bug修改

pages/addjk/activity.vue

@@ -116,16 +116,26 @@
 			this.myOrderCoupon();
 			this.type=opt.type
 			
-			 var qxnum=uni.getStorageSync("quanxian");
+			 /* var qxnum=uni.getStorageSync("quanxian");
 			 if(qxnum==1){
 				 this.iOSInfo = JSON.parse(JSON.stringify(window.iOSInfo));
 			 }else if(qxnum==2){
 				 window.getAndroid=this.getAndroid;
-			 }
+			 } */
+			 this.getpermission()
 		},
 
 
 		methods: {
+			getpermission(){
+				this.$http('openH5ShopHelpSheetOrder/permission', {
+					 
+					},'POST').then(res => {
+						
+						this.iOSInfo=res.data;
+						
+					})
+			},
 			getAndroid(e){
 				this.iOSInfo=e		
 			},

pages/addjk/activityDetail.vue

@@ -129,12 +129,12 @@
 			
 			this.id=opt.id;
 			this.getDetails()
-			var qxnum=uni.getStorageSync("quanxian");
+			/* var qxnum=uni.getStorageSync("quanxian");
 			if(qxnum==1){
 					 this.iOSInfo = JSON.parse(JSON.stringify(window.iOSInfo));
 			}else if(qxnum==2){
 					window.getAndroid=this.getAndroid;
-			}
+			} */
             /* this.shopckList= uni.getStorageSync("shopckList");
 			this.ckmusic=uni.getStorageSync("ckmusic");
 			if(this.ckmusic){
@@ -154,12 +154,22 @@
 			} */
 			
 			//console.log(this.bgmMusic)
+			this.getpermission()
 			
 		},
 		onUnload(){
 			this.bgmMusic.stop()
 		},
 		methods: {
+			getpermission(){
+				this.$http('openH5ShopHelpSheetOrder/permission', {
+					 
+					},'POST').then(res => {
+						
+						this.iOSInfo=res.data;
+						
+					})
+			},
 			getAndroid(e){
 				this.iOSInfo=e		
 			},

pages/addjk/addActivity.vue

@@ -25,17 +25,27 @@
 		onLoad(opt) {
            this.img=opt.img;
 		    let iOSInfo = JSON.parse(JSON.stringify(window.iOSInfo));
-		     var qxnum=uni.getStorageSync("quanxian");
+		    /* var qxnum=uni.getStorageSync("quanxian");
 		     if(qxnum==1){
 		     	this.iOSInfo = JSON.parse(JSON.stringify(window.iOSInfo));
 		     }else if(qxnum==2){
 				 window.getAndroid=this.getAndroid;
-			 }
+			 } */
+			 this.getpermission()
 		},
 		onShow() {
 			
 		},
 		methods: {
+			getpermission(){
+				this.$http('openH5ShopHelpSheetOrder/permission', {
+					 
+					},'POST').then(res => {
+						
+						this.iOSInfo=res.data;
+						
+					})
+			},
 			getAndroid(e){	
 				this.iOSInfo=e		
 			},

pages/europeOrder/eorderDetail.vue

@@ -314,12 +314,13 @@ export default {
 		this.getData()
 		this.type=opt.type;
 		 this.getOrderTimes();
-		 var qxnum = uni.getStorageSync("quanxian");
+		 /* var qxnum = uni.getStorageSync("quanxian");
 		 if (qxnum == 1) {
 		 	this.iOSInfo = JSON.parse(JSON.stringify(window.iOSInfo));
 		 }else if(qxnum==2){
 		 	 window.getAndroid=this.getAndroid;
-		  }
+		  } */
+		  this.getpermission()
 	},
 	onShow() {
 		if(this.id){
@@ -327,6 +328,15 @@ export default {
 		}
 	},
 	methods: {
+		getpermission(){
+			this.$http('openH5ShopHelpSheetOrder/permission', {
+				 
+				},'POST').then(res => {
+					
+					this.iOSInfo=res.data;
+					
+				})
+		},
 		getAndroid(e){
 			this.iOSInfo=e		
 		},

pages/myOrder/activityOrderDetail.vue

@@ -372,17 +372,26 @@
 			}
 			this.getTuiKuanData()
 			
-			var qxnum = uni.getStorageSync("quanxian");
+			/* var qxnum = uni.getStorageSync("quanxian");
 			if (qxnum == 1) {
 				this.iOSInfo = JSON.parse(JSON.stringify(window.iOSInfo));
 			}else if(qxnum==2){
 				 window.getAndroid=this.getAndroid;
-			 }
-
+			 } */
+           this.getpermission()
 		},
 
 
 		methods: {
+			getpermission(){
+				this.$http('openH5ShopHelpSheetOrder/permission', {
+					 
+					},'POST').then(res => {
+						
+						this.iOSInfo=res.data;
+						
+					})
+			},
 			isShowMaSHow(index){
 				 this.swiperIndex=index
 				 this.isShowMa=true

pages/myOrder/mallOrderDetail.vue

@@ -379,17 +379,27 @@
 			}
 			this.getTuiKuanData()
 
-			var qxnum = uni.getStorageSync("quanxian");
+			/* var qxnum = uni.getStorageSync("quanxian");
 			if (qxnum == 1) {
 				this.iOSInfo = JSON.parse(JSON.stringify(window.iOSInfo));
 			}else if(qxnum==2){
 				 window.getAndroid=this.getAndroid;
-			 }
+			 } */
+			this.getpermission()
 
 		},
 
 
 		methods: {
+			getpermission(){
+				this.$http('openH5ShopHelpSheetOrder/permission', {
+					 
+					},'POST').then(res => {
+						
+						this.iOSInfo=res.data;
+						
+					})
+			},
 			isShowMaSHow(index){
 				this.swiperIndex=index
 				 this.isShowMa=true

pages/myOrder/paintOrderDetail.vue

@@ -358,16 +358,26 @@
 			}
 			this.getTuiKuanData()
 			
-			var qxnum = uni.getStorageSync("quanxian");
+			/* var qxnum = uni.getStorageSync("quanxian");
 			if (qxnum == 1) {
 				this.iOSInfo = JSON.parse(JSON.stringify(window.iOSInfo));
 			}else if(qxnum==2){
 				 window.getAndroid=this.getAndroid;
-			 }
+			 } */
+			  this.getpermission()
 		},
 		
 
 		methods: {
+			getpermission(){
+				this.$http('openH5ShopHelpSheetOrder/permission', {
+					 
+					},'POST').then(res => {
+						
+						this.iOSInfo=res.data;
+						
+					})
+			},
 			isShowMaSHow(index){
 				this.swiperIndex=index
 				 this.isShowMa=true

pages/rescue/rescueOrderDetail.vue

@@ -105,7 +105,7 @@
 			</view>
 			<view class="informationLine">
 				<view class="informationTxt">下单人：</view>
-				<view class="informationNum" >{{orderData.openUser.nickName|| '未知'}} / {{orderData.openShopHelpSheet.mobilePhone}}</view>
+				<view class="informationNum" >{{orderData.openUser.nickName|| '未知'}} / {{orderData.openUser.mobilePhone}}</view>
 			</view>
 			<view class="informationLine" v-if="orderData.openShopHelpSheet.confirmTime">
 				<view class="informationTxt">确认时间：</view>
@@ -119,7 +119,7 @@
 			
 			<view class="informationLine" v-if="orderData.openShopHelpSheet.finishTime">
 				<view class="informationTxt">完成时间：</view>
-				<view class="informationNum" >{{orderData.openShopHelpSheet.finishTime}}/orderData.openShopHelpSheet.finishOperator</view>
+				<view class="informationNum" >{{orderData.openShopHelpSheet.finishTime}}/{{orderData.openShopHelpSheet.finishOperator}}</view>
 			</view>
 			
 			<view class="informationLine" v-if="orderData.openShopHelpSheet.finishComment">
@@ -145,6 +145,8 @@
 			</view>
 		
 		</view>
+		 <!-- <view>iOSInfo</view> 
+		  <view>{{iOSInfo}}</view> -->
 
 		<view style="height: 50rpx;background-color: #F4F5F7;"></view>
 
@@ -155,11 +157,21 @@
 		</view> -->
 		<!-- 待服务 -->
 		<view class="bottom">
-			<view  class="cancel" v-if="orderData.openShopHelpSheet.sheetState == 0||orderData.openShopHelpSheet.sheetState == 1||orderData.openShopHelpSheet.sheetState == 2" @click="cancelBespeak">取消订单</view>
-			<view  class="defer" v-if="orderData.openShopHelpSheet.sheetState == 0||orderData.openShopHelpSheet.sheetState == 1" @click="updateShop">更换门店</view>
-			<view  class="defer" v-if="orderData.openShopHelpSheet.sheetState == 0" @click="confirmOrder">确认</view>
-		    <view  class="defer" v-if="orderData.openShopHelpSheet.sheetState == 1||orderData.openShopHelpSheet.sheetState == 2" @click="completeOrder">完成</view>
-			<view  class="defer" v-if="orderData.openShopHelpSheet.sheetState == 1" @click="goingOrder">出发</view>
+			<view v-if="iOSInfo.indexOf('Q060')!=-1||!iOSInfo">
+				<view  class="cancel" v-if="orderData.openShopHelpSheet.sheetState == 0||orderData.openShopHelpSheet.sheetState == 1||orderData.openShopHelpSheet.sheetState == 2" @click="cancelBespeak">取消订单</view>
+			</view>
+			<view v-if="iOSInfo.indexOf('Q061')!=-1||!iOSInfo">
+			 <view  class="defer" v-if="orderData.openShopHelpSheet.sheetState == 0||orderData.openShopHelpSheet.sheetState == 1" @click="updateShop">更换门店</view>
+			</view>
+			<view v-if="iOSInfo.indexOf('Q057')!=-1||!iOSInfo">
+			 <view  class="defer" v-if="orderData.openShopHelpSheet.sheetState == 0" @click="confirmOrder">确认</view>
+		    </view>
+		    <view v-if="iOSInfo.indexOf('Q059')!=-1||!iOSInfo">
+			  <view  class="defer" v-if="orderData.openShopHelpSheet.sheetState == 1||orderData.openShopHelpSheet.sheetState == 2" @click="completeOrder">完成</view>
+			 </view>
+			 <view v-if="iOSInfo.indexOf('Q058')!=-1||!iOSInfo">
+			   <view  class="defer" v-if="orderData.openShopHelpSheet.sheetState == 1" @click="goingOrder">出发</view>
+		     </view>
 		</view>
 
 
@@ -173,14 +185,12 @@
 					<image @click="completeShow=false" src="../../static/img/icon_close.png" mode="" style="width: 26rpx; height: 26rpx;"></image>
 					
 				</view>
-				
 				<view class="contLine">
 					<view class="contlineRight">
 						<textarea placeholder-style="color:#999999" placeholder="备注" v-model="finishComment"
 								class="contlineRightInput" maxlength="-1" auto-height="true"  />
 					</view>
 				</view>
-				
 				<view class="tuiBtns">
 					<view class="btn" @click="completeShow=false">取消</view>
 					<view class="btn2" @click="complete">确认完成</view>
@@ -221,12 +231,9 @@
 		},
 		data() {
 			return {
-
 				id: '',
 				iStatusBarHeight:'',
-				
 				orderData: '',
-
 				onval: true, // val值变化时自动重新生成二维码
 				loadMake: true, // 组件加载完成后自动生成二维码
 				size: 500,
@@ -271,16 +278,41 @@
 			}
 			//this.getTuiKuanData()
 			this.getShopinfo();
-			var qxnum = uni.getStorageSync("quanxian");
+			/* var qxnum = uni.getStorageSync("quanxian");
 			if (qxnum == 1) {
 				this.iOSInfo = JSON.parse(JSON.stringify(window.iOSInfo));
 			}else if(qxnum==2){
 				 window.getAndroid=this.getAndroid;
-			 }
+			 } */
+			 /* var standalone = window.navigator.standalone
+			 var userAgent = window.navigator.userAgent.toLowerCase()
+			 var safari = /safari/.test(userAgent)
+			 var ios = /iphone|ipod|ipad|mac/.test(userAgent)
+			 var android = /android/.test(userAgent)
+			 if (ios) {
+			 	this.iOSInfo = JSON.parse(JSON.stringify(window.iOSInfo));
+			 } else if (android) {
+				 
+			 	  window.getAndroid=this.getAndroid;
+			 } */
+			 this.getpermission()
 		},
 		
 
 		methods: {
+			getpermission(){
+				this.$http('openH5ShopHelpSheetOrder/permission', {
+					 
+					},'POST').then(res => {
+						
+						this.iOSInfo=res.data;
+						
+					})
+			},
+			getAndroid(e){
+				
+				this.iOSInfo=e		
+			},
 			goMapStart(){
 				var obj={
 					Lat:this.orderData.openShopHelpSheet.startLat,
@@ -494,9 +526,7 @@
 				this.swiperIndex=index
 				 this.isShowMa=true
 			},
-			getAndroid(e){
-				this.iOSInfo=e		
-			},
+			
 			payDone(){
 				var that = this
 				uni.showModal({

pages/wyCar/apply.vue

@@ -10,7 +10,7 @@
 					</image>
 		
 				</view>
-				<view class="zdyNavTitle">网约车优享申请</view>
+				<view class="zdyNavTitle">网约车优享</view>
 				<view style="width: 50px;"></view>
 			</view>
 		</view>
@@ -55,7 +55,7 @@
 					</view>
 				</view>
 				<view class="line">
-					<view class="lineLeft">上传凭证</view>
+					<view class="lineLeft">上传图片</view>
 					<view class="lineImgBOx">
 						<view class="lineimghz" v-for="(item,index) in imgListArr">
 							<img src="../../static/img/del.png" alt="" class="lineimgdel" @click="delimg(index)" >
@@ -255,6 +255,7 @@
 .lineImgBOx{
 	display: flex;
 	flex-wrap: wrap;
+	width: 540rpx;
 }
 .lineimghz{
 	margin-right: 24rpx;
@@ -264,6 +265,7 @@
 .lineimg{
 	width: 150rpx;
 	height: 150rpx;
+	border-radius: 6rpx;
 }
 .lineimgdel{
 	width: 37rpx;
@@ -284,7 +286,7 @@
 	width: 130rpx;
 }
 .lineInput{
-	font-size: 28rpx;
+	font-size: 28rpx;    color: #3c3c3c;
 }
 .top{
 	color: #666666;font-size: 28rpx;

pages/wyCar/index.vue

@@ -10,7 +10,7 @@
 					</image>
 		
 				</view>
-				<view class="zdyNavTitle">网约车优享申请</view>
+				<view class="zdyNavTitle">网约车优享</view>
 				<view style="width: 50px;"></view>
 			</view>
 		</view>
@@ -64,11 +64,11 @@
 			
 		</view>
 		
-		<view class="carBox" @click="goapply">
+	<!-- 	 <view class="carBox" @click="goapply">
 			<image src="../../static/img/wyc.png" mode="" class="wycImg"></image>
 			<view class="carMs">网约车优享申请</view>
-		</view>
-		
+		</view> 
+		 -->
 		<!-- 认证 -->
 		<view class="authentication" @click="rzHide()" v-if="rzShow">
 			<view class="rzBox" @click.stop="">
@@ -105,7 +105,7 @@
 				sourceUserID:'00958045-3341-4AF7-9460-801F5B52E3E2',
 				sourceName:'姜国远',
 				qrcodeSrc: '',
-				qrcodeSize:200,
+				qrcodeSize:250,
 				qrcodeText: '',
 				url:'',
 				token:'',
@@ -129,8 +129,11 @@
 					title: '二维码生成中',
 					mask: true
 				}) 
-			this.qrcodeText=this.url+'/#/pages/wyCar/apply'+'?shopID='+this.shopID+'&shopName='+this.shopName+'&sourceUserID='+this.sourceUserID+'&sourceName='+this.sourceName+'&token='+this.token+'&uid='+this.uid
-			//console.log(this.qrcodeText)
+			this.qrcodeText=this.url+'/#/pages/wyCar/apply'+'?shopID='+this.shopID+'&shopName='+this.shopName+'&sourceUserID='+this.sourceUserID+'&sourceName='+this.sourceName+'&token='+this.token+'&uid='+this.uid+'&v='+Date.now()
+			this.qrcodeText=encodeURI(this.qrcodeText)
+			console.log(this.qrcodeText)
+			
+			
 				uQRCode.make({
 					canvasId: 'qrcode',
 					text: this.qrcodeText,
@@ -138,7 +141,7 @@
 					margin: 10,
 					success: res => {
 						this.qrcodeSrc = res
-						console.log('qrcodeSrc = ' + this.qrcodeSrc);
+						//console.log('qrcodeSrc = ' + this.qrcodeSrc);
 					},
 					complete: () => {
 						uni.hideLoading()
@@ -292,27 +295,29 @@
 	position: fixed;
 	left: 0;
 	bottom: 0;
+	display: flex;
+	    justify-content: center;
 }
 .wxsm{
-	font-weight: 400;font-size: 28rpx;padding-top: 100rpx;
+	font-weight: 400;font-size: 28rpx;padding-top: 80rpx;
 	color: #3C3C3C;text-align: center;
 }
 .wxImgBox{
-	width: 200px;
-	height: 200px;
+	width: 250px;
+	height: 250px;
 	background: #EDEDED;
 	margin: 0 auto;
 	margin-top: 30rpx;
 }
 .rzBox{
 	width: 100vw;
-	height: 60vh;
+	height: 70vh;
 	background: #FFFFFF;
-	margin-top: 40vh;
+	margin-top: 30vh;
 	border-radius: 32rpx 32rpx 0rpx 0rpx;
 }
 .rzTitle{
-	font-weight: 500;font-size: 30rpx;padding-left: 24rpx;
+	font-weight: 600;font-size: 30rpx;padding-left: 24rpx;
 	color: #3C3C3C;padding-top: 30rpx;
 }
 .carBox{
@@ -365,7 +370,8 @@ line-height: 50rpx;
 .lineName{
 	display: flex;justify-content: space-between;
 	padding: 10rpx 20rpx;
-	border-bottom: 1px solid #DDDDDD;
+	border-bottom: 1px solid #EEEEEE;
+	padding-bottom: 16rpx;
 }
 .lineNameBox{
 	font-weight: 500;font-size: 30rpx;
@@ -410,7 +416,7 @@ line-height: 50rpx;
 	display: flex;padding-left: 35rpx;padding-top: 17rpx;color: #FFFFFF;
 }
 .topImg{
-	width: 24rpx;height: 24rpx;margin-left: 8rpx;margin-top: 6rpx;
+	width: 24rpx;height: 24rpx;margin-left: 8rpx;margin-top: 8rpx;
 }
 .topRzBtn{
 	width: 110rpx;font-size: 26rpx;
@@ -418,7 +424,7 @@ line-height: 50rpx;
 	background: #FFFFFF;
 	border-radius: 6rpx;
 	color: #FF8130;
-	margin-top: 10rpx;
+	margin-top: 12rpx;
 	margin-right: 24rpx;
 }
 .searchBox{

pages/wyCar/success.vue

@@ -9,7 +9,7 @@
 					</image>
 		
 				</view>
-				<view class="zdyNavTitle">网约车优享申请</view>
+				<view class="zdyNavTitle">网约车优享</view>
 				<view style="width: 50px;"></view>
 			</view>
 		</view>
@@ -70,8 +70,8 @@
 		padding-top: 60rpx;
 	}
 	.title1{
-		font-weight: 500;padding-top: 18rpx;text-align: center;
-		color: #3C3C3C;font-size: 32rpx;
+		font-weight: 500;padding-top: 20rpx;text-align: center;
+		color: #3C3C3C;font-size: 32rpx;font-weight: 600;
 		line-height: 45rpx;
 	}
 	.title2{

utils/request.js

@@ -1,6 +1,6 @@
 //测试地址
-//const baseUrl = 'http://api.dms.66km.com.cn/'
-const baseUrl = 'http://dms.66km.com.cn/'
+const baseUrl = 'http://api.dms.66km.com.cn/'
+//const baseUrl = 'http://dms.66km.com.cn/'
 //const baseUrl = 'http://192.168.0.146:20187/'
 //const baseUrl = 'http://syadmin.66km.com/'
 //正式地址-66