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

components/cm-module/homeIndex/banner.vue

@@ -173,9 +173,9 @@
 				}
 				.iconfont{
 					color: $color-system;
-					font-size: $font-size-34;
+					font-size: $font-size-32;
 					.sm{
-						font-size: $font-size-28;
+						font-size: $font-size-26;
 					}
 				}
 			}

components/cm-module/homeIndex/navbars.vue

@@ -125,7 +125,7 @@
 				height: 40rpx;
 				line-height: 40rpx;
 				text-align: center;
-				font-size: $font-size-28;
+				font-size: $font-size-26;
 				color: #666666;
 			}
 			.nav-cell-main{

components/cm-module/productDetails/secondParameters.vue

@@ -17,11 +17,11 @@
 			<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-tr" v-if="product.contactName!=''&& product.contactName!=null">
 			<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-tr" v-if="product.contactMobile!=''&&product.contactMobile!=null">
 			<view class="content-td">联系方式</view> 
 			<view class="content-th">{{product.contactMobile}}</view>
 		</view>
@@ -43,7 +43,7 @@
 			<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-td">数量</view>
 			<view class="content-th">{{product.stock}}</view>
 		</view>
 		<view class="content-tr">

components/cm-module/productDetails/secondPrice.vue

@@ -8,7 +8,7 @@
 				</view>
 				<template  v-else>
 					<text class="p-no">￥</text>
-					<text class="txt big" >价格详聊</text>
+					<text class="txt big" >详聊</text>
 				</template>
 			</view>
 		</template>

components/cm-module/productDetails/secondRecommend.vue

@@ -35,8 +35,7 @@
 		props:{
 			queryProductid: {
 				// Unistars类型
-				type: Number,
-				default: 0
+				type: String,
 			}
 		},
 		components:{
@@ -59,13 +58,11 @@
 		methods:{
 			infoRecommend(id){
 				this.SellerService.ProductRecommend({productId:id}).then(response =>{
-					console.log(response)
 					if( response.data && response.data.length > 0){
 						this.isEmpty = false
 						for (var i = 0, j = response.data.length; i < j; i += this.pageSize) {
 							this.recommendList.push(response.data.slice(i, i + this.pageSize));
 						}
-						console.log(this.recommendList)
 					}else{
 						this.isEmpty = true
 					}

pages.json

@@ -538,7 +538,7 @@
 				},{
 					"path": "pages/form/form",
 					"style": {
-						"navigationBarTitleText": "发布商品"
+						"navigationBarTitleText": "发布二手"
 					}
 				},
 				{
@@ -551,7 +551,7 @@
 				{
 					"path": "pages/product/product-details",
 					"style": {
-						"navigationBarTitleText": "二手商品详情",
+						"navigationBarTitleText": "商品详情",
 						"enablePullDownRefresh":true
 					}
 				}

pages/search/search-second.vue

@@ -41,7 +41,7 @@
 				        </view>
 				    </view>
 				</view>
-				<view v-if="showLoading && listData.length > 4">
+				<view v-if="showLoading">
 					<view class="loading-wrapper loading-wrapper-now" v-if="loadingNow">{{loadingText}}<text v-if="loadingText === '已至底部'">‧ ‧ ‧</text></view>
 					<view class="loading-wrapper loading-wrapper-btm" v-else>———<text class="btm-text">已至底部</text>———</view>
 				</view>
@@ -145,7 +145,7 @@
 						this.pullFlag = false;
 						setTimeout(()=>{ this.pullFlag = true; },500)
 						// 底部提示文案
-						if(hasNextPage) {
+						if(this.hasNextPage) {
 							this.loadingText = '上拉加载更多';
 						} else {
 							this.showLoading = true;

pages/user/address/addressManage.vue

@@ -209,14 +209,13 @@
 			// display: flex;
 			align-items: center;
 			position: relative;
-			width: 654rpx;
+			width: 702rpx;
 			height: 88rpx;
-			padding:0 24rpx;
+			// padding:0 24rpx;
 			margin: 0 auto;
 			// background: #F7F7F7;
 			// border-radius: 14rpx;
 			border-bottom: 2rpx solid #e1e1e1;
-
 			.label{
 				// display: inline-block;
 				width:100rpx ;

second/pages/form/form.vue

@@ -27,7 +27,7 @@
 						  </view>
 						  <view class="linqi_text" v-show="secondParams.secondHandType==2">
 							  <view class="jiaobiao"></view>
-							  <p>临期产品是指临近保质期的产品，距离到期日最好在6个月以上</p>
+							  <p class="p">临期产品是指临近保质期的产品，距离到期日最好在6个月以上</p>
 						  </view>
 					 </view>
 					 <view class="row">
@@ -42,12 +42,14 @@
 								<text class="iconfont  icon-iconfontguanbi"  @click="hidePopup()"></text>
 								<view class="content">
 									<view class="freight-radio">
-										<radio-group class="row-group" @change="radioChange" >
-											<label class="row-input" v-for="(item, index) in BrandList" :key="item.id">
-												<view class="row-text">{{item.name}}</view>
-												<radio class="row-radio" :value="item.id"  color="#E15616"/>
-											</label>
-										</radio-group>
+										 <scroll-view scroll-y style="max-height: 605rpx;">
+											<radio-group class="row-group" @change="radioChange" >
+												<label class="row-input" v-for="(item, index) in BrandList" :key="item.id">
+													<view class="row-text">{{item.name}}</view>
+													<radio class="row-radio" :value="item.id"  color="#E15616"/>
+												</label>
+											</radio-group>
+										</scroll-view>
 									</view>
 								</view>
 							</view>	
@@ -158,13 +160,13 @@
 						<view class="release-from">
 							<view class="label">商品图片</view>
 								<view class="release-input upload image uploadGoodsImages" >
-									<view class="upload-file" v-show="GoodsImagesList.length<5">
+									<view class="upload-file" v-if="GoodsImagesList.length<5">
 										<i class="iconfont icon-shangchuantupian"></i>
-										<p class="add-text">营业执照</p>
+										<p class="add-text">商品图片</p>
 										<view ref="goodsImages" class="input-file"  @click="uploadGoodsImagesFn"></view>
 									</view>
-									<view class="upload-file"  v-for="(item, index) in GoodsImagesList" :key="index">
-										<img :data-original='item' :src="item" :data-image="item" alt="" class="upload-img" >
+									<view class="upload-file" v-for="(item, index) in GoodsImagesList" :key="index">
+										<image :data-original='item' :src="item" :data-image="item" alt="" class="upload-img" ></image>
 										<i class=" del iconfont icon-shanchu1" @click="removeGoodsImagesFn(index)"></i>
 									</view>
 								</view>
@@ -177,7 +179,14 @@
 						<view class="productinfo">
 							 <view class="label unlogin-label" style="width: 100%;">商品详细信息</view>
 							 <div class="textarea-wrapper">
-								 <textarea maxlength="200" v-model="secondParams.productDetails"  cols="70" class="description" rows="6"  placeholder="请填写商品详细信息，对商品进行更详细的描述"  placeholder-class="placeholder"></textarea>
+								 <textarea 	class="textarea"
+								 			type="text" 
+								 			v-model="secondParams.productDetails" 
+								 			placeholder="请填写商品详细信息，对商品进行更详细的描述" 
+								 			placeholder-class="placeholder"
+								 			maxlength="200"
+								 			@input="onTextareaInputInfo"
+								 />
 								 <span class="word-limit">{{secondParams.productDetails.length}}/200</span>
 							 </div>
 						</view>
@@ -297,6 +306,9 @@
 			}
 		},
 		methods:{
+			onTextareaInputInfo(e){
+			   this.secondParams.productDetails = e.detail.value;
+			},
 			radioChange(e){//品牌
 				this.secondParams.brandID = e.target.value;
 				this.BrandList.forEach((item,index)=>{
@@ -514,9 +526,9 @@
 		.Secondary{margin-left: 161rpx;}
 		.secondradio view.active {color: #e15616;}
 		.placeholder{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;
+		.linqi_text { width: 607rpx; height: 68rpx;background-color: #1890f9;box-shadow: 0rpx 4rpx 6rpx 0rpx rgba(24, 144, 249, 0.17);text-align: center;
 		    line-height: 68rpx;color: #ffffff;margin: auto;font-size:24rpx;position: relative;}
-		.jiaobiao {width: 0;height: 0;border-left: 20rpx solid transparent;border-right: 20rpx solid transparent;top: -30%;
+		.jiaobiao {width: 0;height: 0;border-left: 20rpx solid transparent;border-right: 20rpx solid transparent;top: -25%;
 		    right: 40%;border-bottom: 20rpx solid #1890f9;position: absolute;}
 		.label{color: #666666;display: inline-block;width: 120rpx;}
 		.label.second{width: 155rpx;}
@@ -540,6 +552,9 @@
 			}
 			.row-input{margin-right: 10rpx;}
 		}
+		.linqi_text .p{
+			font-size: $font-size-20;
+		}
 		.upload-file {
 		    position: relative;
 		    float: left;
@@ -739,8 +754,8 @@
 					padding: 0 35rpx;
 					.row-group{
 						width: 100%;
-						max-height: 605rpx;
-						overflow: auto;
+						// max-height: 605rpx;
+						// overflow: auto;
 				
 					}
 					.row-input{

second/pages/form/introduce.vue

@@ -79,15 +79,14 @@
 	                 </view>
 	                    <view class="threebuy">此流程适用于10万以下的设备，10万以上二手设备交易请联系高先生。</view>
 	                    <view class="jioayi">具体的流程如下：</view>
-					    <image src="http://static-b.caimei365.com/app/img/bg/jiaoyi.png" mode="" class="jiaoyi_pimg"></image>
-						<image src="http://static-b.caimei365.com/app/img/bg/jiaoyi3x.png" mode="" class="jiaoyi_img"></image>
+						<image src="https://admin-b.caimei365.com/userfiles/1/images/photo/2020/11/intro.png" mode="" class="jiaoyi_img"></image>
 	                </view>
 	            </view>
 	            <view class="second-hand-btn" >
 	                <view class="button" @click.stop="gotoform">去发布</view>
 	                <view class="button" @click.stop="gotolist">逛二手市场</view>
-	                <view class="button" @click.stop="gotorepair">去维修</view>
-	                <view class="button" @click.stop="gotohome">去首页</view>
+	                <view class="button" @click="gotorepair">去维修</view>
+	                <view class="button" @click="this.$api.switchTabTo('/pages/tabBar/home/index')">去首页</view>
 	            <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>
@@ -109,11 +108,8 @@
 				this.$api.navigateTo('/second/pages/product/product-list');
 			},
 			gotorepair:function(){
-				this.$api.navigateTo(`/h5/pages/activity/activity_mid`);
+				this.$api.navigateTo('/h5/pages/article/page?linkType=7');
 			},
-			gotohome:function(){
-				this.$api.navigateTo('/pages/tabBar/home/index');
-			}
 		},
 		
 		
@@ -138,6 +134,7 @@ page{
 		width: 100%;
 		display: block;
 		margin: 20rpx auto 0;
+		height: 800rpx;
 	}
 	.big-title{
 		color: #FFFFFF;
@@ -185,10 +182,11 @@ page{
 	.right-two{
 		color: #FFFFFF;
 		font-size: 20rpx;
+		display: block;
 	}
 	image{
-		width: 104rpx;
-		height: 90rpx
+		width: 100%;
+		height: 100%;
 	}
 }
 .top_text{
@@ -306,6 +304,8 @@ page{
 }
 .top_title view:nth-child(1){
 	margin-right: 20rpx;
+	width: 104rpx;
+	height: 92rpx;
 }
 .right-title{
 	width: 250rpx;

second/pages/product/product-details.vue

@@ -1,20 +1,23 @@
 
 <template>
 	<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> -->
 		<view  class="navbar" :class="navbarFiexd">
-			<!--  -->
 			<view class="nav-item tui-skeleton-fillet" :class="{ current: tabCurrentIndex === 0 }" @click="tabClick(0)">
 				<text>详情</text>
 				<text class="line"></text>
 			</view>
+			<view class="nav-item tui-skeleton-fillet" :class="{ current: tabCurrentIndex === 1 }" @click="tabClick(1)">
+				<text>品牌</text>
+				<text class="line"></text>
+			</view>	
+			<view class="nav-item tui-skeleton-fillet" :class="{ current: tabCurrentIndex === 2 }" @click="tabClick(2)">
+				<text>推荐</text>
+				<text class="line"></text>
+			</view>	
+			<!-- <view class="nav-item tui-skeleton-fillet" :class="{ current: tabCurrentIndex === 0 }" @click="tabClick(0)">
+				<text>详情</text>
+				<text class="line"></text>
+			</view>
 			<view class="nav-item tui-skeleton-fillet" 
 				  :class="{ current: tabCurrentIndex === 1 }" 
 				  @click="tabClick(1)" 
@@ -25,7 +28,7 @@
 			<view class="nav-item tui-skeleton-fillet" :class="{ current: tabCurrentIndex === 2 }" @click="tabClick(2)">
 				<text>推荐</text>
 				<text class="line"></text>
-			</view>	
+			</view>	 -->
 		</view>
 		
 		<tui-skeleton v-if="skeletonShow" backgroundColor="#fafafa" borderRadius="10rpx" :isLoading	="true" :loadingType="5"></tui-skeleton>
@@ -65,14 +68,14 @@
 								<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-seve">
+							<text class="iconfont icon-wuyoutuihuo tui-skeleton-rect"><text class="text">无忧退货</text></text>
+							<text class="iconfont icon-wuyoutuihuoi tui-skeleton-rect"><text class="text">快速退款</text></text>
+							<text class="iconfont icon-wuyoutuihuo tui-skeleton-rect"><text class="text">正品保证</text></text>
+						</view>
 				</view>
+				
 				<view class="product-parameter" @click="showPopup">
 					<text class="title">参数：</text>
 					<text class="name">品牌  起订量  分类...</text>
@@ -114,7 +117,7 @@
 					<view class="title-tab">相关推荐</view>
 				</view>
 				<view class="content hot">
-					<recommend :query-productid="product.productID" ></recommend>
+					<recommend :query-productid="product.productID" v-if="isRequest" ></recommend>
 				</view>
 			</view>	
 				</view> 
@@ -146,6 +149,7 @@
 	import recommend from "@/components/cm-module/productDetails/secondRecommend" //相关推荐
 	import cmParameter from "@/components/cm-module/productDetails/secondParameters.vue" //相关参数
 	import wxLogin from "@/common/config/wxLogin.js"
+	import { debounce } from '@/common/config/common.js'
 	var isPreviewImg;
 	export default{
 		components:{
@@ -196,6 +200,11 @@
 				linkPath:'',
 				popupShow:false,//参数弹窗
 				CustomBar:this.CustomBar,// 顶部导航栏高度
+				tabSelectFlag:false,
+				sectionPropsArr: [],
+				scrollTopArray:[],
+				sectionTopRangeArr: [],
+				winHeight:''
 			}
 		},
 		onLoad(option) {
@@ -234,8 +243,9 @@
 					this.product = response.data
 					//处理商品图片列表
 					this.product.imageList.forEach(item =>{
-						this.productImage.push(item.image);
+						this.productImage.push(item);
 					})
+					this.isRequest = true
 				}).catch(error =>{
 					this.$util.msg(error.msg,2000);
 				})
@@ -254,7 +264,7 @@
 				})
 			},
 			tabClick(index) {//商品详情&&供应商信息tab切换
-				console.log(index)
+				this.tabSelectFlag = true
 				this.tabCurrentIndex = index;
 				let classIndex = '.productDetails'+index;
 				uni.createSelectorQuery().select('.container-product-main').boundingClientRect((data)=>{//最外层盒子节点
@@ -318,27 +328,83 @@
 			},
 			hidePopup(){
 				this.popupShow = false
-			}
+			},
+			getSectionProps() {//获取每个tab对应区域的scrollTop值
+				let className = '.product-details',
+					sectionPropsArr = [];
+				uni.createSelectorQuery().select('.container-product-main').boundingClientRect((data)=>{//最外层盒子节点
+				　　uni.createSelectorQuery().selectAll(className).boundingClientRect((res)=>{//最外层盒子节点
+						res.forEach((item, index) => {
+							sectionPropsArr.push({
+								className: `${className}${index}`,
+								scrollTop: item.top - data.top - 150
+							})
+						})
+						this.sectionPropsArr = sectionPropsArr;
+						this.sectionTopRangeArr = this.getSectionRange(sectionPropsArr);
+				　　}).exec()
+				}).exec()
+			},
+			getSectionRange(arr) {// 获取每个tab对应区域的区间
+				let sectionScrollTopList = [];
+				for(let i = 0; i < arr.length; i++) {
+					let thisScrollTop = arr[i].scrollTop;
+					if(i < arr.length - 1) {
+						let nextScrollTop = arr[i+1].scrollTop;
+						if(i == 0) {
+							sectionScrollTopList.push(`0-${thisScrollTop}`);
+						} else if(i == arr.length - 1){
+							sectionScrollTopList.push(`${thisScrollTop}-${nextScrollTop - this.winHeight}`);
+						} else {
+							sectionScrollTopList.push(`${thisScrollTop}-${nextScrollTop}`);
+						}
+					} else {
+						sectionScrollTopList.push(`${thisScrollTop}-${thisScrollTop+500}`);
+					}
+				}
+				return sectionScrollTopList;
+			},
+			activeTab: debounce((top, _this)=> {//当滑动时也能同步激活tab
+				const { sectionTopRangeArr } = _this;
+				if(sectionTopRangeArr.length > 0) {
+					sectionTopRangeArr.forEach((item, index) => {
+						let splitItem = item.split('-'),
+							openInterval = Number(splitItem[0]),
+							closedInterval = Number(splitItem[1]);
+						if(top >= openInterval && top < closedInterval) {
+							_this.tabCurrentIndex = index;
+						}
+					})
+				}
+			},100, true),
+			getWinHeight() {
+				this.winHeight = wx.getSystemInfoSync().windowHeight;
+			},
+			
 		},
 		onPageScroll(e){//实时获取到滚动的值
-			if(e.scrollTop>50){
+			const { scrollTop } = e;
+			if(!this.tabSelectFlag) {
+				this.activeTab(scrollTop, this);
+			}
+			if(e.scrollTop>100){
 				this.headerColor = true
+				this.navbarFiexd = 'fixed'
 				this.nvabarData={							
 					showCapsule: 1, 
 					title: '商品详情', 		
 				}
 			}else{
 				this.headerColor = false
+				this.navbarFiexd = 'none'
 				this.nvabarData={
 					showCapsule: 1, 
 					title: '', 		
 				}
 			}
 			if(e.scrollTop>700){
-				this.navbarFiexd = 'fixed'
 				this.isScrollTop = true
 			}else{
-				this.navbarFiexd = 'none'
 				this.isScrollTop = false
 			}
 		},
@@ -378,7 +444,7 @@
 		height: 80rpx;
 		box-sizing: border-box;
 		padding: 0 24rpx;
-		background: #ffe6dc;
+		background: #fff;
 		z-index: 10;
 		display: flex;
 		position: fixed;
@@ -461,14 +527,12 @@
 		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
@@ -480,18 +544,18 @@
 				float: left;
 				.p-title-name{
 					width:602rpx;
-					height: 96rpx;
+					// height: 96rpx;
 					float: left;
-					line-height: 42rpx;
+					line-height: 46rpx;
 					font-size: $font-size-34;
 					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;
+					// -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;
@@ -733,13 +797,13 @@
 			color: $text-color;
 		}
 		.iconfont{
-			color: #999999;
-			margin-right: 20rpx;
+			color: #fea785;
+			margin-right: 40rpx;
 			font-size: $font-size-26;
 		}
 		.text{
 			font-size: $font-size-26;
-			color: #999999;
+			color: #fea785;
 			margin-left: 10rpx;
 		}
 	}
@@ -756,7 +820,7 @@
 			display: inline-block;
 			float: left;
 			font-size: $font-size-28;
-			color: $text-color;
+			color: #666666;
 		}
 		.name{
 			float: right;
@@ -764,7 +828,7 @@
 			display: inline-block;
 			float: left;
 			font-size: $font-size-28;
-			color: #999999;
+			color: $text-color;
 			float: right;
 			padding-right: 48rpx;
 			overflow: hidden;

second/pages/product/product-list.vue

@@ -12,7 +12,7 @@
 		</view>
 		<view class="main-content" v-if="searchHide">
 			<view class="secondTitle">
-				<view class="ClassA" @click="handle('1')">
+				<view class="ClassA" @click="handle('1')" :class="[currentId == '1' ? 'active':'',currentId == '1' ? 'off':'']">
 					{{ tabTitleName }}
 					<text class="iconfont" :class="mainflag ? 'icon-xiangxiajiantou':'icon-xiangshangjiantou'"></text>
 					<view class="line" v-if="currentId == '1'"></view>
@@ -44,9 +44,9 @@
 		                        {{item.name}}
 		                    </view>
 		                    <view class="targetprice" >
-		                        <text v-if="item.detailTalkFlag ==2 && hasLogin==false">价格详聊</text>
-		                        <text v-else-if="!hasLogin" class="priceparam">登录查看价格</text>
-		                        <text v-else-if="hasLogin && item.detailTalkFlag==2">价格详聊</text>
+		                        <text v-if="item.detailTalkFlag ==2 && hasLogin==false">￥详聊</text>
+		                        <text v-else-if="!hasLogin" class="priceparam" @click.stop="this.$api.navigateTo('/pages/login/login')">登录查看价格></text>
+		                        <text v-else-if="hasLogin && item.detailTalkFlag==2">￥详聊</text>
 		                        <text v-else>￥{{item.price1Str}}</text>
 		                    </view>
 							<view class="shijian">
@@ -72,12 +72,12 @@
 		            <view class="no-content" v-show="showflag" :class="showflag?'show':''">
 		                <image src="http://static-b.caimei365.com/app/img/bg/kong_m.png"  />
 		                <view class="error-message">
-		                    <view>此分类下面没有商品，换其它分类瞅瞅</view>
+		                    <view>该分类下面没有商品，请更换其它分类</view>
 		                </view>
 		            </view>
 		        </view>
 				<view class="fabu" :style="{ paddingBottom :isIphoneX ? '68rpx' : '0rpx' }">
-					 <text  class="intro"  @click.stop="gotointro" >市场介绍</text>
+					 <text  class="intro"  @click.stop="gotointro" >二手市场介绍</text>
 					 <text  class="release" @click.stop="gotoform" >我要发布</text>
 				</view>
 				<!-- 透明模态层 -->
@@ -165,7 +165,7 @@
 				   _this.tabTitleName = '二手仪器';
 				   this.pageNum = 1
 				   if ( _this.currentId == '1'){
-						_this.mainflag = true;
+						_this.mainflag = !_this.mainflag;
 				   }else {
 						_this.mainflag=false;
 						_this.currentID2 = 0;
@@ -193,8 +193,6 @@
 				this.isModallayer = false;
 			},
 			gettabList:function (loadMore) {
-				console.log(this.hasLogin)
-				console.log(this.userInfo)
 							this.showLoading = true;
 							this.loadingNow = true;
 							this.loadingText = '加载中';
@@ -367,6 +365,13 @@
 		color: #666666;
 		border: 0;
 		position: relative;
+		.line {
+		    width: 10vw;
+		    margin: 0 auto;
+		    height: .48vw;
+		    background-color: #e15616;
+		    display: block;
+		}
 	}
 	.mainTab {
 		background: #fff;
@@ -398,19 +403,19 @@
 		text-align: center;
 		top: 50%;
 		position: absolute;
+		image{
+			width: 306rpx;
+			height: 212rpx;
+		}
 
 	}
-	.no-content img{
-		width: 306rpx;
-		height: 212rpx;
-	}
 	.error-message{
 		font-size: 24rpx;
 		color: #b2b2b2;
 	}
 	.Listitem {
 		height: 202rpx;
-		padding: 20rpx;
+		padding:30rpx 20rpx;
 		border-bottom: 2rpx solid #F0F2F4;
 	}
 	.itemImg {