diff --git a/components/base/changeLanguage.vue b/components/base/changeLanguage.vue deleted file mode 100644 index 82c5b79..0000000 --- a/components/base/changeLanguage.vue +++ /dev/null @@ -1,77 +0,0 @@ - - - - - \ No newline at end of file diff --git a/config.js b/config.js index 0c3a700..9a6313c 100644 --- a/config.js +++ b/config.js @@ -5,7 +5,7 @@ import utils from './utils/utils.js' // 当前环境 -const type = 'dev' +const type = 'prod' // 环境配置 diff --git a/locale/en.json b/locale/en.json deleted file mode 100644 index c4c96eb..0000000 --- a/locale/en.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "tabbar.title.1" : "消息", - "tabbar.title.2" : "通讯录", - "tabbar.title.3" : "发现", - "tabbar.title.4" : "我", - "navbar.relation.newFriend" : "新的朋友", - "navbar.mine.service" : "服务", - "navbar.relation.searchFriend" : "添加朋友", - "pages" : { - "index" : { - "index" : { - "agreement" : "Agreement content" - } - } - }, - "components" : { - "config" : { - "configPopup" : { - - } - } - } -} \ No newline at end of file diff --git a/locale/index.js b/locale/index.js deleted file mode 100644 index 36973ea..0000000 --- a/locale/index.js +++ /dev/null @@ -1,25 +0,0 @@ -import Vue from 'vue' -import VueI18n from 'vue-i18n' - -import zhHans from './zh-Hans.json' // 中文简体 - -Vue.use(VueI18n) - -// 所需要用的语言包 -let messages = { - 'zh-Hans' : zhHans -} - -if(!uni.getStorageSync('language') || !messages[uni.getStorageSync('language')]){ - uni.setStorageSync('language', 'zh-Hans') -} - -const lang = uni.getStorageSync('language');//获取缓存中的语言 -// const lang = 'en'; -// VueI18n构造函数所需要的配置 -const i18nConfig = { - locale: lang,//当前语言 - messages -} -const i18n = new VueI18n(i18nConfig) -export default i18n \ No newline at end of file diff --git a/locale/zh-Hans.json b/locale/zh-Hans.json deleted file mode 100644 index 285f1f2..0000000 --- a/locale/zh-Hans.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "tabbar.title.1" : "消息", - "tabbar.title.2" : "通讯录", - "tabbar.title.3" : "发现", - "tabbar.title.4" : "我", - "navbar.relation.newFriend" : "新的朋友", - "navbar.mine.service" : "服务", - "navbar.relation.searchFriend" : "添加朋友", - "responseMessage" : { - - }, - "pages" : { - "index" : { - "index" : { - "agreement" : "协议内容" - } - } - }, - "components" : { - "config" : { - "configPopup" : { - "noData" : "内容未找到:404" - } - } - } -} \ No newline at end of file diff --git a/main.js b/main.js index 0d7bf7e..c85c62d 100644 --- a/main.js +++ b/main.js @@ -10,7 +10,6 @@ Vue.config.productionTip = false App.mpType = 'app' import store from '@/store/store' -import i18n from './locale/index.js' import './config' import './utils/index.js' @@ -31,17 +30,14 @@ uni.$uv.setConfig({ //组件注册 import configPopup from '@/components/config/configPopup.vue' -import changeLanguage from '@/components/base/changeLanguage.vue' import navbar from '@/components/base/navbar.vue' Vue.component('configPopup', configPopup) -Vue.component('changeLanguage', changeLanguage) Vue.component('navbar', navbar) const app = new Vue({ ...App, store, - i18n }) app.$mount() // #endif diff --git a/pages.json b/pages.json index 6d3d7e7..1e01c30 100644 --- a/pages.json +++ b/pages.json @@ -1,207 +1,178 @@ { - "pages": [ - { + "pages": [{ "path": "pages/index/index", "style": { "navigationBarTitleText": "" } }, { - "path" : "pages/publish/competition", - "style" : - { - "navigationBarTitleText" : "" - } - }, - { - "path" : "pages/auth/login", - "style" : - { - "navigationBarTitleText" : "" - } - }, - { - "path" : "pages/publish/actorDetail", - "style" : - { - "navigationBarTitleText" : "" - } - }, - { - "path" : "pages/order/payOrder", - "style" : - { - "navigationBarTitleText" : "" - } - }, - { - "path" : "pages/auth/wxUserInfo", - "style" : - { - "navigationBarTitleText" : "" - } - }, - { - "path" : "pages/publish/actorRelease", - "style" : - { - "navigationBarTitleText" : "" - } - }, - { - "path" : "pages/publish/publishPost", - "style" : - { - "navigationBarTitleText" : "" - } - }, - { - "path" : "pages/index/publish", - "style" : - { - "navigationBarTitleText" : "" - } - }, - { - "path" : "pages/index/center", - "style" : - { - "navigationBarTitleText" : "" - } - }, - { - "path" : "pages/mine/releaseRecord", - "style" : - { - "navigationBarTitleText" : "" - } - }, - { - "path" : "pages/mine/promotionRecord", - "style" : - { - "navigationBarTitleText" : "" - } - }, - { - "path" : "pages/mine/addBankCard", - "style" : - { - "navigationBarTitleText" : "" - } - }, - { - "path" : "pages/mine/purse", - "style" : - { - "navigationBarTitleText" : "" + "path": "pages/publish/competition", + "style": { + "navigationBarTitleText": "" } }, { - "path" : "pages/mine/incomeRecord", - "style" : - { - "navigationBarTitleText" : "" + "path": "pages/auth/login", + "style": { + "navigationBarTitleText": "" } }, { - "path" : "pages/mine/certifiedIndividual", - "style" : - { - "navigationBarTitleText" : "" + "path": "pages/publish/actorDetail", + "style": { + "navigationBarTitleText": "" } }, { - "path" : "pages/mine/withdraw", - "style" : - { - "navigationBarTitleText" : "" + "path": "pages/order/payOrder", + "style": { + "navigationBarTitleText": "" } }, { - "path" : "pages/mine/withdrawalRecord", - "style" : - { - "navigationBarTitleText" : "" + "path": "pages/auth/wxUserInfo", + "style": { + "navigationBarTitleText": "" } }, { - "path" : "pages/mine/enterpriseCertification", - "style" : - { - "navigationBarTitleText" : "" + "path": "pages/publish/actorRelease", + "style": { + "navigationBarTitleText": "" } }, { - "path" : "pages/publish/postList", - "style" : - { - "navigationBarTitleText" : "" + "path": "pages/publish/publishPost", + "style": { + "navigationBarTitleText": "" } }, { - "path" : "pages/publish/postDetail", - "style" : - { - "navigationBarTitleText" : "" + "path": "pages/index/publish", + "style": { + "navigationBarTitleText": "" } }, { - "path" : "pages/publish/actorList", - "style" : - { - "navigationBarTitleText" : "" + "path": "pages/index/center", + "style": { + "navigationBarTitleText": "" } }, { - "path" : "pages/mine/sonPage/promotion/promotionDetail", - "style" : - { - "navigationBarTitleText" : "" + "path": "pages/publish/postList", + "style": { + "navigationBarTitleText": "" } }, { - "path" : "pages/mine/sonPage/promotion/promotionRecordList", - "style" : - { - "navigationBarTitleText" : "" + "path": "pages/publish/postDetail", + "style": { + "navigationBarTitleText": "" } }, { - "path" : "pages/mine/sonPage/release/releaseList", - "style" : - { - "navigationBarTitleText" : "" + "path": "pages/publish/actorList", + "style": { + "navigationBarTitleText": "" } } - ,{ - "path" : "pages/mine/authOption", - "style" : - { - "navigationBarTitleText": "", - "enablePullDownRefresh": false - } - } - ,{ - "path" : "pages/mine/authPerson", - "style" : - { - "navigationBarTitleText": "", - "enablePullDownRefresh": false - } - - } - , - { - "path" : "pages/mine/authFirm", - "style" : - { - "navigationBarTitleText": "", - "enablePullDownRefresh": false - } - - } - ], + ], + "subPackages": [{ + "root": "pages_mine", + "pages": [{ + "path": "mine/addBankCard" + }, + { + "path": "mine/incomeRecord", + "style": { + "navigationBarTitleText": "" + } + }, + { + "path": "mine/certifiedIndividual", + "style": { + "navigationBarTitleText": "" + } + }, + + { + "path": "mine/sonPage/promotion/promotionDetail", + "style": { + "navigationBarTitleText": "" + } + }, + { + "path": "mine/sonPage/promotion/promotionRecordList", + "style": { + "navigationBarTitleText": "" + } + }, + { + "path": "mine/sonPage/release/releaseList", + "style": { + "navigationBarTitleText": "" + } + }, { + "path": "mine/authOption", + "style": { + "navigationBarTitleText": "", + "enablePullDownRefresh": false + } + }, { + "path": "mine/authPerson", + "style": { + "navigationBarTitleText": "", + "enablePullDownRefresh": false + } + + }, + { + "path": "mine/authFirm", + "style": { + "navigationBarTitleText": "", + "enablePullDownRefresh": false + } + }, + + { + "path": "mine/releaseRecord", + "style": { + "navigationBarTitleText": "" + } + }, + { + "path": "mine/promotionRecord", + "style": { + "navigationBarTitleText": "" + } + }, + { + "path": "mine/purse", + "style": { + "navigationBarTitleText": "" + } + }, + { + "path": "mine/withdraw", + "style": { + "navigationBarTitleText": "" + } + }, + { + "path": "mine/withdrawalRecord", + "style": { + "navigationBarTitleText": "" + } + }, + { + "path": "mine/enterpriseCertification", + "style": { + "navigationBarTitleText": "" + } + } + ] + }], "globalStyle": { "navigationBarTextStyle": "black", "navigationBarTitleText": "unapp模板", @@ -210,4 +181,4 @@ "navigationStyle": "custom" }, "uniIdRouter": {} -} +} \ No newline at end of file diff --git a/pages/index/center.vue b/pages/index/center.vue index 1f7e4d8..a5f8ef0 100644 --- a/pages/index/center.vue +++ b/pages/index/center.vue @@ -3,7 +3,7 @@ - + @@ -119,25 +119,25 @@ export default { // 基础列表 baseList: [{ name: 'photo', - imageUrl: '/static/image/center/1.png', + imageUrl: 'https://tennis-oss.xzaiyp.top/2024-09-07/05cbb032-8177-478e-8fbe-0a3797096890.png', title: '我的发布', gotoPageUrl: '/mine/releaseRecord' }, { name: 'lock', - imageUrl: '/static/image/center/1.png', + imageUrl: 'https://tennis-oss.xzaiyp.top/2024-09-07/05cbb032-8177-478e-8fbe-0a3797096890.png', title: '我的推广', gotoPageUrl: '/mine/promotionRecord' }, { name: 'star', - imageUrl: '/static/image/center/1.png', + imageUrl: 'https://tennis-oss.xzaiyp.top/2024-09-07/05cbb032-8177-478e-8fbe-0a3797096890.png', title: '我的银行卡', gotoPageUrl: '/mine/addBankCard' }, { name: 'star', - imageUrl: '/static/image/center/1.png', + imageUrl: 'https://tennis-oss.xzaiyp.top/2024-09-07/05cbb032-8177-478e-8fbe-0a3797096890.png', title: '我的钱包', gotoPageUrl: '/mine/purse' }, @@ -146,18 +146,18 @@ export default { otherList: [ { name: 'photo', - imageUrl: '/static/image/center/1.png', + imageUrl: 'https://tennis-oss.xzaiyp.top/2024-09-07/05cbb032-8177-478e-8fbe-0a3797096890.png', title: '实名信息', gotoPageUrl: '/mine/certifiedIndividual' }, { name: 'lock', - imageUrl: '/static/image/center/1.png', + imageUrl: 'https://tennis-oss.xzaiyp.top/2024-09-07/05cbb032-8177-478e-8fbe-0a3797096890.png', title: '帮助反馈' }, { name: 'outLogin', - imageUrl: '/static/image/center/1.png', + imageUrl: 'https://tennis-oss.xzaiyp.top/2024-09-07/05cbb032-8177-478e-8fbe-0a3797096890.png', title: '退出登录', gotoPageUrl: '/mine/promotionRecord' }, @@ -177,7 +177,9 @@ export default { this.$refs.confirmationPopup.open() return } - this.$utils.navigateTo(item.gotoPageUrl) + uni.navigateTo({ + url: '/pages_mine' + item.gotoPageUrl + }) }, handleConfirm() { diff --git a/pages/publish/publishPost.vue b/pages/publish/publishPost.vue index 2a6e73e..5b88358 100644 --- a/pages/publish/publishPost.vue +++ b/pages/publish/publishPost.vue @@ -150,6 +150,7 @@ let self = this e.file.forEach(file => { self.$Oss.ossUpload(file.url).then(url => { + console.log(url); self.fileList.push({ url }) diff --git a/pages/mine/addBankCard.vue b/pages_mine/mine/addBankCard.vue similarity index 97% rename from pages/mine/addBankCard.vue rename to pages_mine/mine/addBankCard.vue index 8323d15..1a6bf12 100644 --- a/pages/mine/addBankCard.vue +++ b/pages_mine/mine/addBankCard.vue @@ -19,7 +19,7 @@ - + diff --git a/pages/mine/authFirm.vue b/pages_mine/mine/authFirm.vue similarity index 100% rename from pages/mine/authFirm.vue rename to pages_mine/mine/authFirm.vue diff --git a/pages/mine/authOption.vue b/pages_mine/mine/authOption.vue similarity index 100% rename from pages/mine/authOption.vue rename to pages_mine/mine/authOption.vue diff --git a/pages/mine/authPerson.vue b/pages_mine/mine/authPerson.vue similarity index 90% rename from pages/mine/authPerson.vue rename to pages_mine/mine/authPerson.vue index 104c4ec..76afd17 100644 --- a/pages/mine/authPerson.vue +++ b/pages_mine/mine/authPerson.vue @@ -10,14 +10,14 @@ {{ name }} - + 身份证号 {{ idCard }} - + diff --git a/pages/mine/certifiedIndividual.vue b/pages_mine/mine/certifiedIndividual.vue similarity index 91% rename from pages/mine/certifiedIndividual.vue rename to pages_mine/mine/certifiedIndividual.vue index fc6a037..4e5fa6c 100644 --- a/pages/mine/certifiedIndividual.vue +++ b/pages_mine/mine/certifiedIndividual.vue @@ -8,16 +8,16 @@ - + 请确保二代身份证有效,并且头像文字清晰,四角对齐,无反光,无遮挡。 - + - + diff --git a/pages/mine/enterpriseCertification.vue b/pages_mine/mine/enterpriseCertification.vue similarity index 100% rename from pages/mine/enterpriseCertification.vue rename to pages_mine/mine/enterpriseCertification.vue diff --git a/pages/mine/incomeRecord.vue b/pages_mine/mine/incomeRecord.vue similarity index 94% rename from pages/mine/incomeRecord.vue rename to pages_mine/mine/incomeRecord.vue index f21ee6e..c655c65 100644 --- a/pages/mine/incomeRecord.vue +++ b/pages_mine/mine/incomeRecord.vue @@ -11,7 +11,7 @@ - + {{ item.userId }} diff --git a/pages/mine/promotionRecord.vue b/pages_mine/mine/promotionRecord.vue similarity index 98% rename from pages/mine/promotionRecord.vue rename to pages_mine/mine/promotionRecord.vue index 7148977..ef11375 100644 --- a/pages/mine/promotionRecord.vue +++ b/pages_mine/mine/promotionRecord.vue @@ -52,7 +52,7 @@