修改

pages/bill/bill.vue

@@ -169,11 +169,6 @@
 			this.getElInfo()
 		},
 		methods: {
-			queryBalance(){
-				this.$api.yeepay.queryBalance({merchant:this.vuex_merchantNo}).then(res=>{
-					console.log(res);
-				})
-			},
 			async getElInfo() {
 				let rectInfo = await this.$u.getRect('.card');
 				this.height = this.$u.sys().windowHeight - rectInfo.top + 'px'

pages/card/card.vue

@@ -1,34 +1,36 @@
 <template>
 	<view>
-		<button class="card btnCss" style="font-size: 30rpx;color: #5c5c5c;border-radius: 0;border: none;"
-			v-for="(item,index) in menuList" :key="index" @click="jump(item.path)">
-			<view style="display: flex;">
-				<view class="center">
-					<image style="width: 36rpx;height: 36rpx;" :src="item.icon"></image>
+		<view class="" v-for="(item,index) in menuList" :key="index" @click="jump(item.path)">
+			<button v-if="index!=4" class="card btnCss" style="font-size: 30rpx;color: #5c5c5c;border-radius: 0;border: none;">
+				<view style="display: flex;">
+					<view class="center">
+						<image v-if="index!=1 && index!=5" style="width:36rpx" :src="item.icon" mode="widthFix"></image>
+						<image v-else style="width:38rpx" :src="item.icon" mode="widthFix"></image>
+					</view>
+					<view class="center">
+						<text class="padding-left-10">{{item.name}}</text>
+					</view>
 				</view>
-				<view class="center">
-					<text class="padding-left-10">{{item.name}}</text>
+				<view class="">
+					<text class="cuIcon-right"></text>
 				</view>
-			</view>
-			<view class="">
-				<text class="cuIcon-right"></text>
-			</view>
-		</button>
-
-		<button open-type="contact" class="card btnCss"
-			style="font-size: 30rpx;color: #5c5c5c;border-radius: 0;border: none;">
-			<view style="display: flex;">
-				<view class="center">
-					<image style="width: 36rpx;height: 36rpx;" src="/static/icon/kefu.png"></image>
+			</button>
+			
+			<button v-else open-type="contact" class="card btnCss"
+				style="font-size: 30rpx;color: #5c5c5c;border-radius: 0;border: none;">
+				<view style="display: flex;">
+					<view class="center">
+						<image style="width: 36rpx;height: 36rpx;" src="/static/icon/kefu1.png"></image>
+					</view>
+					<view class="center">
+						<text class="padding-left-10">在线咨询</text>
+					</view>
 				</view>
-				<view class="center">
-					<text class="padding-left-10">在线咨询</text>
+				<view class="">
+					<text class="cuIcon-right"></text>
 				</view>
-			</view>
-			<view class="">
-				<text class="cuIcon-right"></text>
-			</view>
-		</button>
+			</button>
+		</view>
 		
 		<u-modal @confirm="$jump('/pages/member/member')" :show-cancel-button="true"  confirm-color="#ff9447" confirm-text="立即开启" cancel-text="暂不开启" v-model="isOpenMemberShow" content="请先创建会员中心"></u-modal>
 	</view>
@@ -39,25 +41,35 @@
 		data() {
 			return {
 				menuList: [{
-						icon: '/static/icon/shangjia.png',
+						icon: '/static/icon/info.png',
 						name: '商家资料',
 						path: '/pages/shop-info/shop-info?edit=true&phone=' + this.$cache.get('phone')
 					},
 					{
-						icon: '/static/icon/bank.png',
+						icon: '/static/icon/yinhangka.png',
 						name: '银行卡',
 						path: '/pages/userBank/userBank'
 					},
 					{
-						icon: '/static/icon/xiazai.png',
+						icon: '/static/icon/xiazai1.png',
 						name: '物料下载',
 						path: '/pages/material-download/material-download'
 					},
 					{
-						icon: '/static/icon/wendang.png',
+						icon: '/static/icon/yijian.png',
 						name: '意见反馈',
 						path: '/pages/card/feedback'
 					},
+					{
+						icon: '/static/icon/kefu1.png',
+						name: '在线咨询',
+						path: '/pages/card/feedback'
+					},
+					{
+						icon: '/static/icon/logout1.png',
+						name: '退出登录',
+						path: 'logout'
+					},
 				],
 				isOpenMemberShow:false
 			}

pages/index/index.vue

@@ -5,44 +5,34 @@
 			<view class="flex justify-between">
 				<view class="title ">
 					<view class="icon">
-						<image src="@/static/icon/dianpu.png" mode=""></image>
+						<image src="@/static/icon/dianpu6.png" mode=""></image>
 					</view>
 					<view class="center margin-left-10">
 						<view @click="showShop">
 							<text class="name">{{shopLable || '去完善商户资料'}}</text>
-							<u-icon v-if="shopShow" name="arrow-up-fill" style="margin-left: 10rpx;"></u-icon>
-							<u-icon v-else name="arrow-down-fill" style="margin-left: 10rpx;"></u-icon>
+							<u-icon size="25" v-if="shopShow" name="arrow-up-fill" style="margin-left: 10rpx;"></u-icon>
+							<u-icon size="25" v-else name="arrow-down-fill" style="margin-left: 10rpx;"></u-icon>
 						</view>
 					</view>
 				</view>
-
-				<view class="btn">
-					<view class="image">
-						<image src="@/static/icon/logout.png" mode=""></image>
-					</view>
-					<view @click="logout" class="center padding-left-10">
-						<text>退出</text>
-						<text class="cuIcon-right"></text>
-					</view>
-				</view>
 			</view>
 
 
-			<view class="cu-list grid col-3 no-border top-menu">
+			<view class="cu-list grid col-3 no-border top-menu" style="padding: 20rpx 10rpx;">
 				<view class="cu-item" @click="operate(index)" v-for="(item,index) in menuList" :key="index">
 					<view class="grid-icon margin-top-20">
-						<image style="width: 66rpx;height: 66rpx;" :src="item.icon" />
+						<image style="width: 62rpx;height: 62rpx;" :src="item.icon" />
 					</view>
-					<text style="color: #fff;font-size: 26rpx;">{{item.name}}</text>
+					<text style="color: #fff;font-size: 26rpx;font-weight: 500;">{{item.name}}</text>
 				</view>
 			</view>
 
 			<view class="menu-list">
-				<view @click="jump('/pages/my-bills/my-bills')" class="menu menu1">
+				<view @click="jump('/pages/my-bills/my-bills')" class="menu">
 					<view class="menu-top">
-						<image src="@/static/icon/bill.png"></image>
-						<view class="center padding-left-20">
-							<text class="text-lg">我的账单</text>
+						<image src="@/static/index/bills.png"></image>
+						<view class="center padding-left-10">
+							<text class="text-lg text-bold" style="color: #303030;">我的账单</text>
 						</view>
 					</view>
 					<view class="menu-bottom">
@@ -56,47 +46,47 @@
 						</view>
 					</view>
 				</view>
-				<view class="menu menu2" @click="jump('/pages/member/member')">
+				<view class="menu" @click="jump('/pages/member/member')">
 					<view class="menu-top">
-						<image src="@/static/icon/center.png"></image>
-						<view class="center padding-left-20">
-							<text class="text-lg">会员中心</text>
+						<image src="@/static/index/huiyuan.png"></image>
+						<view class="center padding-left-10">
+							<text class="text-lg text-bold" style="color: #303030;">会员中心</text>
 						</view>
 					</view>
 					<view class="menu-bottom" style="color: #FFFFFF;">
 						<view class="">
 							<text>新增会员</text>
-							<text>{{statistic.newMember || 0}}</text>
+							<text style="color: #3D72EA;">{{statistic.newMember || 0}}</text>
 						</view>
 						<view class="">
 							<text>会员总数</text>
-							<text>{{statistic.allMembers || 0}}</text>
+							<text style="color: #3D72EA;">{{statistic.allMembers || 0}}</text>
 						</view>
 					</view>
 				</view>
 			</view>
 
 			<view class="market">
-				<text class="title">营销管理</text>
-				<view class="cu-list grid col-2 no-border margin-top-30">
+				<text class="title">商家工具</text>
+				<view class="cu-list grid col-4 no-border margin-top-30">
 					<view class="cu-item" @click="jump(item.path)" v-for="(item,index) in marketList" :key="index">
 						<view class="grid-icon">
-							<image style="width: 120rpx;height: 120rpx;" :src="item.icon" />
+							<image style="width: 80rpx;height: 80rpx;" :src="item.icon" />
 						</view>
 						<text style="color: #222222;font-size: 26rpx;margin-top: 20rpx;">{{item.name}}</text>
 						<view class="cu-tag bg-red badge" v-if="item.count>0">{{item.count}}</view>
 					</view>
 				</view>
 			</view>
-
-			<view class="system">
+			
+			<view class="market">
 				<text class="title">数字化系统</text>
-				<view class="cu-list grid col-4 no-border margin-top-30" style="border-radius:20rpx ;">
+				<view class="cu-list grid col-4 no-border margin-top-30">
 					<view class="cu-item" @click="jump(item.path)" v-for="(item,index) in systemList" :key="index">
 						<view class="grid-icon">
-							<image style="height: 56rpx;width: 56rpx;" :src="item.icon" />
+							<image style="width: 80rpx;height: 80rpx;" :src="item.icon" />
 						</view>
-						<text style="color: #222222;font-size: 26rpx;">{{item.name}}</text>
+						<text style="color: #222222;font-size: 26rpx;margin-top: 20rpx;">{{item.name}}</text>
 						<view class="cu-tag bg-red badge" v-if="item.count>0">{{item.count}}</view>
 					</view>
 				</view>
@@ -147,47 +137,50 @@
 					}
 				],
 				marketList: [{
-						icon: '/static/icon/faqi.png',
+						icon: '/static/index/faqi.png',
 						name: '发起活动',
-						background: "background-image:linear-gradient(#FF9549,#FCB07B)",
 						path: '/pages/publish/publish',
 						count: 0
 					},
 					{
-						icon: '/static/icon/qingdan.png',
+						icon: '/static/index/qingdan.png',
 						name: '活动清单',
-						background: "background-image:linear-gradient(#5892F7,#67BBF9)",
 						path: '/pages/activity/activity',
 						count: 0
 					},
+					{
+						icon: '/static/index/mendian-add.png',
+						name: '添加门店',
+						path: '/pages/shop-info/shop-info',
+						count: 0
+					},
 				],
 				systemList: [{
-						icon: '/static/icon/system5.png',
-						name: '添加门店',
-						path: '/pages/shop-info/shop-info?phone=' + this.$cache.get('phone')
+						icon: '/static/index/shangcheng.png',
+						name: '线上商城',
+						path: ''
 					}, {
-						icon: '/static/icon/system1.png',
+						icon: '/static/index/mendian.png',
+						name: '门店管理',
+						path: ''
+					}
+					, {
+						icon: '/static/index/waimai.png',
 						name: '外卖平台',
 						path: ''
 					},
 					{
-						icon: '/static/icon/system2.png',
+						icon: '/static/index/yuyue.png',
 						name: '预约系统',
 						path: ''
 					},
 					{
-						icon: '/static/icon/system3.png',
+						icon: '/static/index/erp.png',
 						name: 'ERP系统',
 						path: ''
 					},
 					{
-						icon: '/static/icon/system4.png',
-						name: '线上商城',
-						path: ''
-					},
-
-					{
-						icon: '/static/icon/add.png',
+						icon: '/static/index/add.png',
 						name: '添加服务',
 						path: ''
 					},
@@ -435,6 +428,9 @@
 		left: 54%;
 		margin-left: 20rpx;
 	}
+	.cu-list.grid.no-border {
+	    padding: 10rpx;
+	}
 
 	.title {
 		display: flex;
@@ -473,20 +469,20 @@
 		padding-top: 20rpx;
 
 		.menu {
-			width: 48.8%;
-			color: #FFFFFF;
+			background-color: #FFFFFF;
+			width: 49%;
 			display: flex;
 			flex-direction: column;
 			align-items: center;
-			border-radius: 14rpx;
-			padding: 30rpx 20rpx;
+			border-radius: 16rpx;
+			padding: 30rpx 15rpx;
 
 			.menu-top {
 				display: flex;
 
 				image {
-					width: 70rpx;
-					height: 70rpx;
+					width: 60rpx;
+					height: 60rpx;
 				}
 			}
 
@@ -505,28 +501,29 @@
 					text:first-child {
 						margin-bottom: 10rpx;
 						font-size: 26rpx;
-						color: #E0E2F6;
+						color: #303030;
+						font-weight: 400;
+					}
+					
+					text:last-child {
+						margin-bottom: 10rpx;
+						font-size: 28rpx;
+						color: #FF8D32;
+						font-weight: 500;
 					}
 				}
 			}
 		}
