From 4dfd9194b3bcbe5d955220ef91a4a4b542807c34 Mon Sep 17 00:00:00 2001
From: chenkainan <chenkainan163@163.com>
Date: Fri, 29 Jul 2022 11:12:58 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=9C=B0=E5=9D=80=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.js                           |  2 +-
 app.json                         |  5 ++++-
 pages/index/index.wxml           |  2 +-
 pages/info/museumInfo/index.js   | 17 +++++++++++++++++
 pages/info/museumInfo/index.wxml |  6 +++++-
 pages/info/museumInfo/index.wxss |  5 +++--
 pages/order/hotel/index.wxml     |  4 ++--
 project.config.json              | 21 ++++++++++++++-------
 project.private.config.json      | 17 ++++++-----------
 9 files changed, 53 insertions(+), 26 deletions(-)

diff --git a/app.js b/app.js
index 35e9810..c5cd544 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.isTest27?true:false;
+      data.isTest = data.isTest30?true:false;
       this.globalData.configJson = data
     })
     
diff --git a/app.json b/app.json
index 9dbe4a2..fbacb66 100644
--- a/app.json
+++ b/app.json
@@ -175,7 +175,10 @@
     "pages/group/info/index",
     "pages/culture/index",
     "pages/culture/info/index",
-    "pages/user/logout/index"
+    "pages/user/logout/index",
+	"pages/user/linkman/add/index",
+	"pages/user/address/add/index",
+	"pages/user/linkman/index"
   ],
   "requiredPrivateInfos": [
     "getLocation",
diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index e470051..5924079 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -225,7 +225,7 @@
   </view>
   <view class="pic-list" style="margin-top:20rpx">
     <image bindtap="gotoUrl" data-event="dou_click" data-title="抖in苏州"
-      data-url="https://m.cloud.sz-trip.com/ShakeInDetail?id=350&class_id=27&index=1"
+      data-url="https://m.cloud.sz-trip.com/ShakeInDetailList?id=350&class_id=27&index=1"
       src="https://static.ticket.sz-trip.com/xcxImages/index/cxzs0.png" mode="aspectFill"></image>
     <image bindtap="gotoPath" data-event="food_click" data-title="街巷美食"
       data-path="/pages/list/{{isTest?'road':'food'}}/index"
diff --git a/pages/info/museumInfo/index.js b/pages/info/museumInfo/index.js
index d599b24..28f17ec 100644
--- a/pages/info/museumInfo/index.js
+++ b/pages/info/museumInfo/index.js
@@ -399,6 +399,7 @@ Page({
     })
   },
   order: function () {
+	this.data.isGroup = null
     if(this.data.product.product.flag!=1 || this.data.product.sku.flag=='off') return;
     if(this.data.isGroup){
       // 如果是团队预约的话 是需要判断是否需要审核的
@@ -420,6 +421,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;
diff --git a/pages/info/museumInfo/index.wxml b/pages/info/museumInfo/index.wxml
index 940dd71..529faa3 100644
--- a/pages/info/museumInfo/index.wxml
+++ b/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'>
diff --git a/pages/info/museumInfo/index.wxss b/pages/info/museumInfo/index.wxss
index ed15b1a..2b8e000 100644
--- a/pages/info/museumInfo/index.wxss
+++ b/pages/info/museumInfo/index.wxss
@@ -69,11 +69,12 @@
   box-shadow: -1rpx 1rpx 16rpx 0px rgba(6, 0, 1, 0.1);
   display: flex;
   align-items: center;
-  justify-content: center;
+  justify-content: space-around;
+  z-index: 2;
 }
 
 .fixed-btn .btn {
-  width: 391rpx;
+  width: 350rpx;
   line-height: 73rpx;
   background: #D62828;
   border-radius: 37rpx;
diff --git a/pages/order/hotel/index.wxml b/pages/order/hotel/index.wxml
index 0930b19..f59a916 100644
--- a/pages/order/hotel/index.wxml
+++ b/pages/order/hotel/index.wxml
@@ -110,10 +110,10 @@
       <view bindtap="cancel">取消</view>
       <view bindtap="confirm">确定</view>
     </view>
-    <navigator url="/pages/user/linkman/add/index" class="add-btn">添加出行人</navigator>
+    <navigator url="/pages/old/linkman/add/index" class="add-btn">添加出行人</navigator>
     <view class="linkmanlist-item" wx:for="{{linkmanList}}">
       <view class="linkmanlist-item-top">
-        <navigator bindtap="gotoEdit" data-item="{{item}}" url="/pages/user/linkman/add/index?id={{item.id}}&from=order" class="iconfont icon-bianji1"></navigator>
+        <navigator bindtap="gotoEdit" data-item="{{item}}" url="/pages/old/linkman/add/index?id={{item.id}}&from=order" class="iconfont icon-bianji1"></navigator>
         <view class="linkman-nickname">{{item.name}}</view>
         <view class="linkman-info">
           <view class="linkman-tel" style="margin-bottom:20rpx">手机号 {{item.tel}}</view>
diff --git a/project.config.json b/project.config.json
index fe4e401..68c7558 100644
--- a/project.config.json
+++ b/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
   }
 }
\ No newline at end of file
diff --git a/project.private.config.json b/project.private.config.json
index bf9632e..684d82c 100644
--- a/project.private.config.json
+++ b/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"
 }
\ No newline at end of file