合并代码

jiuyi2/manifest.json

@@ -2,8 +2,8 @@
     "name" : "九亿",
     "appid" : "__UNI__08B31BC",
     "description" : "",
-    "versionName" : "1.0.5",
+    "versionName" : "1.0.6",
-    "versionCode" : 1005,
+    "versionCode" : 1006,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {

jiuyi2/pages/mine/homepage.vue

@@ -22,8 +22,6 @@
 	import api from '@/api/index.js'
 	// 工具库
 	import util from '@/common/js/util';
-	// api
-	import api from '@/api/index.js'
 	// 代理
 	const {
 		proxy

jiuyi2/pages/mine/mine.vue

@@ -19,6 +19,8 @@ import {
 } from 'vuex'
 // 顶部状态栏
 import statusBar from '@/components/header/statusBar'
+// 未登录状态
+import noLogin from '@/components/login/noLogin'
 
 // 产品列表
 import productList from '@/components/shop/productList/productList';
@@ -64,7 +66,19 @@ function toCustomer() {
 </script>
 
 <template>
-	<view class="app">
+	<view class="page" v-if="!userinfo.id">
+		<statusBar />
+		<view class="head rows plr30">
+			<view class="side"></view>
+			<view class="f1"></view>
+			<view class="side">
+				<uni-icons type="gear" size="40rpx" color="#333" @click="link('/pages/mine/setting/setting')" />
+			</view>
+		</view>
+
+		<noLogin class="f1" />
+	</view>
+	<view class="app" v-else>
 		<view class="apex" :class="{ 'active': showHeader }">
 			<statusBar />
 			<view class="head rows">