diff --git a/manifest.json b/manifest.json index 2b4ead1..16979c1 100644 --- a/manifest.json +++ b/manifest.json @@ -48,7 +48,11 @@ "setting" : { "urlCheck" : false }, - "usingComponents" : true + "usingComponents" : true, + "lazyCodeLoading": "requiredComponents", + "optimization": { + "subPackages": true + } }, "vueVersion" : "2" } diff --git a/pages/profit/profitEndDetails.vue b/pages-profit/profit/profitEndDetails.vue similarity index 99% rename from pages/profit/profitEndDetails.vue rename to pages-profit/profit/profitEndDetails.vue index 2934916..48ad56e 100644 --- a/pages/profit/profitEndDetails.vue +++ b/pages-profit/profit/profitEndDetails.vue @@ -220,7 +220,7 @@ export default { targetToOrder(id) { if (id) { uni.navigateTo({ - url: "../profit/profitEndOrder?id=" + id, + url: "/pages-profit/profit/profitEndOrder?id=" + id, }); } }, diff --git a/pages/profit/profitEndOrder.vue b/pages-profit/profit/profitEndOrder.vue similarity index 100% rename from pages/profit/profitEndOrder.vue rename to pages-profit/profit/profitEndOrder.vue diff --git a/pages/profit/profitInDetails.vue b/pages-profit/profit/profitInDetails.vue similarity index 99% rename from pages/profit/profitInDetails.vue rename to pages-profit/profit/profitInDetails.vue index 2f4ba33..c992388 100644 --- a/pages/profit/profitInDetails.vue +++ b/pages-profit/profit/profitInDetails.vue @@ -222,7 +222,7 @@ export default { console.log("id", id); if (id) { uni.navigateTo({ - url: "../profit/profitInOrder?id=" + id, + url: "/pages-profit/profit/profitInOrder?id=" + id, }); } }, diff --git a/pages/profit/profitInOrder.vue b/pages-profit/profit/profitInOrder.vue similarity index 100% rename from pages/profit/profitInOrder.vue rename to pages-profit/profit/profitInOrder.vue diff --git a/pages/profit/profitPreDetails.vue b/pages-profit/profit/profitPreDetails.vue similarity index 100% rename from pages/profit/profitPreDetails.vue rename to pages-profit/profit/profitPreDetails.vue diff --git a/pages-userInfo/contact/contact.vue b/pages-userInfo/contact/contact.vue index 81267b0..5dd4eb0 100644 --- a/pages-userInfo/contact/contact.vue +++ b/pages-userInfo/contact/contact.vue @@ -1,6 +1,6 @@ diff --git a/pages.json b/pages.json index 440f284..bfd078a 100644 --- a/pages.json +++ b/pages.json @@ -8,16 +8,7 @@ "navigationBarBackgroundColor": "#141b29", "navigationStyle": "custom" } - }, - { - "path": "pages/profit/profit", - "style": { - "navigationBarTitleText": "收益", - "enablePullDownRefresh": false, - "navigationStyle": "custom" - } - }, - { + },{ "path": "pages/index/upload/upload", "style": { "navigationBarTitleText": "上传图片", @@ -61,74 +52,84 @@ } }, { - "path": "pages/profit/profitPreDetails", - "style": { - "navigationBarTitleText": "即将入账详情", - "enablePullDownRefresh": true - } - - }, { - "path": "pages/profit/profitInDetails", - "style": { - "navigationBarTitleText": "已入账详情", - "enablePullDownRefresh": true - } - - }, { - "path": "pages/profit/profitInOrder", - "style": { - "navigationBarTitleText": "收益结算单", - "enablePullDownRefresh": false - } - - }, { - "path": "pages/profit/profitEndDetails", + "path": "pages/userInfo/userInfo", "style": { - "navigationBarTitleText": "转入钱包详情", - "enablePullDownRefresh": true + "navigationBarTitleText": "", + "enablePullDownRefresh": false, + "navigationStyle": "custom" } - }, { - "path": "pages/profit/profitEndOrder", - "style": { - "navigationBarTitleText": "转入钱包结算单", - "enablePullDownRefresh": false - } - }, - { - "path": "pages/userInfo/userInfo", + "path": "pages/profit/profit", "style": { - "navigationBarTitleText": "", + "navigationBarTitleText": "收益", "enablePullDownRefresh": false, "navigationStyle": "custom" } } ], - "subPackages": [{ - "root": "pages-userInfo", - "pages": [{ - "path": "about/about", - "style": { - "navigationBarTitleText": "常见问题", - "enablePullDownRefresh": false + "subPackages": [ + { + "root": "pages-profit", + "pages": [ + { + "path": "profit/profitPreDetails", + "style": { + "navigationBarTitleText": "即将入账详情", + "enablePullDownRefresh": true + } + + }, { + "path": "profit/profitInDetails", + "style": { + "navigationBarTitleText": "已入账详情", + "enablePullDownRefresh": true + } + + }, { + "path": "profit/profitInOrder", + "style": { + "navigationBarTitleText": "收益结算单", + "enablePullDownRefresh": false + } + + }, { + "path": "profit/profitEndDetails", + "style": { + "navigationBarTitleText": "转入钱包详情", + "enablePullDownRefresh": true + } + + }, { + "path": "profit/profitEndOrder", + "style": { + "navigationBarTitleText": "转入钱包结算单", + "enablePullDownRefresh": false + } } - }, + ] + },{ + "root": "pages-userInfo", + "pages": [ { + "path": "about/about", + "style": { + "navigationBarTitleText": "常见问题", + "enablePullDownRefresh": false + } + }, { "path": "contact/contact", "style": { "navigationBarTitleText": "联系我们", "enablePullDownRefresh": false } - }, - { + }, { "path": "extends/extends", "style": { "navigationBarTitleText": "邀请更多人", "enablePullDownRefresh": false } - }, - { + }, { "path": "setting/setting", "style": { "navigationBarTitleText": "系统设置", @@ -140,75 +141,63 @@ "navigationBarTitleText": "通知公告", "enablePullDownRefresh": true } - }, - { + }, { "path": "creatorAccount/creatorAccount", "style": { "navigationBarTitleText": "收款账户", "enablePullDownRefresh": true } - }, - { + }, { "path": "creatorAccount/createAccount", "style": { "navigationBarTitleText": "添加收款账户", "enablePullDownRefresh": false } - }, - { + }, { "path": "withdraw/withdrawLog", "style": { "navigationBarTitleText": "提现记录", "enablePullDownRefresh": true } - }, - { + }, { "path": "withdraw/withdrawIndex", "style": { "navigationBarTitleText": "提现", "enablePullDownRefresh": true } - }, - { + }, { "path": "withdraw/withdraw", "style": { "navigationBarTitleText": "发起提现", "enablePullDownRefresh": false } - }, - { + }, { "path": "notice/noticeDetail", "style": { "navigationBarTitleText": "公告详情", "enablePullDownRefresh": false } - } - - , { + }, { "path": "withdraw/withdrawDetail", "style": { "navigationBarTitleText": "提现详情", "enablePullDownRefresh": false } - }, - { - "path": "setting/compoSign", - "style": { - "navigationBarTitleText": "艺术家合作协议", - "enablePullDownRefresh": false - } - - }, - { - "path": "setting/secretSign", - "style": { - "navigationBarTitleText": "艺术家隐私协议", - "enablePullDownRefresh": false - } - - } + }, { + "path": "setting/compoSign", + "style": { + "navigationBarTitleText": "艺术家合作协议", + "enablePullDownRefresh": false + } + }, { + "path": "setting/secretSign", + "style": { + "navigationBarTitleText": "艺术家隐私协议", + "enablePullDownRefresh": false + } + } ] }], "globalStyle": { @@ -236,19 +225,16 @@ "iconPath": "static/index-default.png", "selectedIconPath": "static/index-select.png", "text": "首页" - }, - { - "pagePath": "pages/profit/profit", - "iconPath": "static/theme-default.png", - "selectedIconPath": "static/theme-select.png", - "text": "收益" - }, - { - "pagePath": "pages/userInfo/userInfo", - "iconPath": "static/mine-default.png", - "selectedIconPath": "static/mine-select.png", - "text": "我的" - } - ] + }, { + "pagePath": "pages/profit/profit", + "iconPath": "static/theme-default.png", + "selectedIconPath": "static/theme-select.png", + "text": "收益" + }, { + "pagePath": "pages/userInfo/userInfo", + "iconPath": "static/mine-default.png", + "selectedIconPath": "static/mine-select.png", + "text": "我的" + }] } } diff --git a/pages/index/index.vue b/pages/index/index.vue index 750dfdf..b0b8de7 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -54,11 +54,7 @@ return { iconColor: '#0b6375', userInfo:{}, - banner:[ - { - bannerImg: "/static/material.png" - } - ], + banner:[], current: 0, mode: 'default', dotsStyles: { @@ -77,11 +73,11 @@ funcList: [{ title: '素材管理', url: '/pages/index/material/material', - icon: '/static/material.png' + icon: 'http://117.50.61.7:6001/mini/bnyer-hub/material.png' }, { title: '上传素材', url: '/pages/index/upload/upload', - icon: '/static/upload.png' + icon: 'http://117.50.61.7:6001/mini/bnyer-hub/upload.png' }], list: [{ typeId: 1, diff --git a/pages/profit/profit.vue b/pages/profit/profit.vue index 2ddd8c8..f31a903 100644 --- a/pages/profit/profit.vue +++ b/pages/profit/profit.vue @@ -193,8 +193,8 @@ export default { active: 0, hidden: true, incomeBackground: '/static/income-background.png', - advertIcon: "/static/advertIcon.png", - inviteIcon: "/static/inviteIcon.png", + advertIcon: "http://117.50.61.7:6001/mini/bnyer-hub/inviteIcon.png", + inviteIcon: "http://117.50.61.7:6001/mini/bnyer-hub/inviteIcon.png", }; }, // 下拉刷新 @@ -329,7 +329,7 @@ export default { data: typeId, success() { uni.navigateTo({ - url: "../profit/profitPreDetails", + url: "/pages-profit/profit/profitPreDetails", }); }, }); @@ -339,7 +339,7 @@ export default { data: typeId, success() { uni.navigateTo({ - url: "../profit/profitInDetails", + url: "/pages-profit/profit/profitInDetails", }); }, }); @@ -349,7 +349,7 @@ export default { data: typeId, success() { uni.navigateTo({ - url: "../profit/profitEndDetails", + url: "/pages-profit/profit/profitEndDetails", }); }, }); @@ -364,7 +364,7 @@ export default { //查看更多公告 getMore() { uni.navigateTo({ - url: "../../pages-userInfo/notice/notice", + url: "/pages-userInfo/notice/notice", }); }, segActive(index) { diff --git a/pages/userInfo/userInfo.vue b/pages/userInfo/userInfo.vue index 7adb4e0..98263a9 100644 --- a/pages/userInfo/userInfo.vue +++ b/pages/userInfo/userInfo.vue @@ -87,8 +87,8 @@ }], pageUrl: '', userInfo: { - name: "Adming", - img: "/static/material.png" + name: "admin", + img: "/static/mine-select.png" }, creatorFansLikeInfo: { fansNum: 0, diff --git a/static/advertIcon.png b/static/advertIcon.png deleted file mode 100644 index c120ffa..0000000 Binary files a/static/advertIcon.png and /dev/null differ diff --git a/static/contact/contact.jpg b/static/contact/contact.jpg deleted file mode 100644 index a51f88e..0000000 Binary files a/static/contact/contact.jpg and /dev/null differ diff --git a/static/inviteIcon.png b/static/inviteIcon.png deleted file mode 100644 index fbc7efd..0000000 Binary files a/static/inviteIcon.png and /dev/null differ diff --git a/static/material.png b/static/material.png deleted file mode 100644 index bb508c7..0000000 Binary files a/static/material.png and /dev/null differ diff --git a/static/upload.png b/static/upload.png deleted file mode 100644 index a428216..0000000 Binary files a/static/upload.png and /dev/null differ