-
-		.menu1 {
-			background-color: #5C6186;
-		}
-
-		.menu2 {
-			background-color: #E19D5B;
-		}
 	}
 
 	.market {
 		margin-top: 20rpx;
 		border-radius: 20rpx;
 		background-color: #FFFFFF;
-		padding: 30rpx 50rpx 20rpx;
+		padding: 30rpx 30rpx 20rpx;
 
 		.title {
+			font-size: 32rpx;
 			font-weight: 800;
 		}
 	}
@@ -538,6 +535,7 @@
 		padding: 30rpx 50rpx 20rpx;
 
 		.title {
+			font-size: 32rpx;
 			font-weight: 800;
 		}
 	}

pages/login/account-login.vue

@@ -150,6 +150,7 @@
 	}
 
 	.bg {
+		overflow: hidden;
 		z-index: 99;
 		height: 400rpx;
 		width: 400rpx;
@@ -162,6 +163,7 @@
 	}
 
 	.bg1 {
+		overflow: hidden;
 		height: 460rpx;
 		width: 460rpx;
 		position: absolute;

pages/member/member.vue

@@ -2,11 +2,13 @@
 	<view>
 		<u-navbar :custom-back="back" title="会员中心"></u-navbar>
 		<view class="empty-page" v-if="!isOpenMember">
-			<image src="../../static/icon/vip.png" mode=""></image>
-			<text>没有会员中心信息</text>
+			<image src="../../static/icon/huiyuan1.png" mode=""></image>
+			<text style="color: #303030;font-weight: 800;font-size: 32rpx;margin-top: 25rpx;">创建会员中心</text>
+			<text style="color: #888888;font-size: 26rpx;margin-top: 20rpx;">设置积分价值、积分规则</text>
+			<text style="color: #888888;font-size: 26rpx;margin-top: 10rpx;">实时查看会员信息和积分情况</text>
 
-			<view @click="$jump('/pages/member/add')" class="cu-btn btn-bg-color round" style="width: 48%;height: 80rpx;position: fixed;bottom: 20%;">
-				<u-icon name="plus-circle" size="40"></u-icon>
+			<view @click="$jump('/pages/member/add')" class="cu-btn btn-bg-color round" style="width: 48%;height: 80rpx;position: fixed;bottom: 40%;">
+				<u-icon name="plus-circle-fill" size="40"></u-icon>
 				<text class="margin-left-10 text-lg">创建会员中心</text>
 			</view>
 		</view>
@@ -75,16 +77,11 @@
 			<view class="u-popup-content">
 				<text>更改积分规则</text>
 				<u-form>
-					<u-form-item label-width="180"  label="消费1元赠送">
-						<u-input 
-						v-model="sendPointUnit" 
-						border="true" 
-						border-color="#eaeaea"  
-						type="number" 
-						:clearable="false" 
-						placeholder="请输入积分数"
-						/>
-						<view slot="right" style="color: #D18C42;">积分</view>
+					<u-form-item label-width="170"  label="消费1元赠送">
+						<u-input   disabled type="digit" height="50" :border="true" :clearable="false" v-model="sendPointUnit" placeholder="请输入积分数"/>
+						<view slot="right" class="cu-tag btn-bg-color radius">
+							积分
+						</view>
 					</u-form-item>
 				</u-form>
 				<u-button size="medium" shape="circle" :custom-style="customStyle1" @click="update">确定</u-button>
@@ -117,13 +114,15 @@
 				//消费一元赠送的积分值
 				sendPointUnit:'',
 				customStyle1:{
-					backgroundColor:'#D18C42',
+					padding:'40rpx',
+					backgroundColor:'#F39248',
 					color:'#fff',
 					marginBottom:'20rpx',
-					width:'400rpx'
+					width:'350rpx'
 				},
 				customStyle2:{
-					width:'400rpx'
+					padding:'40rpx',
+					width:'350rpx'
 				},
 			}
 		},
