From bf2aeef4516ae42c05091a075794e0f0a841e13c Mon Sep 17 00:00:00 2001
From: chenkun <3289431190@qq.com>
Date: Sat, 7 Sep 2024 17:59:26 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=88=91=E7=9A=84=E6=8E=A8=E5=B9=BF?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E9=80=89=E6=8B=A9=E5=99=A8Bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages_mine/mine/promotionRecord.vue | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/pages_mine/mine/promotionRecord.vue b/pages_mine/mine/promotionRecord.vue
index f1f3712..f67a2d6 100644
--- a/pages_mine/mine/promotionRecord.vue
+++ b/pages_mine/mine/promotionRecord.vue
@@ -15,16 +15,14 @@
 				<!--搜索框-->
 				<view style="width:40%;height:100%">
 					<uv-input v-model="queryParams.keyWord" placeholder="请输入内容" border="surround" clearable
-                    @change="keyWordChange"
-					></uv-input>
+						@change="keyWordChange"></uv-input>
 				</view>
 				<!--开始时间-->
 				<view class="dateTimeCls">
 					<view class="date" @click="startDateOpen">
 						{{ queryParams.startDate }}
 						<uv-datetime-picker ref="startDateRef" v-model="queryParams.startDate" mode="date"
-							@confirm="startDateChange">
-						</uv-datetime-picker>
+							@confirm="startDateChange"></uv-datetime-picker>
 					</view>
 					<view class="image">
 						<image src="../static/promotionRecord/2.svg" style="width: 100%;height: 100%"></image>
@@ -53,7 +51,7 @@
 
 <script>
 	import PromotionRecordList from "./sonPage/promotion/promotionRecordList.vue";
