From 769642d272f1356aa7465b862a90c7d8e66e8e81 Mon Sep 17 00:00:00 2001
From: "3321822538@qq.com" <3321822538@qq.com>
Date: Tue, 14 May 2024 18:03:52 +0800
Subject: [PATCH] aaa

---
 pages.json                            |  78 +++++++++++++++++++
 pages/agentpages/index/index.vue      | 105 +++++++++++++++++++-------
 pages/agentpages/shopguanli/index.vue |   2 +-
 pages/agentpages/user/index.vue       |   8 +-
 pages/my.vue                          |   6 +-
 pages/personal/index.vue              |   4 +-
 6 files changed, 169 insertions(+), 34 deletions(-)

diff --git a/pages.json b/pages.json
index b7d150f..da42899 100644
--- a/pages.json
+++ b/pages.json
@@ -329,9 +329,87 @@
 						"enablePullDownRefresh": false,
 						"navigationStyle": "custom"
 					}
+				},{
+					"path": "daili/cjdaili",
+					"style": {
+						"navigationBarTitleText": "",
+						"enablePullDownRefresh": false,
+						"navigationStyle": "custom"
+					}
+				},{
+					"path": "daili/yunwei",
+					"style": {
+						"navigationBarTitleText": "",
+						"enablePullDownRefresh": false,
+						"navigationStyle": "custom"
+					}
+				},{
+					"path": "listshu/index",
+					"style": {
+						"navigationBarTitleText": "",
+						"enablePullDownRefresh": false,
+						"navigationStyle": "custom"
+					}
+				},{
+					"path": "listshu/shangjialist",
+					"style": {
+						"navigationBarTitleText": "",
+						"enablePullDownRefresh": false,
+						"navigationStyle": "custom"
+					}
+				},{
+					"path": "listshu/xqdetail",
+					"style": {
+						"navigationBarTitleText": "",
+						"enablePullDownRefresh": false,
+						"navigationStyle": "custom"
+					}
+				},{
+					"path": "listshu/quanxian",
+					"style": {
+						"navigationBarTitleText": "",
+						"enablePullDownRefresh": false,
+						"navigationStyle": "custom"
+					}
+				},{
+					"path": "listshu/edit",
+					"style": {
+						"navigationBarTitleText": "",
+						"enablePullDownRefresh": false,
+						"navigationStyle": "custom"
+					}
+				},{
+					"path": "order/index",
+					"style": {
+						"navigationBarTitleText": "",
+						"enablePullDownRefresh": false,
+						"navigationStyle": "custom"
+					}
+				},{
+					"path": "order/detailshop",
+					"style": {
+						"navigationBarTitleText": "",
+						"enablePullDownRefresh": false,
+						"navigationStyle": "custom"
+					}
+				},{
+					"path": "order/xiangqing",
+					"style": {
+						"navigationBarTitleText": "",
+						"enablePullDownRefresh": false,
+						"navigationStyle": "custom"
+					}
+				},{
+					"path": "shuju/index",
+					"style": {
+						"navigationBarTitleText": "",
+						"enablePullDownRefresh": false,
+						"navigationStyle": "custom"
+					}
 				}
 
 
+
 				// 其他 userpages 目录下的页面...
 			]
 		}
diff --git a/pages/agentpages/index/index.vue b/pages/agentpages/index/index.vue
index 8e88674..bae6292 100644
--- a/pages/agentpages/index/index.vue
+++ b/pages/agentpages/index/index.vue
@@ -2,8 +2,8 @@
 	<view class="page">
 		<!-- 代理首页显示 -->
 		<view class="userdaili">
-			<u-navbar title="代理首页" :border-bottom="false" :background="bgc" title-color='#000'
-				title-size='36' height='36'></u-navbar>
+			<u-navbar title="代理首页" :border-bottom="false" :background="bgc" title-color='#000' title-size='36'
+				height='36'></u-navbar>
 
 			<view class="zhanghu">
 				<view class="zhtitle">
@@ -31,7 +31,7 @@
 				</view>
 				<u-picker mode="time" v-model="show" :params="params" @confirm="confirm"></u-picker>
 				<view class="date">
