Browse Source

二手发布修改

zhengjinyi 3 years ago
parent
commit
e825909b7a

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

@@ -179,7 +179,7 @@
 					},
 					{
 						name:'发布二手商品',
-						path:'/pages/second/form/form-seller',
+						path:'/pages/second/form/form-select',
 						icon:'https://static.caimei365.com/app/img/icon/icon_seller_6@2x.png',
 					},
 					{

+ 13 - 1
pages.json

@@ -856,7 +856,19 @@
                 {
                     "path": "form/form-seller",
                     "style": {
-                        "navigationBarTitleText": "发布二手"
+                        "navigationBarTitleText": "发布二手预成交商品"
+                    }
+                },
+                {
+                    "path": "form/form-presale",
+                    "style": {
+                        "navigationBarTitleText": "发布二手估价商品"
+                    }
+                },
+                {
+                    "path": "form/form-select",
+                    "style": {
+                        "navigationBarTitleText": "选择发布类型"
                     }
                 },
                 {

+ 1122 - 0
pages/second/form/form-presale.vue

@@ -0,0 +1,1122 @@
+<template name="secondHandrelease">
+	<view class="fleaMarketForm">
+		<view class="bannerimg"><image src="https://static.caimei365.com/app/img/bg/secondbg.png"></image></view>
+		<view class="my-maintenance" :style="{ paddingBottom: isIphoneX ? '270rpx' : '250rpx' }">
+			<view class="newsTitle">
+				<view class="nestext">
+					欢迎您来到采美365网二手商品市场,您可以在这里发布二手仪器和产品,采美官方
+					人员将会对商品进行审核和专业的估价,估价完成后才能上架展示并销售,展示期为
+					3个月。为了完整展示您的商品,请您认真填写以下商品基本信息,谢谢合作。
+				</view>
+			</view>
+			<view class="row">
+				<view class="label"><text class="red">*</text>发布身份:</view>
+				<view class="select spacing">
+					<picker
+						@change="bindPickerChangePublisher($event)"
+						:value="index"
+						:range="publisherActions"
+						range-key="name"
+					>
+						<input
+							class="input"
+							type="text"
+							disabled="true"
+							v-model="publisherText"
+							placeholder="请选择发布身份"
+							placeholder-class="placeholder"
+						/>
+					</picker>
+				</view>
+				<text class="iconfont icon-xiayibu"></text>
+			</view>
+			<view class="row">
+				 <view class="label"><text class="red">*</text>联系人:</view>
+				 <view class="spacing">
+					  <input type="text" 
+							 maxlength="15" 
+							 v-model="secondParams.contactName" 
+							 placeholder="请输入联系人姓名" 
+							 placeholder-class="placeholder">
+				</view> 
+			</view>
+			<view class="row">
+				<view class="label"><text class="red">*</text>联系方式:</view>
+				<view class="spacing">
+					<input  type="text" 
+							v-model="secondParams.contactMobile" 
+							maxlength="11" 
+							placeholder="请输入联系人手机号" 
+							@blur="contactMobileOnblur"
+							placeholder-class="placeholder">
+				</view> 
+			</view>
+			<view class="row">
+				<view class="label"><text class="red">*</text>验证码:</view>
+				<view class="spacing">
+					<input  type="text" 
+							v-model="secondParams.checkCode" 
+							maxlength="6" 
+							placeholder="请输入验证码" 
+							placeholder-class="placeholder">
+				</view> 
+				<view class="row-btn" :class="[isMobileDisabled  ? 'disabled' : '']">
+					<button class="row-input"
+							type="button" 
+							@click.stop="getMobileCodeFn" 
+							:disabled="isMobileDisabled">
+							{{ mobileCodeText }}
+					</button>
+				</view>		
+			</view>
+			<view class="row">
+				<view class="label"><text class="red">*</text>二手分类:</view>
+				<view class="select spacing">
+					<picker
+						@change="bindPickerChange($event)"
+						:value="index"
+						:range="categoryActions"
+						range-key="name"
+					>
+						<input
+							class="input"
+							type="text"
+							disabled="true"
+							v-model="organizationTypeText"
+							placeholder="请选择分类"
+							placeholder-class="placeholder"
+						/>
+					</picker>
+				</view>
+				<text class="iconfont icon-xiayibu"></text>
+			</view>
+			<view class="row">
+				<view class="label"><text class="red">*</text>商品品牌:</view>
+				<view class="select spacing">
+					<picker
+						@change="bindPickerChangeBrand($event)"
+						:value="index"
+						:range="brandActions"
+						range-key="name"
+					>
+						<input
+							class="input"
+							type="text"
+							disabled="true"
+							v-model="brandName"
+							placeholder="请选择品牌"
+							placeholder-class="placeholder"
+						/>
+					</picker>
+				</view>
+				<text class="iconfont icon-xiayibu"></text>
+			 </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"><text class="red">*</text>商品名称:</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">
+					<input type="text" 
+						   v-model="secondParams.fixedYears"  
+						   maxlength="10" 
+						   placeholder="请输入出厂日期 如:2020年06月" 
+						   placeholder-class="placeholder">
+				 </view>
+			 </view>
+			 <view class="row" v-if="secondParams.publishIdentity === 2">
+				 <view class="label"><text class="red">*</text>公司名称:</view>
+				 <view class="spacing">
+					 <input type="text"  
+							v-model="secondParams.companyName"  
+							maxlength="30" 
+							placeholder="请输入公司名称,不超过30个汉字" 
+							placeholder-class="placeholder">
+				 </view>
+			 </view>
+			 <view class="row">
+				 <view class="label"><text class="red">*</text>商品成色:</view>
+				 <view class="spacing">
+					 <input type="text" 
+							maxlength="10"  
+							v-model="secondParams.productQuality"  
+							placeholder="请输入商品成色,如“9成新”" 
+							placeholder-class="placeholder">
+				</view> 
+			 </view>
+			 <view class="row">
+				 <view class="label">商品类型:</view>
+				 <view class="select spacing">
+				 	<picker
+				 		@change="bindPickerChangeProduct($event)"
+				 		:value="index"
+				 		:range="productActions"
+				 		range-key="name"
+				 	>
+				 		<input
+				 			class="input"
+				 			type="text"
+				 			disabled="true"
+				 			v-model="organizationTypeText1"
+				 			placeholder="请选择发布身份"
+				 			placeholder-class="placeholder"
+				 		/>
+				 	</picker>
+				 </view>
+				 <text class="iconfont icon-xiayibu"></text>
+			 </view>
+			<view class="row" >
+				 <view class="label"><text class="red">*</text>联系地址:</view>
+				 <view class="spacing"  @click="showMulLinkageThreePicker">
+					 <text class="row-input" :class="addressData.address === '请选择所在地区' ? 'none,placeholder' : ''"  >
+						{{addressData.address}}
+					 </text>		
+				</view> 
+				<text class="iconfont icon-xiayibu"></text>
+			 </view>
+			 <textarea  type="text"  
+						class="border-grey address-details" 
+						v-model="secondParams.address" 
+						maxlength="50"
+						placeholder="请填写详细地址,如街道/小区/门牌等"  
+						placeholder-class="placeholder"/>
+			</textarea>
+			<view class="release-main-container">
+				<view class="release-from">
+					<view class="label"><text class="red">*</text>商品图片</view>
+					<view class="release-input upload image uploadGoodsImages" >
+						<view class="upload-file" v-if="GoodsImagesList.length<5">
+							<text class="iconfont icon-shangchuantupian"></text>
+							<p class="add-text">商品图片</p>
+							<view ref="goodsImages" class="input-file"  @click="uploadGoodsImagesFn"></view>
+						</view>
+						<view class="upload-file" v-for="(item, index) in GoodsImagesList" :key="index">
+							<image :data-original='item' :src="item" :data-image="item" alt="" class="upload-img" ></image>
+							<text class=" del iconfont icon-iconfontguanbi" @click="removeGoodsImagesFn(index)"></text>
+						</view>
+					</view>
+					<view class="form-upload-tips">
+						<text class="iconfont icon-wenhao" ></text>
+						<view class="wen-tips" >最多上传5张二手商品图片,请尽量全部上传,单张图片不能超过5M</view>
+					</view>
+				</view>
+				<view class="productinfo">
+					 <view class="label unlogin-label" style="width: 100%;">商品详细信息</view>
+					 <view class="textarea-wrapper">
+						 <textarea 	class="textarea"
+									type="text" 
+									v-model="secondParams.productDetails" 
+									placeholder="请填写商品详细信息,对商品进行更详细的描述" 
+									placeholder-class="placeholder"
+									maxlength="200"
+									@input="onTextareaInputInfo"
+						 />
+						 <span class="word-limit">{{secondParams.productDetails.length}}/200</span>
+					 </view>
+				</view>
+			</view>	
+		</view>
+		<view class="secondBj thebj"   v-show="modal1" :class="modal1 ? 'show':''">
+			<view class="bjmain theresult">
+				<text class="title">发布提示</text>
+				<text class="content"> {{ tipsContentText }} </text>
+				<view class="paybtn">
+					<view class="btn cancel" @click.stop="cancelButtonFn">{{ cancelButtonText  }}</view>
+					<view class="btn confirm" @click.stop="confirmButtonFn">{{ confirmButtonText }}</view>
+				</view>
+			</view>
+		</view>
+		<!-- 地址弹窗 -->
+		<mpvue-city-picker :themeColor="themeColor"
+							ref="mpvueCityPicker" 
+							:pickerValueDefault="cityPickerValueDefault"
+							@onCancel="onCancel" 
+							@onConfirm="onConfirm">
+		</mpvue-city-picker>
+		<!-- 发布按钮 -->
+		<tui-bottom-popup :radius="false" :mask="false" :show="popupShow">
+			<view class="tui-popup-box clearfix">
+				<view class="tui-right-flex tui-popup-btn" :style="{ paddingBottom: isIphoneX ? '68rpx' : '34rpx' }">
+					<view class="tui-flex-1">
+						<view class="tui-button-text" @click="handleChangAgree">
+							<text  class="iconfont"
+								   :class="checkbox ? 'icon-yixuanze':'icon-weixuanze'" >
+							</text>
+							已阅读并同意采美
+							<text style="color:#1890f9;" @click.stop="this.$api.navigateTo('/pages/service/service?id=1039&title=二手出让协议')">《二手出让协议》</text>
+						</view>
+					</view>
+					<view class="tui-flex-1">
+						<view class="tui-button" @click="handleSubmitBtn">发布</view>
+					</view>
+				</view>
+			</view>
+		</tui-bottom-popup>
+		<!-- 弹窗提示 -->
+		<tui-modal :show="modal" :padding="'40rpx 30rpx'" @cancel="hideMobel" :custom="true" fadeIn >
+			<view class="tui-modal-custom">
+				<view class="tui-prompt-text">
+					{{ contentModalText }}
+				</view>
+				<view class="tui-prompt-flex">
+					<view class="btn btn-confirm" @click="handleClick">确定</view>
+				</view>
+			</view>
+		</tui-modal>
+	</view>
+</template>
+
+<script>
+	import mpvueCityPicker from '@/components/mpvue-citypicker/mpvueCityPicker.vue'
+	import { uploadFileImage , uploadFilePdf } from '@/services/public.js'
+	import authorize from '@/common/config/authorize.js'
+	import $reg from '@/common/config/common.js'
+	import { mapState,mapMutations } from 'vuex'
+	export default{
+		name:'secondHandrelease',
+		components:{
+			mpvueCityPicker,
+		},
+		data(){
+			return{
+				isIphoneX: this.$store.state.isIphoneX,
+				popupShow:true,
+				userIdentity:0,
+				publisherText:'个人身份',
+				organizationTypeText:'请选择二手分类',
+				organizationTypeText1:'请选择商品类型',
+				brandActions:[],
+				publisherActions:[
+					{name:'个人身份',value:1},
+					{name:'公司身份',value:2},
+				],
+				categoryActions:[
+					{name:'二手仪器',value:1},
+					{name:'其他',value:3},
+				],
+				productActions:[
+					{name:'医美',value:1},
+					{name:'非医美',value:3},
+				],
+				GoodsImagesList:[],
+				secondParams:{
+					publishIdentity:1, // 发布者身份 1 个人身份 2 公司身份
+					secondHandType:'',//一级分类
+					instrumentType:1,//二手仪器分类
+					name:'',
+					brandId:'',//品牌ID
+					brandName:'',//其他品牌
+					fixedYears:'',//出厂
+					companyName:'',//公司名称
+					maturityYears:'',//产品到期
+					normalPrice:'',//市场价
+					originalPrice:'',//采购价
+					stock:'',//数量
+					productQuality:'',//商品成色
+					contactName:'',//联系人
+					contactMobile:'',//联系方式
+					checkCode:'',// 联系人手机验证码
+					secondProductType:'',//
+					townId:'',//县区地址
+					address:'',//详细地址
+					image:'',//图片
+					productDetails:'',//商品详细信息
+					source:4//二手发布来源.1:WWW,2:小程序,3:后台,4:协销
+				 },
+				 addressData:{
+					address:'请选择所在地区',
+					townID:'',			//区ID
+					cityID:'',			//区ID
+					provinceID:'',		//区ID
+					addressDetail: '',	//地址
+				 },
+				brandName:'请选择品牌名称',
+				checkbox:false,
+				tipsContentText:'',
+				cancelButtonText:'取消发布',
+				confirmButtonText:'去支付',
+				contentModalText:'发布成功!商品信息会在1-2个工作日内进行审核,采美官方人员也会联系您进行商品估价,审核通过后将立即上线到采美二手市场。',
+				isButtonsType:0,
+				modal:false,
+				modal1:false,
+				isMobileDisabled: true,	//手机验证码按钮控制
+				mobilCount: '',				//倒计时
+				mobileCodeText: '获取验证码',
+				mobilTime: null,
+			}
+		},
+		methods:{
+			onTextareaInputInfo(e){
+			   this.secondParams.productDetails = e.detail.value
+			},
+			showMulLinkageThreePicker() {//三级地址联动
+				this.isShowInput = true
+				this.$refs.mpvueCityPicker.show()
+			},
+			onConfirm(e) {//获取选择的地址信息
+				this.addressData.address = e.name
+				this.addressData.townID = e.townCode
+				this.addressData.cityID = e.cityCode
+				this.addressData.provinceID = e.provinceCode
+				this.secondParams.townId = this.addressData.townID
+			},
+			bindPickerChangePublisher(e) {// 选择发布者身份
+				this.publisherText = this.publisherActions[e.target.value].name
+				this.secondParams.publishIdentity = this.publisherActions[e.target.value].value
+			},
+			bindPickerChange(e) {// 选择二手分类
+				this.secondParams.secondHandType = this.categoryActions[e.target.value].value
+				if(this.secondParams.secondHandType === 1){
+					this.organizationTypeText =  '二手仪器-美容仪器'
+				}else{
+					this.organizationTypeText = this.categoryActions[e.target.value].name
+				}
+			},
+			bindPickerChangeBrand(e) {
+				// 选择品牌
+				this.brandName = this.brandActions[e.target.value].name
+				this.secondParams.brandId = this.brandActions[e.target.value].value
+			},
+			bindPickerChangeProduct(e) {
+				// 选择商品类型
+				this.organizationTypeText1 = this.productActions[e.target.value].name
+				this.secondParams.secondProductType = this.productActions[e.target.value].value
+			},
+			contains(arr, val) {// 校验
+				return arr.some(item => item === val)
+			},
+			uploadGoodsImagesFn(event){//上传商品图片
+				uploadFileImage().then(res =>{
+					 this.GoodsImagesList.push(JSON.parse(res.data).data)
+					 this.secondParams.image =this.GoodsImagesList.toString()+','
+				})
+			},
+			removeGoodsImagesFn(index){//删除商品图片
+				this.GoodsImagesList.splice(index,1)
+				this.secondParams.image =this.GoodsImagesList.toString()+','
+			},
+			contactMobileOnblur(e){// 识别手机号是否正确
+				if(this.$reg.isMobile(e.detail.value)){
+					this.isMobileDisabled = false
+				}
+			},
+			getMobileCodeFn(){
+				let params = {
+						mobile:this.secondParams.contactMobile,
+						isCheckCaptcha:1,
+						activateCodeType:6,
+						platformType:2
+					}
+				this.isMobileDisabled = true
+				this.PublicService.GetRegisterMobileCode(params).then(response =>{
+					this.$util.msg('验证短信已发送',2000)
+					const TIME_COUNT = 60
+			     	if (!this.mobilTime) {
+			       		this.mobilCount = TIME_COUNT
+			       		this.isMobileDisabled = true
+			       		this.mobilTime = setInterval(() => {
+			       			if (this.mobilCount > 1 && this.mobilCount <= TIME_COUNT) {
+			         			this.mobilCount--
+			         			this.mobileCodeText = this.mobilCount +'s重新发送'
+			        		} else {
+				         		this.isMobileDisabled = false
+				         		clearInterval(this.mobilTime)
+				         		this.mobilTime = null
+								this.mobileCodeText = '获取验证码'
+			        		}
+			       		},1000)
+			      	}
+				}).catch( error =>{
+					this.$util.msg(error.msg,2000)
+					this.isMobileDisabled = false
+				})
+			},
+			handleSubmitBtn () {
+				if(this.secondParams.contactName == ''){
+					this.$util.msg('请输入联系人姓名',2000)
+					return
+				}
+				if(this.secondParams.contactMobile == ''){
+					console.log(this.secondParams.contactMobile)
+					this.$util.msg('请输入联系方式',2000)
+					return
+				}
+				if(!$reg.isMobile(this.secondParams.contactMobile)){
+					this.$util.msg('请填写正确的手机号',2000)
+					return
+				}
+				if(this.secondParams.checkCode == ''){
+					this.$util.msg('请输入短信验证码',2000)
+					return
+				}
+				if(this.secondParams.secondHandType == ''){
+					this.$util.msg('请选择分类',2000)
+					return
+				}
+				if(this.secondParams.secondHandType == 1 ){
+					if(this.secondParams.instrumentType ==''){
+						this.$util.msg('请完善仪器分类',2000)
+						return
+					}
+				}
+				if(this.secondParams.brandId == ''){
+					this.$util.msg('请选择商品品牌',2000)
+					return
+				}
+				if(this.secondParams.name == ''){
+					this.$util.msg('请输入商品名称',2000)
+					return 
+				}
+				if(this.secondParams.publishIdentity === 2) {
+					if (this.secondParams.companyName=='') {
+						 this.$util.msg('请输入公司名称',2000)
+						 return
+					} 
+				}
+				if(this.secondParams.productQuality == ''){
+					this.$util.msg('请输入商品成色',2000)
+					return
+				}
+				if(this.secondParams.townId == ''|| this.secondParams.townId == undefined){
+					this.$util.msg('请完善联系地址',2000)
+					return
+				}
+				if(this.secondParams.address == ''){
+					this.$util.msg('请填写详细地址',2000)
+					return
+				}
+				if(this.GoodsImagesList ==''){
+					this.$util.msg('请上传商品图片',2000)
+					return
+				}
+				if(this.checkbox==false){
+					this.$util.msg('请勾选已阅读',2000)
+					return
+				}
+				console.log(this.secondParams)
+			},
+			SecondHandProduct(params){//提交发布
+				this.SecondService.SecondHandProduct(params).then(res=>{ 
+					this.modal = true
+				})
+				.catch(error =>{
+					this.$util.msg(error.msg,2000)
+				})
+			},
+			cancelButtonFn(){//弹窗操作按钮
+				switch(this.isButtonsType){
+					case 1:
+						this.modal1 = false
+						this.SecondHandProduct(this.secondParams)
+						break
+					case 2:	
+						this.modal1 = false
+						break
+				}
+			},
+			confirmButtonFn(){//弹窗操作按钮
+				switch(this.isButtonsType){
+					case 1:
+						this.modal1 = false
+						break
+					case 2:	
+						this.modal1 = false
+						break
+				}
+			},
+			handleChangAgree() {
+				this.checkbox = !this.checkbox
+			},
+			getBrandList() {
+				// 获取收款类型列表
+				this.SecondService.brandList()
+					.then(response => {
+						this.brandActions = response.data.map(item => ({
+							...item,
+							name: item.name,
+							value: item.id
+						}))
+					})
+					.catch(err => {
+						this.$util.msg(err.msg, 2000)
+					})
+			},
+			hideMobel(){
+				this.modal = false
+			},
+			handleClick(){
+				this.modal = false
+				this.$api.redirectTo ('/pages/second/product/product-list')
+			}
+		},
+		onShow() {
+			this.getBrandList()
+			this.$api.getComStorage('userInfo').then((resolve) =>{
+				this.userIdentity = resolve.userIdentity
+				console.log(this.userIdentity)
+			}).catch(error =>{
+				console.log(error)
+			})
+		}
+	}
+</script>
+
+<style lang="scss">
+	view{font-size: 28rpx;}
+	.my-maintenance{
+		padding: 20rpx;
+	} 
+	.bannerimg {
+		height: 100rpx;
+		width: 100%;
+	}
+	.bannerimg  image{
+		width: 100%;
+		height: 100% ;
+	}
+	.newsTitle {
+		line-height: 48rpx;
+		text-align: left;
+		color: #e15616;
+		padding:20rpx;
+		background-color: rgba(225, 86, 22, .1);
+		border-radius: 10rpx;
+	}
+	.nestext{
+		font-size: 24rpx;
+		line-height: 40rpx;
+	}
+	.secondradio view{
+		display: inline-block;
+		color: #333333;
+		margin-right: 21rpx;
+	}
+	.secondradio{
+		display: inline-block;
+		margin-left: 40rpx;
+	}	
+	.Secondary{
+		margin-left: 96rpx;
+	}
+	.secondradio view.active {
+		color: #e15616;
+	}
+	.placeholder{
+		color: #b2b2b2;
+	}
+	.linqi_text { 
+		width: 607rpx; 
+		height: 68rpx;
+		background-color: #1890f9;
+		box-shadow: 0rpx 4rpx 6rpx 0rpx rgba(24, 144, 249, 0.17);
+		text-align: center;
+		line-height: 68rpx;
+		color: #ffffff;
+		margin: auto;
+		font-size:24rpx;
+		position: relative;
+	}
+	.jiaobiao {
+		width: 0;
+		height: 0;
+		border-left: 20rpx solid transparent;
+		border-right: 20rpx solid transparent;
+		top: -25%;
+		right: 40%;
+		border-bottom: 20rpx solid #1890f9;
+		position: absolute;
+		}
+	.label{
+		color: #666666;
+		display: inline-block;
+		.red{
+			color: #f94b4b;
+		}
+	}
+	.label-im{
+		width: 100%;
+		line-height: 50rpx;
+		font-size: $font-size-28;
+		color: #666666;
+		text-align: left;
+		margin-top: 20rpx;
+		.red{
+			color: #f94b4b;
+		}
+		.sms{
+			font-size: $font-size-24;
+			color: #fea785;
+		}
+	}
+	.label-em{
+		line-height: 28rpx;
+		font-size: $font-size-20;
+		color: #fea785;
+		width: 100%;
+		text-align: left;
+	}
+	.label.second{
+		width: 155rpx;
+	}
+	.row .spacing.second{
+		width: 70%;
+	}
+	.row{
+		width: 100%;
+		border-bottom: 2rpx solid #e1e1e1;
+		line-height: 90rpx;
+		float: left;
+		height: auto;
+		position: relative;
+		.checkbox-main{
+			width: 100%;
+			.checkbox-list {
+				height: 60rpx;
+				font-size: $font-size-28;
+				line-height: 60rpx;
+				border-radius: 10rpx;
+				margin-right: 20rpx;
+				margin-bottom: 10rpx;
+				box-sizing: border-box;
+				float: left;
+				color: #333333;
+				.icon-yixuanze{
+					margin-right: 10rpx;
+					color: #E15616;
+				}
+				.icon-weixuanze{ 
+					margin-right: 10rpx;
+					color: #B2B2B2;
+				}
+			}
+		}
+		.row-btn{
+			width: 180rpx;
+			height:64rpx;
+			background: $btn-confirm;
+			padding: 0;
+			border-radius: 32rpx;
+			position: absolute;
+			right: 0;
+			top: 10rpx;
+			.row-input{
+				width: 180rpx;
+				height: 64rpx;
+				line-height: 64rpx;
+				padding: 0;
+				color: #FFFFFF;
+				background: $btn-confirm;
+				text-align: center;
+				border-radius: 32rpx;
+				&.other{
+					width: 180rpx;
+					background: #F7F7F7;
+					margin-right: 20rpx;
+				}
+				&.none{
+					background: #F7F7F7;
+				}
+			}
+			&.disabled{
+				background: #F7F7F7;
+				.row-input{
+					background: #F7F7F7;
+					color: #999999;
+					font-size: 24rpx;
+				}
+			}
+		}
+		&.none{
+			border-bottom: none;
+		}
+	}
+	.row.fenlei{
+		height: auto;
+		margin: 10rpx 0;
+		border: 0;
+	}
+	.select {
+		position: relative;
+		color: #b2b2b2;
+		text-align: left;
+		user-select: none;
+	}
+	.row .spacing{
+		display: inline-block;
+		margin-left: 50rpx;
+		width: 430rpx;
+		vertical-align:middle;
+		position: relative;
+		color: #333333;
+		.input{
+			color: #333333;
+		}
+		&.file{
+			width: 100%;
+		}
+		&.file-text{
+			width: 100%;
+			line-height: 44rpx;
+			font-size: 28rpx;
+			box-sizing: border-box;
+			margin-left: 0;
+			.file-text-em{
+				width: 100%;
+				text-overflow: ellipsis;
+				overflow: hidden;
+				display: -webkit-box;
+				-webkit-line-clamp: 1;
+				line-clamp: 1;
+				-webkit-box-orient: vertical;
+				line-height: 44rpx;
+				font-size: 28rpx;
+				padding-right: 40rpx;
+				box-sizing: border-box;
+				position: relative;
+			}
+			.icon-iconfontguanbi{
+				width: 40rpx;
+				height: 40rpx;
+				line-height: 40rpx;
+				display: block;
+				position: absolute;
+				top: 0;
+				right:0;
+				color: #f94b4b;
+				font-size: 36rpx;
+			}
+		}
+		&.file-none{
+			width: 100%;
+			margin-left: 0;
+			position: relative;
+			.file-none-button{
+				width: 88rpx;
+				height: 44rpx;
+				background-color: #e15616;
+				border-radius: 8rpx;
+				line-height: 44rpx;
+				text-align: center;
+				font-size: 24rpx;
+				color: #FFFFFF;
+				position: absolute;
+				right: 0;
+				top: -15rpx;
+			}
+		}
+	}
+	.select .placeholder {
+		position: relative;
+		cursor: pointer;
+		width: 100%;
+		display: inline-block;
+	}
+	.icon-xiayibu{
+		right: 0rpx;
+		color: #b2b2b2;
+		position: absolute;
+	}
+	.xiangliao{
+		font-size: 26rpx;
+		margin-right: 10rpx;
+		color: #b2b2b2;
+	}
+	.icon-jiagexiangliao{
+		color: #e15616 !important;
+	}
+	.pricecolor{
+		margin-left: 10rpx;
+	}
+	.showflag{
+		color: #b2b2b2;
+	}
+	.border-grey{
+		width: 100%;
+		resize: none;
+		padding: 20rpx 0;
+		height: 160rpx;
+		border-bottom: 2rpx solid #e1e1e1;
+	}
+	.release-main-container {
+		overflow: hidden;
+		margin: 20rpx 0;
+	}
+	.uploadGoodsImages{
+		display: flex;
+		overflow-x: auto;
+		overflow-y: hidden;
+	}
+	.secondradio{
+		.row-radio{
+			transform: scale(.8);
+		}
+		.row-input{margin-right: 10rpx;}
+	}
+	.linqi_text .p{
+		font-size: $font-size-20;
+	}
+	.upload-file {
+		float: left;
+		margin: 20rpx 20rpx 20rpx 0px;
+		cursor: pointer;
+		width: 194rpx;
+		height: 194rpx;
+		border-radius: 6rpx;
+		border: solid 2rpx #e1e1e1;
+		flex-shrink: 0;
+		position: relative;
+		display: inline-block;
+		.input-file {
+			width: 194rpx;
+			height: 194rpx;
+			opacity: 0;
+			cursor: pointer;
+			position: absolute;
+			top: 0;
+			left: 0;
+		}
+		.upload-img {
+			width: 100%;
+			height: 100%;
+			display: block;
+			border-radius: .53vw;
+		}
+		
+		.icon-shangchuantupian{
+			display: block;
+			width: 100%;
+			height: 100rpx;
+			line-height: 90rpx;
+			color: #b2b2b2;
+			font-size: $font-size-40;
+			text-align: center;
+			padding-top: 20rpx;
+			box-sizing: border-box;
+		}
+		.add-text {
+			display: block;
+			width: 100%;
+			line-height: 50rpx;
+			font-size: 24rpx;
+			color: #b2b2b2;
+			text-align: center;
+		}
+		.icon-iconfontguanbi{
+			width: 40rpx;
+			height: 40rpx;
+			line-height: 40rpx;
+			display: block;
+			position: absolute;
+			background: #f94b4b;
+			text-align: center;
+			line-height: 40rpx;
+			border-radius: 50%;
+			top: -15rpx;
+			right:-18rpx;
+			color: #FFFFFF;
+			font-size: $font-size-24;
+		}
+	}
+	.wen-tips {
+		width: 664rpx;
+		height: 68rpx;
+		line-height: 68rpx;
+		text-align: center;
+		color: #FFF;
+		font-size: 20rpx;
+		background-color: #1890f9;
+		box-shadow: 0 0.8vw 1.6vw 0 rgba(24, 144, 249, 0.17);
+		border-radius: 2rpx;
+		display: none;
+	}
+	.form-upload-tips:hover .wen-tips {
+		display: block;
+	}
+	.textarea-wrapper {
+		letter-spacing: 2rpx;
+		line-height: 48rpx;
+		color: #333333;
+		position: relative;
+		font-size: 28rpx;
+		border: 2rpx solid #E1E1E1;
+		height: 300rpx;
+		padding: 16rpx;
+		border-radius: 6rpx;
+		margin: 20rpx 0;
+	}
+	.textarea-wrapper textarea{
+		width: 100%;
+	}
+	.word-limit {
+		position: absolute;
+		right: 2.7vw;
+		bottom: 2.7vw;
+		font-size: 3.2vw;
+		color: #9aa5b5;
+	}
+	.row.Read{
+		border: 0;
+		text-align: center;
+		color: #999999;
+	}
+	.thebj {
+		position: fixed;
+		left: 0;
+		top: 0;
+		bottom: 0;
+		width: 100%;
+		height: 100%;
+		background-color: rgba(0, 0, 0, .5);
+		z-index: 999999;
+		opacity: 0;
+	}
+	.thebj.show{
+		 opacity: 1;
+	}
+	.theresult {
+		position: absolute;
+		top: 50%;
+		left: 50%;
+		transform: translate(-50%, -50%);
+		width:580rpx;
+		background-color: #fff;
+		border-radius: 32rpx;
+	}
+	.theresult .title{
+		line-height: 100rpx;
+		text-align: center;
+		display: block;
+		color: #333333;
+		font-size: 30rpx;
+		font-weight: bold;
+		border-bottom: 2rpx solid #efefef;
+	}
+	.theresult .content{
+		padding: 30rpx 52rpx;
+		line-height: 48rpx;
+		color: #666666;
+		font-size: 30rpx;
+		display: block;
+	}
+	.paybtn{
+		width: 100%;
+		height: 90rpx;
+		float: left;
+		.btn{
+			width: 50%;
+			height: 90rpx;
+			text-align: center;
+			line-height: 90rpx;
+			font-size: 30rpx;
+			display: inline-block;
+			float: left;
+			&.cancel{
+				background-color: #efefef;
+				border-radius: 0rpx 0rpx 0rpx 32rpx;
+				color: #999999;
+			}
+			&.confirm{
+				background-image: linear-gradient(270deg, #f28f31 0%, #e15616 100%);
+				border-radius: 0rpx 0rpx 32rpx 0rpx;
+				color: #fff;
+			}
+		}
+	}
+	.icon-wenhao{
+		color: #1890f9;
+		font-size: 35rpx;
+		width: 50rpx;
+	}
+	.form-upload-tips:hover .wen-tips {display: block;}
+	.tui-popup-box {
+		position: relative;
+		box-sizing: border-box;
+		min-height: 100rpx;
+		padding: 6rpx 24rpx;
+		.tui-popup-content {
+			padding-top: 30rpx;
+		}
+	}
+	.tui-popup-btn {
+		width: 100%;
+		height: auto;
+		float: left;
+		box-sizing: border-box;
+		margin-top: 30rpx;
+		.tui-button {
+			width: 600rpx;
+			height: 88rpx;
+			background: $btn-confirm;
+			line-height: 88rpx;
+			text-align: center;
+			color: #ffffff;
+			font-size: $font-size-28;
+			border-radius: 44rpx;
+			margin: 0 auto;
+		}
+		.tui-button-text{
+			width: 600rpx;
+			height: 70rpx;
+			line-height: 70rpx;
+			text-align: center;
+			color: #333333;
+			font-size: $font-size-26;
+			margin: 0 auto;
+			margin-top: 15rpx;
+			.iconfont{
+				margin-right: 10rpx;
+				&.icon-yixuanze{
+					color: $color-system;
+				}
+			}
+		}
+	}	
+	.tui-prompt-flex{
+		width: 100%;
+		height: 80rpx;
+		display: flex;
+		margin-top: 20rpx;
+		.btn{
+			flex: 1;
+			line-height: 80rpx;
+			font-size: $font-size-26;
+			text-align: center;
+			color: #FFFFFF;
+			border-radius: 40rpx;
+			margin: 0 24rpx;
+			&.btn-cancel{
+				background: #F7F7F7;
+				color: #999999;
+			}
+			&.btn-confirm{
+				background: $btn-confirm;
+			}
+		}
+		
+	}
+	.tui-prompt-text{
+		line-height: 44rpx;
+		font-size: $font-size-26;
+		color: #333333;
+		.text{
+			color: $color-system;
+		}
+	}
+</style>

+ 120 - 0
pages/second/form/form-select.vue

@@ -0,0 +1,120 @@
+
+<template>
+	<view class="container register">
+		<view class="main">
+			<view class="main-item">
+				<view class="item" @click.stop="this.$api.navigateTo('/pages/second/form/form-seller')">
+					<view class="icon">
+						<image src="https://static.caimei365.com/app/img/icon/icon-presale.png" mode=""></image>
+					</view>
+					<view class="text by">发布二手预成交商品</view>
+					<view class="text-small">所填卖家敏感信息较多,客户已有购买意向时</view>
+					<view class="text-small">选择此类型发布</view>
+				</view>
+				<view class="item bot" @click.stop="this.$api.navigateTo('/pages/second/form/form-presale')">
+					<view class="icon">
+						<image src="https://static.caimei365.com/app/img/icon/icon-presales.png" mode=""></image>
+					</view>
+					<view class="text my">发布二手估价商品</view>
+					<view class="text-small">所填卖家敏感信息较少,为了让二手商品快速上架</view>
+					<view class="text-small">展示选择此类型发布</view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default{
+		data() {
+			return{
+				
+			}
+		},
+		onLoad(option) {
+
+		},
+		computed: {
+			
+		},
+		methods:{
+			
+		}
+	}
+</script>
+
+<style lang="scss">
+	.register{
+		width: 100%;
+		height: 100%;
+		position: relative;
+		box-sizing: border-box;
+		padding-top: 100rpx;
+		.main{
+			width: 100%;
+			height: 370rpx;
+			.title{
+				width: 100%;
+				height: 46rpx;
+				line-height: 46rpx;
+				float: left;
+				text-align: center;
+				font-size: $font-size-34;
+				color: $text-color;
+				font-weight: bold;
+			}
+			.main-item{
+				width: 100%;
+				height: auto;
+				float: left;
+				box-sizing: border-box;
+				margin-top: 20rpx;
+				.item{
+					width: 100%;
+					height: auto;
+					float: left;
+					display: flex;
+					flex-direction: column;
+					align-items: center;
+					margin-top: 50rpx;
+					&.bot{
+						margin-top: 100rpx;
+					}
+					.icon{
+						width: 186rpx;
+						height: 186rpx;
+						image{
+							width: 186rpx;
+							height: 186rpx;
+							display: block;
+						}
+					}
+					.text{
+						line-height: 54rpx;
+						font-size: $font-size-30;
+						text-align: center;
+						&.by{
+							color: #3b77ff;
+						}
+						&.my{
+							color: #ff7a51;
+						}
+					}
+					.text-small{
+						line-height: 40rpx;
+						font-size: $font-size-24;
+						text-align: center;
+						color: #999999;
+					}
+				}
+			}
+		}
+		.bg_image{
+			position: absolute;
+			width: 100%;
+			height:354rpx;
+			left: 0;
+			bottom: 0;
+		}
+	}
+</style>

+ 5 - 5
pages/second/form/form-seller.vue

@@ -1,12 +1,12 @@
 <template name="secondHandrelease">
 	<view class="fleaMarketForm">
-		<view class="bannerimg"><image src="https://static.caimei365.com/app/img/bg/secondbg.jpg"></image></view>
+		<view class="bannerimg"><image src="https://static.caimei365.com/app/img/bg/secondbg.png"></image></view>
 		<view class="my-maintenance" :style="{ paddingBottom: isIphoneX ? '270rpx' : '250rpx' }">
 			<view class="newsTitle">
 				<view class="nestext">
-					欢迎您来到采美365网二手商品市场,您可以在这里发布二手设备、产品信息,
-					展示期为3个月;为了完整展示您的商品,请您认真填写以下商品基本信息,
-					后续采美工作人员将联系您进行承诺书签名,谢谢合作。
+					欢迎您来到采美365网二手商品市场,您可以在这里发布二手仪器和产品,采美官方
+					人员将会对商品进行审核和专业的估价,估价完成后才能上架展示并销售,展示期为
+					3个月。为了完整展示您的商品,请您认真填写以下商品基本信息,谢谢合作。
 				</view>
 			</view>
 			<view class="row">
@@ -855,7 +855,7 @@
 		padding: 20rpx;
 	} 
 	.bannerimg {
-		height: 66rpx;
+		height: 100rpx;
 		width: 100%;
 	}
 	.bannerimg  image{

+ 6 - 277
pages/second/form/form.vue

@@ -1,12 +1,12 @@
 <template name="secondHandrelease">
 	<view class="fleaMarketForm">
-		<view class="bannerimg"><image src="https://static.caimei365.com/app/img/bg/secondbg.jpg"></image></view>
+		<view class="bannerimg"><image src="https://static.caimei365.com/app/img/bg/secondbg.png"></image></view>
 		<view class="my-maintenance" :style="{ paddingBottom: isIphoneX ? '270rpx' : '250rpx' }">
 			<view class="newsTitle">
 				<view class="nestext">
-					欢迎您来到采美365网二手商品市场,您可以在这里发布二手设备、产品信息,
-					展示期为3个月;为了完整展示您的商品,请您认真填写以下商品基本信息,
-					后续采美工作人员将联系您进行承诺书签名,谢谢合作。
+					欢迎您来到采美365网二手商品市场,您可以在这里发布二手仪器和产品,采美官方
+					人员将会对商品进行审核和专业的估价,估价完成后才能上架展示并销售,展示期为
+					3个月。为了完整展示您的商品,请您认真填写以下商品基本信息,谢谢合作。
 				</view>
 			</view>
 			<view class="row">
@@ -151,20 +151,6 @@
 							placeholder-class="placeholder">
 				 </view>
 			 </view>
-			 <view class="row">
-				 <view class="label"><text class="red">*</text>交易价:</view>
-				 <view class="spacing">
-					 <input type="text" maxlength="20" v-model="secondParams.price"  placeholder="请输入交易价" placeholder-class="placeholder">
-				 </view>
-			 </view>
-			 <view style="margin-top: 15rpx;">
-				 <text class="iconfont xiangliao" 
-					   :class="vShow_detailTalkFlag ? 'icon-jiagexiangliao':'icon-juxingweigouxuan'" 
-					   @click="Detailed($event)">
-					<text class='pricecolor' >价格详聊</text>
-				 </text>
-				 <text class="showflag" v-show="vShow_detailTalkFlag">(勾选代表同意不显示交易价)</text>
-			 </view>
 			 <view class="row">
 				 <view class="label"><text class="red">*</text>商品成色:</view>
 				 <view class="spacing">
@@ -175,95 +161,6 @@
 							placeholder-class="placeholder">
 				</view> 
 			 </view>
-			 <view class="row none">
-				 <view class="label"><text class="red">*</text>商品包含的文件:</view>
-			 </view>
-			 <view class="row none">
-				 <view class="checkbox-main">
-				 	<view
-				 		class="checkbox-list"
-				 		:class="type.isChecked ? 'checked' : ''"
-				 		v-for="(type, index) in productFileTypeActions"
-				 		:key="index"
-				 		@click="choiceProductFileType(type, index)"
-				 	>
-				 		<text class="iconfont" :class="type.isChecked ? 'icon-yixuanze' : 'icon-weixuanze'"></text>
-				 		{{ type.name }}
-				 	</view>
-				 </view>
-			 </view>
-			<view class="row none" v-if="secondParams.publishIdentity === 1">
-				<view class="label-im">身份证照片:</view>
-				<view class="label-em">个人请上传身份证正反面照片(图片大小不超过5M)</view>
-				<view class="release-input upload image uploadGoodsImages" >
-					<view class="upload-file-view">
-						<view class="upload-file" v-if="secondParams.authenticationImage == ''">
-							<text class="iconfont icon-shangchuantupian"></text>
-							<text class="add-text">身份证正面</text>
-							<view ref="goodsImages" class="input-file"  @click="uploadCardImageFn(1)"></view>
-						</view>
-						<view class="upload-file" v-else>
-							<image :src="secondParams.authenticationImage" alt="" class="upload-img" ></image>
-							<text class=" del iconfont icon-iconfontguanbi" @click="removeCardImageFn(1)"></text>
-						</view>
-					</view>
-					<view class="upload-file-view">
-						<view class="upload-file" v-if="secondParams.authenticationBackImage == ''">
-							<text class="iconfont icon-shangchuantupian"></text>
-							<text class="add-text">身份证反面</text>
-							<view ref="goodsImages" class="input-file"  @click="uploadCardImageFn(2)"></view>
-						</view>
-						<view class="upload-file" v-else>
-							<image :src="secondParams.authenticationBackImage" alt="" class="upload-img" ></image>
-							<text class=" del iconfont icon-iconfontguanbi" @click="removeCardImageFn(2)"></text>
-						</view>
-					</view>
-				</view>
-			 </view>
-			<view class="row none" v-if="secondParams.publishIdentity === 2">
-			 	<view class="label-im">营业执照:</view>
-			 	<view class="label-em">请上传营业执照照片(图片大小不超过5M)</view>
-			 	<view class="release-input upload image uploadGoodsImages" >
-			 		<view class="upload-file" v-if="secondParams.licenseImage == ''">
-			 			<text class="iconfont icon-shangchuantupian"></text>
-			 			<text class="add-text">营业执照</text>
-			 			<view ref="goodsImages" class="input-file"  @click="uploadUserImageFn"></view>
-			 		</view>
-			 		<view class="upload-file" v-else>
-			 			<image :src="secondParams.licenseImage" alt="" class="upload-img" ></image>
-			 			<i class=" del iconfont icon-iconfontguanbi" @click="removeUserImageFn"></i>
-			 		</view>
-			 	</view>
-			</view>
-			<view class="row">
-			  	<view class="label-im"><text class="red">*</text>收款账号:<text class="sms">(用于接收最终结算金额)</text></view>
-			  	<view class="spacing file-none">
-			  		<input  type="text"
-							v-model="secondParams.cardNumber"  
-							maxlength="20" 
-							placeholder="请输入收款银行卡卡号" 
-							placeholder-class="placeholder">
-			  	</view> 
-			</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 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 class="label">商品类型:</view>
 				 <view class="select spacing">
@@ -320,33 +217,6 @@
 						<view class="wen-tips" >最多上传5张二手商品图片,请尽量全部上传,单张图片不能超过5M</view>
 					</view>
 				</view>
-				<view class="row">
-					<view class="label-im">二手出让承诺函签署文件:</view>
-					<view class="label-em">(仅支持pdf文件,大小不能超过20)</view>
-					<view class="spacing file-none" v-if="secondParams.fileName == ''">
-						<view class="file-none-button" @click="uploadCommitmentFile">上传</view>
-					</view> 
-					<view class="spacing file-text" v-else>
-						<text class="file-text-em">{{ secondParams.fileName }}</text>
-						<text class=" del iconfont icon-iconfontguanbi" @click="deleteCommitmentFile"></text>
-					</view>
-				</view>
-				<view class="row none">
-					<view class="label-im">二手出让承诺函签署图片</view>
-					<view class="label-em">(若不方便上传承诺函签署文件,可对已签署的承诺函进行拍照或者截图再上传图片)</view>
-					<view class="label-em">图片大小不超过5M</view>
-					<view class="release-input upload image uploadGoodsImages" >
-						<view class="upload-file" v-if="secondParams.commitmentImage == ''">
-							<i class="iconfont icon-shangchuantupian"></i>
-							<text class="add-text">承诺函图片</text>
-							<view ref="goodsImages" class="input-file"  @click="uploadCommitmentImageFn"></view>
-						</view>
-						<view class="upload-file" v-else>
-							<image :src="secondParams.commitmentImage" alt="" class="upload-img" ></image>
-							<i class=" del iconfont icon-iconfontguanbi" @click="removeCommitmentImageFn"></i>
-						</view>
-					</view>
-				</view>
 				<view class="productinfo">
 					 <view class="label unlogin-label" style="width: 100%;">商品详细信息</view>
 					 <view class="textarea-wrapper">
@@ -445,13 +315,6 @@
 					{name:'医美',value:1},
 					{name:'非医美',value:3},
 				],
-				productFileTypeActions:[
-					{ name:'仪器原始合同',value:1,isChecked:false},
-					{ name:'仪器注册证',value:2,isChecked:false},
-					{ name:'仪器发票',value:3,isChecked:false},
-					{ name:'仪器报关单',value:4,isChecked:false},
-					{ name:'无任何文件',value:5,isChecked:false}
-				],
 				GoodsImagesList:[],
 				secondParams:{
 					publishIdentity:1, // 发布者身份 1 个人身份 2 公司身份
@@ -463,33 +326,20 @@
 					fixedYears:'',//出厂
 					companyName:'',//公司名称
 					maturityYears:'',//产品到期
-					price:'',//交易价
-					detailTalkFlag:1,//是否启用详聊
 					normalPrice:'',//市场价
 					originalPrice:'',//采购价
 					stock:'',//数量
 					productQuality:'',//商品成色
-					fileType:'', // 商品文件类型
 					contactName:'',//联系人
 					contactMobile:'',//联系方式
 					checkCode:'',// 联系人手机验证码
-					cardNumber:'',// 收款账号
-					authenticationImage:'', //身份证正面
-					authenticationBackImage:'', //身份证反面
-					licenseImage:'',//营业执照图片
-					commitmentImage:'',//承诺函图片
-					dockingPeopleName:'',//采美对接人姓名
-					dockingPeopleMobile:'',//采美对接人手机号
 					secondProductType:'',//
 					townId:'',//县区地址
 					address:'',//详细地址
 					image:'',//图片
-					fileName:'',
-					ossName:'',
 					productDetails:'',//商品详细信息
 					source:2//二手发布来源.1:WWW,2:小程序,3:后台,4:协销
 				 },
-				 checkedFileTypeList:[],
 				 addressData:{
 					address:'请选择所在地区',
 					townID:'',			//区ID
@@ -502,9 +352,8 @@
 				tipsContentText:'',
 				cancelButtonText:'取消发布',
 				confirmButtonText:'去支付',
-				contentModalText:'发布成功!商品信息会在1-2个工作日内进行审核,审核通过后将立即上线到采美二手市场',
+				contentModalText:'发布成功!商品信息会在1-2个工作日内进行审核,采美官方人员也会联系您进行商品估价,审核通过后将立即上线到采美二手市场',
 				isButtonsType:0,
-				vShow_detailTalkFlag:false,
 				modal:false,
 				modal1:false,
 				isMobileDisabled: true,	//手机验证码按钮控制
@@ -550,84 +399,19 @@
 				this.organizationTypeText1 = this.productActions[e.target.value].name
 				this.secondParams.secondProductType = this.productActions[e.target.value].value
 			},
-			choiceProductFileType(type,index){
-				// 选择类别
-				type.isChecked = !type.isChecked
-				if (type.isChecked) {
-					if(!this.contains(this.checkedFileTypeList,type.value)){
-						this.checkedFileTypeList.push(type.value)
-					}
-				} else {
-					this.checkedFileTypeList.splice(this.checkedFileTypeList.indexOf(type.value),1)
-				}
-				this.secondParams.fileType = this.checkedFileTypeList.join(',')
-			},
 			contains(arr, val) {// 校验
 				return arr.some(item => item === val)
 			},
-			Detailed(){
-				this.vShow_detailTalkFlag = !this.vShow_detailTalkFlag
-				if(this.vShow_detailTalkFlag){
-					this.secondParams.detailTalkFlag = 2 //启用价格详聊
-				}else {
-					this.secondParams.detailTalkFlag = 1 //不启用价格详聊
-				}
-			},
 			uploadGoodsImagesFn(event){//上传商品图片
 				uploadFileImage().then(res =>{
 					 this.GoodsImagesList.push(JSON.parse(res.data).data)
 					 this.secondParams.image =this.GoodsImagesList.toString()+','
 				})
 			},
-			uploadCardImageFn(type){//上传身份正反面照
-				uploadFileImage().then(res =>{
-					if(type == 1){
-						this.secondParams.authenticationImage = JSON.parse(res.data).data
-					}else{
-						this.secondParams.authenticationBackImage = JSON.parse(res.data).data
-					}
-				})
-			},
-			uploadUserImageFn(event){//上传营业执照图片
-				console.log('event')
-				uploadFileImage().then(res =>{
-					 this.secondParams.licenseImage = JSON.parse(res.data).data
-				})
-			},
-			uploadCommitmentImageFn(event){//上传承诺函图片
-				uploadFileImage().then(res =>{
-					 this.secondParams.commitmentImage = JSON.parse(res.data).data
-				})
-			},
-			uploadCommitmentFile(){//上传承诺函文件
-				uploadFilePdf().then(res =>{
-					let data =  JSON.parse(res.data).data
-					this.secondParams.fileName = uni.getStorageSync('fileName')
-					this.secondParams.ossName = data.ossName
-					console.log('fileName',this.secondParams.fileName)
-					console.log('ossName',this.secondParams.ossName)
-				})
-			},
-			deleteCommitmentFile(){//删除承诺函文件
-				this.secondParams.fileName = ''
-			},
 			removeGoodsImagesFn(index){//删除商品图片
 				this.GoodsImagesList.splice(index,1)
 				this.secondParams.image =this.GoodsImagesList.toString()+','
 			},
-			removeCardImageFn(type){//删除身份证图片
-				if(type == 1){
-					this.secondParams.authenticationImage = ''
-				}else{
-					this.secondParams.authenticationBackImage = ''
-				}
-			},
-			removeUserImageFn(index){//删除公司营业执照图片
-				this.secondParams.licenseImage = ''
-			},
-			removeCommitmentImageFn(index){//删除承诺函图片
-				this.secondParams.commitmentImage = ''
-			},
 			contactMobileOnblur(e){// 识别手机号是否正确
 				if(this.$reg.isMobile(e.detail.value)){
 					this.isMobileDisabled = false
@@ -706,38 +490,10 @@
 						 return
 					} 
 				}
-				if(!this.$api.isNumber(this.secondParams.price)){
-					  this.$util.msg('请输入交易价',2000)
-						return
-				}
 				if(this.secondParams.productQuality == ''){
 					this.$util.msg('请输入商品成色',2000)
 					return
 				}
-				if(this.secondParams.fileType == ''){
-					this.$util.msg('请选择商品包含的文件',2000)
-					return
-				}
-				if(this.secondParams.cardNumber == ''){
-					this.$util.msg('请输入收款银行卡卡号',2000)
-					return
-				}
-				if(this.userIdentity === 1){
-					if(this.secondParams.dockingPeopleName == ''){
-						this.$util.msg('请输入采美对接人姓名',2000)
-						return
-					}
-					if(this.secondParams.dockingPeopleMobile == ''){
-						this.$util.msg('请输入采美对接人手机号',2000)
-						return
-					}
-				}
-				if(this.secondParams.dockingPeopleMobile !=''){
-					if(!$reg.isMobile(this.secondParams.dockingPeopleMobile)){
-						this.$util.msg('请填写正确的采美对接人手机号',2000)
-						return
-					}
-				}
 				if(this.secondParams.townId == ''|| this.secondParams.townId == undefined){
 					this.$util.msg('请完善联系地址',2000)
 					return
@@ -754,33 +510,6 @@
 					this.$util.msg('请勾选已阅读',2000)
 					return
 				}
-				if(this.secondParams.publishIdentity === 1){
-					if(this.secondParams.authenticationImage == '' && this.secondParams.authenticationBackImage == ''){
-						this.modal1 = true
-						this.tipsContentText = '上传身份证照片,您的二手商品将获得更好的推荐和曝光,方便您快速卖出。'
-						this.cancelButtonText = '继续发布'
-						this.confirmButtonText = '去上传'
-						this.isButtonsType = 1
-						return
-					}
-				}else{
-					if(this.secondParams.licenseImage == ''){
-						this.modal1 = true
-						this.tipsContentText = '上传营业执照照片,您的二手商品将获得更好的推荐和曝光,方便您快速卖出。'
-						this.cancelButtonText = '继续发布'
-						this.confirmButtonText = '去上传'
-						this.isButtonsType = 1
-						return
-					}
-				}
-				if(this.secondParams.commitmentImage == '' || this.secondParams.ossName == ''){
-					this.modal1 = true
-					this.tipsContentText = '上传二手出让承诺函,您的二手商品将获得更好的推荐和曝光,方便您快速卖出。'
-					this.cancelButtonText = '继续发布'
-					this.confirmButtonText = '去上传'
-					this.isButtonsType = 1
-					return
-				}
 				console.log(this.secondParams)
 			},
 			SecondHandProduct(params){//提交发布
@@ -855,7 +584,7 @@
 		padding: 20rpx;
 	} 
 	.bannerimg {
-		height: 66rpx;
+		height: 100rpx;
 		width: 100%;
 	}
 	.bannerimg  image{

+ 53 - 53
pages/second/product/product-list.vue

@@ -105,9 +105,9 @@
 
 <script>
 	import authorize from '@/common/config/authorize.js'
-	import wxLogin from "@/common/config/wxLogin.js"
-	import modalLayer from "@/components/modal-layer"
-	import { mapState,mapMutations } from 'vuex';
+	import wxLogin from '@/common/config/wxLogin.js'
+	import modalLayer from '@/components/modal-layer'
+	import { mapState,mapMutations } from 'vuex'
 	export default{
 		name:'secondList',
 		components:{
@@ -156,10 +156,10 @@
 			}
 		},
 		created() {
-			 this.setScrollHeight();	
+			 this.setScrollHeight()	
 			this.$api.getStorage().then((resolve) => {
-				this.userId = resolve.userId ? resolve.userId : '';
-				this.gettabList();
+				this.userId = resolve.userId ? resolve.userId : ''
+				this.gettabList()
 			})	
 		},
 		computed: {
@@ -167,7 +167,7 @@
 		},
 		filters: {
 			NumFormat:function(text) {//处理金额
-				return Number(text).toFixed(2);
+				return Number(text).toFixed(2)
 			},
 		},
 		onLoad(option) {
@@ -178,50 +178,50 @@
 		methods:{
 			scrolltolower() {
 				if(this.hasNextPage && this.pullFlag) {
-					this.gettabList(true);
+					this.gettabList(true)
 				}
 			},
 			setScrollHeight() {
-				const {windowHeight, pixelRatio} = wx.getSystemInfoSync();
-				this.windowHeight = windowHeight - 1;
-				this.scrollHeight = windowHeight - 1;
+				const {windowHeight, pixelRatio} = wx.getSystemInfoSync()
+				this.windowHeight = windowHeight - 1
+				this.scrollHeight = windowHeight - 1
 			},
 			handle: function (index) {//一級分类
-				   const _this = this;
-				   _this.currentId = index;
-				   _this.tabTitleName = '二手仪器';
+				   const _this = this
+				   _this.currentId = index
+				   _this.tabTitleName = '二手仪器'
 				   this.pageNum = 1
 				   if ( _this.currentId == '1'){
-						_this.mainflag = !_this.mainflag;
+						_this.mainflag = !_this.mainflag
 				   }else {
-						_this.mainflag=false;
-						_this.currentID2 = 0;
+						_this.mainflag=false
+						_this.currentID2 = 0
 				   }
-				   _this.gettabList();
+				   _this.gettabList()
 			          },
 			 handleChild:function(item){ //二级分类
-				const _this = this;
-			   _this.currentID2 = item.value;
-			   _this.tabTitleName = item.name;
+				const _this = this
+			   _this.currentID2 = item.value
+			   _this.tabTitleName = item.name
 			   if (_this.currentID2==item.value){
-				   _this.mainflag=false;
+				   _this.mainflag=false
 			   }
-		       _this.gettabList();
+		       _this.gettabList()
 			  },	
 			navigator(url){
 				this.$api.navigateTo(url)
 			},	
 			navToDetailPage:function(id) {
-				this.isModallayer = true;
-				this.$api.navigateTo(`/pages/second/product/product-details?id=${id}`);
-				this.isModallayer = false;
+				this.isModallayer = true
+				this.$api.navigateTo(`/pages/second/product/product-details?id=${id}`)
+				this.isModallayer = false
 			},
 			gettabList:function (loadMore) {
-				this.showLoading = true;
-				this.loadingNow = true;
-				this.loadingText = '加载中';
-				this.isShowEmpty = false;				
-				if(loadMore) {this.pageNum += 1;}
+				this.showLoading = true
+				this.loadingNow = true
+				this.loadingText = '加载中'
+				this.isShowEmpty = false				
+				if(loadMore) {this.pageNum += 1}
 				let params = {
 						userId:this.userId,
 						secondHandType:this.currentId,
@@ -232,40 +232,40 @@
 				}
 				this.SecondService.SeconHandProductList(params).then(res =>{
 					 if (res.code == 0) {
-						   const data = res.data;
+						   const data = res.data
 						   if(data.results.length == 0){
-							   this.tabchildList = [];
-							   this.showflag = true;
-							   this.listRecord = data.totalRecord;
+							   this.tabchildList = []
+							   this.showflag = true
+							   this.listRecord = data.totalRecord
 						   }else {
-							   this.showflag = false;
-							   this.isShow = true;
-							   let results = data.results;
+							   this.showflag = false
+							   this.isShow = true
+							   let results = data.results
 							   if(loadMore) {
-								this.tabchildList = [...this.tabchildList,...results];
+								this.tabchildList = [...this.tabchildList,...results]
 							   } else {
-								this.tabchildList = [...results];
-								this.showSkeleton = false;
+								this.tabchildList = [...results]
+								this.showSkeleton = false
 							   }
-							   this.hasNextPage = data.hasNextPage;
-							   this.listRecord = data.totalRecord;
+							   this.hasNextPage = data.hasNextPage
+							   this.listRecord = data.totalRecord
 							  
 						   }
 						   // 防上拉暴滑
-						   this.pullFlag = false;
-						   setTimeout(()=>{ this.pullFlag = true; },500)
+						   this.pullFlag = false
+						   setTimeout(()=>{ this.pullFlag = true },500)
 						   // 底部提示文案
 						   if(this.hasNextPage) {
-							this.loadingText = '上拉加载更多';
+							this.loadingText = '上拉加载更多'
 						   } else {
-							this.showLoading = true;
-							this.loadingNow = false;
-							this.loadingText = '已至底部';
+							this.showLoading = true
+							this.loadingNow = false
+							this.loadingText = '已至底部'
 						   }
 						 }else{
-							this.$util.msg(error.msg,2000);
+							this.$util.msg(error.msg,2000)
 						 }
-					this.requestFlag = true;
+					this.requestFlag = true
 				})
 			},	
 			NavigatorLogin(pros){// 登录查看价格
@@ -295,7 +295,7 @@
 		      // 来自页面内转发按钮
 		    }
 			return {
-			  title: `欢迎来到采美二手市场~`,
+			  title: '欢迎来到采美二手市场~',
 			  path: `pages/search/search-instrument?keyWord=${this.listQuery.keyword}`
 			}
 		},	
@@ -360,7 +360,7 @@
 	}
 	.ListImg{
 		width: 750rpx;
-		height: 266rpx;
+		height: 265rpx;
 	}
 	.banner-img{
 		width: 100%;

+ 9 - 0
pages/supplier/user/my-product.vue

@@ -38,6 +38,7 @@
 											<view class="tui-goods-price">¥{{item.price | NumFormat}}</view>
 										</view>
 										<view class="tui-goods-pip">市场价:¥{{item.normalPrice | NumFormat}}</view>
+										<view class="tui-goods-pip">新品展示:¥{{item.normalPrice | NumFormat}}</view>
 										<view class="tui-goods-pip">分类:{{ item.typeName ? item.typeName : '无' }}</view>
 									</view>
 									<view class="tui-goods-status">
@@ -108,6 +109,13 @@
 						<text class="iconfont icon-xiangyou"></text>
 					</picker>
 				</view>
+				<view class="d-label">新品展示:</view>
+				<view class="d-input">
+					<picker @change="bindPickerChange(6,$event)" :value="index" :range="newFlagActions" range-key="name">
+						<input class="input" type="text" disabled="false" v-model="validFlagText" value="" placeholder="请选择"/>
+						<text class="iconfont icon-xiangyou"></text>
+					</picker>
+				</view>
 				<view class="d-input btn">
 					<view class="d-btn comfrim" @click="handSearchList">确定</view>
 					<view class="d-btn clear" @click="handSearchClear">重置</view>
@@ -162,6 +170,7 @@
 				threeClassificationText:'',
 				recommendActions: [{name:'是',value:1},{name: '否',value:0}],
 				commodityTypeActons: [{name:'产品',value:1},{name: '仪器',value:2}],
+				newFlagActions: [{name:'全部',value:''},{name:'参与',value:1},{name: '不参与',value:2}],
 				statusActions: [
 					{name:'全部',value:''},
 					{name: '未审核',value:1},