Merge branch 'master' of http://8.134.10.79:3000/Leadfyy.co/uniapp-shikongwang

5 years ago · 80b1116914
18 changed files with 309 additions and 88 deletions
--- a/App.vue
+++ b/App.vue
@ -4,6 +4,7 @@
 			wxlogin: () => {}
 		},
 		onLaunch: function() {
+			this.disableConsole();
 			this.getUserInfo();
 		},
 		onShow: function() {
@ -25,16 +26,19 @@
 				this.globalData.wxlogin();
 			},
 			wxlogin(){
-				uni.login({
-					complete: result => {
-						if(result.errMsg == 'login:ok'){
-							let code = result.code;
-							this.$http(this.API.API_WXLOGIN, { code }).then(res => {
-								console.log("获得用户信息", res);
-								uni.setStorageSync('userinfo', res.data);
-							})
+				return new Promise((resolve, rejecj) => {
+					uni.login({
+						complete: result => {
+							if(result.errMsg == 'login:ok'){
+								let code = result.code;
+								this.$http(this.API.API_WXLOGIN, { code }).then(res => {
+									console.log("获得用户信息", res);
+									uni.setStorageSync('userinfo', res.data);
+									resolve(res.data);
+								})
+							}
 						}
-					}
+					})
 				})
 			},
 			// 小程序版本更新检查
@ -74,6 +78,12 @@
 						}
 					});
 				});
+			},
+			// 判断正式服屏蔽console输出
+			disableConsole(){
+				if(this.API.DEV == 'prod'){
+					console.log = () => {};
+				}
 			}
 		}
 	}
@ -85,6 +95,7 @@
 	@import './colorui/icon.css';
 	@import "@/colorui/animation.css";
 	@import '@/common/styles/common.css';
