Merge branch 'master' of http://150.158.33.144:3000/lalalashen/MeetMateApp

pages/w3/X_bank.scss

@@ -44,6 +44,18 @@ page {
 			}
 
 	}
+	.empty{
+		display: flex;flex-direction: column;justify-content: normal;align-items: center;
+		width:690rpx;
+		height: 560rpx;
+		.bg {
+			margin-top: 100rpx;
+			width:434rpx;
+			height: 234rpx;
+			background: url('http://c.yujianmate.com/images/v1/w3/empty.png');
+			background-size: 434rpx 234rpx;
+		}
+	}
 	.mingxiList {
 		display: flex;flex-direction: row;justify-content: space-between;align-items: center;
 		position: relative;

pages/w3/X_bank.vue

@@ -28,7 +28,10 @@
 						mode="heightFix" />
 				</view>
 			</view>
-
+			<view  class="empty" v-if="nodata">
+				<view class="bg"></view>
+				<text style="margin-top: 0rpx;font-size: 24rpx;color: #999999;">暂无数据</text>
+			</view>
 			<view class="item" v-for="(item,index) in list">
 				<view class="left">
 					<view class="name">{{item.name}}</view>

pages/w3/box.scss

@@ -65,6 +65,19 @@ page {
 		color: #FFFFFF;
 	}
 }
+
+.empty{
+		display: flex;flex-direction: column;justify-content: normal;align-items: center;
+		width:690rpx;
+		height: 560rpx;
+		.bg {
+			margin-top: 100rpx;
+			width:434rpx;
+			height: 234rpx;
+			background: url('http://c.yujianmate.com/images/v1/w3/empty.png');
+			background-size: 434rpx 234rpx;
+		}
+	}
 .list_item {
 	width:690rpx;height:268rpx;display: flex;flex-direction: column;justify-content: flex-start;align-items: center;
 	background: url('http://c.yujianmate.com/images/v1/w3bg_box2.png');

pages/w3/box.vue

@@ -54,7 +54,10 @@
 				</view>
 			</view>
 		</view>
-
+		<view v-if="nodata" class="empty">
+			<view class="bg"></view>
+			<text style="margin-top: 0rpx;font-size: 24rpx;color: #999999;">暂无数据</text>
+		</view>
 		<view class="list_item" v-for="(item,index) in list" :class="tab2 > 1?'state12':''">
 			<view class="item2">
 				<view class="left">
@@ -119,6 +122,7 @@
 				tab: 1,
 				tab2: 1,
 				list: [],
+				nodata:true,
 
 			}
 		},
@@ -248,7 +252,8 @@
 					success: (res) => {
 						console.log("----", res.data.list);
 						if (res.data.success == "yes") {
-							that.list = res.data.list;
+							that.list = res.data.list || [];
+							that.nodata = !(that.list.length > 0)
 						}
 					},
 					complete: (com) => {

pages/w3/invite.scss

@@ -26,9 +26,18 @@ page {
 	padding:50rpx;font-size: 52rpx;color:#6E6A6A;padding-top: 80rpx;
 }
 .myinfo {
-	width: 690rpx;display:flex;flex-direction: column;margin:30rpx 30rpx 60rpx;justify-content: center;
+	width: 690rpx;display:flex;flex-direction: column;margin:0rpx 30rpx 60rpx;justify-content: center;
 	.imgList {
-		display: flex;flex-direction: row;justify-content: space-around;align-items: center;
+		width: 100%;
+		height: 249rpx;
+		display: flex;justify-content: space-around;
+		position: relative;
+		.imgItem{
+			position: absolute;
+			bottom: -60rpx;
+			display: flex;flex-direction: row;justify-content: space-around;align-items: center;
+			z-index: 1;
+		}
 	}
 	
 	.numlist {

pages/w3/invite.vue

@@ -10,10 +10,11 @@
 			<view class="myinfo">
 				<view class="line"></view>
 
-				<view style="margin-top: 20rpx;" class="imgList">
-
-					<image style="height: 160rpx;" src="http://c.yujianmate.com/images/v1/w3/invite_txt.png" mode="heightFix" />
-					<image style="height: 256.69rpx;" src="http://c.yujianmate.com/images/v1/w3/goldenCoin.png" mode="heightFix" />
+				<view class="imgList">
+					<view class="imgItem">
+						<image style="height: 160rpx;" src="http://c.yujianmate.com/images/v1/w3/invite_txt.png" mode="heightFix" />
+						<image style="height: 256.69rpx;" src="http://c.yujianmate.com/images/v1/w3/goldenCoin.png" mode="heightFix" />
+					</view>
 				</view>
 
 				<view style="margin-top: 24rpx;" class="numlist">