Merge branch 'dev' into atsMaster

pages.json

@@ -1,5 +1,6 @@
 {
 	"pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
+		
 		{
 			"path": "pages/index/index",
 			"style": {

pages/index/rescue.vue

@@ -47,27 +47,27 @@
 				<image src="../../static/img/little_rightArrow.png" mode="" style="width: 30rpx;height: 30rpx;"></image>
 
 			</view> -->
-
-			<view class="shopBox" @click="startBtn">
-				<view class="left">
-					<view class="graypoint"></view>
-					<view class="leftTitle">位置</view>
-					<view class="content">{{currentAddress}}</view>
-				</view>
-				<image src="../../static/img/little_rightArrow.png" mode="" style="width: 30rpx;height: 30rpx;"></image>
-			
-			</view>
-			
-			<view class="shopBox" @click="endBtn" v-if="typeIndex==2">
-				<view class="left">
-					<view class="graypoint"></view>
-					<view class="leftTitle">终点</view>
+
+			<view class="shopBox" @click="startBtn">
+				<view class="left">
+					<view class="graypoint"></view>
+					<view class="leftTitle">位置</view>
+					<view class="content">{{currentAddress}}</view>
+				</view>
+				<image src="../../static/img/little_rightArrow.png" mode="" style="width: 30rpx;height: 30rpx;"></image>
+			
+			</view>
+			
+			<view class="shopBox" @click="endBtn" v-if="typeIndex==2">
+				<view class="left">
+					<view class="graypoint"></view>
+					<view class="leftTitle">终点</view>
 					<view class="content" v-if="endAddress">{{endAddress}}</view>
-					<view class="Nocontent" v-else>请选择</view>
-				</view>
-				<image src="../../static/img/little_rightArrow.png" mode="" style="width: 30rpx;height: 30rpx;"></image>
-			
-			</view>
+					<view class="Nocontent" v-else>请选择</view>
+				</view>
+				<image src="../../static/img/little_rightArrow.png" mode="" style="width: 30rpx;height: 30rpx;"></image>
+			
+			</view>
 			
 		</view>
 
@@ -126,8 +126,8 @@
 				 //  	iconPath: '../../static/img/icon_zhongdian.png'
 				 //   },
 				],
-				tabIndex: 0,
-				tMap:'',
+				tabIndex: 0,
+				tMap:'',
 				mapHeight:200,
 				currentAddress:'',
 				endAddress:'',
@@ -151,7 +151,7 @@
 				helptime:'',
 				setting:'',
 			}
-		},
+		},
 		onLoad() {
 			var that = this;
 			this.userInfo=this.$store.state.userInfo;
@@ -173,13 +173,13 @@
 			const tMap = new QQMapWX({
 				key: 'L2GBZ-CIS6J-HRFFV-K5LO6-QROT7-BQFXZ' //开发者密钥 //这里要换成自己的key
 			});
-			this.tMap=tMap
-			// uni.getSystemInfo({
-			// 	success: (res) => {
-			// 		this.mapHeight = res.windowHeight  *2 - 664 - 120
-			// 	}
+			this.tMap=tMap
+			// uni.getSystemInfo({
+			// 	success: (res) => {
+			// 		this.mapHeight = res.windowHeight  *2 - 664 - 120
+			// 	}
 			// })
-			
+			
 			 uni.getLocation({
 				type: 'gcj02',
 				success: function (res) {
@@ -216,9 +216,9 @@
 						},
 					})
 				}
-			}); 
-			
-		},
+			}); 
+			
+		},
 		
 		methods: {
 			getsetting(){
@@ -638,7 +638,7 @@
 	}
 
 	.contBox {
-		width: 100%;
+		width: 100%;
 		height: 664rpx;
 	}
 
@@ -733,15 +733,15 @@
 	.left {
 		display: flex;
 		align-items: center;
-	}
-	.leftTitle{
-		width: 56rpx;
-		font-size: 28rpx;
-		font-weight: 400;
-		color: #666666;
-		line-height: 40rpx;
-		margin-left: 16rpx;
-		margin-right: 30rpx;
+	}
+	.leftTitle{
+		width: 56rpx;
+		font-size: 28rpx;
+		font-weight: 400;
+		color: #666666;
+		line-height: 40rpx;
+		margin-left: 16rpx;
+		margin-right: 30rpx;
 	}
 
 	.graypoint {
@@ -774,7 +774,7 @@
 	    color: #FFFFFF !important;
   }
 
-	.bottomView {
+	.bottomView {
 		border-top: 1rpx solid #EEEEEE;
 		background-color: #FFFFFF;
 		width: 100%;
@@ -869,4 +869,4 @@
 				margin-top: 62rpx;
 				margin-left:71rpx;
 			}
-</style>
+</style>

pages/index/shopList.vue

@@ -402,7 +402,7 @@
 				this.loading=false;
 				this.$http('opencarOwnerHome/queryShopInfoList', {
 
-					lat: this.location.lat ? this.location.lat : '',
+					lat: this.location.lat ? this.location.lat : '',
 					lng: this.location.lng ? this.location.lng : '',
                     city:this.cityCode,
                     area:this.area
@@ -451,16 +451,16 @@
 				} */
 				
 			}
-		},
-		
-		// 下拉刷新
-		onPullDownRefresh() {
-			
-			this.getqueryShopList()
-			setTimeout(function() {
-				uni.stopPullDownRefresh();
-			}, 1000);
-		},
+		},
+		
+		// 下拉刷新
+		onPullDownRefresh() {
+			
+			this.getqueryShopList()
+			setTimeout(function() {
+				uni.stopPullDownRefresh();
+			}, 1000);
+		},
 		
 	}
 </script>
@@ -514,7 +514,7 @@
 }
 	.box {
 		min-height: 100vh;
-		background-color: #F4F5F7;
+		background-color: #F4F5F7;
 		padding-bottom: 60rpx;
 	}
 	.shopdhBox{
@@ -618,14 +618,14 @@
 	.brandsBg {
 		display: flex;
 		align-items: center;
-		padding: 5rpx 0rpx;
+		padding: 5rpx 0rpx;
 		flex-wrap: wrap;
-		    height: 36rpx;
-		/* 隐藏文字显示 ...不换行 */
-		overflow: hidden;
-		text-overflow: ellipsis;
+		    height: 36rpx;
+		/* 隐藏文字显示 ...不换行 */
+		overflow: hidden;
+		text-overflow: ellipsis;
 		white-space: nowrap;
-	}
+	}
 	
 
 	.brands {
@@ -681,12 +681,12 @@
 	}
 
 	.shopright {
-		padding-left: 20rpx;
+		padding-left: 20rpx;
 		width: 510rpx;
 	}
 
 	.shopName {
-		font-size: 28rpx;
+		font-size: 28rpx;
 		font-weight: bold;
 		color: #333333;
 		line-height: 40rpx;
@@ -749,11 +749,11 @@
 		line-height: 30rpx;
 		padding-top: 10rpx;
 		display: flex;
-		justify-content: space-between;
+		justify-content: space-between;
 		padding-right: 10rpx;
 	}
 
-	.shopaddress {
+	.shopaddress {
 		width: 400rpx;
 		/* 隐藏文字显示 ...不换行 */
 		overflow: hidden;
@@ -826,4 +826,4 @@
 		margin-top: 62rpx;
 		margin-left:71rpx;
 	}
-</style>
+</style>

pages/index/vipCard.vue

@@ -25,13 +25,13 @@
 			</view> 
 
 			<view class="tab">
-				<view>
-					<view class="tabLine" :class="{tabActive:tabIndex==1}" @click="tabClick(1)">计次</view>
-					<view :class="{line:tabIndex==1}"></view>
+				<view>
+					<view class="tabLine" :class="{tabActive:tabIndex==1}" @click="tabClick(1)">计次</view>
+					<view :class="{line:tabIndex==1}"></view>
 				</view>
-				<viw>
-					<view class="tabLine" :class="{tabActive:tabIndex==2}" @click="tabClick(2)">储值</view>
-					<view :class="{line:tabIndex==2}"></view>
+				<viw>
+					<view class="tabLine" :class="{tabActive:tabIndex==2}" @click="tabClick(2)">储值</view>
+					<view :class="{line:tabIndex==2}"></view>
 				</viw>
 			</view>
 		</view> -->
@@ -183,21 +183,21 @@
 			</view>
 
 			<!-- 无数据空白页 -->
-			<!-- nodata v-if="vipData.cardTimeList.length==0"></nodata> -->
-			
-			<!-- 使用条款-->
-			<view class="shiyongBox" v-if="shiyongShow" @click="shiyongShow=false">
-				<view class="shiyongCont" @click.stop="">
-					<view class="shiyongContTop">
-						<view class="shiyongContTopTitle">使用条款</view>
-						<image src="../../static/img/icon_close.png" alt="" class="shiyongContTopX"
-							@click="shiyongShowHlde"></image>
-					</view>
-					<view class="shiyonghtml">
-						<view v-html="useComment" v-if="useComment"></view>
-						<view v-else class="shiyongno">使用条款暂无内容</view>
-					</view>
-				</view>
+			<!-- nodata v-if="vipData.cardTimeList.length==0"></nodata> -->
+			
+			<!-- 使用条款-->
+			<view class="shiyongBox" v-if="shiyongShow" @click="shiyongShow=false">
+				<view class="shiyongCont" @click.stop="">
+					<view class="shiyongContTop">
+						<view class="shiyongContTopTitle">使用条款</view>
+						<image src="../../static/img/icon_close.png" alt="" class="shiyongContTopX"
+							@click="shiyongShowHlde"></image>
+					</view>
+					<view class="shiyonghtml">
+						<view v-html="useComment" v-if="useComment"></view>
+						<view v-else class="shiyongno">使用条款暂无内容</view>
+					</view>
+				</view>
 			</view>
 			
 			<!-- 储值 -->
@@ -273,7 +273,7 @@
 			
 			</view>
 			
-			
+			
 			
 		</view>
 		
@@ -292,22 +292,22 @@
 
 
 			<!-- 无数据空白页 -->
-			<!-- <nodata v-if="vipData.carMoneyList.length==0"></nodata> -->
-			
-			<!-- 使用条款-->
-			<view class="shiyongBox" v-if="shiyongShow" @click="shiyongShow=false">
-				<view class="shiyongCont" @click.stop="">
-					<view class="shiyongContTop">
-						<view class="shiyongContTopTitle">使用条款</view>
-						<image src="../../static/img/icon_close.png" alt="" class="shiyongContTopX"
-							@click="shiyongShowHlde"></image>
-					</view>
-					<view class="shiyonghtml">
-						<view v-html="useComment" v-if="useComment"></view>
-						<view v-else class="shiyongno">使用条款暂无内容</view>
-					</view>
-				</view>
-			</view>
+			<!-- <nodata v-if="vipData.carMoneyList.length==0"></nodata> -->
+			
+			<!-- 使用条款-->
+			<view class="shiyongBox" v-if="shiyongShow" @click="shiyongShow=false">
+				<view class="shiyongCont" @click.stop="">
+					<view class="shiyongContTop">
+						<view class="shiyongContTopTitle">使用条款</view>
+						<image src="../../static/img/icon_close.png" alt="" class="shiyongContTopX"
+							@click="shiyongShowHlde"></image>
+					</view>
+					<view class="shiyonghtml">
+						<view v-html="useComment" v-if="useComment"></view>
+						<view v-else class="shiyongno">使用条款暂无内容</view>
+					</view>
+				</view>
+			</view>
 			
 		</view>
 
@@ -502,16 +502,16 @@
 						}	
 					  })
 			},
