From e273a38c8905f346ddc68815ef4d8d8869e74648 Mon Sep 17 00:00:00 2001 From: Fox-33 <1466778434@qq.com> Date: Fri, 4 Jul 2025 16:50:24 +0800 Subject: [PATCH] feat: page-center; --- api/fetch.js | 20 ++ config.js | 2 + pages.json | 3 + pages/index/center.vue | 35 +- pages/index/index.vue | 3 + pages_order/auth/wxUserInfo.vue | 526 +++++++++++++++------------ pages_order/center/accountCard.vue | 41 ++- pages_order/center/popupQrCode.vue | 56 +++ pages_order/center/reportCard.vue | 2 +- pages_order/checkup/checkupBook/apply.vue | 5 + pages_order/common.vue | 55 +++ pages_order/order/orderDetail.vue | 567 ------------------------------ pages_order/product/styles/tab.scss | 4 + pages_order/product/tabCourse/index.vue | 8 +- pages_order/product/tabDetect/index.vue | 12 +- pages_order/product/tabNutrient/index.vue | 6 +- pages_order/static/center/icon-change.png | Bin 0 -> 279 bytes store/store.js | 5 +- 18 files changed, 536 insertions(+), 814 deletions(-) create mode 100644 api/fetch.js create mode 100644 pages_order/center/popupQrCode.vue create mode 100644 pages_order/common.vue delete mode 100644 pages_order/order/orderDetail.vue create mode 100644 pages_order/static/center/icon-change.png diff --git a/api/fetch.js b/api/fetch.js new file mode 100644 index 0000000..6443777 --- /dev/null +++ b/api/fetch.js @@ -0,0 +1,20 @@ +import api from './api.js' + +const fetch = (key, data = {}, transform = true, loadingTitle) => { + return new Promise(resolve => { + + const callback = (res) => { + if (!transform) { + resolve(res) + return + } + if (res.code == 200) { + resolve(res.result) + } + } + + api(key, data, callback, loadingTitle) + }) +} + +export default fetch diff --git a/config.js b/config.js index 4175d2b..d8c3365 100644 --- a/config.js +++ b/config.js @@ -1,6 +1,7 @@ import Vue from 'vue' import api from '@/api/api.js' +import fetch from '@/api/fetch.js' import utils from './utils/utils.js' import uvUI from '@/uni_modules/uv-ui-tools' @@ -52,5 +53,6 @@ uni.$uv.setConfig({ Vue.prototype.$config = utils.deepMergeObject(defaultConfig, config[type]) Vue.prototype.$api = api +Vue.prototype.$fetch = fetch export default Vue.prototype.$config \ No newline at end of file diff --git a/pages.json b/pages.json index ece21b5..c4a5de1 100644 --- a/pages.json +++ b/pages.json @@ -140,6 +140,9 @@ }, { "path": "checkup/checkupReport/index" + }, + { + "path": "common" } ] }], diff --git a/pages/index/center.vue b/pages/index/center.vue index 012fcd2..8e208f1 100644 --- a/pages/index/center.vue +++ b/pages/index/center.vue @@ -26,8 +26,18 @@ - - + + {{ item.label }} @@ -77,19 +87,17 @@ return { list1: [ { id: '001', label: '检测预约', icon: '/pages_order/static/center/icon-detectBook.png', path: '/pages_order/checkup/checkupRecords' }, - // todo { id: '002', label: '联系客服', icon: '/pages_order/static/center/icon-service.png', key: 'service' }, - // todo - { id: '003', label: '服用说明', icon: '/pages_order/static/center/icon-instruc.png', path: '/pages_order/mine/instruc' }, - // todo - { id: '004', label: '用户须知', icon: '/pages_order/static/center/icon-userAgreement.png', path: '/pages_order/mine/userAgreement' }, + // todo: check key + { id: '003', label: '服用说明', icon: '/pages_order/static/center/icon-instruc.png', path: `/pages_order/common?key=instruc&title=服用说明` }, + // todo: check key + { id: '004', label: '用户须知', icon: '/pages_order/static/center/icon-userAgreement.png', path: `/pages_order/common?key=userAgreement&title=用户须知` }, ], list2: [ { id: '005', label: '我的评价', icon: '/pages_order/static/center/icon-comment.png', key: 'comment' }, - // todo - { id: '006', label: '关于我们', icon: '/pages_order/static/center/icon-aboutUs.png', path: '/pages_order/mine/service' }, - // todo - { id: '007', label: '修改信息', icon: '/pages_order/static/center/icon-modifyInfo.png', path: '/pages_order/mine/instruc' }, + // todo: check key + { id: '006', label: '关于我们', icon: '/pages_order/static/center/icon-aboutUs.png', path: `/pages_order/common?key=aboutUs&title=关于我们` }, + { id: '007', label: '修改信息', icon: '/pages_order/static/center/icon-modifyInfo.png', path: `/pages_order/auth/wxUserInfo?mode=edit` }, { id: '008', label: '退出登录', icon: '/pages_order/static/center/icon-logout.png', key: 'logout' }, ], } @@ -225,4 +233,9 @@ } } } + + .btn-service { + border: none; + padding: 0; + } \ No newline at end of file diff --git a/pages/index/index.vue b/pages/index/index.vue index 689a64c..51b5c63 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -73,6 +73,9 @@ }, onLoad() { + // todo: delete + // this.$utils.navigateTo('/pages_order/auth/facialVerify') + this.productSwiperList = [ { id: '001', diff --git a/pages_order/auth/wxUserInfo.vue b/pages_order/auth/wxUserInfo.vue index f56675f..debdd23 100644 --- a/pages_order/auth/wxUserInfo.vue +++ b/pages_order/auth/wxUserInfo.vue @@ -1,100 +1,132 @@ + + \ No newline at end of file diff --git a/pages_order/center/accountCard.vue b/pages_order/center/accountCard.vue index 91a0278..74ecf4f 100644 --- a/pages_order/center/accountCard.vue +++ b/pages_order/center/accountCard.vue @@ -1,19 +1,42 @@ diff --git a/pages_order/center/popupQrCode.vue b/pages_order/center/popupQrCode.vue new file mode 100644 index 0000000..dd23646 --- /dev/null +++ b/pages_order/center/popupQrCode.vue @@ -0,0 +1,56 @@ + + + + + \ No newline at end of file diff --git a/pages_order/center/reportCard.vue b/pages_order/center/reportCard.vue index 2dfb7d9..1f5e41b 100644 --- a/pages_order/center/reportCard.vue +++ b/pages_order/center/reportCard.vue @@ -2,7 +2,7 @@ 体检报告 - + diff --git a/pages_order/checkup/checkupBook/apply.vue b/pages_order/checkup/checkupBook/apply.vue index db855ed..f75abc1 100644 --- a/pages_order/checkup/checkupBook/apply.vue +++ b/pages_order/checkup/checkupBook/apply.vue @@ -510,6 +510,11 @@ // todo + uni.showToast({ + icon: 'success', + title: '提交成功', + }); + setTimeout(() => { // todo: check // this.$utils.navigateBack() diff --git a/pages_order/common.vue b/pages_order/common.vue new file mode 100644 index 0000000..0fbdd32 --- /dev/null +++ b/pages_order/common.vue @@ -0,0 +1,55 @@ + + + + + \ No newline at end of file diff --git a/pages_order/order/orderDetail.vue b/pages_order/order/orderDetail.vue deleted file mode 100644 index 8ca27b7..0000000 --- a/pages_order/order/orderDetail.vue +++ /dev/null @@ -1,567 +0,0 @@ - - - - - diff --git a/pages_order/product/styles/tab.scss b/pages_order/product/styles/tab.scss index 357ca74..8c8ffc2 100644 --- a/pages_order/product/styles/tab.scss +++ b/pages_order/product/styles/tab.scss @@ -83,4 +83,8 @@ .section { margin-top: 48rpx; + + &-header { + margin-bottom: 16rpx; + } } diff --git a/pages_order/product/tabCourse/index.vue b/pages_order/product/tabCourse/index.vue index d0a4ad9..a83d631 100644 --- a/pages_order/product/tabCourse/index.vue +++ b/pages_order/product/tabCourse/index.vue @@ -22,14 +22,16 @@ - - + + + + - + diff --git a/pages_order/product/tabDetect/index.vue b/pages_order/product/tabDetect/index.vue index f4c2a84..050c084 100644 --- a/pages_order/product/tabDetect/index.vue +++ b/pages_order/product/tabDetect/index.vue @@ -36,15 +36,21 @@ - + + + - + + + - + + + diff --git a/pages_order/product/tabNutrient/index.vue b/pages_order/product/tabNutrient/index.vue index f331ea7..c541acc 100644 --- a/pages_order/product/tabNutrient/index.vue +++ b/pages_order/product/tabNutrient/index.vue @@ -36,11 +36,13 @@ - + + + - + diff --git a/pages_order/static/center/icon-change.png b/pages_order/static/center/icon-change.png new file mode 100644 index 0000000000000000000000000000000000000000..7c1b4a227ee18fcefae658c9db02957f1b72ade2 GIT binary patch literal 279 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?3oVGw3ym^DWND9BhG z*T?$*FF^9)3B^)(Oom%u}qS1z%eBC0}g%)9dT>;llJb z3!y_QW@Rz&PCP!i@!{>_ykipkcPcN@P3<_pdx4((e~;M4r$tXoPP{*>{ljVH%uBWg z=C=FJ&yy<%IwvuI`YXonu4`2Z2R1p)Kam{I@1vL!d6I8yX2({648@j$IdWce&+@Z> WuDG7FEME@jZU#?RKbLh*2~7YKfoLTF literal 0 HcmV?d00001 diff --git a/store/store.js b/store/store.js index 0f9dc2c..863ef4a 100644 --- a/store/store.js +++ b/store/store.js @@ -93,7 +93,10 @@ const store = new Vuex.Store({ // 退出登录 logout(state){ uni.showModal({ - title: '确认退出登录吗', + title: '退出登录', + content: '确认要退出登录吗', + cancelColor: '#393939', + confirmColor: '#7451DE', success(r) { if(r.confirm){ state.userInfo = {}