替换修改小程序图标

components/cm-module/cm-seller/user.vue

@@ -84,7 +84,9 @@
 			<view class="foot-list">
 				<view class="list-cell-item">
 					<view class="list-cell"  v-for="(item, index) in firstList" :key="index" @click="navigator(item.path)" hover-class="cell-hover" :hover-stay-time="50">
-						<text class="cell-icon"><text class="iconfont" :class="item.icon"></text></text>
+						<view class="cell-icon">
+							<image class="cell-icon-image" :src="item.icon" mode=""></image>
+						</view>
 						<text class="cell-tit">{{item.name}}</text>
 						<text 	v-if="index == 1 && orderNum >0"
 								class="uni-badge uni-badge-error uni-small uni-badge--small icon-num">
@@ -95,7 +97,9 @@
 				</view>
 				<view class="list-cell-item">
 					<view class="list-cell"  v-for="(item, index) in twoList" :key="index" @click="navigator(item.path)" hover-class="cell-hover" :hover-stay-time="50">
-						<text class="cell-icon"><text class="iconfont" :class="item.icon"></text></text>
+						<view class="cell-icon">
+							<image class="cell-icon-image" :src="item.icon" mode=""></image>
+						</view>
 						<text class="cell-tit">{{item.name}}</text>
 						<text class="cell-more iconfont icon-xiayibu"></text>
 					</view>
@@ -139,14 +143,38 @@
 				refundsCount:'', //退货/款角标
 				institutionsCont:120,
 				firstList:[
-					{name:'待注册机构',path:'/seller/pages/club/stayClub-list',icon:'icon-daizhucejigou'},
-					{name:'机构列表',path:'/seller/pages/club/list',icon:'icon-jigouliebiao'},
-					{name:'拉机构上线',path:'/seller/pages/login/register-select',icon:'icon-lajigoushangxian'},
-					{name:'邀请运营人员',path:'/seller/pages/club/allClub-list',icon:'icon-yaoqingyunyingrenyuan'}
+					{
+						name:'待注册机构',
+						path:'/seller/pages/club/stayClub-list',
+						icon:'https://static.caimei365.com/app/img/icon/icon_seller_1@2x.png',
+					},
+					{
+						name:'机构列表',
+						path:'/seller/pages/club/list',
+						icon:'https://static.caimei365.com/app/img/icon/icon_seller_2@2x.png',
+					},
+					{
+						name:'拉机构上线',
+						path:'/seller/pages/login/register-select',
+						icon:'https://static.caimei365.com/app/img/icon/icon_seller_3@2x.png',
+					},
+					{
+						name:'邀请运营人员',
+						path:'/seller/pages/club/allClub-list',
+						icon:'https://static.caimei365.com/app/img/icon/icon_seller_4@2x.png',
+					}
 				],
 				twoList:[
-					{name:'帮机构下单',path:'/seller/pages/club/club-list',icon:'icon-bangjigouxiadan'},
-					{name:'发布二手商品',path:'/second/pages/form/form-seller',icon:'icon-shangpin'}
+					{
+						name:'帮机构下单',
+						path:'/seller/pages/club/club-list',
+						icon:'https://static.caimei365.com/app/img/icon/icon_seller_5@2x.png',
+					},
+					{
+						name:'发布二手商品',
+						path:'/second/pages/form/form-seller',
+						icon:'https://static.caimei365.com/app/img/icon/icon_seller_6@2x.png',
+					}
 				]
 			}
 		},
