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

pagesB/CommodityOrder/CommodityOrder.vue

@@ -302,10 +302,10 @@
 							uni.removeStorageSync('Refresh');
 							this.total = res.total
 						} else if (res.code == 9999) {
-							// this.$refs.uToast.show({
+							this.$refs.uToast.show({
-							// 	title: '未登录,请先登录',
+								title: '未登录,请先登录',
-							// 	type: 'error',
+								type: 'error',
-							// })
+							})
 						}
 					})
 			},
@@ -318,7 +318,7 @@
 		},
 		watch: { //监听
 			'orderTypeList.goodsName'() {
-				this.pageNum = 1
+				this.orderTypeList.pageNum = 1
 				this.goodsOrderinfo()
 			},
 		},
@@ -328,7 +328,7 @@
 			// });
 		},
 		onShow() {
-			this.pageNum = 1;
+			this.orderTypeList.pageNum = 1;
 			this.baseurl = baseurl;
 			let that = this
 			const value3 = uni.getStorageSync('Refresh');
@@ -359,7 +359,7 @@
 		},
 		onReachBottom() { //下滑加载
 			if (this.orderlist.length >= this.total) {} else {
-				this.pageNum++;
+				this.orderTypeList.pageNum++;
 				ssgoodsOrder(this.orderTypeList).then(res => {
 					res.rows.forEach(e => {
 						// e.timestamp = null
@@ -373,7 +373,7 @@
 			}
 		},
 		onPullDownRefresh() { //下拉刷新
-			this.pageNum = 1;
+			this.orderTypeList.pageNum = 1;
 			this.goodsOrderinfo();
 			setTimeout(function() {
 				uni.stopPullDownRefresh();

pagesB/ExpertlookOrder/ExpertlookOrder.vue

@@ -11,8 +11,8 @@
 					placeholder-class="placeholder">
 			</view>
 		</u-navbar>
-		<u-tabs :list="tabslist" :is-scroll="false" :current="tabscurrent" @change="tabschange" :show-bar='false'
+		<!-- <u-tabs :list="tabslist" :is-scroll="false" :current="tabscurrent" @change="tabschange" :show-bar='false'
-			active-color='#26A888'></u-tabs>
+			active-color='#26A888'></u-tabs> -->
 		<view class="" v-if="total>0" style="margin-top: 80rpx;padding: 3%;">
 			<view class="Apayment" v-for='(item,index) in orderlist' :key="index">
 				<view class="names">店铺名称
@@ -129,10 +129,11 @@
 	export default {
 		data() {
 			return {
-				tabslist: [{
+				tabslist: [
-						name: '全部',
+					// {
-						orderStatus: '',
+					// 	name: '全部',
-					},
+					// 	orderStatus: '',
+					// },
 					// {
 					// 	name: '待付款',
 					// 	orderStatus: 'WAIT_PAY',
@@ -147,10 +148,10 @@
 					// 	name: '已完成',
 					// 	orderStatus: 'EVALUATED',
 					// },
-					{
+					// {
-						name: '待咨询',
+					// 	name: '待咨询',
-						orderStatus: 'RECEIVED_GOODS',
+					// 	orderStatus: 'RECEIVED_GOODS',
-					}
+					// }
 				],
 				tabscurrent: 0,
 				background: {
@@ -160,7 +161,7 @@
 				orderTypeList: {
 					patientId: '',
 					orderType: 'HEALTH_CONSULTATION',
-					orderStatus: '',
+					orderStatus: 'RECEIVED_GOODS',
 					// goodsOrderId: '', //
 					pageSize: 15, //
 					pageNum: 1, //
@@ -178,15 +179,15 @@
 		},
 		methods: {
 			//点击tabs
-			tabschange(index) {
+			// tabschange(index) {
-				console.log(this.tabslist)
+			// 	console.log(this.tabslist)
-				this.tabscurrent = index;
+			// 	this.tabscurrent = index;
-				this.orderTypeList.orderStatus = this.tabslist[index].orderStatus
+			// 	this.orderTypeList.orderStatus = this.tabslist[index].orderStatus
-				console.log(this.orderTypeList.orderStatus, '999')
+			// 	console.log(this.orderTypeList.orderStatus, '999')
-				console.log(this.orderTypeList.orderType, '99')
+			// 	console.log(this.orderTypeList.orderType, '99')
 
-				this.goodsOrderinfo();
+			// 	this.goodsOrderinfo();
-			},
+			// },
 			//返回上一页
 			goprevious() {
 				uni.navigateBack({
@@ -295,7 +296,6 @@
 			//商品订单请求
 			goodsOrderinfo() {
 				// this.orderTypeList.orderType = this.patientId
-
 				console.log(this.orderTypeList, '45')
 				ssgoodsOrder(this.orderTypeList).then(
 					res => {
@@ -310,10 +310,10 @@
 							uni.removeStorageSync('Refresh');
 							this.total = res.total
 						} else if (res.code == 9999) {
-							// this.$refs.uToast.show({
+							this.$refs.uToast.show({
-							// 	title: '未登录,请先登录',
+								title: '未登录,请先登录',
-							// 	type: 'error',
+								type: 'error',
-							// })
+							})
 						}
 					})
 			},