Merge branch 'devlop' of http://git.qniao.cn/dengxiongfei/paper-shopkeeper-app into devlop

components/not-logged/not-logged.vue

@@ -42,8 +42,8 @@
 		margin-top: 40%;
 	}
 	.view-image{
-		width: 100rpx;
-		height: 100rpx;
+		width: 750rpx;
+		height: 456rpx;
 	}
 	.login-btn{
 		width: 90%;

pages.json

@@ -330,8 +330,7 @@
 				"enablePullDownRefresh": false
 			}
 		}
-
-	],
+    ],
 	"globalStyle": {
 		"navigationBarTextStyle": "black",
 		"navigationBarTitleText": "uni-app",

pages/trade/index.vue

@@ -2,8 +2,8 @@
   <view class="trade-index">
     <uni-nav-bar :fixed="true" color="#ffffff" background-color="#ffffff" :status-bar="true">
       <view class="left-title">
-        <view v-if="mainKey === '0'" class="text-view"><text class="title">交易大厅</text></view>
-        <view v-if="mainKey === '1'">
+        <view v-if="!hasLogin" class="text-view"><text class="title">交易大厅</text></view>
+        <view v-if="hasLogin">
           <view class="bar-contant">
             <view class="check-control title-left36" :class="current === '0' ? 'check-title' : 'oncheck-title'" @click="controlChange('0')">
               <text>报价</text>
@@ -24,8 +24,8 @@
 				</view>
 			</view>
 		</view> -->
-    <view class="" v-if="mainKey === '0'"><not-logged @loginChange="loginChange()"></not-logged></view>
-    <view class="" v-if="mainKey === '1'">
+    <view class="" v-if="!hasLogin"><not-logged @loginChange="loginChange()"></not-logged></view>
+    <view class="" v-if="hasLogin">
       <view class="content">
         <view v-if="current === '0'">
           <quotationList :refresh="refresh"></quotationList>
@@ -43,12 +43,13 @@ import notLogged from '@/components/not-logged/not-logged.vue'
 import scrollList from '@/components/scroll-list/scroll-list.vue'
 import quotationList from './quotationList.vue'
 import orderList from './orderList.vue'
+import { back, go2, uploadFile } from '@/utils/hook.js'
 export default {
   components: { notLogged, scrollList, quotationList, orderList },
   data() {
     return {
       key: '',
-      mainKey: '1',
+      mainKey: '0',
       current: '0',
       items: ['报价', '订单'],
       refresh: false
@@ -57,9 +58,14 @@ export default {
   onShow() {
     this.refresh = !this.refresh
   },
+  computed: {
+      hasLogin() {
+        return this.$store.state.qnToken != ''
+      }
+    },
   methods: {
     loginChange() {
-      this.mainKey === '0' ? '1' : '0'
+      go2('login')
     },
     // 标题选项卡点击事件
     controlChange(value) {