chenrui %!s(int64=2) %!d(string=hai) anos
pai
achega
97cd216f2e
Modificáronse 2 ficheiros con 16 adicións e 16 borrados
  1. 13 13
      pages/vinAnalyse/fitProductlist.vue
  2. 3 3
      pages/vinAnalyse/shelfAnalyse.vue

+ 13 - 13
pages/vinAnalyse/fitProductlist.vue

@@ -9,7 +9,7 @@
 		</view>
 		<view v-if="list.length > 0">
 			<view class="listBox" v-for="(item, i) in list" :key="i">
-				<view class="listBox_l"><image :src="item.images" width="100%" height="100%"></image></view>
+				<view class="listBox_l"><image :src="item.images ?item.images :`../../static/${theme}/def_img@2x.png`" width="100%" height="100%"></image></view>
 				<view class="listBox_r">
 					<view class="type">{{ item.productCode }}</view>
 					<view class="tit">{{ item.productName }}i</view>
@@ -63,7 +63,7 @@ export default {
 			sortList: [
 				{
 					id: 1,
-					name: '最近次VIN扫描时间降序'
+					name: '最近次VIN扫描时间降序'
 				},
 				{
 					id: 2,
@@ -74,7 +74,7 @@ export default {
 					name: '适配无货降序'
 				}
 			],
-			isSortFlag: -1,
+			isSortFlag: 0,
 			list: [],
 			shelfSn: '',
 			pageNo: 1,
@@ -86,6 +86,7 @@ export default {
 		};
 	},
 	onLoad(options) {
+		this.theme = getApp().globalData.theme
 		this.shelfSn = options.shelfSn;
 		let ajaxData = {
 			pageNo: this.pageNo,
@@ -122,7 +123,7 @@ export default {
 			this.isSortFlag = i;
 		},
 		reset() {
-			this.isSortFlag = -1;
+			this.isSortFlag = 0;
 			let ajaxData = {
 				pageNo: 1,
 				pageSize: this.pageSize,
@@ -131,13 +132,13 @@ export default {
 			this.loadData(ajaxData);
 		},
 		handelSort() {
-			if (this.isSortFlag == -1) {
-				uni.showToast({
-					title: '请选择排序方式',
-					icon: 'none',
-					duration: 4000
-				});
-			} else {
+			// if (this.isSortFlag == -1) {
+			// 	uni.showToast({
+			// 		title: '请选择排序方式',
+			// 		icon: 'none',
+			// 		duration: 4000
+			// 	});
+			// } else {
 				var ajaxData = {
 					shelfSn: this.shelfSn,
 					pageNo: this.pageNo,
@@ -150,11 +151,10 @@ export default {
 				} else {
 					ajaxData.orderBy = 'xvfp.not_stock_count desc,xp.code asc';
 				}
-				this.isSortFlag = -1;
 				this.sortShow=false;
 				this.loadData(ajaxData);
 			}
-		}
+		// }
 	},
 	//到底部加载更多
 	onReachBottom() {

+ 3 - 3
pages/vinAnalyse/shelfAnalyse.vue

@@ -48,7 +48,7 @@
 						</view>
 					</view>
 				</view>
-				<u-empty :src="`/static/${$config('themePath')}/def_no_data@3x.png`" icon-size="150" text="暂无VIN记录" mode="list" :margin-top="260"></u-empty>
+				<u-empty v-if="listData.length == 0 &&status!='loading'" :src="`/static/${$config('themePath')}/def_no_data@3x.png`" icon-size="150" text="暂无VIN记录" mode="list" :margin-top="260"></u-empty>
 				<view style="padding-bottom: 20upx;">
 					<u-loadmore v-if="totalNum>listData.length || status=='loading'" :status="status" />
 				</view>
@@ -57,9 +57,9 @@
 		<!-- 搜索弹窗 -->
 		<search :showModal="showModal" @refresh="refreshList" @close="showModal=false"/>
 		<!-- vin 详情 -->
-		<div class="cpb_cart-mask" v-if="showCart" @click="showCart=false">
+		<div class="cpb_cart-mask" v-if="showCart" @click="showCart=false;selFlag=0">
 			<div class="cpb_cart-box" @click.stop="showCart=true">
-				<div class="cpb_close flex align-center justify_center" @click.stop="showCart=false">
+				<div class="cpb_close flex align-center justify_center" @click.stop="showCart=false;selFlag=0">
 					<u-icon name="close"></u-icon>
 				</div>
 				<div class="cpb_cart-tit">