Merge branch 'xie1108'

pages/peanut/home.vue

@@ -11,28 +11,28 @@
 						<image src="../../static/icon/hehan.png" mode="aspectFit" class="icon_hua_1"></image>
 					</view>	
 							
-				<view class="fiveIcon flexbox" >
+				<view class="fiveIcon flexbox" style="justify-content: space-around;">
 					<div class="item item1" @click="onPageJump('../acupoint/acupoint')">
 						<image src="../../static/icon/five1.png" mode="aspectFit" ></image>
 						<text>经穴检索</text>
 					</div>
-					<div class="item item1">
+					<!-- <div class="item item1">
 						<image src="../../static/icon/five2.png" mode="aspectFit"></image>
 						<text>方药检索</text>
-					</div>
-					<div class="item item1">
+					</div> -->
+					<!-- <div class="item item1">
 						<image src="../../static/icon/five4.png" mode="aspectFit"></image>
 						<text>五运六气</text>
-					</div>
+					</div> -->
 					<div class="item item1" @click="onPageJump('../peanut/searchFor')">
 						<image src="../../static/icon/five3.png" mode="aspectFit"></image>
 						<text>书名检索</text>
 					</div>
 					
-					<div class="item item1">
+					<!-- <div class="item item1">
 						<image src="../../static/icon/five5.png" mode="aspectFit"></image>
 						<text>吴门医述</text>
-					</div>
+					</div> -->
 				</view>
 				<!-- <view class="search_box flexbox" @click="onPageJump('../peanut/searchFor')">
 					<view class="search">

pages/peanut/mine.vue

@@ -123,7 +123,7 @@
 	import $http from '@/config/requestConfig.js';
 	// import appShare, { closeShare } from '@/uni_modules/zhouWei-APPshare/js_sdk/appShare';
 	import {
-		mapState
+		mapState,mapMutations
 	} from 'vuex';
 	export default {
 		data() {
@@ -161,6 +161,7 @@
 		},
 		//方法
 		methods: {
+			...mapMutations(['setUserInfo']),
 			// 获得操作系统
 			getOS(){
 				let oprateOs = ''				
@@ -279,6 +280,7 @@
 			// 退出登录
 			signOut() {
 				this.signShow = false
+				this.setUserInfo({'token': null})
 				uni.reLaunch({
 					url: '../user/login'
 				});