Browse Source

下单修改

master
chenkainan 4 years ago
parent
commit
67439d4366
  1. 4
      app.js
  2. 2
      pages/info/postProductInfo/index.js
  3. 3
      pages/order/postOrder/index.js
  4. 7
      pages/order/scene/index.js

4
app.js

@ -22,7 +22,7 @@ App({
unique_key: "wechatxcx" unique_key: "wechatxcx"
}).then(res => { }).then(res => {
let data = JSON.parse(res.data); let data = JSON.parse(res.data);
data.isTest = data.isTest32?true:false; data.isTest = data.isTest33?true:false;
this.globalData.configJson = data this.globalData.configJson = data
}) })
@ -146,7 +146,7 @@ App({
ticketProduct:[], ticketProduct:[],
index: 0, index: 0,
createDate: null, createDate: null,
list: [], list: null,
productPrice: 0, productPrice: 0,
ticketPrice: 0, ticketPrice: 0,
productState:{ productState:{

2
pages/info/postProductInfo/index.js

@ -243,7 +243,7 @@ Page({
}) })
}, },
order: function () { order: function () {
app.globalData.postProduct = [] app.globalData.postProduct = null
app.globalData.list = [] app.globalData.list = []
if (this.data.skuFlag == 'order') { if (this.data.skuFlag == 'order') {
util.pagePoint({ util.pagePoint({

3
pages/order/postOrder/index.js

@ -164,7 +164,8 @@ Page({
if (app.globalData.category_id) { if (app.globalData.category_id) {
data.category_id = app.globalData.category_id; data.category_id = app.globalData.category_id;
} }
if(!app.globalData.list){ console.log(app.globalData.list)
if(!app.globalData.list || app.globalData.list.length == 0){
commonApi.user_post("order/create", { commonApi.user_post("order/create", {
data: JSON.stringify(data) data: JSON.stringify(data)
}).then(res => { }).then(res => {

7
pages/order/scene/index.js

@ -115,7 +115,7 @@ Page({
icon: 'none' icon: 'none'
}) })
} }
if (!this.data.kjId && !this.data.gp_id && this.data.product.isGroup != 1) { if (!this.data.kjId && !this.data.gp_id && this.data.product.isGroup != 1 && !this.data.flag) {
this.couponCom.setNullCoupon() this.couponCom.setNullCoupon()
} }
app.globalData.couponInfo = null; app.globalData.couponInfo = null;
@ -251,7 +251,8 @@ Page({
} }
app.globalData.list[app.globalData.index] = this.data.product app.globalData.list[app.globalData.index] = this.data.product
app.globalData.ticketPrice += (this.data.singlePrice * this.data.productNum - (this.data.coupon?this.data.coupon.activity.money:0))/100; app.globalData.ticketPrice += (this.data.singlePrice * this.data.productNum - (this.data.coupon?this.data.coupon.activity.money:0))/100;
if(app.globalData.list.length > app.globalData.index + 1){ console.log(app.globalData.list,app.globalData.list.length)
if(app.globalData.list && app.globalData.list.length > app.globalData.index + 1){
if(app.globalData.createDate){ if(app.globalData.createDate){
app.globalData.createDate.product_list.push(data.product_list[0]) app.globalData.createDate.product_list.push(data.product_list[0])
}else{ }else{
@ -265,7 +266,7 @@ Page({
return return
}else{ }else{
console.log(app.globalData.list.length,app.globalData.postProduct) console.log(app.globalData.list.length,app.globalData.postProduct)
if(app.globalData.list.length > 1 || app.globalData.postProduct.length>0){ if(app.globalData.list && app.globalData.list.length > 1 || app.globalData.postProduct.length>0){
if(app.globalData.createDate){ if(app.globalData.createDate){
app.globalData.createDate.product_list.push(data.product_list[0]) app.globalData.createDate.product_list.push(data.product_list[0])
} }

Loading…
Cancel
Save