fixed:优化自定义导航栏的计算,详情页购物车数量为0的隐藏，首页ui优化

App.vue

@@ -5,9 +5,8 @@ import dayjs from 'dayjs'
 import { removeStorage } from '@/lib/storage/index.js'
 export default {
 	onLaunch: function() {
-		this.setSystemInfo() // 获取系统信息
-		this.setMenuButtonInfo() // 获取胶囊信息
 		this.checkUpdate() // 检查更新
+		this.setMobileData() // 获取系统信息和胶囊信息
 		
 		const extConfig = wx.getExtConfigSync ? wx.getExtConfigSync(): {}
 		console.log(extConfig)
@@ -33,7 +32,7 @@ export default {
 	},
 	
 	methods: {
-		...mapActions('systemInfo', ['setSystemInfo', 'setMenuButtonInfo']),
+		...mapActions('systemInfo', ['setMobileData']),
 		...mapActions('user', ['setToken', 'setLoginStatus', 'getStoreInfo']),
 
 		// 检查更新

apis/order.js

@@ -38,7 +38,8 @@ export function orderList(params) {
 	return request({
 		url: 'zsxcx/orderXcx.htm',
 		method: 'post',
-		data: params
+		data: params,
+		needMask: true
 	})
 }
 

components/c-nav_bar/index.vue

@@ -36,26 +36,19 @@ export default {
 	computed: {
 		...mapState(['systemInfo']),
 		cNavSty() {
-			const { systemInfo, menuButtonInfo } = this.systemInfo
-			const space = menuButtonInfo.top - systemInfo.statusBarHeight
-			return `height: ${menuButtonInfo.bottom + space}px;background-color: ${this.bg};color: ${this.color};`
+			const { menuCalcInfo } = this.systemInfo
+			return `height: ${menuCalcInfo.navH}px;background-color: ${this.bg};color: ${this.color};`
 		},
 		backStyle() {
-			const { systemInfo, menuButtonInfo } = this.systemInfo
-			const space = menuButtonInfo.top - systemInfo.statusBarHeight // 上下间距
-			const navH = menuButtonInfo.bottom + space
-			const titleH = navH - systemInfo.statusBarHeight
-			const lrSpace = systemInfo.windowWidth - menuButtonInfo.right // 左右间距
-			return `height: ${titleH}px;left: ${lrSpace}px;`
+			const { systemInfo, menuCalcInfo } = this.systemInfo
+			const titleH = menuCalcInfo.navH - systemInfo.statusBarHeight
+			return `height: ${titleH}px;left: ${menuCalcInfo.lrSpace}px;`
 		},
 		cTitleStyle() {
-			const { systemInfo, menuButtonInfo } = this.systemInfo
-			const space = menuButtonInfo.top - systemInfo.statusBarHeight // 上下间距
-			const navH = menuButtonInfo.bottom + space
-			const titleH = navH - systemInfo.statusBarHeight
-			const lrSpace = systemInfo.windowWidth - menuButtonInfo.right // 左右间距
+			const { systemInfo, menuButtonInfo, menuCalcInfo } = this.systemInfo
+			const titleH = menuCalcInfo.navH - systemInfo.statusBarHeight
 			const v = systemInfo.system.includes('iOS') ? 'center' : 'flex-start'
-			return `height: ${titleH}px;font-size: ${systemInfo.fontSizeSetting}px;padding: 0 ${lrSpace}px;justify-content: ${v};margin-top: ${systemInfo.statusBarHeight}px;`
+			return `height: ${titleH}px;font-size: ${systemInfo.fontSizeSetting}px;padding: 0 ${menuCalcInfo.lrSpace}px;justify-content: ${v};margin-top: ${systemInfo.statusBarHeight}px;`
 		}
 	},
 	methods: {

pages/category/index.vue

@@ -169,11 +169,13 @@ export default {
 	// 	this.getCate()
 	// },
 	onShow() {
+		uni.showLoading()
 		this.getCate()
 		this.getCateGoods()
 		if(this.token) {
 			this.setCount()
 		}
+		uni.hideLoading()
 	},
 	onShareAppMessage() {
 		return {

pages/goods/detail.vue

@@ -130,7 +130,7 @@
 				>
 					<image class="icon mb-1" src="/static/images/common/icon-cart_gray.png" mode="aspectFit" />
 					<text>购物车</text>
-					<view class="cart_count">{{ cart_count <= 99 ? cart_count : '99+' }}</view>
+					<view class="cart_count" v-if="cart_count !== 0">{{ cart_count <= 99 ? cart_count : '99+' }}</view>
 				</navigator>
 				<view class="flex-1 left-item flex flex-column j-center a-center" @click="handleCollect(detail.is_col)">
 					<image v-show="detail.is_col === 10" class="icon mb-1" src="/static/images/common/icon-collect_active.png" mode="aspectFit" />

pages/home/components/goods-module.vue

 <template>
 	<view class="w-100">
-		<view class="font-bold font-36 px-3 py-2">{{title}}</view>
+		<view class="font-bold font-36 px-3 pb-2">{{title}}</view>
 		<view class="list-wrap w-100 flex j-start a-center flex-wrap">
 			<navigator 
 				class="list-item mb-3 ml-3"

pages/home/index.vue

@@ -93,13 +93,8 @@
 			<search-bar bg="#f8f8f8" innerBg="#fff" />
 			
 			<view class="w-100 content-wrap">
-				<block v-if="!cate_data.xplist.length && !cate_data.cxlist.length && !cate_data.bklist.length && !searchList.length">
-					<empty-view
-						iconSrc="/static/images/common/noGoods.png"
-						text="店铺尚未上架商品"
-					/>
-				</block>
-				<block v-else>
+				
+				<block v-if="cate_data.xplist.length || cate_data.cxlist.length || cate_data.bklist.length && !searchList.length">
 					<template v-if="cate_data">
 						<goods-module
 							v-if="cate_data.xplist.length > 0"
@@ -165,6 +160,13 @@
 						</view>
 					</template>
 				</block>
+				
+				<block v-else>
+					<empty-view
+						iconSrc="/static/images/common/noGoods.png"
+						text="店铺尚未上架商品"
+					/>
+				</block>
 	
 			</view>
 		</template>
@@ -218,19 +220,7 @@ export default {
 			isOverdue: state => state.user.isOverdue,
 			token: state => state.user.token,
 			storeInfo: state => state.user.storeInfo
-		}),
-		cH() {
-			const { systemInfo, menuButtonInfo } = this.systemInfo
-			const space = menuButtonInfo.top - systemInfo.statusBarHeight
-			const cH = menuButtonInfo.bottom + space
-			return cH
-		},
-		// scrollH() {
-		// 	const { systemInfo, menuButtonInfo } = this.systemInfo
-		// 	const space = menuButtonInfo.top - systemInfo.statusBarHeight
-		// 	const cH = menuButtonInfo.bottom + space
-		// 	return `height: ${systemInfo.windowHeight - cH}px;`
-		// },
+		})
 	},
 
 	created() {

pages/mine/index.vue

@@ -130,12 +130,7 @@ export default {
 		...mapState({
 			token: state => state.user.token,
 			userInfo: state => state.user.userInfo,
-			// menuButtonInfo: state => state.systemInfo.menuButtonInfo
-		}),
-		// navTitleSty() {
-		// 	const menuButtonInfo = this.menuButtonInfo
-		// 	return `height:${menuButtonInfo.height}px;line-height:${menuButtonInfo.height}px;top:${menuButtonInfo.top}px;`
-		// }
+		})
 	},
 	onShow() { // 获取更新用户信息
 		if(this.token) {

store/modules/systemInfo.js

 const state = {
 	systemInfo: null,
-	menuButtonInfo: null
+	menuButtonInfo: null,
+	menuCalcInfo: null
 }
 
 const mutations = {
-	SETSYSTEMINFO(state, params){
-		state.systemInfo = params
-	},
-	SETMENUBUTTONINFO(state, params) {
-		state.menuButtonInfo = params
+	SETMOBILEDATA(state, params) {
+		state.systemInfo = params.systemInfo
+		state.menuButtonInfo = params.menuButtonInfo
+		state.menuCalcInfo = params.menuCalcInfo
 	}
 }
 
 const actions = {
-	setSystemInfo: ({commit}) => {
-		commit('SETSYSTEMINFO', uni.getSystemInfoSync())
-	},
-	setMenuButtonInfo: ({commit}) => {
-		commit('SETMENUBUTTONINFO', uni.getMenuButtonBoundingClientRect())
+	setMobileData: ({commit}) => {
+		try{
+			const systemInfo = uni.getSystemInfoSync()
+			const menuButtonInfo = uni.getMenuButtonBoundingClientRect()
+			const lrSpace = systemInfo.windowWidth - menuButtonInfo.right
+			const btSpace = menuButtonInfo.top - systemInfo.statusBarHeight
+			const menuCalcInfo = Object.freeze({
+				navH: menuButtonInfo.bottom + btSpace, //导航栏高度
+				lrSpace,// 和胶囊一样的左右间距
+				btSpace, // 和胶囊一样的上下间距
+			})
+			const params = Object.freeze({
+				systemInfo,
+				menuButtonInfo,
+				menuCalcInfo
+			})
+			commit('SETMOBILEDATA', params)
+		}catch(e){
+			console.log(e)
+			//TODO handle the exception
+		}
 	}
 }