修改

pages.json

@@ -273,7 +273,8 @@
             "path" : "pages/pay/pay-result",
             "style" :                                                                                    
             {
-                "navigationBarTitleText": "支付结果",
+				"navigationStyle":"custom",
+                "navigationBarTitleText": "收款结果",
                 "enablePullDownRefresh": false
             }
             

pages/bill/bill.vue

@@ -6,7 +6,7 @@
 			<view class="tixian">
 				<view class="value" style="margin-bottom: 50rpx;">
 					<text>总应收</text>
-					<text class="text-price">{{shopData.totalFunkPrice}}</text>
+					<text class="text-price">{{shopData.charge}}</text>
 				</view>
 				<view class="flex justify-center align-center">
 					<view class="cu-btn btn round" style="padding: 24rpx 50rpx;" hover-class="hoverClass1"
@@ -18,7 +18,7 @@
 			<view style="display: flex;justify-content: flex-start;">
 				<view class="value">
 					<text>余额</text>
-					<text class="text-price">{{$digital.floatSub(shopData.withdrawTotalPrice,shopData.totalPointValue)}}</text>
+					<text class="text-price">{{shopData.balance}}</text>
 				</view>
 			</view>
 
@@ -51,7 +51,7 @@
 				<view class="area2 area-padding">
 					<text>折扣</text>
 				</view>
-				<view class="area3 area-padding u-text-right u-p-r-20">
+				<view class="area3 area-padding  text-center">
 					<text>价值</text>
 				</view>
 			</view>
@@ -62,7 +62,7 @@
 				<view class="area2 area-padding">
 					<text>积分</text>
 				</view>
-				<view class="area3 area-padding u-text-right u-p-r-20">
+				<view class="area3 area-padding  ">
 					<text>价值</text>
 				</view>
 			</view>
@@ -70,48 +70,49 @@
 				:down="downOption" :up="upOption">
 				<view @click="$jump('/pages/bill/billDetail?billDetail='+JSON.stringify(item)+'&current='+current)"
 					class="item" hover-class="hoverClass" v-for="(item,index) in list" :key="index">
-					<block v-if="current==1">
+					<block v-if="current==0">
 						<view class="area1">
 							<view class="item-padding">
-								<image :src="item.channelLogo" mode="aspectFit"></image>
-								<view class="">
-									<text>{{item.channelName}}</text>
-									<text>{{item.jsTime}}</text>
+								<image style="border-radius: 50%;"
+									:src="item.avatar?item.avatar:'/static/icon/avatar.png'" mode="aspectFit">
+								</image>
+								<view class="margin-left-10">
+									<text>{{item.nickName || '用户支付'}}</text>
+									<text>{{item.createTime}}</text>
 								</view>
 							</view>
 						</view>
-						<view class="area2 text-area ">
+						<view class="area2 text-area" style="width: 15%;">
 							<view class="item-padding">
-								<image style="width: 35rpx;height: 35rpx;margin-bottom: -5rpx;"
-									src="@/static/icon/points-value.png"></image>
-								<text style="font-size: 32rpx;margin-left: 10rpx;color: #F39248;">+{{item.point  || 0}}</text>
+								<text>{{item.discount==-1 || item.discount==0?'无折扣':item.discount +'折'}}</text>
 							</view>
 						</view>
-						<view class="area3 text-area ">
-							<view class="item-padding" style="font-size: 34rpx;color: #000;">￥{{item.pointValue  || 0}}</view>
+						<view class="area3 text-area u-p-r-20" style="width: 30%;">
+							<view class="item-padding"
+								style="flex:1;text-align: right;font-size: 34rpx;color: #F39248;">
+								+￥{{item.price || 0}}</view>
 						</view>
 					</block>
-					<block v-if="current==0">
+					
+					<block v-if="current==1">
 						<view class="area1">
 							<view class="item-padding">
