From 532b9f1d47093d62657244953cbb559d7770e795 Mon Sep 17 00:00:00 2001
From: js199000126 <528892601@qq.com>
Date: Fri, 26 May 2023 17:58:32 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 yudao-ui-app/config/app.js                    |  4 +--
 yudao-ui-app/pages/users/order_list/index.vue | 26 ++++++++++++++++---
 2 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/yudao-ui-app/config/app.js b/yudao-ui-app/config/app.js
index 06c5429ab..605d8d33c 100644
--- a/yudao-ui-app/config/app.js
+++ b/yudao-ui-app/config/app.js
@@ -1,6 +1,6 @@
 
-// let domain = process.env.APP_BASE_URL
-let domain = 'http://192.168.1.188:48080'
+let domain = process.env.APP_BASE_URL
+// let domain = 'http://192.168.1.188:48080'
 // let domain = 'http://api.cyywl.top'
 
 module.exports = {
diff --git a/yudao-ui-app/pages/users/order_list/index.vue b/yudao-ui-app/pages/users/order_list/index.vue
index 3366ba938..a98282365 100644
--- a/yudao-ui-app/pages/users/order_list/index.vue
+++ b/yudao-ui-app/pages/users/order_list/index.vue
@@ -1,11 +1,11 @@
 <template>
 	<view class="container">
 		<view class="navbar">
-			<view class="goback"></view>
+			<view class="goback" @tap="goBack"></view>
 			<view class="search">
 				<view class="icon"></view>
 				<view class="input">
-					<u--input placeholder="搜索我的订单" v-model="value" @change="change"></u--input>
+					<u--input placeholder="搜索我的订单" v-model="value"></u--input>
 				</view>
 				<view class="button">搜索</view>
 			</view>
@@ -14,7 +14,7 @@
 			</view>
 		</view>
 		<view class="tabs">
-			<u-tabs :list="list1" @tap="click" lineWidth="60rpx" lineHeight="9rpx"></u-tabs>
+			<u-tabs :current="getTabVal()" :list="list1" @tap="click" lineWidth="60rpx" lineHeight="9rpx"></u-tabs>
 		</view>
 
 		<!-- <view class="item" @tap="goOrderDetails(123)">
@@ -93,6 +93,7 @@
 	// #endif
 	import emptyPage from '@/components/emptyPage.vue'
 	export default {
+		// props:['status'],
 		components: {
 			payment,
 			home,
@@ -110,6 +111,7 @@
 				orderData: {}, //订单详细统计
 				orderStatus: 0, //订单状态
 				page: 1,
+				tabVal: '',
 				list1: [{
 					name: '全部',
 					value: '99'
@@ -157,10 +159,11 @@
 			};
 		},
 		computed: mapGetters(['isLogin', 'userInfo']),
-		onLoad(option) {
+		onLoad() {
 			this.loadmore()
 		},
 		onShow() {
+			this.tabVal = this.$route.query.status
 			if (this.isLogin) {
 				this.loadend = false;
 				this.page = 1;
@@ -175,6 +178,21 @@
 			// }
 		},
 		methods: {
+			// 返回上一级
+			goBack(){
+				uni.navigateBack({
+				delta: 1
+			});
+			},
+			
+			// 获取对应标签
+			getTabVal(){
+				for(let i in this.list1){
+					if(this.list1[i].value == this.tabVal){
+						return i
+					}
+				}
+			},
 			getStatus(val) {
 				if (val == '0') {
 					return '待发货'