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

# Conflicts:
#	second/pages/form/form.vue

second/pages/form/form.vue

@@ -73,12 +73,12 @@
 							<input type="text" v-model="secondParams.fixedYears"  maxlength="10" placeholder="请输入出厂日期 如：2020年06月" placeholder-class="placeholder">
 						 </view>
 					 </view>
-					 <view class="row"  v-show="secondParams.secondHandType==2">
+					 <!-- <view class="row"  v-show="secondParams.secondHandType==2">
 						 <view class="label second">产品到期日</view>
 						 <view class="spacing second">
 							<input type="text"  v-model="secondParams.maturityYears" maxlength="10" placeholder="请输入产品到期日，如：2020年12月" placeholder-class="placeholder">
 						 </view>
-					 </view>
+					 </view> -->
 					 <view class="row">
 						 <view class="label">公司名称</view>
 						 <view class="spacing">
@@ -98,13 +98,13 @@
 						 </label>
 						 <label class="showflag" v-show="vShow_detailTalkFlag">(勾选代表同意不显示交易价)</label>
 					 </view>
-					 <view class="row" v-show="secondParams.secondHandType==2">
+					<!-- <view class="row" v-show="secondParams.secondHandType==2">
 						 <view class="label">市场价</view>
 						 <view class="spacing">
 							  <input type="text"  v-model="secondParams.normalPrice" maxlength="30" placeholder="请输入市场价" placeholder-class="placeholder">
 						 </view>
-					 </view>
-					 <view class="row"  v-show="secondParams.secondHandType==2">
+					 </view> -->
+					<!-- <view class="row"  v-show="secondParams.secondHandType==2">
 						 <view class="label second">采购价/原价</view>
 						 <view class="spacing second">
 							  <input type="text"  v-model="secondParams.originalPrice" maxlength="30" placeholder="请输入采购价/原价" placeholder-class="placeholder"/>
@@ -115,7 +115,7 @@
 						 <view class="spacing"> 
 							  <input type="text"   v-model="secondParams.stock" maxlength="30"  placeholder="请输入数量" placeholder-class="placeholder">
 						 </view>
-					 </view>
+					 </view> -->
 					 <view class="row">
 						 <view class="label">商品成色</view>
 						 <view class="spacing">
@@ -248,7 +248,7 @@
 				popupShow:false,
 				fenlei:[
 				            {name:'二手仪器',value:'1'},
-				            {name:'临期产品',value:'2'},
+				            // {name:'临期产品',value:'2'},
 				            {name:'其他',value:'3'},
 				        ],
 				        radioList:[
@@ -386,6 +386,7 @@
 					  this.$util.msg('请输入商品名称',2000);
 						return
 				}
+<<<<<<< HEAD
 				 if(this.secondParams.secondHandType ==2) {
 					if (this.secondParams.maturityYears=='') {
 						 this.$util.msg('请输入产品到期日',2000);

second/pages/product/product-list.vue

@@ -17,10 +17,10 @@
 					<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':'']">
+				<!-- <view class="ClassA" @click="handle('2')" :class="[currentId == '2' ? 'active':'',currentId == '2' ? 'off':'']">
 					临期产品
 					<view class="line" v-if="currentId == '2'"></view>
-				</view>
+				</view> -->
 				<view class="ClassA" @click="handle('3')" :class="[currentId == '3' ? 'active':'',currentId == '3' ? 'off':'']">
 					其他
 					<view class="line" v-if="currentId == '3'"></view>