+	@import "@/common/styles/iconfont.css";
 	/*每个页面公共css */
 	//底部按钮
 	.btn-bottom {
--- a/common/api.js
+++ b/common/api.js
@ -37,10 +37,15 @@ export const API_COLLECT_DEAL = '/api/collect/deal'; // 商品收藏
 export const API_PRPAID =  '/api/order/deal'

 /* 个人中心相关 */
+export const API_USER_CENTER = '/api/user/center'; // 个人中心
 export const API_COLLECT_LIST = '/api/collect/list'; // 我的收藏列表
+export const API_CONTACT = '/api/contact'; // 客服落地页信息
+export const API_ARTICLE_QA = '/api/article/qa'; // 常见问题列表

 /* 用户相关 */
 export const API_WXLOGIN = '/api/wxlogin'; // 用户登录
 export const API_WECHAT_SETPHONE = '/api/wechat/setPhone'; // 用户授权手机号提交
 export const API_WECHAT_SETPROFILE = '/api/wechat/setProfile'; // 用户授权微信信息提交（返回用户信息）

+/* 商户相关 */
+export const API_CONFIRM_CODE = '/api/confirm/code'; // 扫码核销
--- a/common/http.interceptor.js
+++ b/common/http.interceptor.js
@ -23,22 +23,11 @@ const install = (Vue, vm) => {
 	Vue.prototype.$u.http.interceptor.response = res => {
 		if(res.code == 0) {
 			return res;
-		} else if(res.code == 201) {
-			console.log("其他状态：", res.code)
-			return false;
-		} else if (res.code == 9999) {
-			uni.navigateTo({
-				url: '/pages/login/index?type=userinfo'
-			})
-			return false;
-		} else if (res.code == 9998) {
-			uni.navigateTo({
-				url: '/pages/login/index?type=phone'
-			})
-			return false;
 		} else {
+			vm.$msg(res.msg);
 			return false;
 		}
+		// res.code == 9998 手机号 res.code == 9999 用户信息
 	}
 }

--- a/common/styles/iconfont.css
+++ b/common/styles/iconfont.css
@ -0,0 +1,74 @@
+@font-face {
+  font-family: "lf-iconfont"; /* Project id 2631569 */
+  src: url('//at.alicdn.com/t/font_2631569_rgieivs47oc.woff2?t=1624527625328') format('woff2'),
+       url('//at.alicdn.com/t/font_2631569_rgieivs47oc.woff?t=1624527625328') format('woff'),
+       url('//at.alicdn.com/t/font_2631569_rgieivs47oc.ttf?t=1624527625328') format('truetype');
+}
+
+.lf-iconfont {
+  font-family: "lf-iconfont" !important;
+  font-size: 16px;
+  font-style: normal;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+}
+
+.lf-icon-jia1:before {
+  content: "\e6d4";
+}
+
+.lf-icon-xiangyou-copy:before {
+  content: "\e623";
+}
+
+.lf-icon-dianhua:before {
+  content: "\e64c";
+}
+
+.lf-icon-shuaxin:before {
+  content: "\e60e";
+}
+
+.lf-icon-shibai:before {
+  content: "\e645";
+}
+
+.lf-icon-jianshao:before {
+  content: "\e663";
+}
+
+.lf-icon-cuo:before {
+  content: "\e63f";
+}
+
+.lf-icon-icon-test:before {
+  content: "\e61e";
+}
+
+.lf-icon-dizhi:before {
+  content: "\e612";
+}
+
+.lf-icon-fanhui-xianxing:before {
+  content: "\e641";
+}
+
+.lf-icon-weigouxuan:before {
+  content: "\e615";
+}
+
+.lf-icon-gouxuan-xianxing:before {
+  content: "\e616";
+}
+
+.lf-icon-jian1:before {
+  content: "\e646";
+}
+
+.lf-icon-chenggong:before {
+  content: "\e60a";
+}
+
+.lf-icon-fenxiangzhuanfa:before {
+  content: "\e74f";
+}
--- a/components/my-nocontent/my-nocontent.vue
+++ b/components/my-nocontent/my-nocontent.vue
@ -2,7 +2,7 @@
 	<!-- 暂无内容-->
 	<view class="padding-xl margin-top-xl">
 		<view class="flex justify-center">
-			<image src="@/static/images/mescroll-empty.png" mode="widthFix" class="no-content-img"></image>
+			<image src="@/static/images/empty.png" mode="widthFix" class="no-content-img"></image>
 		</view>
 		<text class="block text-center margin-top">暂无数据</text>
 	</view>
@ -21,7 +21,7 @@

 <style lang="scss" scoped>
 	.no-content-img{
-		width: 300rpx;
-		height: 300rpx;
+		width: 440rpx;
+		height: 380rpx;
 	}
 </style>
--- a/pages.json
+++ b/pages.json
@ -102,6 +102,12 @@
 			"style": {
 				"navigationBarTitleText": "时空网"
 			}
+		},
+		{
+			"path": "pages/FQA/index",
+			"style": {
+				"navigationBarTitleText": "常见问题"
+			}
 		}
 	],
 	"globalStyle": {
@ -111,7 +117,7 @@
 		"backgroundColor": "#fff"
 	},
 	"tabBar": {
-	    "color": "#909399",
+	    "color": "#333333",
 	    "selectedColor": "#FE9903",
 	    "borderStyle": "black",
 	    "backgroundColor": "#ffffff",
--- a/pages/FQA/index.vue
+++ b/pages/FQA/index.vue
@ -0,0 +1,30 @@
+<template>
+	<view>
+		<rich-text :nodes="content" v-if="content"></rich-text>
+		<my-nocontent v-else></my-nocontent>
+	</view>
+</template>
+
+<script>
+	export default {
+		data(){
+			return {
+				content: ''
+			}
+		},
+		onLoad(){
+			this.getData();
+		},
+		methods: {
+			getData(){
+				this.$http(this.API.API_ARTICLE_QA).then(res => {
+					this.content = res.data.content;
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped="scoped">
+	
+</style>
--- a/pages/center/index.vue
+++ b/pages/center/index.vue
@ -1,80 +1,90 @@
 <template>
 	<view>
 		<view class="lf-flex head">
-			<image class="user-img"></image>
+			<image class="user-img" :src="info.avatar" @click="lookImg(info.avatar)" v-if="info.avatar"></image>
+			<image class="user-img" src="../../static/logo.png" v-else></image>
 			<view class="user-info">
 				<view class="lf-font-40 lf-font-bold" style="width: 500rpx;">
-					<text>时空网的忠实网友</text>
-					<text class="user-label">商户</text>
-					<text class="user-label">管理员</text>
+					<text>{{ info.nickname }}</text>
+					<text class="user-label" v-for="(item, index) in info.tags" :key="index">{{ item }}</text>
 				</view>
 				<view class="lf-m-t-20 lf-font-28">
-					<text>ID 78873</text>
-					<text class="lf-m-l-30">135****7547</text>
+					<text>ID {{ info.id }}</text>
+					<text class="lf-m-l-30">{{ hidePhone(info.tel) }}</text>
 				</view>
 			</view>
 		</view>
 		<view class="list">
 			<view class="lf-row-between list-item" hover-class="lf-opacity" @click="$url('/pages/collect/index')">
-				<view>
-					<u-icon name="heart" size="50" class="lf-text-vertical"></u-icon>
-					<text class="lf-text-vertical lf-m-l-16 lf-font-32">我的收藏</text>
+				<view class="lf-row-center">
+					<image class="icon-img" src="../../static/center/collect.png"></image>
+					<text class="lf-text-vertical lf-m-l-20 lf-font-32">我的收藏</text>
 				</view>
 				<view>
-					<u-icon name="arrow-right" size="40" color="#777777"></u-icon>
+					<text class="lf-iconfont lf-icon-xiangyou-copy lf-color-gray lf-font-40"></text>
 				</view>
 			</view>
 			<view class="lf-row-between list-item" hover-class="lf-opacity" @click="$url('/pages/contactService/index')">
-				<view>
-					<u-icon name="heart" size="50" class="lf-text-vertical"></u-icon>
+				<view class="lf-row-center">
+					<image class="icon-img" src="../../static/center/service.png"></image>
 					<text class="lf-text-vertical lf-m-l-16 lf-font-32">联系客服</text>
 				</view>
 				<view>
-					<u-icon name="arrow-right" size="40" color="#777777"></u-icon>
+					<text class="lf-iconfont lf-icon-xiangyou-copy lf-color-gray lf-font-40"></text>
 				</view>
 			</view>
 			<view class="lf-row-between list-item" hover-class="lf-opacity">
-				<view>
-					<u-icon name="heart" size="50" class="lf-text-vertical"></u-icon>
+				<view class="lf-row-center">
+					<image class="icon-img" src="../../static/center/suggestion.png"></image>
 					<text class="lf-text-vertical lf-m-l-16 lf-font-32">意见反馈</text>
 				</view>
 				<view>
-					<u-icon name="arrow-right" size="40" color="#777777"></u-icon>
+					<text class="lf-iconfont lf-icon-xiangyou-copy lf-color-gray lf-font-40"></text>
 				</view>
 				<button class="feedback-btn" open-type="feedback"></button>
 			</view>
-			<view class="lf-row-between list-item" hover-class="lf-opacity">
-				<view>
-					<u-icon name="heart" size="50" class="lf-text-vertical"></u-icon>
+			<view class="lf-row-between list-item" hover-class="lf-opacity" @click="$url('/pages/FQA/index')">
+				<view class="lf-row-center">
+					<image class="icon-img" src="../../static/center/problem.png"></image>
 					<text class="lf-text-vertical lf-m-l-16 lf-font-32">常见问题</text>
 				</view>
 				<view>
-					<u-icon name="arrow-right" size="40" color="#777777"></u-icon>
+					<text class="lf-iconfont lf-icon-xiangyou-copy lf-color-gray lf-font-40"></text>
 				</view>
 			</view>
+			<!-- TODO 退出登录逻辑 -->
 			<view class="lf-row-between list-item" hover-class="lf-opacity">
-				<view>
-					<u-icon name="heart" size="50" class="lf-text-vertical"></u-icon>
+				<view class="lf-row-center">
+					<image class="icon-img" src="../../static/center/loginout.png"></image>
 					<text class="lf-text-vertical lf-m-l-16 lf-font-32">退出登录</text>
 				</view>
 				<view>
-					<u-icon name="arrow-right" size="40" color="#777777"></u-icon>
+					<text class="lf-iconfont lf-icon-xiangyou-copy lf-color-gray lf-font-40"></text>
 				</view>
 			</view>
 		</view>
 		<!-- 商家工具 -->
-		<view class="shop-list">
+		<view class="lf-m-b-20 shop-list" v-if="isRight(info.store)">
 			<view class="lf-row-between lf-m-b-20">
 				<view class="lf-font-36 lf-font-bold">商家工具</view>
-				<view class="lf-font-28" style="color: #555555;">李大叔家的店</view>
+				<view class="lf-font-28" style="color: #555555;">{{ info.store.name }}</view>
 			</view>
 			<view class="lf-row-between list-item" hover-class="lf-opacity">
+				<view class="lf-row-center">
+					<image class="icon-img" src="../../static/center/order.png"></image>
+					<text class="lf-text-vertical lf-m-l-16 lf-font-32">商家订单</text>
+				</view>
 				<view>
-					<u-icon name="heart" size="50" class="lf-text-vertical"></u-icon>
+					<text class="lf-iconfont lf-icon-xiangyou-copy lf-color-gray lf-font-40"></text>
+				</view>
+			</view>
+			<view class="lf-row-between list-item" hover-class="lf-opacity" @click="chargeOff">
+				<view class="lf-row-center">
+					<image class="icon-img" src="../../static/center/scan.png"></image>
 					<text class="lf-text-vertical lf-m-l-16 lf-font-32">卡券核销</text>
 				</view>
 				<view>
-					<u-icon name="arrow-right" size="40" color="#777777"></u-icon>
+					<text class="lf-iconfont lf-icon-xiangyou-copy lf-color-gray lf-font-40"></text>
 				</view>
 			</view>
 		</view>
@ -85,14 +95,70 @@
 	export default {
 		data() {
 			return {
-				
+				info: {
+					avatar: '',
+					nickname: '',
+					id: '',
+					tel: '',
+					tags: []
+				}
+			}
+		},
+		computed: {
+			hidePhone(){
+				return function(tel){
+					if(tel.length == 11){
+						var reg = /^(\d{3})\d{4}(\d{4})$/;
+						var new_phone = tel.replace(reg, "$1****$2");
+						return new_phone;
+					}else{
+						return tel;
+					}
+				}
+			},
+			isRight(){
+				return function(val){
+					return this.$shared.isRight(val);
+				}
 			}
 		},
 		onLoad() {
-
+			this.verifyUserInfo();
+			this.getData();
 		},
 		methods: {
-
+			verifyUserInfo(){
+				let userInfo = uni.getStorageSync('userinfo') || {};
+				if(!userInfo.id || !userInfo.nickname || !userInfo.avatar){
+					this.$url('/pages/login/index?type=userinfo');
+				}
+			},
+			getData(){
+				this.$http(this.API.API_USER_CENTER).then(res => {
+					console.log("res" , res);
+					this.info = res.data;
+				})
+			},
+			// 预览图片
+			lookImg(img){
+				uni.previewImage({
+					urls: [img]
+				})
+			},
+			// 卡券核销
+			chargeOff(){
+				uni.scanCode({
+					complete: result => {
+						console.log("resuly", result)
+						if(result.errMsg == 'scanCode:ok'){
+							let content = result.result; // 核销码
+							this.$http(this.API.API_CONFIRM_CODE, {confirm_code: content}).then(res => {
+								this.$msg(res.msg);
+							});
+						}
+					}
+				})
+			}
 		}
 	}
 </script>
@ -115,7 +181,7 @@
 			width: 150rpx;
 			height: 150rpx;
 			border-radius: 50%;
-			background-color: #EEEEEE;
+			// background-color: #EEEEEE;
 			margin-right: 20rpx;
 		}
 		.user-info{
@ -145,6 +211,10 @@
 		height: 110rpx;
 		box-sizing: border-box;
 		position: relative;
+		.icon-img{
+			width: 42rpx;
+			height: 42rpx;
+		}
 		.feedback-btn{
 			position: absolute;
 			width: 100%;
--- a/pages/collect/index.vue
+++ b/pages/collect/index.vue
@ -44,7 +44,6 @@
 		},
 		methods: {
 			getCollectList(){
-				// TODO 接口传参
 				this.$http(this.API.API_COLLECT_LIST).then(res => {
 					this.isPage = res.data.has_more_page;
 					let list = res.data.items.map(item => {
--- a/pages/contactService/index.vue
+++ b/pages/contactService/index.vue
@ -4,25 +4,27 @@
 			<view class="lf-color-gray">在线客服</view>
 			<button class="btn" open-type="contact">在线联系</button>
 		</view>
+		
 		<view class="lf-row-between item">
 			<view class="lf-color-gray">服务时间</view>
-			<view>10:00～20:00</view>
+			<view>{{ info.service_period }}</view>
 		</view>
 		<view class="lf-row-between item" @click="makePhoneCall">
 			<view class="lf-color-gray">客服电话</view>
-			<view>13278683790</view>
+			<view>{{ info.phone }}</view>
 		</view>
 		<view class="lf-row-between item">
 			<view class="lf-color-gray">联系地址</view>
-			<view>南宁市青秀区汇东国际F座6楼</view>
+			<view>{{ info.address }}</view>
 		</view>
 		<view class="lf-row-between item">
 			<view class="lf-color-gray">客服微信</view>
 			<view>
-				<text>whhu8798</text>
+				<text>{{ info.wechat }}</text>
 				<text class="lf-m-l-20 lf-color-primary" @click="copy">复制</text>
 			</view>
 		</view>
+		
 		<view class="lf-row-between item">
 			<view class="lf-color-gray">当前版本</view>
 			<view>{{ version }}</view>
@ -34,23 +36,31 @@
 	export default {
 		data(){
 			return {
-				version: ''
+				version: '',
+				info: {}
 			}
 		},
 		onLoad(){
 			this.version = this.API.VERSION;
+			this.getInfo();
 		},
 		methods: {
+			// 获取信息
+			getInfo(){
+				this.$http(this.API.API_CONTACT).then(res => {
+					this.info = res.data;
+				})
+			},
 			// 拨打电话
 			makePhoneCall(){
 				uni.makePhoneCall({
-					phoneNumber: ''
+					phoneNumber: this.info.phone
 				})
 			},
 			// 复制
 			copy(){
 				uni.setClipboardData({
-					data: 'a'
+					data: this.info.wechat
 				})
 			}
 		}
--- a/pages/goodsDetail/index.vue
+++ b/pages/goodsDetail/index.vue
@ -2,7 +2,7 @@
 	<view>
 		<block v-if="isRight(goods_detail)">
 			<!-- 商品图片轮播 -->
-			<swiper :current="current" :indicator-dots="true" :circular="true" class="swiper-box">
+			<swiper :current="current" :indicator-dots="true" :circular="true" class="swiper-box" indicator-active-color="#FE9903">
 				<swiper-item v-for="item in goods_detail.banners" :key="item.id">
 					<image :src="item.cover" style="width: 100%; height: 100%;"></image>
 					<!-- <image :src="item.cover" mode="aspectFit"></image> -->
@ -17,7 +17,7 @@
 						<view>¥{{ goods_detail.specs[0].original_price }}</view>
 						<view v-if="goods_detail.specs[0].cost">{{ goods_detail.specs[0].cost }}</view>
 					</view>
-					<view>
+					<view class="lf-font-24">
 						<view class="lf-color-gray">{{ goods_detail.specs[0].sold_stock_text }}</view>
 						<view class="lf-color-primary">{{ goods_detail.specs[0].stock_text }}</view>
 					</view>
@ -35,12 +35,15 @@
 						<view class="lf-font-32 lf-m-l-20" style="max-width: 512rpx;">{{ goods_detail.store.name }}</view>
 					</view>
 					<view @click="makePhoneCall(goods_detail.store.tel)">
-						<u-icon name="phone" color="#3A62FF" size="46"></u-icon>
+						<text class="lf-iconfont lf-icon-dianhua lf-font-40" style="color: #3A62FF;"></text>
 					</view>
 				</view>
 				<view class="lf-flex lf-m-t-20" @click="openMap">
-					<u-icon name="map-fill" size="60"></u-icon>
-					<view class="lf-m-l-20 lf-font-32">{{ goods_detail.store.address }}</view>
+					<!-- <u-icon name="map-fill" size="60"></u-icon> -->
+					<view style="width: 60rpx; height: 60rpx;" class="lf-row-center">
+						<text class="lf-iconfont lf-icon-dizhi lf-font-40" style="color: #000000;"></text>
+					</view>
+					<view class="lf-m-l-20 lf-font-28">{{ goods_detail.store.address }}</view>
 				</view>
 			</view>
 			<!-- 商品详情 -->
@ -54,20 +57,27 @@
 			<view class="lf-row-between fixed-bottom">
 				<view class="lf-flex lf-p-t-10 lf-p-b-10">
 					<view class="lf-flex-column lf-row-center icon-item" @click="$url('/pages/index/index', {type: 'switch'})">
-						<u-icon name="home" size="50"></u-icon>
+						<!-- <u-icon name="home" size="50"></u-icon> -->
+						<image class="icon-img" src="../../static/tabbar/home.png"></image>
 						<view class="lf-m-t-1">首页</view>
 					</view>
 					<view class="lf-flex-column lf-row-center icon-item" @click="$url('/pages/contactService/index')">
-						<u-icon name="server-fill" size="50"></u-icon>
+						<!-- <u-icon name="server-fill" size="50"></u-icon> -->
+						<image class="icon-img" src="../../static/center/service.png"></image>
 						<view class="lf-m-t-1">客服</view>
 					</view>
 					<view class="lf-flex-column lf-row-center icon-item" @click="switchCollect">
-						<u-icon name="heart-fill" size="50" color="#FF0000" v-if="is_collect"></u-icon>
-						<u-icon name="heart" size="50" v-else></u-icon>
+						<!-- <u-icon name="heart-fill" size="50" color="#FF0000" v-if="is_collect"></u-icon>
+						<u-icon name="heart" size="50" v-else></u-icon> -->
+						<image class="icon-img" src="../../static/center/collect-active.png" v-if="is_collect"></image>
+						<image class="icon-img" src="../../static/center/collect.png" v-else></image>
 						<view class="lf-m-t-1">{{ is_collect ? '已收藏' : '收藏' }}</view>
 					</view>
 					<button class="lf-flex-column lf-row-center icon-item" open-type="share">
-						<u-icon name="share" size="50"></u-icon>
+						<!-- <u-icon name="share" size="50"></u-icon> -->
+						<view class="icon-img lf-row-center">
+							<text class="lf-iconfont lf-icon-fenxiangzhuanfa lf-font-32"></text>
+						</view>
 						<view class="lf-m-t-1">分享</view>
 					</button>
 				</view>
@ -108,6 +118,11 @@
 			},
 			// 切换商品收藏
 			switchCollect(){
+				let userInfo = uni.getStorageSync('userinfo') || {};
+				if(!userInfo.id || !userInfo.nickname || !userInfo.avatar){
+					this.$url('/pages/login/index?type=userinfo');
+					return;
+				}
 				this.$http(this.API.API_COLLECT_DEAL, {goods_id: this.goods_id}).then(res => {
 					console.log("res", res);
 					this.is_collect = Boolean(res.data.user.is_collect);
@ -174,6 +189,7 @@
 			color: #FF0000;
 			font-size: 40rpx;
 			margin-right: 22rpx;
+			font-weight: bold;
 		}
 		.price>view:nth-of-type(2){
 			text-decoration: line-through;
@ -271,6 +287,10 @@
 			&:first-child{
 				padding-left: 0;
 			}
+			.icon-img{
+				height: 44rpx;
+				width: 50rpx;
+			}
 		}
 		.btn{
 			margin: 0;
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@ -6,7 +6,7 @@
 		<view class="com" v-for="(tab, tabIndex) in tab_list" v-if="tabIndex == current" :key="tab.id">
 			<view class="lf-row-between list" v-for="(item, index) in tab.list" :key="item.id" @click="toDetail(item)">
 				<view class="left">
-					<image :src="item.cover" mode=""></image>
+					<image :src="item.cover" mode="aspectFit"></image>
 				</view>
 				<view class="right">
 					<view class="lf-line-2 title">{{ item.name }}</view>
@ -155,9 +155,12 @@
 			this.getGoodsList();
 			uni.stopPullDownRefresh()
 		},
-		// onShareAppMessage(){
-			
-		// }
+		onShareAppMessage(){
+			return {
+				title: '分享小程序',
+				path: '/pages/route/index'
+			}
+		}
 	}
 </script>

@ -255,7 +258,7 @@
 						width: 160rpx;
 						height: 60rpx;
 						background: #FE9903;
-						border-radius: 15px;
+						border-radius: 50px;
 						font-size: 24rpx;
 						color: #FFFFFF;
 						margin: 0rpx 20rpx 0rpx 20rpx;
--- a/pages/login/index.vue
+++ b/pages/login/index.vue
@ -1,26 +1,29 @@
 <template>
 	<view>
 		<view class="lf-row-center lf-flex-column box">
-			<image class="img"></image>
-			<view class="lf-m-t-10 lf-font-32" v-if="type == 'phone'">游客jdsfbuskdnko</view>
+			<!-- <image class="img" :src="userInfo.avatar" v-if="userInfo.avatar"></image> -->
+			<!-- <image class="img" src="../../static/logo.png" v-else></image> -->
+			<image class="img" src="../../static/logo.png" ></image>
+			<view class="lf-m-t-30 lf-font-32" v-if="type == 'phone'">{{ userInfo.nickname || '游客用户' }}</view>
 			<block v-if="type == 'userinfo'">
 				<button class="btn" @click="getUserProfile">
 					<u-icon name="weixin-fill" color="#ffffff" size="60" class="lf-text-vertical"></u-icon>
-					<text class="lf-m-l-20">绑定微信</text>
+					<text class="lf-m-l-20">微信快捷登录</text>
 				</button>
-				<view class="lf-m-t-40 lf-font-28" @click="$toBack()">暂不绑定继续操作</view>
+				<!-- <view class="lf-m-t-40 lf-font-28" @click="$toBack()">暂不绑定继续操作</view> -->
+				<view class="mask" v-if="!checked" @click="$msg('您未同意协议条款')"></view>
 			</block>
 			<block v-else-if="type == 'phone'">
 				<button class="btn" open-type="getPhoneNumber" @getphonenumber="getPhoneNumber">
 					<u-icon name="weixin-fill" color="#ffffff" size="60" class="lf-text-vertical"></u-icon>
-					<text class="lf-m-l-20">微信快捷登录</text>
+					<text class="lf-m-l-20">绑定手机号</text>
 				</button>
 				<!-- <view class="lf-m-t-40 lf-font-28" @click="$url('/pages/login/accountLogin')">使用手机号登录</view> -->
 				<view class="mask" v-if="!checked" @click="$msg('您未同意协议条款')"></view>
 			</block>
 		</view>
 		<!-- 服务条款 -->
-		<view class="fixed-bottom" v-if="type == 'phone'">
+		<view class="fixed-bottom">
 			<checkbox-group @change="checkboxChange" style="display: inline-block;">
 				<checkbox class="lf-text-vertical" :checked="checked"></checkbox>
 			</checkbox-group>
@ -47,7 +50,9 @@
 		},
 		onLoad(options){
 			this.type = options.type || this.type;
-			getApp().globalData.wxlogin(); // 重新登录
+			getApp().globalData.wxlogin().then(res => {
+				this.userInfo = res;
+			});
 		},
 		methods: {
 			// 进入查看协议
@ -125,7 +130,6 @@
 			width: 180rpx;
 			height: 180rpx;
 			border-radius: 50%;
-			background-color: #EEEEEE;
 		}
 		.btn{
 			background-color: #09BB07;
--- a/static/center/collect-active.png
+++ b/static/center/collect-active.png
--- a/static/center/order.png
+++ b/static/center/order.png
--- a/static/center/scan.png
+++ b/static/center/scan.png
--- a/static/images/empty.png
+++ b/static/images/empty.png
--- a/static/logo.png
+++ b/static/logo.png