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