chenrui 4 years ago
parent
commit
25dd353953

+ 1 - 1
pages/login/login.vue

@@ -192,7 +192,7 @@ export default {
 		//  忘记密码
 		forgetPass() {
 			uni.navigateTo({
-				url: '/pages/login/forget-pass'
+				url: '/pages/login/forget-pass?username=' + this.form.username
 			});
 		},
 		//  判断是否记住密码

+ 111 - 112
pages/shopTourRecord/shopTourRecord.vue

@@ -4,51 +4,49 @@
 		<screenModule class="screenModule" :defaultParams="searchForm" @refresh="refresh" />
 		<!-- 列表数据 -->
 		<view class="list-con">
-			<view class="record-con">
-				<view v-show="searchForm.creatTime.length != 0" class="alert-tips">
-					<text>创建时间:{{searchForm.creatTime[0]}} 至 {{searchForm.creatTime[1]}}</text>
-				</view>
-				<scroll-view scroll-y class="record-con-c" @scrolltolower="onreachBottom">
-					<view class="record-item" v-for="(item,index) in list" :key="index" @click="getDetails(item)">
-						<view class="item-head">
-							<text class="item-c-tit">{{item.storeName}}</text>
-							<u-tag class="item-c-type" :text="item.status | taskStatus" :type="item.status | statusCls" />
-						</view>
-						<view class="item-main">
-							<text class="item-tit">巡店人:</text>
-							<text class="item-val">{{item.userName}}</text>
-						</view>
-						<view class="item-main">
-							<text class="item-tit">创建时间:</text>
-							<text class="item-val">{{item.startTime}}</text>
-						</view>
-						<view class="item-main">
-							<text class="item-tit">检查方式:</text>
-							<text class="item-val">{{item.typeDictValue}}</text>
-						</view>
-						<u-grid class="item-grid" :col="4" hover-class="none">
-							<u-grid-item>
-								<text class="grid-num text-blue">{{item.totalTargetCount}}</text>
-								<text class="grid-text">检查项</text>
-							</u-grid-item>
-							<u-grid-item>
-								<text class="grid-num text-green">{{item.passTargetCount}}</text>
-								<text class="grid-text">合格</text>
-							</u-grid-item>
-							<u-grid-item>
-								<text class="grid-num text-red">{{item.notPassTargetCount}}</text>
-								<text class="grid-text">不合格</text>
-							</u-grid-item>
-							<u-grid-item>
-								<text class="grid-num text-yellow">{{item.notWorkTargetCount}}</text>
-								<text class="grid-text">不适用</text>
-							</u-grid-item>
-						</u-grid>
-					</view>
-					<u-empty :text="noDataText" img-width="120" :margin-top="400" v-if="list.length == 0 && status != 'loading'" mode="list"></u-empty>
-					<view style="padding: 20upx;"><u-loadmore v-if="total > pageSize || status == 'loading'" :status="status" /></view>
-				</scroll-view>
+			<view v-show="searchForm.creatTime.length != 0" class="alert-tips">
+				<text>创建时间:{{searchForm.creatTime[0]}} 至 {{searchForm.creatTime[1]}}</text>
 			</view>
+			<scroll-view scroll-y class="record-con-c" @scrolltolower="onreachBottom">
+				<view class="record-item" v-for="(item,index) in list" :key="index" @click="getDetails(item)">
+					<view class="item-head">
+						<text class="item-c-tit">{{item.storeName}}</text>
+						<u-tag class="item-c-type" :text="item.status | taskStatus" :type="item.status | statusCls" />
+					</view>
+					<view class="item-main">
+						<text class="item-tit">巡店人:</text>
+						<text class="item-val">{{item.userName}}</text>
+					</view>
+					<view class="item-main">
+						<text class="item-tit">创建时间:</text>
+						<text class="item-val">{{item.startTime}}</text>
+					</view>
+					<view class="item-main">
+						<text class="item-tit">检查方式:</text>
+						<text class="item-val">{{item.typeDictValue}}</text>
+					</view>
+					<u-grid class="item-grid" :col="4" hover-class="none">
+						<u-grid-item>
+							<text class="grid-num text-blue">{{item.totalTargetCount}}</text>
+							<text class="grid-text">检查项</text>
+						</u-grid-item>
+						<u-grid-item>
+							<text class="grid-num text-green">{{item.passTargetCount}}</text>
+							<text class="grid-text">合格</text>
+						</u-grid-item>
+						<u-grid-item>
+							<text class="grid-num text-red">{{item.notPassTargetCount}}</text>
+							<text class="grid-text">不合格</text>
+						</u-grid-item>
+						<u-grid-item>
+							<text class="grid-num text-yellow">{{item.notWorkTargetCount}}</text>
+							<text class="grid-text">不适用</text>
+						</u-grid-item>
+					</u-grid>
+				</view>
+				<u-empty :text="noDataText" img-width="120" v-if="list.length == 0 && status != 'loading'" mode="list"></u-empty>
+				<view v-if="total > pageSize || status == 'loading'" class="loadmore"><u-loadmore :status="status" /></view>
+			</scroll-view>
 		</view>
 	</view>
 </template>
@@ -206,80 +204,81 @@
 	.shopTourRecord-wrap{
 		// 列表数据
 		.list-con{
-			.record-con{
-				.alert-tips{
-					padding: 20upx 30upx 10upx;
-					background-color: #F8F8F8;
-					border-bottom: 1px solid #EEEEEE;
-					text{
-						display: block;
-						font-size: 24upx;
-						padding: 4upx 10upx;
-					}
+			.alert-tips{
+				padding: 20upx 30upx 10upx;
+				background-color: #F8F8F8;
+				border-bottom: 1px solid #EEEEEE;
+				text{
+					display: block;
+					font-size: 24upx;
+					padding: 4upx 10upx;
 				}
-				.record-con-c{
-					height: calc(100vh - 84px);
-					.record-item{
-						background-color: #fff;
-						margin: 20upx 30upx 20upx;
-						padding: 14upx 30upx 20upx;
-						border-radius: 12upx;
-						box-shadow: 1px 1px 3px #eee;
-						.item-head{
-							display: flex;
-							justify-content: space-between;
-							align-items: center;
-							padding: 10upx 0;
-							.item-c-tit{
-								flex-grow: 1;
-								padding-right: 18upx;
-								font-weight: bold;
-							}
-							.item-c-type{
-								flex-shrink: 0;
-							}
+			}
+			.record-con-c{
+				height: calc(100vh - 84px);
+				.record-item{
+					background-color: #fff;
+					margin: 20upx 30upx 20upx;
+					padding: 14upx 30upx 20upx;
+					border-radius: 12upx;
+					box-shadow: 1px 1px 3px #eee;
+					.item-head{
+						display: flex;
+						justify-content: space-between;
+						align-items: center;
+						padding: 10upx 0;
+						.item-c-tit{
+							flex-grow: 1;
+							padding-right: 18upx;
+							font-weight: bold;
 						}
-						.item-main{
-							font-size: 26upx;
-							line-height: 48upx;
-							padding: 6upx 0;
-							position: relative;
-							.item-tit{
-								display: inline-block;
-								position: absolute;
-								left: 0;
-								top: 8upx;
-							}
-							.item-val{
-								display: inline-block;
-								padding-left: 130upx;
-							}
+						.item-c-type{
+							flex-shrink: 0;
 						}
-						.item-grid{
-							margin-top: 10upx;
-							.text-blue{
-								color: #2979ff;
-							}
-							.text-green{
-								color: #19be6b;
-							}
-							.text-red{
-								color: #fa3534;
-							}
-							.text-yellow{
-								color: #ff9900;
-							}
-							.grid-num{
-								font-weight: bold;
-							}
-							.grid-text{
-								font-size: 26upx;
-								padding-top: 10upx;
-								color: #666;
-							}
+					}
+					.item-main{
+						font-size: 26upx;
+						line-height: 48upx;
+						padding: 6upx 0;
+						position: relative;
+						.item-tit{
+							display: inline-block;
+							position: absolute;
+							left: 0;
+							top: 8upx;
+						}
+						.item-val{
+							display: inline-block;
+							padding-left: 130upx;
+						}
+					}
+					.item-grid{
+						margin-top: 10upx;
+						.text-blue{
+							color: #2979ff;
+						}
+						.text-green{
+							color: #19be6b;
+						}
+						.text-red{
+							color: #fa3534;
+						}
+						.text-yellow{
+							color: #ff9900;
+						}
+						.grid-num{
+							font-weight: bold;
+						}
+						.grid-text{
+							font-size: 26upx;
+							padding-top: 10upx;
+							color: #666;
 						}
 					}
 				}
+				.loadmore{
+					padding: 20upx;
+				}
 			}
 		}
 	}

File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/app-plus/app-service.js


File diff suppressed because it is too large
+ 191 - 200
unpackage/dist/dev/app-plus/app-view.js


Some files were not shown because too many files changed in this diff