1.订单

pages/addjk/activity.vue

@@ -11,7 +11,8 @@
 
 				</view>
 				<view class="zdyNavTitle">活动</view>
-				<image src="../../static/img/icon_nav_add.png" mode="aspectFit" class="addImg" @click="goAdd"></image>
+				<image v-if="iOSInfo.indexOf('Q021')!=-1||!iOSInfo" src="../../static/img/icon_nav_add.png" mode="aspectFit" class="addImg" @click="goAdd"></image>
+				<view v-else style="width: 50px;"></view>
 			</view>
 		</view>
 		<view class="status_bar" :style="{height: iStatusBarHeight + 'px'}"></view>
@@ -42,21 +43,21 @@
 
 				<view class="btns">
 					<view class="btnBox">
-						<view class="btn" style="width: 120rpx;" @click="changeMore(item)">更多</view>
-						<view class="btn" @click="goSign(item)">报名详情</view>
-						<view class="btn" @click="goStatis(item)" v-if="iOSInfo.indexOf('Q028')!=-1||!iOSInfo">数据统计</view>
+						<view v-if="iOSInfo.indexOf('Q022')!=-1 || iOSInfo.indexOf('Q023')!=-1 || iOSInfo.indexOf('Q024')!=-1||!iOSInfo" class="btn" style="width: 120rpx;" @click="changeMore(item)">更多</view>
+						<view v-if="iOSInfo.indexOf('Q025')!=-1||!iOSInfo" class="btn" @click="goSign(item)">报名详情</view>
+						<view v-if="iOSInfo.indexOf('Q028')!=-1||!iOSInfo" class="btn" @click="goStatis(item)">数据统计</view>
 						<view class="btn" style="width: 120rpx;" @click="goshare(item)" >分享</view>
 					</view>
 					<view class="moreBtn" v-if="item.showMoreBtn==true">
-						<view class="more" @click="goEdit(item.ID)">
+						<view v-if="iOSInfo.indexOf('Q022')!=-1||!iOSInfo" class="more" @click="goEdit(item.ID)">
 							<image src="../../static/img/icon_bianji.png" mode="" class="btnImg"></image>
 							<view class="btn2">编辑</view>
 						</view>
-						<view class="more" @click="open(item)" v-if="item.state=='未启用'">
+						<view v-if="(iOSInfo.indexOf('Q023')!=-1||!iOSInfo) && item.state=='未启用'" class="more" @click="open(item)">
 							<image src="../../static/img/icon_tingyong.png" mode="" class="btnImg"></image>
 							<view class="btn2">启用</view>
 						</view>
-						<view class="more" @click="stop(item)" v-else>
+						<view v-if="iOSInfo.indexOf('Q024')!=-1||!iOSInfo" class="more" @click="stop(item)" v-else>
 							<image src="../../static/img/icon_tingyong.png" mode="" class="btnImg"></image>
 							<view class="btn2">停用</view>
 						</view>
@@ -447,7 +448,7 @@
 		padding: 26rpx 20rpx;
 		border-radius: 0 0 10rpx 10rpx;
 		display: flex;
-		justify-content: space-between;
+		justify-content: flex-end;
 		align-items: center;
 	}
 
@@ -483,7 +484,8 @@
 		border-radius: 30rpx;
 		border: 1rpx solid #DDDDDD;
 		text-align: center;
-		line-height: 60rpx;
+		line-height: 60rpx;
+		margin-left: 17rpx;
 	}
 
 	.btn2 {

pages/myOrder/activityOrderDetail.vue

@@ -166,12 +166,12 @@
 
 		<!-- 待付款 -->
 		<view class="bottom" v-if="orderData.data.sheetState == 1">
-			<view class="cancel" @click="cancelBespeak">取消订单</view>
+			<view v-if="iOSInfo.indexOf('Q030')!=-1||!iOSInfo" class="cancel" @click="cancelBespeak">取消订单</view>
 
 		</view>
 		<!-- 待服务 -->
 		<view class="bottom" v-if="orderData.data.sheetState == 2">
-			<view class="defer" @click="goHeXiao">核销</view>
+			<view v-if="iOSInfo.indexOf('Q032')!=-1||!iOSInfo" class="defer" @click="goHeXiao">核销</view>
 
 		</view>
 
@@ -241,7 +241,7 @@
 				src: '', // 二维码生成后的图片地址或base64
 				isShowMa: false,
 				quanMaList: [],
-
+				iOSInfo:'',
 			}
 		},
 		onLoad(opt) {
@@ -252,7 +252,10 @@
 			if (this.id) {
 				this.getData()
 			}
-
+			var qxnum = uni.getStorageSync("quanxian");
+			if (qxnum == 1) {
+				this.iOSInfo = JSON.parse(JSON.stringify(window.iOSInfo));
+			}
 
 		},
 
@@ -269,7 +272,9 @@
 				var android = /android/.test(userAgent)
 				if (ios) {
 					if (true) { //!standalone&& !safari
-						window.webkit.messageHandlers.goHeXiao.postMessage({"id":this.id?this.id:''})
+						window.webkit.messageHandlers.goHeXiao.postMessage({
+							"id": this.id ? this.id : ''
+						})
 					}
 				} else if (android) {
 					window.android.postMessage()
@@ -323,7 +328,7 @@
 							duration: 2000
 						});
 						that.getData()
