Browse Source

Merge branch 'deploy' of http://git.chelingzhu.com/chelingzhu-web/storeCheck-app into deploy

1004749546@qq.com 4 years ago
parent
commit
1003bd71c6

+ 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
 			});
 		},
 		//  判断是否记住密码

+ 2 - 2
pages/organization/organization.vue

@@ -182,9 +182,9 @@
 	page {
 		background-color: #f8f8f8;
 		height: 100vh;
-		position: relative;
 	}
 	.organization-wrap{
+		position: relative;
 		.organization-root-tit{
 			position: fixed;
 			left: 0;
@@ -206,7 +206,7 @@
 			}
 		}
 		.organization-node-con{
-			padding: 0 30upx;
+			padding: 88upx 30upx 0;
 			background-color: #fff;
 			.organization-node-item{
 				display: flex;

+ 7 - 0
pages/shopTourOver/shopTourOver.vue

@@ -47,6 +47,7 @@
 					this.$refs.xdr.subCanvas()
 				}else{
 					this.storeManagerSign = ''
+					uni.hideLoading()
 					uni.showToast({ icon: 'none', title: '店长签名生成失败,请重新提交' })
 				}
 			},
@@ -59,6 +60,7 @@
 					this.isSubmit()
 				}else{
 					this.inspectorSign = ''
+					uni.hideLoading()
 					uni.showToast({ icon: 'none', title: '巡店人签名生成失败,请重新提交' })
 				}
 			},
@@ -67,6 +69,7 @@
 				let _this = this
 				if(this.sign == 2&&this.storeManagerSign && this.inspectorSign){
 					console.log('正常提交')
+					uni.hideLoading()
 					clzConfirm({
 						title: '提示',
 						content: '确定提交本次巡店?',
@@ -99,6 +102,10 @@
 					})
 					return
 				}
+				uni.showLoading({
+					title: '保存中,请稍后...', 
+					mask: true
+				})
 				this.$refs.dz.subCanvas()
 			},
 			//  提交

+ 2 - 2
pages/shopTourRecord/shopTourRecord.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="shopTourRecord-wrap">
 		<!-- 筛选条件 -->
-		<screenModule class="screenModule" :defaultParams="searchForm" @refresh="refresh" />
+		<screenModule :defaultParams="searchForm" @refresh="refresh" />
 		<!-- 列表数据 -->
 		<view class="list-con">
 			<view class="record-con">
@@ -12,7 +12,7 @@
 					<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" />
+							<u-tag size="mini" mode="plain" shape="circle" class="item-c-type" :text="item.status | taskStatus" :type="item.status | statusCls" />
 						</view>
 						<view class="item-main">
 							<text class="item-tit">巡店人:</text>

+ 6 - 0
pages/signIn/signIn.vue

@@ -89,6 +89,7 @@ export default {
 		//  签到拍照
 		goPhotograph() {
 			const _this = this;
+			
 			uni.chooseImage({
 				count: 1, //最多可以选择的图片张数,默认9
 				sizeType: ['original', 'compressed'], //可以指定是原图还是压缩图,默认二者都有
@@ -96,9 +97,14 @@ export default {
 				success: function(res) {
 					// tempFilePaths 图片的本地文件路径列表,tempFiles 图片的本地文件列表,每一项是一个 File 对象
 					console.log(JSON.stringify(res.tempFilePaths));
+					uni.showLoading({
+						title: '保存中,请稍后...', 
+						mask: true
+					})
 					saveImgToAliOss(res.tempFilePaths[0],function(ret){
 						console.log(ret)
 						_this.photograph = ret.data
+						uni.hideLoading()
 					})
 				}
 			});

+ 7 - 9
pages/spotCheckCenter/spotChecking.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="pagesCons">
 		<view class="tab-body">
-			<view><u-tabs-swiper ref="uTabs" :list="tabList" name="dispName" :current="current" @change="tabsChange" :is-scroll="false" swiperWidth="750"></u-tabs-swiper></view>
+			<view class="uTabs"><u-tabs-swiper ref="uTabs" :list="tabList" name="dispName" :current="current" @change="tabsChange" :is-scroll="false" swiperWidth="750"></u-tabs-swiper></view>
 			<swiper class="check-list" :current="swiperCurrent" @transition="transition" @change="swiperChange" @animationfinish="animationfinish">
 				<swiper-item 
 				class="swiper-item" 
@@ -15,9 +15,7 @@
 						:key="item.id">
 							<view class="check-row" @click="viewRow(item)">
 								<view>{{ item.storeName }}</view>
-								<view>
-								  <u-tag size="mini" mode="plain" shape="circle" :text="item.statusDictValue" :type="item.status | statusCls" />
-								</view>
+								<u-tag size="mini" mode="plain" shape="circle" class="item-c-type" :text="item.statusDictValue" :type="item.status | statusCls" />
 							</view>
 							<view class="check-row" @click="viewRow(item)">
 								<view>
@@ -223,8 +221,12 @@ page {
 	display: flex;
 	flex-direction: column;
 	.tab-body {
+		.uTabs{
+			border-bottom: 1px solid #EEEEEE;
+			box-shadow: 1px 1px 3px #eeeeee;
+		}
 		.check-list {
-			height: calc(100vh - 50px);
+			height: calc(100vh - 56px);
 		}
 		.check-order-list {
 			background: #ffffff;
@@ -254,7 +256,6 @@ page {
 				}
 				.item-c-type{
 					flex-shrink: 0;
-					border-radius: 6upx;
 				}
 				.action {
 					margin: 0 6rpx;
@@ -283,9 +284,6 @@ page {
 						font-size: 28upx;
 					}
 				}
-				.u-tag {
-					border-radius: 0;
-				}
 				.uni-icons {
 					margin: 0 5upx;
 				}

+ 2 - 9
pages/spotCheckConfigure/addSpotCheck.vue

@@ -210,15 +210,8 @@ export default {
 		// 开始日期
 		confirmStartDate(val) {
 			let d = val.year + '-' + val.month + '-' + val.day;
-			let a = this.form.startDate;
-			if (a == '' || moment(d).isBefore(a)) {
-				this.form.startDate = d;
-			} else {
-				uni.showToast({
-					icon: 'none',
-					title: '开始日期应小于结束日期'
-				});
-			}
+			this.form.startDate = d
+			this.form.endDate = ''
 		},
 		openEndDate(){
 			this.showPickerEnd = this.form.cycleType=='WEEK'

+ 2 - 0
pages/spotCheckConfigure/spotCheckList.vue

@@ -38,6 +38,7 @@ export default {
 	},
 	onLoad() {
 		if(this.$hasPermissions("B_spotConfig_new_mobile")){
+			// #ifdef APP-PLUS
 			// 设置标题栏按钮
 			let currentWebview = this.$scope.$getAppWebview();
 			currentWebview.setTitleNViewButtonStyle(0, {
@@ -47,6 +48,7 @@ export default {
 				width: '80px',
 				fontSrc: '/static/iconfont/iconfont.ttf'
 			});
+			// #endif
 		}
 		
 		// 首次加载列表

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


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


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