代码提交

pages/myOrder/activityOrderDetail.vue

@@ -59,7 +59,20 @@
 
 		<!-- 订单内容 -->
 		<view class="information">
-			<view class="detailedTitle">订单内容</view>
+			<view class="detailedTitle ptzt">订单内容
+			<view class="groupStateBox " v-if="orderData.data.groupState==4">
+				 <image src="../../static/img/cky.png" mode="" class="groupStateIcon"></image>
+				 <view class="groupStateTxt">自动成团</view>
+			</view>
+			<view class="groupStateBox " v-if="orderData.data.groupState==3">
+				 <image src="../../static/img/cky.png" mode="" class="groupStateIcon"></image>
+				 <view class="groupStateTxt">拼团成功</view>
+			</view>
+			<view class="groupStateBox " v-if="orderData.data.groupState==1">
+				 <image src="../../static/img/del.png" mode="" class="groupStateIcon"></image>
+				 <view class="groupStateTxt">拼团失败</view>
+			</view>
+			</view>
 
 			<view v-if="orderData.openSheetDetail.length>0" v-for="(item,index) in orderData.openSheetDetail"
 				:key="index">
@@ -74,28 +87,38 @@
 				<view class="salePrice"><span class="informationNum" >￥</span>{{item.salePrice}}</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 v-if="orderData.data.sheetState != 1 && orderData.data.sheetState != 4&& orderData.data.sheetState != 5" class="line"></view>
+			<view v-if="orderData.data.sheetState != 1 && orderData.data.sheetState != 4&& orderData.data.sheetState != 5">
 				<view class="goodsName2">
 					券码信息（{{quanMaList.length?quanMaList.length:0}}张可用）
 				</view>
-				<view class="detailedLine" v-for="(v,index) in orderData.OpenSheetQRCode">
-
-					<view v-if="v.writeoffState==1" class="detailedName">
-						<view class="redPoint"></view>
-						<view class="code">{{v.qrCode}}</view>
-						<view class="quanState">待使用</view>
-
-					</view>
-					<view v-if="v.writeoffState==3" class="detailedName">
-						<view class="redPoint"></view>
-						<view class="code old">{{v.qrCode}}</view>
-						<view class="quanState2">已使用</view>
+				<view class="detailedLineBox" v-for="(v,index) in orderData.OpenSheetQRCode">
 
+					<view class="detailedLine">
+						<view v-if="v.writeoffState==1" class="detailedName">
+							<view class="redPoint"></view>
+							<view class="code">{{v.qrCode}}</view>
+							<view class="quanState">待使用</view>
+						</view>
+						<view v-if="v.writeoffState==3" class="detailedName">
+							<view class="redPoint"></view>
+							<view class="code old" >{{v.qrCode}}</view>
+							<view class="quanState2">已使用</view>
+						
+						</view>
+							<image src="../../static/img/icon_erweima.png" mode="" style="width: 36rpx;height: 36rpx;"
+											v-if="v.writeoffState==1" @click="isShowMaSHow"></image>
 					</view>
-
-					<image src="../../static/img/icon_erweima.png" mode="" style="width: 36rpx;height: 36rpx;"
-						v-if="v.writeoffState==1" @click="isShowMaSHow"></image>
+										
+						<view class="writeoffLineBox" v-if="v.writeoffState==3">
+							<view class="writeoffLine">
+								<view class="writeoffLineTxt">核销时间：{{v.writeoffTime}}</view>
+								<view class="writeoffLineTxt">核销人：{{v.writeoffName}}</view>
+							</view>
+							<view class="writeoffLine">
+								<view class="writeoffLineTxt">核销门店：{{v.writeoffShopName?v.writeoffShopName:''}}</view>
+							</view>
+						</view>
 				</view>
 			</view>
 
@@ -166,7 +189,7 @@
 		</view>
 		
 		<!-- 核销信息 -->
-		<view class="information" v-if="orderData.data.sheetState == 3">
+		<view class="information writeoffXx" v-if="orderData.data.sheetState == 3">
 			<view class="detailedTitle">核销信息</view>
 			<view class="informationLine">
 				<view class="informationTxt">核销状态：</view>
