Merge remote-tracking branch 'remotes/origin/zhoucong' into develop

# Conflicts:
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/vlog/myVlog/myVlog.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/vlog/photoAlbum/photoAlbum.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/vlog/scenicList/scenicList.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/vlog/share/share.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/vlog/vlogIndex/vlogIndex.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/vlog/vlogList/vlogList.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/vlog/vlogface/vlogface.js.map

App.vue

@@ -9,7 +9,7 @@
 			let path=options.path
 			uni.setStorageSync("enterOptions",options)
 			let token=uni.getStorageSync("token")
-			if(!token&&path.indexOf("pages/ourPayment/ourPayment")==-1){//扫码支付页面不需要在此登录
+			if(!token&&path.indexOf("pages/payment/ourPayment/ourPayment")==-1){//扫码支付页面不需要在此登录
 				setTimeout(()=>{//解决关联普通二维码扫码首次进入时一直显示登录中
 					uni.navigateTo({
 						url: "/pages/login/login"

pages.json

@@ -8,7 +8,7 @@
 			}
 		}
 	    ,{
-            "path" : "pages/orderPayment/orderPayment",
+            "path" : "pages/payment/orderPayment/orderPayment",
             "style" :                                                                                    
             {
                 "navigationBarTitleText": "订单支付",
@@ -37,7 +37,7 @@
             
         }
         ,{
-            "path" : "pages/paySuccess/paySuccess",
+            "path" : "pages/payment/paySuccess/paySuccess",
             "style" :                                                                                    
             {
                 "navigationBarTitleText": "支付成功",
@@ -46,7 +46,7 @@
             
         }
         ,{
-            "path" : "pages/ourPayment/ourPayment",
+            "path" : "pages/payment/ourPayment/ourPayment",
             "style" :                                                                                    
             {
                 "navigationBarTitleText": "订单支付",

pages/ourPayment/ourPayment.vue → pages/payment/ourPayment/ourPayment.vue

@@ -140,6 +140,7 @@
 					}
 				],
 				orderId:"",//订单Id
+				companyAttribute:"",//等于5时为出租车
 			}
 		},
 		onLoad(option) {
@@ -306,6 +307,7 @@
 				  uni.hideLoading()
 			    if (res.code=="00"){
 			      this.name = res.data.companyVo.companyName
+				  this.companyAttribute=res.data.companyVo.companyAttribute
 			    } else {
 			        uni.showToast({
 					  title:res.message,
@@ -327,11 +329,11 @@
 			    orderSource:this.orderSource,//订单来源 8扫码支付
 			    openid:this.openid
 			  }
-			  this.$request("wechatUser/myPage/usableCouponList",data).then((res) => {
+			  this.$request("wechatUser/myPage/usableCouponList",data).then((res) =>{
 			    if (res.data.code == "00") {
 			      this.couponData = res.data.data
 			      let masterSlaveCouponList=res.data.data.masterSlaveCouponList
-			      if (masterSlaveCouponList.length>0) {
+			      if (masterSlaveCouponList&&masterSlaveCouponList.length>0) {
 			        masterSlaveCouponList.forEach((item) => { //获取最优券
 			          savedMoneyList.push(item.savedMoney)
 			        })
@@ -449,9 +451,18 @@
 				    signType:this.signType,
 				    paySign:this.paySign,
 				    success: function (res) {
-				        uni.redirectTo({
-				            url:"../paySuccess/paySuccess?orderId="+_this.orderId
+						if(this.companyAttribute==5){//出租车跳转分销组合票页面
+							uni.navigateTo({
+							    url:"/pages/combination/distributionCombiChoose/distributionCombiChoose"
 							})
+						}else{
+							uni.navigateTo({
+							    url:"/pages/paySuccess/paySuccess?orderId="+_this.orderId
+							})
+						}
+				        // uni.redirectTo({
+				        //     url:"../paySuccess/paySuccess?orderId="+_this.orderId
+				        // })
 				    },
 				    fail: function (err) {
 				        uni.showToast({
@@ -467,9 +478,18 @@
 					provider: 'alipay', // 服务提供商 支付宝支付: alipay   微信支付: wxpay
 					orderInfo: this.orderInfo, // 支付宝订单号
 					success: function (res) {
-						uni.redirectTo({
-						    url:"../paySuccess/paySuccess?orderId="+_this.orderId
+						if(this.companyAttribute==5){//出租车跳转分销组合票页面
+							uni.navigateTo({
+							    url:"/pages/combination/distributionCombiChoose/distributionCombiChoose"
 							})
+						}else{
+							uni.navigateTo({
+							    url:"/pages/paySuccess/paySuccess?orderId="+_this.orderId
+							})
+						}
+						// uni.redirectTo({
+						//     url:"../paySuccess/paySuccess?orderId="+_this.orderId
+						// })
 					},
 					fail: function (err) {
 						uni.showToast({

pages/vlog/vlogList/vlogList.vue

@@ -91,8 +91,7 @@
 				let fileName = new Date().valueOf(); //获取时间戳
 				uni.downloadFile({ //下载文件资源到本地
 					url,
-					filePath: wx.env.USER_DATA_PATH + '/' + fileName +
-						'.mp4', //filePath指定文件下载后存储的路径，wx.env.USER_DATA_PATH,时间戳为文件名
+					filePath: wx.env.USER_DATA_PATH + '/' + fileName + '.mp4', //filePath指定文件下载后存储的路径，wx.env.USER_DATA_PATH,时间戳为文件名
 					success: res => { //下载到本地成功
 						let filePath = res.filePath;
 						uni.saveVideoToPhotosAlbum({ //保存视频到系统相册。
@@ -101,8 +100,7 @@
 								//删除本地缓存
 								let fileMgr = uni.getFileSystemManager();
 								fileMgr.unlink({
-									filePath: wx.env.USER_DATA_PATH + '/' + fileName +
-										'.mp4',
+									filePath: wx.env.USER_DATA_PATH + '/' + fileName + '.mp4',
 								})
 								uni.showToast({
 									title: "下载成功",
@@ -111,6 +109,13 @@
 								})
 							},
 							fail: err => {
+								uni.showModal({
+								    title: '提示',
+								    content: err,
+									showCancel:false,
+								});
+								
+								
 								uni.hideLoading();
 								//拒绝授权时显示
 								if (err.errMsg === 'saveVideoToPhotosAlbum:fail auth deny') {
@@ -147,6 +152,12 @@
 						})
 					},
 					fail: err => { //下载失败
+						uni.showModal({
+						    title: '提示',
+						    content: "123"+ err,
+							showCancel:false,
+						});
+					
 						uni.hideLoading();
 						if (err.errMsg == 'downloadFile:fail createDownloadTask:fail url not in domain list') {
 							uni.showToast({

pages/vlog/vlogface/vlogface.vue

@@ -32,7 +32,7 @@
 				<view>不遮挡面部</view>
 			</view>
 		</view>
-		<!-- <u-button type="success" size="medium" @click="takePhoto">开始识别</u-button> -->
+		<u-button type="success" size="medium" @click="takePhoto">开始识别</u-button>
 	</view>
 </template>