Przeglądaj źródła

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

zhengjinyi 4 lat temu
rodzic
commit
0c043570b2

+ 450 - 2
second/pages/form/form.vue

@@ -1,9 +1,457 @@
-<template>
-	<text>发布二手商品</text>
+<template name="secondHandrelease">
+	<view class="fleaMarketForm">
+	     <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>
+	             </view>
+				 <form>
+					 <view class="row"> 
+						 <label><span>*</span>分类</label>
+						 <view class="secondradio" >
+							  <view v-for="(item,index) in fenlei" :key="index" v-model="secondParams.secondHandType"  @click="secondHandRidio(item)"
+								  :class="currentId==item.value?'select active':''" class="icon">
+								  <label class="icon typeradio"></label>{{item.name}}
+							  </view>
+						  </view>
+					 </view>
+					 
+				 </form>
+	          </view>
+	
+	             
+	
+	</view>
 </template>
 
 <script>
+	import { mapState,mapMutations } from 'vuex';
+	export default{
+		name:'secondHandrelease',
+		components:{
+		},
+		data(){
+			return{
+				fenlei:[
+				            {name:'二手仪器',value:'1'},
+				            {name:'临期产品',value:'2'},
+				            {name:'其他',value:'3'},
+				        ],
+				        currentId:0,
+				        radioList:[
+				            {name:'轻光电',value:'1',isChecked:false},
+				            {name:'重光电',value:'2',isChecked:false},
+				            {name:'耗材配件',value:'3',isChecked:false},
+				
+				        ],
+				        beauty:[
+				           {name:'医美',value:'1'},
+				           {name:'非医美',value:'2'},
+				        ],
+				        BrandList:[],
+				        isShow:false,
+				        includedTax:'',
+				        GoodsImagesList:[],
+				        oldNum:0,
+				        secondType:0,
+				        vShow_GoodsImages:false,
+				        fromMessage:'',//提示文字
+				        // formData:new FormData(),
+				        secondParams:{
+				            secondHandType:'',//一级分类
+				            instrumentType:'',//二手仪器分类
+				            name:'',
+				            brandID:'',//品牌ID
+				            brandName:'',//其他品牌
+				            fixedYears:null,//出厂
+				            companyName:'',//公司名称
+				            maturityYears:'',//产品到期
+				            price1:'',//交易价
+				            detailTalkFlag:1,//是否启用详聊
+				            normalPrice:'',//市场价
+				            originalPrice:'',//采购价
+				            stock:'',//数量
+				            productQuality:'',//商品成色
+				            contactName:'',//联系人
+				            contactMobile:'',//联系方式
+				            secondProductType:null,//
+				            townId:'',//县区地址
+				            address:'',//详细地址
+				            image1:'',//图片
+				            productDetails:'',//商品详细信息
+				            source:1,
+				         },
+				        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
+			}
+		},
+		methods:{
+			showBrand:function(){
+			            var _this = this;
+			            _this.selectBrand = !_this.selectBrand;
+			        },
+			        secondHandRidio: function(item) {
+			        var _this = this;
+			            _this.currentId = item.value;
+			            _this.secondParams.secondHandType = item.value;
+			            if (item.value==1){
+			            _this.isShow = true;
+			            }else {
+			             _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();
+			          } else {
+			            _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;
+			            }else {
+			              _this.shoplogoTwo = false;
+			            }
+			        },
+			        Detailed:function(){
+			        var _this = this;
+			         if(event.target.checked==true){
+			             _this.secondParams.detailTalkFlag = 2 ;//启用价格详聊
+			             _this.vShow_detailTalkFlag = true;
+			          }else {
+			            _this.secondParams.detailTalkFlag = 1 ;//不启用价格详聊
+			            _this.vShow_detailTalkFlag = false;
+			          }
+			        },
+			        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 = '';
+			            });
+			        },
+			         removeGoodsImagesFn: function(index){//删除商品图片
+			            var _this = this;
+			            _this.GoodsImagesList.splice(index,1);
+			            _this.secondParams.image1 =_this.GoodsImagesList.toString()+',';
+			         },
+			        getProductType:function(item){
+			        var _this = this;
+			         _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);
+			                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);
+			                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);
+			                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);
+			                 return
+			             }
+			             if (_this.secondParams.maturityYears == '') {
+			                 _this.vShow_expire = true;
+			                 _this.fromMessage = '请输入产品到期日';
+			                 _this.scrollIntoView();
+			                 setTimeout(function () {
+			                     _this.vShow_expire = false;
+			                 }, 2000);
+			                 return
+			             }
+			         }
+			         if(_this.secondParams.price1 == ''){
+			                  _this.vShow_Price = true;
+			                  _this.fromMessage = '请输入交易价';
+			                  _this.scrollIntoView();
+			                    setTimeout(function(){
+			                        _this.vShow_Price = false;
+			                    },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);
+			                return
+			           }
+			         if(_this.secondParams.stock == ''){
+			              _this.vShow_Number = true;
+			              _this.fromMessage = '请输入数量';
+			              _this.scrollIntoView();
+			                setTimeout(function(){
+			                    _this.vShow_Number = false;
+			                },2000);
+			                return
+			            }
+			         }
+			
+			
+			         if(_this.secondParams.productQuality == ''){
+			              _this.vShow_shopColor = true;
+			              _this.fromMessage = '请输入商品成色';
+			              _this.scrollIntoView();
+			                setTimeout(function(){
+			                    _this.vShow_shopColor = false;
+			                },2000);
+			                return
+			         }
+			          if(_this.secondParams.contactName == ''){
+			              _this.vShow_contactName = true;
+			              _this.fromMessage = '请输入联系人姓名';
+			              _this.scrollIntoView();
+			                setTimeout(function(){
+			                    _this.vShow_contactName = false;
+			                },2000);
+			                return
+			         }
+			          if(_this.secondParams.contactMobile == ''){
+			              _this.vShow_contactMobile = true;
+			              _this.fromMessage = '请输入联系方式';
+			              _this.scrollIntoView();
+			                setTimeout(function(){
+			                    _this.vShow_contactMobile = false;
+			                },2000);
+			                return
+			         }
+			         if(_this.secondParams.contactMobile.length !=11){
+			              _this.vShow_contactMobile = true;
+			              _this.fromMessage = '联系方式格式不正确';
+			              _this.scrollIntoView();
+			                setTimeout(function(){
+			                    _this.vShow_contactMobile = false;
+			                },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);
+			                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);
+			                return
+			         }
+			            if(_this.GoodsImagesList ==''){
+			               _this.vShow_GoodsImages = true;
+			              _this.fromMessage = '请上传图片';
+			                document.documentElement.scrollTop=900;
+			              setTimeout(function(){
+			                   _this.vShow_GoodsImages = false;
+			                },2000);
+			                return;
+			            }
+			         if(_this.checkbox==false){
+			               _this.vShow_checkBox = true;
+			               _this.fromMessage='请勾选已阅读';
+			                setTimeout(function(){
+			                   _this.vShow_checkBox = false;
+			                },2000);
+			                return
+			         }
+			         console.log(_this.secondParams)
+			          SecondApi.SecondHandProduct(_this.secondParams,function (res) { //提交发布
+			             if (res.code==0){
+			                 console.log(res)
+			               _this.vShow_secondBj = true;
+			               _this.playid= res.data;
+			             }else{
+			                  this.$util.msg(res.msg,2000)
+			                 _this.secondBj = false;
+			                 return
+			             }
+			         })
+			        },
+			        quxiao:function(){
+			        var _this = this;
+			         _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)
+			                }
+			            })
+			        },
+			        changeBox:function () {
+			            if(event.target.checked ==true){
+			             this.checkbox = true
+			            }else {
+			             this.checkbox = false
+			            }
+			        },
+					
+		},
+		 created:function () {
+		        var _this = this;
+		        _this.SecondService.brandList({},function (res) {//品牌列表
+		            if(res.code == 0){
+		               _this.BrandList = res.data;
+		            }
+		        })
+		     _this.SecondService.GetProvince({},function(response){ //省份
+		            if(response.code == 0){
+		                _this.provinceArray = response.data
+		            }else{
+		               this.$util.msg(response.msg,2000)
+		            }
+		        })
+		    },
+	}
 </script>
 
 <style>
