Sfoglia il codice sorgente

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

# Conflicts:
#	unpackage/dist/dev/app-plus/app-config-service.js
#	unpackage/dist/dev/app-plus/app-service.js
#	unpackage/dist/dev/app-plus/app-view.js
chenrui 4 anni fa
parent
commit
cd319e57eb

+ 3 - 1
components/uni-check-list/uni-check-list.vue

@@ -29,7 +29,9 @@
 		props: {
 			listData: {
 				type: Array,
-				default: []
+				default: function(){
+					return []
+				}
 			},
 			// 类型 radio 或 checkbox 或 views 指 只是展示列表
 			types:{

+ 8 - 2
hybrid/html/video.html

@@ -23,7 +23,7 @@
 <body>
 <div class="storeCheck" id="app">
     <!-- 播放器 -->
-    <div class="videoPlay">
+    <div class="videoPlay" v-if="xdType=='video'">
       <!-- 云台控制 -->
       <div class="control-yt" v-show="showYt&&!showYtbtns" @click="openYt"></div>
       <div class="control-yt-close" v-show="showYtbtns" @click="openYt"></div>
@@ -217,7 +217,8 @@
 	var vm = new Vue({
 	  el: '#app',
 	  data: {
-		  player: null,
+		  xdType:'video', // 巡店类型
+		  player: null, // 播放器对象
 		  showYt: false, // 显示云台控制
 		  showYtbtns: false,
 		  showPz: false,// 显示拍照弹框
@@ -245,6 +246,11 @@
 			clearInterval(this.hsID)
 		},
 		methods: {
+		  // 设置类型
+		  setTyps(type){
+			  console.log(type)
+			  this.xdType = type
+		  },
 		  // 初始化播放器
 		  videoInit(){
 			  const _this = this

+ 7 - 1
pages.json

@@ -198,10 +198,16 @@
 			}
 		},
 		{
-			"path": "pages/toDoList/backlogDetail",		//  待办单 > 待办单列表
+			"path": "pages/toDoList/backlogDetail",		//  待办单 > 问题详情
 			"style": {
 				"navigationBarTitleText": "问题详情"
 			}
+		},
+		{
+			"path": "pages/toDoList/addBacklog",		//  待办单 > 创建问题
+			"style": {
+				"navigationBarTitleText": "创建问题"
+			}
 		}
     ],
 	"globalStyle": {

+ 1 - 1
pages/index/index.vue

@@ -203,11 +203,11 @@ export default {
 			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;

+ 5 - 0
pages/shopTour/shopTour.vue

@@ -13,6 +13,7 @@
 				isClose: false, // 是否关闭当前窗口
 				isEditImg: false, // 是否正在编辑图片
 				showPz: false, // 是否正在拍照
+				types: 'scene', // 巡店类型,默认视频
 			};
 		},
 		methods: {
@@ -59,6 +60,9 @@
 				})
 			}
 		},
+		onLoad(options) {
+			// this.types = options.types
+		},
 		onReady() {
 			let _this = this
 			// #ifdef APP-PLUS
@@ -67,6 +71,7 @@
 			 //如果是页面初始化调用时,需要延时一下
 			 setTimeout(function() {
 				_this.wv = currentWebview.children()[0]
+				_this.wv.evalJS("vm.setTyps('"+_this.types+"')")
 			 }, 500);
 			// #endif
 		},

+ 91 - 0
pages/toDoList/addBacklog.vue

