lilei пре 4 година
родитељ
комит
0a45c80e32
5 измењених фајлова са 24 додато и 16 уклоњено
  1. 3 1
      pages/goods/index.vue
  2. 1 1
      pages/index/index.vue
  3. 18 12
      pages/login/login.vue
  4. 1 1
      pages/store/store.vue
  5. 1 1
      pages/userCenter/index.vue

+ 3 - 1
pages/goods/index.vue

@@ -13,7 +13,7 @@
 				</view>
 			</view>
 			<view v-if="goodsList.length==0">
-				<u-empty text="暂无商品" mode="list"></u-empty>
+				<u-empty icon-size="60" :text="noDataText" mode="list"></u-empty>
 			</view>
 		</view>
 		<!-- 购物车 -->
@@ -32,6 +32,7 @@
 		},
 		data() {
 			return {
+				noDataText: '正则加载...',
 				imageTopList:[],
 				goodsList:[], // 商品
 				goodsType:[], // 商品分类
@@ -49,6 +50,7 @@
 					})
 				}else{
 					this.goodsList = []
+					this.noDataText = '暂无商品'
 				}
 			})
 		},

+ 1 - 1
pages/index/index.vue

@@ -55,7 +55,7 @@
 			 		</view>
 			 	</view>
 				<view v-if="stationDataList.length==0">
-					<u-empty text="暂无数据" mode="list"></u-empty>
+					<u-empty icon-size="60" text="暂无数据" mode="list"></u-empty>
 				</view>
 			 </view>
 		</view>

+ 18 - 12
pages/login/login.vue

@@ -1,19 +1,22 @@
 <template>
 	<view class="content">
 		<view>
-			<view class="logo">
-				<u-image src="/static/logo.png" width="140" height="140" ></u-image>
+			<view>
+				<view class="logo">
+					<u-image src="/static/logo.png" width="140" height="140" ></u-image>
+				</view>
+				<view class="login-btns">
+					<u-button shape="circle" :custom-style="wxButton" class="login-btn" type="success" :hair-line="false" open-type="getPhoneNumber" @getphonenumber="getPhoneNumber">
+						微信登陆
+					</u-button>
+					<u-gap height="30"></u-gap>
+					<u-button shape="circle" :custom-style="phoneButton" class="login-btn" @click="phoneLogin" type="primary">
+						手机号码登录
+					</u-button>
+				</view>
 			</view>
-			<view class="login-btns">
-				<u-button shape="circle" :custom-style="wxButton" class="login-btn" type="success" :hair-line="false" open-type="getPhoneNumber" @getphonenumber="getPhoneNumber">
-					微信登陆
-				</u-button>
-				<u-gap height="30"></u-gap>
-				<u-button shape="circle" :custom-style="phoneButton" class="login-btn" @click="phoneLogin" type="primary">
-					手机号码登录
-				</u-button>
-				<u-gap height="60"></u-gap>
-				<u-button shape="circle" plain lass="login-btn" @click="cansel" type="info">
+			<view class="nologin">
+				<u-button shape="circle" size="mini" plain lass="login-btn" @click="cansel" type="info">
 					暂不登录
 				</u-button>
 			</view>
@@ -154,6 +157,9 @@
 				flex-grow: 1;
 				height: 80vh;
 				padding: 20% 10%;
+				display: flex;
+				flex-direction: column;
+				justify-content: space-between;
 			}
 			&:last-child{
 				font-size: 24upx;

+ 1 - 1
pages/store/store.vue

@@ -48,7 +48,7 @@
 						</view>
 					</view>
 				</view>
-				<u-empty v-if="deviceData.length==0" text="暂无设备" mode="list" margin-top="120"></u-empty>
+				<u-empty v-if="deviceData.length==0" icon-size="60" text="暂无设备" mode="list" margin-top="120"></u-empty>
 			</view>
 		</view>
 	</view>

+ 1 - 1
pages/userCenter/index.vue

@@ -8,7 +8,7 @@
 			</view>
 			<view class="user-info">
 				<text v-if="hasLogin">{{user.mobile||'--'}}</text>
-				<u-button v-else="!hasLogin" plain size="mini" shape="circle" @click="toLoginPage">登录</u-button>
+				<u-button v-else="!hasLogin" plain size="mini" shape="circle" @click="toLoginPage">立即登录</u-button>
 			</view>
 			<view v-if="hasLogin">
 				<u-icon name="arrow-right" color="#fff"></u-icon>