test

components/cm-module/orderDetails/orderButton.vue

@@ -3,12 +3,12 @@
 		<!-- 底部按钮 -->
 		<view class="button-content">
 			<view class="btn btn-payment" v-if="order.affirmPaymentFlag=='00'" @click.stop="btnConfirm('payment',order)">确认打款<text>供应商</text></view>
+			<view class="btn btn-confirm" v-if="btnState.isConfirmation" @click.stop="btnConfirm('confirmation',order)">确认订单</view>
 			<view class="btn btn-pay" v-if="btnState.isPay" @click.stop="btnConfirm('pay',order)">付款</view>
 			<view class="btn btn-share" @click.stop="onShareCode">
 				<view class="tips" v-if="shareCode">分享码：{{shareCode}}</view>
 				分享订单
 			</view>
-			<view class="btn btn-pay" v-if="btnState.isConfirmation" @click.stop="btnConfirm('confirmation',order)">确认订单</view>
 			<view class="btn btn-cancel" v-if="btnState.isCancel" @click.stop="btnConfirm('cancel',order)">取消订单</view>
 			<view class="btn btn-delete" v-if="btnState.isDelete" @click.stop="btnConfirm('delete',order)">删除订单</view>
 			<view class="btn btn-query" v-if="btnState.isQuery" @click.stop="btnConfirm('query',order)">查看物流</view>
@@ -191,8 +191,8 @@
 			}
 			.btn-confirm{
 				color: #FFFFFF;
-				border: 2rpx solid ;
-				background:linear-gradient(315deg,rgba(231,0,0,1) 0%,rgba(255,104,1,1) 100%);
+				border: 2rpx solid #ff7a51;
+				background:#ff7a51;
 			}
 			.btn-pay{
 				background:#f94b4b;
@@ -201,8 +201,6 @@
 				color: #fff;
 			}
 			.btn-share{
-				// background:linear-gradient(315deg,rgba(0,212,150,1) 0%,rgba(126,243,174,1) 100%);
-				// position: relative;
 				.tips{
 					width: 160rpx;
 					height: 34rpx;

components/cm-module/productDetails/secondPrice.vue

@@ -16,7 +16,7 @@
 			<view class="wrap-main-item">
 				<view class="p-price tui-skeleton-fillet">
 					<text class="txt sm">￥</text>
-					<text class="txt big" v-if="product.detailTalkFlag==2">价格详聊</text>
+					<text class="txt big" v-if="product.detailTalkFlag==2">详聊</text>
 					<text class="txt big" v-else>{{product.price1Str}}</text>
 				</view>
 			</view>

second/pages/form/form.vue

@@ -556,7 +556,6 @@
 			font-size: $font-size-20;
 		}
 		.upload-file {
-		    position: relative;
 		    float: left;
 		    margin: 20rpx 20rpx 20rpx 0px;
 		    cursor: pointer;

second/pages/product/product-list.vue

@@ -14,7 +14,7 @@
 			<view class="secondTitle">
 				<view class="ClassA" @click="handle('1')" :class="[currentId == '1' ? 'active':'',currentId == '1' ? 'off':'']">
 					{{ tabTitleName }}
-					<text class="iconfont" :class="mainflag ? 'icon-xiangxiajiantou':'icon-xiangshangjiantou'"></text>
+					<text class="iconfont" :class="mainflag ? 'icon-xiangshangjiantou':'icon-xiangxiajiantou'"></text>
 					<view class="line" v-if="currentId == '1'"></view>
 				</view>
 				<view class="ClassA" @click="handle('2')" :class="[currentId == '2' ? 'active':'',currentId == '2' ? 'off':'']">
@@ -378,17 +378,17 @@
 		width: 29vw;
 		position: absolute;
 		z-index: 1;
-	}
-	.mainTab .li.addstyle {
-		color: #e15616;
-	}
-	.mainTab  {
+		border-radius: 6rpx;
+		box-shadow:0rpx 6rpx 12rpx 0rpx rgba(0, 0, 0, 0.07);
 		.li{
 			height: 80rpx;
 			line-height: 80rpx;
 			text-align: center;
 			color: #627386;
 			cursor: pointer;
+			&.addstyle{
+				color: #e15616;
+			}
 		}
 		.line {
 			width: 75rpx;

seller/pages/order/create-order.vue

@@ -54,7 +54,7 @@
 		</seller-regulations>
 		<regula-alert v-if="isregulaTip" ref="csPhone"></regula-alert>
 		<!-- 返佣订单 -->
-		<view class="Rebate" @click="RebateChang" v-if="goodsData.length==1">
+		<view class="Rebate" @click="RebateChang" v-if="goodsData.length==1 && secondflag">
 			<text class="rebate-title">返佣订单</text>
 			<text class="iconfont" :class="rebatecheck?'icon-yixuanze':'icon-weixuanze'" ></text>
 		</view>
@@ -140,7 +140,8 @@
 				seconDepositFlg:true,
 				rebateFlag:0,
 				rebatecheck:false,
-				productsList:[]
+				productsList:[],
+				secondflag:true
 			}
 		},
 		onLoad(option){//商品数据
@@ -186,6 +187,7 @@
 						this.isRequest = true
 						this.goodsData = resData.shopList
 						this.userMoney = resData.userMoney
+						this.secondflag = false
 					}).catch(error =>{
 						this.$util.msg(error.msg,2000)
 					})

supplier/pages/user/information.vue

@@ -202,26 +202,30 @@
 			</view>
 			<view class="zizhi">
 				<view class="info2-title zizhi-title hoor">荣誉证书</view>
-				<view class="uploadImage list-image">
-					<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 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>
 			</view>
 			<view class="zizhi">
 				<view class="info2-title zizhi-title hoor">产品证书</view>
 				<view class="uploadImage list-image">
-					<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  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>
 			</view>
 		</view>
@@ -807,8 +811,8 @@
 			 padding: 0 24rpx;
 			 &.list-image{
 				 overflow: hidden;
-				 display: flex;
-				 overflow-x: auto;
+				 // display: flex;
+				 // overflow-x: auto;
 				 padding-top: 20rpx;
 				 .formLine-file{
 					 float: left;
@@ -820,10 +824,12 @@
 					  position: relative;
 					  display: inline-block;
 					  margin: 0 15rpx;
+					  display: flex;
+					  align-items: center;
 				 }
 			 }
 			 .form-upload-image{
-				 width: 256rpx;
+				 width: 200rpx;
 				 height:180rpx; 
 				 position: relative;
 				 .upload-img{