shish 4 лет назад
Родитель
Сommit
8a110ad006

+ 6 - 4
ghsApp/src/admin/home/workbench.vue

@@ -1,5 +1,6 @@
 <template>
-	<div class="app-main app-content">
+	<view class="app-main app-content">
+		<view v-if="!$util.isEmpty(loginInfo)">
 		<!-- 今日概况 -->
 		<div class="user-wrap">
 			<div class="user-top">
@@ -90,10 +91,11 @@
 
 		<!--没有开店时的界面-->
     	<none-hd :show="no_shop_show_model" :title="MODEL_TITLE" :btnText="MODEL_BTN_TEXT" @bthClick="toFreeApply_HOME" :authShow="EXPER_AUTH_SHOW" @comfirm="experienceFun"></none-hd>
-
+		</view>
+		<view v-else>
 		<loginModel :show="show_login_model" @comfirm="loginFun"></loginModel>
-
-	</div>
+		</view>
+	</view>
 </template>
 
 <script>

+ 5 - 7
ghsApp/src/components/app-wrapper-empty.vue

@@ -3,11 +3,10 @@
 		<div class="app-empty-center" :style="{'text-align: center;': !!isEmpty}">
 			<slot v-if="!isEmpty" name="empty_body" />
 			<slot v-if="isEmpty && !isLoading" name="empty_content">
-				<!-- :style="`width:${pictureWidth};`" -->
-				<div class="app-empty__img" :style="{width: pictureWidth}">
-					<img :src="src" mode="widthFix" />
+				<div class="app-empty-img" :style="{width: pictureWidth}">
+					<image :src="src" mode="widthFix" ></image>
 				</div>
-				<div class="app-empty__title">
+				<div class="app-empty-title">
 					<template v-if="isTitle">
 						<span :class="[type==='noData'?'empty_noData':'']">{{ title }}</span>
 						<span>{{ content }}</span>
@@ -113,19 +112,18 @@ export default {
 			margin-bottom: 80upx;
 		}
 
-		& .app-empty__img {
+		& .app-empty-img {
 			width: 100%;
 			text-align: center;
 			margin: 116upx auto 20upx;
 			& image {
 				width: 180upx;
-				max-width: 100%;
 				height: auto;
 				margin:0 auto;
 			}
 		}
 
-		& .app-empty__title {
+		& .app-empty-title {
 			display: flex;
 			flex-direction: column;
 			align-items: center;

+ 5 - 5
ghsApp/src/components/login-model.vue

@@ -2,14 +2,15 @@
   <view class="model" v-if="show">
     <view class="experFrame">
       <view>
-        <view style="text-align:center;margin-bottom:60upx;">
+        <view style="text-align:center;margin-bottom:20upx;">
           <image :src="`${constant.imgUrl}/logo3.png`" class="logo" mode="widthFix"></image> 
         </view>
+        <view style="color:#666666;text-align:center;margin-bottom:30upx;font-size:35upx;">销花宝</view>
         <view>
-          <input v-model="mobile" class="experInput" placeholder="手机号" type="number" />
+          <input @focus="mobile=''" v-model="mobile" class="experInput" placeholder="手机号" type="number" />
         </view>
         <view>
-          <input v-model="password" class="experInput" placeholder="密码" type="text" />
+          <input @focus="password=''" v-model="password" class="experInput" placeholder="密码" type="password" />
         </view>
         <button class="admin-button-com small blue buttonText" @click="loginClick">登陆</button>
       </view>
@@ -49,7 +50,6 @@ export default {
   left: 0;
   width: 100vw;
   height: 100vh;
-  background: rgba(0, 0, 0, 0.6);
   color: #fff;
   overflow: hidden;
   text-align: center;
@@ -81,7 +81,7 @@ export default {
     font-size: 30upx;
   }
   &>.experFrame{
-      margin-top: 260upx;
+      margin-top: 160upx;
       height: 50upx;
       .experInput{
         height: 70upx;