-		},
-		
-		// 下拉刷新
-		onPullDownRefresh() {
-			// this.page = 1
-			this.myOrderCoupon()
-			setTimeout(function() {
-				uni.stopPullDownRefresh();
-			}, 1000);
-		},
+		},
+		
+		// 下拉刷新
+		onPullDownRefresh() {
+			// this.page = 1
+			this.myOrderCoupon()
+			setTimeout(function() {
+				uni.stopPullDownRefresh();
+			}, 1000);
+		},
 		
 	}
 </script>
@@ -524,13 +524,13 @@
 	padding-bottom: 20rpx;
 }
 .titleType2{
-	width: 32rpx;height: 32rpx;	color: #FFFFFF;font-size: 24rpx;background: #FF8113;
+	width: 32rpx;height: 32rpx;	color: #FFFFFF;font-size: 24rpx;background: #FF8113;
 border-radius: 4rpx;margin-right: 8rpx;text-align: center;line-height: 32rpx;
 display: inline-block;font-weight: 400;
 }
 .titleType{
 	color: #FFFFFF;font-size: 24rpx;font-weight: 400;height: 32rpx;
-	padding:0px 4rpx;background: #FF8113;line-height: 32rpx;
+	padding:0px 4rpx;background: #FF8113;line-height: 32rpx;
 border-radius: 4rpx;margin-right: 8rpx;
 }
 .discountTypeBox{
@@ -667,17 +667,17 @@ border-radius: 4rpx;margin-right: 8rpx;
 		line-height: 42rpx;
 		color: #3C3C3C;
 		text-align: center;
-	}
-	.line{
-		width: 40rpx;
-		margin: 0rpx 10rpx;
-		height: 4rpx;
-		background: #FF0000;
-		margin-top: 8rpx;
+	}
+	.line{
+		width: 40rpx;
+		margin: 0rpx 10rpx;
+		height: 4rpx;
+		background: #FF0000;
+		margin-top: 8rpx;
 	}
 
 	.tabActive {
-		color: #3C3C3C;
+		color: #3C3C3C;
 		font-weight: bold;
 	
 	}
@@ -806,12 +806,12 @@ border-radius: 4rpx;margin-right: 8rpx;
 		color: #FF0000;
 		line-height: 50rpx;
 	}
-	.moneyBox{
-		flex-grow: 1;
-		display: flex;
-		/* justify-content: flex-end; */
-		margin-right: 10rpx;
-		align-items: center; 
+	.moneyBox{
+		flex-grow: 1;
+		display: flex;
+		/* justify-content: flex-end; */
+		margin-right: 10rpx;
+		align-items: center; 
 	}
 	.count {
 		color: #FF0000;
@@ -849,13 +849,13 @@ border-radius: 4rpx;margin-right: 8rpx;
 		padding: 24rpx;
 		color: #3C3C3C;
 		font-size: 30rpx;
-		border-bottom: 1rpx solid #EEEEEE;
+		border-bottom: 1rpx solid #EEEEEE;
 		align-items: center;
 	}
 
 	.shiyongContTopTitle {
-		font-size: 30rpx;
-		color: #3C3C3C;
+		font-size: 30rpx;
+		color: #3C3C3C;
 		font-weight: bold;
 	}
 
@@ -866,7 +866,7 @@ border-radius: 4rpx;margin-right: 8rpx;
 	}
 
 	.shiyongno {
-		color: #666666;
+		color: #666666;
 		font-size: 26rpx;
 	}
 	.authorizBox{

pages/subPack/rescueOrder.vue

@@ -47,6 +47,17 @@
 
 			<nodata v-show="items==''&&isload"></nodata>
 		</view>
+		<!-- 手机号授权 -->
+			<view class="authorizBox" v-if="authorizShow" @click="authorizShow=false">
+				<view class="authorizCont" @click.stop="">
+					<view class="authorizName">{{wxOpenData.miniAppName}}</view>
+					<view class="authorizMs">您好，欢迎访问本店，授权手机号登录能获取我们最新的促销活动哦~</view>
+					<button class="authorizContbutton" type="default" open-type="getPhoneNumber" @getphonenumber="decryptPhoneNumber">授权</button>
+				</view>
+				<view style="text-align: center;padding-top: 56rpx;">
+					<image src="../../../static/timg/icon_guanbi@2x.png" mode="" class="authorizCloseImg"></image>
+				</view>
+			</view>
 	</view>
 </template>
 
@@ -64,18 +75,65 @@
 				items: [],
 				isload: false,
                 iStatusBarHeight:'',
+				userInfo:'',
+				ext:'',
+				wxOpenData:'',
+				themeColor:'',
+				authorizShow:false,
+				code:'',
 			}
 		},
 		onLoad(opt) {
             this.iStatusBarHeight = uni.getSystemInfoSync().statusBarHeight;
 			this.tabIndex = opt.num;
-			this.getData()
+			this.userInfo=this.$store.state.userInfo;
+			this.ext=this.$common.getExtStoreId();
+			this.themeColor = uni.getStorageSync("themeColor");
+			if(this.userInfo){
+				this.getData()
+			}else{
+				this.$common.automaticlogin().then(val => {
+					this.userInfo=this.$store.state.userInfo;
+					this.wxOpenData=this.$store.state.wxOpenData;
+					this.themeColor = uni.getStorageSync("themeColor");
+					this.getData();
+					if(!this.userInfo){
+						this.authorizShow=true
+					}
+				})
+			}
+			//this.getData()
 		},
 		onShow() {
 			console.log(this.tabIndex)
 			this.getData()
 		},
 		methods: {
+			decryptPhoneNumber: function(e) {
+			  console.log(e);
+			  this.code=e.detail.code
+			  this.wxPhoneLogin()
+			  this.authorizShow=false;
+			},
+			wxPhoneLogin(){
+					 var that=this;
+					 this.$http('miniApp2/sys/wxPhoneLogin', {
+					   appId:this.ext.appId,
+					   unionId:this.ext.unionId,
+					   code:this.code,
+					   openId:this.wxOpenData.openid
+					  },'POST').then(res => {
+						var data = res.data;
+						if(data.loginInfo){
+							this.userInfo=data.loginInfo.openUser;
+							this.wxOpenData=data.loginInfo;
+							this.$store.commit('mutationswxOpenData', data)
+							this.$store.commit('mutationsuserInfo', this.userInfo)
+						    this.getData()
+						}	
+					  })
+			},
+			
 			tabClick(num) {
 				this.tabIndex = num;
 				this.page = 1;
@@ -296,4 +354,90 @@
 		font-size: 24rpx;
 		padding-left: 20rpx;
 	}
+	.authorizBox{
+			width: 100vw;
+			height: 100vh;
+			background: rgba(0, 0, 0, 0.5);
+			position: fixed;
+			top: 0;
+			left: 0;
+		}
+		.authorizCont{
+			margin-top: 30vh;
+			width: 564rpx;
+			height: 408rpx;
+			background: #FFFFFF;
+			border-radius: 24rpx;
+			margin-left: 93rpx;
+			position: relative;
+		}
+		.authorizCloseImg{
+			width: 62rpx;
+			height: 62rpx;
+		}
+		.sqLogoBox{
+			width: 180rpx;
+			height: 180rpx;
+			background: #FFFFFF;
+			border-radius: 90rpx;
+			text-align: center;
+			position: absolute;
+			top: -50rpx;
+			left: 192rpx;
+		}
+		.authorizName{
+			color: #333333;
+			line-height: 42rpx;
+			font-size: 30rpx;
+			text-align: center;
+			padding-top: 58rpx;
+		}
+		.authorizMs{
+			color: #999999;
+			line-height: 36rpx;
+			font-size: 26rpx;
+			width: 452rpx;
+			padding-top: 24rpx;
+			text-align: center;
+			margin-left: 56rpx;
+		}
+		.authorizContbutton{
+			width: 422rpx;
+			height: 88rpx;
+			background: #D53533;
+			border-radius: 44rpx;
+			line-height: 88rpx;
+			text-align: center;
+			font-size:30rpx;
+			color: #FFFFFF;
+			margin-top: 62rpx;
+			margin-left:71rpx;
+		}
+		.shopBoxpt{
+			margin-top: 20rpx;
+		}
+		button::after{
+		 	border: none;
+		}
+		button{
+			position: relative;
+			display: block;
+			margin-left: 0;
+			margin-right: 0;
+			padding-left: 0px;
+			padding-right: 0px;
+			box-sizing: border-box;
+			// font-size: 18px;
+			text-align: center;
+			text-decoration: none;
+			// line-height: 1;
+			line-height: 1.35;
+			// border-radius: 5px;
+			-webkit-tap-highlight-color: transparent;
+			overflow: hidden;
+			color: #000000;
+			background-color: #fff;
+			
+			height: 100%;
+			}
 </style>

pages/user/addCar/addCar.vue

@@ -96,8 +96,8 @@
 					"value": "ids"
 				},
 				vin: '',
-				type:'',
-				themeColor:'',
+				type:'',
+				themeColor:'',
                 title: 'Hello',
                 keyMode:'keyboard',
                 keyTitle:'VIN',
@@ -106,7 +106,7 @@
 		},
 		onLoad(opt) {
 			uni.removeStorageSync('carModelInfo');
-			 this.themeColor = uni.getStorageSync("themeColor");
+			 this.themeColor = uni.getStorageSync("themeColor");
 
 			this.getNowFormatDate();
 
@@ -406,7 +406,7 @@
 					brandLogo: "",
 					buyDate: this.time,
 					guidePrice: "",
-					vIN: this.vin,
+					vIN: this.vin,
 					id:this.carId,
 				};
 				if(this.carModelInfo){
@@ -426,7 +426,7 @@
 						brandLogo: this.carModelInfo.carModelInfo.logo,
 						buyDate: this.time,
 						guidePrice: this.carModelInfo.carModelInfo.guidePrice,
-						vIN: this.vin,
+						vIN: this.vin,
 						id:this.carId,
 					}
 				}

pages/user/bespeakDetail.vue

@@ -109,7 +109,7 @@
 				orderData: '',
 				timedata:'',
 				billDate:'',
-				 themeColor:'',
+				 themeColor:'',
                 iStatusBarHeight:'',
 				stationID:'',
 			}
