This commit is contained in:
weipengfei 2023-09-28 17:03:04 +08:00
commit 25a31e754c
3 changed files with 1681 additions and 1563 deletions

View File

@ -119,48 +119,48 @@
//
paydecimal() {
let that = this
uni.showModal({
title: '提示',
content: '商户' + this.merchant_Data.mer_name + '是否同意缴纳保证金',
success: (res) => {
if (res.confirm) {
let that = this
uni.showModal({
title: '提示',
content: '商户' + this.merchant_Data.mer_name + '是否同意缴纳保证金',
success: (res) => {
if (res.confirm) {
// console.log('');
paymerchant().then((res) => {
// console.log('');
paymerchant().then((res) => {
uni.requestPayment({
provider: 'wxpay',
orderInfo: res.data
.config, //
success: (res) => {
that.$util.Tips({
title: '支付成功'
});
that.decimal()
that.list(true)
},
fail: (err) => {
that.$util.Tips({
title: '支付失败'
});
uni.requestPayment({
provider: 'wxpay',
orderInfo: res.data
.config, //
success: (res) => {
that.$util.Tips({
title: '支付成功'
});
that.decimal()
that.list(true)
},
fail: (err) => {
that.$util.Tips({
title: '支付失败'
});
console.log('fail:' + JSON.stringify(err));
}
});
}).catch((err) => {
console.log(err)
this.$util.Tips(()=>{
})
})
} else if (res.cancel) {
console.log('用户点击取消');
}
console.log('fail:' + JSON.stringify(err));
}
});
}).catch((err) => {
console.log(err)
that.$util.Tips({
title: err
})
})
} else if (res.cancel) {
console.log('用户点击取消');
}
});
}
});
}
}
}
}

View File

@ -54,6 +54,7 @@
<image class="icon_img" :src="`${prefix}ddgl.png`" mode="aspectFill"></image>
<text class="text">订单管理</text>
</view> -->
<view class="examine"
@click="navigator(`/pages/nongKe/gather/select_warehouse?mer_id=${mer_id}&stype=1`)">
<image class="icon_img" :src="`${prefix}rkgl.png`" mode="aspectFill">
@ -83,7 +84,7 @@
</image>
<text class="text">订单核销</text>
</view>
<view class="examine" @click="navigator(`/pages/margin/margin`)">
<view class="examine" @click="margin(`/pages/margin/margin`)">
<image class="icon_img" src="@/static/images/jy.png">
</image>
<text class="text">缴纳保证金</text>
@ -323,7 +324,7 @@
<text class="text">商户设置</text>
</view>
<view class="examine" @click="navigator(`/pages/margin/margin`)">
<view class="examine" @click="margin(`/pages/margin/margin`)">
<image class="icon_img" src="@/static/images/jy.png">
</image>
<text class="text">缴纳保证金</text>
@ -394,7 +395,7 @@
</image>
<text class="text">商户设置</text>
</view>
<view class="examine" @click="navigator(`/pages/margin/margin`)">
<view class="examine" @click="margin(`/pages/margin/margin`)">
<image class="icon_img" src="@/static/images/jy.png">
</image>
<text class="text">缴纳保证金</text>
@ -886,10 +887,7 @@
})
},
navigator(url, t) {
if (this.userInfoData.mer_info.mer_settlement_agree_status == 0) {
if (this.codenote.length == 0) {
this.isFshow = true
this.countDown()
@ -904,7 +902,6 @@
}
}
} else {
uni.navigateTo({
url: url
})

File diff suppressed because it is too large Load Diff