no message

pages/common_tools/my_consulting/my_consulting.vue

@@ -92,9 +92,9 @@
 					</view>
 					<view class="textstyle margin-top-xs">
 						<text style="color: #333333;">下单时间：{{item.created_at}}</text>
-					</view>
-					<view class="cu-bar bg-white tabbar" v-if="item.order_status==1||item.order_status==2" style="width: 100%;display: flex;justify-content: flex-end;">
-						<u-button shape="circle" size="mini" @click="cancelOrder(item,index)" :ripple="true">取消订单</u-button>
+					</view>
+					<view class="cu-bar bg-white tabbar" v-if="item.order_status==1||item.order_status==2" style="width: 100%;display: flex;justify-content: flex-end;">
+						<u-button shape="circle" size="mini" @click="cancelOrder(item,index)" :ripple="true">取消订单</u-button>
 					</view>
 				</view>
 			</view>
@@ -131,7 +131,7 @@
 				</view>
 				<view class="u-text-center u-padding-top-10 u-padding-bottom-20 tips">请输入密码</view>
 			</view>
-		</u-keyboard>
+		</u-keyboard>
 		<view class="cu-tabbar-height"></view>
 	</view>
 </template>
@@ -420,11 +420,12 @@
 							icon: "none"
 						})
 					} else {
-						res.data.data.forEach((item, index) => {
-							if (item.docter === null||item.product_type == 6||item.product_type == 5||item.product_type == 3) {
-								res.data.data.splice(index, 1)
+						let i = res.data.data.length
+						while (i--) {
+							if (res.data.data[i].docter === null || res.data.data[i].product_type == 6 || res.data.data[i].product_type == 5 || res.data.data[i].product_type == 3) {
+								res.data.data.splice(i, 1)
 							}
-						})
+						}
 						// res.data.data.forEach((item, index) => {
 						// 	if () {
 						// 		res.data.data.splice(index, 1)
@@ -435,17 +436,17 @@
 						// 		res.data.data.splice(index, 1)
 						// 	}
 						// })
-						res.data.data.forEach((item, index) => {
-							if (item.product_type != 1 && item.product_type != 2) {
-								res.data.data.splice(index, 1)
-							}
-						})
+						// res.data.data.forEach((item, index) => {
+						// 	if (item.product_type != 1 && item.product_type != 2) {
+						// 		res.data.data.splice(index, 1)
+						// 	}
+						// })
 						// res.data.data.forEach((item, index) => {
 						// 	if () {
 						// 		res.data.data.splice(index, 1)
 						// 	}
-						// })
-						this.pageindex++
+						// })
+						this.pageindex++
 						this.ordersList = this.ordersList.concat(res.data.data)
 						// this.totalPage = res.data.last_page
 					}

pages/doctor_related/select_doctor.vue

@@ -221,7 +221,11 @@
 							this.value2 = index
 							console.log(this.value2)
 						}
-					})
+					})
+					this.timeday = ""
+					this.timehour = ""
+					this.pageindex = 1
+					this.doctorList = []
 					this.getDoctorList()
 				}).catch(res => {})
 			},

pages/order/payment.vue

@@ -67,12 +67,12 @@
 											<span class="couponItem-subject-right-header-icon">{{item.type==1?'满减':'折扣'}}</span>
 											{{item.title}}
 										</view>
-										<button :data-index="index" @click="collectCoupons(item,index)" class="couponItem-subject-right-btn">使用</button>
-										<view class="closing-date" v-if="item.expire_type == 2">
-											{{item.start_time}} - {{item.end_time}}
-										</view>
-										<view class="closing-date" v-else>
-											有效期：{{item.effective_days}}天
+										<button :data-index="index" @click="collectCoupons(item,index)" class="couponItem-subject-right-btn">使用</button>
+										<view class="closing-date" v-if="item.expire_type == 2">
+											{{item.start_time}} - {{item.end_time}}
+										</view>
+										<view class="closing-date" v-else>
+											有效期：{{item.effective_days}}天
 										</view>
 									</view>
 								</view>
@@ -401,7 +401,7 @@
 					})
 					return false
 				}
-				if (this.info.balance < this.orderAmount * 100) {
+				if (this.info.balance < this.orderAmount * 100 && this.paytype != 1) {
 					uni.showModal({
 						title: "错误提示",
 						content: "余额不足，请先充值",
@@ -539,7 +539,7 @@
 					is_security: this.infodata.is_security,
 					guardian_name: this.infodata.guardian_name,
 					relationship_type: this.infodata.relationship_type,
-					payment_type: this.infodata.payment_type,
+					payment_type: this.paytype,
 					pay_password: this.password,
 					user_coupon_id: this.couponid,
 					is_need_insurance: num,
@@ -872,24 +872,32 @@
 						}
 					}
 				} else {
-					uni.requestPayment({
-						nonceStr: res.data.nonceStr,
-						package: res.data.package,
-						paySign: res.data.paySign,
-						signType: res.data.signType,
-						timeStamp: res.data.timeStamp,
-						success: (res) => {
+					if (res.status == 0) {
+						if (res.data == null) {
 							uni.redirectTo({
 								url: "order?type=" + this.infodata.product_type
 							})
-						},
-						fail: (err) => {
-							
-						},
-						complete: (res) => {
-							
+						} else {
+							uni.requestPayment({
+								nonceStr: res.data.nonceStr,
+								package: res.data.package,
+								paySign: res.data.paySign,
+								signType: res.data.signType,
+								timeStamp: res.data.timeStamp,
+								success: (res) => {
+									uni.redirectTo({
+										url: "order?type=" + this.infodata.product_type
+									})
+								},
+								fail: (err) => {
+
+								},
+								complete: (res) => {
+
+								}
+							})
 						}
-					})
+					}
 				}
 			},
 			// 按键被点击(点击退格键不会触发此事件)

pages/service_packs/packs_information.vue

@@ -368,20 +368,20 @@
 					})
 					return false
 				}
-				if (this.guardianName == "") {
-					uni.showToast({
-						title: "请填写监护人姓名",
-						icon: "none"
-					})
-					return false
-				}
-				if (this.nRelationship.label == "请选择") {
-					uni.showToast({
-						title: "请选择关系",
-						icon: "none"
-					})
-					return false
-				}
+				// if (this.guardianName == "") {
+				// 	uni.showToast({
+				// 		title: "请填写监护人姓名",
+				// 		icon: "none"
+				// 	})
+				// 	return false
+				// }
+				// if (this.nRelationship.label == "请选择") {
+				// 	uni.showToast({
+				// 		title: "请选择关系",
+				// 		icon: "none"
+				// 	})
+				// 	return false
+				// }
 				// if (!this.isagreement) {
 				// 	uni.showToast({
 				// 		title: "请先同意保单协议",