@@ -117,7 +117,7 @@
 		onLoad(opt) {
 			this.iStatusBarHeight = uni.getSystemInfoSync().statusBarHeight;
 			this.id = opt.id
-			 this.themeColor = uni.getStorageSync("themeColor");
+			 this.themeColor = uni.getStorageSync("themeColor");
 
 			if (this.id) {
 				this.getData()
@@ -529,7 +529,7 @@
 	}
 
 	.informationNum {
-		color: #333333;
+		color: #333333;
 		width: 524rpx;
 	}
 
@@ -790,9 +790,9 @@
 		height: 98rpx;
 		width: 100vw;
 		position: fixed;
-		bottom: 0rpx;
-		padding-bottom: constant(safe-area-inset-bottom);
-		padding-bottom: env(safe-area-inset-bottom);
+		bottom: 0rpx;
+		padding-bottom: constant(safe-area-inset-bottom);
+		padding-bottom: env(safe-area-inset-bottom);
 		
 	}
 	.cancel{

pages/user/myBespeak.vue

@@ -26,7 +26,17 @@
 		<view class="noMore" v-if="noMoreShow && (itemData.length!=0)">没有更多数据</view>
 		<!-- 无数据空白页 -->
 		<nodata v-if="itemData.length==0"></nodata>
-
+        <!-- 手机号授权 -->
+        	<view class="authorizBox" v-if="authorizShow" @click="authorizShow=false">
+        		<view class="authorizCont" @click.stop="">
+        			<view class="authorizName">{{wxOpenData.miniAppName}}</view>
+        			<view class="authorizMs">您好，欢迎访问本店，授权手机号登录能获取我们最新的促销活动哦~</view>
+        			<button class="authorizContbutton" type="default" open-type="getPhoneNumber" @getphonenumber="decryptPhoneNumber">授权</button>
+        		</view>
+        		<view style="text-align: center;padding-top: 56rpx;">
+        			<image src="../../../static/timg/icon_guanbi@2x.png" mode="" class="authorizCloseImg"></image>
+        		</view>
+        	</view>
 	</view>
 </template>
 
@@ -44,18 +54,64 @@
 				itemData: [],
 				noMoreShow: false,
 				iStatusBarHeight:'',
+				userInfo:'',
+				ext:'',
+				wxOpenData:'',
+				themeColor:'',
+				authorizShow:false,
+				code:'',
 			}
 		},
 		onLoad() {
 			this.iStatusBarHeight = uni.getSystemInfoSync().statusBarHeight;
 			this.page = 1
-			this.myOrderCoupon()
+			//this.myOrderCoupon()
+			this.userInfo=this.$store.state.userInfo;
+			this.ext=this.$common.getExtStoreId();
+			this.themeColor = uni.getStorageSync("themeColor");
+			if(this.userInfo){
+				this.myOrderCoupon()
+			}else{
+				this.$common.automaticlogin().then(val => {
+					this.userInfo=this.$store.state.userInfo;
+					this.wxOpenData=this.$store.state.wxOpenData;
+					this.themeColor = uni.getStorageSync("themeColor");
+					this.myOrderCoupon();
+					if(!this.userInfo){
+						this.authorizShow=true
+					}
+				})
+			}
 		},
 		onShow() {
 			this.page = 1
 			this.myOrderCoupon()
 		},
 		methods: {
+			decryptPhoneNumber: function(e) {
+			  console.log(e);
+			  this.code=e.detail.code
+			  this.wxPhoneLogin()
+			  this.authorizShow=false;
+			},
+			wxPhoneLogin(){
+					 var that=this;
+					 this.$http('miniApp2/sys/wxPhoneLogin', {
+					   appId:this.ext.appId,
+					   unionId:this.ext.unionId,
+					   code:this.code,
+					   openId:this.wxOpenData.openid
+					  },'POST').then(res => {
+						var data = res.data;
+						if(data.loginInfo){
+							this.userInfo=data.loginInfo.openUser;
+							this.wxOpenData=data.loginInfo;
+							this.$store.commit('mutationswxOpenData', data)
+							this.$store.commit('mutationsuserInfo', this.userInfo)
+						    this.myOrderCoupon()
+						}	
+					  })
+			},
 			goDetail(id) {
 				uni.navigateTo({
 					url: 'bespeakDetail?id=' + id
@@ -120,7 +176,7 @@
 	}
 </script>
 
-<style>
+<style scoped lang="scss">
 	.box {
 		min-height: 100vh;
 		background-color: #F4F5F7;
@@ -191,4 +247,90 @@
 		color: #999999;
 		font-size: 28rpx;
 	}
+	.authorizBox{
+			width: 100vw;
+			height: 100vh;
+			background: rgba(0, 0, 0, 0.5);
+			position: fixed;
+			top: 0;
+			left: 0;
+		}
+		.authorizCont{
+			margin-top: 30vh;
+			width: 564rpx;
+			height: 408rpx;
+			background: #FFFFFF;
+			border-radius: 24rpx;
+			margin-left: 93rpx;
+			position: relative;
+		}
+		.authorizCloseImg{
+			width: 62rpx;
+			height: 62rpx;
+		}
+		.sqLogoBox{
+			width: 180rpx;
+			height: 180rpx;
+			background: #FFFFFF;
+			border-radius: 90rpx;
+			text-align: center;
+			position: absolute;
+			top: -50rpx;
+			left: 192rpx;
+		}
+		.authorizName{
+			color: #333333;
+			line-height: 42rpx;
+			font-size: 30rpx;
+			text-align: center;
+			padding-top: 58rpx;
+		}
+		.authorizMs{
+			color: #999999;
+			line-height: 36rpx;
+			font-size: 26rpx;
+			width: 452rpx;
+			padding-top: 24rpx;
+			text-align: center;
+			margin-left: 56rpx;
+		}
+		.authorizContbutton{
+			width: 422rpx;
+			height: 88rpx;
+			background: #D53533;
+			border-radius: 44rpx;
+			line-height: 88rpx;
+			text-align: center;
+			font-size:30rpx;
+			color: #FFFFFF;
+			margin-top: 62rpx;
+			margin-left:71rpx;
+		}
+		.shopBoxpt{
+			margin-top: 20rpx;
+		}
+		button::after{
+		 	border: none;
+		}
+		button{
+			position: relative;
+			display: block;
+			margin-left: 0;
+			margin-right: 0;
+			padding-left: 0px;
+			padding-right: 0px;
+			box-sizing: border-box;
+			// font-size: 18px;
+			text-align: center;
+			text-decoration: none;
+			// line-height: 1;
+			line-height: 1.35;
+			// border-radius: 5px;
+			-webkit-tap-highlight-color: transparent;
+			overflow: hidden;
+			color: #000000;
+			background-color: #fff;
+			
+			height: 100%;
+			}
 </style>

pages/user/myOrder/activityOrderDetail.vue

@@ -1,21 +1,21 @@
 <template>
 	<view class="box">
-	
-		<!-- 自定义导航 -->
-	<!-- 	<view class="zdyNavBox">
-			<view class="status_bar" :style="{height: iStatusBarHeight + 'px'}"></view>
-			<view class="zdyNav">
-				<view class="zdyNavLeft">
-					<image src="../../../static/img/nav_icon_back.png" mode="aspectFit" class="backImg" @click="goback"></image>
-					<image src="../../../static/img/nav_icon_home.png" mode="" class="homeImg" @click="gohome"></image>
-				</view>
-				<view class="zdyNavTitle">订单详情</view>
-				<view style="width: 100px;"></view>
-			</view>
-		</view>
-		<view class="status_bar" :style="{height: iStatusBarHeight + 'px'}"></view>
-		<view style="height: 44px;"></view> -->
-		<homenav :iStatusBarHeight="iStatusBarHeight" :title="'订单详情'" :cj="3"></homenav>
+	
+		<!-- 自定义导航 -->
+	<!-- 	<view class="zdyNavBox">
+			<view class="status_bar" :style="{height: iStatusBarHeight + 'px'}"></view>
+			<view class="zdyNav">
+				<view class="zdyNavLeft">
+					<image src="../../../static/img/nav_icon_back.png" mode="aspectFit" class="backImg" @click="goback"></image>
+					<image src="../../../static/img/nav_icon_home.png" mode="" class="homeImg" @click="gohome"></image>
+				</view>
+				<view class="zdyNavTitle">订单详情</view>
+				<view style="width: 100px;"></view>
+			</view>
+		</view>
+		<view class="status_bar" :style="{height: iStatusBarHeight + 'px'}"></view>
+		<view style="height: 44px;"></view> -->
+		<homenav :iStatusBarHeight="iStatusBarHeight" :title="'订单详情'" :cj="3"></homenav>
 		
 		<view class="top" :style="{background:'#'+themeColor}">
 			<view class="orderState">
@@ -100,16 +100,16 @@
 			 </view> -->
 			</view>
 			
-			
-			<view v-if="orderData.openSheetDetail.length>0" v-for="(item,index) in orderData.openSheetDetail" :key="index">
-				<view class="informationLine2">
-					<view class="goodsName">{{item.itemName}}</view>
-					<view class="huodong" @click="goDetail(item.itemId)">
-						<view class="goodsName3">活动详情</view>
-						<image src="../../../static/img/little_rightArrow.png" mode="" style="width: 30rpx;height: 30rpx;"></image>
-					</view>
-				</view>
-				<view class="salePrice"><span class="informationNum">￥</span>{{orderData.data.payType==1? item.salePrice:0}}</view>
+			
+			<view v-if="orderData.openSheetDetail.length>0" v-for="(item,index) in orderData.openSheetDetail" :key="index">
+				<view class="informationLine2">
+					<view class="goodsName">{{item.itemName}}</view>
+					<view class="huodong" @click="goDetail(item.itemId)">
+						<view class="goodsName3">活动详情</view>
+						<image src="../../../static/img/little_rightArrow.png" mode="" style="width: 30rpx;height: 30rpx;"></image>
+					</view>
+				</view>
+				<view class="salePrice"><span class="informationNum">￥</span>{{orderData.data.payType==1? item.salePrice:0}}</view>
 			</view>
 			
 			<view v-if="orderData.data.sheetState != 1 && orderData.data.sheetState != 4&& orderData.data.sheetState != 5" class="line"></view>
@@ -158,28 +158,28 @@
 
 		<!-- 订单信息 -->
 		<view class="information">
-			<view class="detailedTitle">订单信息</view>
-			<view class="informationLine" v-if="orderData.data.plateNumber">
-				<view class="informationTxt">车牌号：</view>
-				<view class="informationNum">{{orderData.data.plateNumber}}</view>
-			</view>
-			
-			<view class="informationLine" v-if="orderData.data.customerName">
-				<view class="informationTxt">联系人：</view>
-				<view class="informationNum">{{orderData.data.customerName}}</view>
-			</view>
-			<view class="informationLine" v-if="orderData.data.mobilePhone">
-				<view class="informationTxt">手机号：</view>
-				<view class="informationNum">{{orderData.data.mobilePhone}}</view>
-			</view>
-			<view class="informationLine" v-if="orderData.data.unit">
-				<view class="informationTxt">单位：</view>
-				<view class="informationNum">{{orderData.data.unit}}</view>
-			</view>
-			<view class="informationLine">
-				<view class="informationTxt">报名时间：</view>
-				<view class="informationNum">{{orderData.data.createTime}}</view>
-			</view>
+			<view class="detailedTitle">订单信息</view>
+			<view class="informationLine" v-if="orderData.data.plateNumber">
+				<view class="informationTxt">车牌号：</view>
+				<view class="informationNum">{{orderData.data.plateNumber}}</view>
+			</view>
+			
+			<view class="informationLine" v-if="orderData.data.customerName">
+				<view class="informationTxt">联系人：</view>
+				<view class="informationNum">{{orderData.data.customerName}}</view>
+			</view>
+			<view class="informationLine" v-if="orderData.data.mobilePhone">
+				<view class="informationTxt">手机号：</view>
+				<view class="informationNum">{{orderData.data.mobilePhone}}</view>
+			</view>
+			<view class="informationLine" v-if="orderData.data.unit">
+				<view class="informationTxt">单位：</view>
+				<view class="informationNum">{{orderData.data.unit}}</view>
+			</view>
+			<view class="informationLine">
+				<view class="informationTxt">报名时间：</view>
+				<view class="informationNum">{{orderData.data.createTime}}</view>
+			</view>
 			
 			<view class="informationLine">
 				<view class="informationTxt">订单单号：</view>
@@ -252,23 +252,23 @@
 					<image @click="isShowMaHide" src="../../../static/img/icon_delete.png" mode=""
 						style="width: 26rpx;height: 26rpx;margin-left: 10rpx;"></image>
 
-				</view>
-				<swiper class="swiper" circular :current='swiperIndex'  :autoplay="false" :indicator-dots="true" indicator-color="#CCCCCC" indicator-active-color="#D53533">
-					<swiper-item v-for="(item,index) in quanMaList">
-						<view class="swiper-item">
-							<view class="maCode">{{item}}</view>
-							<view class="maBoximg">
-								<tki-qrcode cid="qrcode1" ref="qrcode" :val="item" :size="400" :unit="unit"
-									:pdground="pdground" :icon="icon" :iconSize="iconsize" :lv="lv" :onval="onval"
-									:loadMake="loadMake" :usingComponents="true" @result="qrR" />
-							</view>
-						</view>
-					</swiper-item>
-					
-					
+				</view>
+				<swiper class="swiper" circular :current='swiperIndex'  :autoplay="false" :indicator-dots="true" indicator-color="#CCCCCC" indicator-active-color="#D53533">
+					<swiper-item v-for="(item,index) in quanMaList">
+						<view class="swiper-item">
+							<view class="maCode">{{item}}</view>
+							<view class="maBoximg">
+								<tki-qrcode cid="qrcode1" ref="qrcode" :val="item" :size="400" :unit="unit"
+									:pdground="pdground" :icon="icon" :iconSize="iconsize" :lv="lv" :onval="onval"
+									:loadMake="loadMake" :usingComponents="true" @result="qrR" />
+							</view>
+						</view>
+					</swiper-item>
+					
+					
 				</swiper>
-				
-			
+				
+			
 			</view>
 		</view>
 
@@ -378,7 +378,7 @@
 		data() {
 			return {
 
-				id: '',
+				id: '',
 				iStatusBarHeight:'',
 				
 				orderData: '',
@@ -399,9 +399,9 @@
 				iconsize: 40, // 二维码图标大小
 				lv: 3, // 二维码容错级别 ， 一般不用设置，默认就行
 				src: '', // 二维码生成后的图片地址或base64
-				isShowMa: false,
+				isShowMa: false,
 				quanMaList:[],
-				 themeColor:'',
+				 themeColor:'',
                 authorizShow:false,
                 userInfo:'',
                 ext:'',
@@ -443,10 +443,10 @@
 					}
             	})
             }
-			
+			
 			
 
-		},
+		},
 		
 
 		methods: {
@@ -501,7 +501,7 @@
 			},
 			seeTyshowBtn(){
 				this.seeTyshow=true;
-			},
+			},
 			decryptPhoneNumber: function(e) {
 			  console.log(e);
 			  this.code=e.detail.code
@@ -547,13 +547,13 @@
 			},
 			isShowMaHide(){
 				this.isShowMa=false
-			},
-			goDetail(id) {
-				console.log('id--',id);
-				uni.navigateTo({
-					
-					url: '../../activity/jkDetail?id=' + id
-				})
+			},
+			goDetail(id) {
+				console.log('id--',id);
+				uni.navigateTo({
+					
+					url: '../../activity/jkDetail?id=' + id
+				})
 			},
 			pay(){
 				this.$http('openMallOrder/unifiedPay', {
@@ -648,45 +648,45 @@
 
 				})
 			},