@@ -0,0 +1,91 @@
+<template>
+	<view class="back-content">
+		<!-- 轮播图 -->
+		<view class="paizhao">
+			<view class="icon">
+				<u-icon name="xianchangpaishe" custom-prefix="xd-icon" size="64" color="#888888"></u-icon>
+			</view>
+		</view>
+		<swiper v-if="backlogPhotoList.length" class="top-ad-swiper" :indicator-dots="false" :autoplay="true" :interval="5000" :duration="600" :circular="true">
+			<swiper-item v-for="(item,index) in backlogPhotoList" :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>
+				</div>
+			</swiper-item>
+		</swiper>
+		<u-form class="form-content" :model="form" ref="uForm" label-width="180">
+			<u-form-item label="门店" prop="storeName">
+				<u-input clearable v-model="form.storeName" disabled placeholder="请选择发起时间区间" @click="openPicker"/>
+			</u-form-item>
+			<u-form-item label="考评指标" prop="clsName">
+				<u-input v-model="form.clsName" placeholder="请输入门店名称" />
+			</u-form-item>
+			<!-- <u-form-item label="处理人" prop="userName">
+				<u-input v-model="form.userName" placeholder="请输入巡店人名称" />
+			</u-form-item>
+			<u-form-item label="抄送" prop="status" label-position="top"> 
+				<view :class="['status-item', item.checked ? 'active' : '']" v-for="item in statusList" :key="item.id" @click="chooseStatus(item)">
+					{{item.dispName}}
+				</view>
+			</u-form-item>
+			<u-form-item label="整改到期日" prop="sourceType" label-position="top">
+				<view :class="['status-item', item.checked ? 'active' : '']" v-for="item in sourceTypeList" :key="item.id" @click="chooseSourceType(item)">
+					{{item.dispName}}
+				</view>
+			</u-form-item> -->
+		</u-form>
+		
+	</view>
+</template>
+
+<script>
+	export default {
+		components: {
+		},
+		data() {
+			return {
+				// 顶部轮播图片
+				backlogPhotoList:[],
+				form: {
+					storeName: '', // 门店
+					clsName: '' ,// 考评指标
+					
+				}
+			}
+		},
+		onLoad(option) {
+			
+		},
+		methods: {
+			
+			
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.back-content {
+		.paizhao {
+			height: 340upx;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			.icon{
+				width: 160upx;
+				height: 160upx;
+				border: 1px solid #eee;
+				display: flex;
+				align-items: center;
+				justify-content: center;
+			}
+		}
+		.top-ad-swiper{
+			height: 340upx;
+		}
+		.swiper-item-imgse{
+			width: 750upx;
+			height: 340upx;
+		}
+	}
+</style>

+ 70 - 5
pages/toDoList/backlogDetail.vue

@@ -10,16 +10,48 @@
 			</swiper-item>
 		</swiper>
 		<view class="back-text">
+			<!-- 门店 -->
 			<view class="text-item">
 				常青二路店
 			</view>
+			<!-- 处理人 -->
 			<view class="text-item">
-				<view>处理人</view>
-				<view>张三丰</view>
-				<view class="">
+				<view>
+					<text>处理人</text>
+					<text class="margin-left ellipsis-one">张三丰</text>
+				</view>
+				<view class="time ">
 					2020-08-07 到期
 				</view>
 			</view>
+			<!-- 创建人 -->
+			<view class="text-item">
+				<view>
+					<text>创建人</text>
+					<text class="margin-left ellipsis-one">张三丰</text>
+				</view>
+				<view class="time">
+					2020-08-07 创建
+				</view>
+			</view>
+			<!-- 指标 -->
+			<view class="text-item">
+				<view>
+					考评指标
+				</view>
+				<view class="margin-left">
+					正常营业
+				</view>
+			</view>
+			<!-- 描述 -->
+			<view class="text-item">
+				<view>
+					描述
+				</view>
+				<view class="margin-left">
+					正常营业
+				</view>
+			</view>
 		</view>
 	</view>
 </template>
@@ -34,10 +66,15 @@
 				imageTopList:[],
 			}
 		},
-		onLoad() {
-			
+		onLoad(option) {
+			console.log(option.id)
+			this.getData(option.id)
 		},
 		methods: {
+			// 获取详情数据
+			getData (id) {
+				
+			}
 			
 		}
 	}
@@ -52,5 +89,33 @@
 			width: 750upx;
 			height: 340upx;
 		}
+		.back-text{
+			background: #ffffff;
+			padding: 10upx 20upx;
+			margin: 20upx;
+			border-radius: 6upx;
+			box-shadow: 1px 1px 3px #EEEEEE;
+			.text-item{
+				display: flex;
+				align-items: center;
+				padding: 20upx 10upx;
+				font-size: 28upx;
+				justify-content: space-between;
+				.margin-left{
+					margin-left: 30upx;
+				}
+				.time{
+					color: #888;
+					font-size: 26upx;
+					margin-left: 10upx;
+				}
+				> view{
+					&:first-child{
+						flex: 1;
+					}
+				}
+			}
+			
+		}
 	}
 </style>

+ 10 - 6
pages/toDoList/toDoList.vue

@@ -41,12 +41,13 @@
 							class="check-order-list" 
 							v-for="(item,index) in list" 
 							:key="item.id"
