边民确认列表点击时间不弹框问题修改

components/mcalendar/mcalendar.vue

@@ -3,7 +3,7 @@
 		<view class="mcalendar">
 			<view class="con">
 				<text class="icon">&#xe621;</text>
-				<input placeholder="选择日期范围" :value="param.data" class="date" :disabled="true" @click="show = true" />
+				<text class="date" :disabled="true" @click="updateShow()">{{param.data}}</text>
 				<text class="icon del" @click="clear()" v-if="param.data">&#xe61a;</text>
 				<text class="label" @click="today()">今天</text>
 			</view>
@@ -25,7 +25,9 @@ export default {
 		return {
 			show: false,
 			minDate: this.util.getDate('lm'),
-			param: {}
+			param: {
+				data: '选择日期范围'
+			}
 		};
 	},
 	watch: {
@@ -35,13 +37,19 @@ export default {
 	},
 	methods: {
 		confirm(e) {
+			console.log('==='+e)
+			console.log('==='+e.length)
 			this.$emit('input', false);
 			this.param.dateBegin = e[0];
-			this.param.dateEnd = e[1];
-			this.param.data = e[0] + ' - ' + e[1];
+			let end = e.length - 1;
+			this.param.dateEnd = e[end];
+			this.param.data = e[0] + ' - ' + e[end];
 			this.show = false;
 			this.$emit('confirm', e);
 		},
+		updateShow() {
+			this.show = true;
+		},
 		today() {
 			this.param.dateBegin = this.util.getDate('day');
 			this.param.dateEnd = this.util.getDate('day');
@@ -52,7 +60,7 @@ export default {
 		clear() {
 			this.param.dateBegin = '';
 			this.param.dateEnd = '';
-			this.param.data = '';
+			this.param.data = '选择日期范围';
 			this.$forceUpdate();
 			this.$emit('clear');
 		}

pages/market/one/confirm/apply.vue

@@ -50,7 +50,8 @@ export default {
 				cooperEntrustStatus: 1,//互助委托申报确认状态
 				//applyConfirmStatus: 0, //进口申报确认状态
 				finishStatus: 0, //订单完成状态
-				resaleStatus: 0 //订单转售状态
+				resaleStatus: 0, //订单转售状态
+				confirmType: 'apply_confirm_time'
 			},
 			list: [],
 			loadMore: true,
@@ -89,7 +90,8 @@ export default {
 		},
 		confirm(e) {
 			this.param.dateBegin = e[0];
-			this.param.dateEnd = e[1];
+			let end = e.length - 1;
+			this.param.dateEnd = e[end];
 			this.show = false;
 			this.refresh();
 		},

pages/market/one/confirm/cooperation.vue

@@ -49,7 +49,8 @@ export default {
 				cooperEntrustStatus: 1,//互助委托申报确认状态
 				// applyConfirmStatus: 0, //进口申报确认状态
 				finishStatus: 0, //订单完成状态
-				resaleStatus: 0 //订单转售状态
+				resaleStatus: 0, //订单转售状态
+				confirmType: 'cooper_entrust_time'
 			},
 			list: [],
 			loadMore: true,
@@ -89,7 +90,8 @@ export default {
 		},
 		confirm(e) {
 			this.param.dateBegin = e[0];
-			this.param.dateEnd = e[1];
+			let end = e.length - 1;
+			this.param.dateEnd = e[end];
 			this.show = false;
 			this.refresh();
 		},

pages/market/one/confirm/people.vue

@@ -50,7 +50,8 @@ export default {
 				// cooperEntrustStatus: 0, //互助委托申报确认状态
 				// applyConfirmStatus: 0, //进口申报确认状态
 				finishStatus: 0, //订单完成状态
-				resaleStatus: 0 //订单转售状态
+				resaleStatus: 0, //订单转售状态
+				confirmType: 'people_confirm_time'
 			},
 			list: [],
 			loadMore: true
@@ -86,7 +87,8 @@ export default {
 		},
 		confirm(e) {
 			this.param.dateBegin = e[0];
-			this.param.dateEnd = e[1];
+			let end = e.length - 1;
+			this.param.dateEnd = e[end];
 			this.show = false;
 			this.refresh();
 		},

pages/shop/detail.vue

@@ -4,7 +4,7 @@
 			<view class="box order_detail">
 				<u-divider text="商铺信息"></u-divider>
 				<view class="item">
-					<text class="label">商铺编号</text>
+					<text class="label">商铺编码</text>
 					<text class="desc">{{item.shopNo}}</text>
 				</view>
 				<view class="item">
@@ -12,10 +12,31 @@
 					<text class="desc">{{item.shopName}}</text>
 				</view>
 				<view class="item">
+					<text class="label">商铺类型</text>
+					<text class="desc" v-if="item.shopType == 1">中方商铺</text>
+					<text class="desc" v-if="item.shopType == 2">外国商铺</text>
+				</view>
+				<view class="item">
 					<text class="label">铺主</text>
 					<text class="desc">{{item.ownerName}}</text>
 				</view>
 				<view class="item">
+					<text class="label">联系方式</text>
+					<text class="desc">{{item.ownerTel}}</text>
+				</view>
+				<view class="item">
+					<text class="label">营业执照</text>
+					<text class="desc">{{item.shopSccd}}</text>
+				</view>
+				<view class="item">
+					<text class="label">开户行</text>
+					<text class="desc">{{item.bank}}</text>
+				</view>
+				<view class="item">
+					<text class="label">开户行账号</text>
+					<text class="desc">{{item.bankAccount}}</text>
+				</view>
+				<view class="item">
 					<text class="label">互市区</text>
 					<text class="desc">{{item.tradeAreaName}}</text>
 				</view>
@@ -24,14 +45,14 @@
 					<text class="desc">{{item.bnsScope}}</text>
 				</view>
 				<view class="item">
-					<text class="label">有效期</text>
-					<text class="desc">{{item.expiry}}</text>
-				</view>
-				<view class="item">
 					<text class="label">店铺地址</text>
 					<text class="desc">{{item.shopAddr}}</text>
 				</view>
 				<view class="item">
+					<text class="label">有效期</text>
+					<text class="desc">{{item.expiry}}</text>
+				</view>
+				<view class="item">
 				</view>
 			</view>
 		</view>
@@ -57,7 +78,7 @@
 			}
 		},
 		methods: {
-			
+
 		}
 	}
 </script>