bug修改

pages/activity/jkDetail.vue

@@ -784,8 +784,11 @@
 						 duration: 2000
 				      });
 					  console.log(that.orderData)
-					  uni.redirectTo({
+					  /* uni.redirectTo({
 					  	url: "../user/myOrder/activityOrderDetail?id=" + that.orderData.id +"&SheetType=" + that.orderData.sheetType
+					  }) */
+					  uni.navigateTo({
+					  	url:'../subPack/paySuccess?id=' + that.orderData.id +"&SheetType=" + that.orderData.sheetType+'&sx=1'+"&orderType=jike"
 					  })
 				    }
 				}); 

pages/index/paintShopList.vue

@@ -337,9 +337,9 @@
 		color: #F19D01;
 		height: 28rpx;
 		border: 1px solid #F19D01;
-
-		font-size: 20rpx;
-		line-height: 28rpx;
+		
+		font-size: 22rpx;
+		line-height: 30rpx;
 		margin: 5rpx 10rpx 5rpx 0rpx;
 	}
 
@@ -350,7 +350,7 @@
 
 	.shopTime {
 		color: #666666;
-		font-size: 22rpx;
+		font-size: 26rpx;
 	}
 
 	.addressBox {
@@ -466,6 +466,7 @@
 		overflow: hidden;
 		text-overflow: ellipsis;
 		white-space: nowrap;
+		color: #999999;
 	}
 
 	.noMore {

pages/index/paintSure.vue

@@ -293,8 +293,11 @@
 							duration: 3000
 						});
 						if (this.orderData.sheetType==5){
-							uni.redirectTo({
+							/* uni.redirectTo({
 								url: "../user/myOrder/paintOrderDetail?id=" +that.orderData.id+'&sx=1'
+							}) */
+							uni.navigateTo({
+								url:'../subPack/paySuccess?id=' + that.orderData.id +"&orderType=paint"
 							})
 						}
 					}
@@ -355,8 +358,11 @@
 									"&SheetType=" + that.orderData.sheetType
 							})
 						}else if (that.orderData.sheetType==5){
-							uni.navigateTo({
+							/* uni.navigateTo({
 								url: "../user/myOrder/paintOrderDetail?id=" +that.orderData.id
+							}) */
+							uni.navigateTo({
+								url:'../subPack/paySuccess?id=' + that.orderData.id +"&orderType=paint"
 							})
 						}
 

pages/shop/ckshopList.vue

@@ -362,9 +362,15 @@
 	}
 
 	.shopName {
-		color: #333333;
-		font-size: 26rpx;
-		font-weight: 600;
+		    font-size: 32rpx;
+		    font-weight: bold;
+		    color: #222222;
+			line-height: 40rpx;
+			width: 450rpx;
+			white-space: nowrap;
+			overflow: hidden;
+			text-overflow: ellipsis;
+			
 	}
 
 	.span1 {
@@ -411,8 +417,8 @@
 		height: 28rpx;
 		border: 1px solid #F19D01;
 
-		font-size: 20rpx;
-		line-height: 28rpx;
+		font-size: 22rpx;
+		line-height: 30rpx;
 		margin: 5rpx 10rpx 5rpx 0rpx;
 	}
 
@@ -423,7 +429,7 @@
 
 	.shopTime {
 		color: #666666;
-		font-size: 22rpx;
+		font-size: 26rpx;
 	}
 
 	.addressBox {
@@ -539,6 +545,7 @@
 		overflow: hidden;
 		text-overflow: ellipsis;
 		white-space: nowrap;
+		color: #999999;
 	}
 
 	.noMore {

pages/shop/confirm.vue

@@ -290,8 +290,11 @@
 					  console.log(that.orderData)
 					   if(that.orderData.sheetType==1||that.orderData.sheetType==2||that.orderData.sheetType==3){
 						   console.log("商城订单s")
-						uni.redirectTo({
+						/* uni.redirectTo({
 							url: "../user/myOrder/mallOrderDetail?id=" + that.orderData.id +"&SheetType=" + that.orderData.sheetType
+						}) */
+						uni.navigateTo({
+							url:'../subPack/paySuccess?id=' + that.orderData.id +"&SheetType=" + that.orderData.sheetType+'&sx=1'+"&orderType=shop"
 						})
 					   }
 				    }

pages/shop/goodsDetail.vue

@@ -33,13 +33,15 @@
 		
 		<view class="goodsName">{{info.name}}</view>
 		<view style="display: flex;justify-content: space-between;padding-right: 24rpx;">
-			<view class="goodsMd" v-if="info.sellingPoint">{{info.sellingPoint}}</view>
+			<view class="goodsMd" ><span v-if="info.sellingPoint">{{info.sellingPoint}}</span> </view>
 			<view class="Sold" v-if="info.showLabel&&info.showLabel.indexOf('3')!=-1">已售 <span style="color: #FFC107;">{{info.saleQty>0?info.saleQty:0}}</span> </view>
 		</view>
 		<view class="goodsMSBox" v-if="info.detailSellingLabel">
-		
 			<view class="goodsMs" v-for="(item,index) in info.detailSellingLabel.split(',')">{{item}}</view>
 		</view>
+		<view style="padding-left: 24rpx;padding-bottom: 20rpx;">
+			<view class="Sold" v-if="info.showLabel&&info.showLabel.indexOf('2')!=-1">库存 <span style="color: #FFC107;">{{info.qty>0?info.qty:0}}</span> </view>
+		</view>
 	
 	</view>
 	
@@ -172,15 +174,22 @@
 					</view>
 					<view class="hotGoodsLineRIght">
 						<view class="goodsName2">{{info.name}}</view>
-					    <view class="Sold" v-if="info.showLabel&&info.showLabel.indexOf('3')!=-1">
-							已售 {{info.saleQty>0?info.saleQty:0}}</view>
-						<view class="goodsPrice">
-							<view class="goodsPrice11" v-if="info.saleLabel">{{info.saleLabel}}</view>
-							<view class="goodsPrice22">￥</view>
-							<view class="goodsPrice33">{{info.salePrice?info.salePrice:info.scribingPrice}}
-							 <span v-if="info.categoryIds=='7B97D114-C419-42B2-9C1E-0B4CA284CDA0'">万</span>
+						<div style="display: flex;">
+							<view class="biaoqian2" v-if="info.saleLabel">{{info.saleLabel}}</view>
+						</div>
+						
+					    
+						<view style="display: flex;justify-content: space-between;">
+							<view class="goodsPrice">
+								<view class="goodsPrice22">￥</view>
+								<view class="goodsPrice33">{{info.salePrice?info.salePrice:info.scribingPrice}}
+								 <span v-if="info.categoryIds=='7B97D114-C419-42B2-9C1E-0B4CA284CDA0'">万</span>
+								</view>
+								<view class="goodsPrice44" v-if="info.showLabel&&info.scribingPrice&&info.showLabel.indexOf('1')!=-1">￥{{info.scribingPrice}}</view>
 							</view>
-							<view class="goodsPrice44" v-if="info.showLabel&&info.scribingPrice&&info.showLabel.indexOf('1')!=-1">￥{{info.scribingPrice}}</view>
+							
+						    <view class="Sold" style="padding-top: 18rpx;" v-if="info.showLabel&&info.showLabel.indexOf('3')!=-1">
+						    	已售 {{info.saleQty>0?info.saleQty:0}}</view>
 						</view>
 					</view>
 				</view>
@@ -834,6 +843,7 @@
 	}
 	.hotGoodsLineRIght{
 		padding-left: 24rpx;
+		width: 450rpx;
 	}
 	.goodsPrice{
 		display: flex;
@@ -940,16 +950,19 @@ button{
 	margin-left: 80rpx;
 }
 .goodsDetailTitle{
-	color: #333333;
-	font-size: 30rpx;
-	font-weight: 500;
+	    font-size: 26rpx;
+	    color: #666E80;
 	background: #FFFFFF;
 	padding: 20rpx 24rpx;
+	padding-left: 0;
 }
 .goodsDetail{
 	margin-top: 20rpx;
 	padding-bottom: 30rpx;
 	background: #FFFFFF;
+	font-size: 26rpx;
+	padding-left: 24rpx;
+	padding-right: 24rpx;
 }
 .goodsDetail img{
 	width: 750rpx;
@@ -1072,7 +1085,7 @@ button{
 	font-size: 28rpx;
 	font-weight: 400;
 	color: #EC0F0A;
-	padding-top: 10rpx;
+	padding-top: 12rpx;
 	
 }
 
@@ -1087,7 +1100,7 @@ button{
 	color: #999999;
 	padding-top: 14rpx;
 	text-decoration:line-through;
-	padding-left: 10rpx;
+	padding-left: 14rpx;
 }
 .Sold{
 		font-weight: 400;
@@ -1110,6 +1123,7 @@ button{
 	font-size: 26rpx;
 	padding: 0 24rpx;
 	padding-bottom: 10rpx;
+	width: 550rpx;
 }
 .shopCont{
 	background: #FFFFFF;
@@ -1292,19 +1306,28 @@ button{
 	font-size: 22rpx;
 	color: #FFFFFF;
 	margin-top: 24rpx;
-	margin-bottom: -15rpx;
+	margin-bottom: -20rpx;
+}
+.biaoqian2{
+	background: #FF0035;
+	border-radius: 24rpx 24rpx 25rpx 0rpx;
+	padding: 4rpx 16rpx;
+	font-size: 22rpx;
+	color: #FFFFFF;
+	margin-top: 24rpx;
 }
 .shareIcon{
 	width: 33rpx;height: 33rpx;margin-left: 10rpx;
 }
 .shareBoxNew{
 	display: flex;font-size: 24rpx;
-color: #666666;padding-top: 6rpx;
+color: #666666;padding-top: 16rpx;
 line-height: 33rpx;
 }
 .goodsMSBox{
 	display: flex;padding-left: 24rpx;
-	padding-bottom: 24rpx;
+
+	flex-wrap: wrap;
 }
 .goodsMs{
 	font-size: 18rpx;
@@ -1313,5 +1336,6 @@ line-height: 33rpx;
 	border-radius: 6rpx;
 	border: 1rpx solid #FF063A;
 	margin-right: 16rpx;
+	margin-bottom: 16rpx;
 }
 </style>

pages/user/historySpend.vue

@@ -138,7 +138,7 @@
 		
 
 		<!-- 上拉 加载更多 -->
-		<view class="noMore" v-if="noMoreShow && (itemData.length!=0)">没有更多数据</view>
+		<view class="noMore" v-if="noMoreShow && itemData.length!=0">没有更多数据</view>
 		<!-- 无数据空白页 -->
 		<nodata v-if="itemData.length==0&&oldlist.length==0"></nodata>
         <!-- 手机号授权 -->

pages/user/myOrder/activityOrderDetail.vue

@@ -16,9 +16,9 @@
 		<view class="status_bar" :style="{height: iStatusBarHeight + 'px'}"></view>
 		<view style="height: 44px;"></view> -->
 		<homenav :iStatusBarHeight="iStatusBarHeight" :title="'订单详情'" :cj="3"></homenav>
-		<view class="shuaxin" v-if="orderData.data.sheetState == 1 &&sx" @click="shuaxinFn">
+		<!-- <view class="shuaxin" v-if="orderData.data.sheetState == 1 &&sx" @click="shuaxinFn">
 			如果支付状态未及时更新，请点击 <span style="color: #3F90F7;">刷新</span> 
-		</view>
+		</view> -->
 		<view class="topBox">
 			<view class="top" >
 				<view class="orderState">

pages/user/myOrder/mallOrderDetail.vue

@@ -16,9 +16,9 @@
 		<view class="status_bar" :style="{height: iStatusBarHeight + 'px'}"></view>
 		<view style="height: 44px;"></view> -->
 		<homenav :iStatusBarHeight="iStatusBarHeight" :title="'订单详情'" :cj="3"></homenav>
-		<view class="shuaxin" v-if="orderData.data.sheetState == 1 &&sx" @click="shuaxinFn">
+		<!-- <view class="shuaxin" v-if="orderData.data.sheetState == 1 &&sx" @click="shuaxinFn">
 			如果支付状态未及时更新，请点击 <span style="color: #3F90F7;">刷新</span> 
-		</view>
+		</view> -->
 		<view class="topBox">
 			<view class="top" >
 				<view class="orderState">

pages/user/myOrder/paintOrderDetail.vue

@@ -16,9 +16,9 @@
 		<view class="status_bar" :style="{height: iStatusBarHeight + 'px'}"></view>
 		<view style="height: 44px;"></view> -->
 		<homenav :iStatusBarHeight="iStatusBarHeight" :title="'订单详情'" :cj="3"></homenav>
-		<view class="shuaxin" v-if="orderData.data.sheetState == 1 &&sx" @click="shuaxinFn">
+		<!-- <view class="shuaxin" v-if="orderData.data.sheetState == 1 &&sx" @click="shuaxinFn">
 			如果支付状态未及时更新，请点击 <span style="color: #3F90F7;">刷新</span> 
-		</view>
+		</view> -->
 		<view class="topBox">
 			<view class="top" >
 				<view class="orderState">