dever 4 年之前
父节点
当前提交
0161e0f493
共有 3 个文件被更改,包括 39 次插入6 次删除
  1. 2 2
      pages/index/index.vue
  2. 36 3
      pages/index/list.vue
  3. 1 1
      pages/user/login.vue

+ 2 - 2
pages/index/index.vue

@@ -20,7 +20,7 @@
 			</view>
 			<view class="entrance" v-if="fetch.user.id <= 0">
 				<view class="item" @tap="login">
-					<view class="title">登录</view>
+					<view class="title">快速登录</view>
 				</view>
 			</view>
 			<view class="info">
@@ -69,7 +69,7 @@
 					</view>
 				</view>
 			</view>
-			<view class="member-news">
+			<view class="member-news" v-if="fetch.xuanchuan.length > 0">
 				<view class="header">
 					<view class="title">小记宣传栏</view>
 					<view class="iconfont iconRightbutton" style="display: none;"></view>

+ 36 - 3
pages/index/list.vue

@@ -1,5 +1,4 @@
 <template>
-	<gracePage :customHeader="false">
 	<view class="container" slot="gBody">
 		<view class="main" v-if="fetch.cate.length > 0">
 			<view class="content" :style="height">
@@ -29,7 +28,7 @@
 									<!-- 商品 begin -->
 									<view class="good" v-for="(v1, k1) in fetch.info[v.id]" :key="k1">
 										<image :src="v1.pic_cover" class="image" @tap="location(v1.id_code)"></image>
-										<view class="right">
+										<view class="right" @tap="location(v1.id_code)">
 											<text class="name">{{ v1.name }}</text>
 											<text class="tips">{{ v1.desc }}</text>
 											<view class="price_and_action" v-if="v1.buy == 1">
@@ -47,9 +46,16 @@
 				<!-- goods list end -->
 			</view>
 			<!-- content end -->
+		</view>
+		<view v-if="fetch.cate.length <= 0" class="d-flex w-100 h-100 flex-column just-content-center align-items-center" style="margin-top:200rpx;">
+			<view class="tips d-flex flex-column align-items-center font-size-base text-color-assist">
+				<view>您还没有任何阅览的小记</view>
+				<view>小记可能就在你身边,快去寻找吧~</view>
+			</view>
+			<button type="primary" class="drink-btn" size="default" @tap="home">我的家园</button>
+			<view class="font-size-sm text-color-primary" @tap="qun" style="display: none;">加入官方微信群</view>
 		</view>
 	</view>
-	</gracePage>
 </template>
 
 <script>
@@ -99,6 +105,9 @@ export default {
 				})
 			});
 		},
+		home : function() {
+			this.Dever.location('index/index');
+		},
 		location : function(id) {
 			this.Dever.location('dream/index?id=' + id);
 		},
@@ -160,6 +169,30 @@ page {
 	min-height: 100%;
 }
 /* #endif */
+.order-box {
+	padding: 20rpx;
+	/* #ifdef H5 */
+	margin-bottom: 100rpx;
+	/* #endif */
+}
+
+.drinks-img {
+	width: 260rpx;
+	height: 260rpx;
+}
+
+.tips {
+	margin: 60rpx 0 80rpx;
+	line-height: 48rpx;
+}
+
+.drink-btn {
+	width: 320rpx;
+	border-radius: 50rem !important;
+	margin-bottom: 40rpx;
+	font-size: $font-size-base;
+	line-height: 3.0;
+}
 uni-button {
 	background-color: #ADB838;
 }

+ 1 - 1
pages/user/login.vue

@@ -53,7 +53,7 @@
 			</view>
 			
 			<!-- 其他登录 -->
-			<view class="other_login cuIcon">
+			<view class="other_login cuIcon" style="display: none;">
 				<view class="login_icon">
 					<view class="cuIcon-weixin" @tap="login_weixin"></view>
 				</view>