-			
-			cancelBespeak(){
-				var that = this
-				uni.showModal({
-				    title: '提示',
-				    content: '是否取消该订单',
-					cancelText:'否',
-					confirmText:'是',
-				    success: function (res) {
-				        if (res.confirm) {
-							
-								uni.showLoading({
-									title: '加载中'
-								})
-								
-								that.$http('openOrderManagement/updateSheetState', {
-							
-									id: that.id,
-							
-								}, 'POST').then(res => {
-									uni.hideLoading();
-									// var list = res.data.Items
-									
-									uni.showToast({
-										title: '取消成功',
-										icon: 'none',
-										duration: 2000
-									});
-									setTimeout(function() {
-										that.getData();
-									}, 1000);
-								})
-							
-				          
-				        } else if (res.cancel) {
-				           
-				        }
-				    }
-				});
+			
+			cancelBespeak(){
+				var that = this
+				uni.showModal({
+				    title: '提示',
+				    content: '是否取消该订单',
+					cancelText:'否',
+					confirmText:'是',
+				    success: function (res) {
+				        if (res.confirm) {
+							
+								uni.showLoading({
+									title: '加载中'
+								})
+								
+								that.$http('openOrderManagement/updateSheetState', {
+							
+									id: that.id,
+							
+								}, 'POST').then(res => {
+									uni.hideLoading();
+									// var list = res.data.Items
+									
+									uni.showToast({
+										title: '取消成功',
+										icon: 'none',
+										duration: 2000
+									});
+									setTimeout(function() {
+										that.getData();
+									}, 1000);
+								})
+							
+				          
+				        } else if (res.cancel) {
+				           
+				        }
+				    }
+				});
 			},
 			
 			map() {
@@ -734,19 +734,19 @@
 				}, 'GET').then(res => {
 					uni.hideLoading();
 					this.orderData = res.data;
-					if (this.quanMaList) {
-						this.quanMaList = [];
-					}
-					let maList = this.orderData.OpenSheetQRCode;
-					if (maList) {
-						maList.forEach(item =>{
-							if (item.writeoffState==1) {
-								this.quanMaList.push(item.qrCode);
-							}
-						})
-					}
-					this.clock()
-					console.log('可用券码--',this.quanMaList);
+					if (this.quanMaList) {
+						this.quanMaList = [];
+					}
+					let maList = this.orderData.OpenSheetQRCode;
+					if (maList) {
+						maList.forEach(item =>{
+							if (item.writeoffState==1) {
+								this.quanMaList.push(item.qrCode);
+							}
+						})
+					}
+					this.clock()
+					console.log('可用券码--',this.quanMaList);
 					
 				})
 			},
@@ -824,14 +824,14 @@
 			  setTimeout(_this.clock, 1000)
 			},
 			goback() {
-				uni.navigateBack({
-				 	delta: 1
+				uni.navigateBack({
+				 	delta: 1
+				})
+			},
+			gohome(){
+				uni.switchTab({
+					url:'../../index/index'
 				})
-			},
-			gohome(){
-				uni.switchTab({
-					url:'../../index/index'
-				})
 			},
 
 		},
@@ -906,12 +906,12 @@
 }
 .grouptkLIne{
 	display: flex;padding: 15rpx 24rpx;
-	justify-content: space-between;font-weight: 400;
-color: #3C3C3C;font-size: 26rpx;line-height: 32rpx;
+	justify-content: space-between;font-weight: 400;
+color: #3C3C3C;font-size: 26rpx;line-height: 32rpx;
 }
 .grouptk .maTitle{
 	 padding-left: 4rpx; 
-	 color: #333333;font-weight: 500;
+	 color: #333333;font-weight: 500;
 }
 .ptCont{
 	width: 702rpx;
@@ -943,10 +943,10 @@ color: #3C3C3C;font-size: 26rpx;line-height: 32rpx;
 	color: #FFFFFF;
 }
 .DiffBNumber{
-	color: #764D49;font-size: 24rpx;text-align: center;padding-top:16rpx;padding-bottom: 30rpx;
+	color: #764D49;font-size: 24rpx;text-align: center;padding-top:16rpx;padding-bottom: 30rpx;
 }
 .ptmobilePhoneLine{
-	display: flex;font-weight: 400;justify-content: center;
+	display: flex;font-weight: 400;justify-content: center;
 color: #764D49;font-size: 26rpx;padding-top:20rpx;
 }
 .vipIcon{
@@ -974,46 +974,46 @@ color: #764D49;font-size: 26rpx;padding-top:20rpx;
 		min-height: 100vh;
 		background: #F4F5F7;
 		padding-bottom: 135rpx;
-	}
-	.zdyNavBox{
-		width: 100vw;
-		background: #FFFFFF;
-		position: fixed;
-		top: 0;
-		left: 0;
-		z-index: 9999999;
-	}
-	.zdyNav{
-		height: 44px;
-		display: flex;
-		justify-content: space-between;
-		
-		align-items: center;
-	}
-	
-	.backImg{
-		width: 44rpx;
-		height: 44rpx;
-		margin-left: 10rpx;
-		margin-right: 20rpx;
-	}
-	.homeImg{
-		width: 44rpx;
-		height: 44rpx;
-		
-	}
-	.zdyNavLeft{
-		display: flex;
-		align-items: center;
-	}
-	.zdyNavTitle{
-		width: 100vw;
-		height: 44px;
-		background: #FFFFFF;
-		text-align: center;
-		font-size: 34rpx;
-		line-height: 44px;
-	}
+	}
+	.zdyNavBox{
+		width: 100vw;
+		background: #FFFFFF;
+		position: fixed;
+		top: 0;
+		left: 0;
+		z-index: 9999999;
+	}
+	.zdyNav{
+		height: 44px;
+		display: flex;
+		justify-content: space-between;
+		
+		align-items: center;
+	}
+	
+	.backImg{
+		width: 44rpx;
+		height: 44rpx;
+		margin-left: 10rpx;
+		margin-right: 20rpx;
+	}
+	.homeImg{
+		width: 44rpx;
+		height: 44rpx;
+		
+	}
+	.zdyNavLeft{
+		display: flex;
+		align-items: center;
+	}
+	.zdyNavTitle{
+		width: 100vw;
+		height: 44px;
+		background: #FFFFFF;
+		text-align: center;
+		font-size: 34rpx;
+		line-height: 44px;
+	}
 	
 
 	.top {
@@ -1150,8 +1150,8 @@ color: #764D49;font-size: 26rpx;padding-top:20rpx;
 	.code {
 		font-size: 26rpx;
 		color: #333333;
-		font-weight: bold;
-		width: 180rpx
+		font-weight: bold;
+		width: 180rpx
 	}
 
 	.old {
@@ -1179,15 +1179,15 @@ color: #764D49;font-size: 26rpx;padding-top:20rpx;
 		border-radius: 4rpx;
 		margin-left: 20rpx;
 	}
-	.quanState2{
-		font-size: 22rpx;
-		color: #999999;
-		padding: 0 10rpx;
-		
-		border: 1rpx solid #DDDDDD;
-		
-		border-radius: 4rpx;
-		margin-left: 20rpx;
+	.quanState2{
+		font-size: 22rpx;
+		color: #999999;
+		padding: 0 10rpx;
+		
+		border: 1rpx solid #DDDDDD;
+		
+		border-radius: 4rpx;
+		margin-left: 20rpx;
 	}
 
 
@@ -1211,13 +1211,13 @@ color: #764D49;font-size: 26rpx;padding-top:20rpx;
 		display: flex;
 		justify-content: space-between;
 		font-size: 26rpx;
-		padding: 20rpx;
-		align-items: center;
+		padding: 20rpx;
+		align-items: center;
 		padding-bottom: 0;
 	}
 
 	.salePrice {
-		    padding-left: 20rpx;
+		    padding-left: 20rpx;
 		    padding-top: 15rpx;
 		font-size: 26rpx;
 		font-weight: 500;
@@ -1252,23 +1252,23 @@ color: #764D49;font-size: 26rpx;padding-top:20rpx;
 	.goodsName {
 		width: 70%;
 		color: #333333;
-		font-size: 26rpx;
+		font-size: 26rpx;
 		
-	}
-	.huodong{
-		display: flex;
-		align-items: center;
-	}
-	.goodsName3{
-		color: #333333;
-		font-size: 26rpx;
-		
-	}
-	.goodsName2{
-		padding: 20rpx 20rpx 15rpx;
-		
-		color: #333333;
-		font-size: 26rpx;
+	}
+	.huodong{
+		display: flex;
+		align-items: center;
+	}
+	.goodsName3{
+		color: #333333;
+		font-size: 26rpx;
+		
+	}
+	.goodsName2{
+		padding: 20rpx 20rpx 15rpx;
+		
+		color: #333333;
+		font-size: 26rpx;
 	}
 
 	.informationNum {
@@ -1285,7 +1285,7 @@ color: #764D49;font-size: 26rpx;padding-top:20rpx;
 		color: #333333;
 		text-align: center;
 		line-height: 33rpx;
-		padding: 0 15rpx;
+		padding: 0 15rpx;
 		margin-left: 20rpx;
 	}
 
@@ -1350,7 +1350,7 @@ color: #764D49;font-size: 26rpx;padding-top:20rpx;
 	}
 
 	.itemTop {
-		padding: 18rpx 20rpx;
+		padding: 18rpx 20rpx;
 		padding-right: 0;
 		background-color: #FFEFD5;
 
@@ -1363,24 +1363,24 @@ color: #764D49;font-size: 26rpx;padding-top:20rpx;
 		width: 104rpx;
 		font-size: 26rpx;
 		color: #333333;
-		margin-right: 20rpx;
+		margin-right: 20rpx;
 		text-align: right;
-	}
+	}
 	
 
-	.leftItem {
-		font-size: 26rpx;
-		color: #333333;
+	.leftItem {
+		font-size: 26rpx;
+		color: #333333;
 		margin-right: 20rpx;
-		flex-grow: 1;
-		/* 隐藏文字显示 ...不换行 */
-		overflow: hidden;
-		text-overflow: ellipsis;
+		flex-grow: 1;
+		/* 隐藏文字显示 ...不换行 */
+		overflow: hidden;
+		text-overflow: ellipsis;
 		white-space: nowrap;
 	}
 
 	.itemContent {
-		padding: 20rpx;
+		padding: 20rpx;
 		padding-right: 0;
 		background-color: #FFFFFF;
 
@@ -1421,17 +1421,17 @@ color: #764D49;font-size: 26rpx;padding-top:20rpx;
 		font-size: 26rpx;
 		text-align: center;
 		padding-left: 100rpx;
-	}
-	.swiper{
-		width: 100%;
-		height: 85%;
-		background: #FFFFFF;
-		
-	}
-	.swiper-item{
-		width: 100%;
-		height: 100%;
-	}
+	}
+	.swiper{
+		width: 100%;
+		height: 85%;
+		background: #FFFFFF;
+		
+	}
+	.swiper-item{
+		width: 100%;
+		height: 100%;
+	}
 	
 	
 	.maCode {
@@ -1440,7 +1440,7 @@ color: #764D49;font-size: 26rpx;padding-top:20rpx;
 		font-weight: 500;
 		color: #333333;
 		line-height: 42rpx;
-		margin-bottom: 40rpx;
+		margin-bottom: 40rpx;
 		text-align: center;
 	}
 