@@ -214,18 +213,18 @@
 		background-color: #EE9230;
 		color: #FFFFFF;
 	}
+	
 
 	.empty-page {
-		height: 50vh;
+		height: 600rpx;
 		display: flex;
 		justify-content: center;
 		flex-direction: column;
 		align-items: center;
-		color: #CCCCCC;
 
 		image {
-			width: 120rpx;
-			height: 120rpx;
+			width: 160rpx;
+			height: 160rpx;
 			margin-bottom: 20rpx;
 		}
 	}
@@ -242,7 +241,7 @@
 			font-size: 22rpx;
 			height: 40rpx;
 			line-height: 40rpx;
-			background-color: $color;
+			background-color: #E19D5B;
 			color: #fff;
 			position: absolute;
 			top: 20rpx;

pages/my-bills/bills-detail.vue

@@ -5,8 +5,8 @@
 				<image style="border-radius: 50%;" :src="billDetail.avatar?billDetail.avatar:'/static/icon/avatar.png'" mode="aspectFit"></image>
 				<text class="title">{{billDetail.nickName?billDetail.nickName:'微信用户'}}</text>
 				<view class="data">
-					<view class="text-base" style="padding: 0;">
-						+{{billDetail.cost}}
+					<view class="text-base price plus" style="padding: 0;">
+						{{billDetail.cost}}
 					</view>
 				</view>
 			</view>

