From 1e0059dbd54aa4a55a087cb15a9ebc71851408c7 Mon Sep 17 00:00:00 2001
From: "3321822538@qq.com" <3321822538@qq.com>
Date: Thu, 2 Jan 2025 14:18:53 +0800
Subject: [PATCH] =?UTF-8?q?=E8=8C=B6=E5=AE=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/http.interceptor.js |  4 +-
 page_moban/orderlist.vue   | 99 +++++++++++++++++++++++++++++++++++---
 pages.json                 | 28 +++++++++++
 pages/index/index.vue      |  9 +++-
 4 files changed, 129 insertions(+), 11 deletions(-)

diff --git a/common/http.interceptor.js b/common/http.interceptor.js
index 5cbc2d2..5c0bfe5 100644
--- a/common/http.interceptor.js
+++ b/common/http.interceptor.js
@@ -20,8 +20,8 @@ const install = (Vue, vm) => {
 	// 	},
 	// https://yxd.ccttiot.com/prod-api}); 
 	Vue.prototype.$u.http.setConfig({
-			baseUrl: 'http://192.168.2.116:8089',
-			// baseUrl: 'https://testcha.chuangtewl.com/prod-api',
+			// baseUrl: 'http://192.168.2.116:8089',
+			baseUrl: 'https://testcha.chuangtewl.com/prod-api',
 			loadingText: '努力加载中~',
 			loadingTime: 800,
 			// 设置自定义头部content-type
diff --git a/page_moban/orderlist.vue b/page_moban/orderlist.vue
index 690d4f4..ccb2096 100644
--- a/page_moban/orderlist.vue
+++ b/page_moban/orderlist.vue
@@ -4,16 +4,19 @@
 			title-size='36' height='50' id="navbar">
 		</u-navbar>
         <view class="toptab">
-        	<view class="">
-        		订单状态 <u-icon name="arrow-down-fill" color="#3D3D3D" size="24"></u-icon>
+        	<view class="" @click="show = true">
+        		{{zttxt}} <u-icon name="arrow-down-fill" color="#3D3D3D" size="24"></u-icon>
         	</view>
-			<view class="">
+			<!-- <view class="">
 				支付方式 <u-icon name="arrow-down-fill" color="#3D3D3D" size="24"></u-icon>
-			</view>
+			</view> -->
 			<view class="">
-				时间筛选 <u-icon name="arrow-down-fill" color="#3D3D3D" size="24"></u-icon>
+				<!-- 时间筛选 <u-icon name="arrow-down-fill" color="#3D3D3D" size="24"></u-icon> -->
+				<text class="one" @click="btntime(1)">{{kstime}}</text>--<text class="one" @click="btntime(2)">{{jstime}}</text>
 			</view>
         </view>
+		<u-select v-model="show" :list="list" @confirm="confirm"></u-select>
+		<u-picker mode="time" v-model="showtime" :params="params" @confirm='confirmkstime'></u-picker>
 		<view class="list">
 			<view class="list_item" v-for="(item,index) in 5" :key="index" @click="btnxq">
 				<view class="top">
@@ -59,6 +62,54 @@
                 bgc: {
                 	backgroundColor: "#fff",
                 },
+				zttxt:'订单状态',
+				zttxtid:'',
+				kstime:'',
+				jstime:'',
+				num:'',
+				params: {
+					year: true,
+					month: true,
+					day: true,
+					hour: false,
+					minute: false,
+					second: false
+				},
+				showtime: false,
+				show: false,
+				list: [
+					{
+						value: '',
+						label: '全部'
+					},{
+						value: '0',
+						label: '待支付'
+					},{
+						value: '1',
+						label: '支付中'
+					},{
+						value: '2',
+						label: '待使用'
+					},{
+						value: '3',
+						label: '使用中'
+					},{
+						value: '4',
+						label: '已完成'
+					},{
+						value: '5',
+						label: '超时自动取消'
+					},{
+						value: '6',
+						label: '用户取消订单'
+					},{
+						value: '7',
+						label: '退款中'
+					},{
+						value: '8',
+						label: '已退款'
+					}],
+					
 			}
 		},
 		onLoad() {
@@ -68,8 +119,27 @@
 			this.getlist()
 		},
 		methods: {
+			// 点击选择时间
+			btntime(num){
+				this.showtime = true
+				this.num = num
+			},
+			// 筛选开始时间
+			confirmkstime(e){
+				if(this.num == 1){
+					this.kstime = e.year + '-' + e.month + '-' + e.day
+				}else{
+					this.jstime = e.year + '-' + e.month + '-' + e.day
+				}
+			},
+			// 点击状态筛选
+			confirm(e) {
+				this.zttxt = e[0].label
+				this.zttxtid = e[0].value
+			},
+			// 请求订单列表
 			 getlist(){
-				this.$u.get(`/app/order/orderList?statusList=1,2`).then(res =>{
+				this.$u.get(`/app/order/orderList`).then(res =>{
 					if(res.code == 200){
 						
 					}
@@ -86,7 +156,7 @@
 </script>
 
 <style lang="scss">
-	/deep/ .u-iconfont,
+	/deep/ .uicon-nav-back,
 	/deep/ .u-title{
 		padding-bottom: 20rpx;
 	}
@@ -166,9 +236,22 @@
 		display: flex;
 		align-items: center;
 		justify-content: space-between;
-		padding: 0 58rpx;
+		padding: 0 50rpx;
 		box-sizing: border-box;
 		background-color: #fff;
+		view{
+			display: flex;
+			align-items: center;
+			.one{
+				display: inline-block;
+				width: 200rpx;
+				height: 50rpx;
+				border: 1px solid #ccc;
+				border-radius: 10rpx;
+				line-height: 50rpx;
+				text-align: center;
+			}
+		}
 	}
 
 
diff --git a/pages.json b/pages.json
index 3a45094..fc66ab1 100644
--- a/pages.json
+++ b/pages.json
@@ -604,6 +604,34 @@
 						"enablePullDownRefresh": false,
 						"navigationStyle": "custom"
 					}
+				},{
+					"path": "cunganimg",
+					"style": {
+						"navigationBarTitleText": "上传",
+						"enablePullDownRefresh": false,
+						"navigationStyle": "custom"
+					}
+				},{
+					"path": "cunxuan",
+					"style": {
+						"navigationBarTitleText": "上传",
+						"enablePullDownRefresh": false,
+						"navigationStyle": "custom"
+					}
+				},{
+					"path": "lijizy",
+					"style": {
+						"navigationBarTitleText": "上传",
+						"enablePullDownRefresh": false,
+						"navigationStyle": "custom"
+					}
+				},{
+					"path": "zuyongjl",
+					"style": {
+						"navigationBarTitleText": "上传",
+						"enablePullDownRefresh": false,
+						"navigationStyle": "custom"
+					}
 				}
 			]
 		}, {
diff --git a/pages/index/index.vue b/pages/index/index.vue
index c737a8f..7ea31ca 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -65,7 +65,7 @@
 			<view class="tqname">
 				杆柜
 			</view>
-			<view class="gangui">
+			<view class="gangui" @click="btncungan">
 				<image src="https://api.ccttiot.com/smartmeter/img/static/uQPXhfkhmvvvPXbW65WF" mode=""></image>
 				<!-- <view class="cun">
 					存
@@ -262,6 +262,13 @@
 
 		},
 		methods: {
+			// 点击存取球杆进行跳转
+			btncungan(){
+				uni.navigateTo({
+					url:'/page_fenbaotwo/cunganimg'
+				})
+			},
+			
 			// 点击包厢切换高亮
 			btnmd(index,item){
 				this.viewType = item.viewType