commit -m 首页改版

common/config/caimeiApi.js

@@ -260,6 +260,7 @@ const caimeiApi = {
                     28:`/pages/h5/article/path?link=${pros.link}`, // 采美认证通
                     29:'/pages/user/coupon/coupon-collection',//领券中心
                     30:`/pages/h5/activity/quick-operation?linkId=${pros.linkParam.id}`, // 快捷运营入口
+                    31:'/pages/login/supplier_login'
                 }
                 const url = typeMap[pros.linkType]
                 uni.navigateTo({
@@ -294,6 +295,7 @@ const caimeiApi = {
                 28:`/pages/h5/article/path?link=${linkHref}`, // 采美认证通
                 29:'/pages/user/coupon/coupon-collection',//领券中心
                 30:`/pages/h5/activity/quick-operation?linkId=${linkId}`, // 快捷运营入口
+                31:'/pages/login/supplier_login'
             }
             const url = typeMap[linkType]
             uni.navigateTo({

components/cm-module/homeIndex/customer.vue

@@ -50,7 +50,7 @@
 		<tui-top-dropdown
 			backgroundColor="#FFFFFF"
 			:show="dropScreenShow"
-			:height="320"
+			:height="400"
 			:paddingbtm="10"
 			:translatey="dropScreenH"
 			@close="btnCloseDrop"
@@ -110,6 +110,7 @@ export default {
 			scrollTop: 0,
 			dropScreenH: this.CustomBar+78, //下拉筛选框距顶部距离
 			dropScreenShow:false,
+			animationData: {}  
 
         }
     },
@@ -162,6 +163,13 @@ export default {
 		},
 		showDropScreenShow(){
 			this.dropScreenShow = !this.dropScreenShow
+			if(this.dropScreenShow){
+				// 禁止页面滚动  
+				uni.setScrollEnabled(false)
+			}else{
+				// 禁止页面滚动
+				uni.setScrollEnabled(true)
+			}
 		},
 		btnCloseDrop(){
 			this.dropScreenShow = false
@@ -323,7 +331,7 @@ export default {
 		width: 100%;
 		.tui-goods__item {
 			display: inline-block;
-			margin: 0 10rpx;
+			margin: 0 20rpx;
 			height: 50rpx;
 			line-height: 50rpx;
 			font-size: $font-size-26;
@@ -348,6 +356,10 @@ export default {
 		}
 	}
 }
+.tui-scroll-box{
+	height: 340rpx;
+	overflow: hidden;
+}
 .tui-seizeaseat-24 {
 	width: 100%;
 	height: auto;

components/cm-module/scrollTop/scrollTop.vue

@@ -1,20 +1,6 @@
 <template name="scrollTop">
     <!-- 商品详情价格判断 -->
     <view>
-        <view
-            class="supplierLogo"
-            v-if="isShowSupplier && isShowIcon"
-            @click="$api.navigateTo('/pages/login/supplier_login')"
-            :style="{ bottom: bottom + 120 + 'rpx' }"
-        >
-            <image class="logo" src="https://static.caimei365.com/app/img/icon/supplier_logo.png" mode=""></image>
-            <image
-                class="close"
-                @click.stop="isShowIcon = false"
-                src="https://static.caimei365.com/app/img/supplier-login/close_icon.png"
-                mode=""
-            ></image>
-        </view>
         <view class="scrollTop" :style="{ bottom: bottom + 'rpx' }">
             <view class="icon msg" v-if="isShowKefu">
                 <!-- #ifdef MP-WEIXIN -->
@@ -77,27 +63,6 @@ export default {
 </script>
 
 <style lang="scss">
-.supplierLogo {
-    position: fixed;
-    right: 20rpx;
-    z-index: 100;
-    width: 120rpx;
-    height: 130rpx;
-    display: flex;
-    align-items: flex-end;
-    justify-content: flex-end;
-    .logo {
-        width: 120rpx;
-        height: 120rpx;
-    }
-    .close {
-        position: absolute;
-        top: 0;
-        right: 0;
-        width: 30rpx;
-        height: 30rpx;
-    }
-}
 .scrollTop {
     width: 80rpx;
     height: 120rpx;

pages/goods/channel.vue

@@ -8,7 +8,7 @@
 			:loadingType="5"
 		/>
 		<template v-else>
-			<view class="navbars-content">
+			<view class="navbars-content clearfix">
 				<view class="nav-item" v-for="(item,index) in list" :key="index" @click="NavToDetailPage(item,index)">
 					<view class="icon">
 						<image class="icon-image" :src="item.icon" mode="widthFix"></image>
@@ -70,7 +70,7 @@
 		width: 100%;
 		height: auto;
 		box-sizing: border-box;
-	    padding: 40rpx 57rpx;
+	    padding: 40rpx 0rpx;
 		.nav-item{
 			width: 25%;
 			height: auto;

pages/seller/components/home.vue

@@ -146,23 +146,7 @@
 				this.$store.commit('setActivity',data)
 			}
 		},
-		onPageScroll(e){//实时获取到滚动的值
-            if (e.scrollTop > 0) {
-                this.isScroll = true
-            } else {
-                this.isScroll = false
-            }
-			if(e.scrollTop>50){
-				this.inputActive = 'fixed'
-			}else{
-				this.inputActive = 'float'
-			}	
-			if(e.scrollTop>400){
-				this.isScrollTop = true
-			}else{
-				this.isScrollTop = false
-			}	
-		},
+
 		onPullDownRefresh() {//下拉刷新
 			this.getHomeInformation()
 			uni.stopPullDownRefresh()

pages/seller/index/index.vue

@@ -137,6 +137,13 @@ export default {
 			uni.stopPullDownRefresh()
 		}
 	},
+	onPageScroll(e){//实时获取到滚动的值
+		if(e.scrollTop>400){
+			this.$refs.home.isScrollTop = true
+		}else{
+			this.$refs.home.isScrollTop = false
+		}	
+	},
 	onShareAppMessage(res) {
 		//分享转发
 		if (res.from === 'button') {

pages/supplier/user/my-shop.vue

@@ -28,10 +28,10 @@
 						@input="onShowClose"
 						v-model.trim="listQuery.keyword"
 						confirm-type="search"
-						@confirm="SubMitSearch()"
+						@confirm="SubMitSearch"
 						placeholder="搜索本店铺商品"
 					/>
-					<text class="iconfont icon-shanchu1" v-if="isShowClose" @click.stop="delInputText()"></text>
+					<text class="iconfont icon-shanchu1" v-if="isShowClose" @click.stop="delInputText"></text>
 				</view>
 			</view>
 			<view class="container-shop tui-skeleton">
@@ -916,7 +916,7 @@ export default {
 		SubMitSearch() {
 			//搜索
 			this.listQuery.pageNum = 1
-			this.GetSupplierHomeProductList()
+			this.handleChangeAll()
 		},
 		PromotionsFormat(promo) {
 			//促销活动类型数据处理

pages/tabBar/home/index.vue

@@ -105,12 +105,6 @@ export default {
         } else {
             this.isScroll = false
         }
-		//实时获取到滚动的值
-		if (e.scrollTop > 50) {
-			this.inputActive = 'fixed'
-		} else {
-			this.inputActive = 'float'
-		}
 		if (e.scrollTop > 400) {
 			this.isScrollTop = true
 		} else {