代码提交

pages/activity/jkDetail.vue

@@ -1171,10 +1171,10 @@ color: #FFFFFF;font-size: 26rpx;
 }
 .separateTop{
 	font-weight: 500;font-size: 28rpx;
-	color: #FFFFFF;
+	color: #FFFFFF;padding-top: 2rpx;
 }
 .separateTxt{
-	color: #FFFFFF;font-size: 26rpx;
+	color: #FFFFFF;font-size: 26rpx;line-height: 26rpx;
 }
 	.companyName{
 		font-size: 24rpx;

pages/shop/wp.vue

@@ -39,6 +39,7 @@
 				mpWxQr3:'',
 				mpWxQr4:'',
 				ptImg:'http://dmsphoto.66km.com.cn/thFiles/18415D1D-563A-4488-9163-0A7D59A99961.png',
+				ptImg2:'',
 				groupType:'',
 			}
 		},
@@ -58,6 +59,7 @@
 			//this.canvasW = uni.getSystemInfoSync().windowWidth
 			//this.canvasH = this.calculateCanvasHeight()
 			this.avatar=opt.img;
+			this.time=opt.time
 			//this.avatar=this.avatar.replace('http','https');
 			console.log(this.avatar)
 			this.nickname=opt.name;	
@@ -69,7 +71,8 @@
 			if(this.nickname.length>16){
 				this.nickname=this.nickname.substring(0,16)+'...'
 			}
-			if(opt.groupType){
+			if(opt.groupType!=0){
+				console.log(opt.groupType)
 				this.groupType=opt.groupType
 			}
 			//console.log(this.nickname+this.nickname.length)
@@ -197,6 +200,18 @@
 					this.drawRoundRectAvatar(ctx, x, y, av, topimgh, r, hi.tempFilePath)
 					
 				}
+				if(this.groupType){
+					var ptw=uni.upx2px(60)
+					var pth=uni.upx2px(32)
+					var ptIcon=await this.downloadImage(this.ptImg);
+					if (ptIcon.tempFilePath) {
+						const x =  uni.upx2px(30) 
+						const y =  uni.upx2px(370)
+						this.drawRoundRectAvatar(ctx, x, y, ptw, pth, r, ptIcon.tempFilePath)
+						
+					}
+				}
+				
 				// draw hello info
 				//this.drawHelloInfo(ctx, padding, padding + cardHeight + padding, cw)
 				// draw qr code
@@ -249,12 +264,19 @@
 				//let vp = y + uni.upx2px(45)
 				//const hp = x + uni.upx2px(52)
 				let vp =  uni.upx2px(400)
-				const hp = uni.upx2px(36)
+				
+				var hp = uni.upx2px(36)
 				ctx.setTextBaseline('center')
 				const fz30 = uni.upx2px(32)
 				ctx.fillStyle = '#212121'
 				ctx.setFontSize(fz30)
-                ctx.fillText(this.nickname, hp, vp)
+				if(this.groupType){
+					var namehp = uni.upx2px(100)
+					 ctx.fillText(this.nickname, namehp, vp)
+				}else{
+					 ctx.fillText(this.nickname, hp, vp)
+				}
+               
 				var timeX=hp;
 				var timeY=vp+30
 				

pages/subPack/jkDetail.vue

@@ -1057,7 +1057,7 @@
 				this.dm=0;
 				this.ds=0;
 				//this.queryActivityInfo();
-				this.info.state=3
+				//this.info.state=3
 			    return
 			  }
 			
@@ -1254,7 +1254,7 @@ color: #FFFFFF;font-size: 26rpx;
 	color: #FFFFFF;padding-top: 2rpx;
 }
 .separateTxt{
-	color: #D53533;font-size: 26rpx;
+	color: #D53533;font-size: 26rpx;line-height: 26rpx;
 }
 .groupBtnTxt{
 	color: #FFFFFF;font-size: 26rpx;line-height: 26rpx;

pages/user/myOrder/activityOrderDetail.vue

@@ -117,23 +117,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="isShowMaSHow "></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>
 
@@ -201,7 +211,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>
@@ -212,11 +222,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">{{orderData.data.writeoffName?orderData.data.writeoffName:'-'}}</view>
+				<view class="informationNum">{{orderData.data.writeoffShopName?orderData.data.writeoffShopName:'-'}}</view>
 			</view>
 		</view>
 		
@@ -225,7 +235,7 @@
 
 		<view class="bottom" v-if="orderData.data.sheetState == 1">
            <!-- <view class="cancel" @click="cancelBespeak" v-if="orderData.data.groupType==1">取消订单</view> -->
-			<view class="cancel" @click="cancelBespeak" v-if="!orderData.data.groupType">取消订单</view>
+			<view class="cancel" @click="cancelBespeak" >取消订单</view>
 			<view class="defer" :style="{border:'1rpx solid #'+themeColor,color:'#'+themeColor}" @click="pay">立即支付</view>
 		</view>
 		<view class="bottom" v-if="orderData.data.sheetState == 2||orderData.data.sheetState == 5">
@@ -1628,5 +1638,22 @@ color: #764D49;font-size: 26rpx;padding-top:20rpx;
 		line-height: 70rpx;
 		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/user/myOrder/mallOrderDetail.vue

@@ -76,23 +76,35 @@
 				<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>
 
@@ -188,6 +200,26 @@
 			</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>
 
@@ -1311,4 +1343,22 @@
 				line-height: 70rpx;
 				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/user/myOrder/paintOrderDetail.vue

@@ -73,23 +73,34 @@
 				<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>
 
@@ -167,6 +178,26 @@
 			</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>
 
@@ -1298,4 +1329,22 @@
 				line-height: 70rpx;
 				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>