@@ -1536,103 +1536,103 @@ color: #764D49;font-size: 26rpx;padding-top:20rpx;
 			height: 100%;
 			}
 			
-.tuikuanBox {
-		width: 100%;
-		height: 100vh;
-		background: rgba(0, 0, 0, 0.4);
-		position: fixed;
-		left: 0;
-		top: 0;
-		z-index: 999;
-	}
-	
-	.tuikuan {
-		width: 638rpx;
-		height: 664rpx;
-		background: #ffffff;
-		margin: 0 36rpx;
-		margin-top: 50%;
-		border-radius: 24rpx;
-		padding: 30rpx 20rpx;
-	}
-	
-	.tuiTop {
-		display: flex;
-		justify-content: space-between;
-		margin-bottom: 36rpx;
-	}
-	
-	.tuiTitle {
-		width: 56rpx;
-		height: 40rpx;
-		font-size: 28rpx;
-		font-weight: 500;
-		color: #3C3C3C;
-		line-height: 40rpx;
-	
-	}
-	
-	.contLine {
-		display: flex;
-		justify-content: space-between;
-		font-size: 28rpx;
-		padding: 30rpx 0;
-		border-bottom: 1px solid #EEEEEE;
-	}
-	
-	.contlineLeft {
-		color: #666666;
-		line-height: 40rpx;
-		align-items: center;
-	}
-	
-	.star {
-		width: 14rpx;
-		height: 14rpx;
-		padding-bottom: 5rpx;
-	}
-	
-	.carModel {
-		width: 350rpx;
-		text-align: left;
-	}
-	
-	.noColor {
-		color: #CCCCCC;
-	}
-	
-	.carModelRight {
-		display: flex;
-		justify-content: flex-start;
-		align-items: center;
-	}
-	
-	.contlineRight {
-		color: #333333;
-		line-height: 40rpx;
-	
-		width: 400rpx;
-		text-align: right;
-	}
-	
-	.contlineRightInput {
-		color: #333333;
-		text-align: left;
-		font-size: 28rpx;
-		min-height: 182rpx;
-		width: 400rpx;
-	}
-	
-	.contlineRightJt {
-		width: 30rpx;
-		height: 30rpx;
-	
-	}
-	
-	.tuiBtns {
-		display: flex;justify-content: space-around;
-		padding: 40rpx 20rpx 10rpx;
-	
+.tuikuanBox {
+		width: 100%;
+		height: 100vh;
+		background: rgba(0, 0, 0, 0.4);
+		position: fixed;
+		left: 0;
+		top: 0;
+		z-index: 999;
+	}
+	
+	.tuikuan {
+		width: 638rpx;
+		height: 664rpx;
+		background: #ffffff;
+		margin: 0 36rpx;
+		margin-top: 50%;
+		border-radius: 24rpx;
+		padding: 30rpx 20rpx;
+	}
+	
+	.tuiTop {
+		display: flex;
+		justify-content: space-between;
+		margin-bottom: 36rpx;
+	}
+	
+	.tuiTitle {
+		width: 56rpx;
+		height: 40rpx;
+		font-size: 28rpx;
+		font-weight: 500;
+		color: #3C3C3C;
+		line-height: 40rpx;
+	
+	}
+	
+	.contLine {
+		display: flex;
+		justify-content: space-between;
+		font-size: 28rpx;
+		padding: 30rpx 0;
+		border-bottom: 1px solid #EEEEEE;
+	}
+	
+	.contlineLeft {
+		color: #666666;
+		line-height: 40rpx;
+		align-items: center;
+	}
+	
+	.star {
+		width: 14rpx;
+		height: 14rpx;
+		padding-bottom: 5rpx;
+	}
+	
+	.carModel {
+		width: 350rpx;
+		text-align: left;
+	}
+	
+	.noColor {
+		color: #CCCCCC;
+	}
+	
+	.carModelRight {
+		display: flex;
+		justify-content: flex-start;
+		align-items: center;
+	}
+	
+	.contlineRight {
+		color: #333333;
+		line-height: 40rpx;
+	
+		width: 400rpx;
+		text-align: right;
+	}
+	
+	.contlineRightInput {
+		color: #333333;
+		text-align: left;
+		font-size: 28rpx;
+		min-height: 182rpx;
+		width: 400rpx;
+	}
+	
+	.contlineRightJt {
+		width: 30rpx;
+		height: 30rpx;
+	
+	}
+	
+	.tuiBtns {
+		display: flex;justify-content: space-around;
+		padding: 40rpx 20rpx 10rpx;
+	
 	}
 	.btn {
 		width: 250rpx;
@@ -1675,4 +1675,4 @@ color: #764D49;font-size: 26rpx;padding-top:20rpx;
 	.detailedLineBox{
 		padding-bottom: 10rpx;
 	}
-</style>
+</style>

pages/user/myOrder/mallOrderDetail.vue

@@ -1,21 +1,21 @@
 <template>
 	<view class="box">
-	
-		<!-- 自定义导航 -->
-		<!-- <view class="zdyNavBox">
-			<view class="status_bar" :style="{height: iStatusBarHeight + 'px'}"></view>
-			<view class="zdyNav">
-				<view class="zdyNavLeft">
-					<image src="../../../static/img/nav_icon_back.png" mode="aspectFit" class="backImg" @click="goback"></image>
-					<image src="../../../static/img/nav_icon_home.png" mode="" class="homeImg" @click="gohome"></image>
-				</view>
-				<view class="zdyNavTitle">订单详情</view>
-				<view style="width: 100px;"></view>
-			</view>
-		</view>
-		<view class="status_bar" :style="{height: iStatusBarHeight + 'px'}"></view>
-		<view style="height: 44px;"></view> -->
-		<homenav :iStatusBarHeight="iStatusBarHeight" :title="'订单详情'" :cj="3"></homenav>
+	
+		<!-- 自定义导航 -->
+		<!-- <view class="zdyNavBox">
+			<view class="status_bar" :style="{height: iStatusBarHeight + 'px'}"></view>
+			<view class="zdyNav">
+				<view class="zdyNavLeft">
+					<image src="../../../static/img/nav_icon_back.png" mode="aspectFit" class="backImg" @click="goback"></image>
+					<image src="../../../static/img/nav_icon_home.png" mode="" class="homeImg" @click="gohome"></image>
+				</view>
+				<view class="zdyNavTitle">订单详情</view>
+				<view style="width: 100px;"></view>
+			</view>
+		</view>
+		<view class="status_bar" :style="{height: iStatusBarHeight + 'px'}"></view>
+		<view style="height: 44px;"></view> -->
+		<homenav :iStatusBarHeight="iStatusBarHeight" :title="'订单详情'" :cj="3"></homenav>
 		
 		<view class="top" :style="{background:'#'+themeColor}">
 			<view class="orderState">
@@ -60,17 +60,17 @@
 		<!-- 订单内容 -->
 		<view class="information">
 			<view class="detailedTitle">订单内容</view>
-			<view v-if="orderData.openSheetDetail.length>0" v-for="(item,index) in orderData.openSheetDetail" :key="index">
-				
-					<view class="goodsName">{{item.itemName}}</view>
-					<view class="informationLine2">
-						<view class="salePrice"><span
-								class="informationNum">￥</span>{{item.salePrice}}</view>
-						<view class="informationNum" style="color: #999999;">
-							x{{item.itemQty}}</view>
-					</view>
-				
-			</view>
+			<view v-if="orderData.openSheetDetail.length>0" v-for="(item,index) in orderData.openSheetDetail" :key="index">
+				
+					<view class="goodsName">{{item.itemName}}</view>
+					<view class="informationLine2">
+						<view class="salePrice"><span
+								class="informationNum">￥</span>{{item.salePrice}}</view>
+						<view class="informationNum" style="color: #999999;">
+							x{{item.itemQty}}</view>
+					</view>
+				
+			</view>
 			<view v-if="orderData.data.sheetState != 1 && orderData.data.sheetState != 4" class="line"></view>
 			<view v-if="orderData.data.sheetState != 1 && orderData.data.sheetState != 4">
 				<view class="goodsName">
@@ -241,23 +241,23 @@
 					<image @click="isShowMaHide" src="../../../static/img/icon_delete.png" mode=""
 						style="width: 26rpx;height: 26rpx;margin-left: 10rpx;"></image>
 
-				</view>
-				<swiper class="swiper" circular :current='swiperIndex' :autoplay="false" :indicator-dots="true" indicator-color="#CCCCCC" indicator-active-color="#D53533">
-					<swiper-item v-for="(item,index) in quanMaList">
-						<view class="swiper-item">
-							<view class="maCode">{{item}}</view>
-							<view class="maBoximg">
-								<tki-qrcode cid="qrcode1" ref="qrcode" :val="item" :size="400" :unit="unit"
-									:pdground="pdground" :icon="icon" :iconSize="iconsize" :lv="lv" :onval="onval"
-									:loadMake="loadMake" :usingComponents="true" @result="qrR" />
-							</view>
-						</view>
-					</swiper-item>
-					
-					
+				</view>
+				<swiper class="swiper" circular :current='swiperIndex' :autoplay="false" :indicator-dots="true" indicator-color="#CCCCCC" indicator-active-color="#D53533">
+					<swiper-item v-for="(item,index) in quanMaList">
+						<view class="swiper-item">
+							<view class="maCode">{{item}}</view>
+							<view class="maBoximg">
+								<tki-qrcode cid="qrcode1" ref="qrcode" :val="item" :size="400" :unit="unit"
+									:pdground="pdground" :icon="icon" :iconSize="iconsize" :lv="lv" :onval="onval"
+									:loadMake="loadMake" :usingComponents="true" @result="qrR" />
+							</view>
+						</view>
+					</swiper-item>
+					
+					
 				</swiper>
-				
-			
+				
+			
 			</view>
 		</view>
 <!-- 手机号授权 -->
@@ -343,7 +343,7 @@
 		data() {
 			return {
 
-				id: '',
+				id: '',
 				iStatusBarHeight:'',
 				SheetType: '', //SheetType 1 商品2项目3套餐4救援5钣喷6集客
 				orderData: '',
@@ -364,7 +364,7 @@
 				iconsize: 40, // 二维码图标大小
 				lv: 3, // 二维码容错级别 ， 一般不用设置，默认就行
 				src: '', // 二维码生成后的图片地址或base64
-				isShowMa: false,
+				isShowMa: false,
 				quanMaList:[],
 				themeColor:'',
 				authorizShow:false,
@@ -403,10 +403,10 @@
 						this.authorizShow=true
 					}
 				})
-			}
+			}
 			
 
-		},
+		},
 		
 
 		methods: {
@@ -462,7 +462,7 @@
 			},
 			isShowMaHide(){
 				this.isShowMa=false
-			},
+			},
 			decryptPhoneNumber: function(e) {
 			  console.log(e);
 			  this.code=e.detail.code
@@ -595,45 +595,45 @@
 
 
 				})
