diff --git a/manifest.json b/manifest.json
index 513203d..3c380f0 100644
--- a/manifest.json
+++ b/manifest.json
@@ -61,6 +61,9 @@
"desc" : "提供您最近的活动地址"
}
},
+ "optimization" : {
+ "subPackages" : true
+ },
"requiredPrivateInfos" : [ "getLocation" ]
},
"mp-alipay" : {
diff --git a/packages/dl/index.vue b/packages/dl/index.vue
new file mode 100644
index 0000000..4fe26d1
--- /dev/null
+++ b/packages/dl/index.vue
@@ -0,0 +1,210 @@
+
+
+
+
+
+
+
+
+ {{item.text}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/packages/dl/static/dl/dl1.png b/packages/dl/static/dl/dl1.png
new file mode 100644
index 0000000..a49307c
Binary files /dev/null and b/packages/dl/static/dl/dl1.png differ
diff --git a/packages/dl/static/dl/dl1_cur.png b/packages/dl/static/dl/dl1_cur.png
new file mode 100644
index 0000000..35e4f7f
Binary files /dev/null and b/packages/dl/static/dl/dl1_cur.png differ
diff --git a/packages/dl/static/dl/dl2.png b/packages/dl/static/dl/dl2.png
new file mode 100644
index 0000000..e7cb22f
Binary files /dev/null and b/packages/dl/static/dl/dl2.png differ
diff --git a/packages/dl/static/dl/dl2_cur.png b/packages/dl/static/dl/dl2_cur.png
new file mode 100644
index 0000000..f9578ca
Binary files /dev/null and b/packages/dl/static/dl/dl2_cur.png differ
diff --git a/packages/dl/static/dl/dl3.png b/packages/dl/static/dl/dl3.png
new file mode 100644
index 0000000..e84c2d5
Binary files /dev/null and b/packages/dl/static/dl/dl3.png differ
diff --git a/packages/dl/static/dl/dl3_cur.png b/packages/dl/static/dl/dl3_cur.png
new file mode 100644
index 0000000..5f86b30
Binary files /dev/null and b/packages/dl/static/dl/dl3_cur.png differ
diff --git a/packages/dl/static/dl/dl4.png b/packages/dl/static/dl/dl4.png
new file mode 100644
index 0000000..c8088ee
Binary files /dev/null and b/packages/dl/static/dl/dl4.png differ
diff --git a/packages/dl/static/dl/dl4_cur.png b/packages/dl/static/dl/dl4_cur.png
new file mode 100644
index 0000000..f7671de
Binary files /dev/null and b/packages/dl/static/dl/dl4_cur.png differ
diff --git a/packages/dl/static/dl/dl5.png b/packages/dl/static/dl/dl5.png
new file mode 100644
index 0000000..111a335
Binary files /dev/null and b/packages/dl/static/dl/dl5.png differ
diff --git a/packages/dl/static/dl/dl5_cur.png b/packages/dl/static/dl/dl5_cur.png
new file mode 100644
index 0000000..a85a60a
Binary files /dev/null and b/packages/dl/static/dl/dl5_cur.png differ
diff --git a/packages/dl/static/dl/dl6.png b/packages/dl/static/dl/dl6.png
new file mode 100644
index 0000000..7c6043a
Binary files /dev/null and b/packages/dl/static/dl/dl6.png differ
diff --git a/packages/dl/static/dl/dl6_cur.png b/packages/dl/static/dl/dl6_cur.png
new file mode 100644
index 0000000..1bd2937
Binary files /dev/null and b/packages/dl/static/dl/dl6_cur.png differ
diff --git a/packages/dl/static/dl/dl7.png b/packages/dl/static/dl/dl7.png
new file mode 100644
index 0000000..7d42b53
Binary files /dev/null and b/packages/dl/static/dl/dl7.png differ
diff --git a/packages/dl/static/dl/dl7_cur.png b/packages/dl/static/dl/dl7_cur.png
new file mode 100644
index 0000000..83f1efe
Binary files /dev/null and b/packages/dl/static/dl/dl7_cur.png differ
diff --git a/packages/dl/static/dl/dl_cur.png b/packages/dl/static/dl/dl_cur.png
new file mode 100644
index 0000000..bab2b7c
Binary files /dev/null and b/packages/dl/static/dl/dl_cur.png differ
diff --git a/packages/dl/static/dl/dlbg.png b/packages/dl/static/dl/dlbg.png
new file mode 100644
index 0000000..09ed066
Binary files /dev/null and b/packages/dl/static/dl/dlbg.png differ
diff --git a/pages/map/map.vue b/packages/map/map.vue
similarity index 100%
rename from pages/map/map.vue
rename to packages/map/map.vue
diff --git a/pages.json b/pages.json
index cb5de7d..c762cd2 100644
--- a/pages.json
+++ b/pages.json
@@ -62,7 +62,7 @@
"enablePullDownRefresh": false
}
- }, {
+ },{
"path": "pages/guide/index",
"style": {
"navigationBarTitleText": "服务",
@@ -79,13 +79,6 @@
"enablePullDownRefresh": false
}
- }, {
- "path": "pages/map/map",
- "style": {
- "navigationBarTitleText": "展馆导航",
- "enablePullDownRefresh": false
- }
-
}, {
"path": "pages/visit/index",
"style": {
@@ -234,20 +227,32 @@
}
}, {
- "path": "pages/vr/vrpagegm",
+ "path": "pages/guide/feedbackinfo",
"style": {
- "navigationBarTitleText": "",
+ "navigationBarTitleText": "意见建议详情",
"enablePullDownRefresh": false
}
+ }
+ ],
+ "subPackages":[{
+ "root": "packages",
+ "pages":[{
+ "path": "dl/index",
+ "style": {
+ "navigationBarTitleText": "展厅导览",
+ "enablePullDownRefresh": false,
+ "navigationBarBackgroundColor": "#fff"
+ }
}, {
- "path": "pages/guide/feedbackinfo",
+ "path": "map/map",
"style": {
- "navigationBarTitleText": "意见建议详情",
+ "navigationBarTitleText": "展馆导航",
"enablePullDownRefresh": false
}
- }
+ }]
+ }
],
"globalStyle": {
"navigationBarTextStyle": "black",
diff --git a/pages/activity/book.vue b/pages/activity/book.vue
index 8a40959..c9b522b 100644
--- a/pages/activity/book.vue
+++ b/pages/activity/book.vue
@@ -18,11 +18,6 @@
活动时间:{{timeFormat(numberlist.start_time,"yyyy年MM月DD日")}}{{getHm(numberlist.start_time)}}-{{getHm(numberlist.end_time)}}
-
活动地址:{{list.address}}
@@ -30,7 +25,8 @@
- 人数限制:{{numberlist.total==0?'不限':numberlist.total}}
+ 人数限制:{{(list.form==2?10 : (numberlist.total==0?'不限':numberlist.total))}}
+
@@ -61,7 +57,7 @@
每单限购{{list.person_max_count}}张,同一身份证当天限购1张
{{list.team_min_count}}人以上可团体预约
+ v-if="type=='team'">{{list.form==2?10:list.team_min_count}}人以上可团体预约
@@ -151,11 +147,6 @@
-
@@ -187,17 +178,12 @@
-
-
+
@@ -212,23 +198,7 @@
-
-
-
+ keyName="label">
-
+
团体预约
@@ -192,14 +174,7 @@
this.util.alert("您选择的场次不可预约!");
// this.isCanBook = false
return;
- };
- // var nt = new Date();
- // this.isCanBook = this.$moment(nt).isBefore(item.end_plan);
- // console.log("this.isCanBook",this.isCanBook)
- // if(!this.isCanBook){
- // this.util.alert("预约时间已过");
- // return;
- // }
+ };
var _numbers = this.numbers;
for (var mod of _numbers) {
mod.checked = false;
@@ -257,6 +232,9 @@
if (m.has_total == m.total && m.total != 0) {
m.disabled = true
+ }
+ if(res.form==2&&parseInt(m.has_total)>0){
+ m.disabled = true
}
numberArr.push(m);
if (!m.disabled) {
@@ -266,7 +244,6 @@
i++;
}
}
- //console.log("numberArr[0].id", numberArr[0].id);
if (chkMod){
that.activity_number_id = chkMod.id
that.isCanBook = true
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 9b4bdc4..aef9133 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -41,7 +41,24 @@
-
+
+
+
+
+
+
+
+ 展厅导览
+
+
+
+
+
+
+ 2F 平面图
+
+
+
@@ -56,21 +73,6 @@
{{exhibitObj.name}}
-
-
-
@@ -192,7 +194,6 @@
-
@@ -235,7 +236,8 @@
currentIndex: 0,
listCalendar: [],
showAuthorization: false,
- openType: 1
+ openType: 1,
+ dlimg:require("../../static/img/daolan.png")
}
},
onShareAppMessage() {
@@ -262,6 +264,11 @@
uni.navigateTo({
url: "/pages/exhibit/list"
});
+ },
+ toDl(){
+ uni.navigateTo({
+ url: "/packages/dl/index"
+ });
},
togame() {
uni.navigateToMiniProgram({
@@ -424,7 +431,7 @@
},
openMap() {
uni.navigateTo({
- url: "/pages/map/map"
+ url: "/packages/map/map"
})
},
openPark() {
@@ -562,16 +569,6 @@
isOpenDate = true;
} else {
isOpenDate = false;
- /* uni.showToast({
- icon: "none",
- title: selectDate + "不可以预约",
- complete() {
- setTimeout(function() {
- that.load3Day(that.$moment(selectDate).add('days', 1)
- .format("yyyy-MM-DD"))
- }, 2000)
- }
- }, 2000) */
}
}
i++;
@@ -626,15 +623,13 @@
.wrap{
background-color: #cf995a;
}
- .navBarBox {
- /* background-color: #cf995a; */
+ .navBarBox {
position: fixed;
top:0;
left:0;
width:100%;
z-index:999;
- background: linear-gradient(to bottom,#f6d593,#cf995a);
- /* height:190rpx; */
+ background: linear-gradient(to bottom,#f6d593,#cf995a);
}
.navBarBox .statusBar {}
diff --git a/pages/mine/index.vue b/pages/mine/index.vue
index 9cb34cb..a15b86c 100644
--- a/pages/mine/index.vue
+++ b/pages/mine/index.vue
@@ -89,7 +89,6 @@
:sourceType="['album','camera']" :compress="false" :quality="80" :formData="otherData"
:remove="true" :dataType="1" @uploadSuccess="uploadSuccess" @imgDelete="imgDelete"
@uploadFail="uploadFail" :action="action">
-
确认提交
diff --git a/pages/visit/book.vue b/pages/visit/book.vue
index 93a6326..dcb311a 100644
--- a/pages/visit/book.vue
+++ b/pages/visit/book.vue
@@ -175,15 +175,7 @@
-
+
{{type=="team"?"领队人信息":"联系人信息"}}
@@ -198,11 +190,7 @@
-
+
@@ -241,16 +229,11 @@
-
+
-
@@ -260,7 +243,6 @@
-
@@ -290,7 +272,6 @@