Browse Source

bug fix

master
kola-web 2 days ago
parent
commit
4120d5843e
  1. 4
      project.private.config.json
  2. 9
      src/doctor/pages/home/index.scss
  3. 4
      src/doctor/pages/home/index.wxml
  4. 4
      src/doctor/pages/invite/index.wxml
  5. 2
      src/doctor/pages/login/index.wxml
  6. 2
      src/doctor/pages/loginForm/index.wxml
  7. 2
      src/doctor/pages/my/index.wxml
  8. 2
      src/ground/components/ground-tab-bar/index.ts
  9. 6
      src/ground/pages/home/index.scss
  10. 4
      src/ground/pages/home/index.ts
  11. 4
      src/ground/pages/home/index.wxml
  12. 2
      src/ground/pages/login/index.wxml
  13. 2
      src/ground/pages/pharmacist/index.scss
  14. 10
      src/ground/pages/pharmacist/index.ts
  15. 6
      src/ground/pages/pharmacist/index.wxml
  16. 8
      src/ground/pages/stat/index.ts
  17. 2
      src/pages/index/index.ts
  18. 4
      src/pages/work/index.wxml
  19. 2
      src/utils/page.ts

4
project.private.config.json

@ -142,7 +142,7 @@
"scene": null "scene": null
}, },
{ {
"name": "地推端-药师管理", "name": "地推端-店员管理",
"pathName": "ground/pages/pharmacist/index", "pathName": "ground/pages/pharmacist/index",
"query": "", "query": "",
"launchMode": "default", "launchMode": "default",
@ -159,4 +159,4 @@
} }
}, },
"libVersion": "3.5.8" "libVersion": "3.5.8"
} }

9
src/doctor/pages/home/index.scss

