Browse Source

Merge branch 'dev'

# Conflicts:
#	pages/shop/wp.vue
#	pages/user/historySpend.vue
#	utils/request.js
twt 3 weeks ago
parent
commit
c4507424ce

+ 8 - 3
pages/activity/jkDetail.vue

@@ -93,7 +93,8 @@
 						<view class="signupLineLName" v-if="item.nickName!='null'">{{item.nickName?item.nickName:'微信用户'}}</view>
 						<view class="signupLineLName" v-else>微信用户</view>
 					</view>
-					<view class="signupLineM">{{item.plateNumber?item.plateNumber:''}}</view>
+					<view class="signupLineM" v-if="item.plateNumber">{{item.plateNumber | maskLicensePlate}}</view>
+					<view class="signupLineM" v-else></view>
 					<view class="signupLineR">{{item.signTime}}</view>
 				</view>
 			</view>
@@ -476,7 +477,7 @@
 			this.bgmMusic.stop()
 		},
 		
-		
+	
 		methods: {
 			ptMore(){
 				this.djsMoreShow=true;
@@ -1083,7 +1084,11 @@
 			            const twtxt = `0 : 0 : 0 `
 			            return twtxt;
 			         }
-			    }
+			    },
+				maskLicensePlate(value) {
+							
+				   return value.replace(/(\w{1})(\w{3})(\w{1})/, '$1***$3');
+				}
 			    
 		   },
 		beforeCreate: function () {

+ 12 - 0
pages/index/index.vue

@@ -771,6 +771,18 @@
 							 uni.navigateTo({
 							 	url:'../user/addCar/cailist'
 							 }) 
+					}else if(item.bizType==23){
+						//跳转到其他小程序
+						 uni.navigateToMiniProgram({
+						  appId: item.appletID,
+						  path:  item.appletUrl,
+						  extraData: {
+							
+						  },
+						  success(res) {
+							// 打开成功
+						  }
+						})
 					}
 					
 					

+ 2 - 1
pages/shop/goodsDetail.vue

@@ -5,7 +5,8 @@
 			<swiper-item v-for="(item,index) in info.ImgList">
 				<view class="swiper-item">
 					<img mode="aspectFit" :src="item.url" alt="" class="swiper-itemImg" v-if="item.bizType==1">
-					<video :src="item.url" v-if="item.bizType==2" show-fullscreen-btn controls style="width: 100%;height: 100%;"></video>
+					<!-- <video :loop="false" src="http://dmsphoto.66km.com.cn/marketing/47B0933C-1542-4E77-8A72-FC7F30A877B4.mp4" v-if="item.bizType==2" show-fullscreen-btn controls style="width: 100%;height: 100%;"></video> -->
+					 <video :loop="false" :src="item.url" v-if="item.bizType==2" show-fullscreen-btn controls style="width: 100%;height: 100%;"></video>
 				</view>
 			</swiper-item>
 			

+ 2 - 3
pages/shop/wp.vue

