Merge branch 'dev' of https://gitlab.jntmedia.cn/wangjian/FuLiMini into dev

pages/home/home.vue

 <template>
-	<view>
 	<view class="layout">
 		<view class="title">懒人企业福利社</view>
 		<view class="header">
 			<view class="header-top">
-					<text class="header-name">你好，{{name}}</text>
+				<text v-if="isLogin" class="header-name">你好，{{ name }}</text>
+				<text v-else class="header-login" @click="goLogin()">请登录</text>
 				<view class="integral-detail">积分明细 ></view>
 			</view>
 			<view class="header-center">
-					<view class="header-integral">{{integralCount}}</view>
+				<view class="header-integral">{{ integralCount }}</view>
 				<view class="header-integral-tip">当前积分</view>
 			</view>
 		</view>
 		<view class="list">
-				<view class="item" v-for="(item, index) in brandList" :key='index'>
+			<view class="item" v-for="(item, index) in brandList" :key="index">
 				<image class="icon"></image>
 				<view class="item-right">
 					<text class="item-title">叮咚买菜</text>
@@ -21,44 +21,64 @@
 				</view>
 			</view>
 		</view>
-			<uni-load-more v-if="brandList.length>0" :status="loadingType"></uni-load-more>
-		</view>
+		<uni-load-more v-if="brandList.length > 0" :status="loadingType"></uni-load-more>
 	</view>
 </template>
 
 <script>
-	export default {
+export default {
 	data() {
 		return {
 			name: '',
-				integralCount: '',
+			integralCount: '0',
 			loadingType: 'more',
 			brandList: [],
 			page: 1,
-				pageSize: 20
+			pageSize: 20,
+			isLogin: false
 		};
 	},
 	created() {
-			this.getData()
+		this.getData();
+	},
+	onShow() {
+		this.getUserInfo()
 	},
 	methods: {
 		goLogin() {
-				this.$router.push('Login')
+			this.$router.push('Login');
 		},
-			getData() {
-				this.$net.get('/goods/brand', {page: this.page, pageSize: this.pageSize})
+		getUserInfo() {
+			if(this.$net.tokenGet().length > 0) {
+				this.isLogin = true
+				this.$net.get('/staff/detail', {})
 					.then(res => {
-					if(res.list.length > 0) {
-						this.brandList.concat(res.list)
-					}
-					this.loadingType = res.list.length < this.pageSize ? 'more' : 'noMore'
+						this.name = res.accountName
+						this.integralCount = res.allIntegral
 					})
 					.catch(err => {
 						console.log(err)
 					})
+			} else {
+				// 未登录
+				this.isLogin = false
+			}
+		},
+		getData() {
+			this.$net
+				.get('/goods/brand', { page: this.page, pageSize: this.pageSize })
+				.then(res => {
+					if (res.list.length > 0) {
+						this.brandList.concat(res.list);
 					}
+					this.loadingType = res.list.length < this.pageSize ? 'more' : 'noMore';
+				})
+				.catch(err => {
+					console.log(err);
+				});
 		}
 	}
+};
 </script>
 
 <style lang="scss">
@@ -90,14 +110,19 @@
 			margin-left: 30rpx;
 			.header-name {
 				font-size: 24rpx;
-				color: #FFFFFF;
+				color: #ffffff;
+			}
+			.header-login {
+				font-size: 24rpx;
+				color: #ffffff;
+				text-decoration: underline;
 			}
 			.integral-detail {
 				background-image: url(../../static/integral-detail-bg.png);
 				width: 174rpx;
 				height: 58rpx;
 				font-size: 26rpx;
-				color: #FFFFFF;
+				color: #ffffff;
 				line-height: 58rpx;
 				text-align: center;
 			}
@@ -109,18 +134,18 @@
 			.header-integral {
 				font-size: 82rpx;
 				font-weight: bolder;
-				color: #FFFFFF;
+				color: #ffffff;
 				margin-top: 15rpx;
 			}
 			.header-integral-tip {
 				font-size: 24rpx;
-				color: #FFFFFF;
+				color: #ffffff;
 			}
 		}
 		.list {
 			display: flex;
 			flex-direction: row;
-			background: #FFEEEE;
+			background: #ffeeee;
 			border-radius: 30rpx 30rpx 0rpx 0rpx;
 			padding-top: 25rpx;
 			.item {

unpackage/dist/dev/mp-weixin/pages/home/home.js

@@ -180,33 +180,53 @@ Object.defineProperty(exports, "__esModule", { value: true });exports.default =
 //
 //
 //
-//
 var _default =
 {
   data: function data() {
     return {
       name: '',
-      integralCount: '',
+      integralCount: '0',
       loadingType: 'more',
       brandList: [],
       page: 1,
-      pageSize: 20 };
+      pageSize: 20,
+      isLogin: false };
 
   },
   created: function created() {
     this.getData();
   },
+  onShow: function onShow() {
+    this.getUserInfo();
+  },
   methods: {
     goLogin: function goLogin() {
       this.$router.push('Login');
     },
-    getData: function getData() {var _this = this;
-      this.$net.get('/goods/brand', { page: this.page, pageSize: this.pageSize }).
+    getUserInfo: function getUserInfo() {var _this = this;
+      if (this.$net.tokenGet().length > 0) {
+        this.isLogin = true;
+        this.$net.get('/staff/detail', {}).
+        then(function (res) {
+          _this.name = res.accountName;
+          _this.integralCount = res.allIntegral;
+        }).
+        catch(function (err) {
+          console.log(err);
+        });
+      } else {
+        // 未登录
+        this.isLogin = false;
+      }
+    },
+    getData: function getData() {var _this2 = this;
+      this.$net.
+      get('/goods/brand', { page: this.page, pageSize: this.pageSize }).
       then(function (res) {
         if (res.list.length > 0) {
-          _this.brandList.concat(res.list);
+          _this2.brandList.concat(res.list);
         }
-        _this.loadingType = res.list.length < _this.pageSize ? 'more' : 'noMore';
+        _this2.loadingType = res.list.length < _this2.pageSize ? 'more' : 'noMore';
       }).
       catch(function (err) {
         console.log(err);