-				 },
+					},
 					fail: function(err) {
 						console.log(err)
 						uni.showToast({
@@ -828,17 +833,7 @@
 		margin-left: 20rpx;
 	}
 
-	.orderBottom {
-		width: 750rpx;
-		height: 98rpx;
-		background: #FFFFFF;
-		position: fixed;
-		left: 0;
-		bottom: 0;
-		display: flex;
-		justify-content: flex-end;
-	}
-
+	
 
 
 

pages/myOrder/myOrder.vue

@@ -68,13 +68,10 @@
 				tabIndex: 0,
 				items: [],
 				isload: false,
-				iOSInfo:'',
+				
 			}
 		},
 		onLoad(opt) {
-			let iOSInfo = JSON.parse(JSON.stringify(window.iOSInfo));
-			this.iOSInfo = iOSInfo
-			console.log('iOSInfo==',iOSInfo);
 			
 			this.getData()
 		},

pages/myOrder/paintOrderDetail.vue

@@ -171,15 +171,15 @@
 
 		<!-- 待付款 -->
 		<view class="bottom" v-if="orderData.data.sheetState == 1">
-			<view class="cancel" @click="cancelBespeak">取消订单</view>
+			<view v-if="iOSInfo.indexOf('Q030')!=-1||!iOSInfo" class="cancel" @click="cancelBespeak">取消订单</view>
 			
 		</view>
 		<!-- 待服务 -->
 		<view class="bottom" v-if="orderData.data.sheetState == 2">
-			<view class="defer" @click="isShowTui=true">退款</view>
-			<view class="defer" @click="goHeXiao">核销</view>
-			<!-- <view class="defer" @click="">开单</view> -->
-			<!-- <view class="defer" @click="">开卡</view> -->
+			<view v-if="iOSInfo.indexOf('Q031')!=-1||!iOSInfo" class="defer" @click="isShowTui=true">退款</view>
+			<view v-if="iOSInfo.indexOf('Q032')!=-1||!iOSInfo" class="defer" @click="goHeXiao">核销</view>
+			<!-- <view v-if="iOSInfo.indexOf('Q033')!=-1||!iOSInfo" class="defer" @click="">开单</view> -->
+			<!-- <view v-if="iOSInfo.indexOf('Q034')!=-1||!iOSInfo" class="defer" @click="">开卡</view> -->
 			
 		</view>
 
@@ -230,7 +230,7 @@
 						
 						<picker class="carModel" @change="bindChange" mode="selector"  :value="index" :range="tuicauseList" range-key="contents">
 							<view class="uni-input">{{tuicauseList[index].contents}}</view>
-							<!-- <view class="uni-input noColor" v-else>请选择</view> -->
+							
 						</picker>
 						<image src="../../static/img/little_rightArrow.png" mode="" class="contlineRightJt"></image>
 					</view>
@@ -306,7 +306,8 @@
 				isShowTui: false,
 				tuicauseList:[],
 				tuikuanContent:'',
-				index: 0,
+				index: 0,
+				iOSInfo:'',
 				
 			}
 		},
@@ -319,7 +320,11 @@
 				this.getData()
 			}
 			this.getTuiKuanData()
-
+			
+			var qxnum = uni.getStorageSync("quanxian");
+			if (qxnum == 1) {
+				this.iOSInfo = JSON.parse(JSON.stringify(window.iOSInfo));
+			}
 		},
 		
 
@@ -350,8 +355,8 @@
 						uni.hideLoading();
 						// var list = res.data.Items
 						var list = res.data
-						console.log("result+=", res.data);
-						if (res.data) {
+						console.log("result+=", res);
+						if (res.code == 1) {
 							that.isShowTui = false
 							uni.showToast({
 								title: '退款成功',
@@ -934,19 +939,7 @@
 		margin-left: 20rpx;
 	}
 
-	.orderBottom {
-		width: 750rpx;
-		height: 98rpx;
-		background: #FFFFFF;
-		position: fixed;
-		left: 0;
-		bottom: 0;
-		display: flex;
-		justify-content: flex-end;
-	}
-
-
-
+	
 
 
 
@@ -1093,5 +1086,133 @@
 		width: 400rpx;
 		height: 400rpx;
 		margin-left: 86rpx;
+	}
+	.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;
+		padding: 40rpx 20rpx 10rpx;
+	
+	}
+	
+	.btn {
+		width: 288rpx;
+		height: 98rpx;
+		background: #F4F5F7;
+		border-radius: 10rpx;
+		margin-right: 22rpx;
+	
+	
+		font-size: 30rpx;
+		font-weight: 500;
+		color: #3C3C3C;
+		line-height: 98rpx;
+		text-align: center;
+	}
+	
+	.btn2 {
+		width: 288rpx;
+		height: 98rpx;
+		background: #3F90F7;
+		border-radius: 10rpx;
+	
+	
+	
+		font-size: 30rpx;
+		font-weight: 500;
+		color: #FFFFFF;
+		line-height: 98rpx;
+		text-align: center;
 	}
 </style>

utils/request.js

@@ -45,7 +45,6 @@ const http = (url = '', date = {}, type = 'POST', header = {
 			}else if(res.data.code==409){
 				 // getToken(url,date,type,header)
 			}
-			
             resolve(res.data);
         }).catch(error => {
             let [err, res] = error;