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

components/cm-module/productDetails/secondParameters.vue

@@ -0,0 +1,84 @@
+<template name="cm-parameters">
+	<!-- 二手商品参数-->
+	<view class="content">
+		<view class="content-tr">
+			<view class="content-td">品牌</view>
+			<view class="content-th">{{product.brandName == null? '其他' : product.brandName}}</view>
+		</view>
+		<view class="content-tr">
+			<view class="content-td">分类</view> 
+			<view class="content-th">{{product.typeStr}}</view>
+		</view>
+		<view class="content-tr">
+			<view class="content-td">商品成色</view> 
+			<view class="content-th">{{product.productQuality}}</view>
+		</view>
+		<view class="content-tr" v-if="product.fixedYears!=''">
+			<view class="content-td">出厂日期</view> 
+			<view class="content-th">{{product.fixedYears}}</view>
+		</view>
+		<view class="content-tr" v-if="product.showContactFlag==2">
+			<view class="content-td">联系人</view> 
+			<view class="content-th">{{product.contactName}}</view>
+		</view>
+		<view class="content-tr" v-if="product.showContactFlag==2">
+			<view class="content-td">联系方式</view> 
+			<view class="content-th">{{product.contactMobile}}</view>
+		</view>
+		<view class="content-tr" v-if="product.productType!=null||product.productType!=''">
+			<view class="content-td">商品类型</view> 
+			<view class="content-th" v-if="product.productType==1">医美</view>
+			<view class="content-th" v-else>非医美</view>
+		</view>
+		<view class="content-tr" v-if="product.secondHandType==2">
+			<view class="content-td">市场价</view>
+			<view class="content-th">{{product.normalPriceStr}}</view>
+		</view>
+		<view class="content-tr" v-if="product.secondHandType==2">
+			<view class="content-td">采购价/原价</view>
+			<view class="content-th">{{product.originalPriceStr}}</view>
+		</view>
+		<view class="content-tr" v-if="product.secondHandType==2">
+			<view class="content-td">产品到期日</view>
+			<view class="content-th">{{product.maturityYears}}</view>
+		</view>
+		<view class="content-tr" v-if="product.secondHandType==2">
+			<view class="content-td">库存</view>
+			<view class="content-th">{{product.stock}}</view>
+		</view>
+		<view class="content-tr">
+			<view class="content-td">所在地</view>
+			<view class="content-th">{{product.provinceCityDistrict}}</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default{
+		name:'cm-parameters',
+		props:{
+			product:{
+				type:Object,
+				default: {}
+			},
+			goodsData:{
+				type:Object,
+				default: {}
+			},
+		},
+		data() {
+			return{
+				
+			}
+		},
+		created() {
+			
+		},
+		methods:{
+		},
+		
+	}
+</script>
+
+<style>
+</style>

second/pages/form/form.vue

@@ -3,11 +3,11 @@
 	     <view class="bannerimg"><image src="https://admin-b.caimei365.com/userfiles/1/images/photo/2020/11/banner3.png"></image></view>
 	      <view class="my-maintenance" >
 	            <view class="newsTitle">
-	                <p>欢迎您来到采美365网二手商品市场，您可以在这里发布二手设备、产品信息，每个商品需要收取您100元的展示费，展示期为6个月；
-	                   为了完整展示您的商品，请您认真填写以下内容，谢谢合作。</p>
+					<p>欢迎您来到采美365网二手商品市场，您可以在这里发布二手
+					设备/产品信息，每个商品需要收取您100元的展示费，展示期为6个月； 为了完整展示您的商品，请您认真填写以下内容，谢谢合作</p>
 	             </view>
 				 <form>
-					 <view class="row"> 
+					 <view class="row fenlei"> 
 						 <label class="label"><span class="red">*</span>分类</label>
 						 <view class="secondradio">
 							  <view v-for="(item,index) in fenlei" :key="index" v-model="secondParams.secondHandType"  @click="secondHandRidio(item)"
@@ -33,89 +33,89 @@
 							<!-- <ul v-show="selectBrand">
 								 <li  v-for="(item,index) in BrandList" :key="index" :value='item.id' @click="ChangeBrand(item)">{{item.name}}</li>
 							 </ul> -->
+							 	 <text class="iconfont icon-xiayibu"></text>
 						 </view>
 					 </view>
 					 <view class="row">
-						 <label class="label">公司名称</label>
+						 <label class="label"><span class="red">*</span>商品名称</label>
 						 <view class="spacing">
-							 <input type="text" maxlength="40"  id="shopname"  v-model="secondParams.name" placeholder="请输入商品名称，不超过40个汉字">
+							 <input type="text" maxlength="40"  v-model="secondParams.name" placeholder="请输入商品名称，不超过40个汉字">
 						 </view>
 					 </view>
 					 <view class="row">
 						 <label class="label">出厂日期</label>
 						 <view class="spacing">
-							<input type="text" v-model="secondParams.fixedYears" id="shopyear" maxlength="10" placeholder="请输入出厂日期 如：2020年06月">
+							<input type="text" v-model="secondParams.fixedYears"  maxlength="10" placeholder="请输入出厂日期 如：2020年06月">
 						 </view>
 					 </view>
 					 <view class="row"  v-show="secondParams.secondHandType==2">
 						 <label class="label"><span class="red">*</span>产品到期日</label>
 						 <view class="spacing">
-							<input type="text"  v-model="secondParams.maturityYears" id="expire" maxlength="10" placeholder="请输入产品到期日，如：2020年12月">
+							<input type="text"  v-model="secondParams.maturityYears" maxlength="10" placeholder="请输入产品到期日，如：2020年12月">
 						 </view>
 					 </view>
 					 <view class="row">
-						 <label class="label"><span class="red">*</span>公司名称</label>
+						 <label class="label">公司名称</label>
 						 <view class="spacing">
-							 <input type="text"  v-model="secondParams.companyName" id="mechanismname" maxlength="30" placeholder="请输入公司名称，不超过30个汉字">
+							 <input type="text"  v-model="secondParams.companyName"  maxlength="30" placeholder="请输入公司名称，不超过30个汉字">
 						 </view>
 					 </view>
 					 <view class="row">
 						 <label class="label"><span class="red">*</span>交易价</label>
 						 <view class="spacing">
-							 <input type="text" style="width: 288px;" maxlength="20" id="shopprice" oninput="value=value.replace(/[^\d]/g, '')"
-							     v-model="secondParams.price1"  placeholder="请输入交易价">
+							 <input type="text" maxlength="20" v-model="secondParams.price1"  placeholder="请输入交易价">
 						 </view>
 					 </view>
 					 <view style="margin-top: 15rpx;">
 						 <span  @click="Detailed($event)"  v-model="secondParams.detailTalkFlags" class="iconfont xiangliao"
-						 :class="vShow_detailTalkFlag?'icon-jiagexiangliao':'icon-juxingweigouxuan'" ><span style="margin-left: 10rpx;">价格详聊</span></span>
+						 :class="vShow_detailTalkFlag?'icon-jiagexiangliao':'icon-juxingweigouxuan'" ><span class='pricecolor' >价格详聊</span></span>
 						 <span class="showflag" v-show="vShow_detailTalkFlag">(勾选代表同意不显示交易价)</span>
 					 </view>
 					 <view class="row" v-show="secondParams.secondHandType==2">
 						 <label class="label"><span class="red">*</span>市场价</label>
 						 <view class="spacing">
-							  <input type="text"  v-model="secondParams.normalPrice" id="market" maxlength="30" oninput="value=value.replace(/[^\d]/g, '')"   placeholder="请输入市场价">
+							  <input type="text"  v-model="secondParams.normalPrice" maxlength="30" oninput="value=value.replace(/[^\d]/g, '')"   placeholder="请输入市场价">
 						 </view>
 					 </view>
 					 <view class="row"  v-show="secondParams.secondHandType==2">
 						 <label class="label"><span class="red">*</span>采购价/原价</label>
 						 <view class="spacing">
-							  <input type="text"  v-model="secondParams.originalPrice" id="original_price" maxlength="30" oninput="value=value.replace(/[^\d]/g, '')" placeholder="请输入采购价/原价"/>
+							  <input type="text"  v-model="secondParams.originalPrice" maxlength="30" oninput="value=value.replace(/[^\d]/g, '')" placeholder="请输入采购价/原价"/>
 						 </view>
 					 </view>
 					 <view class="row" v-show="secondParams.secondHandType==2">
 						 <label class="label"><span class="red">*</span>数量</label>
 						 <view class="spacing">
-							  <input type="text"  id="number" v-model="secondParams.stock" maxlength="30" oninput="value=value.replace(/[^\d]/g,'')" placeholder="请输入数量">
+							  <input type="text"   v-model="secondParams.stock" maxlength="30"  placeholder="请输入数量">
 						 </view>
 					 </view>
 					 <view class="row">
 						 <label class="label"><span class="red">*</span>商品成色</label>
 						 <view class="spacing">
-						     <input type="text" maxlength="10" id="shopcolor"v-model="secondParams.productQuality"  placeholder="请输入商品成色，如“9成新”">
+						     <input type="text" maxlength="10"  v-model="secondParams.productQuality"  placeholder="请输入商品成色，如“9成新”">
 					    </view> 
 					 </view>
 					 <view class="row">
 						 <label class="label"><span class="red">*</span>联系人</label>
 						 <view class="spacing">
-							  <input type="text" maxlength="6" v-model="secondParams.contactName" id="linkman"  placeholder="请输入联系人姓名">
+							  <input type="text" maxlength="6" v-model="secondParams.contactName"   placeholder="请输入联系人姓名">
 					    </view> 
 					 </view>
 					 <view class="row">
 						 <label class="label"><span class="red">*</span>联系方式</label>
 						 <view class="spacing">
-							 <input type="text"  v-model="secondParams.contactMobile"  oninput="value=value.replace(/[^\d]/g,'')"  id="phoneNum" maxlength="11" placeholder="请输入联系人手机号 / 固话">
+							 <input type="text"  v-model="secondParams.contactMobile"    maxlength="11" placeholder="请输入联系人手机号 / 固话">
 					    </view> 
 					 </view>
 					 <view class="row">
 						 <label class="label">商品类型</label>
 						 <view class="secondradio">
-							 <view class="buy icon mIcon" v-for="(item ,index) in beauty" :key='index' value="item.value" @click="getProductType(item.value)" :class="secondType==item.value?' active':''">
+							 <view class="buy " v-for="(item ,index) in beauty" :key='index' value="item.value" @click="getProductType(item.value)" :class="secondType==item.value?' active':''">
 								 <label class="iconfont" :class="secondType==item.value?'icon-yixuanze':'icon-weixuanze'"></label>{{item.name}}
 							 </view>
 						 </view>
 					 </view>
