diff --git a/manifest.json b/manifest.json
index 5e5f165..e8a569e 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,5 +1,5 @@
{
- "name" : "taihumeisu",
+ "name" : "shiweisuzhou",
"appid" : "__UNI__9BF1085",
"description" : "",
"versionName" : "1.0.0",
@@ -61,7 +61,7 @@
"desc" : "获取用户位置"
}
},
- "requiredPrivateInfos" : [ "getLocation", "onLocationChange", "startLocationUpdate" ]
+ "requiredPrivateInfos" : [ "getLocation", "onLocationChange", "startLocationUpdate" ]
},
"mp-alipay" : {
"usingComponents" : true
diff --git a/pages.json b/pages.json
index 43d8b03..ef0a99f 100644
--- a/pages.json
+++ b/pages.json
@@ -66,7 +66,19 @@
"style" : {
"navigationBarTitleText" : "精选线路"
}
- }
+ },
+ {
+ "path" : "line/lineDetail",
+ "style" : {
+ "navigationBarTitleText" : "线路详情"
+ }
+ },
+ {
+ "path" : "line/order",
+ "style" : {
+ "navigationBarTitleText" : "填写订单"
+ }
+ }
]
}],
"tabBar": {
@@ -82,31 +94,36 @@
"pagePath": "pages/map/map",
"iconPath": "/static/images/map.png",
"selectedIconPath": "/static/images/selectMap.png",
- "text": "特产地图"
+ "text": "特产地图",
+ "visible": false //隐藏底部菜单栏,仅支持APP和H5
},
{
"pagePath": "pages/coupon/coupon",
"iconPath": "/static/images/coupon.png",
"selectedIconPath": "/static/images/selectCoupon.png",
- "text": "领券中心"
+ "text": "领券中心",
+ "visible": false
},
{
"pagePath": "pages/index/index",
"iconPath": "/static/images/home.png",
"selectedIconPath": "/static/images/selectHome.png",
- "text": "首页"
+ "text": "首页",
+ "visible": false
},
{
"pagePath": "pages/cart/cart",
"iconPath": "/static/images/cart.png",
"selectedIconPath": "/static/images/selectCart.png",
- "text": "购物车"
+ "text": "购物车",
+ "visible": false
},
{
"pagePath": "pages/user/user",
"iconPath": "/static/images/mine.png",
"selectedIconPath": "/static/images/selectMine.png",
- "text": "我的"
+ "text": "我的",
+ "visible": false
}
]
},
diff --git a/pages/cart/cart.vue b/pages/cart/cart.vue
index ae5132e..815b055 100644
--- a/pages/cart/cart.vue
+++ b/pages/cart/cart.vue
@@ -1,5 +1,5 @@
-
+
diff --git a/pages/coupon/coupon.vue b/pages/coupon/coupon.vue
index 769c268..fc451ca 100644
--- a/pages/coupon/coupon.vue
+++ b/pages/coupon/coupon.vue
@@ -1,5 +1,5 @@
-
+
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 0fd3020..064951d 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -1,5 +1,5 @@
-
+
diff --git a/pages/map/map.vue b/pages/map/map.vue
index 3460797..c90987f 100644
--- a/pages/map/map.vue
+++ b/pages/map/map.vue
@@ -1,5 +1,5 @@
-
+
diff --git a/pages/user/user.vue b/pages/user/user.vue
index aad2859..28110be 100644
--- a/pages/user/user.vue
+++ b/pages/user/user.vue
@@ -1,5 +1,5 @@
-
+
diff --git a/static/css/base.css b/static/css/base.css
index 1bab87e..00b79a8 100644
--- a/static/css/base.css
+++ b/static/css/base.css
@@ -16,7 +16,7 @@ view {
box-sizing: border-box;
}
-.bg {
+.bg-padding {
padding-bottom: 250rpx;
}
diff --git a/static/js/CommonFunction.js b/static/js/CommonFunction.js
index 74b7844..bd6ce8d 100644
--- a/static/js/CommonFunction.js
+++ b/static/js/CommonFunction.js
@@ -221,5 +221,19 @@ Vue.prototype.getHeadImg = id => {
'/api/multimedia/detail'
).then(res => {
return res.data.head_img
- });
+ });
+}
+
+// 根据类型跳转详情
+Vue.prototype.gotoDetailByType = item => {
+ let url = ''
+ switch (item.type){
+ case 'line':
+ url = '/subPackages/line/lineDetail?id=' + item.id
+ break;
+ default:
+ break;
+ }
+ console.log(url)
+ Vue.prototype.gotoPath(url)
}
\ No newline at end of file
diff --git a/static/js/request.js b/static/js/request.js
index 5513e1d..95da9eb 100644
--- a/static/js/request.js
+++ b/static/js/request.js
@@ -39,7 +39,7 @@ Vue.prototype.NEWAPIURL = '/api';
// #endif
Vue.prototype.Post = (params = {}, apiurl) => {
- const token = getToken();
+ const token = getToken() || '0caa10fc-6d65-4d9c-8e57-b344be3fc526';
if (token) {
params.token = token;
}
diff --git a/subPackages/index.vue b/subPackages/index.vue
index 02409e3..fa29b20 100644
--- a/subPackages/index.vue
+++ b/subPackages/index.vue
@@ -1,8 +1,21 @@
+
+
+
-
\ No newline at end of file
diff --git a/subPackages/line/index.vue b/subPackages/line/index.vue
index c329a78..efe63ea 100644
--- a/subPackages/line/index.vue
+++ b/subPackages/line/index.vue
@@ -1,5 +1,134 @@
-
-
+
+
+
+
+
+ {{item.title}}
+
+
+ {{tagItem}}
+
+
+
+
+ {{item.price / 100}}
+ 预订
+
+
+
-
\ No newline at end of file
+
+
+
+
+
\ No newline at end of file
diff --git a/subPackages/line/lineDetail.vue b/subPackages/line/lineDetail.vue
new file mode 100644
index 0000000..4d9cf43
--- /dev/null
+++ b/subPackages/line/lineDetail.vue
@@ -0,0 +1,278 @@
+
+
+
+
+
+
+
+
+
+ {{detail.price / 100}}
+ {{detail.title}}
+ {{detail.subtitle}}
+
+
+ {{item}}
+
+
+
+
+
+
+
+ 立即购买
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/subPackages/line/order.vue b/subPackages/line/order.vue
new file mode 100644
index 0000000..28e7405
--- /dev/null
+++ b/subPackages/line/order.vue
@@ -0,0 +1,579 @@
+
+
+
+
+
+
+
+ {{ item }}月
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ formatDay(index + 1) }}
+
+
+ ¥{{ getPriceInfo(month[monthIndex], index + 1).m_price / 100 }}
+
+
+ 售罄
+
+
+
+
+
+
+
+
+
+
+ {{ item.sku_name }}
+ {{ item.sku_type_info }}
+ -
+ {{ nums[index] }}
+ +
+
+
+ {{ selectDate.info[index].price / 100 }}
+
+
+
+
+ 总额:
+ ¥{{ totalPrice() / 100 }}
+
+
+ 客服
+
+ 下一步
+
+
+
+
+
+
+
\ No newline at end of file