Merge branch 'master' of http://175.178.51.79:3000/Augcl/pet-front

api/amount/index.js

@@ -3,36 +3,48 @@ import request from '@/utils/request'
 
 // 小程序-金额流水信息列表数据查询
 export const amountLogList = (params) => {
-  return request({
-    url: '/applet/amount/amountLogList',
-    headers: {
-      isToken: true
-    },
-    method: "get",
-    params
-  })
+	return request({
+		url: '/applet/amount/amountLogList',
+		headers: {
+			isToken: true
+		},
+		method: "get",
+		params
+	})
 }
 
 // 小程序-充值
 export const cashIn = (data) => {
-  return request({
-    url: '/applet/amount/cashIn',
-    headers: {
-      isToken: true
-    },
-    method: "post",
-    data
-  })
+	return request({
+		url: '/applet/amount/cashIn',
+		headers: {
+			isToken: true
+		},
+		method: "post",
+		data
+	})
 }
 
 // 小程序-提现
 export const cashOut = (data) => {
-  return request({
-    url: '/applet/amount/cashOut',
-    headers: {
-      isToken: true
-    },
-    method: "post",
-    data
-  })
+	return request({
+		url: '/applet/amount/cashOut',
+		headers: {
+			isToken: true
+		},
+		method: "post",
+		data
+	})
+}
+
+// 小程序-缴纳保证金
+export const teacherPayPrice = (data) => {
+	return request({
+		url: '/applet/UserTeacher/payPrice',
+		headers: {
+			isToken: true
+		},
+		method: "post",
+		data
+	})
 }

otherPages/authentication/examination/end.vue

@@ -3,7 +3,7 @@
 		<view class="containers po-r">
 			<image src="" mode="" class="mainBg"></image>
 			<view class="w-100 po-a content">
-				
+
 				<stepProgress :step="3"></stepProgress>
 
 				<view class="step mt24">
@@ -77,7 +77,8 @@
 							</view>
 							<view class="info color-777 size-22 flex-rowl">
 								<text class="size-22 color-777">微信二维码</text>
-								<image :src="configList.wx_image.paramValueImage" mode="widthFix" style="width: 150rpx;height: 150rpx;"></image>
+								<image :src="configList.wx_image.paramValueImage" mode="widthFix"
+									style="width: 150rpx;height: 150rpx;"></image>
 							</view>
 						</view>
 					</view>
@@ -96,22 +97,36 @@
 								</view>
 								<view class="size-22 flex-rowr" @click="openToolsInfoModal">
 									<text>查看工具包</text>
-									<up-icon name="arrow-down" color="#7F7F7F" size="17rpx" style="margin-left: 5rpx;"></up-icon>
+									<up-icon name="arrow-down" color="#7F7F7F" size="17rpx"
+										style="margin-left: 5rpx;"></up-icon>
 								</view>
 							</view>
-							<view class="info color-777 size-22">
+							<!-- <view class="info color-777 size-22">
 								<view class="flex-between">
 									<text class="size-22">所在地区:</text>
-                  <view plain class="flex-rowr" @click="selectAddr">
+									<view plain class="flex-rowr" @click="selectAddr">
 										<text>{{ form.area ? form.area : '请选择' }}</text>
-										<up-icon style="margin-left: 22rpx;" name="arrow-down" color="#7F7F7F" size="21rpx"></up-icon>
-                  </view>
+										<up-icon style="margin-left: 22rpx;" name="arrow-down" color="#7F7F7F"
+											size="21rpx"></up-icon>
+									</view>
+								</view>
+							</view> -->
+							<view class="info color-777 size-22 mt20">
+								<view class="flex-between">
+									<text class="size-22">姓名:</text>
+									<input v-model="form.name" type="text" placeholder="请输入姓名" />
+								</view>
+							</view>
+							<view class="info color-777 size-22 mt20">
+								<view class="flex-between">
+									<text class="size-22">电话:</text>
+									<input v-model="form.phone" type="text" placeholder="请输入道路、小区、门牌号等" />
 								</view>
 							</view>
 							<view class="info color-777 size-22 mt20">
 								<view class="flex-between">
-									<text class="size-22">详细地址:</text>
-									<input v-model="form.address" type="text" placeholder="请输入道路、小区、门牌号等" />
+									<text class="size-22">地址:</text>
+									<input v-model="form.address" type="text" placeholder="请输入收货地址" />
 								</view>
 							</view>
 						</view>
