فهرست منبع

首页修改 界面优化

zhengjinyi 1 سال پیش
والد
کامیت
514e7f3d9d

+ 7 - 3
common/css/iconfont.scss

@@ -1,8 +1,8 @@
 @font-face {
   font-family: "iconfont"; /* Project id 1519039 */
-  src: url('//at.alicdn.com/t/c/font_1519039_mbm0wo1jgm.woff2?t=1718188311371') format('woff2'),
-       url('//at.alicdn.com/t/c/font_1519039_mbm0wo1jgm.woff?t=1718188311371') format('woff'),
-       url('//at.alicdn.com/t/c/font_1519039_mbm0wo1jgm.ttf?t=1718188311371') format('truetype');
+  src: url('//at.alicdn.com/t/c/font_1519039_9tmdq3dgdhu.woff2?t=1719457092531') format('woff2'),
+       url('//at.alicdn.com/t/c/font_1519039_9tmdq3dgdhu.woff?t=1719457092531') format('woff'),
+       url('//at.alicdn.com/t/c/font_1519039_9tmdq3dgdhu.ttf?t=1719457092531') format('truetype');
 }
 
 .iconfont {
@@ -13,6 +13,10 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.icon-weixin:before {
+  content: "\e665";
+}
+
 .icon-fenxiang:before {
   content: "\e67f";
 }

+ 1 - 1
components/cm-module/homeIndex/banner.vue

@@ -117,7 +117,7 @@ export default {
 
 <style lang="scss" scoped>
 .banner {
-	margin-top: 170rpx;
+	margin-top: 142rpx;
 	background: #f7f7f7;
 }
 .swiper-banner-content {

+ 399 - 387
components/cm-module/homeIndex/customer.vue

@@ -1,387 +1,399 @@
-<template name="headerNavbar">
-	<!-- 自定义导航栏 -->
-	<view>
-		<view
-			class="navbar-wrap"
-			:class="isScroll ? opacityNav : ''"
-			:style="{
-				height: CustomBar + 88 + 'px',
-				paddingTop: StatusBar + 'px'
-			}"
-		>
-			<view
-				class="navbar-text"
-				:style="{
-					color: navbarData.textColor ? navbarData.textColor : '',
-					lineHeight: CustomBar - StatusBar + 'px;',
-					fontSize: fontSizeSetting + 'px;',
-					paddingLeft: navbarData.textLeft ? '' : 12 + 'px'
-				}"
-				:class="platformClass"
-			>
-				{{ navbarData.title ? navbarData.title : ' ' }}
-			</view>
-			<view class="search-input">
-				<view class="gosearch-btn" @click="this.$api.navigateTo(clickPath)">
-					<view class="search-icon"><text class="iconfont icon-iconfonticonfontsousuo1"></text></view>
-					<view class="search-text">{{ hotSearchText }}</view> <view class="search-btn">搜索</view>
-				</view>
-				<view class="gosearch-kf">
-					<!-- #ifdef MP-WEIXIN -->
-					<button class="contact-btn" open-type="contact" @bindcontact="handleContact">
-						<text class="iconfont icon-zixunrexian"></text>
-					</button>
-					<!-- #endif -->
-				</view>
-			</view>
-			<view class="swiper-banner-nav">
-				<scroll-view class="scroll-view_H" scroll-x="true">
-					<view class="tui-goods__item active">首页</view>
-					<view class="tui-goods__item" v-for="(navs, index) in navBarsList" @click="NavToDetailPage(navs,index)">
-						{{ navs.name }}
-					</view>
-				</scroll-view>
-				<view class="swiper-nav-icon" @click="showDropScreenShow">
-					<text class="iconfont" :class="dropScreenShow ? 'icon-xiangshangjiantou':'icon-xiangxiajiantou'"></text>
-				</view>
-			</view>
-		</view>
-		<!--顶部下拉筛选弹层 属性-->
-		<tui-top-dropdown
-			backgroundColor="#FFFFFF"
-			:show="dropScreenShow"
-			:height="310"
-			:paddingbtm="10"
-			:translatey="dropScreenH"
-			@close="btnCloseDrop"
-		>
-			<scroll-view class="tui-scroll-box" scroll-y :scroll-top="scrollTop">
-				<view class="tui-seizeaseat-24">
-					<view class="tui-drop-item tui-icon-middle">全部分类</view>
-					<view class="tui-drop-item tui-icon-middle active">首页</view>
-					<view
-						class="tui-drop-item tui-icon-middle"
-						v-for="(item, index) in navBarsList"
-						:key="index"
-						@tap.stop="NavToDetailPage(item,index)"
-						:data-index="index"
-					>
-						{{ item.name }}
-					</view>
-				</view>
-			</scroll-view>
-		</tui-top-dropdown>
-	</view>
-</template>
-
-<script>
-var self
-import btSearch from '@/components/uni-search/bt-search.vue'
-export default {
-    name: 'headerNavbar',
-    components: {
-        btSearch
-    },
-    props: {
-        navbarData: {
-            // 由父页面传递的数据
-            type: Object
-        },
-		navBarsList: {
-			type: Array
-		},
-        isScroll: {
-            type: Boolean,
-            default: () => false
-        }
-    },
-    data() {
-        return {
-            clickPath: '/pages/search/search',
-            hotSearchText: '搜索商品/项目仪器',
-            CustomBar: this.CustomBar, // 顶部导航栏高度
-            StatusBar: this.StatusBar,
-            fontSizeSetting: this.fontSizeSetting,
-            screenWidth: this.screenWidth,
-            capsule: this.capsule,
-            platformClass: this.platformClass,
-            opacityNav: 'opacityNav', // 渐变颜色
-			height: 64, //header高度
-			scrollTop: 0,
-			dropScreenH: this.CustomBar+78, //下拉筛选框距顶部距离
-			dropScreenShow:false,
-			animationData: {}  
-
-        }
-    },
-    created() {
-        if (getCurrentPages().length === 1) {
-            // 当只有一个页面时
-            this.navbarData.haveBack = false
-        } else {
-            this.navbarData.haveBack = true
-        }
-		let obj = {};
-		// #ifdef MP-WEIXIN
-		obj = wx.getMenuButtonBoundingClientRect();
-		// #endif
-		uni.getSystemInfo({
-			success: res => {
-				this.height = obj.top ? obj.top + obj.height + 8 : res.statusBarHeight + 44;
-				//略小,避免误差带来的影响
-				this.dropScreenH = (this.height * 750) / res.windowWidth + 148;
-			}
-		});
-		console.log('dropScreenH',this.dropScreenH)
-    },
-    onLoad() {},
-    onPageScroll(e) {
-    	console.log(e)
-    },
-    methods: {
-        BackPage: function() {
-            this.$emit('navigateBack')
-        },
-        _goSearchPath: function() {
-            this.$emit('goSearchPath')
-        },
-        _goHome: function() {
-            uni.switchTab({
-                url: '/pages/tabBar/home/index'
-            })
-        },
-		NavToDetailPage(item,index) {//跳转
-			if(index === 3){
-				let linkPath = 'https://static.caimei365.com/app/caimei-activity-h5/html/2023/activity_02.html'
-				this.$api.navigateTo(`/pages/h5/activity/activity?link=${linkPath}&linkId=382`)
-			}else{
-				/**
-				 * 页面跳转
-				 **/
-				this.$api.FlooryNavigateTo(item)
-			}
-		},
-		showDropScreenShow(){
-			this.dropScreenShow = !this.dropScreenShow
-			if(this.dropScreenShow){
-				// 禁止页面滚动  
-				uni.setScrollEnabled(false)
-			}else{
-				// 禁止页面滚动
-				uni.setScrollEnabled(true)
-			}
-		},
-		btnCloseDrop(){
-			this.dropScreenShow = false
-		},
-		handleContact(e) {
-		    console.log(e.detail.path)
-		    console.log(e.detail.query)
-		}
-    },
-    onShow() {}
-}
-</script>
-
-<style lang="scss" scoped>
-.navbar-wrap {
-	position: fixed;
-	width: 100%;
-	top: 0;
-	z-index: 9999;
-	box-sizing: border-box;
-	background:#ffffff url(https://static.caimei365.com/app/img/bg/home_cumres_bg@2x.png);
-	background-size: cover;
-	border-bottom: none;
-}
-.opacityNav {
-	
-}
-.navbar-text {
-	font-size: 30rpx;
-	color: #000000;
-	font-weight: 500;
-}
-.navbar-text.center {
-	text-align: center;
-}
-.navbar-text.left {
-	text-align: left;
-	padding-left: 45px;
-}
-.navbar-icon {
-	position: fixed;
-	display: flex;
-	box-sizing: border-box;
-}
-.navbar-icon .iconfont {
-	display: inline-block;
-	overflow: hidden;
-	font-size: 44rpx;
-	padding-right: 40rpx;
-	margin-top: 1px;
-}
-.navbar-icon .icon-iconfonticonfontsousuo1 {
-	color: #000000;
-}
-.navbar-icon view {
-	height: 18px;
-	border-left: 0.5px solid rgba(0, 0, 0, 0.3);
-	margin-top: 6px;
-}
-.navbar-loading {
-	background: #fff;
-	text-align: center;
-}
-.search-input {
-	width: 100%;
-	height: 90rpx;
-	padding: 20rpx 24rpx 0rpx 24rpx;
-	box-sizing: border-box;
-	.gosearch-btn {
-		width: 632rpx;
-		height: 100%;
-		padding: 5rpx;
-		border-radius: 40rpx;
-		background: #f0f0f0;
-		color: #8a8a8a;
-		background: #ffffff;
-		position: relative;
-		box-sizing: border-box;
-		padding-left: 80rpx;
-		border: 1px solid #ff5b00;
-		float: left;
-		.search-icon {
-			width: 80rpx;
-			height: 56rpx;
-			position: absolute;
-			left: 0;
-			top: 9rpx;
-			text-align: center;
-			line-height: 56rpx;
-			.icon-iconfonticonfontsousuo1 {
-				margin: 0 6rpx;
-				font-size: $font-size-40;
-				color: #8a8a8a;
-				z-index: 10;
-			}
-		}
-		.search-text {
-			font-size: $font-size-24;
-			line-height: 56rpx;
-			color: #8a8a8a;
-			float: left;
-		}
-		.search-btn {
-			width: 120rpx;
-			height: 58rpx;
-			border-radius: 30rpx;
-			background-color: #ff5b00;
-			line-height: 58rpx;
-			text-align: center;
-			font-size: $font-size-28;
-			color: #ffffff;
-			float: right;
-		}
-	}
-	.gosearch-kf {
-		width: 70rpx;
-		height: 70rpx;
-		border-radius: 50%;
-		float: left;
-		line-height: 70rpx;
-		text-align: center;
-		.contact-btn {
-			width: 70rpx;
-			height: 70rpx;
-			background-color: rgba(0, 0, 0, 0);
-			line-height: 70rpx;
-			text-align: center;
-			.iconfont {
-				font-size: $font-size-48;
-				color: #ff5b00;
-			}
-		}
-	}
-}
-.swiper-banner-nav {
-	width: 100%;
-	height: 80rpx;
-	box-sizing: border-box;
-	padding: 15rpx 76rpx 15rpx 24rpx;
-	overflow: hidden;
-	display: flex;
-	align-items: center;
-	position: relative;
-	.swiper-nav-icon {
-		width: 76rpx;
-		height: 80rpx;
-		line-height: 80rpx;
-		text-align: center;
-		position: absolute;
-		right: 0;
-		top: 0;
-		.iconfont {
-			font-size: $font-size-28;
-			color: #666666;
-		}
-	}
-	.scroll-view_H {
-		white-space: nowrap;
-		width: 100%;
-		.tui-goods__item {
-			display: inline-block;
-			margin: 0 20rpx;
-			height: 50rpx;
-			line-height: 50rpx;
-			font-size: $font-size-26;
-			color: #333333;
-			text-align: center;
-			&.active {
-				color: #ff5b00;
-				font-weight: bold;
-				position: relative;
-				&::before {
-					content: '';
-					width: 20rpx;
-					height: 4rpx;
-					border-radius: 2rpx;
-					background: #ff5b00;
-					position: absolute;
-					bottom: 0;
-					left: 50%;
-					margin-left: -10rpx;
-				}
-			}
-		}
-	}
-}
-.tui-scroll-box{
-	height: 280rpx;
-	overflow: hidden;
-}
-.tui-seizeaseat-24 {
-	width: 100%;
-	height: auto;
-	box-sizing: border-box;
-	padding: 24rpx;
-	.tui-drop-item {
-		padding: 0 20rpx;
-		height: 56rpx; 
-		float: left;
-		line-height: 56rpx;
-		background: #f5f5f5;
-		font-size: 24rpx;
-		margin: 12rpx 8rpx;
-		text-align: center;
-		border: 1px solid #f5f5f5;
-		color: #666666;
-		border-radius: 28rpx;
-		&.active {
-			background: #ffffff;
-			border-color: #ff5b00;
-			color: #ff5b00;
-		}
-	}
-}
-</style>
+<template name="headerNavbar">
+    <!-- 自定义导航栏 -->
+    <view>
+        <view class="navbar-wrap" :class="isScroll ? opacityNav : ''" :style="{
+				height: CustomBar + 72 + 'px',
+				paddingTop: StatusBar + 'px'
+			}">
+            <view class="navbar-text" :style="{
+					color: navbarData.textColor ? navbarData.textColor : '',
+					lineHeight: CustomBar - ( StatusBar + 4 ) + 'px;',
+					fontSize: fontSizeSetting + 'px;',
+					paddingLeft: navbarData.textLeft ? '' : 12 + 'px'
+				}" :class="platformClass">
+                {{ navbarData.title ? navbarData.title : ' ' }}
+            </view>
+            <view class="search-input">
+                <view class="gosearch-btn" @click="this.$api.navigateTo(clickPath)">
+                    <view class="search-icon"><text class="iconfont icon-iconfonticonfontsousuo1"></text></view>
+                    <view class="search-text">{{ hotSearchText }}</view>
+                    <view class="search-btn">搜索</view>
+                </view>
+                <view class="gosearch-kf">
+                    <!-- #ifdef MP-WEIXIN -->
+                    <button class="contact-btn" open-type="contact" @bindcontact="handleContact">
+                        <text class="iconfont icon-zixunrexian"></text>
+                    </button>
+                    <!-- #endif -->
+                </view>
+            </view>
+            <view class="swiper-banner-nav">
+                <scroll-view class="scroll-view_H" scroll-x="true">
+                    <view class="tui-goods__item active">首页</view>
+                    <view class="tui-goods__item" v-for="(navs, index) in navBarsList"
+                        :key="index"
+                        @click="NavToDetailPage(navs,index)">
+                        {{ navs.name }}
+                    </view>
+                </scroll-view>
+                <view class="swiper-nav-icon" @click="showDropScreenShow">
+                    <text class="iconfont"
+                        :class="dropScreenShow ? 'icon-xiangshangjiantou':'icon-xiangxiajiantou'"></text>
+                </view>
+            </view>
+        </view>
+        <!--顶部下拉筛选弹层 属性-->
+        <tui-top-dropdown backgroundColor="#FFFFFF" :show="dropScreenShow" :height="310" :paddingbtm="10"
+            :translatey="dropScreenH" @close="btnCloseDrop">
+            <scroll-view class="tui-scroll-box" scroll-y :scroll-top="scrollTop">
+                <view class="tui-seizeaseat-24">
+                    <view class="tui-drop-item tui-icon-middle">全部分类</view>
+                    <view class="tui-drop-item tui-icon-middle active">首页</view>
+                    <view class="tui-drop-item tui-icon-middle" v-for="(item, index) in navBarsList" :key="index"
+                        @tap.stop="NavToDetailPage(item,index)" :data-index="index">
+                        {{ item.name }}
+                    </view>
+                </view>
+            </scroll-view>
+        </tui-top-dropdown>
+    </view>
+</template>
+
+<script>
+    var self
+    import btSearch from '@/components/uni-search/bt-search.vue'
+    export default {
+        name: 'headerNavbar',
+        components: {
+            btSearch
+        },
+        props: {
+            navbarData: {
+                // 由父页面传递的数据
+                type: Object
+            },
+            navBarsList: {
+                type: Array
+            },
+            isScroll: {
+                type: Boolean,
+                default: () => false
+            }
+        },
+        data() {
+            return {
+                clickPath: '/pages/search/search',
+                hotSearchText: '搜索商品/项目仪器',
+                CustomBar: this.CustomBar, // 顶部导航栏高度
+                StatusBar: this.StatusBar,
+                fontSizeSetting: this.fontSizeSetting,
+                screenWidth: this.screenWidth,
+                capsule: this.capsule,
+                platformClass: this.platformClass,
+                opacityNav: 'opacityNav', // 渐变颜色
+                height: 64, //header高度
+                scrollTop: 0,
+                dropScreenH: this.CustomBar + 78, //下拉筛选框距顶部距离
+                dropScreenShow: false,
+                animationData: {}
+
+            }
+        },
+        created() {
+            if (getCurrentPages().length === 1) {
+                // 当只有一个页面时
+                this.navbarData.haveBack = false
+            } else {
+                this.navbarData.haveBack = true
+            }
+            let obj = {}
+            // #ifdef MP-WEIXIN
+            obj = wx.getMenuButtonBoundingClientRect()
+            // #endif
+            uni.getSystemInfo({
+                success: res => {
+                    this.height = obj.top ? obj.top + obj.height + 8 : res.statusBarHeight + 44
+                    //略小,避免误差带来的影响
+                    this.dropScreenH = (this.height * 750) / res.windowWidth + 148
+                }
+            })
+            console.log('dropScreenH', this.dropScreenH)
+        },
+        onLoad() {},
+        onPageScroll(e) {
+            console.log(e)
+        },
+        methods: {
+            BackPage: function() {
+                this.$emit('navigateBack')
+            },
+            _goSearchPath: function() {
+                this.$emit('goSearchPath')
+            },
+            _goHome: function() {
+                uni.switchTab({
+                    url: '/pages/tabBar/home/index'
+                })
+            },
+            NavToDetailPage(item, index) { //跳转
+                if (index === 3) {
+                    let linkPath = 'https://static.caimei365.com/app/caimei-activity-h5/html/2023/activity_02.html'
+                    this.$api.navigateTo(`/pages/h5/activity/activity?link=${linkPath}&linkId=382`)
+                } else {
+                    /**
+                     * 页面跳转
+                     **/
+                    this.$api.FlooryNavigateTo(item)
+                }
+            },
+            showDropScreenShow() {
+                this.dropScreenShow = !this.dropScreenShow
+                if (this.dropScreenShow) {
+                    // 禁止页面滚动  
+                    uni.setScrollEnabled(false)
+                } else {
+                    // 禁止页面滚动
+                    uni.setScrollEnabled(true)
+                }
+            },
+            btnCloseDrop() {
+                this.dropScreenShow = false
+            },
+            handleContact(e) {
+                console.log(e.detail.path)
+                console.log(e.detail.query)
+            }
+        },
+        onShow() {}
+    }
+</script>
+
+<style lang="scss" scoped>
+    .navbar-wrap {
+        position: fixed;
+        width: 100%;
+        top: 0;
+        z-index: 9999;
+        box-sizing: border-box;
+        background: #ffffff url(https://static.caimei365.com/app/img/bg/home_cumres_bg@2x.png);
+        background-size: cover;
+        border-bottom: none;
+    }
+
+    .opacityNav {}
+
+    .navbar-text {
+        font-size: 30rpx;
+        color: #000000;
+        font-weight: 500;
+    }
+
+    .navbar-text.center {
+        text-align: center;
+    }
+
+    .navbar-text.left {
+        text-align: left;
+        padding-left: 45px;
+    }
+
+    .navbar-icon {
+        position: fixed;
+        display: flex;
+        box-sizing: border-box;
+    }
+
+    .navbar-icon .iconfont {
+        display: inline-block;
+        overflow: hidden;
+        font-size: 44rpx;
+        padding-right: 40rpx;
+        margin-top: 1px;
+    }
+
+    .navbar-icon .icon-iconfonticonfontsousuo1 {
+        color: #000000;
+    }
+
+    .navbar-icon view {
+        height: 18px;
+        border-left: 0.5px solid rgba(0, 0, 0, 0.3);
+        margin-top: 6px;
+    }
+
+    .navbar-loading {
+        background: #fff;
+        text-align: center;
+    }
+
+    .search-input {
+        width: 100%;
+        height: 70rpx;
+        padding: 0 24rpx 0rpx 24rpx;
+        box-sizing: border-box;
+
+        .gosearch-btn {
+            width: 632rpx;
+            height: 100%;
+            padding: 5rpx;
+            border-radius: 40rpx;
+            background: #f0f0f0;
+            color: #8a8a8a;
+            background: #ffffff;
+            position: relative;
+            box-sizing: border-box;
+            padding-left: 80rpx;
+            border: 1px solid #ff5b00;
+            float: left;
+
+            .search-icon {
+                width: 80rpx;
+                height: 56rpx;
+                position: absolute;
+                left: 0;
+                top: 9rpx;
+                text-align: center;
+                line-height: 56rpx;
+
+                .icon-iconfonticonfontsousuo1 {
+                    margin: 0 6rpx;
+                    font-size: $font-size-40;
+                    color: #8a8a8a;
+                    z-index: 10;
+                }
+            }
+
+            .search-text {
+                font-size: $font-size-24;
+                line-height: 56rpx;
+                color: #8a8a8a;
+                float: left;
+            }
+
+            .search-btn {
+                width: 120rpx;
+                height: 58rpx;
+                border-radius: 30rpx;
+                background: $btn-confirm;
+                line-height: 58rpx;
+                text-align: center;
+                font-size: $font-size-28;
+                color: #ffffff;
+                float: right;
+            }
+        }
+
+        .gosearch-kf {
+            width: 70rpx;
+            height: 70rpx;
+            border-radius: 50%;
+            float: left;
+            line-height: 70rpx;
+            text-align: center;
+
+            .contact-btn {
+                width: 70rpx;
+                height: 70rpx;
+                background-color: rgba(0, 0, 0, 0);
+                line-height: 70rpx;
+                text-align: center;
+
+                .iconfont {
+                    font-size: $font-size-48;
+                    color: #ff5b00;
+                }
+            }
+        }
+    }
+
+    .swiper-banner-nav {
+        width: 100%;
+        height: 80rpx;
+        box-sizing: border-box;
+        padding: 15rpx 76rpx 15rpx 24rpx;
+        overflow: hidden;
+        display: flex;
+        align-items: center;
+        position: relative;
+
+        .swiper-nav-icon {
+            width: 76rpx;
+            height: 80rpx;
+            line-height: 80rpx;
+            text-align: center;
+            position: absolute;
+            right: 0;
+            top: 0;
+
+            .iconfont {
+                font-size: $font-size-28;
+                color: #666666;
+            }
+        }
+
+        .scroll-view_H {
+            white-space: nowrap;
+            width: 100%;
+
+            .tui-goods__item {
+                display: inline-block;
+                margin: 0 20rpx;
+                height: 50rpx;
+                line-height: 50rpx;
+                font-size: $font-size-24;
+                color: #333333;
+                text-align: center;
+
+                &.active {
+                    color: #ff5b00;
+                    font-weight: bold;
+                    position: relative;
+
+                    &::before {
+                        content: '';
+                        width: 20rpx;
+                        height: 4rpx;
+                        border-radius: 2rpx;
+                        background: #ff5b00;
+                        position: absolute;
+                        bottom: 0;
+                        left: 50%;
+                        margin-left: -10rpx;
+                    }
+                }
+            }
+        }
+    }
+
+    .tui-scroll-box {
+        height: 280rpx;
+        overflow: hidden;
+    }
+
+    .tui-seizeaseat-24 {
+        width: 100%;
+        height: auto;
+        box-sizing: border-box;
+        padding: 24rpx;
+
+        .tui-drop-item {
+            padding: 0 20rpx;
+            height: 56rpx;
+            float: left;
+            line-height: 56rpx;
+            background: #f5f5f5;
+            font-size: 24rpx;
+            margin: 12rpx 8rpx;
+            text-align: center;
+            border: 1px solid #f5f5f5;
+            color: #333333;
+            border-radius: 28rpx;
+
+            &.active {
+                background: #ffffff;
+                border-color: #ff5b00;
+                color: #ff5b00;
+            }
+        }
+    }
+</style>

