Merge remote-tracking branch 'origin/dev' into dev

pagesB/CommodityOrder/CommodityOrder.vue

@@ -68,8 +68,8 @@
 					</view>
 				</view>
 				<view class="anniu">
-					<view class="logistics" v-if="item.orderStatus=='WAIT_REFUND'" style="background-color: coral;color:#fff"
-						@tap='goorderdetails(item)'>退款中
+					<view class="logistics" v-if="item.orderStatus=='WAIT_REFUND'"
+						style="background-color: coral;color:#fff" @tap='goorderdetails(item)'>退款中
 					</view>
 					<view class="logistics"
 						v-if="item.orderStatus=='WAIT_RECEIVED_GOODS'&&item.orderType !='HEALTH_CONSULTATION'"
@@ -151,13 +151,14 @@
 				},
 				orderTypeList: {
 					patientId: '',
+					goodsOrderId: '',
 					orderTypeList: [
 						'INTEGRAL_EXCHANGE',
 						'DIRECT_BUY',
 					],
 					orderStatus: '',
-					pageSize: 15, //
-					pageNum: 1, //
+					pageSize: 15,
+					pageNum: 1,
 					goodsName: '',
 				},
 				orderNoitem: null,
@@ -167,12 +168,6 @@
 				total: 0, //list长度
 				show: false, //确认收获开关
 				img: '', //确认收货页面图片
-				orderStatus: '', //
-				goodsOrderId: '', //
-				pageSize: 15, //
-				pageNum: 1, //
-				goodsName: '',
-				getCodeText: null,
 			}
 		},
 		methods: {
@@ -331,8 +326,8 @@
 			this.orderTypeList.pageNum = 1;
 			this.baseurl = baseurl;
 			let that = this
-			const value3 = uni.getStorageSync('Refresh');
-			if (value3) {
+			const Refresh = uni.getStorageSync('Refresh');
+			if (Refresh) {
 				that.goodsOrderinfo();
 			}
 		},
@@ -345,7 +340,7 @@
 				that.openid = value2
 				if (options.orderStatus) {
 					that.tabscurrent = options.toindex
-					that.orderStatus = options.orderStatus
+					that.orderTypeList.orderStatus = options.orderStatus
 					that.goodsOrderinfo();
 				} else {
 					that.goodsOrderinfo();
@@ -384,4 +379,4 @@
 
 <style lang="scss">
 	@import "./CommodityOrder.scss";
-</style>
+</style>

pagesB/confirmation/confirmation.vue

@@ -68,8 +68,14 @@
 					<view class="items" v-if="Soonerorlater=='after'">
 						<view @tap='taptime(item,index)'
 							v-for="(item ,index) in appointmentTimeList[timecurrent].afternoonList"
-							:class="timeindex==index?'timeitemtap':'timeitem'">
-							{{item.scheduleTimeSlot}}
+							:class="timeindex==index?'timeitemtap':'timeitem'"
+							:style="item.status?'':'background: #FFFFFF;color: #AAABB0;'">
+							<view class="itemstext">
+								{{item.scheduleTimeSlot}}
+							</view>
+							<view class="itemstexttwo">
+								{{item.status?'(可预约)':'(不可预约)'}}
+							</view>
 						</view>
 					</view>
 				</view>