i

Merge branch 'shaojing' of http://code.xmainc.com:3000/panyiping/jundaosuzhou_wechatxcx

app.js

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

pages/order/scene/index.js

@@ -409,15 +409,15 @@ Page({
 	  console.log(this.data)
     let linkmanList = this.data.linkmanList, productNum = this.data.productNum, date = this.data.date, time = this.data.time, remark = this.data.remark, product = this.data.product;
     let linkmanIds = [];
-    if (this.data.is_need_idcard == 1) {
+    // if (this.data.is_need_idcard == 1) {
-      if (linkmanList.length < productNum && app.globalData.product.isGroup != 1) {
+    //   if (linkmanList.length < productNum && app.globalData.product.isGroup != 1) {
-        wx.showToast({
+    //     wx.showToast({
-          title: '请添加出行人',
+    //       title: '请添加出行人',
-          icon: "none"
+    //       icon: "none"
-        })
+    //     })
-        return;
+    //     return;
-      }
+    //   }
-    }
+    // }
     if (!date && this.data.ticket_type == 1) {
       wx.showToast({
         title: '请选择使用日期',