|
|
@ -28,6 +28,12 @@ |
|
|
</view> --> |
|
|
</view> --> |
|
|
</view> |
|
|
</view> |
|
|
|
|
|
|
|
|
|
|
|
<view class="temp-order-confirm-btn fade-up" hover-class="tap-soft" hover-stay-time="80" |
|
|
|
|
|
style="animation-delay: 30ms;" @tap="navigatorTo('orderConfirmTest')"> |
|
|
|
|
|
<text>临时测试:支付成功中间页</text> |
|
|
|
|
|
<text class="temp-order-confirm-arrow">›</text> |
|
|
|
|
|
</view> |
|
|
|
|
|
|
|
|
<view class="saving-hero fade-up" hover-class="tap-soft" hover-stay-time="80" |
|
|
<view class="saving-hero fade-up" hover-class="tap-soft" hover-stay-time="80" |
|
|
style="animation-delay: 50ms;" @tap="navigatorTo('qianbao')"> |
|
|
style="animation-delay: 50ms;" @tap="navigatorTo('qianbao')"> |
|
|
<image class="saving-bg" :src="getMyCenterImage('savingHero')" mode="aspectFit"></image> |
|
|
<image class="saving-bg" :src="getMyCenterImage('savingHero')" mode="aspectFit"></image> |
|
|
@ -785,17 +791,20 @@ |
|
|
uni.setStorageSync('schoolShop', shops) |
|
|
uni.setStorageSync('schoolShop', shops) |
|
|
const pendingShop = shops.find((item) => item && item.status == 0) |
|
|
const pendingShop = shops.find((item) => item && item.status == 0) |
|
|
if (pendingShop) { |
|
|
if (pendingShop) { |
|
|
this.tui.toast((pendingShop.shopName || '店铺') + ' 正在审核中,暂时不能提交新店铺注册', 2000) |
|
|
|
|
|
uni.hideLoading() |
|
|
uni.hideLoading() |
|
|
|
|
|
this.tui.toast((pendingShop.shopName || '店铺') + ' 正在审核中,暂时不能提交新店铺注册', 2000) |
|
|
return |
|
|
return |
|
|
} |
|
|
} |
|
|
|
|
|
uni.hideLoading() |
|
|
uni.navigateTo({ |
|
|
uni.navigateTo({ |
|
|
url: '/package3/shop/merchantRegister' |
|
|
url: '/package3/shop/merchantRegister' |
|
|
}) |
|
|
}) |
|
|
|
|
|
return |
|
|
} else { |
|
|
} else { |
|
|
|
|
|
uni.hideLoading() |
|
|
this.tui.toast(res.message) |
|
|
this.tui.toast(res.message) |
|
|
|
|
|
return |
|
|
} |
|
|
} |
|
|
uni.hideLoading() |
|
|
|
|
|
}).catch(() => { |
|
|
}).catch(() => { |
|
|
uni.hideLoading() |
|
|
uni.hideLoading() |
|
|
}) |
|
|
}) |
|
|
@ -920,6 +929,8 @@ |
|
|
return |
|
|
return |
|
|
} else if (e == 'dingdan') { |
|
|
} else if (e == 'dingdan') { |
|
|
url = '/package1/order/orderList' |
|
|
url = '/package1/order/orderList' |
|
|
|
|
|
} else if (e == 'orderConfirmTest') { |
|
|
|
|
|
url = '/package1/order/orderConfirm?id=1&groupId=&amount=12.34' |
|
|
} else if (e == 'groupPending') { |
|
|
} else if (e == 'groupPending') { |
|
|
url = '/package2/group/groupPendingList' |
|
|
url = '/package2/group/groupPendingList' |
|
|
} else if (e == 'addType') { |
|
|
} else if (e == 'addType') { |
|
|
@ -1228,6 +1239,27 @@ |
|
|
height: 42rpx; |
|
|
height: 42rpx; |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
.temp-order-confirm-btn { |
|
|
|
|
|
height: 78rpx; |
|
|
|
|
|
margin-top: 24rpx; |
|
|
|
|
|
padding: 0 26rpx; |
|
|
|
|
|
border-radius: 28rpx; |
|
|
|
|
|
background: linear-gradient(90deg, rgba(255, 243, 207, .95), rgba(218, 255, 240, .95)); |
|
|
|
|
|
box-shadow: 0 14rpx 34rpx rgba(38, 118, 92, .1); |
|
|
|
|
|
color: #1a4f42; |
|
|
|
|
|
font-size: 26rpx; |
|
|
|
|
|
font-weight: 900; |
|
|
|
|
|
display: flex; |
|
|
|
|
|
align-items: center; |
|
|
|
|
|
justify-content: space-between; |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
.temp-order-confirm-arrow { |
|
|
|
|
|
font-size: 36rpx; |
|
|
|
|
|
line-height: 1; |
|
|
|
|
|
color: #14866c; |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
.saving-hero, |
|
|
.saving-hero, |
|
|
.section-card, |
|
|
.section-card, |
|
|
.quick-card, |
|
|
.quick-card, |
|
|
|