@@ -127,13 +142,8 @@
 				</view>
 			</view>
 
-			<up-modal 
-				:show="showToolsInfoModal"  
-				:showConfirmButton="false"
-				:showCancelButton="false"
-				:closeOnClickOverlay="true"
-				@close="closeToolsInfoModal"
-			>
+			<up-modal :show="showToolsInfoModal" :showConfirmButton="false" :showCancelButton="false"
+				:closeOnClickOverlay="true" @close="closeToolsInfoModal">
 				<up-parse class="size-28" :content="configList.pet_tools.paramValueArea"></up-parse>
 			</up-modal>
 
@@ -145,10 +155,21 @@
 </template>
 
 <script setup>
-	import { ref, reactive, computed } from "vue";
-	import { onShow } from '@dcloudio/uni-app'
-	import { useStore } from 'vuex'
-	import { udpateUser, getUserOne } from '@/api/userTeacher'
+	import {
+		ref,
+		reactive,
+		computed
+	} from "vue";
+	import {
+		onShow
+	} from '@dcloudio/uni-app'
+	import {
+		useStore
+	} from 'vuex'
+	import {
+		udpateUser,
+		getUserOne
+	} from '@/api/userTeacher'
 
 	import stepProgress from '../components/stepProgress.vue';
 
@@ -173,7 +194,7 @@
 		address: null,
 	})
 
-	
+
 	const initData = async () => {
 		console.log('--initData')
 		try {
@@ -244,6 +265,8 @@
 				latitude,
 				longitude,
 				address,
+				name,
+				phone,
 			} = form
 
 			const data = {
@@ -252,10 +275,12 @@
 				latitude,
 				longitude,
 				address,
+				name,
+				phone,
 			}
 
 			await udpateUser(data)
-			
+
 			uni.showToast({
 				title: '提交成功!',
 				icon: "none"
@@ -268,7 +293,7 @@
 			}, 1000)
 
 		} catch (err) {
-			
+
 		}
 
 	}

otherPages/authentication/serve/index.vue

@@ -48,8 +48,8 @@
 			</view>
 			<view class="form">
                 <up-form label-position="left" :model="formData" :rules="rules" ref="dFormRef" labelWidth="200rpx">
-                    <up-form-item label="个人简介" prop="introduction">
-                        <up-input v-model="formData.introduction" 
+                    <up-form-item label="个人简介" prop="userBrief">
+                        <up-input v-model="formData.userBrief" 
                         placeholder="请输入个人简介" border="none" 
                         inputAlign="right"
                         fontSize="28rpx">
@@ -171,7 +171,8 @@
 	const formData = reactive({
 		introduction: '',
 		experience: '',
-		serviceRecord: ''
+		serviceRecord: '',
+		userBrief : '',
 	})
 
 	const rules = {
@@ -211,10 +212,10 @@
 				// 设置基本资料
 				baseFormData.userName = userInfo.value.userName || ''
 				baseFormData.userTelephone = data.phone || userInfo.value.userTelephone || ''
-				baseFormData.sex = data.sex === 0 ? '男' : '女'
+				baseFormData.sex = data.sex == 0 ? '男' : '女'
 				
 				// 设置展示信息
-				formData.introduction = data.introduction || ''
+				formData.userBrief = data.userBrief || ''
 				formData.experience = data.experience || ''
                 
 				form.headImage = userInfo.value.userImage || ''
@@ -222,7 +223,7 @@
 				
 				// 设置服务资料
 				if (data.petType) {
-					form.type = [data.petType]
+					form.type = data.petType.split ? data.petType.split(',').map(n => parseInt(n)) : [parseInt(data.petType)]
 				}
 				
 				// 设置增值服务
@@ -323,10 +324,10 @@
 			const submitData = {
                 id : form.id,
 				phone: baseFormData.userTelephone,
-				sex: baseFormData.sex === '男' ? 0 : 1,
-				introduction: formData.introduction,
+				sex: baseFormData.sex == '男' ? 0 : 1,
+				userBrief: formData.userBrief,
 				experience: formData.experience,
-				petType: form.type.length > 0 ? form.type[0] : null,
+				petType: form.type.length > 0 ? form.type.join(',') : null,
 				license: serveFormData.serve.join(';'),
 			}
 			

otherPages/myOrdersManage/bond/index.vue

@@ -18,7 +18,7 @@
 			<view class="level Recharge">
 				<view class="money level">
 					<text>¥</text>
-					<input v-model="money" type="text" />
+					<input v-model="money" type="digit" />
 				</view>
 				<view class="text2" :style="{ borderRadius: '23.5rpx' }" @click="onPay">
 					去充值
@@ -43,7 +43,8 @@
 		computed
 	} from 'vue'
 	import {
-		cashIn
+		cashIn,
+		teacherPayPrice,
 	} from '@/api/amount/index.js'
 	import {
 		useStore
@@ -78,10 +79,9 @@
 				icon: "none"
 			})
 		}
