Merge branch 'master' of http://39.101.143.165:8090/hxl13994548489/LocalLivingServicesUniapp

pages/index/shop.vue

@@ -24,9 +24,7 @@
 								:disabled="true"></u-rate>
 							<span>{{shopData.grade}}分</span>
 						</view>
-						<span v-if="shopStatus == 1">营业中</span>
-						<span v-if="shopStatus == 5" style="color: #FF8024;">歇业中</span>
-						<span v-if="shopStatus == 2" style="color: #999999;">门店关闭</span>
+						<span :style="{color:btnList[typeIndex].color}">{{btnList[typeIndex].name}}</span>
 					</view>
 				</view>
 				<view class="address">
@@ -64,11 +62,8 @@
 						</view>
 					</view>
 
-					<view class="affirm" v-if="currentIndex ==1">
-						当前门店确定歇业？
-					</view>
-					<view class="affirm" v-if="currentIndex ==2">
-						关闭门店前需保证没有还未使用的有效服务券哦！
+					<view class="affirm">
+					{{btnList[currentIndex].content}}
 					</view>
 				</view>
 				<view class="sub">
@@ -87,9 +82,7 @@
 					<span>{{btnList[currentIndex].name}}</span>
 				</view>
 				<view class="center">
-					<image src="/static/index/start.png" mode="" v-show="shopStatus == 1"></image>
-					<image src="/static/index/close.png" mode="" v-show="shopStatus == 2"></image>
-					<image src="/static/index/rest.png" mode="" v-show="shopStatus == 5"></image>
+					<image :src="btnList[currentIndex].image" mode="" v-show="shopStatus == 1"></image>
 					<span>{{btnList[currentIndex].tip}}</span>
 					<view class="error" v-show="shopStatus == 4">
 						当前门店还存在有效服务券<br />
@@ -112,20 +105,46 @@
 						name: '正常营业',
 						type:1,
 						class:"start",
-						tip:"恭喜发财，开业大吉！"
-
-					},
-					{
-						name: '门店歇业',
-						type: 5,
-						class:"rest",
-						tip:"当前门店已歇业"
+						tip:"恭喜发财，开业大吉！",
+						image:"/static/index/start.png",
+						content:"	",
+						color:""
 					},
 					{
 						name: '关闭门店',
 						type:2,
 						class:"close",
-						tip:"当前门店关闭成功"
+						tip:"当前门店关闭成功",
+						image:"/static/index/close.png",
+						content:"关闭门店前需保证没有还未使用的有效服务券哦！	",
+						color:"#999999"
+					},
+					{
+						name: '暂停营业',
+						type:3,
+						class:"close",
+						tip:"该店铺已暂停营业",
+						image:"/static/index/close.png",
+						content:"	",
+						color:"#999999"
+					},
+					{
+						name: '解约下线',
+						type: 4,
+						class:"close",
+						tip:"谢谢光临，该店铺已下架",
+						image:"/static/index/rest.png",
+						content:"	",
+						color:"#FF8024"
+					},
+					{
+						name: '门店歇业',
+						type: 5,
+						class:"rest",
+						tip:"当前门店已歇业",
+						image:"/static/index/rest.png",
+						content:"当前门店确定歇业？",
+						color:"#FF8024"
 					},
 				],
 				currentIndex: 0,
@@ -135,6 +154,7 @@
 				count: 5,
 				shopData: {},
 				shopStatus: null,
+				typeIndex: 0,
 				id: '',
 			}
 		},
@@ -164,6 +184,7 @@
 						if (res.data.code == 200) {
 							this.isPopup = false
 							this.isSuccess = true
+							this.getShopData()
 						}else {
               uni.showToast({
                 icon: 'none',
@@ -177,7 +198,9 @@
 					if (res.data.code == 200) {
 						this.shopData = res.data.result
 						this.shopStatus = res.data.result.merchantStatus
-						this.currentIndex=this.btnList.findIndex(item => item.type == this.shopStatus);
+						const index=this.btnList.findIndex(item => item.type == this.shopStatus);
+						this.typeIndex = index
+						this.currentIndex=index
 					}
 				})
 			},
@@ -443,13 +466,14 @@
 
 				.btnList {
 					width: 100%;
-					height: 193rpx;
+					min-height: 250rpx;
 					border-bottom: 1px solid #EEEEEE;
 					padding-top: 24rpx;
 
 					.box {
-						display: flex;
-						justify-content: space-between;
+						display:grid;
+						grid-template-columns: repeat(3, 1fr);
+  					gap: 20rpx;
 
 						.btn {
 							width: 196rpx;