-			},
-			cancelBespeak(){
-				var that = this
-				uni.showModal({
-				    title: '提示',
-				    content: '是否取消该订单',
-					cancelText:'否',
-					confirmText:'是',
-				    success: function (res) {
-				        if (res.confirm) {
-							
-								uni.showLoading({
-									title: '加载中'
-								})
-								
-								that.$http('openOrderManagement/updateSheetState', {
-							
-									id: that.id,
-							
-								}, 'POST').then(res => {
-									uni.hideLoading();
-									// var list = res.data.Items
-									
-									uni.showToast({
-										title: '取消成功',
-										icon: 'none',
-										duration: 2000
-									});
-									setTimeout(function() {
-										that.getData();
-									}, 1000);
-								})
-							
-				          
-				        } else if (res.cancel) {
-				           
-				        }
-				    }
-				});
+			},
+			cancelBespeak(){
+				var that = this
+				uni.showModal({
+				    title: '提示',
+				    content: '是否取消该订单',
+					cancelText:'否',
+					confirmText:'是',
+				    success: function (res) {
+				        if (res.confirm) {
+							
+								uni.showLoading({
+									title: '加载中'
+								})
+								
+								that.$http('openOrderManagement/updateSheetState', {
+							
+									id: that.id,
+							
+								}, 'POST').then(res => {
+									uni.hideLoading();
+									// var list = res.data.Items
+									
+									uni.showToast({
+										title: '取消成功',
+										icon: 'none',
+										duration: 2000
+									});
+									setTimeout(function() {
+										that.getData();
+									}, 1000);
+								})
+							
+				          
+				        } else if (res.cancel) {
+				           
+				        }
+				    }
+				});
 			},
 			
 			map() {
@@ -681,32 +681,32 @@
 				}, 'GET').then(res => {
 					uni.hideLoading();
 					this.orderData = res.data;
-					if (this.quanMaList) {
-						this.quanMaList = [];
-					}
-					let maList = this.orderData.OpenSheetQRCode;
-					if (maList) {
-						maList.forEach(item =>{
-							if (item.writeoffState==1) {
-								this.quanMaList.push(item.qrCode);
-							}
-						})
-					}
-					
-					console.log('可用券码--',this.quanMaList);
+					if (this.quanMaList) {
+						this.quanMaList = [];
+					}
+					let maList = this.orderData.OpenSheetQRCode;
+					if (maList) {
+						maList.forEach(item =>{
+							if (item.writeoffState==1) {
+								this.quanMaList.push(item.qrCode);
+							}
+						})
+					}
+					
+					console.log('可用券码--',this.quanMaList);
 					
 				})
 			},
 			
 			goback() {
-				uni.navigateBack({
-				 	delta: 1
+				uni.navigateBack({
+				 	delta: 1
+				})
+			},
+			gohome(){
+				uni.switchTab({
+					url:'../../index/index'
 				})
-			},
-			gohome(){
-				uni.switchTab({
-					url:'../../index/index'
-				})
 			},
 
 		},
@@ -726,46 +726,46 @@
 		min-height: 100vh;
 		background: #F4F5F7;
 		padding-bottom: 135rpx;
-	}
-	.zdyNavBox{
-		width: 100vw;
-		background: #FFFFFF;
-		position: fixed;
-		top: 0;
-		left: 0;
-		z-index: 9999999;
-	}
-	.zdyNav{
-		height: 44px;
-		display: flex;
-		justify-content: space-between;
-		
-		align-items: center;
-	}
-	
-	.backImg{
-		width: 44rpx;
-		height: 44rpx;
-		margin-left: 10rpx;
-		margin-right: 20rpx;
-	}
-	.homeImg{
-		width: 44rpx;
-		height: 44rpx;
-		
-	}
-	.zdyNavLeft{
-		display: flex;
-		align-items: center;
-	}
-	.zdyNavTitle{
-		width: 100vw;
-		height: 44px;
-		background: #FFFFFF;
-		text-align: center;
-		font-size: 34rpx;
-		line-height: 44px;
-	}
+	}
+	.zdyNavBox{
+		width: 100vw;
+		background: #FFFFFF;
+		position: fixed;
+		top: 0;
+		left: 0;
+		z-index: 9999999;
+	}
+	.zdyNav{
+		height: 44px;
+		display: flex;
+		justify-content: space-between;
+		
+		align-items: center;
+	}
+	
+	.backImg{
+		width: 44rpx;
+		height: 44rpx;
+		margin-left: 10rpx;
+		margin-right: 20rpx;
+	}
+	.homeImg{
+		width: 44rpx;
+		height: 44rpx;
+		
+	}
+	.zdyNavLeft{
+		display: flex;
+		align-items: center;
+	}
+	.zdyNavTitle{
+		width: 100vw;
+		height: 44px;
+		background: #FFFFFF;
+		text-align: center;
+		font-size: 34rpx;
+		line-height: 44px;
+	}
 	
 
 	.top {
@@ -902,8 +902,8 @@
 	.code {
 		font-size: 26rpx;
 		color: #333333;
-		font-weight: bold;
-		width: 180rpx
+		font-weight: bold;
+		width: 180rpx
 	}
 
 	.old {
@@ -931,15 +931,15 @@
 		border-radius: 4rpx;
 		margin-left: 20rpx;
 	}
-	.quanState2{
-		font-size: 22rpx;
-		color: #999999;
-		padding: 0 10rpx;
-		
-		border: 1rpx solid #DDDDDD;
-		
-		border-radius: 4rpx;
-		margin-left: 20rpx;
+	.quanState2{
+		font-size: 22rpx;
+		color: #999999;
+		padding: 0 10rpx;
+		
+		border: 1rpx solid #DDDDDD;
+		
+		border-radius: 4rpx;
+		margin-left: 20rpx;
 	}
 
 
@@ -1019,7 +1019,7 @@
 		color: #333333;
 		text-align: center;
 		line-height: 33rpx;
-		padding: 0 15rpx;
+		padding: 0 15rpx;
 		margin-left: 20rpx;
 	}
 
@@ -1084,7 +1084,7 @@
 	}
 
 	.itemTop {
-		padding: 18rpx 20rpx;
+		padding: 18rpx 20rpx;
 		padding-right: 0;
 		background-color: #FFEFD5;
 
@@ -1097,24 +1097,24 @@
 		width: 104rpx;
 		font-size: 26rpx;
 		color: #333333;
-		margin-right: 20rpx;
+		margin-right: 20rpx;
 		text-align: right;
-	}
+	}
 	
 
-	.leftItem {
-		font-size: 26rpx;
-		color: #333333;
+	.leftItem {
+		font-size: 26rpx;
+		color: #333333;
 		margin-right: 20rpx;
-		flex-grow: 1;
-		/* 隐藏文字显示 ...不换行 */
-		overflow: hidden;
-		text-overflow: ellipsis;
+		flex-grow: 1;
+		/* 隐藏文字显示 ...不换行 */
+		overflow: hidden;
+		text-overflow: ellipsis;
 		white-space: nowrap;
 	}
 
 	.itemContent {
-		padding: 20rpx;
+		padding: 20rpx;
 		padding-right: 0;
 		background-color: #FFFFFF;
 
@@ -1155,17 +1155,17 @@
 		font-size: 26rpx;
 		text-align: center;
 		padding-left: 100rpx;
-	}
-	.swiper{
-		width: 100%;
-		height: 85%;
-		background: #FFFFFF;
-		
-	}
-	.swiper-item{
-		width: 100%;
-		height: 100%;
-	}
+	}
+	.swiper{
+		width: 100%;
+		height: 85%;
+		background: #FFFFFF;
+		
+	}
+	.swiper-item{
+		width: 100%;
+		height: 100%;
+	}
 	
 	
 	.maCode {
@@ -1174,7 +1174,7 @@
 		font-weight: 500;
 		color: #333333;
 		line-height: 42rpx;
-		margin-bottom: 40rpx;
+		margin-bottom: 40rpx;
 		text-align: center;
 	}
 
@@ -1381,4 +1381,4 @@
 			.detailedLineBox{
 				padding-bottom: 10rpx;
 			}
-</style>
+</style>

pages/user/myOrder/myOrder.vue

@@ -41,6 +41,17 @@
 
 			<nodata v-show="items==''&&isload"></nodata>
 		</view>
