From 67439d436673054d46c77039e416621bec680533 Mon Sep 17 00:00:00 2001
From: chenkainan <chenkainan163@163.com>
Date: Tue, 9 Aug 2022 21:44:44 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8B=E5=8D=95=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.js                              | 4 ++--
 pages/info/postProductInfo/index.js | 2 +-
 pages/order/postOrder/index.js      | 3 ++-
 pages/order/scene/index.js          | 7 ++++---
 4 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/app.js b/app.js
index 2481395..49f1454 100644
--- a/app.js
+++ b/app.js
@@ -22,7 +22,7 @@ App({
       unique_key: "wechatxcx"
     }).then(res => {
       let data = JSON.parse(res.data);
-      data.isTest = data.isTest32?true:false;
+      data.isTest = data.isTest33?true:false;
       this.globalData.configJson = data
     })
     
@@ -146,7 +146,7 @@ App({
 	ticketProduct:[],
 	index: 0,
 	createDate: null,
-	list: [],
+	list: null,
 	productPrice: 0,
 	ticketPrice: 0,
     productState:{
diff --git a/pages/info/postProductInfo/index.js b/pages/info/postProductInfo/index.js
index 303fc76..d02337c 100644
--- a/pages/info/postProductInfo/index.js
+++ b/pages/info/postProductInfo/index.js
@@ -243,7 +243,7 @@ Page({
     })
   },
   order: function () {
-	app.globalData.postProduct = []
+	app.globalData.postProduct = null
 	app.globalData.list = []
     if (this.data.skuFlag == 'order') {
       util.pagePoint({
diff --git a/pages/order/postOrder/index.js b/pages/order/postOrder/index.js
index cb20054..6dcbca9 100644
--- a/pages/order/postOrder/index.js
+++ b/pages/order/postOrder/index.js
@@ -164,7 +164,8 @@ Page({
     if (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", {
 		  data: JSON.stringify(data)
 		}).then(res => {
diff --git a/pages/order/scene/index.js b/pages/order/scene/index.js
index 34f21b9..6d7572d 100644
--- a/pages/order/scene/index.js
+++ b/pages/order/scene/index.js
@@ -115,7 +115,7 @@ Page({
         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()
     }
     app.globalData.couponInfo = null;
@@ -251,7 +251,8 @@ Page({
     }
 	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;
-	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){
 			app.globalData.createDate.product_list.push(data.product_list[0])
 		}else{
@@ -265,7 +266,7 @@ Page({
 		return
 	}else{
 		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){
 				app.globalData.createDate.product_list.push(data.product_list[0])
 			}