Merge branch 'master' of https://git.banshouhui.com/lijundan/self-support

src/components/createCom/XhFiles.vue

@@ -8,7 +8,7 @@
 			</view> -->
 			<view class="pics u-flex u-flex-wrap">
 				<view class="img-list" v-for="(item,index) in imgList" :key="index">
-					<u-image class="pic" width="160" height="160" :src="item.path" :border-radius="10" @click.stop="prviewImage(item.path,index)"></u-image>
+					<u-image class="pic" width="160" height="160" :src="item.path ? item.path : item.src + '?imageView2/1/w/100/h/100/q/75'" :border-radius="10" @click.stop="prviewImage(item.path,index)"></u-image>
 					<view class="icon-del-box" @click.stop="delFile(index)">
 						<view class="icon-del"></view>
 						<view class="icon-del rotate"></view>
@@ -78,7 +78,7 @@
 		mounted() {
 			if(this.value){
 				this.imgList = this.value.map(img =>{
-					return {path: img, src:img}
+					return {src:img}
 				})
 				this.setValue()
 			}
@@ -157,10 +157,10 @@
 				this.$u.api.orderStandardItem(param).then((res)=>{
 					if (res.code == 200 && res.data.length>0) {
 						self.currentItemDate = res.data[0]
-						self.takeStatus = true
 					}else{
 						console.log("获取完工项的拍照标准异常",res.data.message)
 					}
+					self.takeStatus = true
 				})
 			},
 			getWatermark(){

src/components/mine/customer.vue

@@ -55,7 +55,7 @@
 				return process.uniEnv.qn_base_url + this.imageName
 			},
 			imageName() {
-				return this.isMine ? 'minekefutu.png' : 'kefutuzs.png'
+				return this.isMine ? 'kefufuwu-n.png' : 'kefutuzs.png'
 			},
 			isMine() { // exclusive：专属; mine:我的页面客服; pop: 弹窗客服
 				return this.type == 'mine'
@@ -110,8 +110,7 @@
 												if (res.confirm) {
 													uni.openSetting({
 														success(res) {
-															console.log(res
-																.authSetting)
+															console.log(res.authSetting)
 														}
 													});
 												}

src/pages/mine/cert/index.vue

@@ -112,7 +112,7 @@
             },
             toDetail(key) {
                 let data = this.list[key].data;
-                if(!data.isUpload){
+                if(data.status != 1){
                     return;
                 }
                 wx.navigateTo({

src/pages/mine/customer/index.vue

 <template>
 	<view class="cus-wrap">
-		<w-navbar title="联系客服"></w-navbar>
-		<Customer :type="type"></Customer>
+		<w-navbar title="联系客服"></w-navbar>
+		<view class="cus-wrap-content">
+			<Customer :type="type"></Customer>
+		</view>
 	</view>
 </template>
 
@@ -20,7 +22,6 @@
 			if (e && e.type) {
 				this.type = e.type
 			}
-			console.log('aaaaaaa:', e.visible)
 		},
 	}
 </script>
@@ -28,6 +29,10 @@
 <style lang="scss">
 	.cus-wrap {
 		background-color: #F4F5F7;
-		padding: 20rpx 30rpx;
+		padding: 20rpx 30rpx;
+		height: 100vh;
+		.cus-wrap-content {
+			overflow: auto;
+		}
 	}
 </style>

src/pages/order/detail.vue

@@ -223,7 +223,7 @@
 				scenePhoto: false,
 				isErrorSign:false,
 				errorSignUrl:'',
-				isAllowDianhuaAndDaohang : false,
+				isAllowDianhuaAndDaohang : true,
 				appointmentDatetimeRange:'',
 				appointmentDatetime:'',
 				signDistance:3000,