Merge branch 'master' of http://47.92.161.104:10080/zkx/jp-xqjy into master

apis/likes.js

@@ -0,0 +1,33 @@
+import request from '../utils/request.js';
+import Qs from 'qs';
+
+export function homePage(data) {
+	return request({
+		method: 'post',
+		data: data,
+		url: '/mobile/likes/homePage'
+	})
+}
+
+export function iLikeList(data) {
+	return request({
+		method: 'post',
+		data: data,
+		url: '/mobile/likes/iLikeList'
+	})
+}
+
+export function likeIList(data) {
+	return request({
+		method: 'post',
+		data: data,
+		url: '/mobile/likes/likeIList'
+	})
+}
+
+export function beLike(id) {
+	return request({
+		method: 'get',
+		url: '/mobile/likes/beLike?id=' + id
+	})
+}

pages/friend/index.vue

@@ -335,19 +335,26 @@
 					sgd[item] = this.list[item]
 					formList.push(sgd);
 				}
+				let refreshList = [];
+				for(var i=0; i<3; i++) {
+					var num=Math.floor(Math.random()*8+0);
+					refreshList.push(formList[num]);
+				}
+				refreshList.push({type: '1'});
+				refreshList.push({memberId: this.memberId});
 				
-				var num1=Math.floor(Math.random()*8+0);
-				var num2=Math.floor(Math.random()*8+0);
-				var num3=Math.floor(Math.random()*8+0);
-				console.log(formList[num1]);
-				console.log(formList[num2]);
-				console.log(formList[num3]);
+				var obj = {};
+				for(var m in refreshList) {
+					for(var n in refreshList[m]) {
+						obj[n] = refreshList[m][n];
+					}
+				}
 				
 				uni.showLoading({
 					title: "加载中",
 					mask: true,
 				})
-				friendApi.findFriendsList({memberId: this.memberId},formList[num1],formList[num2],formList[num3]).then((res) => {
+				friendApi.findFriendsList(obj).then((res) => {
 					this.friendList = res.data.data;
 					uni.hideLoading();
 				}).catch(error => {

pagesA/pages/login/change.vue

@@ -19,7 +19,7 @@
 					<view class="jpLogin-link">
 						<view class="jpLogin-link-l">
 						</view>
-						<span @click="getCode">获取验证码</span>
+						<span @click="getCode">{{codeTips}}</span>
 					</view>
 					<view class="jpLogin-input" style="margin-top:40px;">
 						<u-icon custom-prefix="custom-icon" name="cellphone-fill" class="jpLogin-icon"></u-icon>
@@ -61,6 +61,7 @@
 				
 				isSendMsgIng: false,
 				sendMsgSecond: 60 * 2,
+				codeTips: '',
 			}
 		},
 		methods: {
@@ -156,7 +157,7 @@
 					newPhone: this.form.newPhone
 				}).then((response) => {				
 					uni.redirectTo({
-						url: 'pagesA/pages/login/index'
+						url: '/pagesA/pages/login/index'
 					});
 				}).catch(error => {
 					uni.showToast({

pagesA/pages/login/index.vue

@@ -33,7 +33,7 @@
 						<p>没有账号，</p>
 						<span @click="getRegister">去注册</span>
 					</view>
-					<span @click="getCode">获取验证码</span>
+					<span @click="getCode">{{codeTips}}</span>
 				</view>
 			</view>
 			<view style="margin-top: 60px;">
@@ -78,6 +78,7 @@
 				},
 				isSendMsgIng: false,
 				sendMsgSecond: 60 * 2,
+				codeTips: '',
 			}
 		},
 		methods: {
@@ -86,12 +87,12 @@
 			},
 			getRegister() {
 				uni.navigateTo({
-					url: 'pagesA/pages/login/register'
+					url: '/pagesA/pages/login/register'
 				});
 			},
 			getAgreement() {
 				uni.navigateTo({
-					url: 'pagesA/pages/login/agreement'
+					url: '/pagesA/pages/login/agreement'
 				});
 			},
 			codeChange(text) {

pagesA/pages/login/register.vue

@@ -14,14 +14,16 @@
 						<u-form-item>
 							<u-input v-model="form.realName" placeholder="请填写您的真实姓名" />
 						</u-form-item>
-						<u-icon custom-prefix="custom-icon" name="information-line" class="jpLogin-warn"></u-icon>
+						<u-toast ref="uToast" />
+						<u-icon custom-prefix="custom-icon" name="information-line" class="jpLogin-warn" @click="iconClick1"></u-icon>
 					</view>
 					<view class="jpLogin-input">
 						<u-icon custom-prefix="custom-icon" name="profile-fill" class="jpLogin-icon"></u-icon>
 						<u-form-item>
 							<u-input v-model="form.idCard" placeholder="请填写18位身份证号" />
 						</u-form-item>
-						<u-icon custom-prefix="custom-icon" name="information-line" class="jpLogin-warn"></u-icon>
+						<u-toast ref="uToast" />
+						<u-icon custom-prefix="custom-icon" name="information-line" class="jpLogin-warn" @click="iconClick2"></u-icon>
 					</view>
 					<view class="jpLogin-input">
 						<u-icon custom-prefix="custom-icon" name="building-fill" class="jpLogin-icon"></u-icon>
@@ -47,7 +49,7 @@
 						<p>已有账号，</p>
 						<span @click="getLogin">登录</span>
 					</view>
-					<span  @click="getCode">获取验证码</span>
+					<span  @click="getCode">{{codeTips}}</span>
 				</view>
 			</view>
 			<view style="margin-top: 60px;">
@@ -97,6 +99,7 @@
 				,
 				isSendMsgIng: false,
 				sendMsgSecond: 60 * 2,
+				codeTips: '',
 			}
 		},
 		onShow() {
@@ -111,22 +114,36 @@
 			
 		},
 		methods: {
+			iconClick1() {
+				this.$refs.uToast.show({
+					title: '姓名仅供身份验证，不对外展示',
+					position: 'bottom',
+					type: 'default'
+				})
+			},
+			iconClick2() {
+				this.$refs.uToast.show({
+					title: '身份证号仅供身份验证，不对外展示',
+					position: 'bottom',
+					type: 'default'
+				})
+			},
 			radioChange() {
 				this.value = true;
 			},
 			getSearch() {
 				uni.navigateTo({
-					url: 'pagesA/pages/login/search'
+					url: '/pagesA/pages/login/search'
 				})
 			},
 			getLogin() {
 				uni.navigateBack({
-					url: 'pagesA/pages/login/index'
+					url: '/pagesA/pages/login/index'
 				});
 			},
 			getAgreement() {
 				uni.navigateTo({
-					url: 'pagesA/pages/login/agreement'
+					url: '/pagesA/pages/login/agreement'
 				});
 			},
 			codeChange(text) {
@@ -253,7 +270,7 @@
 					var token = response ? response.data.token : '';
 					this.carhelp.setToken(token);
 					this.carhelp.setPersonInfo(response.data.memberInfo);
-					this.gotoUrl("pagesA/pages/login/step1")
+					this.gotoUrl("/pagesA/pages/login/step1")
 					// uni.switchTab({
 					// 	url: '/pages/index/index'
 					// })

pagesA/pages/login/search.vue

@@ -44,7 +44,7 @@
 			getRegister(item) {
 				this.carhelp.set("searchOrgItem",item)
 				uni.navigateBack({
-					url: 'pagesA/pages/login/register'
+					url: '/pagesA/pages/login/register'
 				})
 			},
 			getList() {