+		view{font-size: 28rpx;}
+	    .my-maintenance{padding: 20rpx;} 
+		.bannerimg {height: 66rpx;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);font-size: 28rpx;}
+		.secondradio view{display: inline-block;color: #333333;}
+		.typeradio.icon::before{
+		.secondradio{margin-bottom:20rpx}	
+		}
 </style>

+ 152 - 14
second/pages/form/introduce.vue

@@ -1,22 +1,160 @@
-<template>
-	<view class="container">
-		<view class="top">
-			<img src="/static/second/intro.png"/>
-		</view>
-		<!-- <view id="second-hand-btn" >
-				<button>去发布</button>
-				<button>逛二手市场</button>
-				<button>去维修</button>
-				<button >去首页</button>
-				<view class="foot_font">
-					<span style="color: #ADADAD"> 业务咨询/合作请联系:</span><span style="color: #666666"> 0755 22907771  </span><span style="color: #ADADAD;">手机:</span><span style="color: #666666">15817465281</span>
-				</view>
-		</view>	 -->		
+<template name="fleaMarket">
+	<view class="fleaMarket">
+	      <view class="second-hand-wrapper">
+	            <view class="top_title">
+	                <view ><image src="https://admin-b.caimei365.com/userfiles/1/images/photo/2020/11/%E9%87%87%E7%BE%8Elogo.png" mode=""></image></view>
+	                <view class="right-title">
+	                    <text>二手市场</text>
+	                    <span>SECOND-HANDMARKET</span>
+	                </view>
+	            </view>
+	            <view class="top_text">
+	                质量好一点,效率高一点
+	            </view>
+	            <view class="mian_text">
+	                <h1>采美二手市场介绍<view class="yellow_icon"></view></h1>
+	                <span>
+	                    现实生活中,二手商品越来越经济实惠,二手商品也在多个经济生活领域出现。
+	                    面对潜力巨大的二手市场,采美365网于2019年开办美容行业二手交易版块,搭建二手交易平台,
+	                    将拥有闲置商品卖家与求购方(买家)信息集中起来,让交易双方的买卖信息传播得更广泛,交易更有保障。
+	                </span>
+	            </view>
+	            <view class="mian_content top">
+	                <text>二手平台运营特色</text><view class="yellow_icon"></view>
+	                <view class="font_content">
+	                    <view class="content_list">
+	                        <p>1.自运营</p>
+	                        <span>用户自主上传二手商品信息,自主销售,平台提供商品展示位以及商品信息介绍页面,类似“闲鱼”。</span>
+	                    </view>
+	                    <view class="content_list">
+	                        <p>2.代运营</p>
+	                        <span>由平台协助销售二手商品,为用户提供贴心且必要的推广辅助,促成交易。</span>
+	                    </view>
+	                    <view class="content_list">
+	                        <p>3.第三方服务</p>
+	                        <span>平台提供第三方服务,如申请第三方评测、延保、维修等,一方面更客观全面展示仪器细节,另一方面,便于仪器机能维护,方便维修等。</span>
+	                    </view>
+	                    <view class="content_list">
+	                        <p>4.套餐服务</p>
+	                        <span>多项组合套餐式服务,满足卖家个性化推广需求。</span>
+	                    </view>
+	                    <view class="tishiyu">转让方/出售方(以下统称为“卖家”)需上传个人真实信息,平台留存备案后,卖家通过平台专属页面上传需要出售的商品信息,(按后台系统要求填写)。</view>
+	            </view>
+	           </view>
+	
+	            <view class="mian_content">
+	                <text>合作模式</text><view class="yellow_icon y m" ></view>
+	            <view class="font_content">
+	                <p class="twobuy">成为自由卖家:二手出售方</p>
+	                  <view class="content_list">
+	                    <p>1.自主发布</p>
+	                    <span>平台已拥有独立上传信息页面,卖家可进入页面或者通过链接自主上传商品信息,获得在平台二手版块展示机会。平台收取展示位费用,详见第2条</span>
+	                  </view>
+	                  <view class="content_list">
+	                    <p>2.自主发布</p>
+	                    <span> 卖家每上传一款商品,占据一个展示位,<span class="bluefont">平台收取每款商品100元的展示费用 ,有效期为<span style="font-size: 48px">6</span>个月</span>
+	                           平台提供与该商品匹配的详情信息以及文章信息,降低买家决策成本,以促进销售。特殊政策除外(如特定免费时段)。</span>
+	                  </view>
+	                   <view class="content_list">
+	                    <p>3.平台推广服务(代运营)</p>
+	                    <span> 卖家如需采美平台提供个性化推广服务,以帮助达成交易 ,平台收取一定服务费或佣金。</span>
+	                  </view>
+	                  <view class="content_list">
+	                    <p>4.第三方检测、维修、延保服务</p>
+	                    <span> 平台收取服务佣金。 </span>
+	                  </view>
+	                  <view class="content_list">
+	                      <p>5.套餐服务</p>
+	                      <span>多项组合服务。</span>
+	                  </view>
+	            </view>
+	            </view >
+	
+	            <view class="mian_content">
+	                <text>交易流程</text><view class="yellow_icon y m" ></view>
+	                <view class="font_content">
+	                 <view class="content_list">
+	                    <span>随着越来越多机构青睐性价比高的二手设备,采美二手市场也越来越火热,为了保障买卖双方利益和资金交易安全,
+	                    采美现将二手仪器交易的流程更加规范化,以促进二手市场的健康发展。</span>
+	                 </view>
+	                    <p class="threebuy">此流程适用于10万以下的设备,10万以上二手设备交易请联系高先生。</p>
+	                    <span class="jioayi">具体的流程如下:</span>
+					    <image src="https://admin-b.caimei365.com/userfiles/1/images/photo/2020/11/jiaoyi.png" mode="" class="jiaoyi_pimg"></image>
+						<image src="https://admin-b.caimei365.com/userfiles/1/images/photo/2020/11/jiaoyi3x.png" mode="" class="jiaoyi_img"></image>
+	                </view>
+	            </view>
+	            <view class="second-hand-btn" >
+	                <button @click.stop="gotoform">去发布</button>
+	                <button @click.stop="gotolist">逛二手市场</button>
+	                <button @click.stop="gotorepair">去维修</button>
+	                <button @click.stop="gotohome">去首页</button>
+	            <view class="foot_font">
+	                <span style="color: #ADADAD"> 业务咨询/合作请联系:</span><span style="color: #666666;margin-right: 10rpx"> 0755-22907771  </span><span style="color: #ADADAD;">手机:</span><span style="color: #666666">15817465281</span>
+	            </view>
+	        </view>
+	    </view>
 	</view>
 </template>
 
 <script>
+	export default{
+		name:'fleaMarket',
+		components:{
+		},
+		methods:{
+			gotoform:function(){
+				this.$api.navigateTo('/second/pages/form/form');
+			},
+			gotolist:function(){
+				this.$api.navigateTo('/second/pages/product/product-list');
+			},
+			gotorepair:function(){
+				this.$api.navigateTo('/second/pages/product/product-list');
+			},
+			gotohome:function(){
+				this.$api.navigateTo('/pages/tabBar/home/home');
+			}
+		},
+		
+		
+	}
 </script>
 
 <style>
+			.fleaMarket{padding:20rpx;background-image: linear-gradient(#FF7676, #E15616);}
+	        .second-hand-wrapper image{width: 100%;display: block;margin: 20rpx auto 0;}
+	        .second-hand-btn button {width: 280rpx;height: 90rpx;background: linear-gradient(225deg,rgba(255,107,107,1) 0%,rgba(247,76,0,1) 100%);border-radius: 30rpx;color: #fff;border: none;
+			font-size: 27rpx;outline: none;margin-bottom:20rpx;margin-right: 20rpx;line-height: 90rpx;display: inline-block}
+	        body{position: relative;margin: 40rpx auto 0;}
+	        .second-hand-wrapper{background-image: url("https://admin-b.caimei365.com/userfiles/1/images/photo/2020/11/bg22.png");background-position: 50% 9%;background-repeat: no-repeat;background-size: 100%;}
+	        .second-hand-wrapper text{color: #FFFFFF;letter-spacing: 4rpx;}
+	        .second-hand-btn {position: relative;background: #FFFFFF;border-radius: 30rpx;margin-top: 30rpx;padding:40rpx 22.5rpx 37.5rpx 30rpx;margin-bottom: 15rpx;border-bottom: 9rpx solid #f1ac90;border-right: 9rpx solid #f1ac90;text-align: center;}
+	        .top_title{padding: 40rpx 0 40rpx 0;text-align: center;}
+	        .top_title text{letter-spacing: 12rpx;font-size: 40rpx;font-weight: bold}
+	        .top_title image{width: 104rpx;height: 90rpx}
+	        .top_title span{color: #FFFFFF;font-size: smaller;}
+	        .top_text{font-size: 60rpx;color: #FFFFFF;font-style: oblique;font-weight: bold;margin-top:40rpx;text-align: center;}
+	        .mian_text{margin-top: 75rpx;color: #FFFFFF;font-size: 22rpx;padding: 0 30rpx 0 30rpx;line-height: 40rpx;letter-spacing: 4rpx}
+	        .mian_text h1{font-size:36rpx;font-weight: bold;padding-bottom: 37.5rpx}
+	        .mian_content.top{margin-top: 500rpx;}
+	        .mian_content text{font-size: 36rpx;font-weight: bold;}
+	        .mian_content{margin-top: 80rpx;}
+	        .font_content{background: #FFFFFF;border-radius:37.5rpx;margin-top: 30rpx;padding:18.5rpx;font-weight: 400;line-height: 45rpx;color: rgba(109,114,120,1);opacity: 1;position: relative;border-bottom:9.75rpx solid #f1ac90;border-right: 9.75rpx solid #f1ac90;}
+	        .content_list p{font-size:30rpx;font-family:Source Han Sans CN;}
+	        .content_list span{font-size: 22rpx;}
+	        .content_list{margin-bottom: 37.5rpx;}
+	        .tishiyu{background: #FFF8F8;font-size:24rpx;font-family: Source Han Sans CN;font-weight: 400;line-height: 40rpx;color: #FF7354;opacity: 1;padding: 18rpx;border-radius: 20rpx}
+	        .twobuy{background: #EF5C3C;border-radius: 15rpx;font-size: 3.7vw;font-family: AlibabaPuHuiTiB;opacity: 1;padding: 6rpx;color: #FFFFFF;margin-bottom: 19.5rpx;text-align: center;width: 360rpx}
+	        .threebuy{background: #EF5C3C;border-radius: 9.75rpx;font-size: 27.7rpx;color: #fff;padding: 6rpx;margin-bottom: 37.5rpx}
+	        .bluefont{font-size: 24rpx !important;color: #0091FF}
+	        .foot_font{text-align: center;font-size: 34rpx;line-height: 52rpx}
+	        .yellow_icon{width: 315rpx;height: 22.5rpx;background: rgba(250,185,0,1);opacity: 1;margin-top: -22.5rpx}
+	        .yellow_icon.m{width: 160rpx;}
+	        .top_title view{display: inline-block;}
+	        .jiaoyi{font-size:24rpx;}
+	        .jiaoyi_pimg{display: none !important;}
+	        .top_title view:nth-child(1){margin-right: 20rpx}
+			.right-title{
+				width: 315rpx
+			}
 </style>

+ 18 - 12
second/pages/product/product-list.vue

@@ -16,7 +16,7 @@
 			</view>
 		</view>
 		<view class="ListImg">
-			<image src="/static/second/banner.png" class="banner-img"></image>
+			<image src="https://admin-b.caimei365.com/userfiles/1/images/photo/2020/11/banner.png" class="banner-img"></image>
 		</view>
 		<view class="main-content">
 			<ul class="secondTitle">
@@ -41,8 +41,8 @@
 			<scroll-view :style="{'height':scrollHeight+'px'}" @scrolltolower="scrolltolower" scroll-y v-if="tabchildList.length > 0">
 		            <view class="Listitem" v-if="isShow" v-for="(item, index) in tabchildList" :key="index" :class="item.sold==1?'activeImg':''">
 		                <a class="itemImg onhref" >
-		                    <image :src="item.mainImage" class="bigImg"></image>
-							<image src="../../../static/second/yishou.png" class="yishou_bg" v-if="item.sold==1&&item.newAdded==1||item.sold==1&&item.newAdded==0"></image>
+		                    <image :src="item.imageList[0]" class="bigImg"></image>
+							<image src="https://admin-b.caimei365.com/userfiles/1/images/photo/2020/11/yishou.png" class="yishou_bg" v-if="item.sold==1&&item.newAdded==1||item.sold==1&&item.newAdded==0"></image>
 		                </a>
 		               <view class="ItemInfo">
 		                        <span class="infotag news" v-if="item.sold==0&&item.newAdded==1">新</span>
@@ -51,9 +51,9 @@
 		                        {{item.name}}
 		                    </a>
 		                    <view class="targetprice" >
-		                        <span v-if="item.detailTalkFlag ==2 && userID==null">价格详聊</span>
-		                        <span v-else-if="userID==null" class="priceparam" @click="toLogin">登录查看价格></span>
-		                        <span v-else-if="userID!=null && item.detailTalkFlag==2">价格详聊</span>
+		                        <span v-if="item.detailTalkFlag ==2 && hasLogin==false">价格详聊</span>
+		                        <span v-else-if="hasLogin==false" class="priceparam">登录查看价格></span>
+		                        <span v-else-if="hasLogin && item.detailTalkFlag==2">价格详聊</span>
 		                        <span v-else>¥{{item.price1Str}}</span>
 		                    </view>
 							<view class="shijian">
@@ -83,8 +83,8 @@
 		            </view>
 		        </view>
 				<view class="fabu">
-					 <a href="second/pages/form/introduce" class="intro">市场介绍</a>
-					 <a href="second/pages/form/form" class="release">我要发布</a>
+					 <span  class="intro"  @click.stop="gotointro">市场介绍</span>
+					 <span  class="release" @click.stop="gotoform">我要发布</span>
 				</view>
 				
 		</view>
@@ -144,7 +144,8 @@
 		created() {
 			 this.setScrollHeight();		
 			 this.gettabList();
-			 this.isFocus = true
+			 this.isFocus = true;
+			 console.log(this.hasLogin)
 		},
 		computed: {
 			...mapState(['hasLogin','userInfo'])
@@ -182,7 +183,12 @@
 			   }
 		       _this.gettabList();
 			  },	
-							
+		    gotointro:function(){
+				this.$api.navigateTo('/second/pages/form/introduce');
+			},
+			gotoform:function(){
+				this.$api.navigateTo('/second/pages/form/form');
+			},
 			gettabList:function (loadMore) {
 			                const _this = this;
 							this.showLoading = true;
@@ -234,7 +240,7 @@
 					this.$util.msg('请输入商品关键词',2000)
 					this.secondHandType = 1
 					this.instrumentType=''
-					this.gettabList();
+					// this.gettabList();
 				}else{
 					this.listQuery.pageNum = 1
 					this.showSkeleton = true;
@@ -443,7 +449,7 @@
 		left: 50%;
 		transform: translate(-50%, -50%)
 	}
-	.fabu a{
+	.fabu span{
 		display: inline-block;
 		width: 280rpx;
 		height: 84rpx;

+ 14 - 1
services/second.service.js

@@ -4,8 +4,21 @@ export default class SecondApi {
 		Object.assign(this, { AjaxService })
 		this.name = 'SecondApi'
 	}
-	/*二手商品列表 */
+	/**
+	 *二手商品列表
+	 *@param 二手商品分类 secondHandType	1二手仪器,2临期产品,3其他  【必传】
+	 *@param 二手仪器分类的类型 instrumentType	1轻光电、2重光电、3耗材配件【不传默认全部】
+	 *@param 搜索关键词 searchKeyword	【选传】 
+	 */
 	SeconHandProductList (data = {}) {
 		return this.AjaxService.get({ url:'/product/getSecondHandProductList', data, isLoading: true })
 	}
+	/*二手发布/品牌列表 */
+	brandList (data = {}) {
+		return this.AjaxService.get({ url:'/product/brandList', data, isLoading: true })
+	}
+	/*二手发布/获取省份信息 */
+	GetProvince (data = {}) {
+		return this.AjaxService.get({ url:'/club/province', data, isLoading: true })
+	}
 }