From caa18dffcb2a319229c8fe83ba92d5759c509a2b Mon Sep 17 00:00:00 2001 From: zpc Date: Mon, 16 Jun 2025 14:59:04 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E3=80=81=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common/common.js | 8 +- common/config.js | 24 +- common/env.js | 2 +- common/gotopage.js | 4 +- common/platform/AppPlatform.js | 14 +- common/platform/BasePlatform.js | 10 +- common/platform/H5Platform.js | 2 +- common/platform/MiniProgramPlatform.js | 6 +- common/request.js | 8 +- common/router.js | 6 +- components/coupon-pop/coupon-pop.vue | 2 +- components/empty-state/empty-state.vue | 2 +- components/gbro-marquee/marquee.vue | 510 ---- components/lff-barrage/lff-barrage.vue | 286 --- components/lff-barrage/markdown.md | 15 - components/nav-header/nav-header.vue | 2 +- components/tab-bar/tab-bar.vue | 8 +- custom-tab-bar/index.js | 58 - custom-tab-bar/index.json | 3 - custom-tab-bar/index.wxml | 10 - custom-tab-bar/index.wxss | 42 - package/index/coupon-center.vue | 213 -- package/index/leitai.vue | 1941 --------------- package/index/lian-ji.vue | 2186 ----------------- package/index/sign.vue | 312 --- package/mine/collect.vue | 399 --- package/mine/skill-card.vue | 146 -- package/mine/ti-qu.vue | 622 ----- pages.json | 174 +- pages/index/index.vue | 2 +- pages/infinite/benefit.vue | 4 +- pages/infinite/bonus_house_details.vue | 2 +- pages/infinite/index.vue | 2 +- pages/kit/kit.vue | 4 +- pages/{shouye => main}/bangdan.vue | 4 +- pages/{shouye => main}/canvas-prize-demo.vue | 0 pages/{shouye => main}/dada_ranking.vue | 0 pages/{shouye => main}/danye.vue | 0 pages/{shouye => main}/detail.vue | 6 +- pages/{shouye => main}/detail_wuxian.vue | 4 +- pages/{shouye => main}/huanxiang.vue | 0 pages/{shouye => main}/index.vue | 14 +- pages/{shouye => main}/invite_ranking.vue | 2 +- pages/{shouye => main}/prize-wheel-demo.vue | 0 pages/{shouye => main}/ranking.vue | 0 pages/{shouye => main}/rili.vue | 0 pages/{shouye => main}/slots.vue | 0 pages/other/about.vue | 2 +- {package/mine => pages/other}/qy-rule.vue | 0 pages/{mall => shangcheng}/index.vue | 2 +- pages/user/login.vue | 569 ----- pages/{user => users}/bangding.vue | 4 +- pages/{user => users}/bangdingweb.vue | 0 pages/{user => users}/bi_jl.vue | 0 pages/{user => users}/cancel-account-page.vue | 2 +- pages/{user => users}/change.vue | 0 pages/users/collect.vue | 357 +++ .../mine => pages/users}/coupon-detail.vue | 2 +- pages/{user => users}/coupon.vue | 8 +- {package/mine => pages/users}/equity.vue | 8 +- pages/{user => users}/fhjl.vue | 4 +- pages/{user => users}/hsjl.vue | 0 pages/{user => users}/index.vue | 34 +- pages/{user => users}/jf_jl.vue | 0 pages/users/login.vue | 562 +++++ pages/{user => users}/myCa.vue | 0 pages/{user => users}/my_coupon.vue | 6 +- pages/{user => users}/order.vue | 0 pages/{user => users}/recharge-page.vue | 0 pages/{user => users}/tui-guang.vue | 6 +- pages/{user => users}/vip.vue | 0 pages/{user => users}/wuliu_detail.vue | 0 pages/{user => users}/xfjl.vue | 0 pages/{user => users}/yetx.vue | 0 static/app-plus/no-data.png | Bin 0 -> 3686 bytes .../mescroll-empty/mescroll-empty.vue | 2 +- 76 files changed, 1090 insertions(+), 7537 deletions(-) delete mode 100644 components/gbro-marquee/marquee.vue delete mode 100644 components/lff-barrage/lff-barrage.vue delete mode 100644 components/lff-barrage/markdown.md delete mode 100644 custom-tab-bar/index.js delete mode 100644 custom-tab-bar/index.json delete mode 100644 custom-tab-bar/index.wxml delete mode 100644 custom-tab-bar/index.wxss delete mode 100644 package/index/coupon-center.vue delete mode 100644 package/index/leitai.vue delete mode 100644 package/index/lian-ji.vue delete mode 100644 package/index/sign.vue delete mode 100644 package/mine/collect.vue delete mode 100644 package/mine/skill-card.vue delete mode 100644 package/mine/ti-qu.vue rename pages/{shouye => main}/bangdan.vue (99%) rename pages/{shouye => main}/canvas-prize-demo.vue (100%) rename pages/{shouye => main}/dada_ranking.vue (100%) rename pages/{shouye => main}/danye.vue (100%) rename pages/{shouye => main}/detail.vue (99%) rename pages/{shouye => main}/detail_wuxian.vue (99%) rename pages/{shouye => main}/huanxiang.vue (100%) rename pages/{shouye => main}/index.vue (98%) rename pages/{shouye => main}/invite_ranking.vue (98%) rename pages/{shouye => main}/prize-wheel-demo.vue (100%) rename pages/{shouye => main}/ranking.vue (100%) rename pages/{shouye => main}/rili.vue (100%) rename pages/{shouye => main}/slots.vue (100%) rename {package/mine => pages/other}/qy-rule.vue (100%) rename pages/{mall => shangcheng}/index.vue (99%) delete mode 100644 pages/user/login.vue rename pages/{user => users}/bangding.vue (95%) rename pages/{user => users}/bangdingweb.vue (100%) rename pages/{user => users}/bi_jl.vue (100%) rename pages/{user => users}/cancel-account-page.vue (98%) rename pages/{user => users}/change.vue (100%) create mode 100644 pages/users/collect.vue rename {package/mine => pages/users}/coupon-detail.vue (99%) rename pages/{user => users}/coupon.vue (97%) rename {package/mine => pages/users}/equity.vue (98%) rename pages/{user => users}/fhjl.vue (98%) rename pages/{user => users}/hsjl.vue (100%) rename pages/{user => users}/index.vue (94%) rename pages/{user => users}/jf_jl.vue (100%) create mode 100644 pages/users/login.vue rename pages/{user => users}/myCa.vue (100%) rename pages/{user => users}/my_coupon.vue (99%) rename pages/{user => users}/order.vue (100%) rename pages/{user => users}/recharge-page.vue (100%) rename pages/{user => users}/tui-guang.vue (98%) rename pages/{user => users}/vip.vue (100%) rename pages/{user => users}/wuliu_detail.vue (100%) rename pages/{user => users}/xfjl.vue (100%) rename pages/{user => users}/yetx.vue (100%) create mode 100644 static/app-plus/no-data.png diff --git a/common/common.js b/common/common.js index db4abc7..7aa4e1e 100644 --- a/common/common.js +++ b/common/common.js @@ -118,7 +118,7 @@ export default { if (item.ttype == 2) { /* 一番赏 */ this.to({ - url: '/pages/shouye/detail', + url: '/pages/main/detail', query: { goods_id: item.goods_id } @@ -128,7 +128,7 @@ export default { /* 无限赏 */ if (item.ttype == 3) { this.to({ - url: '/pages/shouye/detail_wuxian', + url: '/pages/main/detail_wuxian', query: { goods_id: item.goods_id } @@ -492,7 +492,7 @@ export default { routerNavigateBack(delta) .catch(() => { // 如果返回失败，则回到首页 - routerNavigateTo('/pages/shouye/index', {}, 'switchTab'); + routerNavigateTo('/pages/main/index', {}, 'switchTab'); }); }, @@ -516,7 +516,7 @@ export default { routerNavigateBack(num) .catch(() => { // 如果返回失败，则回到首页 - routerNavigateTo('/pages/shouye/index', {}, 'reLaunch'); + routerNavigateTo('/pages/main/index', {}, 'reLaunch'); }); }, time * 1000) }, diff --git a/common/config.js b/common/config.js index 3b8af44..829fb21 100644 --- a/common/config.js +++ b/common/config.js @@ -12,24 +12,24 @@ const wx_version = "117"; // 白名单页面（不需要登录即可访问） export const whiteList = [ - "pages/shouye/index", // 首页 + "pages/main/index", // 首页 "pages/index/index", - "pages/shouye/detail", // 详情页 - "pages/shouye/huanxiang", // 换箱页面 - "pages/mall/index", // 商城首页 - "pages/shouye/detail_wuxian", // 无限详情页 + "pages/main/detail", // 详情页 + "pages/main/huanxiang", // 换箱页面 + "pages/shangcheng/index", // 商城首页 + "pages/main/detail_wuxian", // 无限详情页 "pages/kit/kit", // 盒柜页面 "pages/infinite/index", // 福利首页 - "pages/user/index", // 用户中心 + "pages/users/index", // 用户中心 "pages/infinite/daily_check_in", // 每日签到 "pages/infinite/bonus_house", // 福利屋 "pages/other/prize_draw", // 每日奖品抽取 - "pages/shouye/danye", // 单页 + "pages/main/danye", // 单页 "pages/guize/guize", // 规则页面 - "pages/shouye/dada_ranking", // 达达排行榜 - "pages/shouye/invite_ranking", // 邀请排行榜 - "pages/user/login", // 登录页面 - "pages/shouye/slots", + "pages/main/dada_ranking", // 达达排行榜 + "pages/main/invite_ranking", // 邀请排行榜 + "pages/users/login", // 登录页面 + "pages/main/slots", "pages/other/web-pay-order", // 网页支付订单 "pages/other/web-pay-success", // 网页支付成功 "pages/other/about"// 其它页面 @@ -259,7 +259,7 @@ class ConfigManager { if (res.confirm) { console.log('开始重启'); wx.restartMiniProgram({ - path: "/pages/shouye/index" + path: "/pages/main/index" }); // 新的版本已经下载好，调用 applyUpdate 应用新版本并重启 //updateManager.applyUpdate(); diff --git a/common/env.js b/common/env.js index a1b2027..adaa76e 100644 --- a/common/env.js +++ b/common/env.js @@ -41,7 +41,7 @@ const testing = { // 根据环境变量选择对应配置 -let currentEnv = production;//production;//testing;//production_wz; +let currentEnv = testing;//production;//testing;//production_wz; // 衍生配置 const config = { ...currentEnv, diff --git a/common/gotopage.js b/common/gotopage.js index 6f83803..d460cab 100644 --- a/common/gotopage.js +++ b/common/gotopage.js @@ -7,7 +7,7 @@ const tabBarLinks = [ '/pages/index/index', '/pages/product/category', '/pages/cart/cart', - '/pages/user/index/index', + '/pages/users/index/index', '/pages/shop/index' ]; @@ -15,7 +15,7 @@ const tabBarLinks = [ const shareLinks = [ '/pages/plus/assemble/fight-group-detail/fight-group-detail', '/pages/plus/bargain/haggle/haggle', - '/pages/user/invite/invite', + '/pages/users/invite/invite', '/pages/product/detail/detail', '/pages/plus/seckill/detail/detail', '/pages/plus/assemble/detail/detail', diff --git a/common/platform/AppPlatform.js b/common/platform/AppPlatform.js index c4a99da..3e52518 100644 --- a/common/platform/AppPlatform.js +++ b/common/platform/AppPlatform.js @@ -45,7 +45,7 @@ class AppPlatform extends BasePlatform { }); // uni.showTabBar({}) uni.switchTab({ - url: '/pages/mall/index' + url: '/pages/shangcheng/index' }); // uni.tos } else { @@ -58,7 +58,7 @@ class AppPlatform extends BasePlatform { visible: true, }); uni.switchTab({ - url: '/pages/shouye/index' + url: '/pages/main/index' }); } }) @@ -219,7 +219,7 @@ class AppPlatform extends BasePlatform { show: true, title: '商品退换货', icon: 'my/huan.svg', - path: '/pages/shouye/danye?advert=29', + path: '/pages/main/danye?advert=29', handler: this.navigateToPath.bind(this) }; for (let i = 0; i < baseMenuList.length; i++) { @@ -227,10 +227,12 @@ class AppPlatform extends BasePlatform { if (menu.id == 3) { if (!this.getIsCheck("user_menu_3")) { menuList.push(menu); + } - } if (menu.id == 5) { + } else if (menu.id == 5) { if (!this.getIsCheck("user_menu_5")) { menuList.push(menu); + continue; } } else { menuList.push(menu); @@ -336,11 +338,11 @@ class AppPlatform extends BasePlatform { console.log("AppLaunch", res); if (!res.isCheck) { uni.switchTab({ - url: '/pages/shouye/index' + url: '/pages/main/index' }); } else { uni.switchTab({ - url: '/pages/mall/index' + url: '/pages/shangcheng/index' }); } }); diff --git a/common/platform/BasePlatform.js b/common/platform/BasePlatform.js index bbc29f8..9ee41f1 100644 --- a/common/platform/BasePlatform.js +++ b/common/platform/BasePlatform.js @@ -31,7 +31,7 @@ class BasePlatform { async appData() { await this.loadCacheData(); uni.switchTab({ - url: '/pages/shouye/index' + url: '/pages/main/index' }); } @@ -138,7 +138,7 @@ class BasePlatform { show: true, title: '我的收藏', icon: 'my/s3.png', - path: '/package/mine/collect', + path: '/pages/users/collect', handler: this.navigateToPath.bind(this) }, { @@ -146,7 +146,7 @@ class BasePlatform { show: true, title: '优惠券', icon: 'my/s4.png', - path: '/pages/user/coupon', + path: '/pages/users/coupon', handler: this.navigateToPath.bind(this) }, { @@ -154,7 +154,7 @@ class BasePlatform { show: true, title: '邀请好友', icon: 'my/s5.png', - path: '/pages/user/tui-guang', + path: '/pages/users/tui-guang', handler: this.navigateToPath.bind(this) }, { @@ -182,7 +182,7 @@ class BasePlatform { show: true, title: '注销账号', icon: 'my/s10.png', - path: '/pages/user/cancel-account-page', + path: '/pages/users/cancel-account-page', handler: this.navigateToPath.bind(this) }), m.push({ diff --git a/common/platform/H5Platform.js b/common/platform/H5Platform.js index e0672b2..cfb9464 100644 --- a/common/platform/H5Platform.js +++ b/common/platform/H5Platform.js @@ -172,7 +172,7 @@ class H5Platform extends BasePlatform { // if (window.location.pathname == "/" || window.location.pathname == "/pages/index/index") { // uni.switchTab({ - // url: '/pages/shouye/index' + // url: '/pages/main/index' // }); // } } diff --git a/common/platform/MiniProgramPlatform.js b/common/platform/MiniProgramPlatform.js index 4b122ce..a88ea75 100644 --- a/common/platform/MiniProgramPlatform.js +++ b/common/platform/MiniProgramPlatform.js @@ -219,7 +219,7 @@ class MiniProgramPlatform extends BasePlatform { // if (options != null && options.path == "pages/index/index") { // uni.switchTab({ - // url: '/pages/shouye/index' + // url: '/pages/main/index' // }); // } } @@ -228,7 +228,7 @@ class MiniProgramPlatform extends BasePlatform { console.log("getAccountInfoSync",t); await this.loadCacheData(); uni.switchTab({ - url: '/pages/shouye/index' + url: '/pages/main/index' }); // this.getConfig().then(res => { // console.log(res, 'res'); @@ -296,7 +296,7 @@ class MiniProgramPlatform extends BasePlatform { uni.removeStorageSync('token'); uni.removeStorageSync('userinfo'); uni.switchTab({ - url: '/pages/shouye/index' + url: '/pages/main/index' }); } } diff --git a/common/request.js b/common/request.js index 0610331..290d385 100644 --- a/common/request.js +++ b/common/request.js @@ -266,12 +266,12 @@ class RequestManager { setTimeout(() => { // #ifdef H5 uni.navigateTo({ - url: '/pages/user/bangdingweb' + url: '/pages/users/bangdingweb' }) // #endif // #ifdef MP-WEIXIN uni.navigateTo({ - url: '/pages/user/bangding' + url: '/pages/users/bangding' }) // #endif }, 1500) @@ -305,7 +305,7 @@ class RequestManager { var currentParams = currentPage.options || {}; // 只有非登录页面才保存重定向信息 - if (currentRoute && currentRoute !== 'pages/user/login') { + if (currentRoute && currentRoute !== 'pages/users/login') { // 构建完整的重定向URL var redirectPath = '/' + currentRoute; @@ -337,7 +337,7 @@ class RequestManager { uni.removeStorageSync('token'); uni.removeStorageSync('userinfo'); // 使用新的路由守卫方法进行跳转 - RouterManager.navigateTo('/pages/user/login', {}, 'navigateTo') + RouterManager.navigateTo('/pages/users/login', {}, 'navigateTo') .catch(err => { console.error('登录页面跳转失败:', err); }); diff --git a/common/router.js b/common/router.js index 9b9778c..91d48eb 100644 --- a/common/router.js +++ b/common/router.js @@ -46,13 +46,13 @@ export function navigateBack(delta = 1) { // 如果页面栈不足，直接返回首页 if (pages.length <= 1) { - return navigateTo('/pages/shouye/index', {}, 'reLaunch') + return navigateTo('/pages/main/index', {}, 'reLaunch') .then(resolve) .catch(reject); } // 查看前一个页面是否是登录页 - if (pages.length > 1 && pages[pages.length - 2].route === 'pages/user/login') { + if (pages.length > 1 && pages[pages.length - 2].route === 'pages/users/login') { // 如果前一个页面是登录页，则返回两步 uni.navigateBack({ delta: 2, @@ -108,7 +108,7 @@ export function routerTo(options) { // 使用navigateTo而非redirectTo，保留页面栈 uni.navigateTo({ - url: '/pages/user/login', + url: '/pages/users/login', success: () => { console.log('跳转到登录页面成功，保存的重定向地址：', url); }, diff --git a/components/coupon-pop/coupon-pop.vue b/components/coupon-pop/coupon-pop.vue index 42803b8..d875366 100644 --- a/components/coupon-pop/coupon-pop.vue +++ b/components/coupon-pop/coupon-pop.vue @@ -91,7 +91,7 @@ var data = { title: `快来领取${userInfo.nickname}分享的${this.ruleData.num}赏币的${this.ruleData.title}`, imageUrl: this.ruleData.level_img, - path: '/pages/user/index' + + path: '/pages/users/index' + this.$c.qs({ ou_coupon_id: this.ruleData.id }) diff --git a/components/empty-state/empty-state.vue b/components/empty-state/empty-state.vue index f73744c..bb61875 100644 --- a/components/empty-state/empty-state.vue +++ b/components/empty-state/empty-state.vue @@ -12,7 +12,7 @@ export default { // 空状态显示的图片，默认使用kong.png imageSrc: { type: String, - default: '/static/common/kong.png' + default: '/static/app-plus/no-data.png' }, // 空状态显示的文本 message: { diff --git a/components/gbro-marquee/marquee.vue b/components/gbro-marquee/marquee.vue deleted file mode 100644 index 55b650e..0000000 --- a/components/gbro-marquee/marquee.vue +++ /dev/null @@ -1,510 +0,0 @@ - - - - - diff --git a/components/lff-barrage/lff-barrage.vue b/components/lff-barrage/lff-barrage.vue deleted file mode 100644 index 99e6640..0000000 --- a/components/lff-barrage/lff-barrage.vue +++ /dev/null @@ -1,286 +0,0 @@ - - - - diff --git a/components/lff-barrage/markdown.md b/components/lff-barrage/markdown.md deleted file mode 100644 index e709651..0000000 --- a/components/lff-barrage/markdown.md +++ /dev/null @@ -1,15 +0,0 @@ -#如何使用 -###js -```javascript -import lffBarrage from '@/components/lff-barrage/lff-barrage.vue' -components:{lffBarrage}, -methods:{ - colrdo(){ //插入一条弹幕 - this.$refs.lffBarrage.add({item:'你好呀小伙子'}); - } -} -``` -###HTML -```html - -``` \ No newline at end of file diff --git a/components/nav-header/nav-header.vue b/components/nav-header/nav-header.vue index a2af64b..b229716 100644 --- a/components/nav-header/nav-header.vue +++ b/components/nav-header/nav-header.vue @@ -219,7 +219,7 @@ export default { } }); } else { - this.$customRouter.navigateTo('/pages/shouye/index', {}, 'switchTab'); + this.$customRouter.navigateTo('/pages/main/index', {}, 'switchTab'); } } }, diff --git a/components/tab-bar/tab-bar.vue b/components/tab-bar/tab-bar.vue index a6de0d1..56f615a 100644 --- a/components/tab-bar/tab-bar.vue +++ b/components/tab-bar/tab-bar.vue @@ -57,7 +57,7 @@ icon: '/static/tabbar/chousang.png', actIcon: '/static/tabbar/chousang_sel.png', title: '首页', - path: '/pages/shouye/index' + path: '/pages/main/index' }, { id: 2, @@ -85,7 +85,7 @@ icon: '/static/tabbar/mine.png', actIcon: '/static/tabbar/mine_sel.png', title: '我的', - path: '/pages/user/index' + path: '/pages/users/index' } ] @@ -95,7 +95,7 @@ icon: '/static/tabbar/chousang.png', actIcon: '/static/tabbar/chousang_sel.png', title: '首页', - path: '/pages/shouye/index' + path: '/pages/main/index' }, { id: 2, @@ -123,7 +123,7 @@ icon: '/static/tabbar/mine.png', actIcon: '/static/tabbar/mine_sel.png', title: '我的', - path: '/pages/user/index' + path: '/pages/users/index' } ] diff --git a/custom-tab-bar/index.js b/custom-tab-bar/index.js deleted file mode 100644 index f8540ef..0000000 --- a/custom-tab-bar/index.js +++ /dev/null @@ -1,58 +0,0 @@ -Component({ - data: { - selected: 0, - color: "#C6C6C6", - selectedColor: "#333333", - list: [{ - "index": 0, - "pagePath": "/pages/shouye/index", - "iconPath": "/static/tab/n1.png", - "selectedIconPath": "/static/tab/s1.png", - "text": "首页" - }, - { - "index": 2, - "pagePath": "/pages/mall/index", - "iconPath": "/static/tab/n5.png", - "selectedIconPath": "/static/tab/s5.png", - "text": "商城" - }, - { - "index": 3, - "pagePath": "/pages/kit/kit", - "iconPath": "/static/tab/n3.png", - "selectedIconPath": "/static/tab/s3.png", - "text": "盒柜" - }, - { - "index": 1, - "pagePath": "/pages/infinite/index", - "iconPath": "/static/tab/n2.png", - "selectedIconPath": "/static/tab/s2.png", - "text": "福利" - }, - { - "index": 4, - "pagePath": "/pages/user/index", - "iconPath": "/static/tab/n4.png", - "selectedIconPath": "/static/tab/s4.png", - "text": "我的" - } - ] - }, - attached() {}, - methods: { - switchTab(e) { - const data = e.currentTarget.dataset - const url = data.path - console.log(e, data, url, data.index) - wx.switchTab({ - url - }) - // console.log('aaaaaaaa', this.selected, data.index); - this.setData({ - selected: data.index - }) - } - } -}) \ No newline at end of file diff --git a/custom-tab-bar/index.json b/custom-tab-bar/index.json deleted file mode 100644 index 32640e0..0000000 --- a/custom-tab-bar/index.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "component": true -} \ No newline at end of file diff --git a/custom-tab-bar/index.wxml b/custom-tab-bar/index.wxml deleted file mode 100644 index 384bc45..0000000 --- a/custom-tab-bar/index.wxml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - {{item.text}} - - - diff --git a/custom-tab-bar/index.wxss b/custom-tab-bar/index.wxss deleted file mode 100644 index f460837..0000000 --- a/custom-tab-bar/index.wxss +++ /dev/null @@ -1,42 +0,0 @@ -.tab-bar { - position: fixed; - bottom: 0; - left: 0; - right: 0; - box-sizing: content-box; - height: 44px; - background: #FFFFFF; - display: flex; - padding-top: 10px; - box-shadow: 10px 10px 5px rgba(0, 0, 0, 0.5); - padding-bottom: env(safe-area-inset-bottom); -} - -.tab-bar-border { - background-color: #404241; - position: absolute; - left: 0; - top: 0; - width: 100%; - height: 1px; - transform: scaleY(0.5); -} - -.tab-bar-item { - flex: 1; - text-align: center; - display: flex; - justify-content: center; - align-items: center; - flex-direction: column; - position: relative; -} - -.tab-bar-item image { - width: 48rpx; - height: 48rpx; -} - -.tab-bar-item view { - font-size: 10px; -} \ No newline at end of file diff --git a/package/index/coupon-center.vue b/package/index/coupon-center.vue deleted file mode 100644 index f30d92c..0000000 --- a/package/index/coupon-center.vue +++ /dev/null @@ -1,213 +0,0 @@ - - - - - - diff --git a/package/index/leitai.vue b/package/index/leitai.vue deleted file mode 100644 index 1e88538..0000000 --- a/package/index/leitai.vue +++ /dev/null @@ -1,1941 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/package/index/lian-ji.vue b/package/index/lian-ji.vue deleted file mode 100644 index e92ca1e..0000000 --- a/package/index/lian-ji.vue +++ /dev/null @@ -1,2186 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/package/index/sign.vue b/package/index/sign.vue deleted file mode 100644 index 2f207f8..0000000 --- a/package/index/sign.vue +++ /dev/null @@ -1,312 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/package/mine/collect.vue b/package/mine/collect.vue deleted file mode 100644 index 0479772..0000000 --- a/package/mine/collect.vue +++ /dev/null @@ -1,399 +0,0 @@ - - - - - \ No newline at end of file diff --git a/package/mine/skill-card.vue b/package/mine/skill-card.vue deleted file mode 100644 index 25e4ed7..0000000 --- a/package/mine/skill-card.vue +++ /dev/null @@ -1,146 +0,0 @@ - - - - - - diff --git a/package/mine/ti-qu.vue b/package/mine/ti-qu.vue deleted file mode 100644 index 4c72a63..0000000 --- a/package/mine/ti-qu.vue +++ /dev/null @@ -1,622 +0,0 @@ - - - - - - diff --git a/pages.json b/pages.json index 0f662bc..8743861 100644 --- a/pages.json +++ b/pages.json @@ -7,27 +7,29 @@ "^detail-preview-popup$": "@/components/detail-preview-popup/detail-preview-popup.vue", "^banner$": "@/components/banner/banner.vue" }, - "pages": [{ + "pages": [ + { "path": "pages/index/index", "style": { "navigationStyle": "custom" } - }, { - "path": "pages/shouye/index", + }, + { + "path": "pages/main/index", "style": { "navigationStyle": "custom", "navigationBarTextStyle": "black" } }, { - "path": "pages/shouye/detail", + "path": "pages/main/detail", "style": { "navigationStyle": "custom", "navigationBarTextStyle": "black" } }, { - "path": "pages/shouye/detail_wuxian", + "path": "pages/main/detail_wuxian", "style": { "navigationStyle": "custom", "navigationBarBackgroundColor": "#222222", @@ -35,7 +37,7 @@ } }, { - "path": "pages/shouye/rili", + "path": "pages/main/rili", "style": { "navigationBarTitleText": "预售日历", "navigationBarBackgroundColor": "#161616", @@ -43,16 +45,15 @@ } }, { - "path": "pages/shouye/bangdan", + "path": "pages/main/bangdan", "style": { "navigationStyle": "custom", "navigationBarBackgroundColor": "#161616", "navigationBarTextStyle": "black" } }, - { - "path": "pages/shouye/huanxiang", + "path": "pages/main/huanxiang", "style": { "navigationBarTitleText": "换箱", "navigationBarBackgroundColor": "#222222", @@ -61,7 +62,7 @@ } }, { - "path": "pages/user/login", + "path": "pages/users/login", "style": { "navigationBarTitleText": "登录", "navigationBarBackgroundColor": "#FFFFFF", @@ -69,7 +70,7 @@ } }, { - "path": "pages/user/bangding", + "path": "pages/users/bangding", "style": { "navigationBarTitleText": "绑定手机号", "navigationBarBackgroundColor": "#FFFFFF", @@ -77,14 +78,14 @@ } }, { - "path": "pages/user/index", + "path": "pages/users/index", "style": { "navigationStyle": "custom", "navigationBarTextStyle": "black" } }, { - "path": "pages/user/xfjl", + "path": "pages/users/xfjl", "style": { "navigationStyle": "custom", "navigationBarTitleText": "消费记录", @@ -92,7 +93,7 @@ } }, { - "path": "pages/user/hsjl", + "path": "pages/users/hsjl", "style": { "navigationStyle": "custom", "navigationBarTitleText": "打包记录", @@ -100,7 +101,7 @@ } }, { - "path": "pages/user/fhjl", + "path": "pages/users/fhjl", "style": { "navigationStyle": "custom", "navigationBarTitleText": "发货记录", @@ -108,7 +109,7 @@ } }, { - "path": "pages/user/order", + "path": "pages/users/order", "style": { "navigationBarBackgroundColor": "#222222", "navigationBarTitleText": "订单详情", @@ -117,7 +118,7 @@ } }, { - "path": "pages/user/jf_jl", + "path": "pages/users/jf_jl", "style": { "navigationStyle": "custom", "navigationBarTitleText": "积分记录", @@ -125,14 +126,13 @@ } }, { - "path": "pages/user/vip", + "path": "pages/users/vip", "style": { "navigationStyle": "custom", "navigationBarTitleText": "会员中心", "navigationBarTextStyle": "black" } }, - { "path": "pages/guize/guize", "style": { @@ -142,7 +142,7 @@ } }, { - "path": "pages/user/my_coupon", + "path": "pages/users/my_coupon", "style": { "navigationBarTitleText": "欧气券", "navigationBarBackgroundColor": "#222222", @@ -151,13 +151,13 @@ } }, { - "path": "pages/user/bi_jl", + "path": "pages/users/bi_jl", "style": { "navigationStyle": "custom" } }, { - "path": "pages/user/wuliu_detail", + "path": "pages/users/wuliu_detail", "style": { "navigationBarTitleText": "查看物流", "navigationBarBackgroundColor": "#222222", @@ -166,16 +166,15 @@ } }, { - "path": "pages/user/tui-guang", + "path": "pages/users/tui-guang", "style": { "navigationBarTitleText": "邀请好友", "navigationStyle": "custom", "navigationBarTextStyle": "black" } }, - { - "path": "pages/user/change", + "path": "pages/users/change", "style": { "navigationStyle": "custom", "navigationBarBackgroundColor": "#222222", @@ -191,7 +190,7 @@ } }, { - "path": "pages/mall/index", + "path": "pages/shangcheng/index", "style": { "navigationBarTitleText": "", "enablePullDownRefresh": false, @@ -199,7 +198,7 @@ } }, { - "path": "pages/user/coupon", + "path": "pages/users/coupon", "style": { "navigationBarTitleText": "", "enablePullDownRefresh": false, @@ -207,7 +206,7 @@ } }, { - "path": "pages/shouye/ranking", + "path": "pages/main/ranking", "style": { "navigationBarTitleText": "", "enablePullDownRefresh": false, @@ -215,14 +214,13 @@ } }, { - "path": "pages/user/bangdingweb", + "path": "pages/users/bangdingweb", "style": { "navigationBarTitleText": "绑定手机号" } }, - { - "path": "pages/shouye/invite_ranking", + "path": "pages/main/invite_ranking", "style": { "navigationBarTitleText": "", "enablePullDownRefresh": false, @@ -252,8 +250,9 @@ "style": { "navigationStyle": "custom" } - }, { - "path": "pages/shouye/dada_ranking", + }, + { + "path": "pages/main/dada_ranking", "style": { "navigationStyle": "custom" } @@ -265,7 +264,7 @@ } }, { - "path": "pages/shouye/danye", + "path": "pages/main/danye", "style": { "navigationStyle": "custom" } @@ -289,7 +288,7 @@ } }, { - "path": "pages/shouye/slots", + "path": "pages/main/slots", "style": { "navigationStyle": "custom" } @@ -307,7 +306,7 @@ } }, { - "path": "pages/user/recharge-page", + "path": "pages/users/recharge-page", "style": { "navigationStyle": "custom" } @@ -319,13 +318,13 @@ } }, { - "path": "pages/shouye/prize-wheel-demo", + "path": "pages/main/prize-wheel-demo", "style": { "navigationStyle": "custom" } }, { - "path": "pages/shouye/canvas-prize-demo", + "path": "pages/main/canvas-prize-demo", "style": { "navigationStyle": "custom" } @@ -349,7 +348,7 @@ } }, { - "path": "pages/user/cancel-account-page", + "path": "pages/users/cancel-account-page", "style": { "navigationStyle": "custom" } @@ -361,82 +360,31 @@ } }, { - "path": "pages/user/yetx", + "path": "pages/users/yetx", + "style": { + "navigationStyle": "custom" + } + }, + { + "path": "pages/users/collect", + "style": { + "navigationStyle": "custom" + } + }, + { + "path": "pages/users/equity", + "style": { + "navigationStyle": "custom" + } + }, + { + "path": "pages/other/qy-rule", "style": { "navigationStyle": "custom" } } ], - "subPackages": [{ - "root": "package/index", - "pages": [{ - "path": "sign", - "style": { - "navigationStyle": "custom" - } - }, - { - "path": "lian-ji", - "style": { - "navigationStyle": "custom" - } - }, - { - "path": "coupon-center", - "style": { - "navigationStyle": "custom" - } - }, - { - "path": "leitai", - "style": { - "navigationBarTitleText": "", - "navigationStyle": "custom" - } - } - ] - }, - { - "root": "package/mine", - "pages": [{ - "path": "collect", - "style": { - "navigationStyle": "custom" - } - }, - { - "path": "skill-card", - "style": { - "navigationStyle": "custom" - } - }, - { - "path": "equity", - "style": { - "navigationStyle": "custom" - } - }, - { - "path": "qy-rule", - "style": { - "navigationStyle": "custom" - } - }, - { - "path": "coupon-detail", - "style": { - "navigationStyle": "custom" - } - }, - { - "path": "ti-qu", - "style": { - "navigationStyle": "custom" - } - } - ] - } - ], + "subPackages": [], "globalStyle": { "navigationBarTextStyle": "black", "navigationBarTitleText": "友达赏", @@ -456,13 +404,13 @@ "iconHeight": "24px", "list": [ { - "pagePath": "pages/shouye/index", + "pagePath": "pages/main/index", "iconPath": "static/tab/n1.png", "selectedIconPath": "static/tab/c1.png", "text": "首页" }, { - "pagePath": "pages/mall/index", + "pagePath": "pages/shangcheng/index", "iconPath": "static/tab/n5.png", "selectedIconPath": "static/tab/c5.png", "text": "商城" @@ -480,7 +428,7 @@ "text": "福利" }, { - "pagePath": "pages/user/index", + "pagePath": "pages/users/index", "iconPath": "static/tab/n4.png", "selectedIconPath": "static/tab/c4.png", "text": "我的" diff --git a/pages/index/index.vue b/pages/index/index.vue index 602bbdc..0891a7d 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -39,7 +39,7 @@ export default { toHome() { // #ifdef H5 || MP uni.switchTab({ - url: '/pages/shouye/index' + url: '/pages/main/index' }); // #endif }, diff --git a/pages/infinite/benefit.vue b/pages/infinite/benefit.vue index 02c9e2e..9c77f9b 100644 --- a/pages/infinite/benefit.vue +++ b/pages/infinite/benefit.vue @@ -52,13 +52,13 @@ export default { return { imageUrl: imageUrl, title: "友达上线,来就送！", - path: '/pages/shouye/index?pid=' + uni.getStorageSync('userinfo').ID + path: '/pages/main/index?pid=' + uni.getStorageSync('userinfo').ID } }, methods: { items(item) { this.$c.to({ - url: '/pages/shouye/detail', + url: '/pages/main/detail', query: { goods_id: item.id, type_text: '积分赏' diff --git a/pages/infinite/bonus_house_details.vue b/pages/infinite/bonus_house_details.vue index ab902c0..56bcd6d 100644 --- a/pages/infinite/bonus_house_details.vue +++ b/pages/infinite/bonus_house_details.vue @@ -693,7 +693,7 @@ export default { }, toHome() { - this.$customRouter.navigateTo('/pages/shouye/index', {}, 'reLaunch'); + this.$customRouter.navigateTo('/pages/main/index', {}, 'reLaunch'); }, applyPageTransitions() { diff --git a/pages/infinite/index.vue b/pages/infinite/index.vue index 535fa39..c79db65 100644 --- a/pages/infinite/index.vue +++ b/pages/infinite/index.vue @@ -31,7 +31,7 @@ export default { return { imageUrl: imageUrl, title: "友达上线,来就送！", - path: '/pages/shouye/index?pid=' + uni.getStorageSync('userinfo').ID + path: '/pages/main/index?pid=' + uni.getStorageSync('userinfo').ID } }, methods: { diff --git a/pages/kit/kit.vue b/pages/kit/kit.vue index b51d3f9..79a0138 100644 --- a/pages/kit/kit.vue +++ b/pages/kit/kit.vue @@ -525,7 +525,7 @@ export default { toExpress(item) { this.$c.to({ - url: '/pages/user/wuliu_detail', + url: '/pages/users/wuliu_detail', query: { id: item.id } @@ -534,7 +534,7 @@ export default { toOrder(item) { this.$c.to({ - url: '/pages/user/order', + url: '/pages/users/order', query: { id: item.id } diff --git a/pages/shouye/bangdan.vue b/pages/main/bangdan.vue similarity index 99% rename from pages/shouye/bangdan.vue rename to pages/main/bangdan.vue index 9fdc076..c86de86 100644 --- a/pages/shouye/bangdan.vue +++ b/pages/main/bangdan.vue @@ -256,9 +256,9 @@ export default { var pages = getCurrentPages() // console.log(pages) - if (pages.length == 1 && pages[0].route == 'pages/shouye/bangdan') { + if (pages.length == 1 && pages[0].route == 'pages/main/bangdan') { uni.redirectTo({ - url: '/pages/shouye/index' + url: '/pages/main/index' }) } else { uni.navigateBack() diff --git a/pages/shouye/canvas-prize-demo.vue b/pages/main/canvas-prize-demo.vue similarity index 100% rename from pages/shouye/canvas-prize-demo.vue rename to pages/main/canvas-prize-demo.vue diff --git a/pages/shouye/dada_ranking.vue b/pages/main/dada_ranking.vue similarity index 100% rename from pages/shouye/dada_ranking.vue rename to pages/main/dada_ranking.vue diff --git a/pages/shouye/danye.vue b/pages/main/danye.vue similarity index 100% rename from pages/shouye/danye.vue rename to pages/main/danye.vue diff --git a/pages/shouye/detail.vue b/pages/main/detail.vue similarity index 99% rename from pages/shouye/detail.vue rename to pages/main/detail.vue index 41bd16a..a32fc2c 100644 --- a/pages/shouye/detail.vue +++ b/pages/main/detail.vue @@ -249,7 +249,7 @@ export default { title: this.$config.getAppSetting("app_name") + `${this.pageData.goods.title}系列 第${this.pageData.goods.num}套`, imageUrl: this.pageData.goods.imgurl_detail, - path: "/pages/shouye/detail" + + path: "/pages/main/detail" + this.$c.qs({ goods_id: this.pageData.goods.id, goods_num: this.pageData.goods.num, @@ -365,7 +365,7 @@ export default { toCoupon() { this.$c.to({ - url: "/pages/user/coupon", + url: "/pages/users/coupon", query: { type: 2, total_price: this.orderData.order_total, @@ -572,7 +572,7 @@ export default { changeBox() { this.$c.to({ - url: "/pages/shouye/huanxiang", + url: "/pages/main/huanxiang", query: { id: this.pageData.goods.id, type_text: this.optData.type_text, diff --git a/pages/shouye/detail_wuxian.vue b/pages/main/detail_wuxian.vue similarity index 99% rename from pages/shouye/detail_wuxian.vue rename to pages/main/detail_wuxian.vue index 68e5d16..ab26482 100644 --- a/pages/shouye/detail_wuxian.vue +++ b/pages/main/detail_wuxian.vue @@ -314,7 +314,7 @@ export default { return { title: this.$config.getAppSetting("app_name") + `${this.pageData.goods.title}系列`, imageUrl: this.pageData.goods.imgurl_detail, - path: '/pages/shouye/detail_wuxian' + + path: '/pages/main/detail_wuxian' + this.$c.qs({ goods_id: this.pageData.goods.id, goods_num: this.pageData.goods.num, @@ -476,7 +476,7 @@ export default { toCoupon() { this.$c.to({ - url: '/pages/user/coupon', + url: '/pages/users/coupon', query: { type: 2, total_price: this.orderData.order_total diff --git a/pages/shouye/huanxiang.vue b/pages/main/huanxiang.vue similarity index 100% rename from pages/shouye/huanxiang.vue rename to pages/main/huanxiang.vue diff --git a/pages/shouye/index.vue b/pages/main/index.vue similarity index 98% rename from pages/shouye/index.vue rename to pages/main/index.vue index 212ecf7..573f76d 100644 --- a/pages/shouye/index.vue +++ b/pages/main/index.vue @@ -121,7 +121,7 @@ - - \ No newline at end of file diff --git a/pages/user/bangding.vue b/pages/users/bangding.vue similarity index 95% rename from pages/user/bangding.vue rename to pages/users/bangding.vue index ff9c264..f108e9e 100644 --- a/pages/user/bangding.vue +++ b/pages/users/bangding.vue @@ -44,7 +44,7 @@ export default { uni.navigateBack({ fail: function() { // 如果返回失败，表示没有上一页，则跳转到首页 - that.$customRouter.navigateTo('/pages/user/index', {}, 'reLaunch'); + that.$customRouter.navigateTo('/pages/users/index', {}, 'reLaunch'); } }); }, @@ -79,7 +79,7 @@ export default { uni.navigateBack({ fail: function() { // 如果返回失败，表示没有上一页，则跳转到首页 - that.$customRouter.navigateTo('/pages/user/index', {}, 'reLaunch'); + that.$customRouter.navigateTo('/pages/users/index', {}, 'reLaunch'); } }); }, 1000) diff --git a/pages/user/bangdingweb.vue b/pages/users/bangdingweb.vue similarity index 100% rename from pages/user/bangdingweb.vue rename to pages/users/bangdingweb.vue diff --git a/pages/user/bi_jl.vue b/pages/users/bi_jl.vue similarity index 100% rename from pages/user/bi_jl.vue rename to pages/users/bi_jl.vue diff --git a/pages/user/cancel-account-page.vue b/pages/users/cancel-account-page.vue similarity index 98% rename from pages/user/cancel-account-page.vue rename to pages/users/cancel-account-page.vue index a947ea6..2dac380 100644 --- a/pages/user/cancel-account-page.vue +++ b/pages/users/cancel-account-page.vue @@ -83,7 +83,7 @@ } this.closePop(); uni.switchTab({ - url: '/pages/shouye/index' + url: '/pages/main/index' }); } }) diff --git a/pages/user/change.vue b/pages/users/change.vue similarity index 100% rename from pages/user/change.vue rename to pages/users/change.vue diff --git a/pages/users/collect.vue b/pages/users/collect.vue new file mode 100644 index 0000000..cfe1dc1 --- /dev/null +++ b/pages/users/collect.vue @@ -0,0 +1,357 @@ + + + + + \ No newline at end of file diff --git a/package/mine/coupon-detail.vue b/pages/users/coupon-detail.vue similarity index 99% rename from package/mine/coupon-detail.vue rename to pages/users/coupon-detail.vue index 516ae01..bc06761 100644 --- a/package/mine/coupon-detail.vue +++ b/pages/users/coupon-detail.vue @@ -137,7 +137,7 @@ return { title: `快来领取${userInfo.nickname}分享的${this.pageData.num}赏币的${this.pageData.level_text}`, imageUrl: this.pageData.level_img, - path: '/pages/user/index' + + path: '/pages/users/index' + this.$c.qs({ ou_coupon_id: this.pageData.id }) diff --git a/pages/user/coupon.vue b/pages/users/coupon.vue similarity index 97% rename from pages/user/coupon.vue rename to pages/users/coupon.vue index 9f825b7..c819a97 100644 --- a/pages/user/coupon.vue +++ b/pages/users/coupon.vue @@ -1,8 +1,4 @@ - +