@ -39,7 +39,6 @@ page {
align-items: center; align-items: center;
gap: 12rpx; gap: 12rpx;
.label { .label {
margin-top: 8rpx;
padding: 4rpx 12rpx; padding: 4rpx 12rpx;
display: inline-block; display: inline-block;
font-size: 28rpx; font-size: 28rpx;
@ -167,7 +166,7 @@ page {
border-radius: 16rpx 16rpx 0 0; border-radius: 16rpx 16rpx 0 0;
.col { .col {
flex: 1; flex: 1;
padding: 28rpx 34rpx; padding: 28rpx 24rpx;
.name { .name {
font-size: 28rpx; font-size: 28rpx;
color: #ffffff; color: #ffffff;
@ -197,7 +196,7 @@ page {
overflow: hidden; overflow: hidden;
.col { .col {
position: relative; position: relative;
padding: 28rpx 34rpx; padding: 28rpx 24rpx;
flex: 1; flex: 1;
.name { .name {
font-size: 24rpx; font-size: 24rpx;
@ -318,7 +317,7 @@ page {
border-radius: 16rpx 16rpx 0 0; border-radius: 16rpx 16rpx 0 0;
.col { .col {
flex: 1; flex: 1;
padding: 28rpx 34rpx; padding: 28rpx 24rpx;
.name { .name {
font-size: 28rpx; font-size: 28rpx;
color: #ffffff; color: #ffffff;
@ -347,7 +346,7 @@ page {
display: flex; display: flex;
.col { .col {
position: relative; position: relative;
padding: 28rpx 34rpx; padding: 28rpx 24rpx;
flex: 1; flex: 1;
.name { .name {
font-size: 24rpx; font-size: 24rpx;

4
src/doctor/pages/home/index.wxml

@ -14,8 +14,8 @@
<image class="avatar" mode="aspectFill" src="{{pharmacistAvatar}}"></image> <image class="avatar" mode="aspectFill" src="{{pharmacistAvatar}}"></image>
<view class="wrap"> <view class="wrap">
<view class="name"> <view class="name">
{{pharmacistName || '药师'}} {{pharmacistName || '店员'}}
<view class="label">药师</view> <view class="label">店员</view>
</view> </view>
<view class="site">{{pharmacyName || '药店名称'}}</view> <view class="site">{{pharmacyName || '药店名称'}}</view>
</view> </view>

4
src/doctor/pages/invite/index.wxml

@ -16,8 +16,8 @@
<view class="user"> <view class="user">
<image class="avatar" src="{{pharmacistAvatar}}" mode="aspectFill"></image> <image class="avatar" src="{{pharmacistAvatar}}" mode="aspectFill"></image>
<view class="wrap"> <view class="wrap">
<view class="nickname">{{pharmacistName || '药师'}}</view> <view class="nickname">{{pharmacistName || '店员'}}</view>
<view class="label">药师</view> <view class="label">店员</view>
</view> </view>
</view> </view>
<view class="title">邀请您加入健康管理项目</view> <view class="title">邀请您加入健康管理项目</view>

2
src/doctor/pages/login/index.wxml

@ -53,7 +53,7 @@
<image wx:else class="icon" src="{{imageUrl}}icon12.png?t={{Timestamp}}"></image> <image wx:else class="icon" src="{{imageUrl}}icon12.png?t={{Timestamp}}"></image>
<view class="p"> <view class="p">
我特此同意依照此 我特此同意依照此
<text class="link" catch:tap="handleLink">《隐私协议保护政策》</text> <text class="link" bind:tap="handleLink">《个人信息及隐私保护政策》</text>
规定收集我的个人敏感信息 规定收集我的个人敏感信息
</view> </view>
</view> </view>

2
src/doctor/pages/loginForm/index.wxml

@ -64,7 +64,7 @@
</view> </view>
</view> </view>
</view> </view>
<button class="phone" bind:tap="handleSubmit">立即加入药师端</button> <button class="phone" bind:tap="handleSubmit">立即加入店员端</button>
</view> </view>
<van-popup show="{{ show }}" title="选择所属药店" position="bottom" round closeable bind:close="onClose"> <van-popup show="{{ show }}" title="选择所属药店" position="bottom" round closeable bind:close="onClose">

2
src/doctor/pages/my/index.wxml

@ -11,7 +11,7 @@
<image class="icon" src="{{imageUrl}}icon3.png?t={{Timestamp}}"></image> <image class="icon" src="{{imageUrl}}icon3.png?t={{Timestamp}}"></image>
</view> </view>
</view> </view>
<view class="name">{{pharmacistInfo.name || '药师'}}</view> <view class="name">{{pharmacistInfo.name || '店员'}}</view>
<view class="phone">{{pharmacistInfo.pharmacyName || ''}}</view> <view class="phone">{{pharmacistInfo.pharmacyName || ''}}</view>
</view> </view>
<view class="list"> <view class="list">

2
src/ground/components/ground-tab-bar/index.ts

@ -20,7 +20,7 @@ Component({
}, },
{ {
pagePath: '/ground/pages/pharmacist/index', pagePath: '/ground/pages/pharmacist/index',
text: '药师管理', text: '店员管理',
icon: 'tab2', icon: 'tab2',
iconActive: 'tab2-active', iconActive: 'tab2-active',
}, },

6
src/ground/pages/home/index.scss

@ -152,7 +152,7 @@ page {
display: flex; display: flex;
.col { .col {
position: relative; position: relative;
padding: 28rpx 34rpx; padding: 28rpx 24rpx;
flex: 1; flex: 1;
.name { .name {
font-size: 24rpx; font-size: 24rpx;
@ -271,7 +271,7 @@ page {
border-radius: 16rpx 16rpx 0 0; border-radius: 16rpx 16rpx 0 0;
.col { .col {
flex: 1; flex: 1;
padding: 28rpx 34rpx; padding: 28rpx 24rpx;
.name { .name {
font-size: 28rpx; font-size: 28rpx;
color: #ffffff; color: #ffffff;
@ -301,7 +301,7 @@ page {
display: flex; display: flex;
.col { .col {
position: relative; position: relative;
padding: 28rpx 34rpx; padding: 28rpx 24rpx;
flex: 1; flex: 1;
.name { .name {
font-size: 24rpx; font-size: 24rpx;

4
src/ground/pages/home/index.ts

@ -54,7 +54,7 @@ Page({
chart1StartMonth: '', chart1StartMonth: '',
chart1EndMonth: '', chart1EndMonth: '',
// 日期范围 - 图表2(邀约药师统计) // 日期范围 - 图表2(邀约店员统计)
chart2StartDate: '', chart2StartDate: '',
chart2EndDate: '', chart2EndDate: '',
// 图表2显示用的月份(YYYY-MM) // 图表2显示用的月份(YYYY-MM)
@ -277,7 +277,7 @@ Page({
}) })
}, },
// 获取邀约药师统计图表(使用 chart2 的日期) // 获取邀约店员统计图表(使用 chart2 的日期)
getPharmacistChart() { getPharmacistChart() {
// 根据统计类型选择日期格式 // 根据统计类型选择日期格式
const startDate = this.data.statType === 'month' ? this.data.chart2StartMonth : this.data.chart2StartDate const startDate = this.data.statType === 'month' ? this.data.chart2StartMonth : this.data.chart2StartDate

4
src/ground/pages/home/index.wxml

@ -38,7 +38,7 @@
</view> </view>
<view class="line"></view> <view class="line"></view>
<view class="col"> <view class="col">
<view class="name">药师数</view> <view class="name">店员数</view>
<view class="num">{{totalInvitePharmacistCount}}</view> <view class="num">{{totalInvitePharmacistCount}}</view>
</view> </view>
</view> </view>
@ -165,7 +165,7 @@
</view> </view>
<view class="chat-data"> <view class="chat-data">
<view class="c-header"> <view class="c-header">
<view class="title">邀约药师数统计</view> <view class="title">邀约店员数统计</view>
</view> </view>
<view class="chart-range"> <view class="chart-range">
<picker class="picker" mode="date" fields="{{statType === 'month' ? 'month' : 'day'}}" value="{{chart2StartDate}}" end="{{today}}" bindchange="onChart2DateChange" data-field="startDate"> <picker class="picker" mode="date" fields="{{statType === 'month' ? 'month' : 'day'}}" value="{{chart2StartDate}}" end="{{today}}" bindchange="onChart2DateChange" data-field="startDate">

2
src/ground/pages/login/index.wxml

@ -48,7 +48,7 @@
<image wx:else class="icon" src="{{imageUrl}}icon12.png?t={{Timestamp}}"></image> <image wx:else class="icon" src="{{imageUrl}}icon12.png?t={{Timestamp}}"></image>
<view class="p"> <view class="p">
我特此同意依照此 我特此同意依照此
<text class="link" catch:tap="handleLink">《隐私协议保护政策》</text> <text class="link" bind:tap="handleLink">《个人信息及隐私保护政策》</text>
规定收集我的个人敏感信息 规定收集我的个人敏感信息
</view> </view>
</view> </view>

2
src/ground/pages/pharmacist/index.scss

@ -98,7 +98,7 @@ page {
border-radius: 24rpx 24rpx 24rpx 24rpx; border-radius: 24rpx 24rpx 24rpx 24rpx;
border: 2rpx solid #ffffff; border: 2rpx solid #ffffff;
/* 药师基本信息 */ /* 店员基本信息 */
.user { .user {
display: flex; display: flex;
align-items: center; align-items: center;

10
src/ground/pages/pharmacist/index.ts

@ -16,7 +16,7 @@ Page({
currentProjectName: '', currentProjectName: '',
projectIndex: 0, projectIndex: 0,
// 药师列表 // 店员列表
pharmacistList: [] as any[], pharmacistList: [] as any[],
totalCount: 0, totalCount: 0,
@ -32,7 +32,7 @@ Page({
}, },
}, },
onLoad() { onLoad() {
// 地推端药师页面,仅允许地推人员访问 // 地推端店员页面,仅允许地推人员访问
app.waitLogin({ types: [3] }).then(() => { app.waitLogin({ types: [3] }).then(() => {
this.getProjectList() this.getProjectList()
}) })
@ -56,7 +56,7 @@ Page({
projectIndex: projectIndex >= 0 ? projectIndex : 0, projectIndex: projectIndex >= 0 ? projectIndex : 0,
}) })
// 获取药师列表 // 获取店员列表
this.getPharmacistList() this.getPharmacistList()
}) })
}, },
@ -103,7 +103,7 @@ Page({
}) })
} }
}, },
// 获取药师列表 // 获取店员列表
getPharmacistList() { getPharmacistList() {
if (this.data.loading || !this.data.hasMore) return if (this.data.loading || !this.data.hasMore) return
@ -141,7 +141,7 @@ Page({
this.setData({ loading: false }) this.setData({ loading: false })
}) })
}, },
// 搜索药师 // 搜索店员
handleSearch(e: WechatMiniprogram.CustomEvent) { handleSearch(e: WechatMiniprogram.CustomEvent) {
this.setData({ this.setData({
keyword: e.detail.value, keyword: e.detail.value,

6
src/ground/pages/pharmacist/index.wxml

@ -12,7 +12,7 @@
<image class="icon" src="{{imageUrl}}icon1.png?t={{Timestamp}}"></image> <image class="icon" src="{{imageUrl}}icon1.png?t={{Timestamp}}"></image>
<input <input
type="text" type="text"
placeholder="搜索药店名/药师姓名" placeholder="搜索药店名/店员姓名"
class="input" class="input"
placeholder-class="place-input" placeholder-class="place-input"
confirm-type="search" confirm-type="search"
@ -39,9 +39,9 @@
<text class="num">{{totalCount}}</text> <text class="num">{{totalCount}}</text>
</view> </view>
<!-- 药师信息卡片 --> <!-- 店员信息卡片 -->
<view class="pharmacist-card" wx:for="{{pharmacistList}}" wx:key="id" data-id="{{item.id}}" bind:tap="handleInfo"> <view class="pharmacist-card" wx:for="{{pharmacistList}}" wx:key="id" data-id="{{item.id}}" bind:tap="handleInfo">
<!-- 药师基本信息 --> <!-- 店员基本信息 -->
<view class="user"> <view class="user">
<image class="avatar" mode="aspectFill" src="{{item.avatar}}"></image> <image class="avatar" mode="aspectFill" src="{{item.avatar}}"></image>
<view class="wrap"> <view class="wrap">

8
src/ground/pages/stat/index.ts

@ -3,7 +3,7 @@ const app = getApp<IAppOption>()
Page({ Page({
data: { data: {
// 药师ID(从药师列表进入时) // 店员ID(从店员列表进入时)
pharmacistId: 0, pharmacistId: 0,
// 时间筛选 // 时间筛选
@ -60,7 +60,7 @@ Page({
}) })
} }
// 设置药师ID(从药师列表进入) // 设置店员ID(从店员列表进入)
if (options?.id) { if (options?.id) {
this.setData({ this.setData({
pharmacistId: Number.parseInt(options.id), pharmacistId: Number.parseInt(options.id),
@ -96,7 +96,7 @@ Page({
// 根据是否有 pharmacistId 决定调用哪个接口 // 根据是否有 pharmacistId 决定调用哪个接口
if (pharmacistId > 0) { if (pharmacistId > 0) {
// 从药师列表进入 - 查看指定药师的统计 // 从店员列表进入 - 查看指定店员的统计
this.getPharmacistStatistics(pharmacistId, startDate, endDate, currentPage, pageSize, reset) this.getPharmacistStatistics(pharmacistId, startDate, endDate, currentPage, pageSize, reset)
} else { } else {
// 从首页进入 - 查看全部统计 // 从首页进入 - 查看全部统计
@ -162,7 +162,7 @@ Page({
}) })
}, },
// 获取药师统计(从药师列表进入时使用) // 获取店员统计(从店员列表进入时使用)
getPharmacistStatistics( getPharmacistStatistics(
pharmacistId: number, pharmacistId: number,
startDate: string, startDate: string,

2
src/pages/index/index.ts

@ -17,7 +17,7 @@ Page({
projectIndex: 0, projectIndex: 0,
projectList: [] as Array<{ projectId: number; projectName: string; projectDescription: string }>, projectList: [] as Array<{ projectId: number; projectName: string; projectDescription: string }>,
// 扫码获取的药师ID // 扫码获取的店员ID
pharmacistId: '', pharmacistId: '',
isPatient: 0, isPatient: 0,

4
src/pages/work/index.wxml

@ -19,8 +19,8 @@
<view class="card" bind:tap="handleDoctor"> <view class="card" bind:tap="handleDoctor">
<image class="icon" src="{{imageUrl}}icon20.png?t={{Timestamp}}"></image> <image class="icon" src="{{imageUrl}}icon20.png?t={{Timestamp}}"></image>
<view class="wrap"> <view class="wrap">
<view class="title">我是药师</view> <view class="title">我是店员</view>
<view class="content">登录药师专属版本</view> <view class="content">登录店员专属版本</view>
</view> </view>
<image class="more" src="{{imageUrl}}icon10.png?t={{Timestamp}}"></image> <image class="more" src="{{imageUrl}}icon10.png?t={{Timestamp}}"></image>
</view> </view>

2
src/utils/page.ts

@ -67,7 +67,7 @@ function page(config: WechatMiniprogram.Page.Instance<WechatMiniprogram.IAnyObje
} }
return { return {
title: '药师业务管理提效小助手', title: '店员业务管理提效小助手',
path: url, path: url,
imageUrl, imageUrl,
} }

Loading…
Cancel
Save