-		let response = await cashIn({
+		let response = await teacherPayPrice({
 			money: money.value,
-			type: 1,
-			userId: userInfo.value.userId
+			memberId: userInfo.value.userId
 		})
 		if (response.code == 200) {
 			uni.showToast({
@@ -92,7 +92,7 @@
 	}
 
 	onShow(() => {
-		money.value = Number(configList.value.pet_money.pet_money_text)
+		// money.value = Number(configList.value.pet_money.pet_money)
 	})
 </script>
 

otherPages/orderTakingManage/detail/index.vue

@@ -241,7 +241,7 @@
 			</view>
 			<view class="button-group">
 				<up-button @click="noneOrder" color="#FFBF60" text="复制订单编号" shape="circle"></up-button>
-				<up-button @click="toMyOrder" color="#FFBF60" text="到我的订单查看" shape="circle" style="margin-top: 20rpx;"></up-button>
+				<up-button v-if="showSecondButton" @click="toMyOrder" color="#FFBF60" text="到我的订单查看" shape="circle" style="margin-top: 20rpx;"></up-button>
 			</view>
 		</view>
 	</up-popup>
@@ -290,6 +290,7 @@
 	const value = ref("45619491656")
 	const petList = ref([])
 	const confirmStatus = ref([false, false, false]); // 添加确认状态数组，分别对应三个确认项
+	const showSecondButton = ref(false); // 控制第二个按钮的显示
 	const userInfo = computed(() => {
 		return store.getters.userInfo
 	})
@@ -337,6 +338,8 @@
 
 	const orderSuccessOpen = () => {
 		showOrderSuccess.value = true;
+		// 重置按钮显示状态，初始只显示复制订单编号按钮
+		showSecondButton.value = false;
 	};
 
 	// 处理确认按钮点击事件
@@ -447,6 +450,8 @@
 					title: '复制成功',
 					icon: 'none'
 				});
+				// 点击复制按钮后显示第二个按钮
+				showSecondButton.value = true;
 			}
 		});
 	}
@@ -455,7 +460,7 @@
 	const toMyOrder = () => {
 		orderSuccessClose();
 		uni.navigateTo({
-			url: '/pages/myOrdersManage/list/index'
+			url: '/pages/myOrdersManage/index'
 		});
 	}
 </script>

pages/myOrdersManage/components/petServicePopup.vue

@@ -80,7 +80,7 @@ const getServiceTimeText = (timeCode) => {
 const handleClock = (service) => {
 	if (!props.orderData || !service) return;
 
-    let url = `/otherPages/myOrdersManage/clock/index?id=${props.orderData.orderId}&itemID=${props.orderData.id}&serviceId=${service.id}`
+    let url = `/otherPages/myOrdersManage/clock/index?id=${props.orderData.orderId}&itemID=${props.orderData.id}&serviceId=${service.id}&isRead=true`
 
     if(service){
 

pages/myOrdersManage/components/systemOrder.vue

@@ -23,7 +23,7 @@
 						<view class="mb28 address">{{ item.address }}</view>
 						<view class="mb28" v-if="item.type == 0">订单为系统派发，请确认订单信息后再抢单</view>
 						<view class="flex flex-between">
-							<up-button type="primary" :text="btnTexts[item.orderStatus]" @click="showServicePopup(item)" shape="circle"
+							<up-button type="primary" text="打卡记录" @click="showServicePopup(item)" shape="circle"
 								class="mr20" color="#FFAA48"></up-button>
 							<up-button type="primary" text="宠物档案" @click="toPet(item)" shape="circle" class="mr20"
 								color="#FFAA48"></up-button>
@@ -64,7 +64,6 @@ import PetServicePopup from './petServicePopup.vue';
 			required: true
 		}
 	});
-	const btnTexts = ['打卡', '打卡', '打开记录']
 	const orderStatus = ['待接单','进行中','已完成']
 	
 	// 弹窗相关状态