-					<view class="row">
+					<view class="row" >
 						 <label class="label"><span class="red">*</span>联系地址</label>
 						 <view class="spacing"  @click="showMulLinkageThreePicker">
 							 <text class="row-input" :class="addressData.address === '请选择所在地区' ? 'none' : ''">
@@ -124,12 +124,50 @@
 							 <text class="iconfont icon-xiayibu"></text>
 					    </view> 
 					 </view>
-					 <textarea type="text" id="addressDetails" class="border-grey address-details" v-model="secondParams.address" maxlength="50"
+					 <textarea type="text"  class="border-grey address-details" v-model="secondParams.address" maxlength="50"
 						placeholder="请填写详细地址，如街道/小区/门牌等" /></textarea>
-					 
+					<view class="release-main-container">
+						<view class="release-from">
+							<label class="label"><span class="red">*</span>商品图片</label>
+								<view class="release-input upload image uploadGoodsImages" >
+									<view class="upload-file" v-show="GoodsImagesList.length<5">
+										<i class="iconfont icon-shangchuantupian"></i>
+										<p class="add-text">营业执照</p>
+										<input ref="goodsImages" type="file" name="file" value="" class="input-file" accept="image/png,image/jpeg,image/gif,image/jpg"  @change="uploadGoodsImagesFn">
+									</view>
+									<view class="upload-file"  v-for="(item, index) in GoodsImagesList" :key="index">
+										<img :data-original='item' :src="item" :data-image="item" alt="" class="upload-img" >
+										<i class=" del iconfont icon-shanchu1" @click="removeGoodsImagesFn(index)"></i>
+									</view>
+								</view>
+								<view class="form-upload-tips">
+									<i class="iconfont icon-wenhao" ></i>
+									<view class="wen-tips" >最多上传5张二手商品图片，请尽量全部上传，单张图片不能超过5M</view>
+								</view>
+							</view>
+						</view>
+						<view class="productinfo">
+							 <label class="label unlogin-label" style="width: 100%;">商品详细信息</label>
+							 <div class="textarea-wrapper">
+								 <textarea maxlength="200" v-model="secondParams.productDetails"  cols="70" class="description" rows="6"  placeholder="请填写商品详细信息，对商品进行更详细的描述"></textarea>
+								 <span class="word-limit">{{secondParams.productDetails.length}}/200</span>
+							 </div>
+						</view>
+						<view class="productinfo">
+							 <label class="label unlogin-label" style="width: 100%;"><span class="red">*</span>免责声明</label>
+							 <textarea class="smText">
+								 鉴于本网站提供的二手版块信息包括但不限于公司名称，商品的简介、性能、描述与说明，相关图片、视频等均由卖家自行提供，
+								 由卖家对其提供的信息承担相应法律责任。买家应自行甄别商品信息并查验商品性状。本网站对二手版块中买卖双方的交易不提供任何形式的担保与保证，特此声明！
+							 </textarea>
+						</view>
+						<view class="row Read">
+							<span  @click="changeBox($event)" class="iconfont xiangliao"
+							:class="checkbox?'icon-jiagexiangliao':'icon-juxingweigouxuan'" ><span style="margin-left: 10rpx;">已阅读</span></span>
+						</view>
+						<div class="BtnAll" >
+							<button type="button"  @click="submitBtn" class="btn-submit">发布</button>
+					</div>
 				 </form>
-				 <tui-drawer  @mode="bottom" :class="{'tui-drawer-mask_show':visible}" >
-				 </tui-drawer>
 				 <mpvue-city-picker :themeColor="themeColor"
 				 					ref="mpvueCityPicker" 
 				 				    :pickerValueDefault="cityPickerValueDefault"
@@ -137,21 +175,33 @@
 				 					@onConfirm="onConfirm">
 				 </mpvue-city-picker>
 	          </view>
-	
-	             
-	
+			<view class="secondBj thebj"   v-show="vShow_secondBj" :class="vShow_secondBj?'show':''">
+					<view class="bjmain theresult">
+						<span class="title">发布提示</span>
+						<p>发布二手商品，采美需要收取您每个商品100元的展示费，展示期为6个月</br>
+							支付完成后，商品会在1-2个工作日内进行审核，审核通过后，商品会立即上线</p>
+						<view class="paybtn">
+							<span class="thegopay gozhofubao" @click.stop="quxiao">取消发布</span>
+							<span class="cancel closebtn" @click.stop="gopay">去支付</span>
+						</view>
+					</view>
+				</view>
+		<payment-record ref="payment" v-if="isRequest" :discernReceiptList="discernReceiptList" :receiptAmount="receiptAmount"></payment-record>
 	</view>
 </template>
 
 <script>
-	import tuiDrawer from "@/components/thorui/tui-drawer/tui-drawer.vue"
+	import listCell from "@/components/tui-components/list-cell/list-cell.vue"
 	import mpvueCityPicker from '@/components/mpvue-citypicker/mpvueCityPicker.vue'
