二手bug

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

@@ -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>	
@@ -160,7 +162,7 @@
 								<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>
+										<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">
@@ -516,7 +518,7 @@
 		.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;
 		    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;}
@@ -739,8 +741,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-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>
@@ -77,7 +77,7 @@
 		            </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;
@@ -410,7 +415,7 @@
 	}
 	.Listitem {
 		height: 202rpx;
-		padding: 20rpx;
+		padding:30rpx 20rpx;
 		border-bottom: 2rpx solid #F0F2F4;
 	}
 	.itemImg {