Merge branch 'master' of http://47.114.134.244:3000/litiange/jundaosuzhou_wechatxcx

app.js

@@ -21,7 +21,7 @@ App({
       unique_key: "wechatxcx"
     }).then(res => {
       let data = JSON.parse(res.data);
-      data.isTest = data.isTest153? true : false;
+      data.isTest = data.isTest155? true : false;
       this.globalData.configJson = data
     }).then(() => {
       // 获取ui配置文件

pages/order/pay/index.js

@@ -100,7 +100,7 @@ Page({
 
       
 	  // 书券产品
-	  if(res.data.order_product_list[0].product_id == 75012 || res.data.order_product_list[0].product_id == 75013 || res.data.order_product_list[0].product_id == 420265|| res.data.order_product_list[0].product_id == 421929){
+	  if(res.data.order_product_list[0].product_id == 75012 || res.data.order_product_list[0].product_id == 75013 || res.data.order_product_list[0].product_id == 420265|| res.data.order_product_list[0].product_id == 421929 || res.data.order_product_list[0].product_id == 437166){
 		  this.setData({
         isBook:true,
         payIndex:1