-					<text @click="btnks(1)">{{selector}}</text> -- <text @click="btnks(2)">{{selectors}}</text>
+					<text @click="btnks(1)">{{firsTime}}</text> -- <text @click="btnks(2)">{{lasTime}}</text>
 				</view>
 				<view class="shuju">
 					<view class="ddje">
@@ -91,9 +91,9 @@
 				<view class="icons" @click="btnnav(5)">
 					<image src="../../../static/image/ddgl.png" mode=""></image>
 				</view>
-				<view class="icons" @click="btnnav(6)">
+				<!-- <view class="icons" @click="btnnav(6)">
 					<image src="../../../static/image/hydp.png" mode=""></image>
-				</view>
+				</view> -->
 				<view class="icons" @click="btnnav(7)">
 					<image src="../../../static/image/sjfx.png" mode=""></image>
 				</view>
@@ -123,13 +123,17 @@
 				selectors: '2024-4-9',
 				num: '',
 				dateindex: 1,
-
+                
+				firsTime:'',
+				lasTime:''
 			};
 		},
+		onLoad() {
+			let today = new Date();
+			this.firsTime = this.formatDate(today);
+			this.lasTime = this.formatDate(today);
+		},
 		methods: {
-			btnriq(num) {
-				this.dateindex = num
-			},
 			btnks(num) {
 				this.show = true
 				if (num == 1) {
@@ -140,35 +144,41 @@
 			},
 			confirm(e) {
 				if (this.num == 1) {
-					this.selector = e.year + '-' + e.month + '-' + e.day
+					this.firsTime = e.year + '-' + e.month + '-' + e.day
 				} else {
-					this.selectors = e.year + '-' + e.month + '-' + e.day
+					this.lasTime = e.year + '-' + e.month + '-' + e.day
 				}
 			},
 
 			btnnav(num) {
 				if (num == 1) {
-                    uni.navigateTo({
-                    	url:'/pages/agentpages/devicemanagement/index'
-                    })
+					uni.navigateTo({
+						url: '/pages/agentpages/devicemanagement/index'
+					})
 				} else if (num == 2) {
-                    uni.navigateTo({
-                    	url:'/pages/agentpages/shopguanli/index'
-                    })
+					uni.navigateTo({
+						url: '/pages/agentpages/shopguanli/index'
+					})
 				} else if (num == 3) {
-                    uni.navigateTo({
-                    	url:'/page_user/yunying/index'
-                    })
+					uni.navigateTo({
+						url: '/page_user/yunying/index'
+					})
 				} else if (num == 4) {
-                    uni.navigateTo({
-                    	url:'/page_user/daili/index'
-                    })
+					uni.navigateTo({
+						url: '/page_user/daili/index'
+					})
 				} else if (num == 5) {
-
+					uni.navigateTo({
+						url: '/page_user/order/index'
+					})
 				} else if (num == 6) {
-
+					uni.navigateTo({
+						url: '/pages/agentpages/shopguanli/member/index'
+					})
 				} else if (num == 7) {
-
+                    uni.navigateTo({
+                    	url:'/page_user/shuju/index'
+                    })
 				} else if (num == 8) {
 					uni.navigateTo({
 						url: '/pages/agentpages/user/index'
@@ -183,10 +193,51 @@
 					})
 				}
 			},
+			// let today = new Date();
+			// // 获取七天前的日期
+			// // 格式化日期为 yyyy-MM-dd
+			// this.firsTime = this.formatDate(today);
+			// this.lasTime = this.formatDate(today);
+			btnriq(num) {
+				this.dateindex = num
+				if (num == 1) {
+					let today = new Date();
+					this.firsTime = this.formatDate(today);
+					this.lasTime = this.formatDate(today);
+					// this.operatingData()
+				} else if (num == 2) {
+					let yesterday = new Date();
+					yesterday.setDate(yesterday.getDate() - 1);
+					this.firsTime = this.formatDate(yesterday);
+					this.lasTime = this.formatDate(new Date());
+					// this.operatingData()
+				} else if (num == 3) {
+					let today = new Date();
+					let firstDayOfMonth = new Date(today.getFullYear(), today.getMonth(), today.getDate() - 6);
+					this.firsTime = this.formatDate(firstDayOfMonth);
+					this.lasTime = this.formatDate(new Date());
+					// this.operatingData()
+				} else if (num == 4) {
+					let today = new Date();
+					let firstDayOfLastMonth = new Date(today.getFullYear(), today.getMonth() - 1,today.getDate() + 1);
+					let lastDayOfLastMonth = new Date(today.getFullYear(), today.getMonth(), today.getDate());
+					this.firsTime = this.formatDate(firstDayOfLastMonth);
+					this.lasTime = this.formatDate(lastDayOfLastMonth);
+					// this.operatingData()
+				} 
+			},
+			formatDate(date) {
+				let year = date.getFullYear();
+				let month = String(date.getMonth() + 1).padStart(2, '0');
+				let day = String(date.getDate()).padStart(2, '0');
+				return `${year}-${month}-${day}`;
+			},
+
+
 
 		},
 		mounted() {
-			
+
 		}
 	};
 </script>
