diff --git a/pages.json b/pages.json index 00cb9eb..d8a1fa5 100644 --- a/pages.json +++ b/pages.json @@ -392,6 +392,12 @@ "navigationBarTitleText": "我的订单" } }, + { + "path": "order_list1/search", + "style": { + "navigationBarTitleText": "寄售订单" + } + }, { "path": "presell_order_list/index", "style": { diff --git a/pages/activity/assist_detail/index.vue b/pages/activity/assist_detail/index.vue index 380fb9d..1dbcf74 100644 --- a/pages/activity/assist_detail/index.vue +++ b/pages/activity/assist_detail/index.vue @@ -318,6 +318,7 @@ * 生命周期函数--监听页面加载 */ onLoad: function(options) { + console.log(options,"0000000") var that = this; if(options.spid){ app.globalData.spid = options.spid; diff --git a/pages/burst/index.vue b/pages/burst/index.vue index 215759c..83c12d8 100644 --- a/pages/burst/index.vue +++ b/pages/burst/index.vue @@ -71,6 +71,7 @@ export default{ }, // 去详情页 godDetail(item) { + goShopDetail(item, this.uid).then(res => { if (this.isLogin) { initiateAssistApi(item.activity_id).then(res => { diff --git a/pages/goods_details/index.vue b/pages/goods_details/index.vue index 4f6c522..b0262a2 100644 --- a/pages/goods_details/index.vue +++ b/pages/goods_details/index.vue @@ -43,7 +43,7 @@
分享 - + 积分最高可抵扣{{storeInfo.max_integral}}元 @@ -54,6 +54,7 @@ ￥ {{storeInfo.price}} + +积分{{point}} ￥{{storeInfo.svip_price}} @@ -583,6 +584,7 @@ max_count: 0, min_count: 0, pay_limit: 1, + is_burst:null, svipData: {}, svipPrice: false, specsInfo: { @@ -623,6 +625,7 @@ url: '/pages/user/index' }, ], + point:0 }; }, computed:{ @@ -1024,6 +1027,7 @@ this.$set(this.attr.productSelect, "svip_price", productSelect.svip_price); this.$set(this.attr.productSelect, "stock", productSelect.stock); this.$set(this.attr.productSelect, "unique", productSelect.unique); + this.$set(this, "point", productSelect.point); this.$set(this, "uniqueValue", productSelect.unique); if (productSelect.stock == 0) { this.$set(this.attr.productSelect, "cart_num", 0); @@ -1040,6 +1044,7 @@ this.$set(this.attr.productSelect, "stock", 0); this.$set(this.attr.productSelect, "unique", ""); this.$set(this.attr.productSelect, "cart_num", 0); + this.$set(this, "point", productSelect.point); this.$set(this, "attrValue", res); this.$set(this, "attrTxt", "选择"); } @@ -1096,6 +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, '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); @@ -1208,6 +1214,7 @@ this.$set(this.attr.productSelect, "stock", productSelect.stock); this.$set(this.attr.productSelect, "unique", productSelect.unique); this.$set(this, "uniqueValue", productSelect.unique); + this.$set(this, "point", productSelect.point); this.$set(this, "attrValue", value.join(",")); this.$set(this, "attrTxt", "选择"); if (productSelect.stock == 0) { @@ -1226,6 +1233,7 @@ this.$set(this.attr.productSelect, "svip_price", this.storeInfo.svip_price); this.$set(this.attr.productSelect, "stock", 0); this.$set(this.attr.productSelect, "unique", ""); + this.$set(this, "point", this.storeInfo.point); this.$set(this, "uniqueValue", ""); this.$set(this.attr.productSelect, "cart_num", 0); this.$set(this, "attrValue", ""); @@ -1241,6 +1249,7 @@ this.$set(this.attr.productSelect, "svip_price", this.storeInfo.svip_price); this.$set(this.attr.productSelect, "stock", this.storeInfo.stock); this.$set(this.attr.productSelect, "unique", this.storeInfo.unique || ""); + this.$set(this, "point", this.storeInfo.point||0); this.$set(this, "uniqueValue", this.storeInfo.unique || ""); this.$set(this.attr.productSelect, "cart_num", 1); this.$set(this, "attrValue", ""); @@ -1252,6 +1261,7 @@ this.$set(this.attr.productSelect, "svip_price", productSelect.svip_price); this.$set(this.attr.productSelect, "stock", productSelect.stock); this.$set(this.attr.productSelect, "unique", productSelect.unique); + this.$set(this, "point", productSelect.point); this.$set(this, "uniqueValue", productSelect.unique); this.$set(this, "attrValue", value.join(",")); this.$set(this, "attrTxt", "选择"); @@ -1433,7 +1443,7 @@ Cache.set(CART_TIME,timestamp) if (news) { uni.navigateTo({ - url: '/pages/users/order_confirm/index?cartId=' + cartId + url: '/pages/users/order_confirm/index?cartId=' + cartId +'&is_burst='+that.is_burst }); } else { that.$util.Tips({ diff --git a/pages/users/order_confirm/index.vue b/pages/users/order_confirm/index.vue index 966c8ad..246fe49 100644 --- a/pages/users/order_confirm/index.vue +++ b/pages/users/order_confirm/index.vue @@ -691,10 +691,11 @@ timeranges: [], isShow:false, typeList:[ - {id:1,name:'商品'}, - {id:2,name:'积分'}, + {id:0,name:'商品'}, + {id:1,name:'积分'}, ], - orderType:1 + orderType:1, + is_burst:null, }; }, computed: { @@ -714,6 +715,7 @@ mounted: function() { }, onLoad: function(options) { + this.is_burst = options.is_burst // #ifdef H5 this.from = this.$wechat.isWeixin() ? 'weixin' : 'h5' // #endif @@ -1648,6 +1650,8 @@ receipt_data: this.invoiceData, extend: this.extend, post: this.post, + gift_type:this.orderType, + is_burst:this.is_burst, // #ifdef H5 return_url: 'http://' + window.location.host + '/pages/users/order_list/index', // #endif diff --git a/pages/users/order_list1/index.vue b/pages/users/order_list1/index.vue index 8264cad..823e1e9 100644 --- a/pages/users/order_list1/index.vue +++ b/pages/users/order_list1/index.vue @@ -2,7 +2,7 @@ - + 搜索我的寄售订单 @@ -536,6 +536,7 @@ groupOrderList({ page: that.page, limit: that.limit, + is_burst:1, }).then(res => { that.isReady = true; let list = res.data.list || []; @@ -553,6 +554,7 @@ status: that.orderStatus - 1, page: that.page, limit: that.limit, + is_burst:1, }).then(res => { let list = res.data.list || []; let loadend = list.length < that.limit;