diff --git a/pages/order_details/stay.vue b/pages/order_details/stay.vue
index ae1e42b..9f947ae 100644
--- a/pages/order_details/stay.vue
+++ b/pages/order_details/stay.vue
@@ -1,1089 +1,1195 @@
-
-
-
-
-
-
-
- 待付款
- 待发货
- 待收货
- 待评价
- 已完成
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{orderInfo.real_name}}{{orderInfo.user_phone}}
- {{orderInfo.user_address}}
-
-
-
-
-
-
-
- {{item.merchant.mer_name}}
-
-
-
-
-
-
-
- 预售{{goods.cart_info.product.store_name}}
- {{goods.cart_info.productAttr.sku}}
- 发货时间：
-
- {{ goods.cart_info.productPresell.delivery_type === 1 ? '支付成功后' : '预售结束后' }}{{ goods.cart_info.productPresell.delivery_day }}天内
-
- {{ goods.cart_info.productPresell.delivery_type === 1 ? '支付尾款后' : '预售结束后' }}{{ goods.cart_info.productPresell.delivery_day }}天内
-
-
- ￥{{goods.cart_info.productPresellAttr.presell_price}}x{{goods.product_num}}
-
- 立即付款
-
-
-
-
- 阶段一： 等待买家付款
- 商品定金 ￥{{ item.pay_price }}
- 定金需付款￥{{ item.pay_price }}
-
-
- 阶段二： 未开始
- 商品尾款 ￥{{ item.presellOrder.pay_price }}
- 尾款需付款￥{{ item.presellOrder.pay_price }}
-
-
+
+
+
+
+
-
-
- 联系客服
-
-
-
-
- 订单编号：
- {{orderInfo.group_order_sn}}
-
- 复制
-
-
- 复制
-
-
-
-
- 下单时间：
- {{orderInfo.create_time || 0}}
-
-
- 支付状态：
- 未支付
-
-
- 商品总额：
- ￥{{orderInfo.total_price}}
-
-
- 支付方式：
- 余额支付
- 支付宝支付
- 微信支付
- 先货后款
-
-
-
-
-
- {{index}}：
- {{item}}
-
-
-
-
-
-
-
- 运费：
- +￥{{orderInfo.pay_postage}}
-
-
- 优惠券抵扣：
- -￥{{orderInfo.coupon_price}}
-
-
- 积分抵扣：
- -￥{{orderInfo.integral_price}}
-
-
- 实付款：
- 先货后款 实付: ￥
- {{orderInfo.pay_price}}
-
- ￥{{orderInfo.pay_price}}
-
- 结算周期到期后付款 ￥{{orderInfo.interest.total_amount}}
-
-
-
- 结算周期:{{orderInfo.orderList[0].merchant.settle_cycle}}天 日利率:{{orderInfo.orderList[0].merchant.interest_rate}}%
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ {{orderInfo.add_time_y}}{{orderInfo.create_time}}
+
+
+
+
+ 待付款
+ 待发货
+ 待收货
+ 待评价
+ 已完成
+
+
+
+
+
+
+
+
+
+
+
+
+
-
- 下单时实付￥0，确认收货后将开始计算结算周期，结算周期内按照订单金额付款。如未在结算周期内付款平台将在{{this.be_overdue}}天后计息。
-
+
+
+
+
+ {{orderInfo.real_name}}{{orderInfo.user_phone}}
+ {{orderInfo.user_address}}
+
+
+
+
+
+
+
+ {{item.merchant.mer_name}}
+
+
+
+
+
+
+
+ 预售{{goods.cart_info.product.store_name}}
+ {{goods.cart_info.productAttr.sku}}
+ 发货时间：
+
+ {{ goods.cart_info.productPresell.delivery_type === 1 ? '支付成功后' : '预售结束后' }}{{ goods.cart_info.productPresell.delivery_day }}天内
+
+ {{ goods.cart_info.productPresell.delivery_type === 1 ? '支付尾款后' : '预售结束后' }}{{ goods.cart_info.productPresell.delivery_day }}天内
+
+
+ ￥{{goods.cart_info.productPresellAttr.presell_price}}x{{goods.product_num}}
+
+
+ 立即付款
+
+
+
+
+ 阶段一： 等待买家付款
+ 商品定金 ￥{{ item.pay_price }}
+ 定金需付款￥{{ item.pay_price }}
+
+
+ 阶段二： 未开始
+ 商品尾款 ￥{{ item.presellOrder.pay_price }}
+
+ 尾款需付款￥{{ item.presellOrder.pay_price }}
+
+
+
+
+
+
+
+ {{goods.cart_info.product.store_name}}
+ {{goods.cart_info.productAttr.sku}}
+ ￥{{goods.cart_info.productAttr.price}}
+
+ x{{goods.product_num}}
+
+ 立即付款
+
+
+
+
+
+
+ 联系客服
+
+
+
+
+ 订单编号：
+ {{orderInfo.group_order_sn}}
+
+ 复制
+
+
+ 复制
+
+
+
+
+ 下单时间：
+ {{orderInfo.create_time || 0}}
+
+
+ 支付状态：
+ 未支付
+
+
+ 商品总额：
+ ￥{{orderInfo.total_price}}
+
+
+ 支付方式：
+ 余额支付
+ 支付宝支付
+ 微信支付
+
+ 先货后款
+
+
+
+
+
+ {{index}}：
+ {{item}}
+
+
+
+
+
+
+
+
+ 运费：
+ +￥{{orderInfo.pay_postage}}
+
+
+ 优惠券抵扣：
+ -￥{{orderInfo.coupon_price}}
+
+
+ 积分抵扣：
+ -￥{{orderInfo.integral_price}}
+
+
+ 实付款：
+ 先货后款 实付: ￥
+ {{orderInfo.pay_price}}
+
+ ￥{{orderInfo.pay_price}}
+
+ 结算周期到期后付款 ￥{{orderInfo.interest.total_amount}}
+
+
+
+ 结算周期:{{orderInfo.orderList[0].merchant.settle_cycle}}天
+ 日利率:{{orderInfo.orderList[0].merchant.interest_rate}}%
+
+
+
+
+
+
-
-
+
+
+
+
+
+
+
+
+
+ 下单时实付￥0，确认收货后将开始计算结算周期，结算周期内按照订单金额付款。如未在结算周期内付款平台将在{{this.be_overdue}}天后计息。
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/product/list/index.vue b/pages/product/list/index.vue
index a1e50ed..20401ef 100644
--- a/pages/product/list/index.vue
+++ b/pages/product/list/index.vue
@@ -207,7 +207,7 @@
data: {
product_id: '',
unique: "",
- number: ''
+ number: 1
},
on_line: ''
}
@@ -256,19 +256,27 @@
},
//导入
creat() {
+
if (this.on_line == 1) {
- postImport(this.mer_id, this.data).then(res => {
- console.log(res);
- this.show = false
+ if(this.data.number <1){
+ this.show=false
this.$util.Tips({
- title: res.message
+ title: '入库数量不得小于一件'
+ })
+ }else{
+ postImport(this.mer_id, this.data).then(res => {
+ console.log(res);
+ this.show = false
+ this.$util.Tips({
+ title: res.message
+ })
+ }).catch(err=>{
+ this.show=false
+ this.$util.Tips({
+ title: err.message
+ })
})
- }).catch(err=>{
- this.show=false
- this.$util.Tips({
- title: err.message
- })
- })
+ }
}
if (this.on_line == 0) {
console.log('12');
@@ -722,6 +730,7 @@
width: 100%;
margin: auto;
padding: 10px;
+ z-index: 0;
h4 {
font-weight: 400;
diff --git a/pages/users/online_warehousing/index.vue b/pages/users/online_warehousing/index.vue
index 4e4d7ca..bc41dfa 100644
--- a/pages/users/online_warehousing/index.vue
+++ b/pages/users/online_warehousing/index.vue
@@ -3,7 +3,7 @@
-
+
暂无商品订单~
diff --git a/pages/users/order_list/index.vue b/pages/users/order_list/index.vue
index 2a3ea6a..1a02bb2 100644
--- a/pages/users/order_list/index.vue
+++ b/pages/users/order_list/index.vue
@@ -1,1179 +1,1187 @@
-
-
-
-
-
- 搜索我的订单
-
-
-
- 全部
- {{orderData.all || 0}}
-
-
- 待付款
- {{orderData.noPay || 0}}
-
-
- 待发货
- {{orderData.noPostage || 0}}
-
-
- 待收货
- {{orderData.noDeliver || 0}}
-
-
- 待评价
- {{orderData.noComment || 0}}
-
-
-
-
-
-
- 预售尾款订单转到这里了！
- 有 {{ presellOrderCount }} 笔预售尾款订单待付款，请点击查看
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{item.group_order_sn}}
-
-
- {{ item.orderList[0].activity_type === 2 && item.orderList[0].orderProduct[0].cart_info.productPresell.presell_type ==2 ? "待付定金" : "待付款" }}
-
-
-
-
-
-
-
-
-
-
-
-
-
- 预售{{goods.cart_info.product.store_name}}
- 发货时间：
-
-
- {{ goods.cart_info.productPresell.delivery_type === 1 ? '支付成功后' : '预售结束后' }}{{ goods.cart_info.productPresell.delivery_day }}天内
-
-
- {{ goods.cart_info.productPresell.delivery_type === 1 ? '支付尾款后' : '预售结束后' }}{{ goods.cart_info.productPresell.delivery_day }}天内
-
-
-
- ￥{{goods.cart_info.productPresellAttr.presell_price}}
-
- x{{goods.product_num}}
-
-
-
- 定金待支付 ￥{{ order.pay_price }}
- 尾款待支付 ￥{{ order.presellOrder.pay_price }}
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+ 搜索我的订单
+
+
+
+ 全部
+ {{orderData.all || 0}}
+
+
+ 待付款
+ {{orderData.noPay || 0}}
+
+
+ 待发货
+ {{orderData.noPostage || 0}}
+
+
+ 待收货
+ {{orderData.noDeliver || 0}}
+
+
+ 待评价
+ {{orderData.noComment || 0}}
+
+
+
+
+
+
+ 预售尾款订单转到这里了！
+ 有 {{ presellOrderCount }} 笔预售尾款订单待付款，请点击查看
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{item.group_order_sn}}
+
+
+ {{item.pay_type == 3 ? "待付款" : "待结算" }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 预售{{goods.cart_info.product.store_name}}
+ 发货时间：
+
+
+ {{ goods.cart_info.productPresell.delivery_type === 1 ? '支付成功后' : '预售结束后' }}{{ goods.cart_info.productPresell.delivery_day }}天内
+
+
+ {{ goods.cart_info.productPresell.delivery_type === 1 ? '支付尾款后' : '预售结束后' }}{{ goods.cart_info.productPresell.delivery_day }}天内
+
+
+
+ ￥{{goods.cart_info.productPresellAttr.presell_price}}
+
+ x{{goods.product_num}}
+
+
+
+ 定金待支付 ￥{{ order.pay_price }}
+ 尾款待支付 ￥{{ order.presellOrder.pay_price }}
+
+
+
+
+
+
+
+
+
+
+
+
- {{goods.cart_info.product.store_name}}
-
+ {{goods.cart_info.product.store_name}}
+
-
-
- ￥{{goods.cart_info.activeSku.active_price}}
- x{{goods.product_num}}
-
-
- ￥{{goods.cart_info.productAttr.price}}
- x{{goods.product_num}}
-
-
-
-
-
-
-
- 共{{item.total_num || 0}}件商品，总金额
- ￥{{item.pay_price}}
-
+
+
+ ￥{{goods.cart_info.activeSku.active_price}}
+ x{{goods.product_num}}
+
+
+ ￥{{goods.cart_info.productAttr.price}}
+ x{{goods.product_num}}
+
+
+
+
+
+
+
+ 共{{item.total_num || 0}}件商品，总金额
+ ￥{{item.pay_price}}
+
共{{item.orderNum || 0}}件商品，总金额
- ￥{{item.pay_price}}
+ ￥{{item.pay_price}}
-
- 共{{item.total_num || 0}}件商品，结算周期到期后付款￥{{item.interest.total_amount}}
+
+ 共{{item.total_num || 0}}件商品，结算周期到期后付款￥{{item.interest.total_amount}}
-
-
- 立即付款
-
-
-
-
-
-
-
-
-
-
-
- {{item.merchant.mer_name}}
-
-
-
- {{item.takeOrderCount > 0 ? '部分核销' : '待核销'}}
- 待发货
-
- 待收货
- 待评价
- 已完成
- 已退款
-
-
-
-
-
-
-
-
-
-
- 预售{{goods.cart_info.product.store_name}}
- 发货时间：
-
- {{ goods.cart_info.productPresell.delivery_type === 1 ? '支付成功后' : '预售结束后' }}{{ goods.cart_info.productPresell.delivery_day }}天内
-
- {{ goods.cart_info.productPresell.delivery_type === 1 ? '支付尾款后' : '预售结束后' }}{{ goods.cart_info.productPresell.delivery_day }}天内
-
-
-
- {{goods.is_refund==1?'退款中':goods.is_refund==2?'部分退款':goods.is_refund==3?'全部退款':''}}
-
-
-
- ￥{{goods.cart_info.productPresellAttr.presell_price}}
- x{{goods.product_num}}
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{goods.cart_info.product.store_name}}
-
-
- {{goods.is_refund==1?'退款中':goods.is_refund==2?'部分退款':goods.is_refund==3?'全部退款':''}}
-
-
-
-
- ￥{{goods.cart_info.productAssistAttr.assist_price}}
- x{{goods.product_num}}
-
-
-
- ￥{{goods.cart_info.activeSku.active_price}}
- x{{goods.product_num}}
-
-
- ￥{{goods.cart_info.productAttr.price}}
- x{{goods.product_num}}
-
-
-
-
- 共{{item.orderNum || 0}}件商品，总金额
- ￥{{item.presell_price}}
-
-
-
- 申请开票
-
- 查看详情
-
-
- 查看物流
- 确认收货
-
-
-
- 去评价
-
-
-
-
- 查看详情
-
-
- 发布种草
-
- 再次购买
-
-
-
-
-
-
-
- {{loadTitle}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 确认收到货了吗?
- 此订单为先货后款订单，确认收货后将开始计算结算周期。为保障售后权益，请检查后再确认收货。
-
- 取消
-
-
-
+
+
+ 立即付款
+
+
+
+ 去结算
+
+
+
+
+
+
+
+
+
+
+
+ {{item.merchant.mer_name}}
+
+
+
+ {{item.takeOrderCount > 0 ? '部分核销' : '待核销'}}
+ 待发货
+
+ 待收货
+ 待评价
+ 已完成
+ 已退款
+ 待结算
+
+
+
+
+
+
+
+
+
+
+
+ 预售{{goods.cart_info.product.store_name}}
+ 发货时间：
+
+ {{ goods.cart_info.productPresell.delivery_type === 1 ? '支付成功后' : '预售结束后' }}{{ goods.cart_info.productPresell.delivery_day }}天内
+
+ {{ goods.cart_info.productPresell.delivery_type === 1 ? '支付尾款后' : '预售结束后' }}{{ goods.cart_info.productPresell.delivery_day }}天内
+
+
+
+ {{goods.is_refund==1?'退款中':goods.is_refund==2?'部分退款':goods.is_refund==3?'全部退款':''}}
+
+
+
+ ￥{{goods.cart_info.productPresellAttr.presell_price}}
+ x{{goods.product_num}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{goods.cart_info.product.store_name}}
+
+
+ {{goods.is_refund==1?'退款中':goods.is_refund==2?'部分退款':goods.is_refund==3?'全部退款':''}}
+
+
+
+
+ ￥{{goods.cart_info.productAssistAttr.assist_price}}
+ x{{goods.product_num}}
+
+
+
+ ￥{{goods.cart_info.activeSku.active_price}}
+ x{{goods.product_num}}
+
+
+ ￥{{goods.cart_info.productAttr.price}}
+ x{{goods.product_num}}
+
+
+
+
+ 共{{item.orderNum || 0}}件商品，总金额
+ ￥{{item.presell_price}}
+
+
+
+ 申请开票
+
+ 查看详情
+
+
+ 查看物流
+ 确认收货
+
+
+ 去评价
+
+
+
+ 去结算
+
+
+
+
+ 查看详情
+
+
+ 发布种草
+
+ 再次购买
+
+
+
+
+
+
+
+ {{loadTitle}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 确认收到货了吗?
+ 此订单为先货后款订单，确认收货后将开始计算结算周期。为保障售后权益，请检查后再确认收货。
+
+ 取消
+
+
+
\ No newline at end of file
diff --git a/pages/users/payment/payment.vue b/pages/users/payment/payment.vue
index 01e5485..887f01a 100644
--- a/pages/users/payment/payment.vue
+++ b/pages/users/payment/payment.vue
@@ -65,7 +65,7 @@
￥0.00
￥{{couponData.orderList[0].pay_price}}
-
+
可结算周期到期后再付款￥{{totalPrice}}
@@ -176,12 +176,14 @@
groupOrderDetail(this.order_id, this.product_type).then(res => {
this.couponData = res.data
this.$nextTick(()=>{
- this.moerTime(this.couponData.interest.start_time)
+ if(this.couponData.interest !== null){
+ this.moerTime(this.couponData.interest.start_time)
+ }
})
})
},
SubOrder() {
- if (this.product_type == 98) {
+ if (this.couponData.pay_type == 8) {
postsettle(
this.mer_id, {
id:this.order_id,