+	import paymentRecord from '@/components/cm-module/orderDetails/paymentRecord'	
+	import { uploadFileImage } from "@/api/utils.js"
 	import { mapState,mapMutations } from 'vuex';
 	export default{
 		name:'secondHandrelease',
 		components:{
-			tuiDrawer,
-			mpvueCityPicker
+			listCell,
+			mpvueCityPicker,
+			paymentRecord
 		},
 		data(){
 			return{
@@ -173,13 +223,11 @@
 				        ],
 				        BrandList:[],
 				        isShow:false,
-				        includedTax:'',
 				        GoodsImagesList:[],
 				        oldNum:0,
 				        secondType:0,
 				        vShow_GoodsImages:false,
 				        fromMessage:'',//提示文字
-				        // formData:new FormData(),
 				        secondParams:{
 				            secondHandType:'',//一级分类
 				            instrumentType:'',//二手仪器分类
@@ -211,44 +259,20 @@
 						 	provinceID:'',		//区ID
 						 	addressDetail: '',	//地址
 						 },
-				        brandname:'请选择',
+				        brandname:'请选择品牌名称',
 				        checkbox:false,
 				        shoplogoTwo:false,
 				        provinceIndex:'',
 				        provinceArray:[],
 				        cityArray: [],//市
 				        townArray: [],//区
-				        from: {
-				            name:'',
-				            province: '',//省id
-				            city: '',
-				            town: ''
-				        },
-				        TypeList:'',
 				        playid:'',
 				        checkVal:[],
 				        vShow_secondBj:false,
 				        resultBj:false,
 				        vShow_detailTalkFlag:false,
-				        vShow_secondHandType:false,
-				        vShow_instrumentType:false,
-				        vShow_BrandID:false,
-				        vShow_Name:false,
-				        vShow_Price:false,
-				        vShow_shopColor:false,
-				        vShow_contactName:false,
-				        vShow_contactMobile:false,
-				        vShow_Address:false,
-				        vShow_TownId:false,
-				        vShow_Market:false,
-				        vShow_original:false,
-				        vShow_Number:false,
-				        vShow_expire:false,
-				        vShow_detailInfoEditor:true,
-				        vShow_GoodsImages:false,
-				        vShow_checkBox:false,
-				        selectBrand:false,
 						isShowInput:true,
+						showtips:false
 			}
 		},
 		methods:{
@@ -262,324 +286,170 @@
 				this.addressData.townID = e.townCode;
 				this.addressData.cityID = e.cityCode;
 				this.addressData.provinceID = e.provinceCode;
-			},	
+				this.secondParams.townId = this.addressData.townID;
+				this.secondParams.address = this.addressData.address;
+			},
+		 onConfirmbrand(e){
+			 this.brandname = e.name;
+		 },
 			showBrand:function(){
-			            var _this = this;
-			            _this.selectBrand = !_this.selectBrand;
+						this.isShowInput = true
+						this.$refs.listCell.show()
 			        },
 			        secondHandRidio: function(item) {
-			        var _this = this;
-			            _this.currentId = item.value;
-			            _this.secondParams.secondHandType = item.value;
+			            this.currentId = item.value;
+			            this.secondParams.secondHandType = item.value;
 			            if (item.value==1){
-			            _this.isShow = true;
+			            this.isShow = true;
 			            }else {
-			             _this.isShow = false;
+			             this.isShow = false;
 			            }
 			        },
 			        secondHandType:function(item){ //二手仪器
 			        item.isChecked = ! item.isChecked;
-			        var _this = this;
 			          if(item.isChecked){
-			           _this.checkVal.push(item.value);
-			           _this.secondParams.instrumentType =  _this.checkVal.toString();
+			           this.checkVal.push(item.value);
+			           this.secondParams.instrumentType =  this.checkVal.toString();
 			          } else {
-			            _this.checkVal.splice(_this.checkVal.indexOf(item.value), 1);
-			            _this.secondParams.instrumentType = _this.checkVal.toString();
+			            this.checkVal.splice(this.checkVal.indexOf(item.value), 1);
+			            this.secondParams.instrumentType = this.checkVal.toString();
 			          }
 			        },
 			        ChangeBrand:function(item){ //品牌列表
-			         var _this = this;
-			            _this.brandname = item.name;
-			            _this.secondParams.brandID = item.id;
-			            if(_this.secondParams.brandID==161){
-			              _this.shoplogoTwo = true;
+			            this.brandname = item.name;
+			            this.secondParams.brandID = item.id;
+			            if(this.secondParams.brandID==161){
+			              this.shoplogoTwo = true;
 			            }else {
-			              _this.shoplogoTwo = false;
+			              this.shoplogoTwo = false;
 			            }
 			        },
 			        Detailed:function(){
-			        var _this = this;
-					_this.vShow_detailTalkFlag = !_this.vShow_detailTalkFlag;
-			         if(_this.vShow_detailTalkFlag){
-			             _this.secondParams.detailTalkFlag = 2 ;//启用价格详聊
+					this.vShow_detailTalkFlag = !this.vShow_detailTalkFlag;
+			         if(this.vShow_detailTalkFlag){
+			             this.secondParams.detailTalkFlag = 2 ;//启用价格详聊
 			          }else {
-			            _this.secondParams.detailTalkFlag = 1 ;//不启用价格详聊
+			            this.secondParams.detailTalkFlag = 1 ;//不启用价格详聊
 			          }
 			        },
 			        dragstart: function(value) {  // 记录初始信息
 			            this.oldNum = value;
 			        },
 			         uploadGoodsImagesFn: function(event){//上传商品图片
-			            var _this = this;
-			            var inputDOM = _this.$refs.goodsImages;
-			            var file = inputDOM.files;
-			            _this.formData.append('file', file[0]);
-			            SecondApi.uploadimg(_this.formData,function(response){
-			               _this.GoodsImagesList.push(response.data);
-			               _this.secondParams.image1 =_this.GoodsImagesList.toString()+',';
-			                event.target.value = '';
-			            });
+							uploadFileImage().then(res =>{
+								 this.GoodsImagesList.push(JSON.parse(res.data).data);
+								 this.secondParams.image1 =this.GoodsImagesList.toString()+',';
+							})
 			        },
 			         removeGoodsImagesFn: function(index){//删除商品图片
-			            var _this = this;
-			            _this.GoodsImagesList.splice(index,1);
-			            _this.secondParams.image1 =_this.GoodsImagesList.toString()+',';
+			            this.GoodsImagesList.splice(index,1);
+			            this.secondParams.image1 =this.GoodsImagesList.toString()+',';
 			         },
 			        getProductType:function(item){
-			        var _this = this;
-			         _this.secondType=item;
-			          _this.secondParams.secondProductType = item ;
+			         this.secondType=item;
+			          this.secondParams.secondProductType = item ;
 			        },
 			        submitBtn:function () {
-			         var _this = this;
-			          if(_this.secondParams.secondHandType == ''){
-			                _this.vShow_secondHandType = true;
-			                _this.fromMessage = '请选择分类';
-			                _this.scrollIntoView();
-			                setTimeout(function(){
-			                    _this.vShow_secondHandType= false;
-			                },2000);
+			          if(this.secondParams.secondHandType == ''){
+							this.$util.msg('请选择分类',2000);
 			                return;
 			            }
-			            if(_this.secondParams.secondHandType == 1 ){
-			               if(_this.secondParams.instrumentType ==''){
-			                _this.vShow_instrumentType = true;
-			                _this.fromMessage = '请完善仪器分类';
-			                _this.scrollIntoView();
-			                setTimeout(function(){
-			                    _this.vShow_instrumentType= false;
-			                },2000);
+			            if(this.secondParams.secondHandType == 1 ){
+			               if(this.secondParams.instrumentType ==''){
+							this.$util.msg('请完善仪器分类',2000);
 			                return;
 			                }
 			            }
-			         if(_this.secondParams.brandID == ''){
-			                _this.vShow_BrandID = true;
-			                _this.fromMessage = '请选择商品品牌';
-			                _this.scrollIntoView();
-			                setTimeout(function(){
-			                    _this.vShow_BrandID = false;
-			                },2000);
-			                return;
-			            }
-			         if(_this.secondParams.name == ''){
-			              _this.vShow_Name = true;
-			              _this.fromMessage = '请输入商品名称';
-			              _this.scrollIntoView();
-			                setTimeout(function(){
-			                    _this.vShow_Name = false;
-			                },2000);
+			    //      if(this.secondParams.brandID == ''){
+							// this.$util.msg('请选择商品品牌',2000);
+			    //             return;
+			    //         }
+			         if(this.secondParams.name == ''){
+						  this.$util.msg('请输入商品名称',2000);
 			                return
 			         }
-			         if(_this.secondParams.secondHandType ==2) {
-			         if (_this.secondParams.normalPrice == '') {
-			                 _this.vShow_Market = true;
-			                 _this.fromMessage = '请输入市场价';
-			                 _this.scrollIntoView();
-			                 setTimeout(function () {
-			                     _this.vShow_Market = false;
-			                 }, 2000);
+			         if(this.secondParams.secondHandType ==2) {
+			         if (this.secondParams.normalPrice == '') {
+							 this.$util.msg('请输入市场价',2000);
 			                 return
 			             }
-			             if (_this.secondParams.maturityYears == '') {
-			                 _this.vShow_expire = true;
-			                 _this.fromMessage = '请输入产品到期日';
-			                 _this.scrollIntoView();
-			                 setTimeout(function () {
-			                     _this.vShow_expire = false;
-			                 }, 2000);
+			             if (this.secondParams.maturityYears == '') {
+							 this.$util.msg('请输入产品到期日',2000);
 			                 return
 			             }
 			         }
-			         if(_this.secondParams.price1 == ''){
-			                  _this.vShow_Price = true;
-			                  _this.fromMessage = '请输入交易价';
-			                  _this.scrollIntoView();
-			                    setTimeout(function(){
-			                        _this.vShow_Price = false;
-			                    },2000);
+			         if(this.secondParams.price1 == ''){
+							  this.$util.msg('请输入交易价',2000);
 			                    return
 			             }
-			         if(_this.secondParams.secondHandType ==2){
-			             if(_this.secondParams.originalPrice == ''){
-			              _this.vShow_original = true;
-			              _this.fromMessage = '请输入采购价/原价';
-			              _this.scrollIntoView();
-			                setTimeout(function(){
-			                    _this.vShow_original = false;
-			                },2000);
+			         if(this.secondParams.secondHandType ==2){
+			             if(this.secondParams.originalPrice == ''){
+						  this.$util.msg('请输入采购价/原价',2000);
 			                return
 			           }
-			         if(_this.secondParams.stock == ''){
-			              _this.vShow_Number = true;
-			              _this.fromMessage = '请输入数量';
-			              _this.scrollIntoView();
-			                setTimeout(function(){
-			                    _this.vShow_Number = false;
-			                },2000);
+			         if(this.secondParams.stock == ''){
+						  this.$util.msg('请输入数量',2000);
 			                return
 			            }
 			         }
-			
-			
-			         if(_this.secondParams.productQuality == ''){
-			              _this.vShow_shopColor = true;
-			              _this.fromMessage = '请输入商品成色';
-			              _this.scrollIntoView();
-			                setTimeout(function(){
-			                    _this.vShow_shopColor = false;
-			                },2000);
+			         if(this.secondParams.productQuality == ''){
+						  this.$util.msg('请输入商品成色',2000);
 			                return
 			         }
-			          if(_this.secondParams.contactName == ''){
-			              _this.vShow_contactName = true;
-			              _this.fromMessage = '请输入联系人姓名';
-			              _this.scrollIntoView();
-			                setTimeout(function(){
-			                    _this.vShow_contactName = false;
-			                },2000);
+			          if(this.secondParams.contactName == ''){
+						  this.$util.msg('请输入联系人姓名',2000);
 			                return
 			         }
-			          if(_this.secondParams.contactMobile == ''){
-			              _this.vShow_contactMobile = true;
-			              _this.fromMessage = '请输入联系方式';
-			              _this.scrollIntoView();
-			                setTimeout(function(){
-			                    _this.vShow_contactMobile = false;
-			                },2000);
+			          if(this.secondParams.contactMobile == ''){
+						  console.log(this.secondParams.contactMobile)
+						  this.$util.msg('请输入联系方式',2000);
 			                return
 			         }
-			         if(_this.secondParams.contactMobile.length !=11){
-			              _this.vShow_contactMobile = true;
-			              _this.fromMessage = '联系方式格式不正确';
-			              _this.scrollIntoView();
-			                setTimeout(function(){
-			                    _this.vShow_contactMobile = false;
-			                },2000);
+			         if(this.secondParams.contactMobile.length !=11){
+						  this.$util.msg('联系方式格式不正确',2000);
 			                 return
 			          }
-			          if(_this.secondParams.townId == ''|| _this.secondParams.townId == undefined){
-			              _this.vShow_TownId = true;
-			              _this.fromMessage = '请完善联系地址';
-			              _this.scrollIntoView();
-			                setTimeout(function(){
-			                    _this.vShow_TownId = false;
-			                },2000);
+			          if(this.secondParams.townId == ''|| this.secondParams.townId == undefined){
+						  this.$util.msg('请完善联系地址',2000);
 			                return
 			         }
-			           if(_this.secondParams.address == ''){
-			              _this.vShow_Address = true;
-			              _this.fromMessage = '请填写详细地址';
-			               document.getElementById('Address').scrollIntoView({block: 'start', behavior: 'smooth'});
-			                setTimeout(function(){
-			                    _this.vShow_Address = false;
-			                },2000);
+			           if(this.secondParams.address == ''){
+						  this.$util.msg('请填写详细地址',2000);
 			                return
 			         }
-			            if(_this.GoodsImagesList ==''){
-			               _this.vShow_GoodsImages = true;
-			              _this.fromMessage = '请上传图片';
-			                document.documentElement.scrollTop=900;
-			              setTimeout(function(){
-			                   _this.vShow_GoodsImages = false;
-			                },2000);
+			            if(this.GoodsImagesList ==''){
+						    this.$util.msg('请上传图片',2000);
 			                return;
 			            }
-			         if(_this.checkbox==false){
-			               _this.vShow_checkBox = true;
-			               _this.fromMessage='请勾选已阅读';
-			                setTimeout(function(){
-			                   _this.vShow_checkBox = false;
-			                },2000);
+			         if(this.checkbox==false){
+						   this.$util.msg('请勾选已阅读',2000);
 			                return
 			         }
-			         console.log(_this.secondParams)
-			          SecondApi.SecondHandProduct(_this.secondParams,function (res) { //提交发布
+			         console.log(this.secondParams)
+					 this.SecondService.SecondHandProduct(this.secondParams).then(res=>{ //提交发布
 			             if (res.code==0){
-			                 console.log(res)
-			               _this.vShow_secondBj = true;
-			               _this.playid= res.data;
+			               this.vShow_secondBj = true;
+			               this.playid= res.data;
 			             }else{
 			                  this.$util.msg(res.msg,2000)
-			                 _this.secondBj = false;
+			                 this.secondBj = false;
 			                 return
 			             }
 			         })
 			        },
 			        quxiao:function(){
-			        var _this = this;
-			         _this.vShow_secondBj = false;
+			         this.vShow_secondBj = false;
 			        },
 			        gopay:function(){
-			            var _this = this;
-			            window.location.href = '/pay/caimei-paycash.html?pageType=1&&type=confirm&productID='+_this.playid;
-			            _this.vShow_secondBj = false;
-			        },
-			         scrollIntoView: function(){
-			            document.getElementById('secondHandrelease').scrollIntoView({block: 'start', behavior: 'smooth'});
-			        },
-			        province:function () {
-			           var _this = this;
-			           _this.from.province = event.target.value;
-			            if(_this.from.province==''){//省为请选择时市区初始化
-			                _this.cityArray=[];
-			                _this.townArray=[];
-			                _this.secondParams.townId=''
-			            }else {
-			              _this.getcity();
-			            }
-			        },
-			        getcity:function(event){//加载市
-			           var _this = this;
-			            PublicApi.GetCity({ provinceId: _this.from.province },function(response){
-			                 if(response.code == 0 ){
-			                    _this.cityArray = response.data;
-			                     _this.from.city = event.target.value;
-			                     if(_this.from.city==''){
-			                           _this.townArray=[];
-			                     }else {
-			                         _this.getcTown();
-			                     }
-			
-			                }
-			            })
-			
-			
-			        },
-			        getcTown:function(event){
-			            var _this = this;
-			            PublicApi.GetTown({cityId:_this.from.city},function(response){
-			                if(response.code == 0 ){
-			                    _this.townArray = response.data;
-			                    _this.secondParams.townId = event.target.value;
-			                }else{
-			                    this.$util.msg(response.msg,2000)
-			                }
-			            })
+						this.$api.navigateTo(`/pages/user/order/order-payment?type=confirm&productID=${this.playid}`)
+			            this.vShow_secondBj = false;
 			        },
 			        changeBox:function () {
-			            if(event.target.checked ==true){
-			             this.checkbox = true
-			            }else {
-			             this.checkbox = false
-			            }
+						this.checkbox = !this.checkbox;
 			        },
 					
 		},
 		 created(){
-				this.SecondService.brandList().then(res =>{//品牌列表
-		            if(res.code == 0){
-		               this.BrandList = res.data;
-					   console.log( this.BrandList)
-		            }
-		        })
-		     this.SecondService.GetProvince().then(response=>{//省份
-		            if(response.code == 0){
-		                this.provinceArray = response.data
-		            }else{
-		               this.$util.msg(response.msg,2000)
-		            }
-		        })
 		    },
 	}
 </script>
@@ -599,64 +469,206 @@
 		.secondradio{display: inline-block;margin-left: 40rpx;}	
 		.Secondary{width: 100%;text-align: center;margin: 0;}
 		.secondradio view.active {color: #e15616;}
-		.row .label .red{
-			color: #f94b4b;
+		.label .red{color: #f94b4b;}
+		input[type="text"]::placeholder, textarea::placeholder {color: #b2b2b2;}
+		input[type="text"]{line-height: 90rpx;overflow: unset;}
+		.row label.iconfont{margin-right: 10rpx;}
+		.icon-weixuanze{color: #b2b2b2;}
+		.linqi_text { width: 100%; 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: -30%;
+		    right: 38%;border-bottom: 20rpx solid #1890f9;position: absolute;}
+		.label{color: #666666;display: inline-block;}
+		.row{border-bottom: 2rpx solid #e1e1e1;line-height: 90rpx;height: 90rpx;}
+		.row.fenlei{height: auto;}
+		.select {position: relative;color: #9aa5b5;text-align: left;user-select: none;}
+		.row .spacing{display: inline-block;margin-left: 60rpx;width: 68%;vertical-align:middle;position: relative}
+		.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;}
+		.upload-file {
+		    position: relative;
+		    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;
 		}
-		input[type="text"]::placeholder, textarea::placeholder {color: #b2b2b2;;}
-		.row label.iconfont{margin-right: 10rpx;color: #e15616;}
-		.linqi_text {
+		.add-text {
+		    font-size: 26rpx;
+		    color: #333330;
+		    opacity: 0.5;
+		    position: absolute;
+		    top: 55%;
+		    right:24%;
+		}
+		.upload-img {
 		    width: 100%;
+		    height: 100%;
+		    display: block;
+		    border-radius: .53vw;
+		}
+		.icon-shangchuantupian{
+			width: 46rpx;
+			height: 46rpx;
+			color: #b2b2b2;
+			font-size: 18px;
+			position: absolute;
+			top: 30%;
+			left: 40%;
+		}
+		.icon-shanchu1{
+			position: absolute;
+			top: -25rpx;
+			right:-10rpx;
+			color: #f94b4b;
+			font-size: 36rpx;
+		}
+		.wen-tips {
+		    width: 664rpx;
 		    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;
+		    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: #b2b2b2;
+		    position: relative;
+		    font-size: 28rpx;
+		    border: 2rpx solid #b2b2b2;
+		    height: 300rpx;
+			padding: 16rpx;
+			border-radius: 6rpx;
+			margin: 20rpx 0;
+		}
+		.textarea-wrapper textarea{
+			width: 100%;
 		}
-		.jiaobiao {
-		    width: 0;
-		    height: 0;
-		    border-left: 20rpx solid transparent;
-		    border-right: 20rpx solid transparent;
-		    top: 376rpx;
-		    right: 45%;
-		    border-bottom: 20rpx solid #1890f9;
+		.word-limit {
 		    position: absolute;
-			}
-		.row .label{color: #666666;width: 126rpx;display: inline-block;}
-		.row{border-bottom: 2rpx solid #e1e1e1;line-height: 90rpx;height: 90rpx;}
-		.select {
-			position: relative;
-			color: #9aa5b5;
-			text-align: left;
-			user-select: none;
+		    right: 2.7vw;
+		    bottom: 2.7vw;
+		    font-size: 3.2vw;
+		    color: #9aa5b5;
 		}
-		.row .spacing{
-			display: inline-block;
-			margin-left: 60rpx;
-			width: 73%;
-			vertical-align:middle
+		.smText{
+			color: #999999;
+			text-align: left;
+			line-height: 42rpx;
+			font-size: 24rpx;
+			margin-top: 10rpx;
+			width: 100%;
+			height: 260rpx;
 		}
-	  .select .placeholder {
-			position: relative;
-			cursor: pointer;
+		.BtnAll{
 			width: 100%;
+			margin-bottom: 20rpx;
+		}
+		.BtnAll button{
+			width: 600rpx;
+			height: 90rpx;
+			margin: auto;
+			text-align: center;
+			line-height: 90rpx;
+			color: #fff;
+			background-image: linear-gradient(315deg, 
+					#f28f31 0%, 
+					#e15616 100%);
+			border-radius: 90rpx;
+			font-size: 30rpx;
+		}
+		.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 p{
+			padding: 30rpx 52rpx;
+			line-height: 48rpx;
+			color: #666666;
+			font-size: 30rpx;
+		}
+		.paybtn span{
+			width: 290rpx;
+			height: 90rpx;
+			text-align: center;
+			line-height: 90rpx;
+			font-size: 30rpx;
 			display: inline-block;
 		}
-		.icon-xiayibu{margin-left: 280rpx;color: #b2b2b2;}
-		.xiangliao{font-size: 26rpx;margin-right: 10rpx;}
-		.icon-jiagexiangliao{color: #e15616;}
-		.showflag{color: #b2b2b2;}
-		.border-grey{
-			width: 100%;
-			resize: none;
-			padding: 20rpx;
-			height: 160rpx;
-			border-bottom: 2rpx solid #e1e1e1;
+		.paybtn .cancel{
+			background-image: linear-gradient(270deg, #f28f31 0%, #e15616 100%);
+			border-radius: 0rpx 0rpx 32rpx 0rpx;
+			color: #fff;
+			
 		}
-		.release-main-container {
-		    overflow: hidden;
+		.paybtn .thegopay{
+			background-color: #efefef;
+			border-radius: 0rpx 0rpx 0rpx 32rpx;
+			color: #999999;
 		}
+		.icon-wenhao{
+			color: #1890f9;
+			font-size: 35rpx;
+			width: 50rpx;
+		}
+			
 </style>

second/pages/product/product-details.vue

@@ -1,9 +1,1549 @@
+
 <template>
-	<text>二手详情</text>
+	<view class="product" :style="{paddingBottom: userIdentity==1 ? '0rpx' :'188rpx'}">
+		<custom-p   v-if="isHeaderPoduct"
+					:systeminfo='systeminfo' 
+					:navbar-data='nvabarData' 
+					:headerBtnPosi ="headerBtnPosi" 
+					:headerColor="headerColor" 
+					:type="isShareType"
+					:page='backPage'>
+		</custom-p>
+		<tui-skeleton v-if="skeletonShow" backgroundColor="#fafafa" borderRadius="10rpx" :isLoading	="true" :loadingType="5"></tui-skeleton>
+		<view class="container-product tui-skeleton">
+			<view class="product-top">
+				<view class="banner-section">
+					<uni-swiper-dot :info="productImage" :current="current" field="content" :mode="mode" >
+						<swiper class="banner tui-banner tui-skeleton-rect"  @change="swiperChange" :duration='800' :autoplay="false" :circular="true" >
+							<swiper-item v-for="(item, index) in productImage" :key="index" class="banner-item"> 
+								<image :src="item" @click="previewImg(index)" class="product-img" />
+							</swiper-item>
+						</swiper>
+						<view class="swiper__dots-box">
+							<tui-tag padding="12rpx 24rpx" type="translucent" shape="circleLeft" size="32rpx" :scaleMultiple="0.82" originRight>{{ current + 1 }}/{{ productImage.length }}</tui-tag>
+						</view>
+					</uni-swiper-dot>
+				</view>
+				<view class="product-wrap clearfix">
+					<view class="wrap-top" :class="goodsData.isNoneDisabled ? 'none' : ''">
+						<view class="wrap-top-price" v-if="!goodsData.isNoneDisabled">
+							<cm-price v-if="isRequest"
+									  :product="product"
+									  :userIdentity="userIdentity"
+									  :promotions="product.promotions"
+									  :ladderPriceList="ladderPriceList"/>
+						</view>
+						<view class="p-title tui-skeleton-fillet">
+							<view class="p-title-name">
+								{{product.name == undefined ? '' : product.name}}
+							</view>
+							<button open-type="share" class="p-title-share tui-share-position" @tap="onShare">
+								<view class=""><text class="iconfont icon-fenxiang1"></text></view>
+								<view class="">分享</view>
+							</button>
+						</view>
+						<view class="productRemarks"  v-if="product.productRemarks!=''&&product.productRemarks!=null">
+							<text class="text">{{product.productRemarks}}</text>
+						</view>
+						<view class="wrap-label" v-if="product.tagsList.length>0">
+							<view class="label-a tui-skeleton-fillet" v-for="(label,index) in  product.tagsList" :key="index">{{label}}</view>
+						</view>
+					</view>
+				</view>			
+			</view>
+			<view class="product-seve">
+				<text class="title">服务：</text>
+				<text class="iconfont icon-dui tui-skeleton-rect"><text class="text">无忧退货</text></text>
+				<text class="iconfont icon-dui tui-skeleton-rect"><text class="text">快速退款</text></text>
+				<text class="iconfont icon-dui tui-skeleton-rect"><text class="text">正品保证</text></text>
+			</view>
+			<view class="product-parameter" @click="showPopup">
+				<text class="title">参数：</text>
+				<text class="name">品牌  起订量  分类...</text>
+				<text class="iconfont icon-xiayibu"></text>
+			</view>
+			<view class="product-supplier" @click="goSupplier">
+				<view class="logo"><img src="https://img.caimei365.com/group1/M00/03/4B/Cmis210DQ_qAIoyoAAKD15t_iQc959.png" alt=""></view>
+				<view class="main">
+					<view class="name">{{shop.name}}</view>
+					<view class="massgs">
+						<view class="label">满意度:</view>
+						<view class="p-stars">
+							<uni-stars :stars="6" :iconClass="iconClass" :iconColor="iconColor" :fontSize="36" :widthInfo="176"></uni-stars>
+						</view>
+						<view class="acount">
+							<text>50</text>件商品
+						</view>
+					</view>
+				</view>
+				<view class="right"><text class="iconfont icon-xiayibu"></text></view>
+			</view>
+			<view class="product-details">
+				<!-- 商品详情 -->
+				<view class="title">
+					<view class="title-tab">商品详情</view>
+				</view>
+				<view class="Disclaimer">
+					<span >免责声明</span>
+					<text class="text">
+						鉴于本网站提供的二手版块信息包括但不限于公司名称，商品的简介、性能、描述与说明，相关图片、视频等均由卖家自行提供，由卖家对其提供的信息承担相应法律责任。买家应自行甄别商品信息并查验商品性状。本网站对二手版块中买卖双方的交易不提供任何形式的担保与保证，特此声明！
+					</text>
+				</view>
+				<view class="content tui-banner product-rich-text tui-skeleton-rect">
+					<parser :html="html" :img-mode="widthFix"></parser>
+				</view>
+			</view>	
+			<view class="product-details secondBrand">
+				<!-- 品牌信息 -->
+				<view class="title">
+					<view class="title-tab">品牌信息</view>
+				</view>
+				<text class="brandinfo">
+					品牌描述品牌描述品牌描述品牌描述品牌描述品牌描述品牌描述品牌描述
+				</text>
+			</view>
+			<view class="product-details recommend">
+				<!-- 相关推荐 -->
+				<view class="title">
+					<view class="title-tab">相关推荐</view>
+				</view>
+				<view class="content hot">
+					<recommend :query-productid="product.productID" v-if="isRequest"></recommend>
+					<!-- <recommend :query-productid="product.productID" v-if="isRequest"></recommend> -->
+				</view>
+			</view>	
+				</view> 
+			<!-- 商品参数 -->
+			<tui-bottom-popup :radius="true" :show="popupShow" @close="hidePopup()">
+				<view class="tui-popup-box clearfix">
+					<view class="title">商品参数</view>
+					<!-- 二手商品参数-->
+						<second-Parameters v-if="isRequest" :product="product" :goodsData="goodsData" />
+					<view class="tui-right-flex tui-popup-btn" :style="{ paddingBottom :isIphoneX ? '68rpx' : '0rpx' }">
+						<view class="tui-flex-1">
+							<view class="tui-button" @click="hidePopup()">收起</view>
+						</view>
+					</view>
+				</view>	
+			</tui-bottom-popup>	
+			<!-- 侧边 -->
+			<scroll-top v-if="isScrollTop"></scroll-top>
+		</view>
+	</view>
 </template>
 
 <script>
+	import { mapState,mapMutations } from 'vuex'
+	import customP from '@/components/cm-module/headerNavbar/header-poduct' 		 //自定义导航
+	import cmPrice from "@/components/cm-module/productDetails/cm-price.vue" //价格显示
+	import cmAttributes from "@/components/cm-module/productDetails/secondParameters.vue" //规格信息
+	import authorize from '@/common/config/authorize.js'
+	import uniStars from '@/components/uni-stars/uni-stars.vue'
+	import parser from "@/components/jyf-Parser/index" //富文本处理
+	import tuiSkeleton from "@/components/tui-skeleton/tui-skeleton"
+	import recommend from "@/components/cm-module/productDetails/secondRecommend" //相关推荐//相关推荐
+	import cmParameter from "@/components/cm-module/productDetails/cm-parameter" //相关参数
+	import cmService from "@/components/cm-module/productDetails/cm-service" //服务项目
+	import wxLogin from "@/common/config/wxLogin.js"
+	var isPreviewImg;
+	export default{
+		components:{
+			uniStars,
+			customP,
+			parser,
+			tuiSkeleton,
+			recommend,
+			cmPrice,
+			cmAttributes,
+			cmParameter,
+			cmService
+		},
+		data(){
+			return{			
+				html:'<div style="text-align: center;color:#333333;">暂无内容</div>',
+				disabledTabNavList:[{name:'相关推荐'}],
+				mode:'round',
+				iconClass:'icon-aixin',
+				iconColor:'#ff9100',
+				specClass: '',//规格弹窗css类，控制开关动画
+				isBtnType:'',
+				isRequest:false,
+				isScrollTop:false,
+				current:0,
+				isShareType:'',
+				isHeaderPoduct:false,
+				navbarFiexd:'none',
+				ladderPriceFlag:'',
+				ladderPriceList:'',
+				isRecommend:false,
+				isRarameter:true,
+				isService:false,
+				isEvaluate:false,
+				isAnimation:false,
+				skeletonShow:true,
+				isQuantity:false,
+				isStock:false,
+				disabled:false,
+				isNoneDisabled:false,
+				tabCurrentIndex:0,
+				userID:'',
+				productID:0,
+				userIdentity:'',//用户类型
+				goodsData:{},//自定义数据
+				shop:{},//供应商信息
+				product:{},//采美
+				productImage:[],
+				retailPrice:0,
+				buyRetailPrice:0,
+				buyRetailPriceStep:1,
+				stock:0,
+				number:0,
+				minBuyNumber:0,
+				productsList:[],
+				goodListData:[],
+				headerBtnPosi:	this.setHeaderBtnPosi(), //获取设备顶部胶囊高度
+				systeminfo: this.setSysteminfo(),		 //获取设备信息
+				isIphoneX:this.$store.state.isIphoneX,
+				windowHeight: '',
+				headerColor:false,
+				backPage:1,
+				nvabarData: {							 //顶部自定义导航
+					showCapsule: 1, // 是否显示左上角图标   1表示显示    0表示不显示
+					title: ''		// 导航栏 中间的标题
+				},
+				linkPath:'',
+				popupShow:false//参数弹窗
+			}
+		},
+		onLoad(option) {
+			this.productID = option.id;//获取商品ID
+			this.isShareType = option.type
+			this.linkPath = option.path
+			this.isHeaderPoduct = true
+			if(option.page == 2){
+				this.backPage = option.page
+			}
+			if(this.isShareType =='share'){
+				authorize.getSetting().then(wxResponse =>{// console.log('是否已授权',res);//0:为取消授权 1:为已授权 2:为未操作
+					console.log(wxResponse)
+					if(wxResponse == 1){
+						wxLogin.wxLoginAuthorize()
+					}else{
+						console.log(new Date +'用户未授权微信信息')
+					}
+				})	
+			}
+		},
+		computed: {
+			...mapState(['hasLogin','isWxAuthorize'])
+		},
+		methods:{
+			initData(){// 初始化商品详情查询
+				this.SellerService.ProductDetail({productId:this.productID}).then(response =>{	
+					this.skeletonShow = false
+					this.productImage=[];
+					this.shop = response.data.shop
+					this.product = response.data
+					this.ladderPriceFlag = this.product.ladderPriceFlag;
+					this.html = this.product.productDetail == null ? this.html : this.$api.adaptRichTextImg(this.product.productDetail.detailInfo)
+					this.stock = this.product.stock
+					this.buyRetailPriceStep = this.product.step
+					this.number = this.product.minBuyNumber
+					this.minBuyNumber = this.product.minBuyNumber
+					//处理商品图片列表
+					this.product.imageList.forEach(item =>{
+						this.productImage.push(item.image);
+					})
+					//购物车数量
+					this.goodsData.cartCount = this.product.productCount
+					//处理阶梯价格
+					if(this.product.ladderPriceList!=null){
+						this.ladderPriceList = this.product.ladderPriceList;
+					}
+					//拆分金额并转千分位格式显示
+					if(this.product.retailPrice!=null){
+						this.retailPrice = this.product.retailPrice.toFixed(2);
+						this.buyRetailPrice = this.product.retailPrice;
+					}
+					//处理下架商品和售罄商品
+					if(this.product.validFlag =='3' || this.stock == 0 ){
+						this.disabled = true
+						this.isNoneDisabled = true
+						this.tabCurrentIndex = 3;// 页面显示是默认选中第一
+						this.isRecommend = true
+						this.goodsData.disabledText = '下架'
+					}else{
+						this.disabled = false
+						this.isNoneDisabled = false
+						this.tabCurrentIndex = 0;// 页面显示是默认选中第三
+						this.goodsData.disabledText = ''
+					}
+					if(this.product.price1TextFlag == "1"){
+						this.disabled = true
+					}
+					if(this.product.price1TextFlag == "2"){
+						if(this.userIdentity == 4){	
+							this.disabled = true
+						}else{
+							this.disabled = false
+						}
+					}
+					this.goodsData.disabled = this.disabled
+					this.goodsData.isNoneDisabled = this.isNoneDisabled
+					if(this.product.validFlag =='3'){
+						this.goodsData.disabledText = '下架'
+					}
+					if(this.stock == 0){
+						this.goodsData.disabledText = '售罄'
+					}
+					this.isRequest = true
+				}).catch(error =>{
+					this.$util.msg(error.msg,2000);
+				})
+			},
+			swiperChange(e) {//顶部商品图片切换
+				const index = e.detail.current;
+				this.current = index;
+			},
+			previewImg (index) {//顶部商品图片预览
+				isPreviewImg = true
+				let previewUrls = this.productImage
+				uni.previewImage({
+					current: index, 	//图片索引
+					urls: previewUrls, //必须是http图片，本地图片无效
+					longPressActions:''
+				})
+			},
+			tabClick(index) {//商品详情&&供应商信息tab切换
+				console.log(index)
+				this.tabCurrentIndex = index;
+				switch(index){
+					case 1:
+						this.isRarameter = true
+						break;
+					case 2:
+						this.isService = true
+						break;
+					case 3:
+						this.isRecommend = true
+						break;
+				}
+			},
+			handleContact(e){//跳转小程序客服
+
+			},
+			buyProductCart(){//底部购物车按钮点击
+				authorize.getSetting().then(wxResponse =>{// console.log('是否已授权',res);//0:为取消授权 1:为已授权 2:为未操作
+					if(wxResponse == 1){
+						if(this.hasLogin){
+							this.$api.navigateTo('/pages/goods/cart')
+						}else{					
+							this.$api.navigateTo('/pages/login/login?type=1')
+						}
+					}else{
+						this.$api.navigateTo('/pages/authorization/authorization?type=1')
+					}
+				})	
+			},
+			btnGetConfirm(type){//加入购物车&&立即购买点击
+				authorize.getSetting().then(wxResponse =>{// console.log('是否已授权',res);//0:为取消授权 1:为已授权 2:为未操作
+					if(wxResponse == 1){
+						if(this.hasLogin){
+							this.showSpec(type);
+						}else{
+							this.$api.navigateTo('/pages/login/login?type=1')
+						}
+					}else{
+						this.$api.navigateTo('/pages/authorization/authorization?type=1')
+					}	
+				})
+			},	
+			changeCountAdd(){//popup弹窗数量增加按钮
+				if(this.buyRetailPriceStep == 2){
+					this.number+=this.minBuyNumber
+				}else{
+					this.number++
+				}
+				this.processActivityPrice()
+			},
+			changeCountSub(){//popup弹窗数量减按钮
+				if(this.number<=this.minBuyNumber){
+					this.number= this.minBuyNumber
+					this.isQuantity =true
+					this.$util.msg(`该商品最小起订量为${this.minBuyNumber}`,2000);
+					return
+				}else{
+					if(this.buyRetailPriceStep == 2){
+						this.number-=this.minBuyNumber
+					}else{
+						this.number--
+					}
+					this.processActivityPrice()
+					this.isQuantity =false
+				}
+			 },
+			changeNumber(e){
+				let _value = e.detail.value;
+				if(!this.$api.isNumber(_value)){
+					this.number = this.minBuyNumber
+				}else if(_value < this.minBuyNumber){	
+					this.$util.msg(`该商品最小起订量为${this.minBuyNumber}`,2000);
+					this.number = this.minBuyNumber
+				}else if( _value % this.minBuyNumber !=0 ){
+					this.$util.msg(`购买量必须为起订量的整数倍`,2000);
+					this.number = this.minBuyNumber
+				}else{
+					this.number = e.detail.value
+				}
+				this.processActivityPrice()
+			},
+			processActivityPrice(){//单独处理活动价格和阶梯价格
+				if(this.ladderPriceFlag == '0' && this.product.actStatus == 0 || this.product.actStatus == 1){
+					this.buyRetailPrice = this.product.retailPrice
+				}else{
+					this.ladderPriceList.forEach((item,index)=>{
+						if(this.number>=item.buyNum){
+							this.buyRetailPrice = item.buyPrice
+						}
+					})
+				}
+			},
+			showSpec(type) {//显示选择数量确认弹窗
+				this.isBtnType = type
+				this.specClass = 'show';
+			},
+			hideSpec() {//关闭选择数量确认弹窗
+				this.specClass = 'hide';
+				setTimeout(() => {
+					this.specClass = 'none';
+				}, 200);
+			},
+			btnConfirm() {//加入购物车&&立即购买跳转订单页并关闭弹窗
+				if(this.isBtnType == 'add'){				
+					this.getAddProductCart()				
+				}else{
+					this.toConfirmation()
+				}
+			},
+			toConfirmation(){//跳转确认订单页面
+				this.specClass = 'hide';
+				let productStp ={
+						allPrice:this.number*this.buyRetailPrice,
+						allCount:this.number,
+						productID:this.product.productID,
+						productCount:this.number
+				}	
+				this.$api.navigateTo(`/pages/user/order/create-order?type=prodcut&data=${JSON.stringify({data:productStp})}`)
+				setTimeout(() => {
+					this.specClass = 'none';
+				}, 200);
+			},
+			getAddProductCart(){//增加购物车成功和toast弹窗提示成功	
+				this.ProductService.shoppingAddCart({productID:this.productID,userID:this.userID,productCount:this.number}).then(response => {
+					this.specClass = 'hide';
+					this.$util.msg('加入购物车成功',1500,true,'success')
+					this.isAnimation = true
+					setTimeout(() => {this.specClass = 'none'}, 200)
+					setTimeout(() => {this.isAnimation = false},2000)
+					this.goodsData.cartCount = response.data;
+				}).catch(error =>{
+					this.$util.msg(error.msg,2000);
+				})
+			},
+			navToLogin(){
+				authorize.getSetting().then(wxResponse =>{// console.log('是否已授权',res);//0:为取消授权 1:为已授权 2:为未操作
+					if(wxResponse == 1){
+						this.$store.commit('setLoginType',8)
+						this.$store.commit('setLoginProductId',this.productID)
+						this.$api.navigateTo(`/pages/login/login?id=${this.productID}`)
+					}else{
+						this.$api.navigateTo('/pages/authorization/authorization?type=1')
+					}
+				})	
+			},
+			setHeaderBtnPosi(){
+				// 获得胶囊按钮位置信息
+				let headerBtnPosi = uni.getMenuButtonBoundingClientRect();
+				return headerBtnPosi
+			},
+			setSysteminfo(){
+				let systeminfo;
+				uni.getSystemInfo({ // 获取设备信息
+					success: (res) => {
+						systeminfo = res
+					},
+				})
+				return systeminfo
+			},
+			getOptionFn(e){
+				this.isShareType = e.type
+			},
+			goSupplier(){
+				this.$api.setStorage('supplierInfo',this.shop)
+				this.$api.navigateTo('/pages/goods/supplier')
+			},
+			discard(){
+				//丢弃
+			},
+			onShare(res){//分享转发
+				if (res.from === 'button') {
+			      // 来自页面内转发按钮
+			    }
+				return {
+				  title: `${this.product.name}`,
+				  path: `pages/goods/product?type=share&id=${this.productID}`,
+				  imageUrl:`${this.productImage[0]}`
+				}
+			},
+			showPopup(){
+				this.popupShow = true
+			},
+			hidePopup(){
+				this.popupShow = false
+			}
+		},
+		onPageScroll(e){//实时获取到滚动的值
+			if(e.scrollTop>50){
+				this.headerColor = true
+				this.nvabarData={							
+					showCapsule: 1, 
+					title: '商品详情', 		
+				}
+			}else{
+				this.headerColor = false
+				this.nvabarData={
+					showCapsule: 1, 
+					title: '', 		
+				}
+			}
+			if(e.scrollTop>700){
+				this.navbarFiexd = 'fixed'
+				this.isScrollTop = true
+			}else{
+				this.navbarFiexd = 'none'
+				this.isScrollTop = false
+			}
+		},
+		onShareAppMessage(res){//分享转发
+			if (res.from === 'button') {
+		      // 来自页面内转发按钮
+		    }
+			return {
+			  title: `${this.product.name}`,
+			  path: `pages/goods/product?type=share&id=${this.productID}`,
+			  imageUrl:`${this.productImage[0]}`
+			}
+		},
+		onShow() {
+			this.$api.getStorage().then((resolve) => {
+				this.userID = resolve.userID ? resolve.userID : '';	
+				this.userIdentity = resolve.userIdentity ? resolve.userIdentity : 3
+				if (isPreviewImg) {
+					isPreviewImg = false;
+					return;
+				} else {
+					this.initData();
+				}
+			}).catch(error =>{
+				this.initData();
+			})
+		}
+	}
 </script>
 
-<style>
+<style lang="scss">
+	page{
+		background-color: #FFFFFF;
+	}
+	.productRemarks{
+		height: 36rpx;
+		margin: 8rpx 0;
+		width: 100%;
+		float: left;
+		.text{
+			display: inline-block;
+			padding: 0 18rpx;
+			line-height: 32rpx;
+			font-size: 20rpx;
+			color: #FF2A2A;
+			text-align: center;
+			border-radius: 4rpx;
+			background: #FFFFFF;
+			border: 1px solid #FF2A2A;
+			float: left;
+			opacity: 0.8;
+		}
+	}
+	.banner-section{
+		width: 100%;
+		height: 750rpx;
+		position: relative;
+	}	
+	.banner{
+		width: 100%;
+		height: 750rpx;
+		.product-img{
+			width: 750rpx;
+		}
+		image {
+			width: 100%;
+			height: 100%;
+		}
+	}
+	.swiper__dots-box{
+		position: absolute;
+		color: #fff;
+		bottom: 30rpx;
+		right: 0;
+	}
+	.product-wrap{
+		width: 100%;
+		height: auto;
+		padding: 24rpx 0 0 0;
+		background-color: #FFFFFF;
+		border-bottom: 20rpx solid #F7F7F7;
+		.wrap-top{
+			width: 702rpx;
+			padding: 0 24rpx;
+			height: auto;
+			float: left;
+			padding-bottom:20rpx;
+			border-bottom: 1px solid #F8F8F8;
+			&.none{
+				.p-title{
+					color:#999999
+				}
+			}
+			.p-title{
+				width: 100%;
+				height: auto;
+				float: left;
+				.p-title-name{
+					width:602rpx;
+					height: 96rpx;
+					float: left;
+					line-height: 42rpx;
+					font-size: $font-size-28;
+					color: $text-color;
+					-o-text-overflow: ellipsis;
+					text-overflow: ellipsis;
+					display: -webkit-box;
+					word-break: break-all;
+					-webkit-box-orient: vertical;
+					-webkit-line-clamp: 2;
+					overflow: hidden;
+				}
+				.p-title-share{
+					width: 96rpx;
+					height: 96rpx;
+					float: right;
+					text-align: center;
+					color: #999999;
+					font-size: $font-size-24;
+					box-sizing: border-box;
+					padding: 8rpx 0;
+					.icon-fenxiang1{
+						font-size: $font-size-34;
+					}
+				}
+			}
+			.wrap-main-text{
+				line-height: 56rpx;
+				color: #FF2A2A;
+				font-size: $font-size-26;
+				display: block;
+				float: left;
+				font-weight: normal;
+			}
+			.wrap-main-none{
+				display: block;
+				width: 256rpx;
+				height: 44rpx;
+				padding-left: 20rpx;
+				border-radius: 11rpx;
+				background: $btn-confirm;
+				float: right;
+				line-height: 44rpx;
+				color: #FFFFFF;
+				text-align: center;
+				font-size: $font-size-24;
+			}
+			
+			.p-price-none{
+				height: 44rpx;
+				line-height: 44rpx;
+				float: left;
+				font-size: $font-size-24;
+				color: #666;
+				text-decoration: line-through;
+				margin-left: 8rpx;
+			}
+			.p-minBuy{
+				height: 44rpx;
+				line-height: 44rpx;
+				float: right;
+				padding: 0 18rpx;
+				border-radius: 22rpx;
+				background-color: #f7f7f7;
+				color: #7F7F7F;
+				font-size: 24rpx;
+				text-align: center;
+				.min-text{
+					margin: 0 6rpx;
+				}
+			}
+			.p-login{
+				height: 56rpx;
+				line-height: 56rpx;
+				color: $color-system;
+				font-size: $font-size-24;
+				&.grade{
+					.price-left{
+						float: left;
+						.none{
+							display: block;
+							font-size: $font-size-20;
+							line-height: 48rpx;
+							color: #4A4B54;
+							float: left;
+							font-weight: bold;
+							margin-left: 5rpx;
+							text{
+								letter-spacing: 4rpx;
+								font-size: $font-size-32;
+							}
+						}
+					}
+				}
+				.p-no{
+					float: left;
+					margin-right: 5rpx;
+					font-size: $font-size-28;
+					color: $text-color;
+				}
+				.p-login-btn{
+					display: block;
+					height: 44rpx;
+					padding: 0 10rpx 0 20rpx;
+					border-radius: 11rpx;
+					background: $btn-confirm;
+					float: right;
+					line-height: 44rpx;
+					color: #FFFFFF;
+					text-align: center;
+					font-size: $font-size-24;
+				}
+			}
+		}
+		.wrap-label{
+			float: left;
+			width: 100%;
+			box-sizing: border-box;
+			.label-a{
+				padding: 0 18rpx;
+				line-height: 32rpx;
+				font-size: $font-size-20;
+				color:$color-system;
+				text-align: center;
+				border-radius: 6rpx;
+				background:#ffe6dc;
+				margin: 0 20rpx 15rpx 0;
+				display: inline-block;
+			}
+		}
+		.wrap-top-price{
+			float: left;
+			width: 100%;
+			box-sizing: border-box;
+			.wrap-main-item{
+				width: 100%;
+				height: 56rpx;
+				.p-price{
+					height: 56rpx;
+					line-height: 56rpx;
+					float: left;
+					color: #FF2A2A;
+					font-weight: bold;
+					&.none{
+						text-decoration: line-through;
+						color: #999999;
+						font-weight: normal;
+					}
+					.txt{
+						margin:0 2rpx;
+					}
+					.txt.sm{
+						font-size: $font-size-26;
+					}
+					.txt.big{
+						font-size: $font-size-34;
+					}
+				}
+			}
+			.floor-item-act{
+				height: 56rpx;
+				text-align: center;
+				box-sizing: border-box;
+				float: left;
+				padding:10rpx 0;
+				margin-left: 10rpx;
+				.floor-tags{
+					float: right;
+					height: 36rpx;
+					border-radius: 4rpx;
+					background-color: rgba(225, 86, 22, 0.1);
+					line-height: 36rpx;
+					color: $color-system;
+					text-align: center;
+					display: inline-block;
+					padding:0 16rpx;
+					font-size: $font-size-20;
+				}
+			}
+			.floor-item-btn{
+				float: right;
+				height: 40rpx;
+				margin-top: 8rpx;
+				.btn{
+					line-height: 40rpx;
+					padding: 0 20rpx;
+					height: 40rpx;
+					background: $btn-confirm;
+					color: #FFFFFF;
+					font-size: $font-size-20;
+					border-radius: 4rpx;
+				}
+			}
+		}
+		.wrap-info{
+			float: left;
+			width: 702rpx;
+			padding: 24rpx 24rpx 0 24rpx;
+			border-bottom: 1px solid #F8F8F8;
+			.info-viewT{
+				width: 100%;
+				min-height: 40rpx;
+				font-size: $font-size-28;
+				color: $text-color;
+				line-height: 40rpx;
+				text-align: left;
+				&.none{
+					color: #999999;
+				}
+				.info-viewL{
+					min-width: 350rpx;
+					float: left;
+					margin-bottom: 24rpx;
+				}
+				.info-viewR{
+					min-width: 352rpx;
+					float: left;
+					margin-bottom: 24rpx;
+				}
+			}
+			.info-viewB{
+				width: 100%;
+				height: auto;
+			}
+			.info-f{
+				width: 50%;
+				float: left;
+				font-size: $font-size-28;
+				color: $text-color;
+				line-height: 40rpx;
+				margin-bottom: 24rpx;
+				text-align: left;
+			}
+		}
+	}
+	.product-seve{
+		width: 702rpx;
+		height: 90rpx;
+		padding: 0 24rpx;
+		background-color: #FFFFFF;
+		position: relative;
+		display: flex;
+		line-height: 90rpx;
+		border-bottom: 20rpx solid #F7F7F7;
+		.title{
+			line-height: 90rpx;
+			display: inline-block;
+			float: left;
+			font-size: $font-size-28;
+			color: $text-color;
+		}
+		.iconfont{
+			color: #999999;
+			margin-right: 20rpx;
+			font-size: $font-size-26;
+		}
+		.text{
+			font-size: $font-size-26;
+			color: #999999;
+			margin-left: 10rpx;
+		}
+	}
+	.product-parameter{
+		width: 702rpx;
+		height: 90rpx;
+		padding: 0 24rpx;
+		background-color: #FFFFFF;
+		position: relative;
+		display: flex;
+		border-bottom: 20rpx solid #F7F7F7;
+		.title{
+			line-height: 90rpx;
+			display: inline-block;
+			float: left;
+			font-size: $font-size-28;
+			color: $text-color;
+		}
+		.name{
+			float: right;
+			line-height: 90rpx;
+			display: inline-block;
+			float: left;
+			font-size: $font-size-28;
+			color: #999999;
+			float: right;
+			padding-right: 48rpx;
+			overflow: hidden;
+			text-overflow:ellipsis;
+			white-space: nowrap;
+			text-align: right;
+		}
+		.icon-xiayibu{
+			line-height: 90rpx;
+			display: inline-block;
+			position: absolute;
+			width: 48rpx;
+			top: 0;
+			right: 0;
+			color: #b2b2b2;
+		}
+	}
+	.product-supplier{
+		width: 100%;
+		height: 174rpx;
+		padding: 30rpx 24rpx;
+		box-sizing: border-box;
+		background-color: #FFFFFF;
+		position: relative;
+		box-sizing: border-box;
+		border-bottom: 20rpx solid #F7F7F7;
+		.logo{
+			width: 128rpx;
+			height: 92rpx;
+			float: left;
+			border: 1px solid #efefef;
+			border-radius: 6rpx;
+			image{
+				width: 100%;
+				height: 100%;
+				display: block;
+				border-radius: 6rpx;
+			}
+		}
+		.main{
+			width: 470rpx;
+			height: 92rpx;
+			float: left;
+			margin-left: 20rpx;
+			.name{
+				width: 100%;
+				line-height: 46rpx;
+				float: left;
+				font-size: $font-size-28;
+				color: $text-color;
+				float: right;
+				overflow: hidden;
+				text-overflow:ellipsis;
+				white-space: nowrap;
+				text-align: left;
+			}
+			.massgs{
+				width: 100%;
+				line-height: 46rpx;
+				float: left;
+				font-size: $font-size-24;
+				color: #999999;
+				.label{
+					float: left;
+				}
+				.p-stars{
+					float: left;
+					margin-left: 20rpx;
+				}
+				.acount{
+					float: right;
+					text{
+						color: $color-system;
+					}
+				}
+			}
+		}
+		
+		.icon-xiayibu{
+			line-height: 154rpx;
+			display: inline-block;
+			position: absolute;
+			width: 48rpx;
+			top: 0;
+			right: 0;
+			color: #b2b2b2;
+		}
+	}
+	.product-details {
+		background: #FFFFFF;
+		border-bottom: 20rpx solid #F7F7F7;
+		padding: 24rpx;
+		&.service{
+			border-bottom: none;
+		}
+		&.recommend{
+			background-color: #F7F7F7;
+			border-bottom: none;
+			padding: 0;
+			.title{
+				.title-tab{
+					background-color: #F7F7F7;
+					color: $text-color;
+					padding: 0 24rpx;
+					
+				}
+			}
+		}
+		.title{
+			width: 100%;
+			box-sizing: border-box;
+			// padding: 0 24rpx;
+			.title-tab{
+				width: 100%;
+				height: 100rpx;
+				background: #fff;
+				z-index: 10;
+				font-size: $font-size-30;
+				text-align: left;
+				color: $text-color;
+				line-height: 100rpx;
+				font-weight: 600;
+			}
+			.title-msg{
+				width: 100%;
+				height: 236rpx;
+				padding: 18rpx;
+				background-color: rgba(225,86,22, 0.1);
+				color: $color-system;
+				box-sizing: border-box;
+				margin-bottom: 30rpx;
+				.tit{
+					line-height: 46rpx;
+					font-size: $font-size-24;
+					text-align: left;
+				}
+				.txt{
+					line-height: 38rpx;
+					font-size: $font-size-20;
+					text-align: justify;
+				}
+			}
+		}
+		.navbar {
+			width: 702rpx;
+			height: 96rpx;
+			padding: 0 24rpx;
+			background: #fff;
+			z-index: 10;
+			display: flex;
+			border-bottom: 1px solid #F8F8F8;
+			&.fixed{
+				position: fixed;
+				left: 0;
+			}
+			.nav-item {
+				display: flex;
+				flex: 1;
+				justify-content: center;
+				align-items: center;
+				height: 96rpx;
+				font-size: $font-size-28;
+				color: $text-color;
+				position: relative;
+				float: left;
+				position: relative;
+				.line{
+					width: 60%;
+					height: 2px;
+					border-radius: 1px;
+					background: #FFFFFF;
+					position: absolute;
+					bottom: 0;
+					left: 50%;
+					margin-left: -30%;
+				}
+				&.current{
+					color:$color-system;
+					.line{
+						background: $color-system;
+					}
+				}
+			}
+		}
+		.content{
+			width: 100%;
+			min-height: 750rpx;
+			background-color: #FFFFFF;
+		}
+	}
+	.isLower{
+		width: 100%;
+		height: 116rpx;
+		line-height: 116rpx;
+		text-align: center;
+		color: #000000;
+		font-size: $font-size-32;
+		font-weight: bold;
+	}
+	.bottom-btn{
+		width: 100%;
+		height: 110rpx;
+		position: fixed;
+		bottom: 0;
+		left: 0;
+		background: #FFFFFF;
+		z-index: 99;
+		.bottom-le{
+			width: 302rpx;
+			height: 86rpx;
+			padding:12rpx 24rpx;
+			float: left;
+			.item-bt{
+				width: 86rpx;
+				height: 100%;
+				margin-right:22rpx;
+				display: flex;
+				float: left;
+				flex-direction: column;
+				align-items: center;
+				font-size: $font-size-24;
+				color: $text-color;
+				line-height: 34rpx;
+				position: relative;
+				.animation-num{
+					font-size:$font-size-32 ;
+					color: #FF2A2A;
+					position: absolute;
+					top: -12rpx;
+					right: 4rpx;
+					font-weight: bold;
+				}
+				.animation{
+					animation: showAmnation 2.2s ease-in-out both;
+				}
+				.restion{
+					animation: hideAmnation 1s ease-in-out both;
+				}
+				.icon-num{
+					position: absolute;
+					right:-12rpx;
+					top: -9rpx;
+				}
+				.icon-num.goleft{
+					right: 4rpx;
+				}
+				&:last-child{
+					margin-right: 0;
+				}
+				image {
+					width: 40rpx;
+					height: 40rpx;
+					margin-bottom: 8rpx;
+				}
+				button.contact-btn{
+					width: 100%;
+					height: 100%;
+					margin: 0;
+					padding: 0;
+					display: flex;
+					flex-direction: column;
+					align-items: center;
+					box-sizing: border-box;
+					font-size: $font-size-24;
+					text-align: center;
+					text-decoration: none;
+					line-height: 34rpx;
+					border-radius: 0;
+					-webkit-tap-highlight-color: transparent;
+					overflow: hidden;
+					color: $text-color;
+					background-color:#FFFFFF;
+				}
+			}
+		}
+		.bottom-ri{
+			width: 400rpx;
+			height: 100%;
+			float: right;
+			display: flex;
+			box-sizing: border-box;
+			padding: 13rpx 20rpx 13rpx 0;
+			.btn{
+				flex: 1;
+				width: 200rpx;
+				line-height: 84rpx;
+				text-align: center;
+				font-size: $font-size-28;
+				color: #FFFFFF;
+			}
+			.btn-cart{
+				background-color: #ffe6dc;
+				color: $color-system;
+				border-radius: 42rpx 0 0 42rpx;
+			}
+			.btn-cart.disabled{
+				background-color: #E1E1E1;
+			}
+			.btn-bay{
+				background:linear-gradient(to right, #f28f31 0%, #e15616 100%);
+				border-radius: 0 42rpx 42rpx 0;
+			}
+			.btn-bay.disabled{
+				background-color: linear-gradient(135deg,rgba(242,143,49,0.5) 0%,rgba(225,86,22,0.5) 100%);;
+			}
+		}
+	}
+	.uni-badge--small {
+		-webkit-transform: scale(.8);
+		-ms-transform: scale(.8);
+		transform: scale(.8);
+		-webkit-transform-origin: center center;
+		-ms-transform-origin: center center;
+		transform-origin: center center;
+	}
+	.uni-badge {
+		font-family: 'Helvetica Neue', Helvetica, sans-serif;
+		-webkit-box-sizing: border-box;
+		box-sizing: border-box;
+		font-size: 12px;
+		line-height: 1;
+		display: inline-block;
+		padding: 3px 6px;
+		color: #333;
+		border-radius: 100px;
+		background-color: #f1f1f1;
+	}
+	.uni-badge-error {
+		color: #fff;
+		background-color: #dd524d;
+	}
+	/* 加入购物模态层*/
+	@keyframes showPopup {
+		0% {
+			opacity: 0;
+		}
+		100% {
+			opacity: 1;
+		}
+	}
+	@keyframes hidePopup {
+		0% {
+			opacity: 1;
+		}
+		100% {
+			opacity: 0;
+		}
+	}
+	@keyframes showLayer {
+		0% {
+			transform: translateY(0);
+		}
+		100% {
+			transform: translateY(-100%);
+		}
+	}
+	@keyframes hideLayer {
+		0% {
+			transform: translateY(-100%);
+		}
+		100% {
+			transform: translateY(0);
+		}
+	}
+	@keyframes showAmnation {
+		0% {
+			top: -12rpx;
+			opacity: 0;
+		}
+		50% {
+			top: -60rpx;
+			opacity: 1;
+		}
+		100% {
+			top: -100rpx;
+			opacity: 0;
+		}
+	}
+	@keyframes hideAmnation {
+		0% {
+			top: -100rpx;
+			opacity: 0;
+		}
+		100% {
+			top: -12rpx;
+			opacity: 0;
+		}
+	}
+	.popup {
+		position: fixed;
+		top: 0;
+		width: 100%;
+		height: 100%;
+		z-index: 999;
+		display: none;
+		.mask{
+			position: fixed;
+			top: 0;
+			width: 100%;
+			height: 100%;
+			z-index: 21;
+			background-color: rgba(0, 0, 0, 0.6);
+		}
+		.layer {
+			position: fixed;
+			z-index: 22;
+			bottom: -294rpx;
+			width: 702rpx;
+			padding: 24rpx 24rpx 36rpx 24rpx;
+			height: 260rpx;
+			border-radius: 20rpx 20rpx 0 0;
+			background-color: #fff;
+			display: flex;
+			flex-wrap: wrap;
+			align-content: space-between;
+			.content {
+				width: 100%;
+			}
+			.btn {
+				width: 100%;
+				height: 88rpx;
+				margin-top: 20rpx;
+				.button {
+					width: 100%;
+					height: 88rpx;
+					color: #fff;
+					display: flex;
+					align-items: center;
+					justify-content: center;
+					background: $btn-confirm;
+					font-size: $font-size-28;
+					border-radius: 14rpx;
+				}
+			}
+		}
+		
+		&.show {
+			display: block;
+			.mask{
+				animation: showPopup 0.2s linear both;
+			}
+			.layer {
+				animation: showLayer 0.2s linear both;
+			}
+		}
+		&.hide {
+			display: block;
+			.mask{
+				animation: hidePopup 0.2s linear both;
+			}
+			
+			.layer {
+				animation: hideLayer 0.2s linear both;
+			}
+		}
+		&.none {
+			display: none;
+		}
+		&.service {
+			.row {
+				margin: 30upx 0;
+				.title {
+					font-size: 30upx;
+					margin: 10upx 0;
+				}
+				.description {
+					font-size: 28upx;
+					color: #999;
+				}
+			}
+		}
+		.layer-smimg{
+			width: 114rpx;
+			height: 114rpx;
+			float: left;
+			border-radius: 10rpx;
+			margin-right: 24rpx;
+			image{
+				width: 114rpx;
+				height: 114rpx;	
+				border-radius: 10rpx;
+			}
+		}
+		.layer-nunbox{
+			justify-content: space-between;
+			align-items: center;
+			width: 536rpx;
+			height: auto;
+			float: left;
+			.layer-nunbox-t{
+				width: 100%;
+				height:44rpx;
+				position:relative;
+				display: flex;
+				margin-bottom: 10rpx;
+				.text{
+					font-size: $font-size-24;
+					line-height: 48rpx;
+					color: #999999;
+				}
+				.layer-nunbox-text{
+					line-height: 44rpx;
+					font-size: $font-size-28;
+				}
+				.number-box{
+					display: flex;
+					justify-content: center;
+					align-items: center;
+					.iconfont{
+						font-size: $font-size-32;
+						padding:0 20rpx;
+						font-size: $text-color;
+					}
+					.btn-input{
+						width: 62rpx;
+						height: 48rpx;
+						line-height: 48rpx;
+						background: #F8F8F8;
+						border-radius: 4rpx;
+						text-align: center;
+						font-size: $font-size-28;
+					}
+				}
+				.product-step{
+					position: absolute;
+					left: 45rpx;
+					bottom: 0;
+					height: 44rpx;
+					background: #FFFFFF;
+				}
+			}
+			.layer-nunbox-b{
+				width: 100%;
+				height:44rpx;
+				margin-top: 13rpx;
+			}
+			.text{
+				line-height: 44rpx;
+				font-size: $font-size-28;
+				.p{
+					color: #FF2A2A;
+				}
+				.p:first-child{
+					margin-left: 30rpx;
+				}
+				.p.sm{
+					font-size: $font-size-24;
+				}
+			}
+		}
+	}
+	.tui-popup-box {
+		position: relative;
+		box-sizing: border-box;
+		min-height: 220rpx;
+		padding:0rpx 24rpx 0 24rpx;
+		.title{
+			font-size: $font-size-34;
+			color: $text-color;
+			line-height: 88rpx;
+			text-align: center;
+			float: left;
+			width: 100%;
+			height: 88rpx;
+		}
+		.content{
+			width: 100%;
+			height: auto;
+			float: left;
+			.content-tr{
+				width: 100%;
+				height: 58rpx;
+				line-height: 58rpx;
+				display: flex;
+				.content-td{
+					display: flex;
+					flex: 3;
+					font-size: $font-size-26;
+					color: #999999;
+					line-height: 58rpx;
+					text-align: left;
+				}
+				.content-th{
+					display: flex;
+					flex: 7;
+					font-size: $font-size-26;
+					color: #333333;
+					line-height: 58rpx;
+					text-align: left;
+				}
+			}
+		}
+	}
+	.tui-popup-btn {
+		width: 100%;
+		height: auto;
+		float: left;
+		margin-top: 24rpx;
+		.tui-button{
+			width: 100%;
+			height: 88rpx;
+			background: $btn-confirm;
+			line-height: 88rpx;
+			text-align: center;
+			color: #FFFFFF;
+			font-size: $font-size-28;
+			border-radius: 44rpx;
+		}
+	}
+	/*富文本样式*/
+	rich-text.p{
+		width: 702rpx !important;
+		padding: 0 24rpx;
+		text-align: justify;
+	}
+	rich-text.img{
+		width: 100%;
+		height: auto;
+	}
+	.Disclaimer {
+	    background: rgba(225,86,22,0.1);
+	    border-radius:20rpx;
+	    padding:0 20rpx  20rpx 20rpx;
+		font-size: 20rpx;
+		color: #e15616;
+		margin-bottom: 30rpx
+	}
+	.Disclaimer span {
+	    display: block;
+	    padding: 20rpx 0;
+	    text-align: left;
+		font-size: 24rpx;
+	}
+	.Disclaimer .text {
+	    line-height:48rpx;
+	}
+	.brandinfo{
+		color: #333333;
+		line-height: 46rpx;
+		font-size: 26rpx;
+		}
 </style>

services/second.service.js

@@ -17,8 +17,10 @@ export default class SecondApi {
 	brandList (data = {}) {
 		return this.AjaxService.get({ url:'/product/brandList', data, isLoading: true })
 	}
-	/*二手发布/获取省份信息 */
-	GetProvince (data = {}) {
-		return this.AjaxService.get({ url:'/club/province', data, isLoading: true })
+	/*二手发布/提交发布 */
+	SecondHandProduct (data = {}) {
+		return this.AjaxService.post({ url:'/product/releaseSecondHandProduct', data, isLoading: true })
 	}
+	
+
 }