@@ -21,8 +21,7 @@
 	export default {
 		data() {
 			return {
-				//mpWxQr: "https://apidms.66km.com/static/third/jialian.ico",
-				mpWxQr: "https://dmsimg.66km.com/marketing//accompany/4E6F0009-EC54-4387-8DDC-2B7389065B49.png",
+				mpWxQr: "https://apidms.66km.com/static/third/jialian.ico",
 				canvasW: 0,
 				canvasH: 0,
 				invest_areas: [{id: 1, name: "儿童教育"}, {id: 1, name: "大数据"}],
@@ -65,7 +64,7 @@
 			 if(this.avatar.slice(0,5)=='https'){
 				
 			}else{
-			  this.avatar=this.avatar.replace('http','https');
+			   this.avatar=this.avatar.replace('http','https');
 			} 
 			this.time=opt.time
 			

+ 93 - 4
pages/user/reportUni.vue

@@ -143,7 +143,8 @@
 											<view class="kuang"
 												:class="{'report-color-red':item2.ValueType===3,'report-color-yellow':item2.ValueType===2}">
 												{{item2.ValueType===3?'急需处理':item2.ValueType===2?'密切关注':'状态良好'}}</view>
-
+                                             <view class="seeImg " v-if="item2.photoPath" @click="seeImg(item2.photoPath)">查看图片</view>
+										    
 										</view>
 										<view class="contentB">
 											<view class="leftT">备注:</view>
@@ -153,6 +154,7 @@
 											<view class="leftT">说明:</view>
 											<view v-if="item.Describe" class="contentStr">{{item.Describe}}</view>
 										</view>
+										<view class="seeImg2" v-if="item.value[0].photoAllPath" @click="seeImg(item.value[0].photoAllPath)">查看图片</view>
 									</view>
 									<view class="warning-lamp" v-if="item.SectionType===2">
 
@@ -165,23 +167,37 @@
 									</view>
 									<view v-if="item.SectionType===1">
 										<view class="car-report-rv">
-											<img :src="item.SectionPic" style="width: 100%; height: 100%;" alt="图片加载失败">
+											<img v-if="item.SectionPic" :src="item.SectionPic" style="width: 100%; height: 100%;" alt="图片加载失败">
+										   <img v-else src="http://api.dms.66km.com.cn/static/img/huanshi.png" style="width: 100%; height: 100%;" alt="图片加载失败">
 										</view>
 										<view class="car-report-rv-buttom"></view>
 									</view>
+									<view v-if="item.SectionType===2||item.SectionType===1">
+										<view class="seeImg" v-if="item.photoPath.length" @click="seeImg2(item.photoPath)">查看图片</view>
+									</view>
 									<view class="video-button carjcvideo-button" v-if="item.VideoName&&!item.showVideo">
 										<view class="video-play" @click="ckVideo(item)"></view>
 										{{item.VideoName}}
 									</view>
 									<view class="image-list">
-										<view class="image-list-item" v-for="(file,index) in item.photoPath"
+										<!-- <view class="image-list-item" v-for="(file,index) in item.photoPath"
 											:key="file.id">
 											<img mode='aspectFit' :src="file"  @click="sphotos(item.photoPath,index)" class="image-list-item-img"/>
+										</view> -->
+										<view v-if="item.VideoPath.length>0" class="image-list-item " >
+											<view  v-for="(vi,vindex) in item.VideoPath" class="videoLine">
+											<!-- 	<video :src="vi" style="width: 160rpx;height: 160rpx;" ></video> -->
+												<img src="http://dmsphoto.66km.com.cn/thFiles/C8C06AA1-7775-4C23-9454-38C64E004DA8.png" alt="" style="width: 160rpx;height: 160rpx;">
+												<view class="videoLineZz" @click="showVideoFN(vi)"></view>
+											</view>
+											
+											
 										</view>
 									</view>
+									
 
 									<view class="video-wrapper" v-if="item.showVideo">
-										<video :src="item.VideoURL"></video>
+										<video :loop="false" :src="item.VideoURL"></video>
 										<!-- <video-player class="vjs-custom-skin" :options="getPlayerOptions(item.VideoURL)"></video-player> -->
 									</view>
 									<view class="car-report-remarks" v-if="item.SectionType&&item.Comment">
@@ -209,6 +225,11 @@
 				<image src="../../static/timg/icon_guanbi@2x.png" mode="" class="authorizCloseImg"></image>
 			</view>
 		</view>
+		<view class="authorizBox videoZz" v-if="videoUrlShow"  @click="videoUrlShow=false">
+			<view class="videoCont" @click.stop="">
+				<video :src="videoUrl" autoplay></video>
+			</view>
+		</view>
 	</view>
 </template>
 
@@ -229,11 +250,14 @@
 				authorizShow: false,
 				code: '',
 				iStatusBarHeight:'',
+				videoUrl:'',
+				videoUrlShow:false,
 			}
 		},
 		onLoad(opt) {
 			this.iStatusBarHeight = uni.getSystemInfoSync().statusBarHeight;
 			this.id = opt.id;
+			//this.id='C108AADE-9C50-43AE-A152-9A7C6E9BD7F4'//'761BD9FD-B5B4-468D-A136-3DB2AF68A203'
 			this.userInfo = this.$store.state.userInfo;
 			this.ext = this.$common.getExtStoreId();
 			if (this.userInfo) {
@@ -256,6 +280,41 @@
 
 		},
 		methods: {
+			seeImg2(arr){
+				uni.previewImage({
+					urls: arr,
+					//current: index,
+					longPressActions: {
+						itemList: ['发送给朋友', '保存图片', ],
+						success: function(data) {
+						},
+						fail: function(err) {
+						}
+					}
+				});
+			},
+			showVideoFN(url){
+				console.log(url)
+				this.videoUrl=url
+				this.videoUrlShow=true
+			},
+			seeImg(img){
+				console.log(img)
+				var arr=img.split(',')
+				uni.previewImage({
+					urls: arr,
+					//current: index,
+					longPressActions: {
+						itemList: ['发送给朋友', '保存图片', '收藏'],
+						success: function(data) {
+							console.log('选中了第' + (data.tapIndex + 1) + '个按钮,第' + (data.index + 1) + '张图片');
+						},
+						fail: function(err) {
+							console.log(err.errMsg);
+						}
+					}
+				});
+			},
 			sphotos(arr,index){
 				uni.previewImage({
 					urls: arr,
@@ -350,6 +409,9 @@
 							this.$set(item2, 'name', Object.keys(item2)[0])
 							this.$set(item2, 'value', item2[Object.keys(item2)[0]])
 							this.$set(item2, 'showVideo', false)
+							this.$set(item2, 'showVideo2', false)
+							this.$set(item2, 'VideoPath', item2.value[0].VideoPath&& item2.value[
+								0].VideoPath.split(',') || [])
 							this.$set(item2, 'VideoName', item2.value[0].VideoName)
 							this.$set(item2, 'VideoURL', item2.value[0].VideoURL)
 							this.$set(item2, 'photoPath', item2.value[0].photoPath && item2.value[
@@ -358,6 +420,7 @@
 							this.$set(item2, 'Describe', item2.value[0].Describe)
 							this.$set(item2, 'SectionType', item2.value[0].SectionType)
 							this.$set(item2, 'SectionPic', item2.value[0].SectionPic)
+							this.$set(item2, 'photoAllPath', item2.value[0].photoAllPath)
 						})
 					})
 					console.log(data)
@@ -1222,4 +1285,30 @@
 		font-size: 24rpx;
 		color: #999999;
 	}
+	.videoLine{
+		position: relative;
+	}
+	.videoLineZz{
+		width: 160rpx;height: 160rpx;
+		position: absolute;top: 0;left: 0;
+		z-index: 11;
+	}
+	.videoCont{
+		width: 100vw;
+	}
+	.videoCont video{
+		width: 100vw;
+	}
+	.videoZz{
+		display: flex;
+		align-items: center;
+	}
+	.seeImg{
+		padding-left: 20rpx;font-size: 26rpx;
+		color: #1677FF;line-height: 40rpx;
+	}
+	.seeImg2{
+		font-size: 26rpx;
+		color: #1677FF;line-height: 40rpx;
+	}
 </style>

+ 6 - 0
utils/common.js

@@ -103,6 +103,12 @@ function getExtStoreId(type){
 			 "unionId":"9DE2D6D6-D59A-401B-8275-F5DACC99AC22",
 			 "appId":"wx575a8b1339951f27"
 		  } */
+		/*  extConfig={
+		  			 "shopId": "4490D0C9-176B-4C34-BE50-111CA3FA4DC1",
+		  			 "url":"http://apidms.dqcarlink.com/",
+		  			 "unionId":"AE2F2070-2D29-4BDD-978E-0CF419763FCE",
+		  			 "appId":"wx08744a0003d06f3c"
+		  		  } */
 		  
 		console.log(extConfig,'extJson对象');
 		//return extConfig[type];

+ 3 - 4
utils/request.js

@@ -9,9 +9,9 @@ import $store from '../store'
 const extConfig = uni.getExtConfigSync();		
 console.log(extConfig)
 const baseUrl=extConfig.url+'/'
-//const baseUrl='http://192.168.1.12:20187/'
+/* const baseUrl='http://192.168.1.18:20187/' */
 //const baseUrl='http://dms.66km.com.cn/'
-//const baseUrl='http://192.168.1.9:20187/' 
+//const baseUrl='http://apidms.dqcarlink.com/' 
 //const baseUrl='https://store-api.qdbtl.cn/'
 //const baseUrl='https://apidms.66km.com/'
 //京猫虎
@@ -19,8 +19,7 @@ const baseUrl=extConfig.url+'/'
 //	wx2c6f04c0dcd15984正式  wx33053a645546ec31 E37BB296-5A08-4534-859D-B351BA611AF9 EEADACCD-8A19-499D-8AD7-6975D2C93243 
 //测试地址
 //const webUrl = 'http://dms.32che.cn/'
-//汇捷
-//const baseUrl='https://apidms.dqcarlink.com/'
+
 //正式
 const webUrl = 'https://webwx.66km.com/'
 console.log(baseUrl)