Selaa lähdekoodia

refactor(therapist): 将所有技师相关文案和逻辑统一替换为商家

- 替换页面标题中的“技师”为“商家”
- 修改订单状态显示,将“技师出发/到达”改为“商家出发/到达”
- 更新钱包、团队、我的页面相关标签为“商家”
- 调整请求注释及变量名称,明确关联商家业务
- 修正搜索框placeholder提示为“请输入商家名字”
- 修改提示信息及 toast 文本,确保与商家身份对应
- 统一调整接口及数据注释,保持一致性和准确性
zhangtao 1 päivä sitten
vanhempi
commit
cb95831666

+ 2 - 2
App.vue

@@ -367,7 +367,7 @@
  					this.$queue.setData('ylTxSel', res.data.value);
  				}
  			});
-			// 是否开启为技师充值	390
+			// 是否开启为商家充值	390
 			this.$Request.get('/app/common/type/390').then(res => {
 				if (res.code == 0) {
 					this.$queue.setData('jsczSel', res.data.value);
@@ -385,7 +385,7 @@
 					this.$queue.setData('closeKC', res.data.value);
 				}
 			});
-			// 技师详情顶部图高度	421
+			// 商家详情顶部图高度	421
 			this.$Request.get('/app/common/type/421').then(res => {
 				if (res.code == 0) {
 					this.$queue.setData('imageHeight', res.data.value);

+ 1 - 1
my/gonghui/index.vue

@@ -55,7 +55,7 @@
 			<view class="tool-card">
 				<view class="tool-item" @click="navToLogin('/my/gonghui/therapist?consortiaId=' + consortiaId)">
 					<view class="item-right">
-						<view class="view-text">商家技师</view>
+						<view class="view-text">商家</view>
 						<image src="/static/images/index/right.png" class="view-image-right"></image>
 					</view>
 				</view>

+ 2 - 2
my/order/pay.vue

@@ -5,8 +5,8 @@
 			<view v-if="order.status ==2">待服务</view>
 			<view v-if="order.status ==5">已完成</view>
 			<view v-if="order.status ==6">服务中</view>
-			<view v-if="order.status ==7">技师出发</view>
-			<view v-if="order.status ==8">技师到达</view>
+			<view v-if="order.status ==7">商家出发</view>
+			<view v-if="order.status ==8">商家到达</view>
 			<view v-if="order.status ==3">待评价</view>
 			<view v-if="order.status ==4" style="color: #999999;">已取消</view>
 			<view v-if="order.overTimeOrders == 1" style="color: red;font-size:26rpx">(订单已超时)</view>

+ 1 - 1
my/wallet/index.vue

@@ -200,7 +200,7 @@
 
 		<view class="flex justify-around margin-top " v-if="jsczSel != '否'">
 			<view @click="goNav('/pages/therapist/therapistList?index=2')">为TA充值</view>
-			<view @click="goNav('/pages/therapist/therapistList?index=3')">我的技师</view>
+			<view @click="goNav('/pages/therapist/therapistList?index=3')">我的商家</view>
 		</view>
 
 	</view>

+ 4 - 4
pages.json

@@ -54,7 +54,7 @@
 		{
 			"path": "pages/index/order/orderDetail",
 			"style": {
-				"navigationBarTitleText": "技师详情"
+				"navigationBarTitleText": "商家详情"
 			}
 		},
 
@@ -306,7 +306,7 @@
 		{
 			"path": "pages/therapist/therapistList",
 			"style": {
-				"navigationBarTitleText": "选择技师",
+				"navigationBarTitleText": "选择商家",
 				"enablePullDownRefresh": true,
 				"app-plus": {
 					"titleNView": false
@@ -315,7 +315,7 @@
 		}, {
 			"path": "pages/therapist/orderDetail",
 			"style": {
-				"navigationBarTitleText": "技师详情"
+				"navigationBarTitleText": "商家详情"
 			}
 		}
 	],
@@ -430,7 +430,7 @@
  			{
  				"path": "gonghui/therapist",
  				"style": {
- 					"navigationBarTitleText": "商家技师"
+ 					"navigationBarTitleText": "商家商家"
  				}
  			},
 			{

+ 2 - 2
pages/index/index.vue

@@ -234,7 +234,7 @@
 			}
 			// #endif
 
-			that.$Request.getT('/app/common/type/250').then(res => { //技师完成通知
+			that.$Request.getT('/app/common/type/250').then(res => { //商家完成通知
 				if (res.code == 0) {
 					if (res.data && res.data.value) {
 						that.arr.push(res.data.value)
@@ -242,7 +242,7 @@
 				}
 			})
 
-			that.$Request.getT('/app/common/type/248').then(res => { //技师取消通知
+			that.$Request.getT('/app/common/type/248').then(res => { //商家取消通知
 				if (res.code == 0) {
 					if (res.data && res.data.value) {
 						that.arr.push(res.data.value)

+ 3 - 3
pages/index/index1.vue

@@ -70,7 +70,7 @@
 							<view v-if="XCXIsSelect != '否'"
 								style="background: #2FB57A;color: #ffffff;line-height: 56upx;border-radius: 8rpx;font-size: 24upx;padding: 0upx 23upx;"
 								>
-								选择技师
+								选择商家
 							</view>
 						</view>
 					</view>
@@ -233,7 +233,7 @@
 			}
 
 			if (this.myId) {
-				that.$Request.getT('/app/common/type/250').then(res => { //技师完成通知
+				that.$Request.getT('/app/common/type/250').then(res => { //商家完成通知
 					if (res.code == 0) {
 						if (res.data && res.data.value) {
 							that.arr.push(res.data.value)
@@ -241,7 +241,7 @@
 					}
 				})
 
-				that.$Request.getT('/app/common/type/248').then(res => { //技师取消通知
+				that.$Request.getT('/app/common/type/248').then(res => { //商家取消通知
 					if (res.code == 0) {
 						if (res.data && res.data.value) {
 							that.arr.push(res.data.value)

+ 2 - 2
pages/index/order/orderDet.vue

@@ -69,7 +69,7 @@
 			<view class="padding-sm bg radius u-skeleton-fillet margin-top-sm">
 				<view class="flex justify-between align-center" style="padding: 0rpx 10rpx;line-height: 106upx;">
 					<view class="text-30" style="width: 30%;">
-						服务技师
+						服务商家
 					</view>
 					<view class="flex align-center">
 						<text class="margin-right-xs">{{order.artificerName}}</text>
@@ -672,7 +672,7 @@
 					}
 				});
 			},
-			// 技师详情
+			// 商家详情
 			getDet() {
 				this.$Request.get("/app/artificer/selectArtificerById", {
 					artificerId: this.artificerId,

+ 2 - 2
pages/my/index.vue

@@ -20,7 +20,7 @@
 							<view class="u-font-18 margin-left-sm margin-top-xs text-bold"
 								style="font-weight: 800;font-size: 32rpx;color: #222222">{{userName}}</view>
 							<view style="display: flex;align-items: center;" class="box-jishi" @click="handleTop">
-								技师端入口
+								商家端入口
 								<image src="/static/images/qiehuan.png" style="width:18rpx ;height: 18rpx;"></image>
 							</view>
 						</view>
@@ -33,7 +33,7 @@
 						登录
 					</view>
 					<view style="display: flex;align-items: center;margin-left: 120rpx;" class="box-jishi" @click="handleTop">
-						技师端入口
+						商家端入口
 						<image src="/static/images/qiehuan.png" style="width:18rpx ;height: 18rpx;"></image>
 					</view>
 				</view>

+ 1 - 1
pages/my/myteam.vue

@@ -3,7 +3,7 @@
 		<view class="flex text-center  text-lg bg">
 			<view class="title_btn flex-sub bg" @click="cut(1)" :class="tabFromIndex==1?'bgCol2': ''">团队用户
 			</view>
-			<view class="title_btn flex-sub bg" @click="cut(2)" :class="tabFromIndex==2?'bgCol2': ''">团队技师
+			<view class="title_btn flex-sub bg" @click="cut(2)" :class="tabFromIndex==2?'bgCol2': ''">团队商家
 			</view>
 		</view>
 		<view class="view1">

+ 4 - 4
pages/order/index.vue

@@ -20,8 +20,8 @@
 				<view class="theme-color" v-if="item.status ==3">待评价</view>
 				<view class="theme-color" v-if="item.status ==5">已完成</view>
 				<view class="theme-color" v-if="item.status ==6">服务中</view>
-				<view class="theme-color" v-if="item.status ==7">技师出发</view>
-				<view class="theme-color" v-if="item.status ==8">技师到达</view>
+				<view class="theme-color" v-if="item.status ==7">商家出发</view>
+				<view class="theme-color" v-if="item.status ==8">商家到达</view>
 				<view class="theme-color" v-if="item.status ==4" style="color: #999999;">已取消</view>
 				<!-- <view class="u-tips-color">{{item.createTime}}</view> -->
 			</view>
@@ -103,10 +103,10 @@
 					name: '待服务',
 					status: '2'
 				}, {
-					name: '技师出发',
+					name: '商家出发',
 					status: '7'
 				}, {
-					name: '技师到达',
+					name: '商家到达',
 					status: '8'
 				}, {
 					name: '服务中',

+ 2 - 2
pages/therapist/orderDetail.vue

@@ -334,7 +334,7 @@
 				});
 
 			},
-			//服务技师
+			//服务商家
 			getordertherapist() {
 				this.$Request.get("/app/artificer/selectArtificerMassageList", {
 					artificerId: this.artificerId,
@@ -372,7 +372,7 @@
 			goNav(massageTypeId) {
 				if (this.status == 2) {
 					uni.showToast({
-						title: '技师已下线',
+						title: '商家已下线',
 						icon: 'none'
 					})
 				} else {

+ 1 - 1
pages/therapist/therapist.vue

@@ -6,7 +6,7 @@
 				</image>
 				<view class="localName  margin-left-sm">{{city}}</view>
 			</view>
-			<u-search class="flex-sub search" clearabled placeholder="请输入技师名字" :focus="false" v-model="artificerName"
+			<u-search class="flex-sub search" clearabled placeholder="请输入商家名字" :focus="false" v-model="artificerName"
 				:show-action="true" :animation="true" bg-color="#F7F7F7" color="#1A1A1A" @search="onSearch()"
 				action-text="搜索" @custom="onSearch()"></u-search>
 			<!-- <u-search style="width: 100%;" placeholder="搜索需要的师傅" :focus="true" v-model="keyword" :show-action="true"

+ 4 - 4
pages/therapist/therapistList.vue

@@ -6,7 +6,7 @@
  					class="margin-top-xs"></image>
  				<view class="localName  margin-left-sm">{{city}}</view>
  			</view>
- 			<u-search class="flex-sub search" clearabled placeholder="请输入技师名字" :focus="false" v-model="artificerName"
+ 			<u-search class="flex-sub search" clearabled placeholder="请输入商家名字" :focus="false" v-model="artificerName"
  				:show-action="true" :animation="true" bg-color="#F7F7F7" color="#1A1A1A" @search="onSearch()"
  				action-text="搜索" @custom="onSearch()"></u-search>
  		</view>
@@ -311,12 +311,12 @@
 					})
 				} else {
 					uni.setNavigationBarTitle({
-						title: '我的技师'
+						title: '我的商家'
 					})
 				}
 			} else {
 				uni.setNavigationBarTitle({
-					title: '选择技师'
+					title: '选择商家'
 				})
 			}
 			uni.showLoading({
@@ -817,7 +817,7 @@
 				if (this.numIndex == 1) {
 
 					if (e.status != 1) {
-						this.$queue.showToast('当前技师已下线,请预约其他技师!')
+						this.$queue.showToast('当前商家已下线,请预约其他商家!')
 						return;
 					}
 					uni.navigateTo({