Merge branch 'wwz_d' of https://e.coding.net/g-cphe0354/xiaochengxusaomadiancan/cashier_weapp into wwz_x

pages/index/indexs.vue

@@ -8,7 +8,7 @@
 					<text class="contentboxitemlefttextone">点餐</text>
 					<text class="contentboxitemlefttexttow">在线点不排队</text>
 				</view>
-				<view class="contentboxitemright" >
+				<view class="contentboxitemright">
 					<view class="contentboxitemright_item flex-between" @click="scanCodehandle(1)">
 						<image src="https://czg-qr-order.oss-cn-beijing.aliyuncs.com/indexs/Xvip.png" mode="aspectFill">
 						</image>
@@ -74,9 +74,16 @@
 			},
 			memberindex(i) {
 				if (i == 0) {
+					if (this.usershopUserinfo.isVip == 0) {
+						// 跳转到开通页面
+						uni.navigateTo({
+							url: '/pages/member/activatedmemberone?shopId=' + uni.cache.get('shopUser')
+						})
+					} else {
 						uni.pro.navigateTo('member/memberdetails', {
 							shopId_id: uni.cache.get('shopUser'),
 						})
+					}
 				} else {
 					let data = {
 						shopName: this.usershopUserinfo.shopName,
@@ -181,7 +188,7 @@
 
 				.contentboxitemright {
 					width: 50%;
-					padding:0 34rpx;
+					padding: 0 34rpx;
 
 					.contentboxitemright_item:nth-child(2) {
 						margin-top: 30rpx;
@@ -195,6 +202,7 @@
 
 						.contentboxitemright_itembox {
 							width: 170rpx;
+
 							text:nth-child(1) {
 								font-family: Source Han Sans CN, Source Han Sans CN;
 								font-weight: 400;