调整支付,调整版本热更

This commit is contained in:
唐明明
2021-11-02 14:54:41 +08:00
parent a6e97583ee
commit 531b0ab03f
13 changed files with 1668 additions and 933 deletions

View File

@@ -189,14 +189,11 @@
let typeAuth = '',
pathName = ''
if (this.userAuth.certification && this.userAuth.company && this.userAuth.vip) {
if (this.userAuth.company && this.userAuth.vip) {
this.$Router.push({
name: 'goodsManagement'
})
return
} else if (!this.userAuth.certification) {
typeAuth = '暂未完成个人认证,无法发布商品权证'
pathName = 'Personal'
} else if (!this.userAuth.vip) {
typeAuth = '暂未开通平台VIP会员节点无法发布商品权证'
pathName = 'vipIndex'
@@ -284,14 +281,6 @@
this.chains = occData.data
this.categoryArr = occData.tasks
this.help = occData.help
console.log(occData.movement)
// occData.movement.map((val, index) => {
// val.value = index
// return val
// })
this.showCartc(occData.movement)
}).catch(err => {
uni.showToast({

View File

@@ -97,17 +97,20 @@
<no-list v-if="stores.length === 0" name='no-shop' txt="没有任何门店哦~" />
</scroll-view>
</u-popup>
<!-- 二维码展示动画效果 -->
<view class="showCode " v-if="showCode">
<view class="showCodeBg" @click="showCode = false"></view>
<view :class="['showCodeContent', showCode?'showCodeContentSelect':'showCodeContentSelectNo']">
<view class="showCodeTitle">提货二维码</view>
<image :src="showCodeImg" mode="widthFix"></image>
<view class="outTime">
<uni-countdown class="outTime-down" color="#8b64fd" splitorColor="#8b64fd" :showDay="false" :showHour="false" :minute="codeOutTime" @timeup="onTimeUp">
<template #PromptText>后过期</template>
</uni-countdown>
</view>
<view class="showCodeDes">此码请小心保管,丢失或被用不退不换</view>
</view>
</view>
<!-- <u-toast ref="uToast" /> -->
<u-toast ref="uToast" />
</view>
@@ -147,7 +150,8 @@
store_Name: '', // 门店名称
qty: 1,
showCode:false,
showCodeImg:'',
showCodeImg: '',
codeOutTime: '',
loaded:false
};
},
@@ -168,6 +172,7 @@
methods: {
getInfo(symbol) {
mallWarrantsList(symbol).then(res => {
this.codeOutTime = res.validity
this.account = res.account
this.address = res.address
this.addresses = res.addresses
@@ -268,8 +273,19 @@
}
})
},
// 倒计时
onTimeUp(e){
uni.showModal({
title: '提示',
content: '二维码已过期,请重新获取',
showCancel: false,
success: res => {
this.showCodeImg = ''
this.showCode = false
}
})
}
}
}
</script>
@@ -719,7 +735,8 @@
align-items: center;
justify-content: center;
box-sizing: border-box;
padding: 30rpx;
padding: 70rpx 30rpx;
margin-bottom: 10vh;
position: relative;
z-index: 199;
@@ -738,6 +755,14 @@
color: gray;
font-size: 24rpx;
}
.outTime{
padding: $padding 0 0;
.outTime-down{
color: $text-price;
font-size: 32rpx;
}
}
}
@keyframes sk-foldCubeAngle {