+ 9 - 9
components/cm-module/homeIndex/navbars.vue

@@ -44,7 +44,7 @@ export default {
 			this.navList = list.slice(0, 9)
 		},
 		handleMore() {
-			this.$api.navigateTo(`/pages/goods/channel`)
+			this.$api.navigateTo('/pages/goods/channel')
 		},
 		NavToDetailPage(pros, index) {
 			// 采美快捷运营点击量统计
@@ -69,20 +69,20 @@ export default {
 	padding: 20rpx 0 0 0;
 	background-color: #fff;
 	border-radius: 16rpx;
-	margin-top: 14rpx;
+	margin-top: 10rpx;
 	.nav-item {
 		width: 20%;
 		height: auto;
 		float: left;
-		margin-bottom: 30rpx;
+		margin-bottom: 12rpx;
 		.icon {
-			width: 100rpx;
-			height: 100rpx;
+			width: 80rpx;
+			height: 80rpx;
 			margin: 0 auto;
 			position: relative;
 			.icon-image {
-				width: 100rpx;
-				height: 100rpx;
+				width: 80rpx;
+				height: 80rpx;
 				display: block;
 			}
 			.icon-new {
@@ -99,8 +99,8 @@ export default {
 			height: 40rpx;
 			line-height: 40rpx;
 			text-align: center;
-			font-size: $font-size-26;
-			color: #666666;
+			font-size: $font-size-24;
+			color: #333333;
 		}
 	}
 }

+ 3 - 3
components/cm-module/homeIndex/pageSpecial.vue

@@ -290,8 +290,8 @@ export default {
 <style lang="scss">
 .container-pages {
 	width: 100%;
-	height: 508rpx;
-	padding: 24rpx;
+	height: 490rpx;
+	padding:15rpx 24rpx;
 	float: left;
 	background-color: #f7f7f7;
 	box-sizing: border-box;
@@ -365,7 +365,7 @@ export default {
 		float: left;
 		margin-bottom: 13rpx;
 		.tui-group-title {
-			font-size: 26rpx;
+			font-size: 24rpx;
 			line-height: 36rpx;
 			float: left;
 			color: #333333;

+ 3 - 3
pages/goods/channel.vue

@@ -22,7 +22,7 @@
 
 <script>
 	import cmsMixins from '@/mixins/cmsMixins.js'
-	import { mapState,mapMutations} from 'vuex';
+	import { mapState,mapMutations} from 'vuex'
 	export default{
 		mixins: [cmsMixins],
 		data(){
@@ -92,8 +92,8 @@
 				height: 40rpx;
 				line-height: 40rpx;
 				text-align: center;
-				font-size: $font-size-26;
-				color: #666666;
+				font-size: $font-size-24;
+				color: #333333;
 			}
 		}
 	}

+ 40 - 42
pages/goods/product.vue

@@ -138,12 +138,10 @@
 										@tap="onShare"
 										v-if="userInfo.userIdentity !== 1"
 									>
-										<view class=""><text class="iconfont icon-fenxiang1"></text></view>
-										<view class="">分享</view>
+										<text class="iconfont icon-weixin"></text>
 									</button>
 									<button class="p-title-share tui-share-position" @click="handleShare" v-else>
-										<view class=""><text class="iconfont icon-fenxiang1"></text></view>
-										<view class="">分享</view>
+										<text class="iconfont icon-weixin"></text>
 									</button>
 								</view>
 								<view class="wrap-label" v-if="product.tagsList && product.tagsList.length > 0">
@@ -558,7 +556,7 @@
 					</view>
 				</view>
 				<!-- 侧边 -->
-				<scroll-top :isScrollTop="isScrollTop" :bottom="200" v-show="tabCurrentIndex !== 3"></scroll-top>
+				<scroll-top :isScrollTop="isScrollTop" :bottom="240" v-show="tabCurrentIndex !== 3"></scroll-top>
 			</view>
 		</template>
 		<!-- 商品参数 -->
@@ -1625,7 +1623,7 @@ export default {
 				uni.setStorageSync('spId', 0)
 			}
 		}
-		console.log(this.suid, "uni.getStorageSync('spId')", uni.getStorageSync('spId'))
+		console.log(this.suid, 'uni.getStorageSync(\'spId\')', uni.getStorageSync('spId'))
 	}
 }
 </script>
@@ -1701,7 +1699,7 @@ page {
 	height: auto;
 	padding: 24rpx 0 0 0;
 	background-color: #ffffff;
-	border-bottom: 20rpx solid #f7f7f7;
+	border-bottom: 16rpx solid #f7f7f7;
 	.productRemarks {
 		height: 48rpx;
 		width: 100%;
@@ -1712,12 +1710,11 @@ page {
 		text-align: left;
 	}
 	.wrap-top {
-		width: 702rpx;
-		padding: 0 24rpx;
+		width: 100%;
+        box-sizing: border-box;
+		padding: 0 24rpx 10rpx 24rpx;
 		height: auto;
 		float: left;
-		padding-bottom: 20rpx;
-		border-bottom: 1px solid #f8f8f8;
 		&.none {
 			.p-title {
 				color: #999999;
@@ -1729,12 +1726,13 @@ page {
 			float: left;
 			position: relative;
 			.p-title-name {
-				width: 602rpx;
+				width: 100%;
 				height: auto;
 				float: left;
-				line-height: 48rpx;
+				line-height: 38rpx;
 				font-size: $font-size-28;
 				color: $text-color;
+                font-weight: 600;
 				-o-text-overflow: ellipsis;
 				text-overflow: ellipsis;
 				display: -webkit-box;
@@ -1761,23 +1759,23 @@ page {
 				top: 6rpx;
 			}
 			.p-title-share {
-				width: 96rpx;
-				height: 96rpx;
-				position: absolute;
-				right: 0;
+				width: 80rpx;
+				height: 80rpx;
+                line-height: 80rpx;
+				position: fixed;
+				right: 20rpx;
+                bottom: 380rpx;
 				text-align: center;
-				color: #999999;
-				font-size: $font-size-24;
 				box-sizing: border-box;
 				display: block;
-				background: transparent;
-				border-radius: 0;
-				border: 0;
+				background: rgba(255, 255, 255, 0.7);
 				margin: 0;
-				padding: 8rpx 0;
 				z-index: 20;
-				.icon-fenxiang1 {
-					font-size: $font-size-34;
+                border: 1px solid #E1E1E1;
+                border-radius: 50%;
+				.icon-weixin {
+					font-size: 56rpx;
+                    color: #07c160;
 				}
 			}
 			.tui-share-btn::after {
@@ -1884,7 +1882,7 @@ page {
 			text-align: center;
 			border-radius: 6rpx;
 			background: #ffe6dc;
-			margin: 0 20rpx 15rpx 0;
+			margin: 0 20rpx 10rpx 0;
 			display: inline-block;
 		}
 	}
@@ -1995,11 +1993,11 @@ page {
 }
 .product-seve {
 	width: 100%;
-	height: 60rpx;
+	height: 70rpx;
 	background-color: #ffffff;
 	position: relative;
 	display: flex;
-	line-height: 60rpx;
+	line-height: 70rpx;
 	.label {
 		font-size: $font-size-28;
 		color: #333333;
@@ -2020,7 +2018,7 @@ page {
 	display: flex;
 	flex-direction: column;
 	align-items: center;
-	border-bottom: 20rpx solid #f7f7f7;
+	border-bottom: 16rpx solid #f7f7f7;
 	box-sizing: border-box;
 	padding: 40rpx 0;
 	.none-image {
@@ -2036,11 +2034,11 @@ page {
 }
 .product-supporting {
 	width: 100%;
-	height: 274rpx;
+	height: 262rpx;
 	box-sizing: border-box;
-	padding: 30rpx 24rpx;
+	padding: 24rpx;
 	background-color: #ffffff;
-	border-bottom: 20rpx solid #f7f7f7;
+	border-bottom: 16rpx solid #f7f7f7;
 	.product-supporting-title {
 		width: 100%;
 		height: 40rpx;
@@ -2083,7 +2081,7 @@ page {
 }
 .return-instructions {
 	padding: 0 24rpx;
-	border-bottom: 20rpx solid #f7f7f7;
+	border-bottom: 16rpx solid #f7f7f7;
 }
 .product-parameter {
 	width: 702rpx;
@@ -2091,7 +2089,7 @@ page {
 	padding: 0 24rpx;
 	background-color: #ffffff;
 	position: relative;
-	border-bottom: 20rpx solid #f7f7f7;
+	border-bottom: 16rpx solid #f7f7f7;
 	&.coupon {
 		.title {
 			color: #f94b4b;
@@ -2152,24 +2150,24 @@ page {
 }
 .product-supplier {
 	width: 100%;
-	height: 174rpx;
-	padding: 30rpx 24rpx;
+	height: 164rpx;
+	padding: 20rpx 24rpx;
 	box-sizing: border-box;
 	background-color: #ffffff;
 	position: relative;
 	box-sizing: border-box;
-	border-bottom: 20rpx solid #f7f7f7;
+	border-bottom: 16rpx solid #f7f7f7;
 	.logo {
-		width: 128rpx;
-		height: 92rpx;
+		width: 100rpx;
+		height: 100rpx;
 		float: left;
 		border: 1px solid #efefef;
-		border-radius: 6rpx;
+		border-radius: 50%;
 		image {
 			width: 100%;
 			height: 100%;
 			display: block;
-			border-radius: 6rpx;
+			border-radius: 50%;
 		}
 	}
 	.main {
@@ -2224,7 +2222,7 @@ page {
 .product-details {
 	width: 100%;
 	background: #ffffff;
-	border-bottom: 20rpx solid #f7f7f7;
+	border-bottom: 16rpx solid #f7f7f7;
 	&.recommend {
 		background-color: #f7f7f7;
 		border-bottom: none;

+ 8 - 4
pages/login/login.vue

@@ -25,7 +25,7 @@
 					placeholder="请输入短信验证码"
 					@input="handleSmsCode"
 				/>
-				<view class="code-btn" @click.stop="handleMobileCode"> {{ mobileCodeText }} </view>
+				<view class="code-btn" :class="[isMobileDisabled  ? 'disabled' : '']" @click.stop="handleMobileCode"> {{ mobileCodeText }} </view>
 			</view>
 			<view class="login-input link">
 				<view class="login-reg" @click.stop="navigatorRegirst('/pages/login/register-supplier')" v-if="JSON.parse(getOption).state == '1'">免费注册</view>
@@ -154,7 +154,7 @@ export default {
 				this.$util.msg('请输入正确的手机号', 2000)
 				return
 			}
-			this.isMobileDisabled = true
+			if( this.isMobileDisabled){ return }
 			this.userLoginCode(this.smsCodeParams)
 		},
 		userLoginCode(params) {
@@ -169,7 +169,7 @@ export default {
 						this.mobilTime = setInterval(() => {
 							if (this.mobilCount > 1 && this.mobilCount <= TIME_COUNT) {
 								this.mobilCount--
-								this.mobileCodeText = this.mobilCount + 's'
+								this.mobileCodeText = this.mobilCount + '秒后重发'
 							} else {
 								this.isMobileDisabled = false
 								clearInterval(this.mobilTime)
@@ -305,7 +305,11 @@ export default {
 			line-height: 80rpx;
 			text-align: center;
 			color: $color-system;
-			font-size: $font-size-26;
+			font-size: $font-size-26;
+            &.disabled{
+               opacity: .4;
+               color: #50607a;
+            }
 		}
 		.iconfont {
 			position: absolute;

+ 4 - 4
pages/supplier/components/supplierDetails.vue

@@ -170,16 +170,16 @@ page {
 		position: relative;
 		box-sizing: border-box;
 		.logo {
-			width: 128rpx;
-			height: 92rpx;
+			width: 100rpx;
+			height: 100rpx;
 			float: left;
 			border: 1px solid #efefef;
-			border-radius: 6rpx;
+			border-radius: 50%;
 			image {
 				width: 100%;
 				height: 100%;
 				display: block;
-				border-radius: 6rpx;
+				border-radius: 50%;
 			}
 		}
 		.main {

+ 7 - 8
pages/supplier/user/my-shop.vue

@@ -16,7 +16,7 @@
 			:loadingType="5"
 		/>
 		<template v-else>
-			<view class="shop-search-main">
+			<!-- <view class="shop-search-main">
 				<view class="shop-search">
 					<text class="iconfont icon-sousuo"></text>
 					<input
@@ -33,7 +33,7 @@
 					/>
 					<text class="iconfont icon-shanchu1" v-if="isShowClose" @click.stop="delInputText"></text>
 				</view>
-			</view>
+			</view> -->
 			<view class="container-shop tui-skeleton">
 				<!-- 轮播 -->
 				<view class="product-supplier" @click="goSupplier">
@@ -1126,10 +1126,9 @@ page {
 .container-shop {
 	width: 100%;
 	height: auto;
-	padding: 24rpx;
+	padding:0 24rpx 10rpx 24rpx;
 	box-sizing: border-box;
 	background-color: #ffffff;
-	margin-top: 10rpx;
 }
 .product-supplier {
 	width: 100%;
@@ -1140,16 +1139,16 @@ page {
 	position: relative;
 	box-sizing: border-box;
 	.logo {
-		width: 128rpx;
-		height: 92rpx;
+		width: 100rpx;
+		height: 100rpx;
 		float: left;
 		border: 1px solid #efefef;
-		border-radius: 6rpx;
+		border-radius: 50%;
 		image {
 			width: 100%;
 			height: 100%;
 			display: block;
-			border-radius: 6rpx;
+			border-radius: 50%;
 		}
 	}
 	.main {

+ 46 - 11
pages/user/order/order-list.vue

@@ -229,7 +229,7 @@
 		<!-- 提示弹窗 -->
 		<tui-modal
 			:show="modal"
-			@click="handleClick"
+			@click="handleClick"
 			:content="contentModalText"
 			:button="modalButton"
 			color="#333"
@@ -242,7 +242,8 @@
 	</view>
 </template>
 
-<script>
+<script>
+import { mapState, mapMutations } from 'vuex'    
 import headerBack from '@/components/cm-module/headerNavbar/header-back' //自定义导航
 import btSearch from '@/components/uni-search/bt-search.vue' //搜索
 import modalLayer from '@/components/modal-layer'
@@ -367,13 +368,38 @@ export default {
 			}
 			return map[value]
 		}
-	},
+	},
+    computed: {
+        ...mapState(['hasLogin'])
+    },
 	methods: {
 		async initStorage() {
-			//初始化
-			const usrInfo = await this.$api.getStorage()
-			this.listQuery.userId = usrInfo.userId ? usrInfo.userId : 0
-			this.getOrderDatainit(this.currentTab)
+			//初始化
+            if(this.hasLogin){
+                const usrInfo = await this.$api.getStorage()
+                this.listQuery.userId = usrInfo.userId ? usrInfo.userId : 0
+                this.getOrderDatainit(this.currentTab)
+            }else{
+                this.skeletonShow = false
+                this.modal = true
+                this.contentModalText = '您还未登录,请先登录再进行操作'
+                this.handleModelEven = 0
+                this.modalButton = [
+                	{
+                		text: '暂不登录',
+                		type: 'gray',
+                		plain: true //是否空心
+                	},
+                	{
+                		text: '立即登录',
+                		customStyle: {
+                			color: '#fff',
+                			bgColor: 'linear-gradient(90deg, #F28F31 0%, #FF5B00 100%)'
+                		},
+                		plain: false
+                	}
+                ]
+            }
 		},
 		// 滚动切换标签样式
 		onChange: function(e) {
@@ -526,7 +552,10 @@ export default {
 		handleClick(e) {
 			//确认操作
 			if (e.index == 1) {
-				switch (this.handleModelEven) {
+				switch (this.handleModelEven) {
+                    case 0: //未登录
+                        this.$api.redirectTo('/pages/login/login')
+                        break
 					case 1: //取消订单
 						this.cancelOrder(this.handleShopOrderId)
 						break
@@ -543,9 +572,15 @@ export default {
 						this.confirmpayment(this.handleShopOrderId)
 						break
 				}
-			}
+			}else{
+                switch (this.handleModelEven) {
+                    case 0: //未登录
+                        this.$api.switchTabTo('/pages/tabBar/home/index')
+                        break
+                }
+            }
 			this.modal = false
-		},
+		},
 		//取消订单
 		async cancelOrder(shopOrderId) {
 			try {
@@ -750,7 +785,7 @@ export default {
 	},
 	onShow() {
 		this.isModalLayer = false
-		this.getOrderDatainit(this.currentTab)
+		this.initStorage()
 	}
 }
 </script>