This commit is contained in:
weipengfei 2024-01-31 18:06:30 +08:00
parent 79b810f1aa
commit 97ba913d7d

View File

@ -413,7 +413,7 @@
</view> </view>
</view> </view>
<view class='settlement' :class='couponData.status != "noAddress" ? "" : "disabled"' style='z-index:100' <view class='settlement' :class='couponData.status != "noAddress" ? "" : "disabled"' style='z-index:100'
@tap="SubOrder">{{couponData.status != "noAddress" ? '提交订单':'选择地址'}}</view> @tap="openTipsRef">{{couponData.status != "noAddress" ? '提交订单':'选择地址'}}</view>
</view> </view>
</view> </view>
<block v-if="coupon.status"> <block v-if="coupon.status">
@ -442,10 +442,11 @@
<view class="r_c_text">当前订单金额已大于100元</view> <view class="r_c_text">当前订单金额已大于100元</view>
<view class="r_c_text">建议参与惠农供销活动进行购买下单满100元即可获得红包</view> <view class="r_c_text">建议参与惠农供销活动进行购买下单满100元即可获得红包</view>
<view class="r_c_btn"> <view class="r_c_btn">
<button class="r_c_btn1">继续支付</button> <button class="r_c_btn1" @click="closeAndSubOrder">继续支付</button>
<button class="r_c_btn2">前往活动</button> <button class="r_c_btn2" @click="gotoCloud">前往活动</button>
</view> </view>
</view> </view>
<image class="r_c_close" @click.stop="closeTipsRef" src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/d39b4202401311747186525.png"></image>
</view> </view>
</uni-popup> </uni-popup>
</view> </view>
@ -716,9 +717,6 @@
this.product_type = options.product_type this.product_type = options.product_type
this.seckillId = options.seckillId this.seckillId = options.seckillId
if(options.source) this.source = options.source; if(options.source) this.source = options.source;
// else this.$nextTick(()=>{
// this.$refs.tipsRef.open();
// })
// #ifdef H5 // #ifdef H5
this.from = this.$wechat.isWeixin() ? 'weixin' : 'h5' this.from = this.$wechat.isWeixin() ? 'weixin' : 'h5'
// #endif // #endif
@ -1551,7 +1549,7 @@
getTime(index) { getTime(index) {
this.virtualIndex = index; this.virtualIndex = index;
}, },
SubOrder: function(e) { SubOrder: function() {
let that = this, let that = this,
data = {}; data = {};
@ -1781,7 +1779,30 @@
// #ifdef H5 // #ifdef H5
} }
//#endif //#endif
} },
//
closeTipsRef(){
this.$refs.tipsRef.close();
},
//
openTipsRef(){
if(this.source!=103&&this.source!=105) this.$refs.tipsRef.open();
else this.SubOrder();
},
//
closeAndSubOrder(){
this.closeTipsRef();
this.$nextTick(()=>{
this.SubOrder();
})
},
//
gotoCloud(){
this.closeTipsRef();
uni.navigateTo({
url: '/pages/nongKe/cloud_entrepot/indexh'
})
}
} }
} }
</script> </script>
@ -2658,9 +2679,46 @@
top: 0; top: 0;
height: 100%; height: 100%;
width: 100%; width: 100%;
box-sizing: border-box;
padding: 120rpx 30rpx 30rpx 30rpx;
display: flex;
flex-direction: column;
justify-content: space-between;
color: #2E2E2E;
font-size: 28rpx;
.r_c_title{ .r_c_title{
font-weight: blod; font-weight: blod;
} }
.r_c_text{
font-size: 26rpx;
}
.r_c_btn{
display: flex;
justify-content: space-around;
.r_c_btn1{
background-color: transparent;
border: 5rpx solid #FF874C;
color: #FF874C;
font-size: 28rpx;
padding: 5rpx 28rpx;
border-radius: 60rpx;
}
.r_c_btn2{
background-color: #FF874C;
border: 5rpx solid #FF874C;
color: #fff;
font-size: 28rpx;
padding: 5rpx 28rpx;
border-radius: 60rpx;
}
}
}
.r_c_close{
position: absolute;
top: 0;
right: 0;
height: 60rpx;
width: 60rpx;
} }
} }
</style> </style>