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 @@
{
+ // 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}}">
- 参观预约
+ 参观预约
+
+
+ 团体预约
+
- 添加出行人
+ 添加出行人
-
+
{{item.name}}
手机号 {{item.tel}}
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