@@ -486,14 +514,12 @@
 		border-radius: 20rpx;
 	}
 	.list-cell{
-		display:flex;
 		width: 100%;
-		align-items:baseline;
 		line-height:100rpx;
 		position:relative;
 		background: $bg-color;
-		justify-content: center;
 		border-bottom: 1px solid #EBEBEB;
+		height: 100rpx;
 		&:last-child{
 			border-bottom: none;
 		}
@@ -503,15 +529,24 @@
 		.cell-icon{
 			width: 60rpx;
 			height: 100rpx;
-			line-height: 100rpx;
 			text-align: center;
-			.iconfont{
-				font-size: $font-size-34;
-				color: #666666;
+			box-sizing: border-box;
+			padding: 32rpx 12rpx;
+			float: left;
+			.cell-icon-image{
+				width: 36rpx;
+				height: 36rpx;
+				display: block;
 			}
 		}
 		.cell-more{
-			align-self: baseline;
+			width: 60rpx;
+			height: 100rpx;
+			line-height: 100rpx;
+			text-align: right;
+			position: absolute;
+			right: 0;
+			top: 0;
 			font-size:$font-size-28;
 			color:#666666;
 			.txt{
@@ -520,7 +555,9 @@
 			}
 		}
 		.cell-tit{
-			flex: 1;
+			width: 465rpx;
+			display: block;
+			float: left;
 			font-size: $font-size-28;
 			color: #666666;
 			margin-right:10rpx;

components/cm-module/homeIndex/banner.vue

@@ -1,17 +1,19 @@
 <template>
 	<view>
-		<view class="swiper-banner-box" >
-			<swiper class="tui-banner-swiper tui-banner tui-skeleton-fillet" :autoplay="true" :interval="5000" :duration="500"  @change="swiperChange" :circular="true">
-				<swiper-item v-for="(item,index) in list" :key="index" @click.stop="NavToDetailPage(item)">
-					<image :src="item.image" class="tui-slide-image" mode="scaleToFill"/>
-				</swiper-item>
-			</swiper>
-			<view class="swiper__dots-box" v-if="list.length > 1">
-				<view v-for="(item,idx) in list" 
-					  :key="idx" 
-					  :class="[idx===current?'swiper__dots-long':'none']" 
-					  :data-index="current" class="swiper__dots-item">
-				</view>	  
+		<view class="swiper-banner-content">
+			<view class="swiper-banner-box" >
+				<swiper class="tui-banner-swiper tui-banner tui-skeleton-fillet" :autoplay="true" :interval="5000" :duration="500"  @change="swiperChange" :circular="true">
+					<swiper-item v-for="(item,index) in list" :key="index" @click.stop="NavToDetailPage(item)">
+						<image :src="item.image" class="tui-slide-image" mode="scaleToFill"/>
+					</swiper-item>
+				</swiper>
+				<view class="swiper__dots-box" v-if="list.length > 1">
+					<view v-for="(item,idx) in list" 
+						  :key="idx" 
+						  :class="[idx===current?'swiper__dots-long':'none']" 
+						  :data-index="current" class="swiper__dots-item">
+					</view>	  
+				</view>
 			</view>
 		</view>
 		<view class="swiper-banner-msg">
@@ -62,11 +64,18 @@
 </script>
 
 <style lang="scss">
+	.swiper-banner-content{
+		width: 100%;
+		height: 200rpx;
+		padding-top:100rpx;
+		background:#F28F31;
+		position: relative;
+		background-size: cover;
+		margin-bottom: 170rpx;
+	}
 	.swiper-banner-box{
 		width: 100%;
 		height: 360rpx;
-		padding-top:100rpx;
-		background:#FFFFFF url(https://img.caimei365.com/group1/M00/03/B0/Cmis217Z9LCALu9wAAAv45Bdpsk814.png)no-repeat;
 		position: relative;
 		background-size: cover;
 	}	
@@ -120,7 +129,7 @@
 		height: 54rpx;
 		box-sizing: border-box;
 		padding: 0 24rpx;
-		margin-top: 20rpx;
+		margin-top: 24rpx;
 		.content{
 			width: 100%;
 			height: 54rpx;

components/cm-module/homeIndex/customer.vue

@@ -77,7 +77,7 @@
 		 top: 0;
 		 z-index: 100000;
 		 box-sizing: border-box;
-		 background: url(https://img.caimei365.com/group1/M00/03/B0/Cmis217Z9LCAF_anAADHlsIu3aE475.png);
+		 background: url(https://static.caimei365.com/app/img/bg/home_cumres@2x.png);
 		 background-size: cover;
 		 border-bottom:none;
 	}

components/cm-module/homeIndex/navbars.vue

@@ -72,7 +72,7 @@
 		height: auto;
 		box-sizing: border-box;
 		padding: 0 24rpx;
-		margin-top: 30rpx;
+		margin-top: 24rpx;
 		.nav-item{
 			width: 164rpx;
 			height: auto;

components/cm-module/productDetails/secondRecommend.vue

@@ -73,10 +73,11 @@
 .recommend{
 	width: 100%;
 	.recommend-empty{
-		width: 702rpx;
+		width: 100%;
 		// height: 100rpx;
 		line-height: 100rpx;
 		padding: 40rpx 24rpx;
+		box-sizing: border-box;
 		font-size: $font-size-28;
 		color: #999999;
 		text-align: center;

components/cm-module/supplier/user.vue

@@ -61,7 +61,9 @@
 			<view class="foot-list">
 				<view class="list-cell-item">
 					<view class="list-cell" hover-class="cell-hover" :hover-stay-time="50" @click="navigator('/supplier/pages/order/order-list')">
-						<text class="cell-icon"><text class="iconfont icon-wodedingdan"></text></text>
+						<view class="cell-icon">
+							<image class="cell-icon-image" src="https://static.caimei365.com/app/img/icon/icon_club_11@2x.png" mode=""></image>
+						</view>
 						<text class="cell-tit">我的订单</text>
 						<text class="cell-more iconfont icon-xiayibu"></text>
 						<text class="cell-more"></text>
@@ -69,24 +71,32 @@
 				</view>	
 				<view class="list-cell-item">
 					<view class="list-cell"  v-for="(item, index) in firstList" :key="index" @click="navigator(item.path)" hover-class="cell-hover" :hover-stay-time="50">
-						<text class="cell-icon"><text class="iconfont" :class="item.icon"></text></text>
+						<view class="cell-icon">
+							<image class="cell-icon-image" :src="item.icon" mode=""></image>
+						</view>
 						<text class="cell-tit">{{item.name}}</text>
 						<text class="cell-more iconfont icon-xiayibu"></text>
 					</view>
 				</view>
 				<view class="list-cell-item">
 					<view class="list-cell" hover-class="cell-hover" :hover-stay-time="50">
-						<text class="cell-icon"><text class="iconfont icon-lianxiwomen"></text></text>
-						<text class="cell-tit">联系我们</text>
-						<text class="cell-more" @click="toPhone">{{ contactNumber }}</text>
+						<view class="cell-icon">
+							<image class="cell-icon-image" src="https://static.caimei365.com/app/img/icon/icon_club_5@2x.png" mode=""></image>
+						</view>
+						<text class="cell-tit cont">联系我们</text>
+						<text class="cell-more cont" @click="toPhone">{{contactNumber}}</text>
 					</view>
 					<view class="list-cell" @click="this.$api.navigateTo('/pages/user/about/about')" hover-class="cell-hover" :hover-stay-time="50">
-						<text class="cell-icon"><text class="iconfont icon-guanyuwomen"></text></text>
+						<view class="cell-icon">
+							<image class="cell-icon-image" src="https://static.caimei365.com/app/img/icon/icon_club_6@2x.png" mode=""></image>
+						</view>
 						<text class="cell-tit">关于我们</text>
 						<text class="cell-more iconfont icon-xiayibu"></text>
 					</view>
 					<view class="list-cell last" @click="this.$api.navigateTo('/h5/pages/article/page?linkType=99')" hover-class="cell-hover" :hover-stay-time="50">
-						<text class="cell-icon"><text class="iconfont icon-bangzhuzhongxin"></text></text>
+						<view class="cell-icon">
+							<image class="cell-icon-image" src="https://static.caimei365.com/app/img/icon/icon_club_7@2x.png" mode=""></image>
+						</view>
 						<text class="cell-tit">帮助中心</text>
 						<text class="cell-more iconfont icon-xiayibu"></text>
 					</view>
@@ -130,9 +140,21 @@
 				upNum:0, 	//已上架
 				downNum:0, //已下架
 				firstList:[
-					{name:'运营人员管理',path:'/supplier/pages/user/operator/list',icon:'icon-yunyingrenyuanguanli'},
-					{name:'我的资料',path:'/supplier/pages/user/information',icon:'icon-wodeziliao'},
-					{name:'账户设置',path:'/supplier/pages/user/setting/setting',icon:'icon-zhanghushezhi'},
+					{
+						name:'运营人员管理',
+						path:'/supplier/pages/user/operator/list',
+						icon:'https://static.caimei365.com/app/img/icon/icon_club_1@2x.png',
+					},
+					{
+						name:'我的资料',
+						path:'/supplier/pages/user/information',
+						icon:'https://static.caimei365.com/app/img/icon/icon_club_12@2x.png',
+					},
+					{
+						name:'账户设置',
+						path:'/supplier/pages/user/setting/setting',
+						icon:'https://static.caimei365.com/app/img/icon/icon_club_4@2x.png',
+					},
 				]
 			}
 		},
@@ -466,14 +488,12 @@
 		border-radius: 20rpx;
 	}
 	.list-cell{
-		display:flex;
 		width: 100%;
-		align-items:baseline;
 		line-height:100rpx;
 		position:relative;
 		background: $bg-color;
-		justify-content: center;
 		border-bottom: 1px solid #EBEBEB;
+		height: 100rpx;
 		&:last-child{
 			border-bottom: none;
 		}
@@ -483,27 +503,44 @@
 		.cell-icon{
 			width: 60rpx;
 			height: 100rpx;
-			line-height: 100rpx;
 			text-align: center;
-			.iconfont{
-				font-size: $font-size-34;
-				color: #666666;
+			box-sizing: border-box;
+			padding: 32rpx 12rpx;
+			float: left;
+			.cell-icon-image{
+				width: 36rpx;
+				height: 36rpx;
+				display: block;
 			}
 		}
 		.cell-more{
-			align-self: baseline;
+			width: 60rpx;
+			height: 100rpx;
+			line-height: 100rpx;
+			text-align: right;
+			position: absolute;
+			right: 0;
+			top: 0;
 			font-size:$font-size-28;
 			color:#666666;
+			&.cont{
+				width: 250rpx;
+			}
 			.txt{
 				color: #FB4343;
 				padding-right: 10rpx;
 			}
 		}
 		.cell-tit{
-			flex: 1;
+			width: 465rpx;
+			display: block;
+			float: left;
 			font-size: $font-size-28;
 			color: #666666;
 			margin-right:10rpx;
+			&.cont{
+				width: 300rpx;
+			}
 		}
 		.cell-tip{
 			font-size: $font-size-28;

pages.json

@@ -5,7 +5,7 @@
 			"style": {
 				"navigationBarTitleText": "采美采购商城",
 				"enablePullDownRefresh":true,
-				"backgroundColor":"#E15616",
+				"backgroundColor":"#F28F31",
 				"backgroundTextStyle":"light",
 				"navigationStyle":"custom"
 			}

pages/tabBar/user/user.vue

@@ -120,13 +120,15 @@
 				</view>
 			</view>
 			<!-- 底部跳转 -->
-			<view class="foot-list" :style="{paddingTop: hasLogin ? '380rpx': '160rpx'}">
+			<view class="foot-list" :style="{paddingTop: hasLogin ? '370rpx': '170rpx'}">
 			<!-- 	<view class="list-cell-avtiv" @click="navigator('/pages/user/coupon/coupon')">
 					<image src="http://static.caimei365.com/app/meibohui/app/activity-in.png" mode=""></image>
 				</view> -->
 				<view class="list-cell-item" v-show="hasLogin">
 					<view class="list-cell" v-show="userIdentity == 4" @click="navigatorClubUpgrade(`/pages/login/apply?clubStatus=${clubStatus}`)" hover-class="cell-hover" :hover-stay-time="50">
-						<text class="cell-icon"><text class="iconfont icon-shengjihuiyuanjigou"></text></text>
+						<view class="cell-icon">
+							<image class="cell-icon-image" src="https://static.caimei365.com/app/img/icon/icon_club_8@2x.png" mode=""></image>
+						</view>
 						<text class="cell-tit">
 							升级会员机构
 							<text class="cell-tips">采美豆</text>
@@ -137,14 +139,18 @@
 						</text>
 					</view>
 					<view class="list-cell" @click="navigator('/pages/user/regularPurchase/regularPurchase')" hover-class="cell-hover" :hover-stay-time="50">
-						<text class="cell-icon"><text class="iconfont icon-zaicigoumai"></text></text>
+						<view class="cell-icon">
+							<image class="cell-icon-image" src="https://static.caimei365.com/app/img/icon/icon_club_9@2x.png" mode=""></image>
+						</view>
 						<text class="cell-tit">再次购买</text>
 						<text class="cell-more iconfont icon-xiayibu"></text>
 					</view>
 				</view>
 				<view class="list-cell-item">
 					<view class="list-cell"  v-for="(item, index) in firstList" :key="index" @click="navigator(item.path)" hover-class="cell-hover" :hover-stay-time="50">
-						<text class="cell-icon"><text class="iconfont" :class="item.icon"></text></text>
+						<view class="cell-icon">
+							<image class="cell-icon-image" :src="item.icon" mode=""></image>
+						</view>
 						<text class="cell-tit">
 							{{item.name}}
 							<text class="cell-tips" v-if="index == 2 && isModify">采美豆</text>
@@ -154,17 +160,23 @@
 				</view>
 				<view class="list-cell-item">
 					<view class="list-cell" hover-class="cell-hover" :hover-stay-time="50">
-						<text class="cell-icon"><text class="iconfont icon-lianxiwomen"></text></text>
-						<text class="cell-tit">联系我们</text>
-						<text class="cell-more" @click="toPhone">{{contactNumber}}</text>
+						<view class="cell-icon">
+							<image class="cell-icon-image" src="https://static.caimei365.com/app/img/icon/icon_club_5@2x.png" mode=""></image>
+						</view>
+						<text class="cell-tit cont">联系我们</text>
+						<text class="cell-more cont" @click="toPhone">{{contactNumber}}</text>
 					</view>
 					<view class="list-cell" @click="this.$api.navigateTo('/pages/user/about/about')" hover-class="cell-hover" :hover-stay-time="50">
-						<text class="cell-icon"><text class="iconfont icon-guanyuwomen"></text></text>
+						<view class="cell-icon">
+							<image class="cell-icon-image" src="https://static.caimei365.com/app/img/icon/icon_club_6@2x.png" mode=""></image>
+						</view>
 						<text class="cell-tit">关于我们</text>
 						<text class="cell-more iconfont icon-xiayibu"></text>
 					</view>
 					<view class="list-cell last" @click="this.$api.navigateTo('/h5/pages/article/page?linkType=99')" hover-class="cell-hover" :hover-stay-time="50">
-						<text class="cell-icon"><text class="iconfont icon-bangzhuzhongxin"></text></text>
+						<view class="cell-icon">
+							<image class="cell-icon-image" src="https://static.caimei365.com/app/img/icon/icon_club_7@2x.png" mode=""></image>
+						</view>
 						<text class="cell-tit">帮助中心</text>
 						<text class="cell-more iconfont icon-xiayibu"></text>
 					</view>
@@ -224,10 +236,26 @@
 				shipmentsCount:0,  		// 已发货角标
 				salesReturnCount:'',	// 退货/款角标
 				firstList:[
-					{name:'运营人员管理',path:'/pages/user/operator/list',icon:'icon-yunyingrenyuanguanli'},
-					{name:'收货地址管理',path:'/pages/user/address/address',icon:'icon-shouhuodizhiguanli'},
-					{name:'机构资料',path:'/pages/login/information',icon:'icon-jigouziliao'},
-					{name:'账户设置',path:'/pages/user/setting/setting',icon:'icon-zhanghushezhi'},
+					{
+						name:'运营人员管理',
+						path:'/pages/user/operator/list',
+						icon:'https://static.caimei365.com/app/img/icon/icon_club_1@2x.png',
+					},
+					{
+						name:'收货地址管理',
+						path:'/pages/user/address/address',
+						icon:'https://static.caimei365.com/app/img/icon/icon_club_2@2x.png',
+					},
+					{
+						name:'机构资料',
+						path:'/pages/login/information',
+						icon:'https://static.caimei365.com/app/img/icon/icon_club_3@2x.png',
+					},
+					{
+						name:'账户设置',
+						path:'/pages/user/setting/setting',
+						icon:'https://static.caimei365.com/app/img/icon/icon_club_4@2x.png',
+					},
 				]
 			}
 		},
@@ -748,14 +776,12 @@
 		border-radius: 20rpx;
 	}
 	.list-cell{
-		display:flex;
 		width: 100%;
-		align-items:baseline;
 		line-height:100rpx;
 		position:relative;
 		background: $bg-color;
-		justify-content: center;
 		border-bottom: 1px solid #EBEBEB;
+		height: 100rpx;
 		&:last-child{
 			border-bottom: none;
 		}
@@ -765,28 +791,44 @@
 		.cell-icon{
 			width: 60rpx;
 			height: 100rpx;
-			line-height: 100rpx;
 			text-align: center;
-			.iconfont{
-				font-size: $font-size-34;
-				color: #666666;
+			box-sizing: border-box;
+			padding: 32rpx 12rpx;
+			float: left;
+			.cell-icon-image{
+				width: 36rpx;
+				height: 36rpx;
+				display: block;
 			}
 		}
 		.cell-more{
-			align-self: baseline;
+			width: 60rpx;
+			height: 100rpx;
+			line-height: 100rpx;
+			text-align: right;
+			position: absolute;
+			right: 0;
+			top: 0;
 			font-size:$font-size-28;
 			color:#666666;
-			margin-left:10rpx;
+			&.cont{
+				width: 250rpx;
+			}
 			.txt{
 				color: #FB4343;
 				padding-right: 10rpx;
 			}
 		}
 		.cell-tit{
-			flex: 1;
+			width: 465rpx;
+			display: block;
+			float: left;
 			font-size: $font-size-28;
 			color: #666666;
 			margin-right:10rpx;
+			&.cont{
+				width: 300rpx;
+			}
 			.cell-tips{
 				width: 74rpx;
 				height: 32rpx;

second/pages/form/form-seller.vue

@@ -6,30 +6,28 @@
 					<view class="nestext">欢迎您来到采美365网二手商品市场，您可以在这里发布二手设备/产品信息，每个商品需要收取您100元的展示费，展示期为3个月； 为了完整展示您的商品，请您认真填写以下内容，谢谢合作</view>
 	             </view>
 				 <form>
-					 <view class="row fenlei"> 
-						 <view class="label">分类</view>
-						 <view class="secondradio">
-							  <radio-group class="row-group" @change="secondHandRidio" >
-							  	<label class="row-input" v-for="(item, index) in fenlei" :key="index">
+					<view class="row fenlei">
+						<view class="label">分类</view>
+						<view class="secondradio">
+							<radio-group class="row-group" @change="secondHandRidio" >
+								<label class="row-input" v-for="(item, index) in fenlei" :key="index">
 									<radio class="row-radio" :value="item.value" color="#E15616"/>
-							  		<view class="row-text">{{item.name}}</view>
-							  	</label>
-							  </radio-group>
-						  </view>
-						  <view class="secondradio Secondary"  v-if="isShow" >
-							  <checkbox-group class="row-group" @change="secondHandType">
-									<label class="row-input" v-for="(item, index) in radioList" :key="item.value" >
-										<checkbox class="row-check" :value="item.value" ></checkbox>
-										<view class="row-text">{{item.name}}</view>
-									</label>
-							  </checkbox-group>
-						  </view>
-						  <view class="linqi_text" v-show="secondParams.secondHandType==2">
-							  <view class="jiaobiao"></view>
-							  <p class="p">临期产品是指临近保质期的产品，距离到期日最好在3个月以上</p>
-						  </view>
-					 </view>
-					 <view class="row">
+									<view class="row-text">{{item.name}}</view>
+								</label>
+							</radio-group>
+						</view>
+					</view>
+					<view class="row fenlei"  v-if="isShow">
+					 	<view class="secondradio Secondary" >
+							<checkbox-group class="row-group" @change="secondHandType">
+								<label class="row-input" v-for="(item, index) in radioList" :key="item.value" >
+									<checkbox class="row-check" :value="item.value" ></checkbox>
+									<view class="row-text">{{item.name}}</view>
+								</label>
+							</checkbox-group>
+					 	</view>
+					</view>
+					<view class="row">
 						<view class="label">商品品牌</view>
 						<view class="select spacing"  @click="hanldOperationConfim">
 							 <view class="placeholder" :style="brandname=='请选择品牌名称'?'':'color:#333333'">{{brandname}}</view>
@@ -53,25 +51,25 @@
 								</view>
 							</view>	
 						</tui-bottom-popup>	
-					 </view>
-					 <view class="row" v-if="secondParams.brandId==161">
-						 <view class="label">其它品牌</view>
-						 <view class="spacing">
+					</view>
+					<view class="row" v-if="secondParams.brandId==161">
+						<view class="label">其它品牌</view>
+						<view class="spacing">
 							 <input type="text" maxlength="40" v-model="secondParams.brandName" placeholder="请输入商品品牌" placeholder-class="placeholder">
-						 </view>
-					 </view>
-					 <view class="row">
-						 <view class="label">商品名称</view>
-						 <view class="spacing">
+						</view>
+					</view>
+					<view class="row">
+						<view class="label">商品名称</view>
+						<view class="spacing">
 							 <input type="text" maxlength="40"  v-model="secondParams.name" placeholder="请输入商品名称，不超过40个汉字" placeholder-class="placeholder">
-						 </view>
-					 </view>
-					 <view class="row">
-						 <view class="label">出厂日期</view>
-						 <view class="spacing">
+						</view>
+					</view>
+					<view class="row">
+						<view class="label">出厂日期</view>
+						<view class="spacing">
 							<input type="text" v-model="secondParams.fixedYears"  maxlength="10" placeholder="请输入出厂日期 如：2020年06月" placeholder-class="placeholder">
-						 </view>
-					 </view>
+						</view>
+					</view>
 					 <!-- <view class="row"  v-show="secondParams.secondHandType==2">
 						 <view class="label second">产品到期日</view>
 						 <view class="spacing second">
@@ -147,20 +145,20 @@
 								<i class=" del iconfont icon-shanchu1" @click="removeUserImageFn"></i>
 							</view>
 						</view>
-					 </view>
-					 <view class="row">
+					</view>
+					<view class="row">
 						 <view class="label">采美对接人</view> 
 						 <view class="spacing">
 							 <input type="text" v-model="secondParams.dockingPeopleName" maxlength="15" placeholder="请输入采美对接人姓名" placeholder-class="placeholder">
 					    </view> 
-					 </view>
-					 <view class="row">
+					</view>
+					<view class="row">
 						 <view class="label">对接人联系方式</view>
 						 <view class="spacing">
 							 <input type="text" v-model="secondParams.dockingPeopleMobile" maxlength="11" placeholder="请输入采美对接人手机号" placeholder-class="placeholder">
 					    </view> 
-					 </view>
-					 <view class="row">
+					</view>
+					<view class="row">
 						 <view class="label">商品类型</view>
 						 <view class="secondradio">
 							 <radio-group class="row-group" @change="getProductType" >
@@ -170,7 +168,7 @@
 							 	</label>
 							 </radio-group>
 						 </view>
-					 </view>
+					</view>
 					<view class="row" >
 						 <view class="label">联系地址</view>
 						 <view class="spacing"  @click="showMulLinkageThreePicker">
@@ -179,8 +177,8 @@
 							 </text>		
 					    </view> 
 						<text class="iconfont icon-xiayibu"></text>
-					 </view>
-					 <textarea  type="text"  
+					</view>
+					<textarea  type="text"  
 								class="border-grey address-details" 
 								v-model="secondParams.address" 
 								maxlength="50"

second/pages/form/form.vue

@@ -7,27 +7,25 @@
 	             </view>
 				 <form>
 					 <view class="row fenlei"> 
-						 <view class="label">分类</view>
-						 <view class="secondradio">
-							  <radio-group class="row-group" @change="secondHandRidio" >
+						<view class="label">分类</view>
+						<view class="secondradio">
+							<radio-group class="row-group" @change="secondHandRidio" >
 							  	<label class="row-input" v-for="(item, index) in fenlei" :key="index">
 									<radio class="row-radio" :value="item.value" color="#E15616"/>
 							  		<view class="row-text">{{item.name}}</view>
 							  	</label>
-							  </radio-group>
-						  </view>
-						  <view class="secondradio Secondary"  v-if="isShow" >
-							  <checkbox-group class="row-group" @change="secondHandType">
-									<label class="row-input" v-for="(item, index) in radioList" :key="item.value" >
-										<checkbox class="row-check" :value="item.value" ></checkbox>
-										<view class="row-text">{{item.name}}</view>
-									</label>
-							  </checkbox-group>
-						  </view>
-						  <view class="linqi_text" v-show="secondParams.secondHandType==2">
-							  <view class="jiaobiao"></view>
-							  <p class="p">临期产品是指临近保质期的产品，距离到期日最好在3个月以上</p>
-						  </view>
+							</radio-group>
+						</view>
+					 </view>
+					 <view class="row fenlei"  v-if="isShow">
+					 	<view class="secondradio Secondary" >
+							<checkbox-group class="row-group" @change="secondHandType">
+								<label class="row-input" v-for="(item, index) in radioList" :key="item.value" >
+									<checkbox class="row-check" :value="item.value" checked="true"></checkbox>
+									<view class="row-text">{{item.name}}</view>
+								</label>
+							</checkbox-group>
+					 	</view>
 					 </view>
 					 <view class="row">
 						<view class="label">商品品牌</view>