From 1a066ba8924de8a3655f853ad4ac97e6a1e39aa9 Mon Sep 17 00:00:00 2001
From: chenkainan <chenkainan163@163.com>
Date: Wed, 10 Aug 2022 13:48:43 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9C=BA=E9=A6=86=E9=A2=84=E7=BA=A6=E4=B8=8B?=
 =?UTF-8?q?=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                     |  2 +-
 pages/order/scene/index.js | 12 ++++--------
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/app.js b/app.js
index 49f1454..50ebb63 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.isTest33?true:false;
+      data.isTest = data.isTest34?true:false;
       this.globalData.configJson = data
     })
     
diff --git a/pages/order/scene/index.js b/pages/order/scene/index.js
index 6d7572d..3263c0c 100644
--- a/pages/order/scene/index.js
+++ b/pages/order/scene/index.js
@@ -34,7 +34,6 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
-	  console.log(app.globalData.product)
     this.setData({
       type: options.type,
       kjId: app.globalData.kjId,
@@ -249,9 +248,10 @@ Page({
       postData.team_name = this.data.groupName
       postData.type = 1;
     }
-	app.globalData.list[app.globalData.index] = this.data.product
+	if(app.globalData.list){
+		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;
-	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])
@@ -265,7 +265,6 @@ Page({
 		})
 		return
 	}else{
-		console.log(app.globalData.list.length,app.globalData.postProduct)
 		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])
@@ -348,11 +347,9 @@ Page({
    * 生命周期函数--监听页面显示
    */
   onShow: function () {
-    console.log(this.data.flag);
-	if(app.globalData.list.length != 0){
+	if(app.globalData.list && app.globalData.list.length != 0){
 		app.globalData.product = app.globalData.list[app.globalData.index]
 	}
-	console.log(app.globalData.product)
     if (!this.data.isLogin) {
       commonApi.user_post("token/check").then(res => {
         if (res.code == 1) {
@@ -370,7 +367,6 @@ Page({
       commonApi.user_post("product/getProductAllowancePrice", {
         product_code: this.data.product.product.product_code
       }).then(resTwo => {
-        console.log(resTwo)
         if (resTwo && resTwo.code == 1) {
           this.setData({
             allowance_data: resTwo.data