修改

assets/http/api.js

@@ -140,6 +140,7 @@ const ocr={
 }
 
 
+
 export const api={
 	uploadFile,
 	wxApp,

assets/http/service.js

@@ -1,9 +1,9 @@
 import Request from 'luch-request'
 
-// let baseURL = 'https://ldt.guosen-fumao.cn/api/'
-let baseURL = 'http://192.168.1.168:2366/'
+let baseURL = 'https://ldt.guosen-fumao.cn/api/'
+// let baseURL = 'http://192.168.1.168:2366/'
 
-let refreshTokenUrl=baseURL + "blade-auth/oauth/token"
+let refreshTokenUrl = baseURL + "blade-auth/oauth/token"
 
 //获取token
 const getTokenStorage = () => {
@@ -14,17 +14,17 @@ const getTokenStorage = () => {
 	return token
 }
 //缓存token信息
-const cacheToken=(data)=>{
-	let tokenInfo={
-		accessToken:data.access_token,
+const cacheToken = (data) => {
+	let tokenInfo = {
+		accessToken: data.access_token,
 		//提前500秒过期
-		expiresIn:new Date().getTime() + (data.expires_in - 500) * 1000,
-		refreshToken:data.refresh_token,
-		tenantId:data.tenant_id,
-		nickName:data.nick_name
+		expiresIn: new Date().getTime() + (data.expires_in - 500) * 1000,
+		refreshToken: data.refresh_token,
+		tenantId: data.tenant_id,
+		nickName: data.nick_name
 	}
-	uni.setStorageSync('token',data.access_token)
-	uni.setStorageSync('tokenInfo',tokenInfo)
+	uni.setStorageSync('token', data.access_token)
+	uni.setStorageSync('tokenInfo', tokenInfo)
 }
 
 const http = new Request()
@@ -58,8 +58,8 @@ http.interceptors.response.use(async (response) => {
 	//200 返回数据成功 0
 	if (response.data.code != 200) {
 		uni.showToast({
-			icon:'none',
-			title:response.data.msg
+			icon: 'none',
+			title: response.data.msg
 		})
 		return Promise.reject(response)
 	}
@@ -71,27 +71,27 @@ http.interceptors.response.use(async (response) => {
 		} = err
 		if (!isRefreshing) {
 			isRefreshing = true
-			
-			let tokenInfo=uni.getStorageSync('tokenInfo')
-			
+
+			let tokenInfo = uni.getStorageSync('tokenInfo')
+
 			let [, res] = await uni.request({
 				url: refreshTokenUrl,
 				method: 'POST',
 				header: {
 					'Authorization': "Basic c2FiZXI6c2FiZXJfc2VjcmV0",
-					'Content-Type':'application/x-www-form-urlencoded',
+					'Content-Type': 'application/x-www-form-urlencoded',
 					'Tenant-Id': tokenInfo.tenantId
 				},
-				data:{
-					'tenantId':tokenInfo.tenantId,
-					'refresh_token':tokenInfo.refreshToken,
+				data: {
+					'tenantId': tokenInfo.tenantId,
+					'refresh_token': tokenInfo.refreshToken,
 					'grant_type': "refresh_token",
 					'scope': "all",
 				}
 			})
 			//否则保存新的token
 			cacheToken(res.data)
-			
+
 			requests.forEach(cb => cb())
 			// 重试完了清空这个队列
 			requests = []
@@ -106,20 +106,20 @@ http.interceptors.response.use(async (response) => {
 			})
 		}
 	}
-	if (err.data.code==500) {
+	if (err.data.code == 500) {
 		uni.showToast({
-			title:err.data.msg,
-			icon:"none"
+			title: err.data.msg,
+			icon: "none"
 		})
 		return Promise.reject(err)
 	}
 	if (!err.data.success) {
 		uni.showToast({
-			title:err.data.msg,
-			icon:"none"
+			title: err.data.msg,
+			icon: "none"
 		})
 		return err.data
-	}else{
+	} else {
 		return err.data
 	}
 })

pages.json

@@ -335,6 +335,15 @@
             }
             
         }
+        ,{
+            "path" : "pages/flow/flow",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "审核流程",
+                "enablePullDownRefresh": false
+            }
+            
+        }
     ],
 	"globalStyle": {
 		"navigationBarTextStyle": "black",

pages/flow/flow.vue

@@ -0,0 +1,90 @@
+<template>
+	<view class="history">
+		<u-time-line>
+			<u-time-line-item nodeTop="2" v-for="(item,index) in list" :key="index">
+				<template v-slot:node>
+					<view class="u-node bg-white">
+						<u-icon name="clock-fill" color="#e0e3ea" :size="28"></u-icon>
+					</view>
+				</template>
+				<template v-slot:content>
+					<view>
+						<view class="">{{item.createTime}}</view>
+						<view style="width: 636rpx;">
+							<view class="content">
+								<view class="nav-title">
+									<view class="">
+										<text>【{{item.assigneeName?item.assigneeName:'联兑通平台'}}】在 [{{item.createTime}}] 开始处理 [{{item.historyActivityName}}] 环节</text>
+									</view>
+									<view class="" v-if="item.historyActivityDurationTime">
+										任务历时：
+										[{{item.historyActivityDurationTime}}]
+									</view>
+									<view class="" v-if="item.comment">
+										批复意见：
+										[{{item.comment}}]
+									</view>
+									<view class="" v-if="item.endTime">
+										结束时间：
+										[{{item.endTime}}]
+									</view>
+								</view>
+							</view>
+						</view>
+					</view>
+				</template>
+			</u-time-line-item>
+		</u-time-line>
+	</view>
+</template>
+
+<script>
+	export default {
+		props:{
+			shopId: String
+		},
+		data() {
+			return {
+				audit:{},
+				list: []
+			};
+		},
+		created() {
+			this.historyFlowList()
+		},
+		methods: {
+			async historyFlowList() {
+			 	let processInstanceId=(await this.$api.audit.detail({entityId:this.vuex_shopId})).data.processInstanceId
+				this.$api.flow.historyFlowList({processInstanceId}).then(res => {
+					this.list = res.data
+				})
+			}
+		}
+	};
+</script>
+
+<style>
+	page {
+		background-color: #FFFFFF;
+	}
+
+	.history {
+		box-sizing: border-box;
+		padding: 40rpx 20rpx 20rpx 50rpx;
+	}
+
+	.nav-title {
+		font-weight: 300;
+		font-size: 28upx;
+		padding-top: 20rpx;
+		line-height: 50rpx;
+	}
+
+	.content {
+		box-shadow: 0 8rpx 10rpx rgba(234, 234, 234, 0.5), 8rpx 0rpx 10rpx rgba(234, 234, 234, .5), -8rpx 0rpx 10rpx rgba(234, 234, 234, .5);
+		background-color: #FFFFFF;
+		padding: 20rpx;
+		border-radius: 10rpx;
+		margin: 20rpx 0;
+	}
+</style>

pages/index/index.vue

@@ -8,8 +8,8 @@
 						<image src="@/static/icon/dianpu.png" mode=""></image>
 					</view>
 					<view class="center margin-left-10">
-						<view @click="shopShow=true">
-							<text class="name">{{shopLable}}</text>
+						<view @click="showShop">
+							<text class="name">{{shopLable || '去完善商户资料'}}</text>
 							<u-icon v-if="shopShow" name="arrow-up-fill" style="margin-left: 10rpx;"></u-icon>
 							<u-icon v-else name="arrow-down-fill" style="margin-left: 10rpx;"></u-icon>
 						</view>
@@ -38,7 +38,7 @@
 			</view>
 
 			<view class="menu-list">
-				<view @click="$jump('/pages/bill/bill')" class="menu menu1">
+				<view @click="jump('/pages/bill/bill')" class="menu menu1">
 					<view class="menu-top">
 						<image src="@/static/icon/bill.png"></image>
 						<view class="center padding-left-20">
@@ -56,7 +56,7 @@
 						</view>
 					</view>
 				</view>
-				<view class="menu menu2" @click="$jump('/pages/member/member')">
+				<view class="menu menu2" @click="jump('/pages/member/member')">
 					<view class="menu-top">
 						<image src="@/static/icon/center.png"></image>
 						<view class="center padding-left-20">
@@ -79,7 +79,7 @@
 			<view class="market">
 				<text class="title">营销管理</text>
 				<view class="cu-list grid col-2 no-border margin-top-30">
-					<view class="cu-item" @click="$jump(item.path)" v-for="(item,index) in marketList" :key="index">
+					<view class="cu-item" @click="jump(item.path)" v-for="(item,index) in marketList" :key="index">
 						<view class="grid-icon">
 							<image style="width: 120rpx;height: 120rpx;" :src="item.icon" />
 						</view>
@@ -92,9 +92,9 @@
 			<view class="system">
 				<text class="title">数字化系统</text>
 				<view class="cu-list grid col-4 no-border margin-top-30" style="border-radius:20rpx ;">
-					<view class="cu-item" @click="$jump(item.path)" v-for="(item,index) in systemList" :key="index">
+					<view class="cu-item" @click="jump(item.path)" v-for="(item,index) in systemList" :key="index">
 						<view class="grid-icon">
-							<image  style="height: 56rpx;width: 56rpx;" :src="item.icon" />
+							<image style="height: 56rpx;width: 56rpx;" :src="item.icon" />
 						</view>
 						<text style="color: #222222;font-size: 26rpx;">{{item.name}}</text>
 						<view class="cu-tag bg-red badge" v-if="item.count>0">{{item.count}}</view>
@@ -102,8 +102,9 @@
 				</view>
 			</view>
 		</view>
-		
-		<u-modal @confirm="$jump('/pages/member/member')" :show-cancel-button="true"  confirm-color="#ff9447" confirm-text="立即开启" cancel-text="暂不开启" v-model="isOpenMemberShow" content="请先创建会员中心"></u-modal>
+
+		<u-modal @confirm="$jump('/pages/member/member')" :show-cancel-button="true" confirm-color="#ff9447"
+			confirm-text="立即开启" cancel-text="暂不开启" v-model="isOpenMemberShow" content="请先创建会员中心"></u-modal>
 		<u-select @confirm="shopConfirm" v-model="shopShow" value-name="id" label-name="name" :list="shopList">
 		</u-select>
 	</view>
@@ -160,12 +161,11 @@
 						count: 0
 					},
 				],
-				systemList: [
-					{
+				systemList: [{
 						icon: '/static/icon/system5.png',
 						name: '添加门店',
-						path: '/pages/shop-info/shop-info?phone='+this.$cache.get('phone')
-					},{
+						path: '/pages/shop-info/shop-info?phone=' + this.$cache.get('phone')
+					}, {
 						icon: '/static/icon/system1.png',
 						name: '外卖平台',
 						path: ''
@@ -185,7 +185,7 @@
 						name: '线上商城',
 						path: ''
 					},
-					
+
 					{
 						icon: '/static/icon/add.png',
 						name: '添加服务',
@@ -193,14 +193,27 @@
 					},
 				],
 				//是否开启会员中心
-				isOpenMember:false,
-				isOpenMemberShow:false,
+				isOpenMember: false,
+				isOpenMemberShow: false,
+
+				//流程节点信息
+				taskDetail: {}
 			}
 		},
 		onShow() {
 			this.init()
 		},
 		methods: {
+			showShop() {
+				if (this.$isEmpty(this.shopLable)) {
+					uni.navigateTo({
+						url: "/pages/shop-info/shop-info?phone=" + this.$cache.get('phone')
+					})
+				} else {
+					this.shopShow = !this.shopShow
+				}
+			},
+
 			logout() {
 				this.$dialog.showModal('确定要退出吗？').then(res => {
 					uni.clearStorage()
@@ -213,16 +226,11 @@
 				let phone = this.$cache.get('phone')
 				let params = {
 					personTel: phone,
-					auditStatus: this.$global.SHOP_AUDIT.PASS //审核通过
 				}
 				let res = await this.$api.shop.list(params)
 				if (this.$isEmpty(res.data.records)) {
-					this.$dialog.showModal('找不到商户信息',false).then(()=>{
-						this.$cache.clear()
-						uni.reLaunch({
-							url:"/pages/login/account-login"
-						})
-					})
+					this.$u.vuex('vuex_shopStatus', false)
+					return
 				}
 				this.shopList = res.data.records
 				let item = this.shopList[0]
@@ -232,11 +240,14 @@
 				this.labelNames = item.labelNames
 				this.mallId = item.mallId
 				this.cacheSelectedShop(item)
+				this.handelShopStatus()
 				//获取统计数据
 				this.getStatistic()
 			},
 			getStatistic() {
-				this.$api.shop.statistic({shopId:this.shopId}).then(res => {
+				this.$api.shop.statistic({
+					shopId: this.shopId
+				}).then(res => {
 					this.statistic = res.data
 				})
 			},
@@ -248,9 +259,11 @@
 					labelNames: this.labelNames
 				}
 				this.$cache.put("selectedShop", Object.assign(item, selectedShop))
+				this.$u.vuex('vuex_shopStatus', item.auditStatus)
 				this.$u.vuex('vuex_shopId', this.shopId)
 				this.$u.vuex('vuex_mallId', this.mallId)
-				this.$u.vuex('vuex_isOpenMember',item.isOpenMember==1?true:false)
+				this.$u.vuex('vuex_isOpenMember', item.isOpenMember == 1 ? true : false)
+				this.getTaskDetail()
 			},
 			shopConfirm(e) {
 				this.shopId = e[0].value
@@ -266,9 +279,20 @@
 				//获取统计数据
 				this.getStatistic()
 			},
+			jump(path){
+				let flag=this.handelShopStatus()
+				if (this.$isNotEmpty(flag)) {
+					this.$jump(path)
+				}
+			},
 			operate(index) {
-				if (!this.vuex_isOpenMember && (index== 0 || index==1)) {
-					this.isOpenMemberShow=true
+				let flag=this.handelShopStatus()
+				if (this.$isEmpty(flag)) {
+					return
+				}
+				//审核通过，校验是否开启会员中心
+				if (!this.vuex_isOpenMember && (index == 0 || index == 1)) {
+					this.isOpenMemberShow = true
 					return
 				}
 				if (index == 0) {
@@ -279,6 +303,102 @@
 					this.$jump('/pages/card/card')
 				}
 			},
+			handelShopStatus() {
+				//商户审核通过
+				if (this.vuex_shopStatus == this.$global.SHOP_AUDIT.PASS) {
+					return true
+				}
+				//未完善商户资料
+				if (!this.vuex_shopStatus) {
+					uni.showModal({
+						cancelText:'暂不完善',
+						confirmText:'去完善',
+						confirmColor:'#FF9447',
+						cancelColor:'#606266',
+						showCancel:true,
+						title:'提示',
+						content:'商户资料未完善',
+						success: (res) => {
+							if (res.confirm) {
+								this.$jump('/pages/shop-info/shop-info?phone'+ this.$cache.get('phone'))
+							}
+						}
+					})
+					return
+				}
+				//审核失败
+				if (this.vuex_shopStatus == this.$global.SHOP_AUDIT.FAIL) {
+					this.$dialog.showModal('商户资料审核失败,请重新申请', true).then(res => {
+						let params = {
+							isFail: true,
+							shopId: this.vuex_shopId
+						}
+						uni.navigateTo({
+							url: "/pages/shop-info/shop-info" + this.$u.queryParams(params)
+						})
+					})
+					return
+				}
+				//商户已停用
+				if (this.vuex_shopStatus == this.$global.SHOP_AUDIT.STOP) {
+					this.$dialog.showModal('该商户已停用',false)
+					return
+				}
+				//待审核中
+				if (this.vuex_shopStatus.includes('WAITING')) {
+					if (this.vuex_shopStatus == this.$global.SHOP_AUDIT.WAITING_SIGN) {
+						//待签约状态，去签约
+						uni.showModal({
+						    title: '提示',
+						    content: '商户资料审核通过,请进行签约？',
+							cancelText:'暂不签约',
+							confirmColor:'#FF9447',
+							confirmText:'去签约',
+						    success: function (res) {
+						        if (res.confirm) {
+									_this.$jump('/pages/webView/webView?url=' + this.taskDetail.variables.signUrl)
+						        } 
+						    }
+						});
+						return
+					}
+					if (this.vuex_shopStatus == this.$global.SHOP_AUDIT.WAITING_AUTH) {
+						this.$jump('/pages/webView/webView?url=' + this.taskDetail.variables.qrcodeUrl)
+						//待商户认证状态
+						return
+					}
+					let _this=this
+					//待商场审核，待平台审核，待易宝审核状态下，去审核流程详情页
+					uni.showModal({
+					    title: '提示',
+					    content: '商户资料审核中,查看审核流程？',
+						cancelText:'暂不查看',
+						confirmColor:'#FF9447',
+						confirmText:'查看',
+					    success: function (res) {
+					        if (res.confirm) {
+								_this.$jump('/pages/flow/flow')
+					        } 
+					    }
+					});
+				}
+				
+			},
+			/**
+			 * 获取流程节点信息
+			 */
+			async getTaskDetail() {
+				let audit = (await this.$api.audit.detail({
+					entityId: this.vuex_shopId
+				})).data
+				let params = {
+					assignee: '$INITIATOR',
+					processInstanceId: audit.processInstanceId
+				}
+				this.$api.flow.getTaskId(params).then(res => {
+					this.taskDetail = res.data.records[0]
+				})
+			},
 		}
 	}
 </script>

pages/login/account-login.vue

@@ -108,49 +108,17 @@
 					this.$u.toast(res.msg)
 					return
 				}
-				if (res.success && this.$isEmpty(shopList)) {
-					//未完善商户资料
-					uni.navigateTo({
-						url: "/pages/shop-info/shop-info?phone=" + this.form.phone
-					})
-					return
-				}
-				//审核通过
-				let passList = shopList.filter(item => item.auditStatus == this.$global.SHOP_AUDIT.PASS)
-				if (this.$isNotEmpty(passList)) {
-					uni.setStorageSync("phone", this.form.phone)
-					uni.navigateTo({
-						url: '/pages/index/index'
-					})
-					this.$u.toast('登录成功')
-					return
-				}
-				//没有审核通过的数据，有可能待审核中
-				let waitList = shopList.filter(item => item.auditStatus == this.$global.SHOP_AUDIT.WAITING_MALL ||
-					item.auditStatus == this.$global.SHOP_AUDIT.WAITING_PLATFORM)
-				if (this.$isNotEmpty(waitList)) {
-					this.$dialog.showModal('商户资料审核中', false, "#FF9447")
-				}
-				let failList= shopList.filter(item=>item.auditStatus ==this.$global.SHOP_AUDIT.FAIL)
-				if (this.$isNotEmpty(failList) && failList.length == 1) {
-					this.$dialog.showModal('商户资料审核失败,请重新申请', true, "#FF9447").then(res=>{
-						let params={
-							isFail:true,
-							shopId:failList[0].id
-						}
-						uni.navigateTo({
-							url: "/pages/shop-info/shop-info" + this.$u.queryParams(params)
-						})
-						return
-					})
-				}
-
+				uni.setStorageSync("phone", this.form.phone)
+				uni.navigateTo({
+					url: '/pages/index/index'
+				})
+				this.$u.toast('登录成功')
 			},
 			cacheToken(data){
 				let tokenInfo={
 					accessToken:data.access_token,
-					//提前500秒过期
-					expiresIn:new Date().getTime() + (data.expires_in - 30) * 1000,
+					//提前200秒过期
+					expiresIn:new Date().getTime() + (data.expires_in - 200) * 1000,
 					refreshToken:data.refresh_token,
 					tenantId:data.tenant_id,
 					nickName:data.nick_name

pages/login/login.vue

@@ -103,35 +103,26 @@
 					smsId:this.$cache.get('smsId')	
 				}
 				let res=await this.$api.accout.phoneLogin(params)
-				let shopList=res.data
-				uni.hideLoading()
-				if (!res.success) {
-					//登录失败
-					this.$u.toast(res.msg)
-					return
-				}
-				if (res.success && this.$isEmpty(shopList)) {
-					//未完善商户资料
-					uni.navigateTo({
-						url:"/pages/shop-info/shop-info?phone="+this.form.phone
-					})
-					return
-				}
-				//审核通过
-				let passList= shopList.filter(item=>item.auditStatus==this.$global.SHOP_AUDIT.PASS)
-				if (this.$isNotEmpty(passList)) {
-					uni.setStorageSync("phone",this.form.phone)
-					uni.navigateTo({
-						url:'/pages/index/index'
-					})
-					this.$u.toast('登录成功')
-					return
-				}
-				//没有审核通过的数据，有可能待审核中
-				let waitList= shopList.filter(item=>item.auditStatus==this.$global.SHOP_AUDIT.WAITING)
-				if (this.$isNotEmpty(waitList)) {
-					this.$dialog.showModal('商户资料审核中',false,"#FF9447")
+				this.cacheToken(res.data)
+				uni.setStorageSync("phone",this.form.phone)
+				uni.navigateTo({
+					url:'/pages/index/index'
+				})
+				this.$u.toast('登录成功')
+				console.log(res);
+				return
+			},
+			cacheToken(data){
+				let tokenInfo={
+					accessToken:data.access_token,
+					//提前200秒过期
+					expiresIn:new Date().getTime() + (data.expires_in - 200) * 1000,
+					refreshToken:data.refresh_token,
+					tenantId:data.tenant_id,
+					nickName:data.nick_name
 				}
+				this.$cache.put('token',data.access_token)
+				this.$cache.put("tokenInfo",tokenInfo)
 			},
 			codeChange(text) {
 				this.codeTips = text;

pages/pay/pay.vue

@@ -31,6 +31,7 @@
 				scanNotify:{scan: false,scanMessage:'扫描错误，请稍后重试！' },
 				money:'',
 				//向哪个用户收款
+				channelId:'',
 				secret:'',
 				userId:''
 			}
@@ -46,8 +47,10 @@
 					scanType: ['barCode'],
 				    success: function (res) {
 						//用户id
-						_this.secret=res.result
+						let result=res.result.split(';')
+						_this.secret=result[0]
 						_this.userId=_this.secret.substr(0,19)
+						_this.channelId=result[1]
 						//处理支付
 						_this.toPay()
 				    },
@@ -68,7 +71,8 @@
 					expireTime,
 					appId:this.$global.wxParams.clientAppId,
 					secret:this.userId,
-					authCode: this.secret
+					authCode: this.secret,
+					channelId:this.channelId
 				}
 				uni.navigateTo({
 					url:"/pages/pay/pay-result?payParams="+JSON.stringify(params)

pages/shop-info/shop-info.vue

@@ -5,11 +5,11 @@
 		<view class="bg"></view>
 		<view class="card">
 			<view class="margin-bottom-30" v-if="$isNotEmpty(failReason)">
-				<u-alert-tips  type="error" :close-able="true" :show-icon="true" title="审核意见" :description="failReason"></u-alert-tips>
+				<u-alert-tips  @close="failReason=null"  type="error" :close-able="true" :show-icon="true" title="审核意见" :description="failReason"></u-alert-tips>
 			</view>
 			<view class="title u-flex u-row-between u-col-center">
 				<text>完善商家资料</text>
-				<text v-show="step==2||step==3 || step==4" @click="prevStep" class="u-font-24" style="color: #999">上一步</text>
+				<text v-show="step==2||step==3" @click="prevStep" class="u-font-24" style="color: #999">上一步</text>
 			</view>
 			<u-form :model="form" :label-width="labelWidth" ref="uForm">
 				<view v-show="step==1">
@@ -190,7 +190,7 @@
 					</view>
 				</view>
 			</u-form>
-			<view v-if="step==1||step==2 ||step==3" class="center flex-direction" style="margin-top: 100rpx;">
+			<view v-if="step==1||step==2" class="center flex-direction" style="margin-top: 100rpx;">
 				<view @click="nextStep" class="btn cu-btn round" style="width:90%;height: 90rpx;font-size: 34rpx;">
 					下一步
 				</view>
@@ -591,7 +591,7 @@
 				regionShow: false,
 				//门店地址
 				shopAddress: '',
-				step: 3,
+				step: 1,
 				//编辑还是修改
 				isEdit: false,
 				//审核失败，重新申请
@@ -769,7 +769,7 @@
 				}
 			},
 			prevStep() {
-				if (this.step > 1 && this.step < 5) {
+				if (this.step > 1 && this.step < 4) {
 					this.step--
 				}
 			},
@@ -831,7 +831,7 @@
 					}
 					
 				}
