Merge branch 'dev_1.0.0' of https://e.coding.net/g-cphe0354/cashier_front/cashier_admin_app into dwb

pages/index/index.vue

@@ -2,7 +2,12 @@
 <template>
 	<JeepayBackground :bgColorStyle="{}">
 		<!-- 导航条 -->
-		<JeepayCustomNavbar title="首页" textColor="#fff" bgDefaultColor="#318AFE" />
+		<up-navbar title="首页" bg-color="#318AFE" titleStyle="color:#fff;font-size:16px;" @leftClick="toSetting">
+			<template #left>
+				<up-icon name="/static/indexImg/icon-menu.svg" color="#fff" :size="16" ></up-icon>
+			</template>
+		</up-navbar>
+		<!-- <JeepayCustomNavbar title="首页" textColor="#fff" bgDefaultColor="#318AFE"  /> -->
 		<view class="income">
 			<view>总收入</view>
 			<view>￥{{totalRevenuedata}}</view>
@@ -54,7 +59,9 @@
 	let totalRevenue= (d)=>{
 		totalRevenuedata.value=d
 	}
-	
+	function toSetting(){
+		go.to('PAGES_SHOP_SETUP')
+	}
 	// 导航列表
 	const navList = [
 		// {
@@ -143,16 +150,16 @@
 		// 	icon: '/static/indexImg/icon-staff.svg',
 		// 	pageUrl: 'PAGES_USER'
 		// },
-		{
-			title: '订阅通知',
-			icon: '/static/indexImg/icon-notification.svg',
-			pageUrl: 'PAGES_NOTIFICATION_INDEX',
-		},
-		{
-			title: '设置中心',
-			icon: '/static/indexImg/icon-cashier.svg',
-			pageUrl: 'PAGES_SHOP_SETUP',
-		},
+		// {
+		// 	title: '订阅通知',
+		// 	icon: '/static/indexImg/icon-notification.svg',
+		// 	pageUrl: 'PAGES_NOTIFICATION_INDEX',
+		// },
+		// {
+		// 	title: '设置中心',
+		// 	icon: '/static/indexImg/icon-cashier.svg',
+		// 	pageUrl: 'PAGES_SHOP_SETUP',
+		// },
 		// {
 		// 	title: '优惠券',
 		// 	icon: '/static/coupon/icon_coupon.svg',
@@ -332,6 +339,12 @@
 
 <style lang="scss" scoped>
 	.income {
+		/* #ifdef MP-WEIXIN */
+		padding-top: calc(84rpx + 44px);
+		/* #endif */
+		/* #ifdef H5 */
+		padding-top: calc(84rpx);
+		/* #endif */
 		>view {
 			text-align: center;
 			color: #FFFFFF;