pages/my-bills/comps/balance-bills.vue

@@ -141,8 +141,14 @@
 		},
 		created() {
 			this.defaultTime = this.$dateTime.format(new Date(), 'YYYY-mm')
+			this.queryBalance()
 		},
 		methods: {
+			queryBalance(){
+				this.$api.yeepay.queryBalance({merchant:this.vuex_merchantNo}).then(res=>{
+					console.log(res);
+				})
+			},
 			mescrollInit(mescroll) {
 				this.mescroll = mescroll
 			},

pages/shop-info/shop-info.vue

@@ -364,7 +364,7 @@
 
 				title: '',
 				background: {
-					backgroundColor: '#D18C42',
+					backgroundColor: '#FBA33D',
 				},
 				labelWidth: 170,
 				form: {
@@ -753,7 +753,7 @@
 		},
 		onLoad(options) {
 			console.log("123");
-			this.form.personTel = options.phone
+			this.form.personTel = this.$cache.get('phone')
 			this.auditForm.contactMobile=this.form.personTel
 			//监听从chooseLable页面返回的数据
 			uni.$on('labelData', (labelData) => {
@@ -1300,10 +1300,10 @@
 	.card {
 		box-shadow: 0 0 20rpx #bebebe;
 		background-color: #FFFFFF;
-		border-radius: 20rpx;
+		border-radius: 16rpx;
 		position: relative;
 		top: -180rpx;
-		margin: 0 20rpx;
+		margin: 0 15rpx;
 		padding: 30rpx;
 
 		.title {