diff --git a/project.private.config.json b/project.private.config.json index 5f1c192..e3f150d 100644 --- a/project.private.config.json +++ b/project.private.config.json @@ -142,7 +142,7 @@ "scene": null }, { - "name": "地推端-药师管理", + "name": "地推端-店员管理", "pathName": "ground/pages/pharmacist/index", "query": "", "launchMode": "default", @@ -159,4 +159,4 @@ } }, "libVersion": "3.5.8" -} \ No newline at end of file +} diff --git a/src/doctor/pages/home/index.scss b/src/doctor/pages/home/index.scss index a68cbab..89c675f 100644 --- a/src/doctor/pages/home/index.scss +++ b/src/doctor/pages/home/index.scss @@ -39,7 +39,6 @@ page { align-items: center; gap: 12rpx; .label { - margin-top: 8rpx; padding: 4rpx 12rpx; display: inline-block; font-size: 28rpx; @@ -167,7 +166,7 @@ page { border-radius: 16rpx 16rpx 0 0; .col { flex: 1; - padding: 28rpx 34rpx; + padding: 28rpx 24rpx; .name { font-size: 28rpx; color: #ffffff; @@ -197,7 +196,7 @@ page { overflow: hidden; .col { position: relative; - padding: 28rpx 34rpx; + padding: 28rpx 24rpx; flex: 1; .name { font-size: 24rpx; @@ -318,7 +317,7 @@ page { border-radius: 16rpx 16rpx 0 0; .col { flex: 1; - padding: 28rpx 34rpx; + padding: 28rpx 24rpx; .name { font-size: 28rpx; color: #ffffff; @@ -347,7 +346,7 @@ page { display: flex; .col { position: relative; - padding: 28rpx 34rpx; + padding: 28rpx 24rpx; flex: 1; .name { font-size: 24rpx; diff --git a/src/doctor/pages/home/index.wxml b/src/doctor/pages/home/index.wxml index a886354..03f89b8 100644 --- a/src/doctor/pages/home/index.wxml +++ b/src/doctor/pages/home/index.wxml @@ -14,8 +14,8 @@ - {{pharmacistName || '药师'}} - 药师 + {{pharmacistName || '店员'}} + 店员 {{pharmacyName || '药店名称'}} diff --git a/src/doctor/pages/invite/index.wxml b/src/doctor/pages/invite/index.wxml index 01349fd..adc299b 100644 --- a/src/doctor/pages/invite/index.wxml +++ b/src/doctor/pages/invite/index.wxml @@ -16,8 +16,8 @@ - {{pharmacistName || '药师'}} - 药师 + {{pharmacistName || '店员'}} + 店员 邀请您加入健康管理项目 diff --git a/src/doctor/pages/login/index.wxml b/src/doctor/pages/login/index.wxml index 193653b..29a4bea 100644 --- a/src/doctor/pages/login/index.wxml +++ b/src/doctor/pages/login/index.wxml @@ -53,7 +53,7 @@ 我特此同意依照此 - 《隐私协议保护政策》 + 《个人信息及隐私保护政策》 规定收集我的个人敏感信息 diff --git a/src/doctor/pages/loginForm/index.wxml b/src/doctor/pages/loginForm/index.wxml index 4e9884b..f932bf1 100644 --- a/src/doctor/pages/loginForm/index.wxml +++ b/src/doctor/pages/loginForm/index.wxml @@ -64,7 +64,7 @@ - + diff --git a/src/doctor/pages/my/index.wxml b/src/doctor/pages/my/index.wxml index ab146b7..1053560 100644 --- a/src/doctor/pages/my/index.wxml +++ b/src/doctor/pages/my/index.wxml @@ -11,7 +11,7 @@ - {{pharmacistInfo.name || '药师'}} + {{pharmacistInfo.name || '店员'}} {{pharmacistInfo.pharmacyName || ''}} diff --git a/src/ground/components/ground-tab-bar/index.ts b/src/ground/components/ground-tab-bar/index.ts index 8ed45a3..761503c 100644 --- a/src/ground/components/ground-tab-bar/index.ts +++ b/src/ground/components/ground-tab-bar/index.ts @@ -20,7 +20,7 @@ Component({ }, { pagePath: '/ground/pages/pharmacist/index', - text: '药师管理', + text: '店员管理', icon: 'tab2', iconActive: 'tab2-active', }, diff --git a/src/ground/pages/home/index.scss b/src/ground/pages/home/index.scss index 7877c7d..939edc8 100644 --- a/src/ground/pages/home/index.scss +++ b/src/ground/pages/home/index.scss @@ -152,7 +152,7 @@ page { display: flex; .col { position: relative; - padding: 28rpx 34rpx; + padding: 28rpx 24rpx; flex: 1; .name { font-size: 24rpx; @@ -271,7 +271,7 @@ page { border-radius: 16rpx 16rpx 0 0; .col { flex: 1; - padding: 28rpx 34rpx; + padding: 28rpx 24rpx; .name { font-size: 28rpx; color: #ffffff; @@ -301,7 +301,7 @@ page { display: flex; .col { position: relative; - padding: 28rpx 34rpx; + padding: 28rpx 24rpx; flex: 1; .name { font-size: 24rpx; diff --git a/src/ground/pages/home/index.ts b/src/ground/pages/home/index.ts index d39b4cf..54eaf2e 100644 --- a/src/ground/pages/home/index.ts +++ b/src/ground/pages/home/index.ts @@ -54,7 +54,7 @@ Page({ chart1StartMonth: '', chart1EndMonth: '', - // 日期范围 - 图表2(邀约药师统计) + // 日期范围 - 图表2(邀约店员统计) chart2StartDate: '', chart2EndDate: '', // 图表2显示用的月份(YYYY-MM) @@ -277,7 +277,7 @@ Page({ }) }, - // 获取邀约药师统计图表(使用 chart2 的日期) + // 获取邀约店员统计图表(使用 chart2 的日期) getPharmacistChart() { // 根据统计类型选择日期格式 const startDate = this.data.statType === 'month' ? this.data.chart2StartMonth : this.data.chart2StartDate diff --git a/src/ground/pages/home/index.wxml b/src/ground/pages/home/index.wxml index a4145a7..35b90d4 100644 --- a/src/ground/pages/home/index.wxml +++ b/src/ground/pages/home/index.wxml @@ -38,7 +38,7 @@ - 药师数 + 店员数 {{totalInvitePharmacistCount}} @@ -165,7 +165,7 @@ - 邀约药师数统计 + 邀约店员数统计 diff --git a/src/ground/pages/login/index.wxml b/src/ground/pages/login/index.wxml index 49e3eb6..720d129 100644 --- a/src/ground/pages/login/index.wxml +++ b/src/ground/pages/login/index.wxml @@ -48,7 +48,7 @@ 我特此同意依照此 - 《隐私协议保护政策》 + 《个人信息及隐私保护政策》 规定收集我的个人敏感信息 diff --git a/src/ground/pages/pharmacist/index.scss b/src/ground/pages/pharmacist/index.scss index 2b2cb4e..819179e 100644 --- a/src/ground/pages/pharmacist/index.scss +++ b/src/ground/pages/pharmacist/index.scss @@ -98,7 +98,7 @@ page { border-radius: 24rpx 24rpx 24rpx 24rpx; border: 2rpx solid #ffffff; - /* 药师基本信息 */ + /* 店员基本信息 */ .user { display: flex; align-items: center; diff --git a/src/ground/pages/pharmacist/index.ts b/src/ground/pages/pharmacist/index.ts index 291e46a..3289ec7 100644 --- a/src/ground/pages/pharmacist/index.ts +++ b/src/ground/pages/pharmacist/index.ts @@ -16,7 +16,7 @@ Page({ currentProjectName: '', projectIndex: 0, - // 药师列表 + // 店员列表 pharmacistList: [] as any[], totalCount: 0, @@ -32,7 +32,7 @@ Page({ }, }, onLoad() { - // 地推端药师页面,仅允许地推人员访问 + // 地推端店员页面,仅允许地推人员访问 app.waitLogin({ types: [3] }).then(() => { this.getProjectList() }) @@ -56,7 +56,7 @@ Page({ projectIndex: projectIndex >= 0 ? projectIndex : 0, }) - // 获取药师列表 + // 获取店员列表 this.getPharmacistList() }) }, @@ -103,7 +103,7 @@ Page({ }) } }, - // 获取药师列表 + // 获取店员列表 getPharmacistList() { if (this.data.loading || !this.data.hasMore) return @@ -141,7 +141,7 @@ Page({ this.setData({ loading: false }) }) }, - // 搜索药师 + // 搜索店员 handleSearch(e: WechatMiniprogram.CustomEvent) { this.setData({ keyword: e.detail.value, diff --git a/src/ground/pages/pharmacist/index.wxml b/src/ground/pages/pharmacist/index.wxml index 8ec79ee..8f4a524 100644 --- a/src/ground/pages/pharmacist/index.wxml +++ b/src/ground/pages/pharmacist/index.wxml @@ -12,7 +12,7 @@ {{totalCount}} 人 - + - + diff --git a/src/ground/pages/stat/index.ts b/src/ground/pages/stat/index.ts index 8688c68..4542b6a 100644 --- a/src/ground/pages/stat/index.ts +++ b/src/ground/pages/stat/index.ts @@ -3,7 +3,7 @@ const app = getApp() Page({ data: { - // 药师ID(从药师列表进入时) + // 店员ID(从店员列表进入时) pharmacistId: 0, // 时间筛选 @@ -60,7 +60,7 @@ Page({ }) } - // 设置药师ID(从药师列表进入) + // 设置店员ID(从店员列表进入) if (options?.id) { this.setData({ pharmacistId: Number.parseInt(options.id), @@ -96,7 +96,7 @@ Page({ // 根据是否有 pharmacistId 决定调用哪个接口 if (pharmacistId > 0) { - // 从药师列表进入 - 查看指定药师的统计 + // 从店员列表进入 - 查看指定店员的统计 this.getPharmacistStatistics(pharmacistId, startDate, endDate, currentPage, pageSize, reset) } else { // 从首页进入 - 查看全部统计 @@ -162,7 +162,7 @@ Page({ }) }, - // 获取药师统计(从药师列表进入时使用) + // 获取店员统计(从店员列表进入时使用) getPharmacistStatistics( pharmacistId: number, startDate: string, diff --git a/src/pages/index/index.ts b/src/pages/index/index.ts index 2e86ba2..6928627 100644 --- a/src/pages/index/index.ts +++ b/src/pages/index/index.ts @@ -17,7 +17,7 @@ Page({ projectIndex: 0, projectList: [] as Array<{ projectId: number; projectName: string; projectDescription: string }>, - // 扫码获取的药师ID + // 扫码获取的店员ID pharmacistId: '', isPatient: 0, diff --git a/src/pages/work/index.wxml b/src/pages/work/index.wxml index 5afaa54..1ea3bd4 100644 --- a/src/pages/work/index.wxml +++ b/src/pages/work/index.wxml @@ -19,8 +19,8 @@ - 我是药师 - 登录药师专属版本 + 我是店员 + 登录店员专属版本 diff --git a/src/utils/page.ts b/src/utils/page.ts index 05afbc1..cbf0351 100644 --- a/src/utils/page.ts +++ b/src/utils/page.ts @@ -67,7 +67,7 @@ function page(config: WechatMiniprogram.Page.Instance