twt před 5 dny
rodič
revize
5c651b22ab

+ 8 - 2
pages/subPack/refund.vue

@@ -2,8 +2,8 @@
 <view class="box">
  <view class="cont">
 	 <view class="itemBox flex">
-		 </image>
-		 <image class="itemIMg"  src="../../static/timg/noimg.png" mode=""></image>
+		 <image v-if="ImgUrl" :src="ImgUrl" class="itemIMg"/>
+		 <image v-else  class="itemIMg"  src="../../static/timg/noimg.png" mode=""></image>
 		 <view class="itemRight">
 		 	<view class="itemName">{{orderData.data.sheetContent}}</view>
 		
@@ -179,6 +179,7 @@
 				couponCount:1,
 				shData:'',
 				couponIds:'',
+				ImgUrl:'',
 			}
 		},
 		onLoad(opt) {
@@ -195,6 +196,11 @@
 				this.shData=uni.getStorageSync("shData")
 				this.totalPrice=this.shData.itemRealMoney
 			}
+			if(this.orderData.openSheetDetail[0].ImgUrl){
+				   var arr=this.orderData.openSheetDetail[0].ImgUrl.split(",")
+				   this.ImgUrl=arr[0]
+								   
+			}
 		},
 		onShow() {
 			

+ 50 - 8
pages/user/myOrder/activityOrderDetail.vue

@@ -101,15 +101,22 @@
 			</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 class="flex newGoodsLine" v-if="orderData.openSheetDetail.length>0" v-for="(item,index) in orderData.openSheetDetail" :key="index">
+				<view class="imgBox">
+					 <image v-if="item.ImgUrl" :src="getNewValue(item.ImgUrl)" mode="" class="itemIMg"></image>
+					 <image class="itemIMg" v-else  src="../../../static/timg/noimg.png" mode=""></image>
+				</view>
+				<view class="informationLine22">
+					<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 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>
@@ -583,6 +590,7 @@
 				xsShow:false,
 				sheetQRCodeList1:'',
 				shItem:'',
+				ImgUrl:'',
 			}
 		},
 		//0拼团取消1拼团失败 2拼团中3拼团成功4自动成团 groupState
@@ -616,9 +624,24 @@
 			
 
 		},