+							@click="viewRow(item)"
 							>
-								 <view class="check-row" @click="viewRow(item)">
+								 <view class="check-row">
 									 <view class="ellipsis-one">{{item.storeName}}</view>
 									 <view class="createDate">{{item.createDate}}</view>
 								 </view>
-								 <view class="check-row" @click="viewRow(item)">
+								 <view class="check-row">
 									 <view class="ellipsis-one">
 										 {{item.clsName}}
 									</view>
@@ -125,7 +126,8 @@
 						clsName: '正常营业',
 						userName: '张三',
 						sourceType: '视频巡店',
-						status: '待整改'
+						status: '待整改',
+						id: 1
 					},
 					{
 						storeName: '常青二路店',
@@ -133,7 +135,8 @@
 						clsName: '正常营业',
 						userName: '张三',
 						sourceType: '视频巡店',
-						status: '待整改'
+						status: '待整改',
+						id: 2
 					},
 					{
 						storeName: '常青二路店',
@@ -141,7 +144,8 @@
 						clsName: '正常营业',
 						userName: '张三',
 						sourceType: '视频巡店',
-						status: '待整改'
+						status: '待整改',
+						id: 3
 					}
 				],
 				total: 0,
@@ -232,7 +236,7 @@
 			viewRow(item){
 				// 已完成的
 				uni.navigateTo({
-					url: "/pages/workOrder/orderDetails?id="+item.id
+					url: "/pages/toDoList/backlogDetail?id="+item.id
 				})
 			},
 		}

+ 2 - 2
pages/userCenter/personInfo.vue

@@ -24,7 +24,7 @@
 			<view class="content-item">
 				<text>可点检门店</text>
 				<view style="color: #007AFF;" @click="viewStores">
-					12个 <u-icon name="icon-xian-11" custom-prefix="xd-icon" size="28" color="#888888"></u-icon>
+					{{pageData.userStoreList.length}}个 <u-icon name="icon-xian-11" custom-prefix="xd-icon" size="28" color="#888888"></u-icon>
 				</view>
 			</view>
 		</view>
@@ -69,7 +69,7 @@
 				let item = this.pageData.userStoreList
 				if(item.length>0){
 					uni.navigateTo({
-						url: '/pages/userCenter/viewStores?userStoreList='+encodeURIComponent(JSON.stringify(item))
+						url: '/pages/userCenter/viewStores?item='+encodeURIComponent(JSON.stringify(item))
 					})
 				}
 			}

+ 3 - 3
pages/userCenter/viewStores.vue

@@ -1,5 +1,5 @@
 <template>
-	<uni-check-list :listData="list" types="views"></uni-check-list>
+	<uni-check-list :listData="list" titleKeys="storeName" types="views"></uni-check-list>
 </template>
 
 <script>
@@ -10,8 +10,8 @@
 			}
 		},
 		onLoad(options) {
-			console.log(options.userStoreList)
-			this.list = JSON.parse(decodeURIComponent(options.userStoreList))
+			console.log(options.item)
+			this.list = JSON.parse(options.item)
 		},
 		methods: {
 			

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


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


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


+ 8 - 2
unpackage/dist/dev/app-plus/hybrid/html/video.html

@@ -23,7 +23,7 @@
 <body>
 <div class="storeCheck" id="app">
     <!-- 播放器 -->
-    <div class="videoPlay">
+    <div class="videoPlay" v-if="xdType=='video'">
       <!-- 云台控制 -->
       <div class="control-yt" v-show="showYt&&!showYtbtns" @click="openYt"></div>
       <div class="control-yt-close" v-show="showYtbtns" @click="openYt"></div>
@@ -217,7 +217,8 @@
 	var vm = new Vue({
 	  el: '#app',
 	  data: {
-		  player: null,
+		  xdType:'video', // 巡店类型
+		  player: null, // 播放器对象
 		  showYt: false, // 显示云台控制
 		  showYtbtns: false,
 		  showPz: false,// 显示拍照弹框
@@ -245,6 +246,11 @@
 			clearInterval(this.hsID)
 		},
 		methods: {
+		  // 设置类型
+		  setTyps(type){
+			  console.log(type)
+			  this.xdType = type
+		  },
 		  // 初始化播放器
 		  videoInit(){
 			  const _this = this

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