diff --git a/pages/agentpages/shopguanli/index.vue b/pages/agentpages/shopguanli/index.vue
index 347491a..27c2f32 100644
--- a/pages/agentpages/shopguanli/index.vue
+++ b/pages/agentpages/shopguanli/index.vue
@@ -38,7 +38,7 @@
 				<!-- <image src="../../../static/image/ap3.png" mode="" @click="btnshop(3)"></image> -->
 				<image src="../../../static/image/ap4.png" mode="" @click="btnshop(4)"></image>
 				<image src="../../../static/image/ap5.png" mode="" style="margin-right: 0rpx;" @click="btnshop(5)"></image>
-				<image src="../../../static/image/ap6.png" mode="" style="margin-top: 48rpx;" @click="btnshop(6)"></image>
+				<!-- <image src="../../../static/image/ap6.png" mode="" style="margin-top: 48rpx;" @click="btnshop(6)"></image> -->
 			</view>
         </view>
 	</view>
diff --git a/pages/agentpages/user/index.vue b/pages/agentpages/user/index.vue
index 2f341d0..9f4c681 100644
--- a/pages/agentpages/user/index.vue
+++ b/pages/agentpages/user/index.vue
@@ -4,9 +4,9 @@
 			height='38'></u-navbar>
 		<view class="navtop">
 			<view class="left">
-				<view class="" style="width: 90rpx;height: 90rpx;margin-right: 30rpx;">
+				<!-- <view class="" style="width: 90rpx;height: 90rpx;margin-right: 30rpx;">
 					<image src="../../../static/image/nt20.jfif" mode=""></image>
-				</view>
+				</view> -->
 				<view class="leftpic">
 					<view class="name">
 						微信用户
@@ -93,6 +93,10 @@
 					uni.navigateTo({
 						url:'/pages/abbr/index'
 					})
+				}else if(num == 2){
+					uni.navigateTo({
+						url:'/pages/agentpages/shopguanli/myshop/index'
+					})
 				}
 			}
 		}
diff --git a/pages/my.vue b/pages/my.vue
index 06b5cd9..ac62019 100644
--- a/pages/my.vue
+++ b/pages/my.vue
@@ -12,7 +12,9 @@
 	export default {
 		data() {
 			return {
-
+               bgc:{
+				  background: '#25CE88'
+			   }
 			}
 		},
 		methods: {
@@ -23,7 +25,7 @@
 
 <style lang="scss">
 	page {
-		background: linear-gradient(180deg, #25CE88 0%, rgba(255, 255, 255, 0) 100%);
+		// background: linear-gradient(180deg, #25CE88 0%, rgba(255, 255, 255, 0) 100%);
 	}
 
 	.page {
diff --git a/pages/personal/index.vue b/pages/personal/index.vue
index 364eba8..79bd3ed 100644
--- a/pages/personal/index.vue
+++ b/pages/personal/index.vue
@@ -4,9 +4,9 @@
 			height='38'></u-navbar>
 		<view class="navtop">
 			<view class="left">
-				<view class="" style="width: 90rpx;height: 90rpx;margin-right: 30rpx;">
+			<!-- 	<view class="" style="width: 90rpx;height: 90rpx;margin-right: 30rpx;">
 					<image src="../../static/image/nt20.jfif" mode=""></image>
-				</view>
+				</view> -->
 				<view class="leftpic">
 					<view class="name">
 						微信用户