Merge pull request 'cmx' (#30) from cmx into master

Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/30

pages/login/login.vue

@@ -2,7 +2,7 @@
 	<!-- login页面 -->
 	<view>
 		<view class="login">
-			<image class="images" :src="url"></image>
+			<!-- <image class="images" :src="url"></image> -->
 			<view class="backes"></view>
 			<view class="title_top">德铭阳光在线-商家端</view>
 			<view class="content">
@@ -158,8 +158,20 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+.login:before{
+	background: url(../../static/bg.png) no-repeat;
+	background-size: cover;
+	width: 750rpx;
+	height: 100vh;
+	content: "";
+	position: absolute;
+	top: 0;
+	left: 0;
+	z-index: -1;/*-1 可以当背景*/
+	-webkit-filter: blur(3px);
+	filter: blur(3px);
+}
 .login {
-	// background: url(../../static/pageA/loginbackground.png) no-repeat!important;
 	.images {
 		position: fixed;
 		width: 100%;

pages/user/index.vue

@@ -1,7 +1,7 @@
 <template>
     <view class="user">
         <view class="head" @click="toOthersPage('info')">
-            <view class="info">
+            <view class="info" :key="num">
                 <image :src="info.member_avatar"></image>
                 <view class="name">
                     <text>{{info.member_nickname==null?"新用户":info.member_nickname}}</text>
@@ -23,6 +23,10 @@
 			<text>骑手投诉</text>
 			<image src="/static/image/user/1.png"></image>
 		</view>
+		<view class="nav" @click="loginout()">
+			<text>退出登录</text>
+			<image src="/static/image/user/1.png"></image>
+		</view>
 		<u-toast ref="uToast" />
     </view>
 </template>
@@ -31,7 +35,8 @@ export default {
 	name:"user",
 	data() {
 		return {
-			info:{}
+			info:{},
+			num:0
 		}
 	},
 	onLoad() {
@@ -40,6 +45,17 @@ export default {
 		this.getmyinfo()
 	},
 	methods: {
+		// 退出登陆
+		loginout(){
+			uni.clearStorage();
+			this.$refs.uToast.show({
+				title: "退出登陆成功！",
+				type: 'success'
+			});
+			uni.reLaunch({
+				url:"../login/login"
+			})
+		},
 		// 获取个人信息
 		getmyinfo(){
 			let that = this;
@@ -52,6 +68,7 @@ export default {
 					});
 				} else {
 					this.info = res.data.memberInfo
+					this.num++
 				}
 			});
 		},