1

pages/admin/order/index.vue

@@ -271,20 +271,21 @@
 					// console.log(this.OrderList);
 				})
 			},
-      // 保留两位小数
-      toFixed2(num){
-        let str = num;
-        if(typeof num =='string'){
-          str = +str;
-          str = str.toFixed(2);
-        }else str = str.toFixed(2);
-        return str || '0.00';
-      },
-      navToOrder(item, type=2){
-        uni.navigateTo({
-          url: `/pages/admin/orderList/index?merId=${this.mer_id}&types=${type}&pay_time=${item.pay_time.split(' ')[0]}`
-        })
-      }
+			// 保留两位小数
+			toFixed2(num) {
+				if (!num) return "0.00";
+				let str = num;
+				if (typeof num == 'string') {
+					str = +str;
+					str = str.toFixed(2);
+				} else str = str.toFixed(2);
+				return str || '0.00';
+			},
+			navToOrder(item, type = 2) {
+				uni.navigateTo({
+					url: `/pages/admin/orderList/index?merId=${this.mer_id}&types=${type}&pay_time=${item.pay_time.split(' ')[0]}`
+				})
+			}
 		},
 		onReachBottom() {
 			this.getList(this.mer_id)

pages/index/index.vue

@@ -49,6 +49,7 @@
 				</view>
 				<view class="content-middlea-one" style="font-size: 22rpx;color: #7f7f7f;">
 					<text v-if="index==1">(次日18点后可提现)</text>
+					<text v-if="index == 3">(点击查看进度详情)</text>
 				</view>
 			</view>
 		</view>
@@ -875,32 +876,36 @@
 			}
 		},
 
-    beforeDestroy() {
-      // 销毁监听事件
-      this.$bus.$off('value-updated')
-    },
-    methods: {
-      // 提现页面
-      handleToWithDraw(item, index) {
-        if(index==3||index==4) return;
-        let url;
-        if(index<2) url = "/pages/users/embody/embody?mer_id=" + this.userInfoData.service.mer_id;
-        else url = `/pages/admin/orderList/index?merId=${this.userInfoData.service.mer_id}&types=2`;
-        uni.navigateTo({
-          url: url
-        })
-      },
+		beforeDestroy() {
+			// 销毁监听事件
+			this.$bus.$off('value-updated')
+		},
+		methods: {
+			// 提现页面
+			handleToWithDraw(item, index) {
+				if (index == 4) return;
+				let url;
+				if (index == 0) url = "/pages/users/embody/embody?mer_id=" + this.userInfoData.service.mer_id;
+				if (index == 2) url = `/pages/admin/orderList/index?merId=${this.userInfoData.service.mer_id}&types=2`;
+				if (index == 3) url = "/pages/activeCode/subsidy";
+
+				uni.navigateTo({
+					url: url
+				})
+			},
 
 			// 初始化菜单
 			initTypeLiseMenu() {
 
 			},
+
 			//关闭弹窗
 			close() {
 				this.isFshow = false;
 				this.$refs.popup.close()
 				this.num = 15
 			},
+
 			//获取交易信息
 			codelist() {
 

pages/payment/payment_detail.vue

@@ -64,8 +64,8 @@
 				searchParams: {
 					page: 1,
 					limit: 15,
-					section_startTime: '',
-					section_endTime: '',
+					section_startTime: new Date().format("yyyy-MM-dd"),
+					section_endTime: new Date().format("yyyy-MM-dd"),
 					mer_id: ''
 				},
 				loadend: false,
@@ -81,16 +81,16 @@
 		computed: {
 			startTimeTxt() {
 				if (this.searchParams.section_startTime) {
-					return new Date(this.searchParams.section_startTime).format("yyyy年MM月dd");
+					return new Date(this.searchParams.section_startTime).format("yyyy年MM月dd日");
 				} else {
-					return "开始时间";
+					return new Date().format("yyyy年MM月dd日");
 				}
 			},
 			endTimeTxt() {
 				if (this.searchParams.section_endTime) {
-					return new Date(this.searchParams.section_endTime).format("yyyy年MM月dd");
+					return new Date(this.searchParams.section_endTime).format("yyyy年MM月dd日");
 				} else {
-					return "结束时间";
+					return new Date().format("yyyy年MM月dd日");
 				}
 			}
 		},
@@ -116,8 +116,8 @@
 			handleReset() {
 				this.loadend = false;
 				this.searchParams.page = 1;
-				this.searchParams.section_startTime = '';
-				this.searchParams.section_endTime = '';
+				this.searchParams.section_startTime = new Date().format("yyyy-MM-dd");
+				this.searchParams.section_endTime = new Date().format("yyyy-MM-dd");
 				this.paymentData = [];
 				this.getData();
 			},
@@ -200,7 +200,7 @@
 			left: 0;
 			width: 100%;
 			background-color: #EFEFEF;
-			padding: 30rpx 40rpx;
+			padding: 30rpx;
 
 			.payment-detail-head-wrap {
 				display: flex;