整合团体预约至场馆预约

app.js

@@ -22,7 +22,7 @@ App({
       unique_key: "wechatxcx"
     }).then(res => {
       let data = JSON.parse(res.data);
-      data.isTest = data.isTest27?true:false;
+      data.isTest = data.isTest28?true:false;
       this.globalData.configJson = data
     })
     

pages/info/museumInfo/index.js

@@ -420,6 +420,22 @@ Page({
     }
     
   },
+  order1: function () {
+	  this.data.isGroup = 1
+      // 如果是团队预约的话 是需要判断是否需要审核的
+      commonApi.user_post("team_order/is_apply",{
+        id:this.data.id
+      }).then(res=>{
+        // 0 无需资质申请 1 需要资质申请跳转资质申请页面
+        if(res && res.data==1){
+          wx.navigateTo({
+            url: '/pages/group/apply/index?id='+this.data.id,
+          })
+          return;
+        }
+        this.realOrder()
+      })
+  },
   realOrder:function(){
     if (!this.data.info.product_venue) return;
     if (!this.data.info.product_venue.sku[0]) return;

pages/info/museumInfo/index.wxml

@@ -62,7 +62,11 @@
     wx:if="{{info.product_venue && info.product_venue.sku && info.product_venue.sku.length>0}}"></view>
 </view>
 <view class="fixed-btn" wx:if="{{info.product_venue && info.product_venue.sku && info.product_venue.sku.length>0}}">
-  <view bindtap="order" class="btn {{info && info.team_order && isGroup ? 'team' : ''}} {{product.product.flag==1 && product.sku.flag=='on'?'':' disable'}}">参观预约</view>
+  <view bindtap="order" class="btn {{info && info.team_order && isGroup ? 'team' : ''}} {{product.product.flag==1 && product.sku.flag=='on'?'':' disable'}}">参观预约
+  </view>
+  <view class="btn" wx:if="{{info.team_order == 1 && !isGroup}}" bindtap="order1">
+	  团体预约
+  </view>
 </view>
 <view style="position:absolute;right:0;left:-10000rpx;top:-20000rpx;z-index:-1">
   <canvas canvas-id='imageCanvas' class='imageCanvas' style="width:551rpx;height:643rpx;" disable-scroll='true'>

pages/info/museumInfo/index.wxss

@@ -69,11 +69,11 @@
   box-shadow: -1rpx 1rpx 16rpx 0px rgba(6, 0, 1, 0.1);
   display: flex;
   align-items: center;
-  justify-content: center;
+  justify-content: space-around;
 }
 
 .fixed-btn .btn {
-  width: 391rpx;
+  width: 350rpx;
   line-height: 73rpx;
   background: #D62828;
   border-radius: 37rpx;

project.config.json

@@ -1,7 +1,8 @@
 {
-  "description": "项目配置文件",
+  "description": "项目配置文件，详见文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",
   "packOptions": {
-    "ignore": []
+    "ignore": [],
+    "include": []
   },
   "setting": {
     "urlCheck": false,
@@ -37,16 +38,18 @@
     "userConfirmedBundleSwitch": false,
     "packNpmManually": false,
     "packNpmRelationList": [],
-    "minifyWXSS": true
+    "minifyWXSS": true,
+    "lazyloadPlaceholderEnable": false,
+    "useStaticServer": true,
+    "showES6CompileOption": false,
+    "disableUseStrict": false,
+    "useCompilerPlugins": false,
+    "minifyWXML": true
   },
   "compileType": "miniprogram",
   "libVersion": "2.14.0",
   "appid": "wx4bb7b6050831f585",
   "projectname": "%E8%8B%8F%E5%B7%9E%E6%96%87%E6%97%85",
-  "debugOptions": {
-    "hidedInDevtools": []
-  },
-  "isGameTourist": false,
   "simulatorType": "wechat",
   "simulatorPluginLibVersion": {},
   "condition": {
@@ -105,5 +108,9 @@
         }
       ]
     }
+  },
+  "editorSetting": {
+    "tabIndent": "insertSpaces",
+    "tabSize": 2
   }
 }

project.private.config.json

@@ -1,15 +1,8 @@
 {
-  "setting": {},
+  "setting": {
+    "compileHotReLoad": true
+  },
   "condition": {
-    "plugin": {
-      "list": []
-    },
-    "game": {
-      "list": []
-    },
-    "gamePlugin": {
-      "list": []
-    },
     "miniprogram": {
       "list": [
         {
@@ -68,5 +61,7 @@
         }
       ]
     }
-  }
+  },
+  "projectname": "%E8%8B%8F%E5%B7%9E%E6%96%87%E6%97%85",
+  "description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html"
 }