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

otherPages/orderTakingManage/detail/index.vue

@@ -6,29 +6,31 @@
 				<view>
 					本单客户支付金额
 					<view class="vertically_center text1">
-						¥ 45
+						¥ {{ orderDetail.order?.h5OrderVO?.payAmount }}
 					</view>
 				</view>
 				X
 				<view>
 					您的分成比例
 					<view class="vertically_center text1">
-						20%
+						<!-- 20% -->
+						{{ orderDetail.pet_payment_bcs[userInfo.userBcsRole - 1].paramValueText }}
 					</view>
 				</view>
 				=
 				<view>
 					本单酬劳
 					<view class="vertically_center text1">
-						¥ 9
+						¥ {{ orderDetail.pet_payment_bcs[userInfo.userBcsRole - 1].paramValueNo * orderDetail.order?.h5OrderVO?.payAmount }}
 					</view>
 				</view>
 			</view>
 			<view class="top_bottom">
-				订单为系统派发，请确认订单信息后再抢单
+				<!-- 订单为系统派发，请确认订单信息后再抢单 -->
+				{{ typeInfo[orderDetail.order.type].content }}
 			</view>
 			<view class="top-button" :style="{ borderRadius: '27rpx' }">
-				系统派单
+				{{ typeInfo[orderDetail.order.type].title }}
 			</view>
 		</view>
 		<view class="information box-size" :style="{ borderRadius: '16rpx' }">
@@ -41,8 +43,8 @@
 				<view>
 					服务日期
 				</view>
-				<view >
-					12-0，12-08
+				<view v-if="orderDetail.order">
+					{{ getTextList() }}
 				</view>
 			</view>
 			<view class="line1">
@@ -68,31 +70,31 @@
 			</view>
 			<view class="line1">
 			</view>
-			<view v-for="pet in orderDetail.petList" :key="pet.id" class="pet_information box-size">
+			<view v-for="pet in orderDetail.order.h5OrderVO.petVOList" :key="pet.id" class="pet_information box-size">
 				<view class="flex pet_item box-size">
 					<view class="img" :style="{borderRadius:'100rpx'}">
-						<image :src="pet.headImage" mode=""></image>
+						<image :src="pet.photo" mode=""></image>
 					</view>
 					<view >
 						<view class="flex name">
 							<view class="name_text">
-								{{ pet.nickName }}
+								{{ pet.breed }}
 							</view>
 							<image src="" mode=""></image>
 						</view>
-						{{ pet.type }}
+						{{ pet.type }}{{ pet.bodyType }}
 					</view>
 				</view>
-				<view class="pet- level">
-					12-14
-					<text>专业喂养</text>
+				<view class="pet-level" v-for="(it, i) in pet.productNameText">
+					{{ it.time }}
+					<text>{{ it.name }}</text>
 					上门1次
 				</view>
-				<view class="pet- level">
+				<!-- <view class="pet-level">
 					12-15
 					<text>专业喂养</text>
 					上门1次
-				</view>
+				</view> -->
 			</view>
 			<view class="line1">
 			</view>
@@ -101,7 +103,7 @@
 					合计
 				</view>
 				<view class="money_text">
-					¥&nbsp;{{ orderDetail.order?.price }}
+					¥&nbsp;{{ orderDetail.order?.payAmount }}
 				</view>
 			</view>
 		</view>
@@ -116,7 +118,7 @@
 					订单编号：
 				</view>
 				<view>
-					fe34521532513256
+					{{ orderDetail.order.id }}
 				</view>
 			</view>
 			<view class="line1">
@@ -263,6 +265,8 @@
 	import {
 		useStore
 	} from "vuex"
+	
+	import dayjs from "dayjs";
 
 	onLoad((options) => {
 		orderId.value = options.id || null;
@@ -289,6 +293,21 @@
 	const rushToBuyAnOrder = () => {
 		open()
 	}
+	
+	const typeInfo = [
+		{
+			title : '系统派单',
+			content : '订单为系统派发，请确认订单信息后再抢单',
+		},
+		{
+			title : '个人订单',
+			content : '订单为系统派发，请确认订单信息后再抢单',
+		},
+		{
+			title : '流失订单',
+			content : '订单为系统派发，请确认订单信息后再抢单',
+		},
+	]
 
 	// 查看宠物信息
 	const petInfo = () => {
@@ -334,13 +353,58 @@
 		});
 		if (response.code == 200 && response.data) {
 			orderDetail.value = response.data;
+			orderDetail.value.order.h5OrderVO.petVOList.forEach(pet => {
+				
+				pet.productNameText = getProductNameText(pet.id, orderDetail.value.order.h5OrderVO.orderItemList, 
+				orderDetail.value.order.h5OrderVO.orderServiceList)
+			})
 		}
 	}
