Merge branch 'developerB' of git.caimei365.com:caimei-repository/caimei-applets-caimei into developerB

components/cm-module/orderDetails/goodsList.vue

@@ -7,7 +7,7 @@
 					<view v-if="item.shopPromotion" class="floor-item-act">
 						<view class="floor-tags" @click.stop="clickPopupShow(item.shopPromotion)">{{item.shopPromotion.name}}</view>	
 					</view>
-					<view class="title-text" v-if="secondHandOrderFlag==1">{{item.shopName}}</view>
+					<view class="title-text" v-if="information.secondHandOrderFlag==1">{{item.shopName}}<label class="paymenttext" v-if="information.affirmPaymentFlag==1">已确认打款供应商</label></view>
 					<view class="title-text" v-else @click="goShophome(item.shopID)">{{item.shopName}}<label class="iconfont icon-jinrudianpu"></label></view> 
 				</view>
 				<view class="productlist" v-for="(pros,idx) in item.orderProductList" :key="idx">
@@ -92,8 +92,8 @@
 			shopOrderData:{
 				type:Array
 			},
-			secondHandOrderFlag:{
-				type:String
+			information:{
+				type:Object
 			}
 		},
 		data() {
@@ -189,6 +189,11 @@
 						font-size: 28rpx;
 						margin-left: 10rpx;
 					}
+					.paymenttext{
+						color: #f9a94b;
+						font-size: $font-size-22;
+						margin-left: 20rpx;
+					}
 				}
 				
 			}

pages/user/order/order-details.vue

@@ -11,7 +11,7 @@
 			<!-- 地址选择 -->
 			<order-address ref="orderAddress" v-if="isRequest" :addressData="addressData"></order-address>
 			<!-- 商品 -->
-			<goods-list ref='goods' v-if="isRequest" :shopOrderData="shopOrderData" @popupClick="hanldePopupFn"></goods-list>
+			<goods-list ref='goods' v-if="isRequest" :shopOrderData="shopOrderData" :information="information" @popupClick="hanldePopupFn"></goods-list>
 			<!-- 订单信息 -->
 			<order-information ref="information" v-if="isRequest" :information="information"></order-information>
 			<!-- 发票信息 -->

pages/user/order/order-list.vue

@@ -37,7 +37,7 @@
 										<view v-if="shop.shopPromotion" class="floor-item-act">
 											<view class="floor-tags">{{shop.shopPromotion.name}}</view>	
 										</view>
-										<view class="title-text" v-if="order.secondHandOrderFlag==1">{{shop.shopName}}</view>
+										<view class="title-text" v-if="order.secondHandOrderFlag==1">{{shop.shopName}}<label class="paymenttext" v-if="order.affirmPaymentFlag==1">已确认打款供应商</label></view>
 										<view class="title-text tui-skeleton-fillet" v-else @click="goShophome(shop.shopID)">{{shop.shopName}}<label class="iconfont icon-jinrudianpu"></label></view>
 									</view>
 									<view class="goods-item" v-for="(pros,prosIndex) in shop.orderProductList" :key="prosIndex" @click.stop="detail(order.orderID)">
@@ -767,6 +767,11 @@
 				font-size: 28rpx;
 				margin-left: 10rpx;
 			}
