XSLu08042 1 hete
szülő
commit
23f0ec66ca

+ 2 - 1
pages_company/storeOrderDetail.vue

@@ -274,7 +274,8 @@
 		onShareAppMessage(res) {
 			return {
 				title: "订单:"+this.order.orderCode,
-				path: `/pages/shopping/paymentOrder?orderId=${this.order.id}`,
+				path: `/pages_user/shopping/storeOrderDetail?id=${this.order.id}`,
+				imageUrl: 'https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/app/newImages/sharelogo.png'
 			}
 		},
 		methods: {

+ 10 - 9
pages_shopping/paymentOrder.vue

@@ -441,21 +441,22 @@
 				}
 				else if(res.payType==3){
 					 uni.hideLoading();
-					 if(that.order.isPrescribe){
-						 //如果是处方订单开处方
+					 // 能支付的订单表示已经开过处方了
+					 // if(that.order.isPrescribe){
+						//  //如果是处方订单开处方
+						// // uni.redirectTo({
+						// // 	url:"prescribe?orderId="+that.order.id
+						// // })
 						// uni.redirectTo({
-						// 	url:"prescribe?orderId="+that.order.id
+						// 	url:"/pages_shopping/prescribe?orderId="+that.prescribeOrder+"&combinationOrderId="+encodeURIComponent(that.order.combinationOrderId)
 						// })
-						uni.redirectTo({
-							url:"/pages_shopping/prescribe?orderId="+that.prescribeOrder+"&combinationOrderId="+encodeURIComponent(that.order.combinationOrderId)
-						})
-					 }
-					 else{
+					 // }
+					 // else{
 						//如果是普通订单
 						uni.redirectTo({
 							url:"/pages_shopping/success?order="+JSON.stringify(that.order)
 						}) 
-					 }
+					 // }
 				}
 			}
 		}

+ 18 - 16
pages_shopping/prescribe.vue

@@ -45,7 +45,7 @@
 								<view class="info">
 									<text class="sex" v-if="item.gender==1">男</text>
 									<text class="sex" v-if="item.gender==2">女</text>
-									<text class="ege">{{$getAge(item.birthday)}}岁</text>
+									<text class="ege">{{item.birthday?$getAge(item.birthday):'-'}}岁</text>
 								</view>
 								<!-- 选中的对号角标 -->
 								<image v-if="patientId == item.patientId" class="active-img" src="https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/app/newImages/shopping/sel_right50.png" mode=""></image>
@@ -650,22 +650,24 @@
 			 			uni.hideLoading()
 			 			if(res.code==200){
 			 				this.patient=res.data;
-							if(this.patient&&this.patient.length>0) {
-								const existIndex = this.patient.findIndex(
-								    item => item.patientId === this.patientInfo.patientId
-								);
-								
-								if (existIndex === -1) {
-								    // 使用 Vue 的数组变异方法,确保视图更新
-								    this.patient.unshift({ ...this.patientInfo });
-								} else if (existIndex > 0) {
-								    // 已存在但不是第一个,移到最前面
-								    const item = this.patient[existIndex];
-								    this.patient.splice(existIndex, 1);
-								    this.patient.unshift(item);
+							if(this.dataPrescribeKey) {
+								if(this.patient&&this.patient.length>0) {
+									const existIndex = this.patient.findIndex(
+									    item => item.patientId === this.patientInfo.patientId
+									);
+									
+									if (existIndex === -1) {
+									    // 使用 Vue 的数组变异方法,确保视图更新
+									    this.patient.unshift({ ...this.patientInfo });
+									} else if (existIndex > 0) {
+									    // 已存在但不是第一个,移到最前面
+									    const item = this.patient[existIndex];
+									    this.patient.splice(existIndex, 1);
+									    this.patient.unshift(item);
+									}
+								} else {
+									this.patient = [this.patientInfo]
 								}
-							} else {
-								this.patient = [this.patientInfo]
 							}
 			 			}else{
 			 				uni.showToast({