diff --git a/pages/order_details/index.vue b/pages/order_details/index.vue
index 2d7372e..e21e7d2 100644
--- a/pages/order_details/index.vue
+++ b/pages/order_details/index.vue
@@ -220,6 +220,8 @@
支付宝支付
微信支付
+ 先货后款
买家留言:
diff --git a/pages/order_details/stay.vue b/pages/order_details/stay.vue
index e9a6168..e477d14 100644
--- a/pages/order_details/stay.vue
+++ b/pages/order_details/stay.vue
@@ -131,9 +131,14 @@
商品总额:
¥{{orderInfo.total_price}}
-
+
支付方式:
- 先货后款
+ 余额支付
+ 支付宝支付
+ 微信支付
+ 先货后款
@@ -161,14 +166,14 @@
实付款:
- 先货后款 : ¥{{orderInfo.pay_price}}
- ¥{{orderInfo.pay_price}}
-
- 结算周期到期后付款 ¥{{orderInfo.pay_price}}
+ 先货后款 : ¥{{orderInfo.pay_price}}
+ ¥{{orderInfo.pay_price}}
+
+ 结算周期到期后付款 ¥{{orderInfo.interest.total_amount}}
-
- 结算周期:30天 日利率:0.05%
+
+ 结算周期:{{orderInfo.orderList[0].merchant.settle_cycle}}天 日利率:{{orderInfo.orderList[0].merchant.interest_rate}}%
@@ -283,7 +288,7 @@
}
},
computed: configMap({hide_mer_status:0,alipay_open:0,yue_pay_status:0},
- mapGetters(['isLogin','uid','viewColor','keyColor'])),
+ mapGetters(['isLogin','uid','viewColor','keyColor',])),
onLoad: function(options) {
this.credit_buy=options.credit_buy
if(options.product_type)this.product_type=options.product_type
@@ -446,6 +451,7 @@
let _type = 0;
uni.hideLoading();
that.$set(that, 'orderInfo', res.data);
+ console.log(that.orderInfo.orderList[0].merchant.settle_cycle);
}).catch(err => {
// console.log(err)
uni.hideLoading();
diff --git a/pages/product/list/index.vue b/pages/product/list/index.vue
index ec4aeb9..a1e50ed 100644
--- a/pages/product/list/index.vue
+++ b/pages/product/list/index.vue
@@ -52,6 +52,11 @@
规格模板
+
+
+ 商品导入
+
@@ -230,7 +235,20 @@
this.on_line = action
console.log(this.on_line);
this.checkboxList1 = rowId
- this.show = true
+
+ if(!this.checkboxList1[0].sku && action == 0){
+ navigateTo(1, '/pages/users/online_warehousing/index', {
+ mer_id: this.mer_id,
+ product_id: this.data.product_id,
+ unique: this.data.unique,
+
+ });
+ }else{
+ this.data.product_id = this.checkboxList1[0].product_id
+ this.data.unique = this.checkboxList1[0].unique
+ this.show = true
+ console.log(this.data);
+ }
},
close() {
@@ -245,6 +263,11 @@
this.$util.Tips({
title: res.message
})
+ }).catch(err=>{
+ this.show=false
+ this.$util.Tips({
+ title: err.message
+ })
})
}
if (this.on_line == 0) {
diff --git a/pages/users/order_confirm/index.vue b/pages/users/order_confirm/index.vue
index e9cfb69..f3f5c64 100644
--- a/pages/users/order_confirm/index.vue
+++ b/pages/users/order_confirm/index.vue
@@ -1,2543 +1,2534 @@
-
-
-
-
-
- {{addressInfo.real_name}}
- {{addressInfo.phone}}
-
-
- [默认]{{addressInfo.province}}{{addressInfo.city}}{{addressInfo.district}}{{addressInfo.street || ''}}{{addressInfo.detail}}
-
-
-
- 设置收货地址
-
-
-
-
-
-
-
-
-
-
-
-
- {{item.mer_name}}
-
-
-
-
-
-
-
-
-
- 预售{{goods.productPresell.store_name}}
-
- {{goods.productAttr.sku}}
-
- ¥{{goods.productPresellAttr.presell_price}}
- X{{goods.cart_num}}
-
- 发货时间:
-
- {{goods.productPresell.delivery_type === 1 ? '支付后' : '预售结束后'}}{{ goods.productPresell.delivery_day }}天内
-
- {{ goods.productPresell.delivery_type === 1 ? '付尾款后' : '预售结束后' }}{{ goods.productPresell.delivery_day }}天内
-
-
-
- 此商品不支持该区域配送
-
-
-
-
-
-
- 定金
- ¥{{ (goods.productPresellAttr.down_price * goods.cart_num).toFixed(2) }}
-
-
- 尾款
- ¥{{ (goods.productPresellAttr.final_price * goods.cart_num).toFixed(2) }}
-
-
- {{ goods.productPresell.final_start_time | filterDay}}开始支付尾款
-
-
-
-
-
-
-
-
-
-
- {{goods.product.store_name}}
- {{goods.productAttr.sku}}
-
-
-
- ¥{{goods.productAssistAttr.assist_price}}
-
-
- ¥{{goods.activeSku.active_price}}
-
-
- ¥{{goods.productAttr.price}}
-
- X{{goods.cart_num}}
-
-
-
-
-
- 不支持快递
- 不支持到店核销
-
+
+
+
+
+
+ {{addressInfo.real_name}}
+ {{addressInfo.phone}}
+
+
+ [默认]{{addressInfo.province}}{{addressInfo.city}}{{addressInfo.district}}{{addressInfo.street || ''}}{{addressInfo.detail}}
+
+
+
+ 设置收货地址
+
+
+
+
+
+
+
+
+
+
+
+
+ {{item.mer_name}}
+
+
+
+
+
+
+
+
+
+ 预售{{goods.productPresell.store_name}}
+
+ {{goods.productAttr.sku}}
+
+ ¥{{goods.productPresellAttr.presell_price}}
+ X{{goods.cart_num}}
+
+ 发货时间:
+
+ {{goods.productPresell.delivery_type === 1 ? '支付后' : '预售结束后'}}{{ goods.productPresell.delivery_day }}天内
+
+ {{ goods.productPresell.delivery_type === 1 ? '付尾款后' : '预售结束后' }}{{ goods.productPresell.delivery_day }}天内
+
+
+
+ 此商品不支持该区域配送
+
+
+
+
+
+
+ 定金
+ ¥{{ (goods.productPresellAttr.down_price * goods.cart_num).toFixed(2) }}
+
+
+ 尾款
+ ¥{{ (goods.productPresellAttr.final_price * goods.cart_num).toFixed(2) }}
+
+
+ {{ goods.productPresell.final_start_time | filterDay}}开始支付尾款
+
+
+
+
+
+
+
+
+
+
+ {{goods.product.store_name}}
+ {{goods.productAttr.sku}}
+
+
+
+ ¥{{goods.productAssistAttr.assist_price}}
+
+
+ ¥{{goods.activeSku.active_price}}
+
+
+ ¥{{goods.productAttr.price}}
+
+ X{{goods.cart_num}}
+
+
+
+
+
+ 不支持快递
+ 不支持到店核销
+
-
-
-
- 此商品不支持该区域配送
-
-
-
-
-
-
-
-
- 配送方式
-
- {{item.order.isTake==0 ? deliveryName :'到店核销'}}
-
-
-
- {{item.order.isTake==0 ? deliveryName :'到店核销'}}
-
-
-
- {{item.take.mer_take_name}}
- {{item.take.mer_take_address}}
-
-
- 查看地图
-
-
-
-
- 快递费用 (尾款阶段)
-
- +¥{{item.order.postage_price}}
-
- 免运费
-
-
- 店铺优惠券
-
-
- 优惠¥{{item.order.coupon_price}}
- 暂未选择优惠券
-
-
-
-
- 暂无优惠券
-
-
-
- 开具发票
-
- {{(item.invoiceData && item.invoiceData.receipt_title) ? item.invoiceData.receipt_title : '不开发票'}}
-
-
-
-
-
-
- 我已同意定金不退等预售协议
-
-
-
-
- 备注信息
-
-
-
- 共{{item.order.total_num}}件 小计
- ¥{{ item.order.pay_price }}
- ¥{{ item.order.org_price}}
-
-
-
- 实付
- ¥0.00
-
-
-
-
-
-
-
-
-
-
-
- {{agrementTtile}}
-
-
-
-
-
-
-
-
-
-
-
- 支付方式
-
-
-
-
-
- {{item.name}}
-
-
- {{item.title}}
-
- {{userInfo.now_money}}
-
-
-
-
-
-
-
-
- {{item.name}}
-
-
- {{item.title}}
-
- {{userInfo.now_money}}
-
-
-
-
-
-
-
-
-
- 商品总价:
- ¥{{proPrice}}
-
-
- 运费:
- ¥{{couponData.order_total_postage}}
-
-
- 店铺优惠金额:
- -¥{{coupon_price}}
-
-
- 积分抵扣:
-
- 当前积分{{userInfo.integral}}
- 使用了{{integral_count}}个积分,抵扣{{integral_price}}元
-
-
-
-
-
-
- 平台优惠券
-
-
- 优惠¥{{total_platform_coupon_price}}
- 暂未选择优惠券
-
-
-
-
- 暂无优惠券
-
-
-
- 运费:
- +¥{{priceGroup.storePostage}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+ 此商品不支持该区域配送
+
+
+
+
+
+
+
+
+ 配送方式
+
+ {{item.order.isTake==0 ? deliveryName :'到店核销'}}
+
+
+
+ {{item.order.isTake==0 ? deliveryName :'到店核销'}}
+
+
+
+ {{item.take.mer_take_name}}
+ {{item.take.mer_take_address}}
+
+
+ 查看地图
+
+
+
+
+ 快递费用 (尾款阶段)
+
+ +¥{{item.order.postage_price}}
+
+ 免运费
+
+
+ 店铺优惠券
+
+
+ 优惠¥{{item.order.coupon_price}}
+ 暂未选择优惠券
+
+
+
+
+ 暂无优惠券
+
+
+
+ 开具发票
+
+ {{(item.invoiceData && item.invoiceData.receipt_title) ? item.invoiceData.receipt_title : '不开发票'}}
+
+
+
+
+
+
+ 我已同意定金不退等预售协议
+
+
+
+
+ 备注信息
+
+
+
+ 共{{item.order.total_num}}件 小计
+ ¥{{ item.order.pay_price }}
+ ¥{{ item.order.org_price}}
+
+
+
+ 实付
+ ¥0.00
+
+
+
+
+
+
+
+
+
+
+
+ {{agrementTtile}}
+
+
+
+
+
+
+
+
+
+
+
+ 支付方式
+
+
+
+
+
+ {{item.name}}
+
+
+ {{item.title}}
+
+ {{userInfo.now_money}}
+
+
+
+
+
+
+
+
+ {{item.name}}
+
+
+ {{item.title}}
+
+ {{userInfo.now_money}}
+
+
+
+
+
+
+
+
+
+ 商品总价:
+ ¥{{proPrice}}
+
+
+ 运费:
+ ¥{{couponData.order_total_postage}}
+
+
+ 店铺优惠金额:
+ -¥{{coupon_price}}
+
+
+ 积分抵扣:
+
+ 当前积分{{userInfo.integral}}
+ 使用了{{integral_count}}个积分,抵扣{{integral_price}}元
+
+
+
+
+
+
+ 平台优惠券
+
+
+ 优惠¥{{total_platform_coupon_price}}
+ 暂未选择优惠券
+
+
+
+
+ 暂无优惠券
+
+
+
+ 运费:
+ +¥{{priceGroup.storePostage}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/users/order_list/index.vue b/pages/users/order_list/index.vue
index c7ee358..f554a54 100644
--- a/pages/users/order_list/index.vue
+++ b/pages/users/order_list/index.vue
@@ -144,8 +144,8 @@
共{{item.orderNum || 0}}件商品,总金额
¥{{item.pay_price}}
-
- 共{{item.total_num || 0}}件商品,结算周期到期后付款¥{{item.pay_price}}
+
+ 共{{item.total_num || 0}}件商品,结算周期到期后付款¥{{item.interest.total_amount}}
@@ -673,9 +673,9 @@
}).then(res => {
console.log(res);
that.isReady = true;
- let list = res.data.list || [];
+ let list = res.data.return || [];
let loadend = list.length < that.limit;
- // console.log(that.orderList)
+ console.log(that.orderList)
that.orderList = that.page == 1 ? list : that.$util.SplitArray(list, that
.orderList);
that.$set(that, 'orderList', that.orderList);
diff --git a/static/images/daoru.png b/static/images/daoru.png
new file mode 100644
index 0000000..e3a669e
Binary files /dev/null and b/static/images/daoru.png differ