diff --git a/components/reservationOrder/reservationOrder.vue b/components/reservationOrder/reservationOrder.vue index bff9652..8d6a74e 100644 --- a/components/reservationOrder/reservationOrder.vue +++ b/components/reservationOrder/reservationOrder.vue @@ -76,7 +76,7 @@ }, showOrderDetail() { uni.navigateTo({ - url: '/pages/orderDetail/orderDetail?info=' + encodeURIComponent(JSON.stringify(this.orderInfo)) + url: '/pages-order/orderDetail/orderDetail?info=' + encodeURIComponent(JSON.stringify(this.orderInfo)) }) } } diff --git a/components/tabBar/tabBar.vue b/components/tabBar/tabBar.vue index cee78b8..3b434bc 100644 --- a/components/tabBar/tabBar.vue +++ b/components/tabBar/tabBar.vue @@ -65,7 +65,7 @@ this.identity = uni.getStorageSync('identity'); // #endif this.aindex = this.msg - + }, methods: { async getbottom() { @@ -88,13 +88,13 @@ if (index == 1) { this.aindex = index uni.reLaunch({ - url: '/pages/home/home' + url: '/pages-home/home/home' }) } if (index == 2) { this.aindex = index uni.reLaunch({ - url: '/pages/orderList/orderList' + url: '/pages-order/orderList/orderList' }) } if (index == 3) { diff --git a/pages/home/active.vue b/pages-home/home/active.vue similarity index 100% rename from pages/home/active.vue rename to pages-home/home/active.vue diff --git a/pages/home/content.vue b/pages-home/home/content.vue similarity index 98% rename from pages/home/content.vue rename to pages-home/home/content.vue index 1007e18..f59a1ea 100644 --- a/pages/home/content.vue +++ b/pages-home/home/content.vue @@ -57,7 +57,7 @@ export default { }, toActivity(){ uni.navigateTo({ - url: '/pages/home/active' + url: '/pages-home/home/active' }) } } diff --git a/pages/home/home.vue b/pages-home/home/home.vue similarity index 97% rename from pages/home/home.vue rename to pages-home/home/home.vue index 7c0dd3f..9b30c1c 100644 --- a/pages/home/home.vue +++ b/pages-home/home/home.vue @@ -80,7 +80,7 @@ { title: '活动礼包', icon: require('@/static/icons/homeMenuIcon/menu3.png'), - path: '/pages/home/active' + path: '/pages-home/home/active' }, { title: '操作指南', @@ -135,7 +135,7 @@ }, toContent(id) { uni.navigateTo({ - url: "/pages/home/content?id=" + id, + url: "/pages-home/home/content?id=" + id, }) }, async getBannerList() { @@ -151,7 +151,7 @@ gotoShopDetail(row) { // 直接把那一行的数据转发过去 uni.navigateTo({ - url: '/pages/shopDetail/shopDetail?info=' + encodeURIComponent(JSON.stringify(row)) + url: '/pages-shop/shopDetail/shopDetail?info=' + encodeURIComponent(JSON.stringify(row)) }) }, gotoPage(menu) { @@ -170,7 +170,7 @@ }) this.shopList = res.data.records this.shopList.forEach(item => { - item['image'] = require("@/static/images/outImage.jpg") + item['image'] = require("../static/outImage.jpg") }) } } @@ -186,7 +186,7 @@ display: flex; flex-direction: column; position: relative; - + .bannerBg1 { position: absolute; left: 0; @@ -213,10 +213,10 @@ filter: blur(20rpx); /* 设置透明度 */ opacity: 0.5; - + // -webkit-filter: brightness(150%); // filter: brightness(150%); - + transition: all 0.5s; z-index: 2; } @@ -391,4 +391,4 @@ } } } - \ No newline at end of file + diff --git a/static/images/outImage.jpg b/pages-home/static/outImage.jpg similarity index 100% rename from static/images/outImage.jpg rename to pages-home/static/outImage.jpg diff --git a/pages/my/evaluate.vue b/pages-order/my/evaluate.vue similarity index 97% rename from pages/my/evaluate.vue rename to pages-order/my/evaluate.vue index aa30735..3bff0e8 100644 --- a/pages/my/evaluate.vue +++ b/pages-order/my/evaluate.vue @@ -58,7 +58,7 @@ }) this.evaluateList = res.data.records this.evaluateList.forEach(item => { - item.image = require("@/static/images/inImage.jpg") + item.image = require("../static/inImage.jpg") }) } } diff --git a/pages/orderDetail/evaluate.vue b/pages-order/orderDetail/evaluate.vue similarity index 97% rename from pages/orderDetail/evaluate.vue rename to pages-order/orderDetail/evaluate.vue index ce39768..35db6f2 100644 --- a/pages/orderDetail/evaluate.vue +++ b/pages-order/orderDetail/evaluate.vue @@ -42,7 +42,7 @@ }, onLoad(data){ this.info = JSON.parse(decodeURIComponent(data.info)) - this.info['image'] = require("@/static/images/inImage.jpg") + this.info['image'] = require("../static/inImage.jpg") }, methods: { submit() { diff --git a/pages/orderDetail/orderDetail.vue b/pages-order/orderDetail/orderDetail.vue similarity index 99% rename from pages/orderDetail/orderDetail.vue rename to pages-order/orderDetail/orderDetail.vue index 68f6bb7..aa86d42 100644 --- a/pages/orderDetail/orderDetail.vue +++ b/pages-order/orderDetail/orderDetail.vue @@ -152,7 +152,7 @@ methods: { gotoEvaluate() { uni.navigateTo({ - url: '/pages/orderDetail/evaluate' + url: '/pages-order/orderDetail/evaluate' }) }, async getTicketsInfo(id){ diff --git a/pages/orderList/orderList.vue b/pages-order/orderList/orderList.vue similarity index 97% rename from pages/orderList/orderList.vue rename to pages-order/orderList/orderList.vue index af5dda0..afea9ac 100644 --- a/pages/orderList/orderList.vue +++ b/pages-order/orderList/orderList.vue @@ -187,7 +187,7 @@ export default { package: ress.data.package, // 统一下单接口返回的 prepay_id 参数值,格式如“prepay_id=*” signType: ress.data.signType, // 签名算法类型,默认为 MD5,支持RSA等其他加密算法 paySign: ress.data.paySign, // 签名,详见签名生成算法 - success: function (res) { + success: function (res) { console.log('成功',res); if( res.errMsg = 'requestPayment:ok'){ uni.showToast({ @@ -197,7 +197,7 @@ export default { } // 支付成功后的回调函数, res.errMsg = 'requestPayment:ok' }, - + }) }) }, @@ -224,17 +224,17 @@ export default { gotoDetail(row) { if (row.goodsType === '2'){ uni.navigateTo({ - url: '/pages/orderDetail/orderDetail?ticketsId=' + row.goodsId + url: '/pages-order/orderDetail/orderDetail?ticketsId=' + row.goodsId }) }else { uni.navigateTo({ - url: '/pages/orderDetail/orderDetail' + url: '/pages-order/orderDetail/orderDetail' }) } }, gotoEvaluate(row) { uni.navigateTo({ - url: '/pages/orderDetail/evaluate?info=' + encodeURIComponent(JSON.stringify(row)) + url: '/pages-order/orderDetail/evaluate?info=' + encodeURIComponent(JSON.stringify(row)) }) } } diff --git a/static/images/inImage.jpg b/pages-order/static/inImage.jpg similarity index 100% rename from static/images/inImage.jpg rename to pages-order/static/inImage.jpg diff --git a/pages-order/static/outImage.jpg b/pages-order/static/outImage.jpg new file mode 100644 index 0000000..2361a2e Binary files /dev/null and b/pages-order/static/outImage.jpg differ diff --git a/pages/shopDetail/shopDetail.vue b/pages-shop/shopDetail/shopDetail.vue similarity index 98% rename from pages/shopDetail/shopDetail.vue rename to pages-shop/shopDetail/shopDetail.vue index 0b48eda..d5f81f4 100644 --- a/pages/shopDetail/shopDetail.vue +++ b/pages-shop/shopDetail/shopDetail.vue @@ -10,7 +10,7 @@ - + @@ -120,7 +120,7 @@ url: '/pages/login/login' }) } - + }, // 取能提供的服务 async getServer() { @@ -133,7 +133,7 @@ }) this.busiList = res.data.servicePackages this.busiList.forEach(item => { - item['image'] = require("@/static/images/inImage.jpg") + item['image'] = require("../static/inImage.jpg") item['desc'] = this.info.business }) } diff --git a/pages-shop/static/inImage.jpg b/pages-shop/static/inImage.jpg new file mode 100644 index 0000000..e7dd586 Binary files /dev/null and b/pages-shop/static/inImage.jpg differ diff --git a/pages-shop/static/outImage.jpg b/pages-shop/static/outImage.jpg new file mode 100644 index 0000000..2361a2e Binary files /dev/null and b/pages-shop/static/outImage.jpg differ diff --git a/pages.json b/pages.json index 95c1536..c7f9f62 100644 --- a/pages.json +++ b/pages.json @@ -1,7 +1,7 @@ { "easycom": { - "^u-(.*)": "uview-ui/components/u-$1/u-$1.vue" - }, + "^u-(.*)": "uview-ui/components/u-$1/u-$1.vue" + }, "pages": [ //pages数组中第一项表示应用启动页,参考:https://uniapp.dcloud.io/collocation/pages // // { // // "path": "pages/index/index", @@ -9,13 +9,6 @@ // // "navigationBarTitleText": "uni-app" // // } // // }, - { - "path" : "pages/home/home", - "style" : - { - "navigationBarTitleText" : "" - } - }, { "path": "pages/login/login", "style": { @@ -23,151 +16,154 @@ } }, { - "path" : "pages/orderList/orderList", - "style" : - { - "navigationBarTitleText" : "" + "path": "pages/my/my", + "style": { + "navigationBarTitleText": "" + } + }, + + { + "path": "pages/myReservation/myReservation", + "style": { + "navigationBarTitleText": "" } }, { - "path" : "pages/my/my", - "style" : - { - "navigationBarTitleText" : "" + "path": "pages/myCar/myCar", + "style": { + "navigationBarTitleText": "" } }, { - "path" : "pages/home/active", - "style" : - { - "navigationBarTitleText" : "" + "path": "pages/my/myInfo", + "style": { + "navigationBarTitleText": "" } }, { - "path" : "pages/myReservation/myReservation", - "style" : - { - "navigationBarTitleText" : "" + "path": "pages/myCar/carDetail", + "style": { + "navigationBarTitleText": "" } }, { - "path" : "pages/myCar/myCar", - "style" : - { - "navigationBarTitleText" : "" + "path": "pages/my/myEquity", + "style": { + "navigationBarTitleText": "" } }, { - "path" : "pages/shopDetail/shopDetail", - "style" : - { - "navigationBarTitleText" : "" + "path": "pages/my/register", + "style": { + "navigationBarTitleText": "" } }, { - "path" : "pages/orderDetail/orderDetail", - "style" : - { - "navigationBarTitleText" : "" + "path": "pages/myReservation/addReservation", + "style": { + "navigationBarTitleText": "" } }, { - "path" : "pages/my/myInfo", - "style" : - { - "navigationBarTitleText" : "" + "path": "pages/my/message", + "style": { + "navigationBarTitleText": "" } }, { - "path" : "pages/myCar/carDetail", - "style" : - { - "navigationBarTitleText" : "" + "path": "pages/my/cardRoll", + "style": { + "navigationBarTitleText": "" } }, { - "path" : "pages/my/myEquity", - "style" : - { - "navigationBarTitleText" : "" + "path": "pages/myReservation/reservationSuccess", + "style": { + "navigationBarTitleText": "" } }, { - "path" : "pages/my/register", - "style" : - { - "navigationBarTitleText" : "" + "path": "pages/guideList/guideList", + "style": { + "navigationBarTitleText": "" } }, { - "path" : "pages/myReservation/addReservation", - "style" : - { - "navigationBarTitleText" : "" + "path": "pages/guideList/guideDetail", + "style": { + "navigationBarTitleText": "" } }, { - "path" : "pages/my/message", - "style" : - { - "navigationBarTitleText" : "" + "path": "pages/login/bindPhoe", + "style": { + "navigationBarTitleText": "" } + } + ], + "subPackages": [ + { + "root": "pages-order", + "pages": [ + { + "path": "orderList/orderList", + "style": { + "navigationBarTitleText": "" + } + }, + { + "path": "orderDetail/evaluate", + "style": { + "navigationBarTitleText": "" + } + }, + { + "path": "orderDetail/orderDetail", + "style": { + "navigationBarTitleText": "" + } + }, + { + "path": "my/evaluate", + "style": { + "navigationBarTitleText": "" + } + } + ] }, { - "path" : "pages/my/evaluate", - "style" : - { - "navigationBarTitleText" : "" - } + "root": "pages-shop", + "pages": [ + { + "path": "shopDetail/shopDetail", + "style": { + "navigationBarTitleText": "" + } + } + ] }, { - "path" : "pages/my/cardRoll", - "style" : - { - "navigationBarTitleText" : "" - } - }, - { - "path" : "pages/myReservation/reservationSuccess", - "style" : - { - "navigationBarTitleText" : "" - } - }, - { - "path" : "pages/orderDetail/evaluate", - "style" : - { - "navigationBarTitleText" : "" - } - }, - { - "path" : "pages/guideList/guideList", - "style" : - { - "navigationBarTitleText" : "" - } - }, - { - "path" : "pages/guideList/guideDetail", - "style" : - { - "navigationBarTitleText" : "" - } - }, - { - "path" : "pages/login/bindPhoe", - "style" : - { - "navigationBarTitleText" : "" - } - }, - { - "path" : "pages/home/content", - "style" : - { - "navigationBarTitleText" : "" - } + "root": "pages-home", + "pages": [ + { + "path": "home/home", + "style": { + "navigationBarTitleText": "" + } + }, + { + "path": "home/active", + "style": { + "navigationBarTitleText": "" + } + }, + { + "path": "home/content", + "style": { + "navigationBarTitleText": "" + } + } + ] } ], "globalStyle": { diff --git a/pages/index/index.vue b/pages/index/index.vue index 1deb8d8..9454b04 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -16,7 +16,7 @@ onLoad() { if (getToken()) { uni.reLaunch({ - url: '/pages/home/home' + url: '/pages-home/home/home' }) } else { uni.reLaunch({ diff --git a/pages/login/bindPhoe.vue b/pages/login/bindPhoe.vue index 2c73ef6..b38a232 100644 --- a/pages/login/bindPhoe.vue +++ b/pages/login/bindPhoe.vue @@ -118,7 +118,7 @@ import request from '../../utils/request'; }) return false; } - + request({ url: '/rescue/updateUserQx', method: 'post', @@ -137,7 +137,7 @@ import request from '../../utils/request'; if (res.code == 200) { setToken(uni.getStorageSync('validaCodeToken')) uni.reLaunch({ - url: '/pages/home/home' + url: '/pages-home/home/home' }) } else { uni.showToast({ @@ -195,7 +195,7 @@ import request from '../../utils/request'; display: flex; align-items: center; justify-content: center; - + &.disabled { background-color: #1890ff99; } @@ -214,4 +214,4 @@ import request from '../../utils/request'; justify-content: center; } } - \ No newline at end of file + diff --git a/pages/login/login.vue b/pages/login/login.vue index b08381f..68be44b 100644 --- a/pages/login/login.vue +++ b/pages/login/login.vue @@ -167,7 +167,7 @@ }) } else { uni.reLaunch({ - url: '/pages/home/home' + url: '/pages-home/home/home' }) } } else { diff --git a/pages/my/my.vue b/pages/my/my.vue index 351930b..5438aed 100644 --- a/pages/my/my.vue +++ b/pages/my/my.vue @@ -90,7 +90,7 @@ menuCard1: [ { title: '我的资料', icon: require('@/static/icons/my-menu-icon1.png'), path: '/pages/my/myInfo' }, { title: '我的卡券', icon: require('@/static/icons/my-menu-icon5.png'), path: "/pages/my/cardRoll" }, - { title: '我的评价', icon: require('@/static/icons/my-menu-icon3.png'), path: '/pages/my/evaluate' }, + { title: '我的评价', icon: require('@/static/icons/my-menu-icon3.png'), path: '/pages-order/my/evaluate' }, ], menuCard2: [ { title: '消息中心', icon: require('@/static/icons/my-menu-icon2.png'), path: '/pages/my/message' }, diff --git a/pages/my/register.vue b/pages/my/register.vue index 6bc54e6..cd9ad32 100644 --- a/pages/my/register.vue +++ b/pages/my/register.vue @@ -102,7 +102,7 @@ export default { methods: { goHome(){ uni.reLaunch({ - url:'/pages/home/home' + url:'/pages-home/home/home' }) }, /** @@ -120,7 +120,7 @@ export default { }).then((res) => { if (res.code==200) { uni.reLaunch({ - url: '/pages/home/home' + url: '/pages-home/home/home' }) } else { uni.showToast({ diff --git a/static/images/banner.jpg b/static/images/banner.jpg deleted file mode 100644 index 62f82f4..0000000 Binary files a/static/images/banner.jpg and /dev/null differ