Browse Source

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

lilei 4 years ago
parent
commit
f46efb9343

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

@@ -15,7 +15,7 @@
 					<u-icon v-if="showArrow && types != 'views'" name="icon-xian-11" custom-prefix="xd-icon" size="28" color="#888888"></u-icon>
 				</view>
 			</view>
-			<view style="padding-top: 10vh;" v-if="list.length==0">
+			<view style="padding-top: 10vh;" v-if="list.length==0 && status!='loading'">
 				<u-empty :text="noDataText" mode="list"></u-empty>
 			</view>
 		</view>
@@ -49,6 +49,11 @@ export default {
 			type: String,
 			default: '暂无数据'
 		},
+		// 是否在加载中
+		status: {
+			type: String,
+			default: 'onmore'
+		},
 		// 是否显示右边箭头
 		showArrow: {
 			type: Boolean,

+ 1 - 0
pages/spotCheck/spotCheck.vue

@@ -173,6 +173,7 @@
 			this.taskId = options.taskId
 			this.storeId = options.storeId
 			this.storeName = options.storeName
+			console.log(options,this.taskId)
 		},
 		onUnload() {
 			uni.$off("closeTour")

+ 5 - 3
pages/spotCheckCenter/spotChecking.vue

@@ -59,8 +59,8 @@ export default {
 		};
 	},
 	onLoad() {
-		// 获取任务状态
-		this.tabList = this.$store.state.vuex_spotCheckStatus
+		// 获取任务状态   对象深度克隆
+		this.tabList = this.$u.deepClone(this.$store.state.vuex_spotCheckStatus)
 		this.tabList.unshift({dispName: '全部', code: ''})
 		// 加载列表
 		this.resetPage();
@@ -159,8 +159,10 @@ export default {
 		},
 		//  开始点检
 		toSpotCheck(item){
+			console.log(item)
+			console.log('/pages/spotCheck/spotCheck?taskId=' + item.id + '&types=video&storeId='+item.storeId+'&storeName='+item.storeName)
 			// 判断当前门店是否已绑定设备
-			findStoreVsDevice({storeCode:item.code}).then(res=>{
+			findStoreVsDevice({storeCode:item.storeCode}).then(res=>{
 				if(res.data.length){
 					// 门店下的设备
 					this.$u.vuex('vuex_storeVideoList',res.data)

+ 9 - 1
pages/toDoList/chooseReceiveUser.vue

@@ -16,6 +16,7 @@
 	:showArrow="false" 
 	:defValue="value" 
 	:types="type" 
+	:status="status"
 	:noDataText="noDataText"
 	backValue="objArr"
 	@ok="chooseOk">
@@ -30,7 +31,8 @@
 				list: [],
 				value: [],
 				noDataText: '暂无抄送人数据',
-				type: ''  // 单选或多选
+				type: '',  // 单选或多选
+				status: 'loading'
 			}
 		},
 		onLoad(opts) {
@@ -38,12 +40,18 @@
 			this.type = opts.type && opts.type || 'checkbox'
 			console.log(this.value)
 			// 查询用户列表
+			this.status = 'loading'
+			uni.showLoading({
+				title: '加载中...'
+			})
 			findUserList({}).then(res=>{
 				if(res.status == 200){
 					this.list = res.data || []
 				} else {
 					this.noDataText = res.message
 				}
+				this.status = 'nomore'
+				uni.hideLoading()
 			})
 		},
 		methods: {

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


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