Merge branch 'master' of http://8.134.10.79:3000/Leadfyy.co/blindDate

pages/my/index.vue

@@ -16,6 +16,25 @@
 					绑定手机号
 				</view> -->
 			</view>
+			<view class="adv" @click="$url('/pages/my/getRedLine')">
+				<view class="lf-row-between">
+					<view>
+						<view class="logo-my">
+							<!-- <text class="lf-iconfont icon-dingzhi" style="font-size: 60rpx;color: white;"></text> -->
+							<image src="../../static/images/read_line.png" mode="aspectFill" style="width: 60rpx;height: 60rpx;"></image>
+						</view>
+					</view>
+					<view class="adv-content">
+						<view class="lf-color-222 lf-font-32 lf-m-b-15">
+							红线数
+						</view>
+						<view class="lf-color-777 lf-font-26">促成您和心仪对象线下见面</view>
+					</view>
+				</view>
+				<view class="lf-color-primary lf-font-32">
+					3条
+				</view>
+			</view>
 			<!-- <view class="lf-row-between" style="height: 98rpx;padding: 0 32rpx;">
 				<view class="lf-row-round lf-flex-column" @click="showRedthread()">
 					<view class="lf-font-32 lf-color-white">0</view>
@@ -51,21 +70,8 @@
 				</view>
 			</view> -->
 		</view>
-		<view class="adv" @click="$url('/pages/my/getRedLine')">
-			<view>
-				<view class="logo-my">
-					<text class="lf-iconfont icon-dingzhi" style="font-size: 60rpx;color: white;"></text>
-				</view>
-			</view>
-			<view class="adv-content">
-				<view class="lf-color-222 lf-font-32 lf-m-b-15">
-					点击获取红线
-				</view>
-				<view class="lf-color-777">促成您和心仪对象线下见面 <u-icon class="lf-m-l-20" name="arrow-right"></u-icon></view>
-			</view>
-		</view>
 		
-		<view class="classify lf-m-t-30">
+		<view class="classify">
 			<view class="card" v-for="(item,index) in list" :key="index" @click="$url(item.path)">
 				<view class="lf-row-center" style="align-content: center;">
 					<!-- <u-icon class="classify-icon" :name="item.icon"></u-icon> -->
@@ -170,7 +176,7 @@
 		content: '';
 		width: 184%; 
 		// height: 440rpx;
-		height: 280rpx;
+		height: 350rpx;
 		position: absolute;
 		left: -312rpx;
 		top: 0;
@@ -269,10 +275,10 @@
 		height: 195rpx;
 		background-color: white;
 		border-radius: 20rpx;
-		margin: 0 auto;
+		margin: -10rpx auto;
 		display: flex;
-		padding: 0 0 0 30rpx;
-		/* justify-content: space-around; */
+		// padding: 0 0 0 30rpx;
+		justify-content: space-around;
 		align-items: center;
 	}
 	
@@ -290,6 +296,7 @@
 		margin: 0 auto;
 		flex-wrap: wrap;
 		padding: 38rpx 30rpx;
+		margin-top: 170rpx;
 	}
 	.card {
 		width: 116rpx;

pages/userList/filter.json

@@ -226,31 +226,6 @@
 				"value": "双鱼座"
 			}]
 		},
-		"household_register": {
-			"name": "户籍",
-			"selected": "",
-			"data": [{
-				"value": "不限"
-			},{
-				"value": "良庆区"
-			},{
-				"value": "江南区"
-			},{
-				"value": "青秀区"
-			},{
-				"value": "兴宁区"
-			},{
-				"value": "西乡塘区"
-			},{
-				"value": "武鸣区"
-			},{
-				"value": "空港经济区"
-			},{
-				"value": "五象新区"
-			},{
-				"value": "其他地区"
-			}]
-		},
 		"place_residence": {
 			"name": "居住地区",
 			"selected": "",

pages/userList/userList.vue

@@ -20,7 +20,7 @@
 						<view v-for="(value, key) in filter[filter_key]" :key="key" v-if="key != 'name'">
 							<block v-if="key == 'search_value'">
 								<view class="filter-title">会员编号搜索</view>
-								<input class="input-search" placeholder="请输入会员编号" :value="value" @blur="inputBlur(key, $event)" />
+								<input class="input-search" :focus="on_focus" placeholder="请输入会员编号" :value="value" @blur="inputBlur(key, $event)" />
 							</block>
 							<block v-else>
 								<view class="filter-title">{{ value.name }}</view>
@@ -64,12 +64,18 @@
 				show_filter: false,
 				filter: this.productionObj(),
 				filter_key: '',
-				name: '最新'
+				name: '最新',
+				on_focus: false
 			}
 		},
 		onLoad(options){
 			console.log(this.filter)
 			this.name = options.name || this.name;
+			if(this.name == '搜索') {
+				this.show_filter = true;
+				this.filter_key = 'search';
+				this.on_focus = true;
+			}
 		},
 		methods: {
 			// 引入数据，并序列化，避免数据引用