From bdc80f29ef3100d76720e0ff8dcb95709b550da4 Mon Sep 17 00:00:00 2001 From: tianyongbao Date: Thu, 6 Jun 2024 18:42:02 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E5=8A=9F=E8=83=BD=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/config.js | 2 +- src/pages.json | 20 +- src/pages/login.vue | 4 +- src/pages/mine.vue | 29 +- src/pages/statistic/index.vue | 2 +- .../accounts/accountDealRecord/addEdit.vue | 301 +++++++++++ .../accounts/accountDealRecord/details.vue | 107 ++++ .../work/accounts/accountDealRecord/index.vue | 8 - .../work/accounts/accountDealRecord/list.vue | 503 ++++++++++++++++++ src/pages/work/heartJourney/addEdit.vue | 25 +- src/pages/work/heartJourney/details.vue | 10 +- src/pages/work/heartJourney/list.vue | 2 +- src/pages/work/index.vue | 28 +- src/pages_mine/pages/about/index.vue | 10 +- src/pages_mine/pages/help/index.vue | 17 +- src/pages_mine/pages/setting/index.vue | 8 +- src/static/images/tabbar/statistic.png | Bin 0 -> 9335 bytes src/static/images/tabbar/statistic_.png | Bin 0 -> 9251 bytes src/static/intc.jpg | Bin 0 -> 19951 bytes src/utils/common.ts | 30 ++ 20 files changed, 1050 insertions(+), 56 deletions(-) create mode 100644 src/pages/work/accounts/accountDealRecord/addEdit.vue create mode 100644 src/pages/work/accounts/accountDealRecord/details.vue delete mode 100644 src/pages/work/accounts/accountDealRecord/index.vue create mode 100644 src/pages/work/accounts/accountDealRecord/list.vue create mode 100644 src/static/images/tabbar/statistic.png create mode 100644 src/static/images/tabbar/statistic_.png create mode 100644 src/static/intc.jpg diff --git a/src/config.js b/src/config.js index 9cd56c4..7562c2e 100644 --- a/src/config.js +++ b/src/config.js @@ -14,7 +14,7 @@ const config = { // 应用logo logo: "/static/logo.png", // 官方网站 - site_url: "http://ruoyi.vip", + site_url: "http://www.qdintc.com", // 政策协议 agreements: [{ title: "隐私政策", diff --git a/src/pages.json b/src/pages.json index fd0562a..8b9b1db 100644 --- a/src/pages.json +++ b/src/pages.json @@ -70,7 +70,21 @@ } , { - "path": "pages/work/accounts/accountDealRecord/index", + "path": "pages/work/accounts/accountDealRecord/list", + "style": { + "navigationBarTitleText": "账户交易记录" + } + } + , + { + "path": "pages/work/accounts/accountDealRecord/details", + "style": { + "navigationBarTitleText": "账户交易记录详情" + } + } + , + { + "path": "pages/work/accounts/accountDealRecord/addEdit", "style": { "navigationBarTitleText": "账户交易记录" } @@ -308,8 +322,8 @@ }, { "pagePath": "pages/statistic/index", - "iconPath": "static/images/tabbar/work.png", - "selectedIconPath": "static/images/tabbar/work_.png", + "iconPath": "static/images/tabbar/statistic.png", + "selectedIconPath": "static/images/tabbar/statistic_.png", "text": "统计分析" }, { diff --git a/src/pages/login.vue b/src/pages/login.vue index 8eaa313..ff4346d 100644 --- a/src/pages/login.vue +++ b/src/pages/login.vue @@ -49,8 +49,8 @@ const captchaEnabled = ref(true); // 是否开启验证码 const useWxLogin = ref(false); // 是否使用微信登录 const globalConfig = ref(config); const loginForm = ref({ - username: "admin", - password: "admin123", + username: "", + password: "", code: "", uuid: '' }); diff --git a/src/pages/mine.vue b/src/pages/mine.vue index 0eabdc5..04b6dd4 100644 --- a/src/pages/mine.vue +++ b/src/pages/mine.vue @@ -29,9 +29,9 @@ - 交流群 + 企业微信 - + 在线客服 @@ -39,7 +39,7 @@ 反馈社区 - + 点赞我们 @@ -101,8 +101,6 @@ uni.$on('refresh', () => { avatar.value = userStore.avatar; }) -console.log(avatar.value) - function handleToInfo() { uni.navigateTo({ url: '/pages_mine/pages/info/index' @@ -155,7 +153,7 @@ function handleAbout() { }; function handleJiaoLiuQun() { uni.showToast({ - title: 'QQ群：133713780', + title: '17753252359', mask: false, icon: "none", duration: 1000 @@ -163,13 +161,28 @@ function handleJiaoLiuQun() { }; function handleBuilding() { uni.showToast({ - title: '模块建设中~', + title: '谢谢反馈~', + mask: false, + icon: "none", + duration: 1000 + }); +} +function handleService() { + uni.showToast({ + title: '请电联：17753252359~', + mask: false, + icon: "none", + duration: 1000 + }); +} +function handleUs() { + uni.showToast({ + title: '谢谢点赞！', mask: false, icon: "none", duration: 1000 }); } - \ No newline at end of file diff --git a/src/pages/work/accounts/accountDealRecord/details.vue b/src/pages/work/accounts/accountDealRecord/details.vue new file mode 100644 index 0000000..4684844 --- /dev/null +++ b/src/pages/work/accounts/accountDealRecord/details.vue @@ -0,0 +1,107 @@ + + + + + \ No newline at end of file diff --git a/src/pages/work/accounts/accountDealRecord/index.vue b/src/pages/work/accounts/accountDealRecord/index.vue deleted file mode 100644 index dd6b606..0000000 --- a/src/pages/work/accounts/accountDealRecord/index.vue +++ /dev/null @@ -1,8 +0,0 @@ - \ No newline at end of file diff --git a/src/pages/work/accounts/accountDealRecord/list.vue b/src/pages/work/accounts/accountDealRecord/list.vue new file mode 100644 index 0000000..ac6f486 --- /dev/null +++ b/src/pages/work/accounts/accountDealRecord/list.vue @@ -0,0 +1,503 @@ + + + + + \ No newline at end of file diff --git a/src/pages/work/heartJourney/addEdit.vue b/src/pages/work/heartJourney/addEdit.vue index 634ab04..52db3a5 100644 --- a/src/pages/work/heartJourney/addEdit.vue +++ b/src/pages/work/heartJourney/addEdit.vue @@ -63,10 +63,10 @@ const journeyTypeList = ref([]) const data = reactive({ form: {}, rules: { - name: [{ type: 'string', required: true, message: '请输入标题', trigger: ['change', 'blur'] }], - createTime: [{ type: 'string', required: true, message: '请选择记录时间', trigger: ['change', 'blur'] }], - type: [{ type: 'string', required: true, message: '请选择类型', trigger: ['change', 'blur'] }], - remark: [{ type: 'string', required: true, message: '请输入内容', trigger: ['change', 'blur'] }], + name: [{ type: 'string', required: true, message: '标题不能为空', trigger: ['change', 'blur'] }], + createTime: [{ type: 'string', required: true, message: '记录时间不能为空', trigger: ['change', 'blur'] }], + type: [{ type: 'string', required: true, message: '类型不能为空', trigger: ['change', 'blur'] }], + remark: [{ type: 'string', required: true, message: '内容不能为空', trigger: ['change', 'blur'] }], } }) const { form, rules} = toRefs(data) @@ -84,17 +84,30 @@ onLoad((option) => { proxy.$refs['uForm'].setRules(rules.value) }) function getDict() { - // 工单状态 + // 类型 getDicts('journey_type').then(res => { journeyTypeList.value =[res.data] }) if(form.value.id!=null){ getHeartJourney(form.value.id).then(res => { form.value = res.data + // 类型 + getDicts('journey_type').then(result => { + form.value.typeName=dictStr(form.value.type, result.data) + }) + }) } } - + function dictStr(val, arr) { + let str = '' + arr.map(item => { + if (item.dictValue === val) { + str = item.dictLabel + } + }) + return str + } function handleShowTeam() { if (journeyTypeList.value[0].length === 0) { diff --git a/src/pages/work/heartJourney/details.vue b/src/pages/work/heartJourney/details.vue index 9418a9a..50a7b8f 100644 --- a/src/pages/work/heartJourney/details.vue +++ b/src/pages/work/heartJourney/details.vue @@ -7,11 +7,11 @@ > - - - - - {{ detailInfo.remark }} + + + + + diff --git a/src/pages/work/heartJourney/list.vue b/src/pages/work/heartJourney/list.vue index 690ba4f..09acfbf 100644 --- a/src/pages/work/heartJourney/list.vue +++ b/src/pages/work/heartJourney/list.vue @@ -120,7 +120,7 @@ function getList() { }) } function getDict() { - // 工单状态 + // 类型 getDicts('journey_type').then(res => { journeyTypeList.value = res.data }) diff --git a/src/pages/work/index.vue b/src/pages/work/index.vue index 5eac0d7..43c1c10 100644 --- a/src/pages/work/index.vue +++ b/src/pages/work/index.vue @@ -1,6 +1,19 @@