diff --git a/pages/margin/margin.vue b/pages/margin/margin.vue
index 9e9b518..3f728d6 100644
--- a/pages/margin/margin.vue
+++ b/pages/margin/margin.vue
@@ -40,7 +40,7 @@
{{loadTitle}}
-
+
@@ -98,7 +98,7 @@
that.$set(that, 'productList', productList);
}, 500)
-
+
that.$set(that.where, 'page', that.where.page + 1);
if (that.where.page == 1 && res.data.list.length <= 0) that.emptyShow = true
}).catch(err => {
@@ -112,55 +112,55 @@
merchant({
id: this.mer_id
}).then((res) => {
-
+
this.merchant_Data = res.data
});
},
//缴纳保证金
paydecimal() {
-
- let that = this
- uni.showModal({
- title: '提示',
- content: '商户' + this.merchant_Data.mer_name + '是否同意缴纳保证金',
- success: (res) => {
- if (res.confirm) {
- // console.log('用户点击确定');
- paymerchant().then((res) => {
+ let that = this
+ uni.showModal({
+ title: '提示',
+ content: '商户' + this.merchant_Data.mer_name + '是否同意缴纳保证金',
+ success: (res) => {
+ if (res.confirm) {
- 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('用户点击确定');
+ paymerchant().then((res) => {
- console.log('fail:' + JSON.stringify(err));
- }
- });
- }).catch((err) => {
- console.log(err)
- this.$util.Tips(()=>{
-
- })
- })
- } else if (res.cancel) {
- console.log('用户点击取消');
- }
+ 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)
+ that.$util.Tips({
+ title: err
+ })
+ })
+ } else if (res.cancel) {
+ console.log('用户点击取消');
}
- });
+ }
+ });
- }
+ }
}
}
diff --git a/pages/moreProject/moreProject.vue b/pages/moreProject/moreProject.vue
index 8c40e8b..2f8d435 100644
--- a/pages/moreProject/moreProject.vue
+++ b/pages/moreProject/moreProject.vue
@@ -54,6 +54,7 @@
订单管理
-->
+
@@ -83,7 +84,7 @@
订单核销
-
+
缴纳保证金
@@ -323,7 +324,7 @@
商户设置
-
+
缴纳保证金
@@ -394,7 +395,7 @@
商户设置
-
+
缴纳保证金
@@ -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
})
diff --git a/pages/nongKe/cloud_entrepot/index.vue b/pages/nongKe/cloud_entrepot/index.vue
index e6f5115..3e53155 100644
--- a/pages/nongKe/cloud_entrepot/index.vue
+++ b/pages/nongKe/cloud_entrepot/index.vue
@@ -1,1591 +1,1712 @@
-
-
-
-
-
-
-
-
-
-
+
+
+
+ {{ town }}里海云仓
+
+
+
+
+
+
+
+
+
+
-
- {{town}}里海云仓
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-
-
-
-
- {{town}}里海云仓
-
-
+
+ {{ town }}里海云仓
+
+
-
-
-
-
- 搜索
-
-
-
-
-
-
-
-
-
+ 搜索
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+ {{ item.tit }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ item.store_name || item.store_info }}
+
+
+
+ {{
+ item.rate
+ }}
+ {{ item.reply_count }}评论
+
+
+
+
+ ¥{{
+ item.price
+ }}
+
+ ¥30.00
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 暂无商品
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
- {{item.tit}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{item.store_name||item.store_info}}
-
-
-
- {{item.rate}}
- {{item.reply_count}}评论
-
-
-
-
- ¥{{item.price}}
-
-
- ¥30.00
-
-
-
-
-
-
+
+ {{ goodsNum }}
+
+
+
+ ¥{{ totalMoney }}
+ 支持配送 售后无忧
+
+
+ 去结算
+
+
+
+
+
+
+
+
+
+
+
+ 里海云仓
+
+
+
+
+
+
+ {{ item.category_name }}云仓服务
+
+
+ {{ item.description }}
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 暂无商品
-
-
-
-
-
-
-
-
-
-
-
- {{goodsNum}}
-
-
-
-
- ¥{{totalMoney}}
-
-
- 支持配送 售后无忧
-
-
-
-
- 去结算
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 里海云仓
-
-
-
-
-
-
-
- {{item.category_name}}云仓服务
-
-
- {{item.description}}
-
-
-
-
-
-
-
-
-
+
+
+
+ 当前区域暂无云仓
+
+
+
+
+
+
+
-
-
- 当前区域暂无云仓
-
-
-
+
+
-
-
+
+
+
+
+ 当前区域暂无云仓
+
+
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 当前区域暂无云仓
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{skuform.store_info}}
-
-
-
- ¥ {{skuform.price}}
-
-
- 库存:{{skuform.sku[this.skusize].stock}}
-
-
-
-
-
-
- 尺码
-
-
- {{item.sku}}
-
-
-
-
-
- 数量
-
-
-
-
-
-
- 确定
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ skuform.store_info }}
+
+
+ ¥ {{ skuform.price }}
+
+ 库存:{{ skuform.sku[this.skusize].stock }}
+
+
+
+
+
+ 尺码
+
+ {{ item.sku }}
+
+
+
+ 数量
+
+
+
+
+ 确定
+
+
+
+
\ No newline at end of file