@@ -177,11 +200,11 @@
 			
 			<view class="informationLine">
 				<view class="informationTxt">核销时间：</view>
-				<view class="informationNum">{{orderData.data.writeoffTime?orderData.data.writeoffTime:'-'}}</view>
+				<view class="informationNum">{{orderData.data.writeoffTime?orderData.data.writeoffTime:'-'}} {{orderData.data.writeoffName}}</view>
 			</view>
 			<view class="informationLine">
 				<view class="informationTxt">核销门店：</view>
-				<view class="informationNum"></view>
+				<view class="informationNum">{{orderData.data.writeoffShopName?orderData.data.writeoffShopName:'-'}}</view>
 			</view>
 		
 		</view>
@@ -678,6 +701,21 @@
 </script>
 
 <style scoped>
+	.ptzt{
+		display: flex;justify-content: space-between;
+	}
+	.groupStateBox{
+		display: flex;
+	}
+	.groupStateIcon{
+		width: 28rpx;height: 28rpx;
+	}
+	.groupStateTxt{
+		font-weight: 400;padding-left: 8rpx;
+		color: #3C3C3C;line-height: 28rpx;
+		font-size: 26rpx;
+	}
+	
 	.box {
 		min-height: 100vh;
 		background: #F4F5F7;
@@ -1287,4 +1325,22 @@
 		line-height: 98rpx;
 		text-align: center;
 	}
+	.writeoffLine{
+		display: flex;justify-content: space-between;
+		color: #999999;font-size: 24rpx;
+		line-height: 33rpx;padding-top: 8rpx;
+	}
+	.writeoffLineBox{
+		padding: 0 20rpx;
+	}
+	
+	.detailedLineBox .detailedLine{
+		padding-bottom: 0rpx;
+	}
+	.writeoffXx .informationNum{
+		width: 500rpx;
+	}
+	.detailedLineBox{
+		padding-bottom: 10rpx;
+	}
 </style>

pages/myOrder/mallOrderDetail.vue

@@ -76,23 +76,33 @@
 				<view class="goodsName">
 					券码信息（{{quanMaList.length?quanMaList.length:0}}张可用）
 				</view>
-				<view class="detailedLine" v-for="(v,index) in orderData.OpenSheetQRCode">
-
-					<view v-if="v.writeoffState==1" class="detailedName">
-						<view class="redPoint"></view>
-						<view class="code">{{v.qrCode}}</view>
-						<view class="quanState">待使用</view>
-
-					</view>
-					<view v-if="v.writeoffState==3" class="detailedName">
-						<view class="redPoint"></view>
-						<view class="code old">{{v.qrCode}}</view>
-						<view class="quanState2">已使用</view>
-
-					</view>
-
+				<view class="detailedLineBox" v-for="(v,index) in orderData.OpenSheetQRCode">
+                  <view class="detailedLine">
+                   	<view v-if="v.writeoffState==1" class="detailedName">
+                   		<view class="redPoint"></view>
+                   		<view class="code">{{v.qrCode}}</view>
+                   		<view class="quanState">待使用</view>
+                   	
+                   	</view>
+                   	<view v-if="v.writeoffState==3" class="detailedName">
+                   		<view class="redPoint"></view>
+                   		<view class="code old" >{{v.qrCode}}</view>
+                   		<view class="quanState2">已使用</view>
+                   	
+                   	</view>
 					<image src="../../static/img/icon_erweima.png" mode="" style="width: 36rpx;height: 36rpx;"
 						v-if="v.writeoffState==1" @click="isShowMaSHow"></image>
+                   </view>
+					
+					<view class="writeoffLineBox" v-if="v.writeoffState==3">
+						<view class="writeoffLine">
+							<view class="writeoffLineTxt">核销时间：{{v.writeoffTime}}</view>
+							<view class="writeoffLineTxt">核销人：{{v.writeoffName}}</view>
+						</view>
+						<view class="writeoffLine">
+							<view class="writeoffLineTxt">核销门店：{{v.writeoffShopName?v.writeoffShopName:''}}</view>
+						</view>
+					</view>
 				</view>
 			</view>
 