+		<!-- 手机号授权 -->
+			<view class="authorizBox" v-if="authorizShow" @click="authorizShow=false">
+				<view class="authorizCont" @click.stop="">
+					<view class="authorizName">{{wxOpenData.miniAppName}}</view>
+					<view class="authorizMs">您好，欢迎访问本店，授权手机号登录能获取我们最新的促销活动哦~</view>
+					<button class="authorizContbutton" type="default" open-type="getPhoneNumber" @getphonenumber="decryptPhoneNumber">授权</button>
+				</view>
+				<view style="text-align: center;padding-top: 56rpx;">
+					<image src="../../../static/timg/icon_guanbi@2x.png" mode="" class="authorizCloseImg"></image>
+				</view>
+			</view>
 	</view>
 </template>
 
@@ -58,13 +69,34 @@
 				items: [],
 				isload: false,
                 iStatusBarHeight:'',
+				userInfo:'',
+				ext:'',
+				wxOpenData:'',
+				themeColor:'',
+				authorizShow:false,
+				code:'',
 			}
 		},
 		onLoad(opt) {
             this.iStatusBarHeight = uni.getSystemInfoSync().statusBarHeight;
 			this.tabIndex = opt.num;
-
-			this.getData()
+            this.userInfo=this.$store.state.userInfo;
+            this.ext=this.$common.getExtStoreId();
+			this.themeColor = uni.getStorageSync("themeColor");
+            if(this.userInfo){
+            	this.getData()
+            }else{
+            	this.$common.automaticlogin().then(val => {
+            		this.userInfo=this.$store.state.userInfo;
+            		this.wxOpenData=this.$store.state.wxOpenData;
+					this.themeColor = uni.getStorageSync("themeColor");
+            		this.getData();
+            		if(!this.userInfo){
+            			this.authorizShow=true
+            		}
+            	})
+            }
+			
 		},
 		onShow() {
 			console.log(this.tabIndex)
@@ -73,7 +105,30 @@
 
 		},
 		methods: {
-
+           decryptPhoneNumber: function(e) {
+             console.log(e);
+             this.code=e.detail.code
+             this.wxPhoneLogin()
+             this.authorizShow=false;
+           },
+           wxPhoneLogin(){
+           		 var that=this;
+           		 this.$http('miniApp2/sys/wxPhoneLogin', {
+           		   appId:this.ext.appId,
+           		   unionId:this.ext.unionId,
+           		   code:this.code,
+           		   openId:this.wxOpenData.openid
+           		  },'POST').then(res => {
+           			var data = res.data;
+           			if(data.loginInfo){
+           				this.userInfo=data.loginInfo.openUser;
+           				this.wxOpenData=data.loginInfo;
+           				this.$store.commit('mutationswxOpenData', data)
+           				this.$store.commit('mutationsuserInfo', this.userInfo)
+           			    this.getData()
+           			}	
+           		  })
+           },
 
 
 			tabClick(num) {
@@ -314,4 +369,90 @@
 		font-size: 24rpx;
 		padding-left: 20rpx;
 	}
+	.authorizBox{
+			width: 100vw;
+			height: 100vh;
+			background: rgba(0, 0, 0, 0.5);
+			position: fixed;
+			top: 0;
+			left: 0;
+		}
+		.authorizCont{
+			margin-top: 30vh;
+			width: 564rpx;
+			height: 408rpx;
+			background: #FFFFFF;
+			border-radius: 24rpx;
+			margin-left: 93rpx;
+			position: relative;
+		}
+		.authorizCloseImg{
+			width: 62rpx;
+			height: 62rpx;
+		}
+		.sqLogoBox{
+			width: 180rpx;
+			height: 180rpx;
+			background: #FFFFFF;
+			border-radius: 90rpx;
+			text-align: center;
+			position: absolute;
+			top: -50rpx;
+			left: 192rpx;
+		}
+		.authorizName{
+			color: #333333;
+			line-height: 42rpx;
+			font-size: 30rpx;
+			text-align: center;
+			padding-top: 58rpx;
+		}
+		.authorizMs{
+			color: #999999;
+			line-height: 36rpx;
+			font-size: 26rpx;
+			width: 452rpx;
+			padding-top: 24rpx;
+			text-align: center;
+			margin-left: 56rpx;
+		}
+		.authorizContbutton{
+			width: 422rpx;
+			height: 88rpx;
+			background: #D53533;
+			border-radius: 44rpx;
+			line-height: 88rpx;
+			text-align: center;
+			font-size:30rpx;
+			color: #FFFFFF;
+			margin-top: 62rpx;
+			margin-left:71rpx;
+		}
+		.shopBoxpt{
+			margin-top: 20rpx;
+		}
+		button::after{
+		 	border: none;
+		}
+		button{
+			position: relative;
+			display: block;
+			margin-left: 0;
+			margin-right: 0;
+			padding-left: 0px;
+			padding-right: 0px;
+			box-sizing: border-box;
+			// font-size: 18px;
+			text-align: center;
+			text-decoration: none;
+			// line-height: 1;
+			line-height: 1.35;
+			// border-radius: 5px;
+			-webkit-tap-highlight-color: transparent;
+			overflow: hidden;
+			color: #000000;
+			background-color: #fff;
+			
+			height: 100%;
+			}
 </style>

pages/user/myOrder/paintOrderDetail.vue

@@ -1,21 +1,21 @@
 <template>
 	<view class="box">
-	
-		<!-- 自定义导航 -->
-		<!-- <view class="zdyNavBox">
-			<view class="status_bar" :style="{height: iStatusBarHeight + 'px'}"></view>
-			<view class="zdyNav">
-				<view class="zdyNavLeft">
-					<image src="../../../static/img/nav_icon_back.png" mode="aspectFit" class="backImg" @click="goback"></image>
-					<image src="../../../static/img/nav_icon_home.png" mode="" class="homeImg" @click="gohome"></image>
-				</view>
-				<view class="zdyNavTitle">订单详情</view>
-				<view style="width: 100px;"></view>
-			</view>
-		</view>
-		<view class="status_bar" :style="{height: iStatusBarHeight + 'px'}"></view>
-		<view style="height: 44px;"></view> -->
-		<homenav :iStatusBarHeight="iStatusBarHeight" :title="'订单详情'" :cj="3"></homenav>
+	
+		<!-- 自定义导航 -->
+		<!-- <view class="zdyNavBox">
+			<view class="status_bar" :style="{height: iStatusBarHeight + 'px'}"></view>
+			<view class="zdyNav">
+				<view class="zdyNavLeft">
+					<image src="../../../static/img/nav_icon_back.png" mode="aspectFit" class="backImg" @click="goback"></image>
+					<image src="../../../static/img/nav_icon_home.png" mode="" class="homeImg" @click="gohome"></image>
+				</view>
+				<view class="zdyNavTitle">订单详情</view>
+				<view style="width: 100px;"></view>
+			</view>
+		</view>
+		<view class="status_bar" :style="{height: iStatusBarHeight + 'px'}"></view>
+		<view style="height: 44px;"></view> -->
+		<homenav :iStatusBarHeight="iStatusBarHeight" :title="'订单详情'" :cj="3"></homenav>
 		
 		<view class="top" :style="{background:'#'+themeColor}">
 			<view class="orderState">
@@ -60,12 +60,12 @@
 		<!-- 订单内容 -->
 		<view class="information">
 			<view class="detailedTitle">订单内容</view>
-			
-			<view v-if="orderData.openSheetDetail.length>0" v-for="(item,index) in orderData.openSheetDetail" :key="index">
-				<view class="informationLine2">
-					<view class="goodsName">{{item.itemName}}</view>
-					<view class="salePrice"><span class="informationNum">￥</span>{{item.salePrice}}</view>
-				</view>
+			
+			<view v-if="orderData.openSheetDetail.length>0" v-for="(item,index) in orderData.openSheetDetail" :key="index">
+				<view class="informationLine2">
+					<view class="goodsName">{{item.itemName}}</view>
+					<view class="salePrice"><span class="informationNum">￥</span>{{item.salePrice}}</view>
+				</view>
 			</view>
 			
 			<view v-if="orderData.data.sheetState != 1 && orderData.data.sheetState != 4" class="line"></view>
@@ -115,28 +115,28 @@
 
 		<!-- 订单信息 -->
 		<view class="information">
-			<view class="detailedTitle">订单信息</view>
-			<view class="informationLine">
-				<view class="informationTxt">车牌号：</view>
-				<view class="informationNum">{{orderData.data.plateNumber}}</view>
-			</view>
-			<view class="informationLine">
-				<view class="informationTxt">车型：</view>
-				<view class="informationNum"  style="width: 480rpx;">{{orderData.data.carModel}}</view>
-			</view>
-			<view class="informationLine">
-				<view class="informationTxt">联系人：</view>
-				<view class="informationNum">{{orderData.data.customerName}}</view>
-			</view>
-			<view class="informationLine">
-				<view class="informationTxt">手机号：</view>
-				<view class="informationNum">{{orderData.data.mobilePhone}}</view>
-			</view>
-			<view class="informationLine">
-				<view class="informationTxt">预约时间：</view>
-				<view class="informationNum">{{orderData.data.hTime}}</view>
-			</view>
-			
+			<view class="detailedTitle">订单信息</view>
+			<view class="informationLine">
+				<view class="informationTxt">车牌号：</view>
+				<view class="informationNum">{{orderData.data.plateNumber}}</view>
+			</view>
+			<view class="informationLine">
+				<view class="informationTxt">车型：</view>
+				<view class="informationNum"  style="width: 480rpx;">{{orderData.data.carModel}}</view>
+			</view>
+			<view class="informationLine">
+				<view class="informationTxt">联系人：</view>
+				<view class="informationNum">{{orderData.data.customerName}}</view>
+			</view>
+			<view class="informationLine">
+				<view class="informationTxt">手机号：</view>
+				<view class="informationNum">{{orderData.data.mobilePhone}}</view>
+			</view>
+			<view class="informationLine">
+				<view class="informationTxt">预约时间：</view>
+				<view class="informationNum">{{orderData.data.hTime}}</view>
+			</view>
+			
 			
 			<view class="informationLine">
 				<view class="informationTxt">订单单号：</view>
@@ -220,23 +220,23 @@
 					<image @click="isShowMaHide" src="../../../static/img/icon_delete.png" mode=""
 						style="width: 26rpx;height: 26rpx;margin-left: 10rpx;"></image>
 
-				</view>
-				<swiper class="swiper" circular :current='swiperIndex' :autoplay="false" :indicator-dots="true" indicator-color="#CCCCCC" indicator-active-color="#D53533">
-					<swiper-item v-for="(item,index) in quanMaList">
-						<view class="swiper-item">
-							<view class="maCode">{{item}}</view>
-							<view class="maBoximg">
-								<tki-qrcode cid="qrcode1" ref="qrcode" :val="item" :size="400" :unit="unit"
-									:pdground="pdground" :icon="icon" :iconSize="iconsize" :lv="lv" :onval="onval"
-									:loadMake="loadMake" :usingComponents="true" @result="qrR" />
-							</view>
-						</view>
-					</swiper-item>
-					
-					
+				</view>
+				<swiper class="swiper" circular :current='swiperIndex' :autoplay="false" :indicator-dots="true" indicator-color="#CCCCCC" indicator-active-color="#D53533">
+					<swiper-item v-for="(item,index) in quanMaList">
+						<view class="swiper-item">
+							<view class="maCode">{{item}}</view>
+							<view class="maBoximg">
+								<tki-qrcode cid="qrcode1" ref="qrcode" :val="item" :size="400" :unit="unit"
+									:pdground="pdground" :icon="icon" :iconSize="iconsize" :lv="lv" :onval="onval"
+									:loadMake="loadMake" :usingComponents="true" @result="qrR" />
+							</view>
+						</view>
+					</swiper-item>
+					
+					
 				</swiper>
-				
-			
+				
+			
 			</view>
 		</view>
 <!-- 手机号授权 -->
@@ -322,7 +322,7 @@
 		data() {
 			return {
 
-				id: '',
+				id: '',
 				iStatusBarHeight:'',
 				
 				orderData: '',
@@ -343,9 +343,9 @@
 				iconsize: 40, // 二维码图标大小
 				lv: 3, // 二维码容错级别 ， 一般不用设置，默认就行
 				src: '', // 二维码生成后的图片地址或base64
-				isShowMa: false,
+				isShowMa: false,
 				quanMaList:[],
-				 themeColor:'',
+				 themeColor:'',
                 authorizShow:false,
                 userInfo:'',
                 ext:'',
@@ -361,7 +361,7 @@
 			 this.iStatusBarHeight = uni.getSystemInfoSync().statusBarHeight;
 			this.id = opt.id
 			
-			 this.themeColor = uni.getStorageSync("themeColor");
+			 this.themeColor = uni.getStorageSync("themeColor");
              this.userInfo=this.$store.state.userInfo;
             this.ext=this.$common.getExtStoreId();
             if(this.userInfo){
@@ -382,10 +382,10 @@
 						this.authorizShow=true
 					}
             	})
-            }
+            }
 			
 
-		},
+		},
 		
 
 		methods: {
@@ -441,7 +441,7 @@
 			},
 			isShowMaHide(){
 				this.isShowMa=false
-			},
+			},
 			decryptPhoneNumber: function(e) {
 			  console.log(e);
 			  this.code=e.detail.code
@@ -573,45 +573,45 @@
 
 
 				})