-	import moment from "moment";
+	import dayjs from "dayjs";
 	export default {
 		components: {
 			PromotionRecordList
@@ -64,8 +62,8 @@
 				queryParams: {
 					pageNo: 1,
 					pageSize: 10,
-					startDate: moment(new Date()).format('YYYY-MM-DD'),
-					endDate: moment(new Date()).format('YYYY-MM-DD'),
+					startDate: dayjs(new Date()).format('YYYY-MM-DD'),
+					endDate: dayjs(new Date()).format('YYYY-MM-DD'),
 					keyWord: '',
 				},
 			}
@@ -86,7 +84,6 @@
 		methods: {
 
 			getData() {
-				console.log("==getData==")
 				this.$api('infoGetPromotionPage', {
 					pageNo: this.queryParams.pageNo,
 					pageSize: this.queryParams.pageSize,
@@ -100,23 +97,26 @@
 					}
 				})
 			},
-      keyWordChange(val) {
-        console.log("val",val)
-        this.queryParams.keyWord = val
-        this.getData()
-      },
+			keyWordChange(val) {
+				console.log("val", val)
+				this.queryParams.keyWord = val
+				this.getData()
+			},
 
 			startDateChange(val) {
-				this.queryParams.startDate = moment(new Date(val.value)).format('YYYY-MM-DD')
+				this.$nextTick(() => {
+				  this.queryParams.startDate = dayjs(val.value).format("YYYY-MM-DD")
+				});
 				this.getData()
 			},
 			startDateOpen() {
 				this.$refs.startDateRef.open();
 			},
 			endDateChange(val) {
-				var aaa = moment(new Date(val.value)).format('YYYY-MM-DD')
-        console.log(aaa,"aaaaaaaaaaaa")
-				this.queryParams.endDate = aaa
+				this.$nextTick(() => {
+				  this.queryParams.endDate = dayjs(val.value).format("YYYY-MM-DD")
+				});
+				this.getData()
 			},
 			endDateOpen() {
 				this.$refs.endDateRef.open();

From 8b0a19d35f985dc1660cebcdde91907d85b5166e Mon Sep 17 00:00:00 2001
From: chenkun <3289431190@qq.com>
Date: Sat, 7 Sep 2024 19:07:18 +0800
Subject: [PATCH 2/2] .

---
 pages_mine/mine/promotionRecord.vue | 427 ++++++++++++++++++------------------
 1 file changed, 214 insertions(+), 213 deletions(-)

diff --git a/pages_mine/mine/promotionRecord.vue b/pages_mine/mine/promotionRecord.vue
index f67a2d6..bfd7bde 100644
--- a/pages_mine/mine/promotionRecord.vue
+++ b/pages_mine/mine/promotionRecord.vue
@@ -1,221 +1,222 @@
 <template>
-	<view class="promotionRecord">
-		<!--顶部导航栏-->
-		<navbar leftClick @leftClick="$utils.navigateBack" title="我的推广" />
-
-		<!--主页面-->
-		<view class="frame">
-			<!--标题-->
-			<view class="title">
-				<span>推广记录</span>
-			</view>
-
-			<!--搜索条件-->
-			<view class="search">
-				<!--搜索框-->
-				<view style="width:40%;height:100%">
-					<uv-input v-model="queryParams.keyWord" placeholder="请输入内容" border="surround" clearable
-						@change="keyWordChange"></uv-input>
-				</view>
-				<!--开始时间-->
-				<view class="dateTimeCls">
-					<view class="date" @click="startDateOpen">
-						{{ queryParams.startDate }}
-						<uv-datetime-picker ref="startDateRef" v-model="queryParams.startDate" mode="date"
-							@confirm="startDateChange"></uv-datetime-picker>
-					</view>
-					<view class="image">
-						<image src="../static/promotionRecord/2.svg" style="width: 100%;height: 100%"></image>
-					</view>
-				</view>
-				<!--结束时间-->
-				<view class="dateTimeCls">
-					<view class="date" @click="endDateOpen">
-						{{ queryParams.endDate }}
-						<uv-datetime-picker ref="endDateRef" v-model="queryParams.endDate" mode="date"
-							@confirm="endDateChange">
-						</uv-datetime-picker>
-					</view>
-					<view class="image">
-						<image src="../static/promotionRecord/2.svg" style="width: 100%;height: 100%"></image>
-					</view>
-				</view>
-			</view>
-			<!--发布列表-->
-			<view style="" class="publishListClass">
-				<PromotionRecordList :list="promotionRecordList" />
-			</view>
-		</view>
-	</view>
+  <view class="promotionRecord">
+    <!--顶部导航栏-->
+    <navbar leftClick @leftClick="$utils.navigateBack" title="我的推广"/>
+
+    <!--主页面-->
+    <view class="frame">
+      <!--标题-->
+      <view class="title">
+        <span>推广记录</span>
+      </view>
+
+      <!--搜索条件-->
+      <view class="search">
+        <!--搜索框-->
+        <view style="width:40%;height:100%">
+          <uv-input v-model="queryParams.keyWord" placeholder="请输入内容" border="surround" clearable
+                    @change="keyWordChange"></uv-input>
+        </view>
+        <!--开始时间-->
+        <view class="dateTimeCls">
+          <view class="date" @click="startDateOpen">
+            {{ queryParams.startDate }}
+            <uv-datetime-picker ref="startDateRef" v-model="queryParams.startDate" mode="date"
+                                @confirm="startDateChange"></uv-datetime-picker>
+          </view>
+          <view class="image">
+            <image src="../static/promotionRecord/2.svg" style="width: 100%;height: 100%"></image>
+          </view>
+        </view>
+        <!--结束时间-->
+        <view class="dateTimeCls">
+          <view class="date" @click="endDateOpen">
+            {{ queryParams.endDate }}
+            <uv-datetime-picker ref="endDateRef" v-model="queryParams.endDate" mode="date"
+                                @confirm="endDateChange">
+            </uv-datetime-picker>
+          </view>
+          <view class="image">
+            <image src="../static/promotionRecord/2.svg" style="width: 100%;height: 100%"></image>
+          </view>
+        </view>
+      </view>
+      <!--发布列表-->
+      <view style="" class="publishListClass">
+        <PromotionRecordList :list="promotionRecordList"/>
+      </view>
+    </view>
+  </view>
 </template>
 
 <script>
-	import PromotionRecordList from "./sonPage/promotion/promotionRecordList.vue";
-	import dayjs from "dayjs";
-	export default {
-		components: {
-			PromotionRecordList
-		},
-		data() {
-			return {
-				promotionRecordList: [],
-				queryParams: {
-					pageNo: 1,
-					pageSize: 10,
-					startDate: dayjs(new Date()).format('YYYY-MM-DD'),
-					endDate: dayjs(new Date()).format('YYYY-MM-DD'),
-					keyWord: '',
-				},
-			}
-		},
-		onReachBottom() {
-			console.log("=====")
-			let allTotal = this.queryParams.pageNo * this.queryParams.pageSize
-			if (allTotal < this.total) {
-				//当前条数小于总条数 则增加请求数
-				this.queryParams.pageSize += 10
-				this.getData() //调用加载数据方法
-			}
-		},
-		mounted() {
-			console.log("====")
-			this.getData()
-		},
-		methods: {
-
-			getData() {
-				this.$api('infoGetPromotionPage', {
-					pageNo: this.queryParams.pageNo,
-					pageSize: this.queryParams.pageSize,
-					startDate: this.queryParams.startDate,
-					endDate: this.queryParams.endDate,
-					keyWord: this.queryParams.keyWord
-				}, res => {
-					if (res.code == 200) {
-						this.promotionRecordList = res.result.records
-						this.total = res.result.total
-					}
-				})
-			},
-			keyWordChange(val) {
-				console.log("val", val)
-				this.queryParams.keyWord = val
-				this.getData()
-			},
-
-			startDateChange(val) {
-				this.$nextTick(() => {
-				  this.queryParams.startDate = dayjs(val.value).format("YYYY-MM-DD")
-				});
-				this.getData()
-			},
-			startDateOpen() {
-				this.$refs.startDateRef.open();
-			},
-			endDateChange(val) {
-				this.$nextTick(() => {
-				  this.queryParams.endDate = dayjs(val.value).format("YYYY-MM-DD")
-				});
-				this.getData()
-			},
-			endDateOpen() {
-				this.$refs.endDateRef.open();
-			},
-			// startDateFormatter(type, value) {
-			// 	if (type === 'year') {
-			// 		return `${value}年`
-			// 	}
-			// 	if (type === 'month') {
-			// 		return `${value}月`
-			// 	}
-			// 	if (type === 'day') {
-			// 		return `${value}日`
-			// 	}
-			// 	return value
-			// },
-			// endDateFormatter(type, value) {
-			// 	console.log(type, value, "======endDateFormatter=======")
-			// 	if (type === 'year') {
-			// 		return `${value}年`
-			// 	}
-			// 	if (type === 'month') {
-			// 		return `${value}月`
-			// 	}
-			// 	if (type === 'day') {
-			// 		return `${value}日`
-			// 	}
-			// 	return value
-			// }
-		}
-
-	}
+import PromotionRecordList from "./sonPage/promotion/promotionRecordList.vue";
+import dayjs from "dayjs";
+
+export default {
+  components: {
+    PromotionRecordList
+  },
+  data() {
+    return {
+      promotionRecordList: [],
+      queryParams: {
+        pageNo: 1,
+        pageSize: 10,
+        startDate: dayjs(new Date()).format('YYYY-MM-DD'),
+        endDate: dayjs(new Date()).format('YYYY-MM-DD'),
+        keyWord: '',
+      },
+    }
+  },
+  onReachBottom() {
+    console.log("=====")
+    let allTotal = this.queryParams.pageNo * this.queryParams.pageSize
+    if (allTotal < this.total) {
+      //当前条数小于总条数 则增加请求数
+      this.queryParams.pageSize += 10
+      this.getData() //调用加载数据方法
+    }
+  },
+  mounted() {
+    console.log("====")
+    this.getData()
+  },
+  methods: {
+
+    getData() {
+      this.$api('infoGetPromotionPage', {
+        pageNo: this.queryParams.pageNo,
+        pageSize: this.queryParams.pageSize,
+        startDate: this.queryParams.startDate,
+        endDate: this.queryParams.endDate,
+        keyWord: this.queryParams.keyWord
+      }, res => {
+        if (res.code == 200) {
+          this.promotionRecordList = res.result.records
+          this.total = res.result.total
+        }
+      })
+    },
+    keyWordChange(val) {
+      console.log("val", val)
+      this.queryParams.keyWord = val
+      this.getData()
+    },
+
+    startDateChange(val) {
+      this.$nextTick(() => {
+        this.queryParams.startDate = dayjs(val.value).format("YYYY-MM-DD")
+        this.getData()
+      });
+    },
+    startDateOpen() {
+      this.$refs.startDateRef.open();
+    },
+    endDateChange(val) {
+      this.$nextTick(() => {
+        this.queryParams.endDate = dayjs(val.value).format("YYYY-MM-DD")
+        this.getData()
+      });
+    },
+    endDateOpen() {
+      this.$refs.endDateRef.open();
+    },
+    // startDateFormatter(type, value) {
+    // 	if (type === 'year') {
+    // 		return `${value}年`
+    // 	}
+    // 	if (type === 'month') {
+    // 		return `${value}月`
+    // 	}
+    // 	if (type === 'day') {
+    // 		return `${value}日`
+    // 	}
+    // 	return value
+    // },
+    // endDateFormatter(type, value) {
+    // 	console.log(type, value, "======endDateFormatter=======")
+    // 	if (type === 'year') {
+    // 		return `${value}年`
+    // 	}
+    // 	if (type === 'month') {
+    // 		return `${value}月`
+    // 	}
+    // 	if (type === 'day') {
+    // 		return `${value}日`
+    // 	}
+    // 	return value
+    // }
+  }
+
+}
 </script>
 
 <style lang="scss" scoped>
-	* {
-		box-sizing: border-box;
-		margin: 0;
-		padding: 0;
-	}
-
-	.promotionRecord {
-		width: 100vw;
-		height: 100vh;
-
-		.frame {
-			width: 100%;
-			//height: calc(100vh - 220rpx);
-			padding: 28rpx 28rpx 0 28rpx;
-
-			.title {
-				font-size: 34rpx;
-				color: #333;
-				font-weight: 700
-			}
-
-			.search {
-				display: flex;
-				align-items: center;
-				gap: 10rpx;
-				width: 100%;
-				height: 80rpx;
-				margin-top: 20rpx;
-
-
-				.dateTimeCls {
-					display: flex;
-					align-items: center;
-					justify-content: space-between;
-					width: 25%;
-					height: 80%;
-					border: 1px solid #b0b2b3;
-					padding: 5rpx;
-					border-radius: 20rpx;
-
-					.date {
-						font-size: 25rpx;
-						display: flex;
-						align-items: center;
-						width: 80%;
-						height: 100%;
-						color: #b0b2b3;
-
-					}
-
-					.image {
-						width: 20%;
-						height: 100%;
-					}
-				}
-			}
-
-
-			.publishListClass {
-				margin-top: 10rpx;
-				height: 78vh;
-				overflow: auto;
-				width: 100%;
-			}
-		}
-	}
+* {
+  box-sizing: border-box;
+  margin: 0;
+  padding: 0;
+}
+
+.promotionRecord {
+  width: 100vw;
+  height: 100vh;
+
+  .frame {
+    width: 100%;
+    //height: calc(100vh - 220rpx);
+    padding: 28rpx 28rpx 0 28rpx;
+
+    .title {
+      font-size: 34rpx;
+      color: #333;
+      font-weight: 700
+    }
+
+    .search {
+      display: flex;
+      align-items: center;
+      gap: 10rpx;
+      width: 100%;
+      height: 80rpx;
+      margin-top: 20rpx;
+
+
+      .dateTimeCls {
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+        width: 25%;
+        height: 80%;
+        border: 1px solid #b0b2b3;
+        padding: 5rpx;
+        border-radius: 20rpx;
+
+        .date {
+          font-size: 25rpx;
+          display: flex;
+          align-items: center;
+          width: 80%;
+          height: 100%;
+          color: #b0b2b3;
+
+        }
+
+        .image {
+          width: 20%;
+          height: 100%;
+        }
+      }
+    }
+
+
+    .publishListClass {
+      margin-top: 10rpx;
+      height: 78vh;
+      overflow: auto;
+      width: 100%;
+    }
+  }
+}
 </style>
\ No newline at end of file