@@ -189,6 +199,27 @@
 			</view>
 
 		</view>
+		
+		<!-- 核销信息 -->
+		<view class="information writeoffXx" v-if="orderData.data.sheetState == 3">
+			<view class="detailedTitle">核销信息</view>
+			<view class="informationLine">
+				<view class="informationTxt">核销状态：</view>
+				<view class="informationNum" v-if="orderData.data.writeoffState==1">未核销</view>
+				<view class="informationNum" v-if="orderData.data.writeoffState==2">部分核销</view>
+				<view class="informationNum" v-if="orderData.data.writeoffState==3">已核销</view>
+			</view>
+			
+			<view class="informationLine">
+				<view class="informationTxt">核销时间：</view>
+				<view class="informationNum">{{orderData.data.writeoffTime?orderData.data.writeoffTime:'-'}} {{orderData.data.writeoffName}}</view>
+			</view>
+			<view class="informationLine">
+				<view class="informationTxt">核销门店：</view>
+				<view class="informationNum">{{orderData.data.writeoffShopName?orderData.data.writeoffShopName:'-'}}</view>
+			</view>
+		
+		</view>
 
 		<view style="height: 50rpx;background-color: #F4F5F7;"></view>
 
@@ -1246,4 +1277,22 @@
 		line-height: 98rpx;
 		text-align: center;
 	}
+	.writeoffLine{
+		display: flex;justify-content: space-between;
+		color: #999999;font-size: 24rpx;
+		line-height: 33rpx;padding-top: 8rpx;
+	}
+	.writeoffLineBox{
+		padding: 0 20rpx;
+	}
+	
+	.detailedLineBox .detailedLine{
+		padding-bottom: 0rpx;
+	}
+	.writeoffXx .informationNum{
+		width: 500rpx;
+	}
+	.detailedLineBox{
+		padding-bottom: 10rpx;
+	}
 </style>

pages/myOrder/myOrder.vue

@@ -22,7 +22,7 @@
 			  <view class="searchInputBox">
 				  <image src="../../static/img/icon_search.png" mode="" class="iconSimg"></image>
 				  <input type="text" v-model="name" placeholder="订单号、手机号、联系人" class="searchInput" @confirm="searchCf">
-			       <image @click="ssql" src="../../static/img/chahao.png" mode="" class="sschahao"></image>
+			       <image v-if="name" @click="ssql" src="../../static/img/chahao.png" mode="" class="sschahao"></image>
 			  </view>
 			  <image @click="screenSHowBtn" src="../../static/img/icon_shai.png" mode="" class="iconShai"></image>
 			</view>
@@ -163,14 +163,14 @@
 		},
 		onLoad(opt) {
 			
-			this.getData();
+			//this.getData();
 			this.getShopinfo();
 			
 		},
 		onShow() {
 			console.log(this.tabIndex)
-
-			this.getData();
+            this.getShopinfo();
+			//this.getData();
 			
 
 		},
