Merge branch 'develop' of http://git.tbd.yanzuoguang.com/panyongping/uni-pdtravel into develop

pages/album/chooseFavorite.vue

@@ -60,7 +60,6 @@ export default {
         openid: uni.getStorageSync('openid'), //openid
         templateIds//模板Id
       }
-      uni.setStorageSync('merchantId', data.merchantId)
       this.$request('wechatUser/pdAlbum/saveVisitorSurvey', data).then(res => {
 			  if (res.code === '00') {
 			    uni.showToast({
@@ -68,7 +67,7 @@ export default {
 			      icon: 'success'
 			    })
           uni.navigateTo({
-            url: './albumIndex?tip=true'
+            url: `./albumIndex?tip=true&merchantId=${data.merchantId}`
           })
 			  }else{
 			    uni.showToast({

pages/album/getPortrait.vue

 <template>
-	<view class="big-box" :style="{'padding-top': statusBarHeight + 'px'}">
+	<view class="big-box" :style="{'padding-top': statusBarHeight + 'px'}" v-if="statusBarHeight">
 		<view class="nav-bar" :style="{'height': navHeight + 'px'}"></view>
 		<text class="title">扫脸获取您的照片</text>
 		<view class="scan">
@@ -57,6 +57,7 @@ export default {
       maskCount: 3,//弹窗倒计时
       queryData: {},//查询参数
       defaultBrightness: 0.5,//屏幕亮度
+      options: {},//路由传参
     }
   },
   methods: {
@@ -135,7 +136,7 @@ export default {
       })
     },
     getQueryField() {//---获取查询参数
-      const merchantId = uni.getStorageSync('merchantId')
+      const merchantId = this.options.merchantId
 			
       this.$request('scenic/albumConfig/getAlbumConfig',{merchantId}).then(res => {//创建任务
 			  if (res.code === '00') {
@@ -228,7 +229,8 @@ export default {
 		  })
     },
   },
-  onLoad() {
+  onLoad(options) {
+    this.options = options
     this.recordDeviceInfo()
     uni.getScreenBrightness({//获取屏幕亮度
       success(res) {

pages/album/myPhotoAlbum/myPhotoAlbum.vue

@@ -9,10 +9,12 @@
 					<image src="../static/album/myPhoto01.png"></image>
 				</view>
 				<u-picker mode="selector" v-model="orderShow" :default-selector="[orderType]" :range="option"	range-key="areaName" @confirm="industrysTypeConfirm($event)" @cancel="cancel"></u-picker>
-				<view v-for="(item,index) in merchantList" :key="index" class="left-project" :class="[projectCheck==0?'left-projectDe':'']" @click="projectClick(index,item.id)">
+				<template v-for="(item,index) in merchantList">
+					<view :key="index" v-if="index<2" class="left-project" :class="[projectCheck==0?'left-projectDe':'']" @click="projectClick(index,item.id)">
 						{{item.name}}
 						<i>{{previewData.length}}</i>
 					</view>
+				</template>
 			</view>
 			<view class="address-right" @click="projectMoreFun()" v-if="merchantList.length>2">
 				<u-icon name="more-dot-fill"></u-icon>
@@ -175,7 +177,7 @@ export default {
     this.openid = uni.getStorageSync('openid') //获取openid
     this.faceIds = JSON.parse(option.faceIds)
     this.location = JSON.parse(uni.getStorageSync('location'))
-    this.merchantId = uni.getStorageSync('merchantId')// 'z0015605022691a5945bbe463141668c'
+    this.merchantId = option.merchantId||''// 'z0015605022691a5945bbe463141668c'
     this.obtainProvince()//获取省市区
     this.inquireMerchant()//查询所有商户
     this.getPhotos()//照片列表
@@ -330,10 +332,11 @@ export default {
         tickets:1,
         productId:this.merchantMessage[0].merchantExtendProjectId,
         orderSource:11,//指定为相册优惠券
+				merchantType:11,//指定为相册
       }
       this.$request('wechatUser/myPage/usableCouponList',data).then((res)=>{
         if(res.code=='00'){
-          if(res.data.masterSlaveCouponList!=undefined){
+          if(res.data.masterSlaveCouponList.length>0){
             res.data.masterSlaveCouponList.forEach(item=>{
 						  item['couponPrice']=item.deductPrice
             })
@@ -463,6 +466,7 @@ export default {
 			overflow-x: auto;
 
 			.left-name {
+				flex-shrink: 0;
 				font-size: 32rpx;
 				color: #999999;
 				line-height: 76rpx;
@@ -470,6 +474,7 @@ export default {
 			}
 
 			.left-picker {
+				flex-shrink:0;
 				display: flex;
 				font-size: 32rpx;
 				color: #333333;

pages/vlog/vlogface/vlogface.vue

@@ -3,7 +3,8 @@
 		<view class="bg">
 			<image src="../static/vlog/icon/camera.png"></image>
 		</view>
-		<camera class="camera" device-position="front" flash="off" @error="error" @initdone="initdone"></camera>
+		<camera class="camera" device-position="front" flash="off" @error="error"></camera>
+		<!-- <camera class="camera" device-position="front" flash="off" @error="error" @initdone="initdone"></camera> -->
 		<view class="surface" v-show="show">
 			<view>请正对镜头</view>
 			<text>{{text}}</text>
@@ -47,6 +48,7 @@ export default {
     }
   },
   onLoad() { //代替 vue 里面的 created
+    this.initdone()
   },
   onReady() { //代替 vue 里面的 mounted
   },