+	
+	function getOrderServiceText(petId, orderServiceList){
+		
+		let YYYY = undefined
+		
+		return orderServiceList
+		.filter(service => service.petId == petId)//过滤
+		.map(service => dayjs(service.serviceDate))//转成时间
+		.sort((a, b) => a.valueOf() - b.valueOf())//排序
+		.map((service, i) => {
+			// if(YYYY && YYYY.format('YYYY-MM') == service.format('YYYY-MM')){
+			// 	return service.format('DD')
+			// }
+			// if(YYYY && YYYY.format('YYYY') == service.format('YYYY')){
+			// 	return service.format('MM-DD')
+			// }
+			// YYYY = service
+			return service.format('MM-DD')
+		})
+	}
+	function getProductNameText(petId, productList, orderServiceList){
+		
+		let orderService = orderServiceList.filter(service => service.petId == petId)
+		
+		return productList
+		.filter(product => orderService.filter(service => service.id == product.orderServiceId).length > 0)
+		.map(product => {
+			return {
+				time : dayjs(orderService.filter(service => service.id == product.orderServiceId)
+				.serviceDate).format('MM-DD'),
+				name : product.productName,
+			}
+		})
+	}
+	
+	function getTextList(){
+		return orderDetail.value.order?.h5OrderVO
+			.orderServiceList.map(item => 
+			dayjs(item.serviceDate).format('MM-DD')).join('，')
+	}
 </script>
 
 <style scoped lang="scss">
 	@import "index";
-
+	
 	.line1 {
 		position: relative;
 		margin: 10rpx 0 20rpx 0;

pages/orderTakingManage/components/list.vue

@@ -15,7 +15,7 @@
                         <up-image style="flex-shrink:0" class="mr20" width="70px" height="70px" :src="pet.photo"
                             shape="circle"></up-image>
                         <view>
-                            <view class="font28 col3">服务天数: 共{{ pet.orderServiceText.length }}天 I {{ pet.orderServiceText.join(',') }}</view>
+                            <view class="font28 col3 text-ellipsis">服务天数: 共{{ pet.orderServiceText.length }}天 I {{ pet.orderServiceText.join('，') }}</view>
                             <!-- <view class="font28 col3">服务天数: 共{{ item.h5OrderVO.orderServiceList.length }}天 I
 
                                 <text v-for="itemService in item.h5OrderVO.orderServiceList" :key="itemService.id">
@@ -25,7 +25,7 @@
                             </view> -->
 
                             <!-- <view style="margin: 18rpx 0">期望上门时间：{{itemService.expectServiceTime}}</view> -->
-                            <view>{{ pet.breed }} | {{ pet.productNameText.join(',') }}
+                            <view class="text-ellipsis">{{ pet.breed }}{{ pet.bodyType }} | {{ pet.productNameText.join('，') }}
 
                                 <!-- <text v-for="itemPet in item.h5OrderVO.orderItemList" :key="itemPet.id">
                                     {{ itemPet.productName }}
@@ -168,4 +168,10 @@ const noneOrder = async () => {
     text-align: center;
     padding: 25rpx 0rpx;
 }
+.text-ellipsis{
+  overflow:hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+  -o-text-overflow:ellipsis;
+}
 </style>

pages/orderTakingManage/index.vue

@@ -79,6 +79,8 @@ import dayjs from "dayjs";
 		if (response.code == 200 && response.data) {
 			orderlist.value = response.data.rows;
 			
+			list[current.value].badge.value = response.data.total
+			
 			orderlist.value.forEach(item => {
 				item.h5OrderVO.petVOList.forEach(pet => {
 					pet.orderServiceText = getOrderServiceText(pet.id, item.h5OrderVO.orderServiceList)
@@ -97,14 +99,14 @@ import dayjs from "dayjs";
 		.map(service => dayjs(service.serviceDate))//转成时间
 		.sort((a, b) => a.valueOf() - b.valueOf())//排序
 		.map((service, i) => {
-			if(YYYY && YYYY.format('YYYY-MM') == service.format('YYYY-MM')){
-				return service.format('DD')
-			}
-			if(YYYY && YYYY.format('YYYY') == service.format('YYYY')){
-				return service.format('MM-DD')
-			}
-			YYYY = service
-			return service.format('YYYY-MM-DD')
+			// if(YYYY && YYYY.format('YYYY-MM') == service.format('YYYY-MM')){
+			// 	return service.format('DD')
+			// }
+			// if(YYYY && YYYY.format('YYYY') == service.format('YYYY')){
+			// 	return service.format('MM-DD')
+			// }
+			// YYYY = service
+			return service.format('MM-DD')
 		})
 	}
 	function getProductNameText(petId, productList, orderServiceList){

utils/getUrl.js

@@ -3,7 +3,7 @@ const accountInfo = wx.getAccountInfoSync();
 current = accountInfo.miniProgram.envVersion;
 
 const api = {
-	develop:"http://h5.xzaiyp.top/prod-api",
+	develop:"http://h5.xzaiyp.top",
 	// develop: "http://youyi-test.natapp1.cc/prod-api", // 开发
 	trial: "https://pet-admin.hhlm1688.com/prod-api", //测试
 	release: "http://h5.xzaiyp.top/prod-api", // 线上