域名统一调整

api/http.js

-// let base = "https://test-console-api.hzdingmao.com"
-let base = "https://dev-console-api.hzdingmao.com"
-// let base="https://console-api.hibuilding.cn"
+import config from '../common/config.js'
 const http = (params) => {
 	return new Promise((resolve, reject) => {
 		uni.request({
-			url: base + params.url,
+			url: config.base + params.url,
 			method: params.method,
 			data: params.data,
 			header: {

api/request.js

-// 公共中心域名
-export const consoleBaseUrl = 'https://dev-console-api.hzdingmao.com'
-// export const consoleBaseUrl = 'https://test-console-api.hzdingmao.com'
-//正式环境
-// export const consoleBaseUrl = 'https://console-api.hibuilding.cn'
+import config from '../common/config.js'
 const $http = {
 	get: function({
 		url,
 		data,
 		header
 	}) {
-		uni.showLoading({
-			title: "请求中..."
-		})
+		// uni.showLoading({
+		// 	title: "请求中..."
+		// })
 		return new Promise(function(resolve, reject) {
 			uni.request({
-				url: `${consoleBaseUrl}/plat${url}`,
+				url: `${config.base}/plat${url}`,
 				data: data,
 				method: "GET",
 				header: header,
@@ -44,7 +40,7 @@ const $http = {
 		})
 		return new Promise(function(resolve, reject) {
 			uni.request({
-				url: consoleBaseUrl + url,
+				url: config.base + url,
 				data: data,
 				method: "GET",
 				header: header,
@@ -73,7 +69,7 @@ const $http = {
 		})
 		return new Promise(function(resolve, reject) {
 			uni.request({
-				url: `${consoleBaseUrl}/plat${url}`,
+				url: `${config.base}/plat${url}`,
 				data: data,
 				method: "POST",
 				header: header,
@@ -103,7 +99,7 @@ const $http = {
 		})
 		return new Promise(function(resolve, reject) {
 			uni.request({
-				url: consoleBaseUrl + url,
+				url: config.base + url,
 				data: data,
 				method: "POST",
 				header: header,
@@ -133,7 +129,7 @@ const $http = {
 		})
 		return new Promise(function(resolve, reject) {
 			uni.request({
-				url: `${consoleBaseUrl}/plat${url}`,
+				url: `${config.base}/plat${url}`,
 				data: data,
 				method: "DELETE",
 				header: header,
@@ -163,7 +159,7 @@ const $http = {
 		})
 		return new Promise(function(resolve, reject) {
 			uni.request({
-				url: `${consoleBaseUrl}/plat${url}`,
+				url: `${config.base}/plat${url}`,
 				data: data,
 				method: "PUT",
 				header: header,
@@ -193,7 +189,7 @@ const $http = {
 		})
 		return new Promise(function(resolve, reject) {
 			uni.request({
-				url: consoleBaseUrl + url,
+				url: config.base + url,
 				data: data,
 				method: "PUT",
 				header: header,
@@ -223,7 +219,7 @@ const $http = {
 		})
 		return new Promise(function(resolve, reject) {
 			uni.request({
-				url: `${consoleBaseUrl}/plat${url}`,
+				url: `${config.base}/plat${url}`,
 				data: data,
 				method: "DELETE",
 				header: header,
@@ -253,7 +249,7 @@ const $http = {
 		})
 		return new Promise(function(resolve, reject) {
 			uni.request({
-				url: `${consoleBaseUrl}${url}`,
+				url: `${config.base}${url}`,
 				data: data,
 				method: "DELETE",
 				header: header,
@@ -280,7 +276,7 @@ const $http = {
 	}) {
 		return new Promise(function(resolve, reject) {
 			uni.request({
-				url: `${consoleBaseUrl}/plat${url}`,
+				url: `${config.base}/plat${url}`,
 				data: data,
 				method: "POST",
 				header: header,
@@ -305,7 +301,7 @@ const $http = {
 	}) {
 		return new Promise(function(resolve, reject) {
 			uni.request({
-				url: consoleBaseUrl + url,
+				url: config.base + url,
 				data: data,
 				method: "POST",
 				header: header,
@@ -329,7 +325,7 @@ const $http = {
 	}) {
 		return new Promise(function(resolve, reject) {
 			uni.uploadFile({
-				url: consoleBaseUrl + "/api/v1/base/file/upload_file",
+				url: config.base + "/api/v1/base/file/upload_file",
 				filePath: imgUrl,
 				name: 'pic_file_apk',
 				header: {
@@ -352,7 +348,7 @@ const $http = {
 	}) {
 		return new Promise(function(resolve, reject) {
 			uni.uploadFile({
-				url: consoleBaseUrl + "/api/v1/base/file/upload_file",
+				url: config.base + "/api/v1/base/file/upload_file",
 				filePath: fileUrl,
 				name: 'pic_file_apk',
 				header: {

common/config.js

@@ -2,9 +2,15 @@ const $config = {
 	pwdTemplateNo: "industry-0001",
 	loginTemplateNo: "industry-0001",
 	systemCode: "buildingSite",
-	authCode: "477A0661-EF04-11F7-9D69-0BDD73F06500", //开发CED4DE04-BA74-81DF-E51E-9864E4FD0DCB   测试：494BBE85-A6AD-392F-5628-12B39F649333  正式：D0539533-E169-5338-8ED7-3FAD554F4F62
+	authCode: "477A0661-EF04-11F7-9D69-0BDD73F06500",
+	// 开发：477A0661-EF04-11F7-9D69-0BDD73F06500   
+	// 测试：07EC0FDA-0249-6DB3-7422-0AFFF34E0E90  
+	// 正式：D0539533-E169-5338-8ED7-3FAD554F4F62
 	pageSize: 20,
 	isPage: 1,
-	smsCfg: "industry"
+	smsCfg: "industry",
+	// base: "https://test-console-api.hzdingmao.com"
+	base: "https://dev-console-api.hzdingmao.com"
+	// base:"https://console-api.hibuilding.cn"
 }
 export default $config

pages/gallery/gallery.vue

@@ -46,9 +46,9 @@
 						<uni-grid-item class="grid-item" v-for="(model,modelIndex) in item.data" :key="modelIndex">
 							<view class="item" @click="toIndex(model)">
 								<image :src="model.ydt_logo" class="image" />
-								<view class="name" style="color: #666666;font-size: 28rpx;margin-top: 10rpx;">
+								<text class="name">
 									{{nameLengthDeal(model.app_name)}}
-								</view>
+								</text>
 							</view>
 						</uni-grid-item>
 					</uni-grid>
@@ -423,7 +423,7 @@
 				return dest
 			},
 			nameLengthDeal(name) {
-				return StringUtils.stringLength(name, 4)
+				return StringUtils.stringLength(name, 9)
 			}
 		}
 	}
@@ -432,7 +432,6 @@
 <style lang="scss">
 	.content {
 		display: flex;
-		margin-bottom: 130rpx;
 		flex-direction: column;
 
 		.header-content {
@@ -593,6 +592,7 @@
 		.app-content {
 			position: absolute;
 			display: flex;
+			padding-bottom: 85px;
 			flex-direction: column;
 
 			.menu-content {
@@ -636,11 +636,19 @@
 								}
 
 								.name {
+									width: 120rpx;
 									margin-top: 20rpx;
+									text-align: center;
 									font-weight: 400;
 									font-size: 24rpx;
 									color: #333;
-
+									display: -webkit-box;
+									overflow: hidden;
+									text-overflow: ellipsis;
+									word-wrap: break-word;
+									white-space: normal !important;
+									-webkit-line-clamp: 2;
+									-webkit-box-orient: vertical;
 								}
 							}
 						}

pages/index/index.vue

@@ -538,13 +538,12 @@
 				if (this.menus && this.menus.length > 0) {
 					//是否有小程序权限
 					var app = this.menus.find(item => item.object_no == 'gdydt')
-					console.log("app");
 					if (app) {
 						var mainAuthMenus = app.children_list
-						console.log("mainAuthMenus", mainAuthMenus);
+						// console.log("mainAuthMenus", mainAuthMenus);
 						if (mainAuthMenus && mainAuthMenus.length > 0) {
 							var mineMenus = mainAuthMenus.find(item => item.object_no == 'ydtsy')
-							console.log("mineMenus", mineMenus);
+							// console.log("mineMenus", mineMenus);
 							if (mineMenus) {
 								var childMenus = mineMenus.children_list
 								console.log("childMenus", childMenus);

pages/mine/mine.vue

@@ -189,7 +189,7 @@
 				}).then((result) => {
 					console.log("公司申请列表", result);
 					if (result.code == 0) {
-						if (result.data.list.length > 0) {
+						if (result.data.list) {
 							this.mDatas = this.mDatas.concat(result.data.list)
 							this.dealStatus()
 						}