-			},
-			cancelBespeak(){
-				var that = this
-				uni.showModal({
-				    title: '提示',
-				    content: '是否取消该订单',
-					cancelText:'否',
-					confirmText:'是',
-				    success: function (res) {
-				        if (res.confirm) {
-							
-								uni.showLoading({
-									title: '加载中'
-								})
-								
-								that.$http('openOrderManagement/updateSheetState', {
-							
-									id: that.id,
-							
-								}, 'POST').then(res => {
-									uni.hideLoading();
-									// var list = res.data.Items
-									
-									uni.showToast({
-										title: '取消成功',
-										icon: 'none',
-										duration: 2000
-									});
-									setTimeout(function() {
-										that.getData();
-									}, 1000);
-								})
-							
-				          
-				        } else if (res.cancel) {
-				           
-				        }
-				    }
-				});
+			},
+			cancelBespeak(){
+				var that = this
+				uni.showModal({
+				    title: '提示',
+				    content: '是否取消该订单',
+					cancelText:'否',
+					confirmText:'是',
+				    success: function (res) {
+				        if (res.confirm) {
+							
+								uni.showLoading({
+									title: '加载中'
+								})
+								
+								that.$http('openOrderManagement/updateSheetState', {
+							
+									id: that.id,
+							
+								}, 'POST').then(res => {
+									uni.hideLoading();
+									// var list = res.data.Items
+									
+									uni.showToast({
+										title: '取消成功',
+										icon: 'none',
+										duration: 2000
+									});
+									setTimeout(function() {
+										that.getData();
+									}, 1000);
+								})
+							
+				          
+				        } else if (res.cancel) {
+				           
+				        }
+				    }
+				});
 			},
 			
 			map() {
@@ -659,32 +659,32 @@
 				}, 'GET').then(res => {
 					uni.hideLoading();
 					this.orderData = res.data;
-					if (this.quanMaList) {
-						this.quanMaList = [];
-					}
-					let maList = this.orderData.OpenSheetQRCode;
-					if (maList) {
-						maList.forEach(item =>{
-							if (item.writeoffState==1) {
-								this.quanMaList.push(item.qrCode);
-							}
-						})
-					}
-					
-					console.log('可用券码--',this.quanMaList);
+					if (this.quanMaList) {
+						this.quanMaList = [];
+					}
+					let maList = this.orderData.OpenSheetQRCode;
+					if (maList) {
+						maList.forEach(item =>{
+							if (item.writeoffState==1) {
+								this.quanMaList.push(item.qrCode);
+							}
+						})
+					}
+					
+					console.log('可用券码--',this.quanMaList);
 					
 				})
 			},
 			
 			goback() {
-				uni.navigateBack({
-				 	delta: 1
+				uni.navigateBack({
+				 	delta: 1
+				})
+			},
+			gohome(){
+				uni.switchTab({
+					url:'../../index/index'
 				})
-			},
-			gohome(){
-				uni.switchTab({
-					url:'../../index/index'
-				})
 			},
 
 		},
@@ -704,46 +704,46 @@
 		min-height: 100vh;
 		background: #F4F5F7;
 		padding-bottom: 135rpx;
-	}
-	.zdyNavBox{
-		width: 100vw;
-		background: #FFFFFF;
-		position: fixed;
-		top: 0;
-		left: 0;
-		z-index: 9999999;
-	}
-	.zdyNav{
-		height: 44px;
-		display: flex;
-		justify-content: space-between;
-		
-		align-items: center;
-	}
-	
-	.backImg{
-		width: 44rpx;
-		height: 44rpx;
-		margin-left: 10rpx;
-		margin-right: 20rpx;
-	}
-	.homeImg{
-		width: 44rpx;
-		height: 44rpx;
-		
-	}
-	.zdyNavLeft{
-		display: flex;
-		align-items: center;
-	}
-	.zdyNavTitle{
-		width: 100vw;
-		height: 44px;
-		background: #FFFFFF;
-		text-align: center;
-		font-size: 34rpx;
-		line-height: 44px;
-	}
+	}
+	.zdyNavBox{
+		width: 100vw;
+		background: #FFFFFF;
+		position: fixed;
+		top: 0;
+		left: 0;
+		z-index: 9999999;
+	}
+	.zdyNav{
+		height: 44px;
+		display: flex;
+		justify-content: space-between;
+		
+		align-items: center;
+	}
+	
+	.backImg{
+		width: 44rpx;
+		height: 44rpx;
+		margin-left: 10rpx;
+		margin-right: 20rpx;
+	}
+	.homeImg{
+		width: 44rpx;
+		height: 44rpx;
+		
+	}
+	.zdyNavLeft{
+		display: flex;
+		align-items: center;
+	}
+	.zdyNavTitle{
+		width: 100vw;
+		height: 44px;
+		background: #FFFFFF;
+		text-align: center;
+		font-size: 34rpx;
+		line-height: 44px;
+	}
 	
 
 	.top {
@@ -880,8 +880,8 @@
 	.code {
 		font-size: 26rpx;
 		color: #333333;
-		font-weight: bold;
-		width: 180rpx
+		font-weight: bold;
+		width: 180rpx
 	}
 
 	.old {
@@ -909,15 +909,15 @@
 		border-radius: 4rpx;
 		margin-left: 20rpx;
 	}
-	.quanState2{
-		font-size: 22rpx;
-		color: #999999;
-		padding: 0 10rpx;
-		
-		border: 1rpx solid #DDDDDD;
-		
-		border-radius: 4rpx;
-		margin-left: 20rpx;
+	.quanState2{
+		font-size: 22rpx;
+		color: #999999;
+		padding: 0 10rpx;
+		
+		border: 1rpx solid #DDDDDD;
+		
+		border-radius: 4rpx;
+		margin-left: 20rpx;
 	}
 
 
@@ -941,8 +941,8 @@
 		display: flex;
 		justify-content: space-between;
 		font-size: 26rpx;
-		padding: 20rpx;
-		align-items: center;
+		padding: 20rpx;
+		align-items: center;
 		padding-bottom: 0;
 	}
 
@@ -982,12 +982,12 @@
 		width: 80%;
 		color: #333333;
 		font-size: 26rpx;
-	}
-	.goodsName2{
-		padding: 20rpx 20rpx 15rpx;
-		
-		color: #333333;
-		font-size: 26rpx;
+	}
+	.goodsName2{
+		padding: 20rpx 20rpx 15rpx;
+		
+		color: #333333;
+		font-size: 26rpx;
 	}
 
 	.informationNum {
@@ -1004,7 +1004,7 @@
 		color: #333333;
 		text-align: center;
 		line-height: 33rpx;
-		padding: 0 15rpx;
+		padding: 0 15rpx;
 		margin-left: 20rpx;
 	}
 
@@ -1069,7 +1069,7 @@
 	}
 
 	.itemTop {
-		padding: 18rpx 20rpx;
+		padding: 18rpx 20rpx;
 		padding-right: 0;
 		background-color: #FFEFD5;
 
@@ -1082,24 +1082,24 @@
 		width: 104rpx;
 		font-size: 26rpx;
 		color: #333333;
-		margin-right: 20rpx;
+		margin-right: 20rpx;
 		text-align: right;
-	}
+	}
 	
 
-	.leftItem {
-		font-size: 26rpx;
-		color: #333333;
+	.leftItem {
+		font-size: 26rpx;
+		color: #333333;
 		margin-right: 20rpx;
-		flex-grow: 1;
-		/* 隐藏文字显示 ...不换行 */
-		overflow: hidden;
-		text-overflow: ellipsis;
+		flex-grow: 1;
+		/* 隐藏文字显示 ...不换行 */
+		overflow: hidden;
+		text-overflow: ellipsis;
 		white-space: nowrap;
 	}
 
 	.itemContent {
-		padding: 20rpx;
+		padding: 20rpx;
 		padding-right: 0;
 		background-color: #FFFFFF;
 
@@ -1140,17 +1140,17 @@
 		font-size: 26rpx;
 		text-align: center;
 		padding-left: 100rpx;
-	}
-	.swiper{
-		width: 100%;
-		height: 85%;
-		background: #FFFFFF;
-		
-	}
-	.swiper-item{
-		width: 100%;
-		height: 100%;
-	}
+	}
+	.swiper{
+		width: 100%;
+		height: 85%;
+		background: #FFFFFF;
+		
+	}
+	.swiper-item{
+		width: 100%;
+		height: 100%;
+	}
 	
 	
 	.maCode {
@@ -1159,7 +1159,7 @@
 		font-weight: 500;
 		color: #333333;
 		line-height: 42rpx;
-		margin-bottom: 40rpx;
+		margin-bottom: 40rpx;
 		text-align: center;
 	}
 
@@ -1366,4 +1366,4 @@
 			.detailedLineBox{
 				padding-bottom: 10rpx;
 			}
-</style>
+</style>

pages/user/reportUni.vue

@@ -1193,7 +1193,7 @@
 
 	.nameBox {
 		display: flex;
-		align-items: baseline;
+		align-items: baseline;
 		
 	}
 
@@ -1233,8 +1233,8 @@
 		border: 2rpx solid rgba(221, 221, 221, 1);
 		text-align: center;
 		width: 122rpx;
-		line-height: 33rpx;
+		line-height: 33rpx;
 		font-size: 24rpx;
 		color: #999999;
 	}
-</style>
+</style>