-				if (this.step > 0 && this.step < 4) {
+				if (this.step > 0 && this.step < 3) {
 					this.step++
 				}
 			},
@@ -942,7 +942,6 @@
 				this.form.mallAreaId = e[0].value
 			},
 			async submit() {
-				
 				await this.$mpi.subscribe(this.$tmplIds)
 
 				if (this.$isEmpty(this.auditForm.idCardFront)) {
@@ -990,7 +989,7 @@
 			},
 			jump(){
 				let jumpData = {
-					path: this.isEdit ? '/pages/index/index' : '/pages/login/account-login',
+					path: '/pages/index/index' ,
 					title: this.isEdit ? '资料修改成功' : '资料提交成功,请耐心等待审核'
 				}
 				uni.redirectTo({

store/index.js

@@ -12,7 +12,7 @@ try{
 }
 
 // 需要永久存储，且下次APP启动需要取出的，在state中的变量名
-let saveStateKeys = ['vuex_audit','vuex_mallId','vuex_shopId'];
+let saveStateKeys = ['vuex_audit','vuex_mallId','vuex_shopId','vuex_shopStatus'];
 
 // 保存变量到本地存储中
 const saveLifeData = function(key, value){
@@ -36,7 +36,7 @@ const store = new Vuex.Store({
 		vuex_mallId: lifeData.vuex_mallId ? lifeData.vuex_mallId : null,
 		vuex_shopId: lifeData.vuex_shopId ? lifeData.vuex_shopId : null,
 		vuex_isOpenMember: lifeData.vuex_isOpenMember ? lifeData.vuex_isOpenMember : false,
-		vuex_socket: lifeData.vuex_socket ? lifeData.vuex_socket : false,
+		vuex_shopStatus: lifeData.vuex_shopStatus ? lifeData.vuex_shopStatus : null,
 	},
 	mutations: {
 		$uStore(state, payload) {

utils/global.js

@@ -31,10 +31,21 @@ let global = {
 	SHOP:'SHOP',
 	
 	SHOP_AUDIT:{
+		//待商场审核
 		WAITING_MALL:'WAITING_MALL',
+		//待平台审核
 		WAITING_PLATFORM:'WAITING_PLATFORM',
+		//待易宝审核
+		WAITING_INVITATION:'WAITING_INVITATION',
+		//待商户签约
+		WAITING_SIGN:'WAITING_SIGN',
+		//待商户认证
+		WAITING_AUTH:'WAITING_AUTH',
+		//审核通过
 		PASS:'PASS',
+		//审核失败
 		FAIL:'FAIL',
+		//停用
 		STOP:'STOP'
 	},