-								<image style="border-radius: 50%;"
-									:src="item.userAvator?item.userAvator:'/static/icon/avatar.png'" mode="aspectFit">
-								</image>
-								<view class="margin-left-10">
-									<text>{{item.userName || '用户支付'}}</text>
-									<text>{{item.updateTime}}</text>
+								<image :src="item.channelLogo" mode="aspectFit"></image>
+								<view class="">
+									<text>{{item.channelName}}</text>
+									<text>{{item.createTime}}</text>
 								</view>
 							</view>
 						</view>
-						<view class="area2 text-area" style="width: 15%;">
+						<view class="area2 text-area ">
 							<view class="item-padding">
-								<text>{{item.subsidy==1?'无折扣':$digital.floatMul(item.subsidy , 10) +'折'}}</text>
+								<image style="width: 35rpx;height: 35rpx;margin-bottom: -5rpx;"
+									src="@/static/icon/points-value.png"></image>
+								<text style="font-size: 32rpx;margin-left: 10rpx;color: #F39248;">+{{item.price  || 0}}</text>
 							</view>
 						</view>
-						<view class="area3 text-area u-p-r-20" style="width: 30%;">
-							<view class="item-padding"
-								style="flex:1;text-align: right;font-size: 34rpx;color: #F39248;">
-								+￥{{item.realPayAmount || 0}}</view>
+						<view class="area3 text-area ">
+							<view class="item-padding" style="font-size: 34rpx;color: #000;">￥{{item.price  || 0}}</view>
 						</view>
 					</block>
 				</view>
@@ -155,6 +156,7 @@
 					month: true,
 				},
 				defaultTime: '',
+				
 				shopData: {},
 				height: '',
 			}