+			.paymenttext{
+				color: #f9a94b;
+				font-size: $font-size-22;
+				margin-left: 20rpx;
+			}
 		}
 	}
 	.goods-item{

second/pages/product/product-details.vue

@@ -1332,7 +1332,7 @@
 		position: relative;
 		box-sizing: border-box;
 		min-height: 220rpx;
-		padding:0rpx 24rpx 0 24rpx;
+		padding:0rpx 24rpx 24rpx 24rpx;
 		.title{
 			font-size: $font-size-34;
 			color: $text-color;

seller/pages/order/order-details.vue

@@ -13,7 +13,7 @@
 			<!-- 地址选择 -->
 			<order-address ref="orderAddress" v-if="isRequest" :addressData="addressData"></order-address>
 			<!-- 商品 -->
-			<goods-list ref='goods' v-if="isRequest" :shopOrderData="shopOrderData" :secondHandOrderFlag="information.secondHandOrderFlag" @popupClick="hanldePopupFn"></goods-list>
+			<goods-list ref='goods' v-if="isRequest" :shopOrderData="shopOrderData" :information="information" @popupClick="hanldePopupFn"></goods-list>
 			<!-- 订单信息 -->
 			<order-information ref="information" v-if="isRequest" :information="information"></order-information>
 			<!-- 发票信息 -->

supplier/pages/user/information.vue

@@ -203,29 +203,25 @@
 			<view class="zizhi">
 				<view class="info2-title zizhi-title hoor">荣誉证书</view>
 					<view class="uploadImage list-image">
-						<scroll-view  scroll-x >
-							<view class="formLine-file" @click="uploadHonorImageFn" v-if="HonorImagesList.length<5" >
-									<view class="file-honor iconImage"></view>
-							 </view>
-							 <view class="form-upload-image" v-for="(item, index) in HonorImagesList" :key="index">
-								   <image class="upload-img" :src="item" alt="" @click="showViewerImageFn5()"></image>
-								   <view class="iconfont icon-shanchu1" @click="removeGoodsImagesFn(HonorImagesList)"></view>
-							 </view>
-						 </scroll-view>
+						<view class="formLine-file" @click="uploadHonorImageFn" v-if="HonorImagesList.length<5" >
+								<view class="file-honor iconImage"></view>
+						 </view>
+						 <view class="form-upload-image" v-for="(item, index) in HonorImagesList" :key="index">
+							   <image class="upload-img" :src="item" alt="" @click="showViewerImageFn5()"></image>
+							   <view class="iconfont icon-shanchu1" @click="removeGoodsImagesFn(HonorImagesList)"></view>
+						 </view>
 					</view>
 			</view>
 			<view class="zizhi">
 				<view class="info2-title zizhi-title hoor">产品证书</view>
 				<view class="uploadImage list-image">
-					<scroll-view  scroll-x>
-						<view class="formLine-file" @click="uploadproductImageFn" v-if="productImagesList.length<5" >
-								<view class="file-product iconImage"></view>
-						 </view>
-						 <view class="form-upload-image" v-for="(item, index) in productImagesList" :key="index">
-							   <image class="upload-img" :src="item" alt="" @click="showViewerImageFn6()"></image>
-							   <view class="iconfont icon-shanchu1" @click="removeproductImagesFn(index)"></view>
-						 </view>
-					</scroll-view> 
+					<view class="formLine-file" @click="uploadproductImageFn" v-if="productImagesList.length<5" >
+							<view class="file-product iconImage"></view>
+					 </view>
+					 <view class="form-upload-image" v-for="(item, index) in productImagesList" :key="index">
+						   <image class="upload-img" :src="item" alt="" @click="showViewerImageFn6()"></image>
+						   <view class="iconfont icon-shanchu1" @click="removeproductImagesFn(index)"></view>
+					 </view>
 				</view>
 			</view>
 		</view>
@@ -811,11 +807,16 @@
 			 padding: 0 24rpx;
 			 &.list-image{
 				 overflow: hidden;
-				 // display: flex;
-				 // overflow-x: auto;
+				 display: flex;
+				 overflow-x: auto;
+				 flex-shrink: 0;
 				 padding-top: 20rpx;
+				 max-width: 702rpx;
 				 .formLine-file{
 					 float: left;
+					 display: flex;
+					 flex-shrink: 0;
+					 margin-right: 15rpx;
 				 }
 				 .form-upload-image{
 					  float: left;
@@ -823,7 +824,7 @@
 					  flex-shrink: 0;
 					  position: relative;
 					  display: inline-block;
-					  margin: 0 15rpx;
+					  margin-right:15rpx;
 					  display: flex;
 					  align-items: center;
 				 }