Quellcode durchsuchen

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

1004749546@qq.com vor 4 Jahren
Ursprung
Commit
690225278f

+ 196 - 183
pages/index/index.vue

@@ -5,7 +5,7 @@
 			<swiper-item v-for="(item,index) in imageTopList" :key="index">
 				<div class="swiper-item uni-bg-red">
 					<!-- <image class="swiper-item-imgse" :fade-show='true' :src="item.photo"></image> -->
-					<u-image mode="scaleToFill" width="750upx" height="400upx" :src="item.photo"></u-image>
+					<u-image mode="scaleToFill" width="750upx" height="400upx" :src="item.photoPath"></u-image>
 				</div>
 			</swiper-item>
 		</swiper>
@@ -18,8 +18,8 @@
 		<div class="panel-box">
 			<div class="panel-title">
 				<span class="texts">待办单</span>
-				<span class="btns" @click="toDoList">更多 
-				<u-icon name="icon-xian-11" custom-prefix="xd-icon" size="24" color="#4eacfe"></u-icon>
+				<span class="btns" @click="toDoList">更多
+					<u-icon name="icon-xian-11" custom-prefix="xd-icon" size="24" color="#4eacfe"></u-icon>
 				</span>
 			</div>
 			<div class="panel-body">
@@ -37,202 +37,215 @@
 </template>
 
 <script>
