修改

assets/http/service.js

@@ -1,6 +1,7 @@
 import Request from 'luch-request'
 import setting from './setting.js'
 import crypto from '@/utils/crypto.js'
+import queryParams from '@/utils/queryParams.js'
 
 let baseURL = setting.baseURL
 let refreshTokenUrl = baseURL + "blade-auth/oauth/token"
@@ -45,11 +46,9 @@ http.interceptors.request.use((config) => {
 		"Authorization": "Basic c2FiZXI6c2FiZXJfc2VjcmV0",
 		"Blade-Auth": getTokenStorage()
 	}
-	console.log(config,"122222222222");
 	if (setting.enabledCrypto && config.method == 'POST' && config.data) {
-		let encrypt= crypto.encrypt(JSON.stringify(config.data))
-		console.log(crypto.decrypt(encrypt),"/******************");
-		config.data=encrypt
+		let encrypt = crypto.encrypt(JSON.stringify(config.data))
+		config.data = encrypt
 	}
 	return config
 }, (config) => {
@@ -81,45 +80,45 @@ http.interceptors.response.use(async (response) => {
 
 			let tokenInfo = uni.getStorageSync('tokenInfo')
 			if (!tokenInfo.tenantId) {
+				let phone = uni.getStorageSync("phone")
 				uni.showModal({
 					title: "提示",
 					content: "会话已过期，请重新登录",
-					showCancel:false,
-					confirmColor:'#EF9944',
-					success: (res)=>{
+					showCancel: false,
+					confirmColor: '#EF9944',
+					success: (res) => {
 						if (res.confirm) {
 							uni.clearStorageSync()
+							uni.set
 							uni.reLaunch({
-								url:"/pages/login/account-login"
+								url: "/pages/login/account-login?phone=" + phone
 							})
-						} 
+						}
 					}
 				});
 				return
 			}
+			let tokenParams={
+				'tenantId': tokenInfo.tenantId,
+				'refresh_token': tokenInfo.refreshToken,
+				'grant_type': "refresh_token",
+				'scope': "all",
+			}
 			let [, res] = await uni.request({
-				url: refreshTokenUrl,
+				url: refreshTokenUrl + queryParams(tokenParams),
 				method: 'POST',
 				header: {
 					'Authorization': "Basic c2FiZXI6c2FiZXJfc2VjcmV0",
-					'Content-Type': 'application/x-www-form-urlencoded',
 					'Tenant-Id': tokenInfo.tenantId
-				},
-				data: {
-					'tenantId': tokenInfo.tenantId,
-					'refresh_token': tokenInfo.refreshToken,
-					'grant_type': "refresh_token",
-					'scope': "all",
 				}
 			})
-			if (res.data && res.data.error_description=="用户名或密码不正确") {
+			if (res.data && res.data.error_description == "用户名或密码不正确") {
 				uni.clearStorage()
 				uni.reLaunch({
-					url:"/pages/login/account-login"
+					url: "/pages/login/account-login"
 				})
 				return
 			}
-			
 			//否则保存新的token
 			cacheToken(res.data)
 

assets/http/setting.js

@@ -1,19 +1,19 @@
 let setting = {}
 
-// setting.baseURL='https://ldt.guosen-fumao.cn/api/'
-// setting.webSocketUrl='wss://ldt.guosen-fumao.cn/websocket/'
-// setting.enabledCrypto = true
-// setting.enabledDebug = false
+setting.baseURL='https://ldt.guosen-fumao.cn/api/'
+setting.webSocketUrl='wss://ldt.guosen-fumao.cn/websocket/'
+setting.enabledCrypto = true
+setting.enabledDebug = false
 
 // setting.baseURL = 'http://192.168.1.168:2366/'
 // setting.webSocketUrl = 'ws://192.168.1.168:2366/websocket/'
 // setting.enabledCrypto = true
 // setting.enabledDebug = true
 
-setting.baseURL = 'http://139.159.240.119:2366/'
-setting.webSocketUrl = 'ws://139.159.240.119:2366/websocket/'
-setting.enabledCrypto = true
-setting.enabledDebug = true
+// setting.baseURL = 'http://139.159.240.119:2366/'
+// setting.webSocketUrl = 'ws://139.159.240.119:2366/websocket/'
+// setting.enabledCrypto = true
+// setting.enabledDebug = true
 
 
 export default setting

components/mp-uploadImg/mp-uploadImg.vue

@@ -3,8 +3,8 @@
 		<view class="grid  grid-square flex-sub margin-top-50" :class="col?'col-'+col:'col-' + count">
 			<view class="bg-img" v-for="(item,index) in imgList" :key="index" @tap="viewImage(index)">
 				<image :src="imgList[index]" mode="aspectFill"></image>
-				<view class="cu-tag bg-red" @tap.stop="delImg(index)">
-					<text class='cuIcon-close'></text>
+				<view class="cu-tag bg-red" style="padding: 4rpx;border-radius: 0;" @tap.stop="delImg(index)">
+					<text class='cuIcon-close' style="font-size: 22rpx;"></text>
 				</view>
 			</view>
 			<view class="border" @click="uploadShopPics" v-if="imgList.length< count">

pages/shop-info/shop-info.vue

@@ -54,7 +54,7 @@
 					<view v-show="step==2">
 						<view class="border">
 							<u-form-item v-if="typeIndex==1" label="店铺全称" prop="name" label-position="top">
-								<u-input :border="false" placeholder="比如:哈尔滨杨国福麻辣烫餐饮服务有限公司"
+								<u-input :disabled="isEdit" :border="false" placeholder="比如:哈尔滨杨国福麻辣烫餐饮服务有限公司"
 									v-model="auditForm.signName">
 								</u-input>
 							</u-form-item>

utils/queryParams.js

@@ -0,0 +1,53 @@
+function queryParams(data = {}, isPrefix = true, arrayFormat = 'brackets') {
+	let prefix = isPrefix ? '?' : ''
+	let _result = []
+	if (['indices', 'brackets', 'repeat', 'comma'].indexOf(arrayFormat) == -1) arrayFormat = 'brackets';
+	for (let key in data) {
+		let value = data[key]
+		// 去掉为空的参数
+		if (['', undefined, null].indexOf(value) >= 0) {
+			continue;
+		}
+		// 如果值为数组，另行处理
+		if (value.constructor === Array) {
+			// e.g. {ids: [1, 2, 3]}
+			switch (arrayFormat) {
+				case 'indices':
+					// 结果: ids[0]=1&ids[1]=2&ids[2]=3
+					for (let i = 0; i < value.length; i++) {
+						_result.push(key + '[' + i + ']=' + value[i])
+					}
+					break;
+				case 'brackets':
+					// 结果: ids[]=1&ids[]=2&ids[]=3
+					value.forEach(_value => {
+						_result.push(key + '[]=' + _value)
+					})
+					break;
+				case 'repeat':
+					// 结果: ids=1&ids=2&ids=3
+					value.forEach(_value => {
+						_result.push(key + '=' + _value)
+					})
+					break;
+				case 'comma':
+					// 结果: ids=1,2,3
+					let commaStr = "";
+					value.forEach(_value => {
+						commaStr += (commaStr ? "," : "") + _value;
+					})
+					_result.push(key + '=' + commaStr)
+					break;
+				default:
+					value.forEach(_value => {
+						_result.push(key + '[]=' + _value)
+					})
+			}
+		} else {
+			_result.push(key + '=' + value)
+		}
+	}
+	return _result.length ? prefix + _result.join('&') : ''
+}
+
+export default queryParams