diff --git a/.gitignore b/.gitignore index 7ce6e50..28561a1 100644 --- a/.gitignore +++ b/.gitignore @@ -18,4 +18,6 @@ dist *.ntvs* *.njsproj *.sln -*.sw? \ No newline at end of file +*.sw? + +.env \ No newline at end of file diff --git a/src/pages.json b/src/pages.json index e0a2293..aa76d6c 100644 --- a/src/pages.json +++ b/src/pages.json @@ -1,296 +1,296 @@ { - "easycom": { - "autoscan": true, - "custom": { - "^base-(.*)": "@/sheep/components/base/base-$1/base-$1.vue", - "^crud-(.*)": "@/sheep/components/crud/crud-$1/crud-$1.vue", - "^tm-(.*)": "@/uni_modules/tm-ui/components/tm-$1/tm-$1.vue", - "^(?!z-paging-refresh|z-paging-load-more)z-paging(.*)": "z-paging/components/z-paging$1/z-paging$1.vue" - } - }, - "pages": [ - { - "path": "pages/tabbar/home", - "style": { - "navigationBarTitleText": "首页", - "disableScroll": true - } - }, - { - "path": "pages/tabbar/shop", - "style": { - "navigationBarTitleText": "商店", - "disableScroll": true - } - }, - { - "path": "pages/tabbar/order", - "style": { - "navigationBarTitleText": "订单", - "disableScroll": true - } - }, - { - "path": "pages/tabbar/my", - "style": { - "navigationBarTitleText": "我的", - "disableScroll": true - } - } - ], - "subPackages": [ - { - "root": "pages/order", - "pages": [] - }, - { - "root": "pages/shop", - "pages": [ - { - "path": "detail", - "style": { - "navigationBarTitleText": "", - "disableScroll": true - } - }, - { - "path": "product-detail", - "style": { - "navigationBarTitleText": "", - "disableScroll": true - } - } - ] - }, - { - "root": "pages/apply", - "pages": [ - { - "path": "foreign-apply", - "style": { - "navigationBarTitleText": "", - "disableScroll": true - } - }, - { - "path": "foreign-list", - "style": { - "navigationBarTitleText": "", - "disableScroll": true - } - }, - { - "path": "foreign-items", - "style": { - "navigationBarTitleText": "", - "disableScroll": true - } - }, - { - "path": "stride-apply", - "style": { - "navigationBarTitleText": "", - "disableScroll": true - } - }, - { - "path": "stride-list", - "style": { - "navigationBarTitleText": "", - "disableScroll": true - } - }, - { - "path": "stride-items", - "style": { - "navigationBarTitleText": "", - "disableScroll": true - } - } - ] - }, - { - "root": "pages/boxes", - "pages": [ - { - "path": "apply", - "style": { - "navigationBarTitleText": "", - "disableScroll": true - } - }, - { - "path": "detail", - "style": { - "navigationBarTitleText": "", - "disableScroll": true - } - }, - { - "path": "list", - "style": { - "navigationBarTitleText": "", - "disableScroll": true - } - }, - { - "path": "apply-list", - "style": { - "navigationBarTitleText": "", - "disableScroll": true - } - } - ] - }, - { - "root": "pages/merchant", - "pages": [ - { - "path": "detail", - "style": { - "navigationBarTitleText": "", - "disableScroll": true - } - }, - { - "path": "food", - "style": { - "navigationBarTitleText": "菜谱", - "navigationBarBackgroundColor": "#1777FF", - "disableScroll": true - } - }, - { - "path": "product-detail", - "style": { - "navigationBarTitleText": "", - "disableScroll": true - } - } - ] - }, - { - "root": "pages/order", - "pages": [ - { - "path": "detail", - "style": { - "navigationBarTitleText": "", - "disableScroll": true - } - } - ] - }, - { - "root": "pages/refund", - "pages": [ - { - "path": "apply", - "style": { - "navigationBarTitleText": "", - "disableScroll": true - } - }, - { - "path": "history", - "style": { - "navigationBarTitleText": "", - "disableScroll": true - } - } - ] - }, - { - "root": "pages/test", - "pages": [ - { - "path": "login", - "style": { - "navigationBarTitleText": "", - "disableScroll": true - } - } - ] - }, - { - "root": "pages/wallet", - "pages": [ - { - "path": "list", - "style": { - "navigationBarTitleText": "", - "disableScroll": true - } - }, - { - "path": "detail", - "style": { - "navigationBarTitleText": "", - "disableScroll": true - } - }, - { - "path": "recharge", - "style": { - "navigationBarTitleText": "", - "disableScroll": true - } - } - ] - }, - { - "root": "pages/human-face", - "pages": [ - { - "path": "list", - "style": { - "navigationBarTitleText": "", - "disableScroll": true - } - }, - { - "path": "apply", - "style": { - "navigationBarTitleText": "", - "disableScroll": true - } - } - ] - } - ], - "globalStyle": { - "navigationBarTextStyle": "black", - "navigationBarTitleText": "浦江小程序", - "navigationBarBackgroundColor": "#1777FF", - "backgroundColor": "#ecf4f9", - "navigationStyle": "custom" - }, - "tabBar": { - "list": [ - { - "pagePath": "pages/tabbar/home", - "text": "首页", - "iconPath": "static/tabbar/home.png", - "selectedIconPath": "static/tabbar/home-select.png" - }, - { - "pagePath": "pages/tabbar/shop", - "text": "超市", - "iconPath": "static/tabbar/shop.png", - "selectedIconPath": "static/tabbar/shop-select.png" - }, - { - "pagePath": "pages/tabbar/order", - "text": "订单", - "iconPath": "static/tabbar/order.png", - "selectedIconPath": "static/tabbar/order-select.png" - }, - { - "pagePath": "pages/tabbar/my", - "text": "我的", - "iconPath": "static/tabbar/my.png", - "selectedIconPath": "static/tabbar/my-select.png" - } - ] - } -} \ No newline at end of file + "easycom": { + "autoscan": true, + "custom": { + "^base-(.*)": "@/sheep/components/base/base-$1/base-$1.vue", + "^crud-(.*)": "@/sheep/components/crud/crud-$1/crud-$1.vue", + "^tm-(.*)": "@/uni_modules/tm-ui/components/tm-$1/tm-$1.vue", + "^(?!z-paging-refresh|z-paging-load-more)z-paging(.*)": "z-paging/components/z-paging$1/z-paging$1.vue" + } + }, + "pages": [ + { + "path": "pages/tabbar/home", + "style": { + "navigationBarTitleText": "首页", + "disableScroll": true + } + }, + { + "path": "pages/tabbar/shop", + "style": { + "navigationBarTitleText": "商店", + "disableScroll": true + } + }, + { + "path": "pages/tabbar/order", + "style": { + "navigationBarTitleText": "订单", + "disableScroll": true + } + }, + { + "path": "pages/tabbar/my", + "style": { + "navigationBarTitleText": "我的", + "disableScroll": true + } + } + ], + "subPackages": [ + { + "root": "pages/order", + "pages": [] + }, + { + "root": "pages/shop", + "pages": [ + { + "path": "detail", + "style": { + "navigationBarTitleText": "", + "disableScroll": true + } + }, + { + "path": "product-detail", + "style": { + "navigationBarTitleText": "", + "disableScroll": true + } + } + ] + }, + { + "root": "pages/apply", + "pages": [ + { + "path": "foreign-apply", + "style": { + "navigationBarTitleText": "", + "disableScroll": true + } + }, + { + "path": "foreign-list", + "style": { + "navigationBarTitleText": "", + "disableScroll": true + } + }, + { + "path": "foreign-items", + "style": { + "navigationBarTitleText": "", + "disableScroll": true + } + }, + { + "path": "stride-apply", + "style": { + "navigationBarTitleText": "", + "disableScroll": true + } + }, + { + "path": "stride-list", + "style": { + "navigationBarTitleText": "", + "disableScroll": true + } + }, + { + "path": "stride-items", + "style": { + "navigationBarTitleText": "", + "disableScroll": true + } + } + ] + }, + { + "root": "pages/boxes", + "pages": [ + { + "path": "apply", + "style": { + "navigationBarTitleText": "", + "disableScroll": true + } + }, + { + "path": "detail", + "style": { + "navigationBarTitleText": "", + "disableScroll": true + } + }, + { + "path": "list", + "style": { + "navigationBarTitleText": "", + "disableScroll": true + } + }, + { + "path": "apply-list", + "style": { + "navigationBarTitleText": "", + "disableScroll": true + } + } + ] + }, + { + "root": "pages/merchant", + "pages": [ + { + "path": "detail", + "style": { + "navigationBarTitleText": "", + "disableScroll": true + } + }, + { + "path": "food", + "style": { + "navigationBarTitleText": "菜谱", + "navigationBarBackgroundColor": "#1777FF", + "disableScroll": true + } + }, + { + "path": "product-detail", + "style": { + "navigationBarTitleText": "", + "disableScroll": true + } + } + ] + }, + { + "root": "pages/order", + "pages": [ + { + "path": "detail", + "style": { + "navigationBarTitleText": "", + "disableScroll": true + } + } + ] + }, + { + "root": "pages/refund", + "pages": [ + { + "path": "apply", + "style": { + "navigationBarTitleText": "", + "disableScroll": true + } + }, + { + "path": "history", + "style": { + "navigationBarTitleText": "", + "disableScroll": true + } + } + ] + }, + { + "root": "pages/test", + "pages": [ + { + "path": "login", + "style": { + "navigationBarTitleText": "", + "disableScroll": true + } + } + ] + }, + { + "root": "pages/wallet", + "pages": [ + { + "path": "list", + "style": { + "navigationBarTitleText": "", + "disableScroll": true + } + }, + { + "path": "detail", + "style": { + "navigationBarTitleText": "", + "disableScroll": true + } + }, + { + "path": "recharge", + "style": { + "navigationBarTitleText": "", + "disableScroll": true + } + } + ] + }, + { + "root": "pages/human-face", + "pages": [ + { + "path": "list", + "style": { + "navigationBarTitleText": "", + "disableScroll": true + } + }, + { + "path": "apply", + "style": { + "navigationBarTitleText": "", + "disableScroll": true + } + } + ] + } + ], + "globalStyle": { + "navigationBarTextStyle": "black", + "navigationBarTitleText": "浦江小程序", + "navigationBarBackgroundColor": "#1777FF", + "backgroundColor": "#ecf4f9", + "navigationStyle": "custom" + }, + "tabBar": { + "list": [ + { + "pagePath": "pages/tabbar/home", + "text": "首页", + "iconPath": "static/tabbar/home.png", + "selectedIconPath": "static/tabbar/home-select.png" + }, + { + "pagePath": "pages/tabbar/shop", + "text": "超市", + "iconPath": "static/tabbar/shop.png", + "selectedIconPath": "static/tabbar/shop-select.png" + }, + { + "pagePath": "pages/tabbar/order", + "text": "订单", + "iconPath": "static/tabbar/order.png", + "selectedIconPath": "static/tabbar/order-select.png" + }, + { + "pagePath": "pages/tabbar/my", + "text": "我的", + "iconPath": "static/tabbar/my.png", + "selectedIconPath": "static/tabbar/my-select.png" + } + ] + } +} diff --git a/src/pages/human-face/apply.vue b/src/pages/human-face/apply.vue index 86c4c92..b588e35 100644 --- a/src/pages/human-face/apply.vue +++ b/src/pages/human-face/apply.vue @@ -1,105 +1,115 @@ diff --git a/src/pages/tabbar/shop.vue b/src/pages/tabbar/shop.vue index ff1aebd..16a4f05 100644 --- a/src/pages/tabbar/shop.vue +++ b/src/pages/tabbar/shop.vue @@ -15,6 +15,10 @@ const state = reactive({ onLoad(() => {}) onShow(() => { + router.jump("/pages/tabbar/home") + uni.showToast({ title: "敬请期待", icon: "none", duration: 1000 }) + return + if (pageRef.value) { pageRef.value.reload(false) }