-import iconItemsList from '@/components/icon-items-list/icon-items-list.vue'
-import { bannerList } from "@/api/banner.js"
-import { getBackLogList } from '@/api/backLog'
-import { getLookUpDatas } from "@/api/data.js"
-import moment from 'moment'
-export default {
-	components: {
-		iconItemsList
-	},
-	data() {
-		return {
-			// 顶部轮播图片
-			imageTopList:[],
-			notoDoDataText: '数据加载中,请稍后...',
-			toDoData: [],
-			// 快捷导航
-			navList: [
-				{
-					id: 'SPXD',
-					icon: 'xundian',
-					color: '#00aaff',
-					name: '视频巡店',
-					url: '/pages/videoShopTour/videoShopTour',
-					target: 'page',
-					auth: true
-				},
-				{
-					id: 'DJZX',
-					icon: 'dianjian',
-					color: '#ff5500',
-					name: '点检中心',
-					url:'/pages/spotCheckCenter/spotChecking',
-					target: 'page',
-					auth: true
-				},
-				{
-					id: 'XCXD',
-					icon: 'xianchangjiancha',
-					color: '#00aa00',
-					name: '现场巡店',
-					url:'/pages/siteInspection/siteInspection',
-					target: 'page',
-					auth: true
-				},
-				{
-					id: 'XDJL',
-					icon: 'tubiaokuwenjian-gengxin-',
-					color: '#d0527e',
-					name: '巡店记录',
-					url:'/pages/shopTourRecord/shopTourRecord',
-					target: 'page',
-					auth: true
-				}
-			],
-		};
-	},
-	onLoad() {
-		this.getBanner('HOME_TOP')
-		this.gettoDoData()
-		// 获取周
-		this.getLookUpList('WEEK', 'vuex_weeks');
-		// 获取点检任务状态
-		this.getLookUpList('POINT_TASK_STATUS','vuex_spotCheckStatus')
-	},
-	methods: {
-		// 或某一项字典列表,参数code
-		getLookUpList(code, vuexKey) {
-			getLookUpDatas({ type: code }).then(res => {
-				if (res.status == 200) {
-					this.$store.state[vuexKey] = res.data || [];
-				}
-			});
+	import iconItemsList from '@/components/icon-items-list/icon-items-list.vue'
+	import {
+		bannerList
+	} from "@/api/banner.js"
+	import {
+		getBackLogList
+	} from '@/api/backLog'
+	import {
+		getLookUpDatas
+	} from "@/api/data.js"
+	import moment from 'moment'
+	export default {
+		components: {
+			iconItemsList
 		},
-		openVideo() {
-			 uni.navigateTo({
-			 	url:"/pages/shopTour/shopTour"
-			 })
+		data() {
+			return {
+				// 顶部轮播图片
+				imageTopList: [],
+				notoDoDataText: '数据加载中,请稍后...',
+				toDoData: [],
+				// 快捷导航
+				navList: [{
+						id: 'SPXD',
+						icon: 'xundian',
+						color: '#00aaff',
+						name: '视频巡店',
+						url: '/pages/videoShopTour/videoShopTour',
+						target: 'page',
+						auth: true
+					},
+					{
+						id: 'DJZX',
+						icon: 'dianjian',
+						color: '#ff5500',
+						name: '点检中心',
+						url: '/pages/spotCheckCenter/spotChecking',
+						target: 'page',
+						auth: true
+					},
+					{
+						id: 'XCXD',
+						icon: 'xianchangjiancha',
+						color: '#00aa00',
+						name: '现场巡店',
+						url: '/pages/siteInspection/siteInspection',
+						target: 'page',
+						auth: true
+					},
+					{
+						id: 'XDJL',
+						icon: 'tubiaokuwenjian-gengxin-',
+						color: '#d0527e',
+						name: '巡店记录',
+						url: '/pages/shopTourRecord/shopTourRecord',
+						target: 'page',
+						auth: true
+					}
+				],
+			};
 		},
-		// 消息提示
-		showTotast(title){
-			uni.showToast({
-				icon: 'none',
-				title:title
-			})
+		onLoad() {
+			this.getBanner('HOME_TOP')
+			this.gettoDoData()
+			// 获取周
+			this.getLookUpList('WEEK', 'vuex_weeks');
+			// 获取点检任务状态
+			this.getLookUpList('POINT_TASK_STATUS', 'vuex_spotCheckStatus')
 		},
-		// 获取顶部与中部轮播图片
-		getBanner(position){
-			bannerList({
-				position: position,
-				status : '1',
-				bannerType: 'App'
-			}).then(res=>{
-				if(res.status == 200){
-					if(position == 'HOME_TOP'){
-						this.imageTopList=res.data
+		methods: {
+			// 或某一项字典列表,参数code
+			getLookUpList(code, vuexKey) {
+				getLookUpDatas({
+					type: code
+				}).then(res => {
+					if (res.status == 200) {
+						this.$store.state[vuexKey] = res.data || [];
 					}
+				});
+			},
+			openVideo() {
+				uni.navigateTo({
+					url: "/pages/shopTour/shopTour"
+				})
+			},
+			// 消息提示
+			showTotast(title) {
+				uni.showToast({
+					icon: 'none',
+					title: title
+				})
+			},
+			// 获取顶部与中部轮播图片
+			getBanner() {
+				bannerList({
+					position: 'HOME_TOP',
+					bannerType: 'app'
+				}).then(res => {
+					if (res.status == 200) {
+						this.imageTopList = res.data || []
+					}
+				})
+			},
+			// 获取待办单
+			gettoDoData() {
+				let _this = this
+				let toDoData = {
+					pageNo: 1,
+					pageSize: 10,
+					endDate: moment().format('YYYY-MM-DD'),
+					beginDate: moment().subtract(7, 'days').format('YYYY-MM-DD')
 				}
-			}).catch(err=>{
-				console.log('数据获取失败')
-			})
-		},
-		// 获取待办单
-		gettoDoData(){
-			let _this = this
-			let toDoData = {
-			  pageNo: 1,
-			  pageSize: 10,
-			  endDate: moment().format('YYYY-MM-DD'),
-			  beginDate: moment().subtract(7, 'days').format('YYYY-MM-DD')
-			}
-			getBackLogList(toDoData).then(res=>{
-				console.log(res)
-				if(res.status==200){
-					let data = res.data.list
-					if(data.length) {
-						_this.toDoData = data.slice(0,10)
+				getBackLogList(toDoData).then(res => {
+					console.log(res)
+					if (res.status == 200) {
+						let data = res.data.list
+						if (data.length) {
+							_this.toDoData = data.slice(0, 10)
+						} else {
+							_this.toDoData = []
+							_this.notoDoDataText = '暂无数据'
+						}
 					} else {
-						_this.toDoData = []
-						_this.notoDoDataText = '暂无数据'
+						this.showTotast(res.message ? res.message : '网络似乎出错了,请稍后再试')
+						this.notoDoDataText = res.message ? res.message : '网络似乎出错了,请稍后再试'
 					}
-				} else {
-					this.showTotast(res.message ? res.message : '网络似乎出错了,请稍后再试')
-					this.notoDoDataText = res.message ? res.message : '网络似乎出错了,请稍后再试'
-				}
-			})
-		},
-		// 更多待办
-		toDoList(){
-			uni.navigateTo({
-				url: '/pages/toDoList/toDoList'
-			})
+				})
+			},
+			// 更多待办
+			toDoList() {
+				uni.navigateTo({
+					url: '/pages/toDoList/toDoList'
+				})
+			}
 		}
-	}
-};
+	};
 </script>
 
 <style lang="scss">
-.content {
-	.top-ad-swiper{
-		height: 340upx;
-	}
-	.swiper-item-imgse{
-		width: 750upx;
-		height: 340upx;
-	}
-	.panel-box{
-		.panel-title{
-			display: flex;
-			align-items: center;
-			padding:20upx 15upx;
-			border-bottom: 2upx solid #eee;
-			.texts{
-				font-size: 28upx;
-				flex-grow: 1;
-				padding-left: 15upx;
-				background: url(/static/pt.png) no-repeat left center;
-				background-size: auto 80%;
-			}
-			.btns{
-				font-size: 24upx;
-				color: #999;
-			}
+	.content {
+		.top-ad-swiper {
+			height: 340upx;
 		}
-		.panel-body{
-			padding: 20upx 0;
-			.nodata{
-				text-align: center;
-				font-size: 24upx;
-				width: 100%;
-				color: #999999;
-				padding: 30upx 0;
-			}
+
+		.swiper-item-imgse {
+			width: 750upx;
+			height: 340upx;
 		}
-	}
-	.order-list{
-		> div{
-			display: flex;
-			align-items: center;
-			font-size: 30upx;
-			padding: 14upx 0;
-			span{
-				flex-grow: 1;
-				text-align: center;
-				color: #666;
-				width: 33.3%;
-			}
-			span.daiJs{
-				color: #ff0000;
+
+		.panel-box {
+			.panel-title {
+				display: flex;
+				align-items: center;
+				padding: 20upx 15upx;
+				border-bottom: 2upx solid #eee;
+
+				.texts {
+					font-size: 28upx;
+					flex-grow: 1;
+					padding-left: 15upx;
+					background: url(/static/pt.png) no-repeat left center;
+					background-size: auto 80%;
+				}
+
+				.btns {
+					font-size: 24upx;
+					color: #999;
+				}
 			}
-			span.daiWg{
-				color: #ffaa00;
+
+			.panel-body {
+				padding: 20upx 0;
+
+				.nodata {
+					text-align: center;
+					font-size: 24upx;
+					width: 100%;
+					color: #999999;
+					padding: 30upx 0;
+				}
 			}
-			span.yiJs{
-				color: #5fbe00;
+		}
+
+		.order-list {
+			>div {
+				display: flex;
+				align-items: center;
+				font-size: 30upx;
+				padding: 14upx 0;
+
+				span {
+					flex-grow: 1;
+					text-align: center;
+					color: #666;
+					width: 33.3%;
+				}
+
+				span.daiJs {
+					color: #ff0000;
+				}
+
+				span.daiWg {
+					color: #ffaa00;
+				}
+
+				span.yiJs {
+					color: #5fbe00;
+				}
 			}
 		}
 	}
-}
 </style>

+ 10 - 21
pages/myShopTour/myShopTour.vue

@@ -9,7 +9,7 @@
 						<view class="record-con" :style="{'paddingTop': searchForm.beginDate ? '74upx' : ''}">
 							<!-- 筛选日期,近7天 -->
 							<view v-show="searchForm.beginDate" class="alert-tips">
-								<text>{{searchForm.beginDate}} ~ {{searchForm.endDate}}</text>
+								<text>创建时间:{{searchForm.beginDate}} 至 {{searchForm.endDate}}</text>
 							</view>
 							<view class="record-item" v-if="index==current" v-for="(item,sindex) in list" :key="item.id" @click="getDetails(item)">
 								<view class="item-head">
@@ -68,7 +68,6 @@
 	import moment from "moment"
 	import searchModal from './searchModal.vue'
 	import wPicker from "@/components/w-picker/w-picker.vue"
-	import { getLookUpDatas } from '@/api/data.js'
 	import { queryMyTask } from '@/api/task.js'
 	export default {
 		components: { wPicker, searchModal },
@@ -125,7 +124,9 @@
 			}
 		},
 		onLoad() {
-			this.getLookUpData('TASK_STATUS')  // 获取任务状态
+			// 获取任务状态   对象深度克隆
+			this.tabList = this.$u.deepClone(this.$store.state.vuex_taskStatus)
+			this.tabList.unshift({dispName: '全部', code: ''})
 			this.searchForm.beginDate = this.get7day(-6)
 			this.searchForm.endDate = this.get7day(0)
 			this.resetPage()
@@ -143,17 +144,6 @@
 				this.searchForm = params
 				this.pageInit(1)
 			},
-			// 获取数据字典数据
-			getLookUpData(code) {
-				getLookUpDatas({ type: code }).then(res => {
-					if (res.status == 200) {
-						if(code == 'TASK_STATUS'){  //  状态
-							res.data.unshift({dispName: '全部', code: ''})
-							this.tabList = res.data
-						}
-					}
-				})
-			},
 			// 查询列表
 			pageInit(pageNo){
 				if (pageNo) {
@@ -280,14 +270,14 @@
 <style lang="scss">
 page {
 	background-color: #f8f8f8;
-	height: calc(100vh - 44px);
+	height: 100vh;
 }
 .myShopTour-wrap {
 	height: 100%;
 	// 内容
 	.myShopTour-con{
 		.data-list{
-			height: calc(100vh - 84px);
+			height: calc(100vh - 50px);
 			.swiper-item{
 				height: 100%;
 				width: 100%;
@@ -306,21 +296,20 @@ page {
 							width: 100%;
 							z-index: 3;
 							padding: 20upx 30upx 10upx;
-							background-color: #fff;
+							background-color: #F8F8F8;
+							border-bottom: 1px solid #EEEEEE;
 							text{
 								display: block;
 								font-size: 24upx;
 								padding: 4upx 10upx;
-								border: 1upx solid #fcbd71;
-								background-color: #fdf6ec;
-								border-radius: 6upx;
 							}
 						}
 						.record-item{
 							background-color: #fff;
 							margin: 20upx 30upx 20upx;
 							padding: 14upx 30upx 20upx;
-							border-radius: 12upx;
+							border-radius: 6upx;
+							box-shadow: 1px 1px 3px #EEEEEE;
 							.item-head{
 								display: flex;
 								justify-content: space-between;

+ 2 - 1
pages/myShopTour/searchModal.vue

@@ -203,8 +203,9 @@ export default {
 			width: 30%;
 			text-align: center;
 			line-height: 60upx;
-			background-color: #e2e2e2;
+			background-color: #F8F8F8;
 			color: #333;
+			border-radius: 6upx;
 			font-size: 24upx;
 			margin: 0 10upx;
 		}

+ 1 - 1
pages/shopTourDetails/shopTourDetails.vue

@@ -68,7 +68,7 @@
 				if(item.taskTargetPhotoList){
 					let arr = []
 					item.taskTargetPhotoList.map(params => {
-						arr.push(params.photoBasePath + params.photoPath)
+						arr.push(params.photoPath)
 					})
 					this.taskTargetPhotoList = arr
 				}else{

+ 2 - 1
pages/shopTourRecord/screenModule.vue

@@ -255,8 +255,9 @@
 						width: 30%;
 						text-align: center;
 						line-height: 60upx;
-						background-color: #e2e2e2;
+						background-color: #F8F8F8;
 						color: #333;
+						border-radius: 6upx;
 						font-size: 24upx;
 						margin: 0 10upx;
 					}

+ 3 - 5
pages/shopTourRecord/shopTourRecord.vue

@@ -9,7 +9,7 @@
 				<view class="record-con">
 					<u-sticky offset-top="80">
 						<view v-show="searchForm.creatTime.length != 0" class="alert-tips">
-							<text>{{searchForm.creatTime[0]}} ~ {{searchForm.creatTime[1]}}</text>
+							<text>创建时间:{{searchForm.creatTime[0]}} 至 {{searchForm.creatTime[1]}}</text>
 						</view>
 					</u-sticky>
 					<view class="record-item" v-for="(item,index) in list" :key="index" @click="getDetails(item)">
@@ -202,14 +202,12 @@
 				.record-con{
 					.alert-tips{
 						padding: 20upx 30upx 10upx;
-						background-color: #fff;
+						background-color: #F8F8F8;
+						border-bottom: 1px solid #EEEEEE;
 						text{
 							display: block;
 							font-size: 24upx;
 							padding: 4upx 10upx;
-							border: 1upx solid #fcbd71;
-							background-color: #fdf6ec;
-							border-radius: 6upx;
 						}
 					}
 					.record-item{

+ 1 - 1
pages/siteInspection/siteInspection.vue

@@ -23,7 +23,7 @@
 							<u-icon class="company-icon" name="mendian" custom-prefix="xd-icon" size="40" color="#888"></u-icon>
 							<text>{{item.name}}</text>
 						</view>
-						<u-icon class="listData-item-r-icon" name="icon-xian-11" custom-prefix="xd-icon" size="40" color="#2b85e4"></u-icon>
+						<u-icon class="listData-item-r-icon" name="icon-xian-11" custom-prefix="xd-icon" size="24" color="#2b85e4"></u-icon>
 					</view>
 				</view>
 				<u-empty class="nodata" :text="noDataText" v-if="listdata.length==0 && status!='loading'" mode="list"></u-empty>

+ 1 - 1
pages/spotCheckConfigure/spotCheckList.vue

@@ -159,7 +159,7 @@ page {
 	margin: 20upx;
 	background-color: #fff;
 	border-radius: 3px;
-	box-shadow: 1px 1px 5px #ddd;
+	box-shadow: 1px 1px 3px #EEEEEE;
 	.itemName {
 		padding: 25upx;
 		display: flex;

+ 2 - 1
pages/spotCheckDetails/spotCheckDetails.vue

@@ -16,7 +16,8 @@
 						<u-image class="pic" width="100%" height="150upx" :src="pic.photoPath" @click="clickPic(index, ind)"></u-image>
 					</u-col>
 				</u-row>
-				<view class="comment-main">{{item.comments}}</view>
+				<view class="comment-main" v-if="item.comments">{{item.comments}}</view>
+				<view class="comment-main" v-else>--</view>
 			</view>
 		</view>
 	</view>

+ 2 - 1
pages/toDoList/searchModal.vue

@@ -197,8 +197,9 @@
 				width: 30%;
 				text-align: center;
 				line-height: 60upx;
-				background-color: #e2e2e2;
+				background-color: #F8F8F8;
 				color: #333;
+				border-radius: 6upx;
 				font-size: 24upx;
 				margin: 0 10upx;
 			}

+ 6 - 26
pages/toDoList/toDoList.vue

@@ -299,35 +299,16 @@
 <style lang="scss" scoped>
 	page{
 		height: 100%;
-	}
-	/* 自定义导航栏样式 */
-	.slot-wrap {
-		display: flex;
-		align-items: center;
-		/* 如果您想让slot内容占满整个导航栏的宽度 */
-		flex: 1;
-		/* 如果您想让slot内容与导航栏左右有空隙 */
-		padding: 0 30rpx 0 0;
-		color: #fff;
-		font-size: 28upx;
-		.left-icon{
-			flex-grow: 1;
-			font-size: 32upx;
-		}
-		.right-icon{
-			padding-left:50upx;
-		}
-		.uni-icons{
-			margin-right: 10upx;
-		}
-	}
-	.text-right {
-		text-align: right;
+		background: #F8F8F8;
 	}
 	.pagesCons{
 		height: 100%;
+		background: #F8F8F8;
 		display: flex;
 		flex-direction: column;
+		.text-right {
+			text-align: right;
+		}
 		.tab-body{
 			flex: 1;
 			display: flex;
@@ -357,7 +338,6 @@
 				.filter-icon{
 					display: flex;
 					flex-direction: column;
-					// margin-left: 10upx;
 					padding: 20upx;
 				}
 			}
@@ -380,7 +360,7 @@
 					&:first-child{
 						border-bottom: 1px dashed #F8F8F8;
 						.createDate{
-							// color: #666;
+							color: #666;
 							font-size: 26upx;
 							margin-left: 10upx;
 						}

Datei-Diff unterdrückt, da er zu groß ist
+ 9 - 9
unpackage/dist/dev/app-plus/app-service.js


Einige Dateien werden nicht angezeigt, da zu viele Dateien in diesem Diff geändert wurden.