细节优化

pages/my/myInfo.vue

@@ -280,6 +280,16 @@
 							<text class="text-gray">联系我们</text>
 						</view>
 					</view>
+				</view>
+			</view>
+			
+			<!-- 门店管理 -->
+			<view v-if="userInfo.isCleaner || userInfo.isAdmin || userInfo.isManage " class="list-content-box">
+				<view class="header-title">
+					<text class="text-title text-bold">门店管理</text>
+					<view class=""></view>
+				</view>
+				<view class="flex-row-center tool-list">
 					<view v-if="userInfo.isCleaner" class="item-box" @tap="onNavByPath('cleanManage')">
 						<view class="icon-img">
 							<image :src="assetsPath+'/user/tool_3.png'" mode="scaleToFill"></image>

pages/vipCreate/vipCreate.vue

@@ -23,7 +23,7 @@
 						</view>
 					</view>
 
-<!-- 					<view class="flex-between action-box-list">
+					<view class="flex-between action-box-list">
 						<view class="part part-left" @tap="onTabChange(1)">
 							<image v-if="tabIndex ==1" :src="assetsPath+'/vip/btn_2_a.png'" class="active"
 								mode="widthFix"></image>
@@ -35,7 +35,7 @@
 								mode="widthFix"></image>
 							<image v-else :src="assetsPath+'/vip/btn_1.png'" class="unactive" mode="widthFix"></image>
 						</view>
-					</view> -->
+					</view>
 
 					<view v-if="tabIndex ==1" class="list-box">
 						<view v-for="(item,k) in rechargeConfList" :key="k" class="flex-col item"
@@ -505,6 +505,7 @@
 				})
 			},
 			onTabChange(val) {
+				return;
 				if (this.tabIndex == val) return;
 				this.tabIndex = val;
 				this.checked = false;
@@ -690,7 +691,7 @@
 				justify-content: center;
 				align-items: center;
 				width: 690upx;
-				// min-height: 596upx;
+				min-height: 596upx;
 				background: #FFCA7E;
 				border-radius: 32upx;
 				padding: 6px 0;
@@ -805,7 +806,7 @@
 				padding: 0 1%;
 				justify-content: center;
 				align-items: center;
-                margin: 42upx 0;
+                // margin: 42upx 0;
 				.absolute-1 {
 					display: flex;
 					justify-content: center;

setting/dataStatistics/index.vue

@@ -31,7 +31,7 @@
                             <button class="cu-btn sm" :class="dateIndex === 4?'bg-pink':'bg-white'">日期筛选</button>
 						</view>
 						<view class="date-list-item">
-							<view v-if="dateIndex === 4" class="flex-row date-list-item-2 bg-gray">
+							<view v-if="dateIndex === 4" class="flex-row date-list-item-2" @tap="onOpenCalendar">
 								<text>{{faultDate.startTime}}</text>
 								<text>-</text>
 								<text>{{faultDate.endTime}}</text>
@@ -161,7 +161,7 @@
 			</view>
 			</scroll-view>
 		</view>
-		<u-calendar :show="show" :minDate="minDate" :maxDate="maxDate" mode="range" :defaultDate="defaultDate" :monthNum='13' @confirm="onConfirm" @close="onCancel" ></u-calendar>
+		<u-calendar :show="show" :allowSameDay="true" :minDate="minDate" :maxDate="maxDate" mode="range" :defaultDate="defaultDate" :monthNum='13' @confirm="onConfirm" @close="onCancel" ></u-calendar>
 	</view>
 </template>
 
@@ -209,7 +209,7 @@
 					},
 					{
 						label:"全部",
-						startTime: moment().subtract(29,'d').format("YYYY-MM-DD 00:00:00"),
+						startTime: moment().subtract(6,'M').format("YYYY-MM-DD 00:00:00"),
 						endTime:   moment().format("YYYY-MM-DD 23:59:59"),
 					},
 				],
@@ -221,8 +221,8 @@
 					moment().format("YYYY-MM-DD")
 				],
 				faultDate:{
-					startTime:"",
-					endTime:""
+					startTime:moment().subtract(6,'M').format("YYYY-MM-DD"),
+					endTime:  moment().format("YYYY-MM-DD")
 				},
 				platformTypeEnum:{}
 			}
@@ -295,13 +295,12 @@
 			},
 			onTabChange(i){
 				if(this.dateIndex === i) return;
-				if(i===4){
-					this.show = true;
-				}else{
-					this.dateIndex = i;
-					this.onOrderDataStatistics();
-				}
-			}
+				this.dateIndex = i;
+				this.onOrderDataStatistics();
+			},
+			onOpenCalendar(){
+				this.show = true;
+			},
 		}
 	}