-		
+		computed:{
+			getNewValue(item) {
+			      return item => {
+					  var arr=item.split(",")
+					  if(arr.length>1){
+						  item=arr[0]
+					  }else{
+						  //item=item
+					  }
+					  return item
+			        // 根据item做一些处理,返回新值
+			        //return item.value + ' modified';
+			      };
+			    }
+		},
 
 		methods: {
+			
 			getsheetQRCode(){
 				this.$http('openOrderManagement/sheetQRCodeList', {
 					 type:1,		
@@ -990,6 +1013,7 @@
 				}, 'GET').then(res => {
 					uni.hideLoading();
 					this.orderData = res.data;
+					
 					if (this.quanMaList) {
 						this.quanMaList = [];
 					}
@@ -2172,4 +2196,22 @@ color: #764D49;font-size: 26rpx;padding-top:20rpx;
 	.writeoffXx .informationNum{
 		text-align: right;
 	}
+.itemIMg{
+	width: 128rpx;
+	height: 128rpx;border-radius: 10rpx;
+}
+.flex{
+	display: flex;
+}
+.informationLine2{
+	width: 520rpx;
+	
+}
+.newGoodsLine{
+	padding: 20rpx;
+	padding-left: 0;
+}
+.informationLine22{
+	padding-left: 16rpx;
+}
 </style>

+ 47 - 3
pages/user/myOrder/mallOrderDetail.vue

@@ -59,8 +59,12 @@
 		<!-- 订单内容 -->
 		<view class="information">
 			<view class="detailedTitle">订单内容</view>
-			<view style="padding-bottom: 15rpx;" v-if="orderData.openSheetDetail.length>0" v-for="(item,index) in orderData.openSheetDetail" :key="index">
-				
+			<view  class="flex newGoodsLine" style="padding-bottom: 15rpx;" v-if="orderData.openSheetDetail.length>0" v-for="(item,index) in orderData.openSheetDetail" :key="index">
+				<view class="imgBox">
+					 <image v-if="item.ImgUrl" :src="getNewValue(item.ImgUrl)" mode="" class="itemIMg"></image>
+					 <image class="itemIMg" v-else  src="../../../static/timg/noimg.png" mode=""></image>
+				</view>
+				<view class="informationLine22">
 					<view class="goodsName">{{item.itemName}}</view>
 					<view class="informationLine2">
 						<view class="salePrice"><span
@@ -68,6 +72,14 @@
 						<view class="informationNum" style="color: #999999;">
 							x{{item.itemQty}}</view>
 					</view>
+				</view>
+					<!-- <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> -->
@@ -589,7 +601,21 @@
 		   // this.getsheetQRCode()
 
 		},
-		
+		computed:{
+			getNewValue(item) {
+			      return item => {
+					  var arr=item.split(",")
+					  if(arr.length>1){
+						  item=arr[0]
+					  }else{
+						  //item=item
+					  }
+					  return item
+			        // 根据item做一些处理,返回新值
+			        //return item.value + ' modified';
+			      };
+			    }
+		},
 
 		methods: {
 			getsheetQRCode(){
@@ -1893,4 +1919,22 @@
 .tcinformation{
 	padding: 0 0 30rpx 0;
 }
+.itemIMg{
+	width: 128rpx;
+	height: 128rpx;border-radius: 10rpx;
+}
+.flex{
+	display: flex;
+}
+.informationLine2{
+	width: 520rpx;
+	
+}
+.newGoodsLine{
+	padding: 20rpx;
+	padding-left: 0;
+}
+.informationLine22{
+	padding-left: 16rpx;
+}
 </style>

+ 16 - 2
pages/user/myOrder/myOrder.vue

@@ -35,9 +35,22 @@
 						<view class="itemSheetState" v-if="item.SheetState==4">已取消</view>
 				       
 					</view>
-					<view class="itemShopBg">
+					<!-- <view class="itemShopBg">
 						<view class="shopName">{{item.SheetContent}}</view>
 						<view style="color: #333333;font-size: 22rpx;">¥<span class="price">{{item.RealMoney}}</span></view>
+					</view> -->
+					<view class="afterSalesLineCont">
+						<view v-if="item.ImgUrl"><!-- getNewValue(item.ImgUrl) -->
+							<image v-for="(url,index) in item.ImgUrl.split(',')" :src="url" v-if="index<3" class="afterSalesLineImg" mode=""></image>
+						</view>
+						
+						<image v-else src="../../../static/timg/noimg.png" class="afterSalesLineImg" mode=""></image>
+					    <view class="shCont">
+							<view class="shCOntName" v-if="item.sheetType!=5">{{item.SheetContent}}</view>
+							<view class="shCOntName" v-if="item.sheetType==5">钣喷</view>
+							<view class="shContMS">共 {{item.detailCount}} 件商品</view>
+							<view class="shContMS">¥{{item.RealMoney}}</view>
+						</view>
 					</view>
 				     <view class="renBox" v-if="item.SheetType==6">
 						<image src="../../../static/timg/icon_ren.png" mode="" class="renimg"></image> 
@@ -744,12 +757,13 @@
 	width: 144rpx;
 	height: 144rpx;
 	border-radius: 10rpx;
+	margin-right: 20rpx;
 }
 .afterSalesLineCont{
 	display: flex;padding: 24rpx 0;
 }
 .shCont{
-	color: #222222;padding-left: 20rpx;
+	color: #222222;padding-left: 10rpx;
 }
 .shCOntName{
 	font-size: 26rpx;line-height: 37rpx;