diff --git a/pages/admin/orderDetail/indexOther.vue b/pages/admin/orderDetail/indexOther.vue
index 2c638c7..0747029 100644
--- a/pages/admin/orderDetail/indexOther.vue
+++ b/pages/admin/orderDetail/indexOther.vue
@@ -64,6 +64,10 @@
共{{ orderInfo.total_num }}件商品，应支付
￥{{ orderInfo.pay_price }} ( 邮费 ¥{{orderInfo.pay_postage}})
-->
+
+ 共{{ orderInfo.total_num }}件商品，总计
+ ￥{{ orderInfo.pay_price }}
+
订单编号：
diff --git a/pages/admin/orderList/indexOther.vue b/pages/admin/orderList/indexOther.vue
index f92eafe..828c327 100644
--- a/pages/admin/orderList/indexOther.vue
+++ b/pages/admin/orderList/indexOther.vue
@@ -138,13 +138,13 @@
-
+ 总计: ￥{{ item.pay_price }}
+
先货后款
@@ -152,7 +152,7 @@
已
支付
￥0.00 (邮费 ¥{{ item.pay_postage}})
- -->
+
共{{item.total_num}}件商品，结算周期到期后付款￥{{ item.pay_price }}
diff --git a/pages/order_details/indexOther.vue b/pages/order_details/indexOther.vue
index 8d5924a..f494a15 100644
--- a/pages/order_details/indexOther.vue
+++ b/pages/order_details/indexOther.vue
@@ -219,47 +219,82 @@
-
-
- 订单编号：
- {{orderInfo.order_sn}}
-
- 复制
-
-
- 复制
-
-
-
-
- 下单时间：
- {{orderInfo.create_time}}
-
-
- 支付状态：
-
-
-
- 支付时间：
-
-
-
- 商品总额：
- ￥{{orderInfo.total_price}}
-
-
- 支付方式：
- 余额支付
- 支付宝支付
- 微信支付
- 先货后款
-
-
- 买家留言：
- {{orderInfo.mark}}
-
+
+
+
+ 收款公司：
+ {{orderInfo.order_extend.bank_info.company_name}}
+
+
+ 对公账户：
+ {{orderInfo.order_extend.bank_info.corporate_account}}
+
+ 复制
+
+
+ 复制
+
+
+
+
+ 开户行：
+ {{orderInfo.order_extend.bank_info.corporate_bank}}
+
+
+ 开户行地址：
+ {{orderInfo.order_extend.bank_info.corporate_bank_address}}
+
+
+
+
+ 收款凭证：
+
+
+
+
+
+
+
+ 订单编号：
+ {{orderInfo.order_sn}}
+
+ 复制
+
+
+ 复制
+
+
+
+
+ 下单时间：
+ {{orderInfo.create_time}}
+
+
+ 支付状态：
+
+
+
+ 支付时间：
+
+
+
+ 商品总额：
+ ￥{{orderInfo.total_price}}
+
+
+ 支付方式：
+ 余额支付
+ 支付宝支付
+ 微信支付
+ 先货后款
+
+
+ 买家留言：
+ {{orderInfo.mark}}
+
+
{
uni.hideLoading();
-
+ res.data.orderProduct[0].cart_info.productAttr.price = res.data.orderProduct[0].cart_info.productAttr.procure_price;
+ res.data.orderProduct[0].cart_info.product.price = res.data.orderProduct[0].cart_info.productAttr.procure_price;
that.$set(that, 'orderInfo', res.data);
that.orderInfo.take = res.data.take;
that.$set(that, 'cartInfo', res.data.orderProduct);
@@ -934,11 +970,11 @@
* 剪切订单号
*/
// #ifndef H5
- copy: function() {
+ copy: function(str) {
let that = this;
// console.log(that.orderInfo.order_sn)
uni.setClipboardData({
- data: that.orderInfo.order_sn,
+ data: str,
success: function(res) {}
});
@@ -1373,7 +1409,7 @@
.order-details .wrapper {
background: #FFFFFF;
- border-radius: 21rpx 21rpx 21rpx 21rpx;
+ // border-radius: 21rpx 21rpx 21rpx 21rpx;
margin-top: 12rpx;
padding: 30rpx;
}
diff --git a/pages/users/embody/embody.vue b/pages/users/embody/embody.vue
index 64f94e0..5c35731 100644
--- a/pages/users/embody/embody.vue
+++ b/pages/users/embody/embody.vue
@@ -25,23 +25,32 @@
-->
+
+ 公司名称
+
+ {{mode.mer_name}}
+
+
+
- 卡号
- 对公账号
+
- 银行
+ 开户行
-
+
+
- 支行信息
- 开户行地址
+
@@ -286,10 +295,12 @@
async getApply() {
try {
const res = await getAdminApplyAPI(this.merId)
- this.mode.real_name = res.data.financial_bank_name
+ // this.mode.real_name = res.data.financial_bank_name
+ this.mode.real_name = res.data.mer_name
this.mode.bank_code = res.data.financial_bank_code
this.mode.bank_name = res.data.financial_bank_bank
- this.mode.bank_address = res.data.financial_bank_branch
+ this.mode.bank_address = res.data.financial_bank_opening
+ this.mode.mer_name = res.data.mer_name
this.extract_money=res.data.extract_money
this.lock_money = res.data.lock_money
this.ot_margin = res.data.ot_margin
@@ -394,12 +405,18 @@
value.source = this.source
if (that.load) return;
if (that.currentTab == 0) { //银行卡
- if (value.real_name.length == 0) return this.$util.Tips({
- title: '请填写持卡人姓名'
- });
+ // if (value.real_name.length == 0) return this.$util.Tips({
+ // title: '请填写持卡人姓名'
+ // });
if (value.bank_code.length == 0) return this.$util.Tips({
- title: '请填写卡号'
+ title: '请填写对公账号'
});
+ if (!this.mode.bank_name) return this.$util.Tips({
+ title: '请填写开户行'
+ });
+ if (!this.mode.bank_address) return this.$util.Tips({
+ title: '请填写开户地址'
+ });
// if (that.index == 0) return this.$util.Tips({
// title: "请选择银行"
// });
@@ -442,7 +459,7 @@
// console.log(value)
// 提交提现方式
const mode = {
- financial_bank_name: value.real_name,
+ financial_bank_name: this.mode.mer_name,
financial_bank_bank: value.bank_name,
financial_bank_code: value.bank_code,
extract_money: value.extract_price,
@@ -664,7 +681,7 @@
}
.cash-withdrawal .wrapper .list .item .name {
- width: 130rpx;
+ width: 180rpx;
}
.cash-withdrawal .wrapper .list .item .input {
diff --git a/pages/users/order_list/indexOther.vue b/pages/users/order_list/indexOther.vue
index 0e723d8..4fb0c33 100644
--- a/pages/users/order_list/indexOther.vue
+++ b/pages/users/order_list/indexOther.vue
@@ -23,10 +23,10 @@
全部
{{orderData.orderCount+len || 0}}
-
+
待发货
{{orderData.noPostage || 0}}
@@ -655,43 +655,13 @@
* 去订单详情
*/
goOrderDetails: function(order_id, item) {
-
-
let self = this
if (!order_id) return that.$util.Tips({
title: '缺少订单号无法查看订单详情'
});
- // #ifdef MP
- uni.showLoading({
- title: '正在加载',
+ uni.navigateTo({
+ url: `/pages/order_details/indexOther?order_id=${order_id}`
})
- console.log(self.orderStatus)
- openOrderSubscribe().then(() => {
- uni.hideLoading();
- if (self.orderStatus == 0||(item&&item.order_status==1)) {
- uni.navigateTo({
- url: `/pages/order_details/stay?order_id=${item.group_order_id}&product_type=${this.product_type}`
- })
- } else {
- uni.navigateTo({
- url: `/pages/order_details/indexOther?order_id=${order_id}`
- })
- }
- }).catch(() => {
- uni.hideLoading();
- })
- // #endif
- // #ifndef MP
- if (self.orderStatus == 0||(item&&item.order_status==1)) {
- uni.navigateTo({
- url: `/pages/order_details/stay?order_id=${item.group_order_id}&product_type=${this.product_type}`
- })
- } else {
- uni.navigateTo({
- url: `/pages/order_details/indexOther?order_id=${order_id}`
- })
- }
- // #endif
},
/**
* 提示