@@ -164,7 +166,6 @@
 			this.shopDetail()
 		},
 		onReady() {
-			this.defaultTime = this.$dateTime.format(new Date(), 'YYYY-mm')
 			this.getElInfo()
 		},
 		methods: {
@@ -174,9 +175,9 @@
 			},
 			async shopDetail() {
 				let params = {
-					id: this.vuex_shopId
+					shopId: this.vuex_shopId
 				}
-				let res = await this.$api.shop.detail(params)
+				let res = await this.$api.shop.shopBillsInfo(params)
 				this.shopData = res.data
 			},
 			async shop() {
@@ -193,26 +194,27 @@
 					return
 				}
 				let params = {
-					shopId: this.vuex_shopId,
+					receiveId: this.vuex_shopId,
 					current: mescroll.num,
 					size: mescroll.size,
+					paystatus:this.$global.PAY_STATUS.SUCCESS
 				}
 				if (this.defaultTime) {
-					params.monthTime = this.defaultTime
+					params.createTime = this.$dateTime.format(new Date(this.defaultTime))
 				} else {
-					params.monthTime = this.$dateTime.format(new Date(), 'YYYY-mm')
+					params.createTime = this.$dateTime.format(new Date())
 				}
 				try {
-					if (this.current == 1) {
-						this.$api.shop.yingshouPage(params).then(res => {
+					if (this.current == 0) {
+						this.$api.bills.list(params).then(res => {
 							let data = res.data.records
 							let total = res.data.total
 							mescroll.endBySize(data.length, total);
 							if (mescroll.num == 1) this.list = []; //如果是第一页需手动制空列表
 							this.list = this.list.concat(data); //追加新数据
 						})
-					} else if (this.current == 0) {
-						this.$api.shop.remainDetailPage(params).then(res => {
+					} else if (this.current == 1) {
+						this.$api.pointBills.list(params).then(res => {
 							let data = res.data.records
 							let total = res.data.total
 							mescroll.endBySize(data.length, total);

pages/bill/billDetail.vue

@@ -1,97 +1,107 @@
 <template>
 	<view>
-		<block v-if="current==1">
+		<block v-if="current==0">
 			<view class="top">
-				<image :src="billDetail.channelLogo?billDetail.channelLogo:'/static/icon/avatar.png'" mode="aspectFit"></image>
-				<text class="title">{{billDetail.channelName}}</text>
+				<image style="border-radius: 50%;" :src="billDetail.avatar?billDetail.avatar:'/static/icon/avatar.png'" mode="aspectFit"></image>
+				<text class="title">{{billDetail.nickName?billDetail.nickName:'微信用户'}}</text>
 				<view class="data">
-					<image src="@/static/icon/points-value.png" mode="aspectFit"></image>
-					<view>
-						<text>-{{billDetail.point}}</text>
-						<text>(价值 ￥ {{billDetail.pointValue}})</text>
+					<view class="mainColor" style="padding: 0;">
+						+{{billDetail.price}}
 					</view>
 				</view>
 			</view>
 			<view class="card">
 				<view class="item">
-					<text>交易状态</text>
-					<text>交易成功</text>
+					<text>订单标题</text>
+					<text class="strong">{{billDetail.title}}</text>
 				</view>
-				<view class="item" v-if="billDetail.jsStatus">
-					<text>结算时间</text>
-					<text>{{billDetail.jsStatus}}</text>
+				<view class="item">
+					<text>商品原价</text>
+					<text class="strong">{{billDetail.cost}}</text>
 				</view>
 				<view class="item">
-					<text>账期</text>
-					<text>{{billDetail.paymentDays}}</text>
+					<text>余额支付</text>
+					<text class="strong">+{{billDetail.balanceNum}}</text>
 				</view>
+<!-- 				<view class="item">
+					<text>积分成本</text>
+					<view class="u-flex">
+						<image style="width: 26rpx;height: 26rpx;" src="@/static/icon/points-value.png" mode="aspectFit"></image>
+						<text class="mainColor margin-left-10">{{billDetail.point?billDetail.point:0}}</text>
+						<text class="strong" style="margin-left: 50rpx;">￥ {{billDetail.pointValue?billDetail.pointValue:0}}</text>
+					</view>
+				</view> -->
 				<view class="item">
-					<text>产生时间</text>
-					<text>{{billDetail.updateTime}}</text>
+					<text>联营折扣</text>
+					<text style="color: #000;">{{billDetail.discount==-1 || billDetail.discount==0?'无折扣': $digital.floatMul(billDetail.discount , 10) +'折'}}</text>
+				</view>
+				<view class="item">
+					<text>通兑应收</text>
+					<text class="strong">￥{{billDetail.tongduiAccount?billDetail.tongduiAccount:0}}</text>
+				</view>
+				<view class="item">
+					<text>交易状态</text>
+					<text>{{billDetail.payStatus}}</text>
 				</view>
 				<view class="item">
 					<text>交易时间</text>
-					<text>{{billDetail.jsTime}}</text>
+					<text>{{billDetail.createTime}}</text>
 				</view>
 				<view class="item">
-					<text>交易单号</text>
-					<text>{{billDetail.billRecordId}}</text>
+					<text>支付方式</text>
+					<text>{{billDetail.payWay}}</text>
 				</view>
 				<view class="item">
-					<text>商户单号</text>
-					<text>{{billDetail.billRecordId}}</text>
+					<text>交易单号</text>
+					<text>{{billDetail.id}}</text>
 				</view>
 			</view>
 		</block>
-		<block v-if="current==0">
+		
+		<block v-if="current==1">
 			<view class="top">
-				<image style="border-radius: 50%;" :src="billDetail.userAvator?billDetail.userAvator:'/static/icon/avatar.png'" mode="aspectFit"></image>
-				<text class="title">{{billDetail.userName?billDetail.userName:'微信用户'}}</text>
+				<image :src="billDetail.channelLogo?billDetail.channelLogo:'/static/icon/avatar.png'" mode="aspectFit"></image>
+				<text class="title">{{billDetail.channelName}}</text>
 				<view class="data">
-					<view class="mainColor" style="padding: 0;">
-						+{{billDetail.realPayAmount}}
+					<image src="@/static/icon/points-value.png" mode="aspectFit"></image>
+					<view>
+						<text>-{{billDetail.point}}</text>
+						<text>(价值 ￥ {{billDetail.pointValue}})</text>
 					</view>
 				</view>
 			</view>
 			<view class="card">
 				<view class="item">
-					<text>总价</text>
-					<text class="strong">{{billDetail.price}}</text>
-				</view>
-				<view class="item">
-					<text>积分成本</text>
-					<view class="u-flex">
-						<image style="width: 26rpx;height: 26rpx;" src="@/static/icon/points-value.png" mode="aspectFit"></image>
-						<text class="mainColor margin-left-10">{{billDetail.point?billDetail.point:0}}</text>
-						<text class="strong" style="margin-left: 50rpx;">￥ {{billDetail.pointValue?billDetail.pointValue:0}}</text>
-					</view>
+					<text>交易状态</text>
+					<text>交易成功</text>
 				</view>
-				<view class="item">
-					<text>联营折扣</text>
-					<text style="color: #000;">{{billDetail.subsidy==1?'无折扣': $digital.floatMul(billDetail.subsidy , 10) +'折'}}</text>
+				<view class="item" v-if="billDetail.jsStatus">
+					<text>结算时间</text>
+					<text>{{billDetail.jsStatus}}</text>
 				</view>
 				<view class="item">
-					<text>通兑应收</text>
-					<text class="strong">￥{{billDetail.tongduiAccount?billDetail.tongduiAccount:0}}</text>
+					<text>账期</text>
+					<text>{{billDetail.paymentDays}}</text>
 				</view>
 				<view class="item">
-					<text>交易状态</text>
-					<text>{{billDetail.payStatus==0?'待付款':billDetail.payStatus==1?'已付款':'已取消'}}</text>
+					<text>产生时间</text>
+					<text>{{billDetail.updateTime}}</text>
 				</view>
 				<view class="item">
 					<text>交易时间</text>
-					<text>{{billDetail.updateTime}}</text>
+					<text>{{billDetail.jsTime}}</text>
 				</view>
 				<view class="item">
-					<text>支付方式</text>
-					<text>{{billDetail.payWay}}</text>
+					<text>交易单号</text>
+					<text>{{billDetail.billRecordId}}</text>
 				</view>
 				<view class="item">
-					<text>交易单号</text>
-					<text>{{billDetail.id}}</text>
+					<text>商户单号</text>
+					<text>{{billDetail.billRecordId}}</text>
 				</view>
 			</view>
 		</block>
+		
 		<view class="question">
 			<text>对订单有疑问</text>
 			<text class="cuIcon-right" style="margin-top: 5rpx;"></text>

pages/login/forget.vue

@@ -32,8 +32,8 @@
 			</view>
 			
 			<view  style="width: 86%;margin-top: 80rpx;">
-				<view @click="login" class="btn cu-btn round" style="width:100%;height: 90rpx;font-size: 34rpx;">
-					确认修改并登录
+				<view @click="submit" class="btn cu-btn round" style="width:100%;height: 90rpx;font-size: 34rpx;">
+					确认修改
 				</view>
 			</view>
 		</view>
@@ -89,21 +89,18 @@
 		methods: {
 			async forgetPaw(){
 				let p={
-					type:2,
+					type:'SHOP',
 					phone:this.form.phone,
-					password:md5Libs.md5(this.form.password),
-					code:this.form.code
+					secret:md5Libs.md5(this.form.password),
+					value:this.form.code,
+					smsId:this.$cache.get('smsId'),
 				}
-				let res=await this.$api.accout.forgetPaw(p)
+				let res=await this.$api.accout.forgetPsw(p)
 				if (res.success) {
-					this.$dialog.showModal('找回成功，请重新登录',false).then(()=>{
-						uni.navigateBack({
-							delta:1
-						})
-					})
+					this.$dialog.showModalAndBack("修改成功，请重新登录")
 				}
 			},
-			async login(){
+			async submit(){
 				this.$refs.uForm.validate(valid => {
 					if (valid) {
 						this.forgetPaw()
@@ -131,7 +128,8 @@
 						}
 						let p=this.$u.queryParams(params)
 						this.$api.sms.send(p).then(res=>{
-							if (res.data=="success") {
+							if (res.data.success) {
+								this.$cache.put('smsId',res.data.id)
 								this.$u.toast('验证码已发送');
 								// 通知验证码组件内部开始倒计时
 							}else{
@@ -139,6 +137,7 @@
 							}
 							this.$refs.uCode.start();
 						})
+						uni.hideLoading()
 					}, 2000);
 				} else {
 					this.$u.toast('倒计时结束后再发送');

pages/login/register.vue

@@ -158,6 +158,7 @@
 							}
 							this.$refs.uCode.start();
 						})
+						uni.hideLoading()
 					}, 200);
 				} else {
 					this.$u.toast('倒计时结束后再发送');

pages/member/detail.vue

@@ -10,10 +10,6 @@
 				<text>手机号码</text>
 				<text>{{detail.phone || '暂无'}}</text>
 			</view>
-			<view class="itemCard">
-				<text>会员名称</text>
-				<text>{{detail.gender==1?'男':'女'}}</text>
-			</view>
 		</view>
 		<view class="cell">
 			<text class="cell-item" style="font-weight: bold;font-size: 28rpx;">消费记录</text>
@@ -63,6 +59,7 @@
 		mixins: [MescrollMixin],
 		data(){
 			return{
+				userId:'',
 				detail:null,
 				downOption: {
 					auto: false,
@@ -74,9 +71,9 @@
 		onReady() {
 			this.getElInfo()
 		},
-		onLoad(option) {
-			if(option.detail){
-				this.detail = JSON.parse(option.detail)
+		onLoad(options) {
+			if(options.userId){
+				this.userId = options.userId
 			}
 		},
 		methods:{

pages/member/member.vue

@@ -12,10 +12,10 @@
 
 		<block v-else>
 			<view class="top-menu">
-				<view class="leftFixed">{{selectedShop.point}}积分等于{{selectedShop.pointValue}}元</view>
+				<view class="leftFixed">1积分等于{{detail.pointUnitValue}}元</view>
 				<view class="u-flex u-row-between">
 					<view class="item">
-						<text>{{detail.memberCount}}</text>
+						<text>{{detail.memberNum}}</text>
 						<text>会员数量</text>
 					</view>
 					
@@ -25,10 +25,11 @@
 					</view>
 				</view>
 				<view class="u-m-t-50 u-flex u-col-center u-row-center">
-					<text class="u-font-24 u-m-r-20">规则:消费1元赠送{{selectedShop.consumeOnePoint}}积分</text>
+					<text class="u-font-24 u-m-r-20">规则:消费1元赠送{{detail.sendPointUnit}}积分</text>
 					<u-button size="mini" shape="circle" @click="showPopup=true">更改规则</u-button>
 				</view>
 			</view>
+			
 			<view class="padding-20 text-bold text-xl">
 				<text>会员列表</text>
 			</view>
@@ -36,7 +37,7 @@
 			<view class="card">
 				<view class="flex tableTitle">
 					<view class="area1 title">
-						会员名称
+						会员信息
 					</view>
 					<view class="area2 title">
 						积分数
@@ -45,10 +46,9 @@
 						价值
 					</view>
 				</view>
-
 				<mescroll-body :height="height" ref="mescrollRef" @init="mescrollInit" @down="downCallback" @up="upCallback"
 					:down="downOption" :up="upOption">
-					<view class="item" v-for="(item,index) in dataList" :key="index" @click="$jump('/pages/member/detail?detail='+JSON.stringify(item))">
+					<view class="item" v-for="(item,index) in dataList" :key="index" @click="$jump('/pages/member/detail?userId='+item.userId)">
 						<view class="area1 flex text-bold">
 							<image class="img-avatar"
 								:src="item.avatar">
@@ -76,7 +76,7 @@
 				<u-form>
 					<u-form-item label-width="180"  label="消费1元赠送">
 						<u-input 
-						v-model="consumeOnePoint" 
+						v-model="sendPointUnit" 
 						border="true" 
 						border-color="#eaeaea"  
 						type="number" 
@@ -113,7 +113,8 @@
 					auto: false // 不自动加载
 				},
 				showPopup:false,
-				consumeOnePoint:'',
+				//消费一元赠送的积分值
+				sendPointUnit:'',
 				customStyle1:{
 					backgroundColor:'#D18C42',
 					color:'#fff',
@@ -123,7 +124,6 @@
 				customStyle2:{
 					width:'400rpx'
 				},
-				selectedShop:null
 			}
 		},
 		watch:{
@@ -135,20 +135,18 @@
 		},
 		onReady() {
 			this.getElInfo()
-			this.selectedShop = this.$cache.get("selectedShop")
 		},
 		onLoad() {
-			this.fetchShopDetail()
+			this.fetchMemberInfo()
 		},
 		methods: {
 			update(){
 				let params = {
 					id: this.vuex_shopId,
-					consumeOnePoint:this.consumeOnePoint
+					sendPointUnit:this.sendPointUnit
 				}
-				this.$api.memberCenter.update(params).then(res => {
-					this.selectedShop.consumeOnePoint = this.consumeOnePoint
-					this.$cache.put("selectedShop",this.selectedShop)
+				this.$api.shop.submit(params).then(res => {
+					this.fetchMemberInfo()
 					this.showPopup = false
 				})
 			},
@@ -156,11 +154,11 @@
 				let rectInfo = await this.$u.getRect('.tableTitle');
 				this.height=this.$u.sys().windowHeight - rectInfo.top + 'px'
 			},
-			fetchShopDetail() {
-				let params = {
-					id: this.vuex_shopId
+			fetchMemberInfo(){
+				let params={
+					shopId:this.vuex_shopId
 				}
-				this.$api.shop.detail(params).then(res => {
+				this.$api.shop.memberInfo(params).then(res=>{
 					if (res.data.isOpenMember == 1) {
 						this.isOpenMember = true
 						this.detail = res.data
@@ -177,9 +175,11 @@
 					shopId: this.vuex_shopId,
 					current: mescroll.num,
 					size: mescroll.size,
+					//商店会员
+					type:2 
 				}
 				try {
-					this.$api.memberCenter.list(params).then(res => {
+					this.$api.member.list(params).then(res => {
 						let data = res.data.records
 						let total = res.data.total
 						mescroll.endBySize(data.length, total);

pages/pay/pay-result.vue

@@ -1,5 +1,6 @@
 <template>
 	<view>
+		<u-navbar :is-back="false" title="收款结果"></u-navbar>
 		<view class="content">
 			<image :src="payData.icon" mode=""></image>
 			<view class="tips">
@@ -26,12 +27,12 @@
 				//支付数据
 				payData:{
 					payStatus:0,
-					title:'支付处理中',
+					title:'订单处理中',
 					desc:'正在处理中，请等待',
-					icon:"/static/icon/handel.png"
+					icon:"/static/icon/pay-handel.png"
 				},
 				payAmount:0,
-				failReason:'订单支付失败'
+				failReason:'订单收款失败'
 			}
 		},
 		beforeDestroy() {
@@ -70,7 +71,7 @@
 				this.webSocket.acceptMessage = (res) => {
 					if (res.isSuccess==true) {
 						//支付成功
-						this.payAmount=res.successParams.totalPrice
+						this.payAmount=res.totalPrice
 						this.changePayData(1)
 					}
 					if (res.isSuccess==false) {
@@ -79,9 +80,7 @@
 					}
 				}
 				this.webSocket.error = (err) => {
-					console.log("启动失败");
-					this.failReason='连接失败'
-					this.changePayData(2)
+					this.$dialog.showModalAndBack('网络错误')
 				}
 			},
 			//定时关闭连接
@@ -117,14 +116,14 @@
 				if (type==1) {
 					this.payData={
 						payStatus:1,
-						title:'支付成功',
-						desc:'已支付'+this.payAmount+'元',
+						title:'收款成功',
+						desc:'已收款'+this.payAmount+'元',
 						icon:"/static/icon/pay-success.png"
 					}
 				}else if (type==2) {
 					this.payData={
 						payStatus:2,
-						title:'支付失败',
+						title:'收款失败',
 						desc:this.failReason,
 						icon:"/static/icon/pay-fail.png"
 					}

pages/shop-info/shop-info.vue

@@ -4,12 +4,12 @@
 			:border-bottom="false"></u-navbar>
 		<view class="bg"></view>
 		<view class="card">
-			<view class="title u-flex u-row-between u-col-center">
+			<view  class="title u-flex u-row-between u-col-center">
 				<text>完善商家资料</text>
-				<text v-if="step==2||step==3" @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">
-				<block v-if="step==1">
+				<view v-show="step==1">
 					<view class="border">
 						<u-form-item label="门店名称" prop="name">
 							<u-input :border="false" placeholder="比如名杨国福麻辣烫(时尚天河2店)" v-model="form.name"></u-input>
@@ -82,8 +82,8 @@
 						</u-form-item>
 					</view>
 
-				</block>
-				<block v-else-if="step==2">
+				</view>
+				<view v-show="step==2">
 					<view class="border">
 						<u-form-item label="上传店铺封面" prop="cover" label-position="top">
 							<upload-img title="请上传店铺封面" @click="chooseImageShop" :model="form.cover"
@@ -106,8 +106,8 @@
 							<mp-upload-img ref="mpUploadImg" @click='uploadShopPics' :count="5"></mp-upload-img>
 						</view>
 					</view>
-				</block>
-				<block v-else>
+				</view>
+				<view v-show="step==3">
 					<view class="border">
 						<u-form-item label="公司法人姓名" prop="legalPerson" label-position="top">
 							<u-input :border="false" placeholder="请输入公司法人姓名(非必填项)" v-model="auditForm.legalPerson">
@@ -144,7 +144,7 @@
 						</view>
 					</view>
 
-				</block>
+				</view>
 			</u-form>
 			<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;">
@@ -269,7 +269,7 @@
 				if (!this.$isEmpty(this.imgList)) {
 					this.form.shopPic = this.imgList.join(",")
 				}
-			}
+			},
 		},
 		onLoad(options) {
 			if (this.$isEmpty(options.phone)) {
@@ -318,6 +318,7 @@
 			},
 			uploadShopPics(data) {
 				this.imgList=data
+				this.$refs.mpUploadImg.changeImgList(this.imgList)
 			},
 			async fetchShopDetail() {
 				let params = {
@@ -362,7 +363,6 @@
 						this.$u.toast('请选择具体地址')
 						return
 					}
-					this.$refs.mpUploadImg.changeImgList(this.imgList)
 				}
 				if (this.step == 2) {
 					if (this.$isEmpty(this.auditForm.businessLicense)) {
@@ -373,8 +373,10 @@
 				if (this.step > 0 && this.step < 3) {
 					this.step++
 				}
+				if (this.step==2) {
+					this.$refs.mpUploadImg.changeImgList(this.imgList)
+				}
 			},
-			
 			clear(t) {
 				if (t == 'mallAreaLabel') {
 					this.mallAreaLabel = ''

utils/global.js

@@ -30,6 +30,12 @@ let global = {
 		PASS:'PASS',
 		FAIL:'FAIL',
 		STOP:'STOP'
+	},
+	
+	PAY_STATUS:{
+		WAIT:'待付款',
+		SUCCESS:'付款成功',
+		CANCEL:'取消付款'
 	}