mkm/nk-shop2.0
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

缴纳保证金页面修改

Browse Source
This commit is contained in:
jia 2023-09-27 10:48:14 +08:00
parent 2427899247
commit 922ba1b054
3 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
pages/margin/margin.vue
View File

@ -9,7 +9,7 @@
<text>{{merchant_Data.paid_margin}}</text> <text>{{merchant_Data.paid_margin}}</text>
</view> </view>
<view class="item"> <view class="item">
<text>未缴纳保证金</text> <text>剩余缴纳保证金</text>
<text>{{merchant_Data.unpaid_margin}}</text> <text>{{merchant_Data.unpaid_margin}}</text>
</view> </view>
<view class="item"> <view class="item">
@ -34,12 +34,13 @@
<view class="content-order" v-for="(item,i ) in productList"> <view class="content-order" v-for="(item,i ) in productList">
<view class="">订单编号：{{item.order_sn}}</view> <view class="">订单编号：{{item.order_sn}}</view>
<view class="">支付金额：{{item.total_price}}</view> <view class="">支付金额：{{item.total_price}}</view>
<view class="">支付状态：{{item.pay_type==1?'已支付':'待支付'}}</view> <view class="">支付状态：{{item.paid==1?'已支付':'待支付'}}</view>
<view class="">支付时间：{{item.pay_time}}</view> <view class="">支付时间：{{item.pay_time}}</view>
</view> </view>
<view class='loadingicon acea-row row-center-wrapper' v-if='productList.length > 0'> <view class='loadingicon acea-row row-center-wrapper' v-if='productList.length > 0'>
<text class='loading iconfont icon-jiazai' :hidden='loading==false'></text>{{loadTitle}} <text class='loading iconfont icon-jiazai' :hidden='loading==false'></text>{{loadTitle}}
</view> </view>
</view> </view>
</template> </template>
@ -97,7 +98,7 @@
that.$set(that, 'productList', productList); that.$set(that, 'productList', productList);
}, 500) }, 500)
// console.log(that.productList)
that.$set(that.where, 'page', that.where.page + 1); that.$set(that.where, 'page', that.where.page + 1);
if (that.where.page == 1 && res.data.list.length <= 0) that.emptyShow = true if (that.where.page == 1 && res.data.list.length <= 0) that.emptyShow = true
}).catch(err => { }).catch(err => {
@ -125,32 +126,28 @@
uni.showModal({ uni.showModal({
title: '提示', title: '提示',
content: '商户' + this.merchant_Data.mer_name + '是否同意缴纳保证金', content: '商户' + this.merchant_Data.mer_name + '是否同意缴纳保证金',
success: function(res) { success: (res) => {
if (res.confirm) { if (res.confirm) {
// console.log('用户点击确定'); // console.log('用户点击确定');
paymerchant().then((res) => { paymerchant().then((res) => {
uni.requestPayment({ uni.requestPayment({
provider: 'wxpay', provider: 'wxpay',
orderInfo: res.data orderInfo: res.data
.config, //微信、支付宝订单数据 【注意微信的订单信息，键值应该全部是小写，不能采用驼峰命名】 .config, //微信、支付宝订单数据 【注意微信的订单信息，键值应该全部是小写，不能采用驼峰命名】
success: function(res) { success: (res) => {
that.$util.Tips({ this.$util.Tips({
title: '支付成功' title: '支付成功'
}); });
this.decimal()
setTimeout(() => { this.list(true)
that.decimal()
that.list(true)
}, 1000)
}, },
fail: function(err) { fail: (err) => {
this.$util.Tips({
that.$util.Tips({
title: '支付失败' title: '支付失败'
}); });
console.log('fail:' + JSON.stringify(err)); console.log('fail:' + JSON.stringify(err));
} }
}); });

2
pages/product/list/index.vue
View File

@ -556,6 +556,7 @@
title: '下架成功', title: '下架成功',
icon: 'none' icon: 'none'
}) })
that.getList(this.mer_id,false)
} else if (res.cancel) { } else if (res.cancel) {
// console.log('用户点击取消'); // console.log('用户点击取消');
} }
@ -576,6 +577,7 @@
icon: 'success' icon: 'success'
}, () => { }, () => {
that.$set(item, 'is_show', item.is_show == 0 ? 1 : 0); that.$set(item, 'is_show', item.is_show == 0 ? 1 : 0);
that.getList(this.mer_id,false)
}); });
}).catch(err => { }).catch(err => {
return that.$util.Tips({ return that.$util.Tips({

3
pages/supply_chains/supply_chains.vue
View File

@ -268,6 +268,9 @@
}) })
}, },
onShow(){
this.list(true,this.street_id);
},
onReachBottom() { onReachBottom() {
if (this.productList.length > 0) { if (this.productList.length > 0) {
setTimeout(() => { setTimeout(() => {