@@ -183,6 +183,7 @@
 			sub(){
 				this.screenSHow=false;
 				var arr=[]
+				this.items=[]
 				this.tabList.forEach(item=>{
 					if(item.ck){
 						arr.push(item.sheetType)
@@ -250,10 +251,11 @@
 			getShopinfo(){
 				this.$http('openH5SetTheGuest/getShopInfo',{},'GET').then(res => {
 						this.shopName=res.data.shopName;
-						this.mrshopId=this.shopId;
+						this.mrshopId=res.data.id;
 						this.mrshopName=res.data.shopName;
-						this.shopId=this.shopId
+						this.shopId=this.mrshopId
 						this.getShopList();
+						this.getData()
 				 })
 			},
 			getShopList(){
@@ -318,6 +320,7 @@
 				}
 			},
 			searchCf(){
+				this.items=[]
 				this.getData()
 			},
 			getData() {

pages/myOrder/paintOrderDetail.vue

@@ -72,23 +72,33 @@
 				<view class="goodsName2">
 					券码信息（{{quanMaList.length?quanMaList.length:0}}张可用）
 				</view>
-				<view class="detailedLine" v-for="(v,index) in orderData.OpenSheetQRCode">
-
-					<view v-if="v.writeoffState==1" class="detailedName">
-						<view class="redPoint"></view>
-						<view class="code">{{v.qrCode}}</view>
-						<view class="quanState">待使用</view>
-
-					</view>
-					<view v-if="v.writeoffState==3" class="detailedName">
-						<view class="redPoint"></view>
-						<view class="code old" >{{v.qrCode}}</view>
-						<view class="quanState2">已使用</view>
-					
-					</view>
-					
+				<view class="detailedLineBox" v-for="(v,index) in orderData.OpenSheetQRCode">
+                  <view class="detailedLine">
+                   	<view v-if="v.writeoffState==1" class="detailedName">
+                   		<view class="redPoint"></view>
+                   		<view class="code">{{v.qrCode}}</view>
+                   		<view class="quanState">待使用</view>
+                   	
+                   	</view>
+                   	<view v-if="v.writeoffState==3" class="detailedName">
+                   		<view class="redPoint"></view>
+                   		<view class="code old" >{{v.qrCode}}</view>
+                   		<view class="quanState2">已使用</view>
+                   	
+                   	</view>
 					<image src="../../static/img/icon_erweima.png" mode="" style="width: 36rpx;height: 36rpx;"
-						v-if="v.writeoffState==1" @click="isShowMa=true"></image>
+						v-if="v.writeoffState==1" @click="isShowMaSHow"></image>
+                   </view>
+					
+					<view class="writeoffLineBox" v-if="v.writeoffState==3">
+						<view class="writeoffLine">
+							<view class="writeoffLineTxt">核销时间：{{v.writeoffTime}}</view>
+							<view class="writeoffLineTxt">核销人：{{v.writeoffName}}</view>
+						</view>
+						<view class="writeoffLine">
+							<view class="writeoffLineTxt">核销门店：{{v.writeoffShopName?v.writeoffShopName:''}}</view>
+						</view>
+					</view>
 				</view>
 			</view>
 
@@ -166,6 +176,27 @@
 			</view>
 
 		</view>
+		
+		<!-- 核销信息 -->
+		<view class="information writeoffXx" v-if="orderData.data.sheetState == 3">
+			<view class="detailedTitle">核销信息</view>
+			<view class="informationLine">
+				<view class="informationTxt">核销状态：</view>
+				<view class="informationNum" v-if="orderData.data.writeoffState==1">未核销</view>
+				<view class="informationNum" v-if="orderData.data.writeoffState==2">部分核销</view>
+				<view class="informationNum" v-if="orderData.data.writeoffState==3">已核销</view>
+			</view>
+			
+			<view class="informationLine">
+				<view class="informationTxt">核销时间：</view>
+				<view class="informationNum">{{orderData.data.writeoffTime?orderData.data.writeoffTime:'-'}} {{orderData.data.writeoffName}}</view>
+			</view>
+			<view class="informationLine">
+				<view class="informationTxt">核销门店：</view>
+				<view class="informationNum">{{orderData.data.writeoffShopName?orderData.data.writeoffShopName:'-'}}</view>
+			</view>
+		
+		</view>
 
 		<view style="height: 50rpx;background-color: #F4F5F7;"></view>
 
@@ -1259,4 +1290,22 @@
 		line-height: 98rpx;
 		text-align: center;
 	}
+	.writeoffLine{
+		display: flex;justify-content: space-between;
+		color: #999999;font-size: 24rpx;
+		line-height: 33rpx;padding-top: 8rpx;
+	}
+	.writeoffLineBox{
+		padding: 0 20rpx;
+	}
+	
+	.detailedLineBox .detailedLine{
+		padding-bottom: 0rpx;
+	}
+	.writeoffXx .informationNum{
+		width: 500rpx;
+	}
+	.detailedLineBox{
+		padding-bottom: 10rpx;
+	}
 </style>