修改

App.vue

@@ -1,12 +1,20 @@
 <script>
+	import setting from "./assets/http/setting.js"
 	export default {
 		onLaunch: function() {
+			//开启调试模式
+			this.setEnableDebug()
 			//获取审核状态
 			this.$u.vuex('vuex_audit',0)
 			//更新版本
 			this.updateApp()
 		},
 		methods:{
+			setEnableDebug(){
+				uni.setEnableDebug({
+				    enableDebug: setting.enabledDebug
+				})
+			},
 			updateApp(){
 				const updateManager = uni.getUpdateManager();
 				updateManager.onCheckForUpdate(function (res) {

assets/http/setting.js

@@ -3,14 +3,17 @@ 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 = 'http://192.168.1.168:2366/'
-setting.webSocketUrl = 'ws://192.168.1.168:2366/websocket/'
-setting.enabledCrypto = true
-
-// setting.baseURL = 'http://139.159.240.119:2366/'
-// setting.webSocketUrl = 'ws://139.159.240.119:2366/websocket/'
+// 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
 
 
 export default setting

pages/shop-info/shop-info.vue

@@ -1208,14 +1208,13 @@
 				let _this = this
 
 				if (this.$isEmpty(this.auditForm.idCardFront)) {
-					this.$refs.toast.info('请上传身份证正面照')
+					this.$refs.toast.info('请上传身份证人像面')
 					return
 				}
 				if (this.$isEmpty(this.auditForm.idCardContrary)) {
-					this.$refs.toast.info('请上传身份证反面照')
+					this.$refs.toast.info('请上传身份证国徽面')
 					return
 				}
-
 				if (this.$isEmpty(this.form.personName)) {
 					this.$refs.toast.info('请填写商户联系人姓名')
 					return

pages/shop-info/u-city-select.vue

@@ -1,50 +1,52 @@
 <template>
-	<u-popup v-model="value" mode="bottom" :popup="false" :mask="true" :closeable="true" :safe-area-inset-bottom="true"
-		close-icon-color="#ffffff" :z-index="uZIndex" :maskCloseAble="maskCloseAble" @close="close">
-		<u-tabs active-color="#FF9447" v-if="value" :list="genTabsList" :is-scroll="true" :current="tabsIndex"
-			@change="tabsChange" ref="tabs"></u-tabs>
-		<view class="area-box">
-			<view class="u-flex" :class="{ 'change':isChange }">
-				<view class="area-item">
-					<view class="u-padding-10 u-bg-gray" style="height: 100%;">
-						<scroll-view :scroll-y="true" style="height: 100%">
-							<u-cell-group>
-								<u-cell-item v-for="(item,index) in provinces" :title="item.label" :arrow="false"
-									:index="index" :key="index" @click="provinceChange(item,index)">
-									<text v-if="isChooseP&&province==index" class="cuIcon-check text-bold"></text>
-								</u-cell-item>
-							</u-cell-group>
-						</scroll-view>
+	<view class="" :style="vuex_skin">
+		<u-popup v-model="value" mode="bottom" :popup="false" :mask="true" :closeable="true" :safe-area-inset-bottom="true"
+			close-icon-color="#ffffff" :z-index="uZIndex" :maskCloseAble="maskCloseAble" @close="close">
+			<u-tabs :active-color="vuex_skin.bgColor" v-if="value" :list="genTabsList" :is-scroll="true" :current="tabsIndex"
+				@change="tabsChange" ref="tabs"></u-tabs>
+			<view class="area-box">
+				<view class="u-flex" :class="{ 'change':isChange }">
+					<view class="area-item">
+						<view class="u-padding-10 u-bg-gray" style="height: 100%;">
+							<scroll-view :scroll-y="true" style="height: 100%">
+								<u-cell-group>
+									<u-cell-item v-for="(item,index) in provinces" :title="item.label" :arrow="false"
+										:index="index" :key="index" @click="provinceChange(item,index)">
+										<text v-if="isChooseP&&province==index" class="cuIcon-check text-bold"></text>
+									</u-cell-item>
+								</u-cell-group>
+							</scroll-view>
+						</view>
 					</view>
-				</view>
-				<view class="area-item">
-					<view class="u-padding-10 u-bg-gray" style="height: 100%;">
-						<scroll-view :scroll-y="true" style="height: 100%">
-							<u-cell-group v-if="isChooseP">
-								<u-cell-item v-for="(item,index) in citys" :title="item.label" :arrow="false"
-									:index="index" :key="index" @click="cityChange(item,index)">
-									<text v-if="isChooseC&&city==index" class="cuIcon-check text-bold"></text>
-								</u-cell-item>
-							</u-cell-group>
-						</scroll-view>
+					<view class="area-item">
+						<view class="u-padding-10 u-bg-gray" style="height: 100%;">
+							<scroll-view :scroll-y="true" style="height: 100%">
+								<u-cell-group v-if="isChooseP">
+									<u-cell-item v-for="(item,index) in citys" :title="item.label" :arrow="false"
+										:index="index" :key="index" @click="cityChange(item,index)">
+										<text v-if="isChooseC&&city==index" class="cuIcon-check text-bold"></text>
+									</u-cell-item>
+								</u-cell-group>
+							</scroll-view>
+						</view>
 					</view>
-				</view>
-
-				<view class="area-item">
-					<view class="u-padding-10 u-bg-gray" style="height: 100%;">
-						<scroll-view :scroll-y="true" style="height: 100%">
-							<u-cell-group v-if="isChooseC">
-								<u-cell-item v-for="(item,index) in areas" :title="item.label" :arrow="false"
-									:index="index" :key="index" @click="areaChange(item,index)">
-									<text v-if="isChooseA&&area==index" class="cuIcon-check text-bold"></text>
-								</u-cell-item>
-							</u-cell-group>
-						</scroll-view>
+		
+					<view class="area-item">
+						<view class="u-padding-10 u-bg-gray" style="height: 100%;">
+							<scroll-view :scroll-y="true" style="height: 100%">
+								<u-cell-group v-if="isChooseC">
+									<u-cell-item v-for="(item,index) in areas" :title="item.label" :arrow="false"
+										:index="index" :key="index" @click="areaChange(item,index)">
+										<text v-if="isChooseA&&area==index" class="cuIcon-check text-bold"></text>
+									</u-cell-item>
+								</u-cell-group>
+							</scroll-view>
+						</view>
 					</view>
 				</view>
 			</view>
-		</view>
-	</u-popup>
+		</u-popup>
+	</view>
 </template>
 
 <script>

utils/mixin.js

@@ -53,16 +53,6 @@ let page = {
 				return
 			}
 		}
-		//判断商场id是否为空
-		WHiTE_LIST.push('pages/index/index')
-		if (!WHiTE_LIST.includes(currentPage)) {
-			if (!this.vuex_shopId) {
-				uni.reLaunch({
-					url:"/pages/index/index"
-				})
-				return
-			}
-		}
 	}
 }