diff --git a/api/order.js b/api/order.js
index a07ca27..e308479 100644
--- a/api/order.js
+++ b/api/order.js
@@ -89,8 +89,8 @@ export function integralOrderPay(id,data){
/**
* 订单统计数据
*/
-export function orderData(){
- return request.get('order/number')
+export function orderData(data){
+ return request.get('order/number',data)
}
/**
diff --git a/pages/burst/index.vue b/pages/burst/index.vue
index 83c12d8..5ad8921 100644
--- a/pages/burst/index.vue
+++ b/pages/burst/index.vue
@@ -55,7 +55,7 @@ export default{
filter_params: '',
page: 1,
limit: 30,
- is_burst:1
+ // is_burst:1
}).then(res => {
console.log(res,"-=-")
this.list = res.data.list;
diff --git a/pages/goods_details/index.vue b/pages/goods_details/index.vue
index b0262a2..a0c56c8 100644
--- a/pages/goods_details/index.vue
+++ b/pages/goods_details/index.vue
@@ -337,11 +337,11 @@
购物车
-->
-
-
@@ -584,7 +584,7 @@
max_count: 0,
min_count: 0,
pay_limit: 1,
- is_burst:null,
+ // is_burst:null,
svipData: {},
svipPrice: false,
specsInfo: {
@@ -1101,7 +1101,7 @@
that.$set(that, 'activity', res.data.activity ? res.data.activity : []);
that.$set(that, 'max_count', res.data.once_max_count);
that.$set(that, 'pay_limit', res.data.pay_limit);
- that.$set(that, 'is_burst', res.data.is_burst);
+ // that.$set(that, 'is_burst', res.data.is_burst);
that.$set(that, 'min_count', res.data.once_min_count);
that.$set(that, 'svipData', res.data.show_svip_info || null);
that.$set(that, 'svipPrice', res.data.show_svip_info && res.data.show_svip_info.show_svip_price || false);
@@ -1443,7 +1443,8 @@
Cache.set(CART_TIME,timestamp)
if (news) {
uni.navigateTo({
- url: '/pages/users/order_confirm/index?cartId=' + cartId +'&is_burst='+that.is_burst
+ // url: '/pages/users/order_confirm/index?cartId=' + cartId +'&is_burst='+that.is_burst
+ url: '/pages/users/order_confirm/index?cartId=' + cartId
});
} else {
that.$util.Tips({
@@ -1877,7 +1878,7 @@
z-index: 277;
border-top: 1px solid #f0f0f0;
&.footpl{
- padding-left: 80rpx;
+ // padding-left: 80rpx;
}
}
.product-con .footer .item {
diff --git a/pages/user/index.vue b/pages/user/index.vue
index 1955316..fe6879c 100644
--- a/pages/user/index.vue
+++ b/pages/user/index.vue
@@ -60,9 +60,9 @@
-
+
绑定手机号
diff --git a/pages/users/order_confirm/index.vue b/pages/users/order_confirm/index.vue
index 6b3d08b..b932395 100644
--- a/pages/users/order_confirm/index.vue
+++ b/pages/users/order_confirm/index.vue
@@ -342,7 +342,7 @@
-
+
订单类型
@@ -350,7 +350,7 @@
@@ -454,8 +454,8 @@
{{couponData.status != "noAddress" ? '提交订单':'选择地址'}}
- {{couponData.status != "noAddress" ? '确认寄售':'选择地址'}}
+
@@ -696,8 +696,9 @@
{id:0,name:'商品'},
{id:1,name:'积分'},
],
- orderType:1,
- is_burst:null,
+ orderType:null,
+ // is_burst:null,
+ productType:null,
};
},
computed: {
@@ -717,7 +718,7 @@
mounted: function() {
},
onLoad: function(options) {
- this.is_burst = options.is_burst
+ // this.is_burst = options.is_burst
// #ifdef H5
this.from = this.$wechat.isWeixin() ? 'weixin' : 'h5'
// #endif
@@ -1065,7 +1066,21 @@
use_integral: that.use_integral
}).then(res => {
// 默认选中
- that.is_take = false
+ that.is_take = false;
+ if(res.data.order[0]&&res.data.order[0].list[0]&&res.data.order[0].list[0].product){
+ if(res.data.order[0].list[0].product.is_retail==1){
+ // 零售
+ that.productType = 2
+ }else if(res.data.order[0].list[0].product.is_wholesale==1){
+ // 批发
+ that.productType = 1
+ }else{
+ // 普通
+ that.productType = null
+ }
+
+ }
+
res.data.order.forEach(el => {
if(el.order.isTake == 1)that.is_take = true
el.isTake = 0
@@ -1558,6 +1573,11 @@
title: '请阅读并勾选协议，否则无法进行操作'
});
}
+ if(!that.orderType){
+ return that.$util.Tips({
+ title: '请选择订单类型'
+ });
+ }
if (that.is_take) {
if(!that.post.real_name){
return that.$util.Tips({
@@ -1652,12 +1672,20 @@
receipt_data: this.invoiceData,
extend: this.extend,
post: this.post,
- gift_type:this.orderType,
- is_burst:this.is_burst,
+
+
+ // is_burst:this.is_burst,
// #ifdef H5
return_url: 'http://' + window.location.host + '/pages/users/order_list/index',
// #endif
};
+ if(this.productType==2){
+ // gift_type:this.orderType,
+ this.$set(data,'gift_type',this.orderType)
+ }
+ if(this.productType==2||this.productType==1){
+ this.$set(data,'order_type',this.productType)
+ }
if (data.mark && this.isEmojiCharacter(data.mark[Object.keys(data.mark)[0]])) {
that.$util.Tips({
title: '备注不允许输入表情！'
diff --git a/pages/users/order_list1/index.vue b/pages/users/order_list1/index.vue
index 6a19ebc..4d22499 100644
--- a/pages/users/order_list1/index.vue
+++ b/pages/users/order_list1/index.vue
@@ -404,7 +404,7 @@
*/
getOrderData: function() {
let that = this;
- orderData().then(res => {
+ orderData({order_type:1}).then(res => {
that.$set(that, 'orderData', res.data);
})
},
@@ -536,7 +536,8 @@
groupOrderList({
page: that.page,
limit: that.limit,
- is_burst:1,
+ // is_burst:1,
+ order_type:1
}).then(res => {
that.isReady = true;
let list = res.data.list || [];
@@ -555,7 +556,8 @@
status: that.orderStatus ,
page: that.page,
limit: that.limit,
- is_burst:1,
+ // is_burst:1,
+ order_type:1
}).then(res => {
let list = res.data.list || [];
let loadend = list.length < that.limit;
diff --git a/pages/users/promoter-list/index.vue b/pages/users/promoter-list/index.vue
index 2e65acb..3e0b045 100644
--- a/pages/users/promoter-list/index.vue
+++ b/pages/users/promoter-list/index.vue
@@ -10,10 +10,10 @@
-
+
diff --git a/pages/users/user_cash/index.vue b/pages/users/user_cash/index.vue
index 2e2c185..9416b3f 100644
--- a/pages/users/user_cash/index.vue
+++ b/pages/users/user_cash/index.vue
@@ -46,6 +46,10 @@
+
+ 提现手续费
+ 1.2
+
当前可提现金额: ￥{{userInfo.brokerage_price}},冻结佣金：￥{{userInfo.lock_brokerage}}
@@ -536,7 +540,7 @@
}
}
.cash-withdrawal .wrapper .list .item .name {
- width: 130rpx;
+ width: 160rpx;
}
.cash-withdrawal .wrapper .list .item .input {
width: 505rpx;
diff --git a/pages/users/user_invoice_order/index.vue b/pages/users/user_invoice_order/index.vue
index d51fd35..648895b 100644
--- a/pages/users/user_invoice_order/index.vue
+++ b/pages/users/user_invoice_order/index.vue
@@ -246,7 +246,7 @@
if (this.orderInfo.status == '-1') {
this.isGoodsReturn = true;
}
- }).catch(err => {
+ }).catch(err => {
uni.hideLoading();
that.$util.Tips({
title: err