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

apis/common.js

@@ -6,179 +6,11 @@ import Qs from 'qs';
 export function getBannerInfo(formData) {
 	return request({
 		url: '/mobile/bannerInfo/getBannerInfo',
-		data: formData,
-		method: 'post',
-		
-	})
-}
-export function readMessageNum() {
-	return request({
-		url: '/mobile/messageApi/readMessageNum',
-		//data: formData,
-		method: 'post',
-		
-	})
-}
-
-export function getScreenList(formData) {
-	return request({
-		url: '/mobile/recruitmentApi/getScreenList',
-		data: formData,
-		method: 'post',
-		
-	})
-}
-
-//字典表
-export function getData(id) {
-	return request({
-		url: '/sys/dataDictionary/queryChildrenApi',
 		data: {
-			parentId:id
+			classify:formData
 		},
 		method: 'post',
-		timeout: 60000,
-	})
-}
-//上传图片
-export function upload(formData) {
-	return request({
-		url: '/mobile/jobUserApi/upload',
-		data: formData,
-		method: 'post',
 		
 	})
 }
-
-//上传图片
-export function uploadBase64(formData) {
-	var localData = formData.photoFile?formData.photoFile:formData.photoBase64Data;
-	
-	if (localData.indexOf('data:image') != 0) {
-	    //判断是否有这样的头部
-	    localData = 'data:image/jpeg;base64,' + localData
-	}
-	formData.photoBase64Data = localData.replace(/\r|\n/g, '').replace('data:image/jgp', 'data:image/jpeg')
-	
-	
-	return request({
-		url: '/mobile/jobUserApi/uploadBase64',
-		data: formData,
-		method: 'post',
-		timeout: 60000,
-	})
-}
-
-
-export function getSchoolServeList(params) {
-	return request({
-		url: '/mobile/companyInfoApi/schoolServeList',
-		data: Qs.stringify(params),
-		method: 'post',
-	})
-}
-
-
-
-//综合订单
-export function mergeInfo(id) {
-	return request({
-		url: '/mobile/passengerApi/mergeInfo',
-		data: Qs.stringify({
-			outOrderNo: id
-		}),
-		method: 'post',
-	})
-}
-//发送短信
-export function sendMsg(params) {
-	return request({
-		url: '/mobile/personInfoApi/getVerifyCode',
-		data: Qs.stringify(params),
-		method: 'post',
-	})
-}
-
-//验证验证码并登录
-export function validateCode(params) {
-	return request({
-		url: '/mobile/personInfoApi/validateCode',
-		data: Qs.stringify(params),
-		method: 'post',
-	})
-}
-
-//验证验证码并登录
-export function submitAuthentication(params) {
-	return request({
-		url: '/mobile/jobUserApi/submitAuthentication',
-		data: Qs.stringify(params),
-		method: 'post',
-	})
-}
-
-
-export function messageClassify(formData) {
-	return request({
-		url: '/mobile/messageApi/messageClassify',
-		data: formData,
-		method: 'post',
-		
-	})
-}
-
-export function messageList(formData) {
-	return request({
-		url: '/mobile/messageApi/messageList',
-		data: formData,
-		method: 'post',
-		
-	})
-}
-
-
-export function messageDetail(id) {
-	return request({
-		url: '/mobile/messageApi/messageDetail',
-		data: Qs.stringify({
-			messageId: id
-		}),
-		method: 'post',
-	})
-}
-
-export function messageClassifyHR(formData) {
-	return request({
-		url: '/mobile/messageApi/messageClassifyHR',
-		data:formData,
-		method: 'post',
-	})
-}
-
-
-export function changeAgree(formData) {
-	return request({
-		url: '/mobile/messageApi/changeAgree',
-		data:formData,
-		method: 'post',
-	})
-}
-
-
-//推荐简历
-export function positionResumeList(formData) {
-	return request({
-		url: '/mobile/resumeApi/positionResumeList',
-		data:formData,
-		method: 'post',
-	})
-}
-
-//推荐职位
-export function positionRecruitmentList(formData) {
-	return request({
-		url: '/mobile/recruitmentApi/positionRecruitmentList',
-		data:formData,
-		method: 'post',
-	})
-}
+ 

apis/friend.js

@@ -8,4 +8,23 @@ export function findFriendsList(data) {
 		data: data,
 		url: '/mobile/friends/friendsList'
 	})
-}
+}
+
+
+
+export function detail(data) {
+	return request({
+		method: 'post',
+		data: data,
+		url: '/mobile/friends/detail'
+	})
+}
+
+export function beLike(data) {
+	return request({
+		method: 'get',
+		data: data,
+		url: '/mobile/likes/beLike'
+	})
+}
+

apis/index.js

@@ -10,3 +10,15 @@ export function homePage(data) {
 	})
 }
 
+
+export function getBaseDictionary(data ){
+	var url = '/mobile/member/baseDictionary'; 
+	return request({
+		method: 'post', 
+		header:{'Content-Type': 'application/json',
+	//		'X-Requested-With': 'XMLHttpRequest',
+		},
+		data:data,
+		url: url
+	})
+}  

apis/my.js

@@ -1,70 +0,0 @@
-import request from '../utils/request.js';
-import Qs from 'qs';
-
-export function passengerRecordList(data) {
-	return request({
-		method: 'post',
-		data: Qs.stringify(data),
-		url: '/mobile/passengerApi/passengerRecordList'
-	})
-}
-
-export function updateUserInfo(data) {
-	return request({
-		method: 'post',
-		data: Qs.stringify(data),
-		url: '/mobile/passengerApi/updateUserInfo'
-	})
-}
-
-
-export function problemFeedback(data) {
-	return request({
-		method: 'post',
-		data: Qs.stringify(data),
-		url: '/mobile/passengerApi/problemFeedback'
-		
-	})
-}
-
-export function userPhone(data) {
-	return request({
-		method: 'post',
-		data: Qs.stringify(data),
-		url: '/mobile/passengerApi/userPhone'
-		
-	})
-}
-
-export function userUpdatePhone(data) {
-	return request({
-		method: 'post',
-		data: Qs.stringify(data),
-		url: '/mobile/passengerApi/userUpdatePhone'
-		
-	})
-}
-
-
-
-export function passengerRecordDetail(id) {
-	return request({
-		method: 'post',
-		data: {
-			id:id
-		},
-		url: '/mobile/passengerApi/passengerRecordDetail'
-		
-	})
-}
-
-
-
-export function helpCenterList() {
-	return request({
-		method: 'post',
-	
-		url: '/mobile/passengerApi/helpCenterList'
-	})
-}
-

apis/weixin.js

@@ -2,16 +2,7 @@ import request from '@/utils/request'
  
 import Qs from 'qs';
 
-//微信支付
-export function wxpay(orderId) {
-	return request({
-		url: '/wxPay/wxJsapiPay',
-		data: {
-			chargingMarketingId: orderId
-		},
-		method: 'post',
-	})
-}
+
 //根据code换取openid
 export function getDataByCode(code) {
 	return request({
@@ -22,15 +13,3 @@ export function getDataByCode(code) {
 }
 
 
-
-//获得配置
-export function getConfig() {
-	
-	return request({
-		url: '/wechat/getConfig',
-		data: {
-			url:"".split('#')[0]
-		},
-		method: 'get',
-	})
-}

pages/friend/index.vue

@@ -134,10 +134,11 @@
 				<view class="friendList-text">
 					<view class="friendList-name">
 						<span>{{item.realName}}</span>
-						<u-icon custom-prefix="custom-icon" name="men-line" color="#1677FF"></u-icon>
+						<u-icon v-if="item.gender" custom-prefix="custom-icon" name="women-line" color="#1677FF"></u-icon>
+						<u-icon v-else custom-prefix="custom-icon" name="men-line" color="#1677FF"></u-icon>
 					</view>
 					<view class="friendList-info">
-						<span>{{item.age}}岁 · {{item.height}}cm</span>&nbsp;<span v-if="item.weight != null">· {{item.weight}}kg</span>
+						<span>{{item.age}}岁 · {{item.height}}cm{{item.weight?' · '+item.weight+'kg':''}}</span>
 					</view>
 					<view class="friendList-label">
 						<view class="friendList-label-item">

pages/friend/personal.vue

@@ -1,27 +1,50 @@
 <template>
 	<view>
-		<u-navbar :border-bottom="false" :background="navbarBg" back-icon-color="#fff"></u-navbar>
 		<view class="personal">
-			<view class="personalHead">
-				<u-image width="100%" height="375px" src="http://rccs.oss-cn-hangzhou.aliyuncs.com/jp-xqjy/user2.jpg"></u-image>
-			</view>
-			<view class="personal-main">
+			<u-modal v-model="show" :showConfirmButton="false" >
+				<view class="praiseMain">
+				<view class="praiseMain-item">
+					<view class="praiseMain-tit">恭喜配对成功!</view>
+					<view class="praiseMain-pic">
+						<view class="praiseMain-pic-item">
+							<u-image class="newsList-img" :src="info.faceImage" height="260" width="260" border-radius="10"></u-image>
+						</view>
+						<view class="praiseMain-heart">
+							<u-icon custom-prefix="custom-icon" name="heart-2-fill" size="36px" color="#fff"></u-icon>
+						</view>
+						<view class="praiseMain-pic-item">
+							<u-image class="newsList-img" :src="detail.faceImage" height="260" width="260" border-radius="10"></u-image>
+						</view>
+					</view>
+					<view class="praiseMain-pic-text">恭喜！您与「{{detail.realName}}」相互点赞！</view>
+					<view class="praiseMain-btn">
+						<u-button type="error" shape="circle" :custom-style="customStyle2">联系Ta</u-button>
+					</view>
+				</view>
+				</view>
+			</u-modal>
+
+			<view class="personalHead" :style="'height: 375px;background: url('+detail.faceImage+') no-repeat  top center  ;background-size: 100%;'">
+				<u-navbar :border-bottom="false" :background="navbarBg" ></u-navbar>
+			
+ 			</view>
+			<view class="personal-main"  v-if="detail.realName">
 				<view class="personal-name">
-					<span>周群青</span>
-					<u-icon custom-prefix="custom-icon" name="men-line" color="#1677FF"></u-icon>
+					<span v-text="detail.realName"></span>
+					<u-icon custom-prefix="custom-icon" :name="detail.gender?'women-line':'men-line'" color="#1677FF"></u-icon>
 				</view>
 				<view class="personal-space">
 					<view class="personal-info">
-						<span>23岁 · 173cm · 75kg</span>
+						<span>{{detail.age}}岁 · {{detail.height}}cm {{detail.weight?'· '+detail.weight+'kg':''}}</span>
 					</view>
 					<view class="personal-address">
 						<u-icon custom-prefix="custom-icon" name="map-pin-2-fill"></u-icon>
-						<span>荆州市</span>
+						<span>{{detail.orgAreaName}}</span>
 					</view>
 				</view>
 				<view class="personal-att">
 					<view class="personal-att-text">
-						<h2>荆州市总工会</h2>
+						<h2>{{detail.orgName}}</h2>
 						<view class="u-flex">
 							<p>实名认证用户</p>
 							<u-icon custom-prefix="custom-icon" name="check-line"></u-icon>
@@ -37,51 +60,52 @@
 					<view class="personal-con">
 						<view class="personal-col">
 							<p>会员号</p>
-							<h4>N0.0001</h4>
+							<h4>N0.{{detail.number}}</h4>
 						</view>
 						<view class="personal-col">
 							<p>学历</p>
-							<h4>大学本科</h4>
+							<h4>{{detail.educationN}}</h4>
 						</view>
 						<view class="personal-col">
 							<p>行业</p>
-							<h4>IT/互联网</h4>
+							<h4>{{detail.industryN}}</h4>
 						</view>
 						<view class="personal-col">
 							<p>职业</p>
-							<h4>软件工程师</h4>
+							<h4>{{detail.post}}</h4>
 						</view>
 						<view class="personal-col">
 							<p>月薪</p>
-							<h4>4500~6000</h4>
+							<h4>{{detail.salaryRangeN}}</h4>
 						</view>
 						<view class="personal-col">
 							<p>住房状况</p>
-							<h4>结婚时购房</h4>
+							<h4>{{detail.housingSituationN}}</h4>
 						</view>
 						<view class="personal-col">
 							<p>婚姻状况</p>
-							<h4>未婚</h4>
+							<h4>{{detail.maritalStatusN}}</h4>
 						</view>
 						<view class="personal-col">
 							<p>子女状况</p>
-							<h4>无</h4>
+							<h4>{{detail.childStatusN}}</h4>
 						</view>
 						<view class="personal-col">
 							<p>出生地</p>
-							<h4>荆州市沙市区</h4>
+							<h4>{{detail.birthplaceN}}</h4>
 						</view>
 						<view class="personal-col">
 							<p>现工作所在地</p>
-							<h4>荆州市沙市区</h4>
+							<h4>{{detail.workplaceN}}</h4>
 						</view>
 						<view class="personal-row">
 							<p>兴趣爱好</p>
 							<view class="personal-label">
-								<span>摄影</span>
-								<span>烹饪</span>
-								<span>健身</span>
-								<span>打游戏</span>
+								<view v-if="!islogin">游客不可见</view>
+								<span v-for="(item,index) in hobbyList"
+								:key="index"
+								>{{item.hobbyName}}</span>
+						
 							</view>
 						</view>
 					</view>
@@ -93,11 +117,11 @@
 					</view>
 					<view class="personal-con">
 						<view class="personal-text">
-							憧憬“执子之手与子偕老的美好爱情”，对感情忠诚专一，有强烈的责任感，有担当也有一颗浪漫之心。热爱生活，一直相信美好的生活是靠勤奋的双手奋斗出来的，对生活的态度一直是不求飞黄腾达，但求衣食无忧，追求真实平淡。平日爱好书法、运动、电影。对父母孝顺，对家庭懂得家和万事兴。事业上不怕吃苦，兢兢业业，有上进心。
-						</view>
+							{{detail.selfEvaluation}}
+ 						</view>
 					</view>
 				</view>
-				<view class="personal-item">
+				<view class="personal-item" style="    padding-bottom: 60px;">
 					<view class="personal-tit">
 						<u-icon custom-prefix="custom-icon" name="chat-heart-line" color="#FF5E5E" size="20px"></u-icon>
 						<span>择偶标准</span>
@@ -105,57 +129,181 @@
 					<view class="personal-con">
 						<view class="personal-col">
 							<p>年龄范围</p>
-							<h4>25~30</h4>
+							<h4>{{detail.taAgeRangeN}}</h4>
 						</view>
 						<view class="personal-col">
 							<p>月薪</p>
-							<h4>不限</h4>
+							<h4>{{detail.taAgeRangeN}}</h4>
 						</view>
 						<view class="personal-col">
 							<p>学历</p>
-							<h4>不限</h4>
+							<h4>{{detail.taEduN}}</h4>
 						</view>
 						<view class="personal-col">
 							<p>职业</p>
-							<h4>不限</h4>
+							<h4>{{detail.taOccupationN}}</h4>
 						</view>
 						<view class="personal-row">
 							<p>现工作所在地</p>
-							<h4>荆州市沙市区北京路阿萨德阿斯</h4>
+							<h4>{{detail.taWorkplaceN}}</h4>
 						</view>
 						<view class="personal-row">
 							<p>其他要求</p>
-							<h4>阿萨德阿萨德阿斯</h4>
+							<h4>{{detail.taOther}}</h4>
 						</view>
 					</view>
 				</view>
-				<view class="personal-btn">
-					<u-button type="error" shape="circle" :custom-style="customStyle">
-						<span>赞Ta</span>
-						<u-icon custom-prefix="custom-icon" name="thumb-up-line"></u-icon>
-					</u-button>
-				</view>
+				
+			
+			</view>
+			<view class="personal-btn"  v-if="!islogin">
+				<u-button type="error" @click="gotoUrl('pagesA/pages/login/index')" shape="circle" :custom-style="customStyle">
+					<span>注册 / 登录</span>
+				</u-button>
+				
+			
+				
+			</view>
+			<view class="personal-btn"  v-if="islogin">
+				<u-button type="error"  v-if="isedit" @click="gotoUrl('pages/user/edit')" shape="circle" :custom-style="customStyle">
+					<span>编辑</span>
+					<u-icon custom-prefix="custom-icon" name="edit-2-line"></u-icon>
+				</u-button>
+				
+				
+				<u-button type="error"  v-if="!isedit"  @click="likeBtn" shape="circle" :custom-style="customStyle">
+					<span>{{isLike?'已赞':'赞Ta'}}</span>
+					<u-icon custom-prefix="custom-icon" name="thumb-up-line"></u-icon>
+				</u-button>
+				
 			</view>
+			
+			 
 		</view>
  	</view>
 </template>
 
 <script>
+	import * as friendApi from '@/apis/friend.js'
+	
 	export default {
 		data() {
 			return {
+				info:{},
+				show:false,
+				islogin:false,
+				isedit:false,
+				id:"",
+				readStatus:0,
+				isLike:false,
+				detail:{},
+				hobbyList:[],
 				navbarBg: {
 					background: 'none'
 				},
 				customStyle: {
 					background: '#FF5E5E'
 				}, 
+				customStyle2: {
+					background: '#FF5E5E'
+				}, 
 			}
 
-			methods: {
+		},methods: {
+			likeBtn(){
+				if(this.isLike){
+					return
+				}
+				
+				uni.showLoading({
+					title: "加载中",
+					mask: true,
+				})
+				friendApi.beLike({
+					beMemberId:this.id,
+				}).then(response => {
+				    
+					this.isLike=true
+					if(this.isLike){
+						this.customStyle.background ="#a59f9f"
+					}
+				   uni.hideLoading()
+								
+				}).catch(error => {
+				    uni.showToast({
+				    	title: error
+				    })
+				})
+			},
+				getDetail() {
+					var memberId=undefined;
+				
+					var info =this.carhelp.getPersonInfo();
+					this.info=info
+					
+					if(info){
+						if(!this.id||this.id==""){
+							this.id=info.id
+						}
+						memberId=info.id
+						this.islogin=true;
+						if(this.id==info.id){
+							this.isedit=true;
+						}
+					}
+					uni.showLoading({
+						title: "加载中",
+						mask: true,
+					})
+				    friendApi.detail({
+						id:this.id,
+						memberId:memberId,
+						readStatus:this.readStatus
+						}).then(response => {
+				        this.isLoading = false;
+						this.detail = Object.assign(response.data.memberInfo)
+						
+						if(this.islogin){
+							this.hobbyList = response.data.hobbyList;
+							this.isLike = response.data.isLike;
+							if(this.isLike){
+								this.customStyle.background ="#a59f9f"
+							}
+						}else{
+							var tempdetail = response.data.memberInfo;
+							var sz=["number",'realName',"faceImage","gender","age",'height','weight','orgAreaName','orgName']
+							
+							for(var i  in this.detail ){
+								if(sz.indexOf(i)==-1){
+									this.detail[i]="游客不可见"
+									
+								}
+							}
+							 
+						}
+						
+					   uni.hideLoading()
 				
+				    }).catch(error => {
+				         uni.showToast({
+				         
+				         	title: error
+				         })
+				    })
+				}
+		},
+		onLoad(op) {	
+			if(op.id){
+				this.id =op.id;
 			}
-
+			
+			if(op.readStatus==1){
+				this.readStatus=1;
+			}	
+		},
+		onReady() {
+			
+			this.getDetail();
 		}
 	}
 </script>
@@ -165,6 +313,7 @@
 		margin-top: -44px;
 	}
 	.personal-main{
+		padding-bottom: 80px;
 		background-color: #fff;
 		border-radius:12px 12px 0 0;
 		margin-top: -12px;
@@ -290,9 +439,54 @@
 		}
 	}
 	.personal-btn{
+		z-index: 100;
+		position: fixed;
+		bottom: 0;
+		width: 100%;
 		padding: 15px;
 		span{
 			margin-right: 5px;
 		}
 	}
+	.praiseMain{
+		.praiseMain-item{
+			margin: 15px;
+			background-color: #fff;
+			border-radius: 12px;
+			//padding: 20px;
+			position: relative;
+		}
+		.praiseMain-heart{
+			height: 60px;
+			width: 60px;
+			background-color: #FF5E5E;
+			position: absolute;
+			border-radius: 50%;
+			top: 95px;
+			left: 50%;
+			margin-left: -30px;
+			z-index: 9;
+			line-height: 60px;
+			text-align: center;
+		}
+		.praiseMain-tit{
+			font-size: 24px;
+			color:#FF5E5E;
+			margin-bottom: 10px;
+			text-align: center;
+		}
+		.praiseMain-pic{
+			display: flex;
+			justify-content: space-between;
+			//padding: 0 15px;
+		}
+		.praiseMain-pic-text{
+			font-size: 16px;
+			text-align: center;
+			margin: 15px 0;
+		}
+		.praiseMain-btn{
+			padding: 0 15px;
+		}
+	}
 </style>

pages/index/index.vue

@@ -1,17 +1,21 @@
 <template>
-	<view>
+	<view>
+		<u-select v-model="memberQyshow" 
+			@confirm="confirm" :default-value="defaultvalue"
+		   :list="memberQyColumns"></u-select>
+		
 		<u-navbar :is-back="false" :border-bottom="false"><img class="homeLogo" src="/static/img/homeLogo.png" alt=""></u-navbar>
 		<view class="home-head">
 			<view class="homeTab">
 				<u-tabs :list="tabList" :current="current" @change="change" :show-bar="false" active-color="#333" inactive-color="#c4c0c0"></u-tabs>
 			</view>
-			<view class="homeAdd">
+			<view class="homeAdd" >
 				<u-icon custom-prefix="custom-icon" name="map-pin-2-fill"></u-icon>
-				<span>荆州市</span>
-			</view>
+				<span  @click="memberQyshowBtn">{{memberQyObj.name}}</span>
+ 			</view>
 		</view>
 		<view class="homeWrap">
-			<u-swiper :list="wrapList" height="300" border-radius="24"></u-swiper>
+			<u-swiper :list="wrapList" @click="clickBanner" :img-mode="'aspectFit'" :name="'picUrl'" height="300" border-radius="24"></u-swiper>
 		</view>
 		<view class="homeUser">
 			<view class="homeUser-item" v-for="(item ,index) in list" :key="item.id" >
@@ -39,13 +43,18 @@
 
 <script>
 	import * as Api from '@/apis/index.js'
+	import * as Api_common from '@/apis/common.js'
 	
 	export default {
 		data() {
 			return {
+ 				memberQyshow:false,
+				memberQy:1,
+				memberQyColumns:[],
+				listQy:[],
 				list:[],
-					pageIndex: 1,
-					recordsTotal:0,
+				pageIndex: 1,
+				recordsTotal:0,
 				tabList: [{
 					name: '最新'
 				}, {
@@ -70,7 +79,43 @@
 				this.myLoadmore();
 			}
 		},
+		computed:{
+		 defaultvalue(){
+		 	for(var i in this.listQy){
+		 			
+		 		if(this.listQy[i].value==this.memberQy){
+		 			
+		 			return [i]
+		 		}
+		 	}
+		 	return [0]
+		 },
+			memberQyObj(){
+				for(var i in this.listQy){
+						
+					if(this.listQy[i].value==this.memberQy){
+					
+						return this.listQy[i]
+					}
+				}
+				return {
+					id:-1,
+					name:"荆州市"
+				}
+			}
+		},
 		methods: {
+			memberQyshowBtn(){
+				
+				this.memberQyshow  = true
+			 
+			},
+			// 回调参数为包含columnIndex、value、values
+			confirm(e) {
+				this.memberQy=e[0].value
+			   this.carhelp.set("index-defaultvalue-memberQy",this.memberQy);
+			    this.memberQyshow = false
+			},
 			myLoadmore() {
 					
 				this.pageIndex += 1;
@@ -82,7 +127,48 @@
 				this.list = [];
 				this.homePage()
 			},
-		homePage(){
+			getBaseDictionary(){
+				var indexdefaultvaluememberQy= this.carhelp.get("index-defaultvalue-memberQy");
+				 var info= this.carhelp.getPersonInfoPlus();
+				
+				if(info){
+					this.memberQy=info.memberQy
+					this.listQy = info.qyList;
+									
+					for(var i in this.listQy){
+							
+						this.memberQyColumns.push({
+								label: this.listQy[i].name,
+								value: this.listQy[i].value
+						})
+					}
+				}else{
+					Api.getBaseDictionary({
+						
+					}).then((res) => {
+						this.listQy = res.data.qyList;
+					
+						for(var i in this.listQy){
+								
+							this.memberQyColumns.push({
+									label: this.listQy[i].name,
+									value: this.listQy[i].value
+								})
+						}
+						
+					}).catch(error => {
+							uni.showToast({
+							
+								title: error
+							})
+					})
+				}
+				if(indexdefaultvaluememberQy){
+					this.memberQy=indexdefaultvaluememberQy;
+				}
+				
+			},
+			homePage(){
 				uni.showLoading({
 					title: "加载中",
 					mask: true,
@@ -98,17 +184,36 @@
 						];
 						this.recordsTotal = res.data.recordsTotal
 						uni.hideLoading()
+						this.getBaseDictionary()
+					}).catch(error => {
+						uni.showToast({
 						
+							title: error
+						})
+				})
+			},getBannerInfo(){
+				uni.showLoading({
+					title: "加载中",
+					mask: true,
+				})
+				Api_common.getBannerInfo("HOMEPAGE").then((res) => {
+					this.wrapList =res.data;
+					
 					}).catch(error => {
 						uni.showToast({
 						
 							title: error
 						})
 				})
+			},clickBanner(index){
+				var obj= this.wrapList[index]
+				
 			}
+			
 		},
 		onReady() {
 			
+			this.getBannerInfo()
 			this.homePage()
 		}
 	}

pages/index/main-zkx.vue

@@ -58,6 +58,7 @@
 						var token = res ? res.data.data.token : '';					
 						this.carhelp.setPersonInfo(res.data.data.memberInfo );
 						this.carhelp.setToken(token);
+						this.carhelp.setPersonInfoPlus(res.data.data);
 						
 						setTimeout(()=>{
 							uni.switchTab({

pages/news/index.vue

@@ -5,7 +5,8 @@
 			<u-tabs :list="tabList" :current="current" @change="change" :show-bar="false" active-color="#333" inactive-color="#c4c0c0"></u-tabs>
 		</view>
 		<view class="homeWrap">
-			<u-swiper :list="wrapList" height="300" border-radius="24"></u-swiper>
+			<u-swiper :list="wrapList" :img-mode="'aspectFit'" :name="'picUrl'" height="300" border-radius="24"></u-swiper>
+			
 		</view>
 		<view class="newsList">
 			<view class="newsList-item" 
@@ -28,14 +29,16 @@
 
 <script>
 	import * as API from '@/apis/news.js'
+	import * as Api_common from '@/apis/common.js'
 	
 	export default {
 		data() {
 			return {
+				
 				form:{
 					
 				},
-				newstype:'',
+ 				newstype:'',
 				typelist: [],
 				pageIndex: 1,
 				recordsTotal: 0,
@@ -70,6 +73,21 @@
 		},
 		
 		methods: {
+			getBannerInfo(){
+				uni.showLoading({
+					title: "加载中",
+					mask: true,
+				})
+				Api_common.getBannerInfo("TZGG").then((res) => {
+					this.wrapList =res.data;
+					
+					}).catch(error => {
+						uni.showToast({
+						
+							title: error
+						})
+				})
+			},
 			getType() {
 				
 				uni.showLoading({
@@ -143,7 +161,7 @@
 				this.getList(true)
 			},
 			onReady() {
-			
+				this.getBannerInfo()
 				this.getType()
 				
 			}

pages/praise/iPraise.vue

@@ -1,73 +1,89 @@
 <template>
 	<view>
-		<u-navbar :is-back="false" :border-bottom="false"><view class="navbar-tit">我点赞的</view></u-navbar>
+		<u-navbar><view class="navbar-tit">我点赞的</view></u-navbar>
 
 		<view class="friendList">
-			<view class="friendList-item">
-				<u-image class="friendList-img" src="/static/img/sexMan.png" height="160" width="160" border-radius="10">
+			<view class="friendList-item" v-for="(item ,index) in likeList" :key="item.id">
+				<u-image class="friendList-img" :src="item.faceImage" height="160" width="160" border-radius="10">
 				</u-image>
 				<view class="friendList-text">
 					<view class="friendList-name">
-						<span>123123</span>
-						<u-icon custom-prefix="custom-icon" name="men-line" color="#1677FF"></u-icon>
+						<span>{{item.realName}}</span>
+						<u-icon v-if="item.gender" custom-prefix="custom-icon" name="women-line" color="#1677FF"></u-icon>
+						<u-icon v-else custom-prefix="custom-icon" name="men-line" color="#1677FF"></u-icon>
 					</view>
 					<view class="friendList-info">
-						<span>123岁 · 123cm</span>&nbsp;<span>· 132kg</span>
+						<span>{{item.age}}岁 · {{item.height}}cm{{item.weight?' · '+item.weight+'kg':''}}</span>
 					</view>
 					<view class="friendList-label">
 						<view class="friendList-label-item">
 							<u-icon custom-prefix="custom-icon" name="map-pin-2-fill"></u-icon>
-							<span>123</span>
+							<span>{{item.orgAreaName}}</span>
 						</view>
 						<view class="friendList-label-item">
-							<span>123</span>
+							<span>{{item.educationN}}</span>
 						</view>
 						<view class="friendList-label-item">
-							<span>123</span>
+							<span>{{item.industryN}}</span>
 						</view>
 					</view>
 				</view>
 			</view>
-			<view class="friendList-item">
-				<u-image class="friendList-img" src="/static/img/sexWoman.png" height="160" width="160" border-radius="10">
-				</u-image>
-				<view class="friendList-text">
-					<view class="friendList-name">
-						<span>123123</span>
-						<u-icon custom-prefix="custom-icon" name="women-line" color="#FF695B"></u-icon>
-					</view>
-					<view class="friendList-info">
-						<span>123岁 · 123cm</span>&nbsp;<span>· 132kg</span>
-					</view>
-					<view class="friendList-label">
-						<view class="friendList-label-item">
-							<u-icon custom-prefix="custom-icon" name="map-pin-2-fill"></u-icon>
-							<span>123</span>
-						</view>
-						<view class="friendList-label-item">
-							<span>123</span>
-						</view>
-						<view class="friendList-label-item">
-							<span>123</span>
-						</view>
-					</view>
-				</view>
-			</view>
-			<u-divider color="#B6BDC3" style="margin-top:20px;" bg-color="#f4f0f0">已经到底了</u-divider>
+			<u-divider color="#B6BDC3" v-if="likeList.length ==recordsTotal" style="margin-top:20px;" bg-color="#f4f0f0">已经到底了</u-divider>
 		</view>
 	</view>
 </template>
 
 <script>
+	import * as likesApi from '@/apis/likes.js'
+	
 	export default {
 		data() {
 			return {
-				
+				likeList: [],
+				pageIndex: 1,
+				recordsTotal: 0,
+			}
+		},
+		onReachBottom() {
+			if (this.likeList.length < this.recordsTotal) {			
+				this.myLoadmore();
 			}
 		},
-		
 		methods: {
-			
+			getMyLikeList(bl) {
+				uni.showLoading({
+					title: "加载中",
+					mask: true,
+				})
+				if (bl) {
+					this.likeList = [];
+					this.pageIndex = 1;
+				}
+				var data = {
+					pageSize:5,
+					pageIndex: this.pageIndex
+				};
+				likesApi.iLikeList(data).then((res) => {
+					this.likeList = [
+						...this.likeList,
+						...res.data.data
+					];
+					this.recordsTotal = res.data.recordsTotal
+					uni.hideLoading();
+				}).catch(error => {
+					uni.showToast({
+						title: error
+					})
+				})
+			},
+			myLoadmore() {	
+				this.pageIndex += 1;
+				this.getMyLikeList()
+			},
+			onReady() {
+				this.getMyLikeList();
+			}
 		}
 	}
 </script>

pages/praise/index.vue

@@ -3,52 +3,34 @@
 		<u-navbar :is-back="false" :border-bottom="false"><view class="navbar-tit">点赞</view></u-navbar>
 		<view class="praise">
 			<view class="praiseLink">
-				<view class="praiseLink-item" style="">
+				<view class="praiseLink-item" style="" @click="toIPraise">
 					<view class="praiseLink-tit">
 						<h4>我点赞的</h4><span></span>
 					</view>
 				</view>
-				<view class="praiseLink-item praiseLink-bg2">
+				<view class="praiseLink-item praiseLink-bg2" @click="toPraiseMe">
 					<view class="praiseLink-tit">
-						<h4>谁点赞了我</h4><span>+12</span>
+						<h4>谁点赞了我</h4><span v-if="newLike">+{{newLike}}</span>
 					</view>
-					<p>55人点赞了我</p>
+					<p>{{peopleNum}}人点赞了我</p>
 				</view>
 			</view>
 			<view class="title">互相点赞联系双方</view>
 			<view class="praiseMain">
-				<view class="praiseMain-item">
+				<view class="praiseMain-item" v-for="(item ,index) in homePageList" :key="item.id">
 					<view class="praiseMain-tit">恭喜配对成功!</view>
 					<view class="praiseMain-pic">
 						<view class="praiseMain-pic-item">
-							<u-image class="newsList-img" src="/static/img/sexMan.png" height="260" width="260" border-radius="10"></u-image>
+							<u-image class="newsList-img" :src="item.beLikeMemberFaceImage" height="260" width="260" border-radius="10"></u-image>
 						</view>
 						<view class="praiseMain-heart">
 							<u-icon custom-prefix="custom-icon" name="heart-2-fill" size="36px" color="#fff"></u-icon>
 						</view>
 						<view class="praiseMain-pic-item">
-							<u-image class="newsList-img" src="/static/img/sexWoman.png" height="260" width="260" border-radius="10"></u-image>
+							<u-image class="newsList-img" :src="item.likeMemberFaceImage" height="260" width="260" border-radius="10"></u-image>
 						</view>
 					</view>
-					<view class="praiseMain-pic-text">恭喜！您与「周群青」相互点赞！</view>
-					<view class="praiseMain-btn">
-						<u-button type="error" shape="circle" :custom-style="customStyle">联系Ta</u-button>
-					</view>
-				</view>
-				<view class="praiseMain-item">
-					<view class="praiseMain-tit">恭喜配对成功!</view>
-					<view class="praiseMain-pic">
-						<view class="praiseMain-pic-item">
-							<u-image class="newsList-img" src="/static/img/sexMan.png" height="260" width="260" border-radius="10"></u-image>
-						</view>
-						<view class="praiseMain-heart">
-							<u-icon custom-prefix="custom-icon" name="heart-2-fill" size="36px" color="#fff"></u-icon>
-						</view>
-						<view class="praiseMain-pic-item">
-							<u-image class="newsList-img" src="/static/img/sexWoman.png" height="260" width="260" border-radius="10"></u-image>
-						</view>
-					</view>
-					<view class="praiseMain-pic-text">恭喜！您与「周群青」相互点赞！</view>
+					<view class="praiseMain-pic-text">恭喜！您与「{{item.likeMemberName}}」相互点赞！</view>
 					<view class="praiseMain-btn">
 						<u-button type="error" shape="circle" :custom-style="customStyle">联系Ta</u-button>
 					</view>
@@ -59,18 +41,49 @@
 </template>
 
 <script>
+	import * as likesApi from '@/apis/likes.js'
+	
 	export default {
 		data() {
 			return {
+				newLike: '',
+				peopleNum: '',
+				homePageList: [],
 				customStyle: {
 					background: '#FF5E5E'
-				}, 
-			}
-
-			methods: {
-				
+				},
 			}
-
+		},
+		onLoad(op) {
+			this.getHomePage();
+		},
+		methods: {
+			toIPraise() {
+				uni.navigateTo({
+					url: '/pages/praise/iPraise'
+				});
+			},
+			toPraiseMe() {
+				uni.navigateTo({
+					url: '/pages/praise/praiseMe'
+				});
+			},
+			getHomePage() {
+				uni.showLoading({
+					title: "加载中",
+					mask: true,
+				})
+				likesApi.homePage().then((res) => {
+					this.newLike = res.data.likeINotReadNum;
+					this.peopleNum = res.data.eachOtherPage.data.length;
+					this.homePageList = res.data.eachOtherPage.data;
+					uni.hideLoading();
+				}).catch(error => {
+					uni.showToast({
+						title: error
+					})
+				})
+			},
 		}
 	}
 </script>

pages/praise/praiseMe.vue

@@ -1,76 +1,87 @@
 <template>
 	<view>
-		<u-navbar :is-back="false" :border-bottom="false"><view class="navbar-tit">谁点赞了我</view></u-navbar>
+		<u-navbar><view class="navbar-tit">谁点赞了我</view></u-navbar>
 
 		<view class="friendList">
-			<view class="friendList-item">
-				<view class="friendList-new">
+			<view class="friendList-item" v-for="(item ,index) in likeList" :key="item.id">
+				<view class="friendList-new" v-if="item.isRead == '0'">
 					new
 				</view>
-				<u-image class="friendList-img" src="/static/img/sexMan.png" height="160" width="160" border-radius="10">
+				<u-image class="friendList-img" :src="item.faceImage" height="160" width="160" border-radius="10">
 				</u-image>
 				<view class="friendList-text">
 					<view class="friendList-name">
-						<span>123123</span>
-						<u-icon custom-prefix="custom-icon" name="men-line" color="#1677FF"></u-icon>
+						<span>{{item.realName}}</span>
+						<u-icon v-if="item.gender" custom-prefix="custom-icon" name="women-line" color="#1677FF"></u-icon>
+						<u-icon v-else custom-prefix="custom-icon" name="men-line" color="#1677FF"></u-icon>
 					</view>
 					<view class="friendList-info">
-						<span>123岁 · 123cm</span>&nbsp;<span>· 132kg</span>
+						<span>{{item.age}}岁 · {{item.height}}cm{{item.weight?' · '+item.weight+'kg':''}}</span>
 					</view>
 					<view class="friendList-label">
 						<view class="friendList-label-item">
 							<u-icon custom-prefix="custom-icon" name="map-pin-2-fill"></u-icon>
-							<span>123</span>
+							<span>{{item.orgAreaName}}</span>
 						</view>
 						<view class="friendList-label-item">
-							<span>123</span>
+							<span>{{item.educationN}}</span>
 						</view>
 						<view class="friendList-label-item">
-							<span>123</span>
+							<span>{{item.industryN}}</span>
 						</view>
 					</view>
 				</view>
 			</view>
-			<view class="friendList-item">
-				<u-image class="friendList-img" src="/static/img/sexWoman.png" height="160" width="160" border-radius="10">
-				</u-image>
-				<view class="friendList-text">
-					<view class="friendList-name">
-						<span>123123</span>
-						<u-icon custom-prefix="custom-icon" name="women-line" color="#FF695B"></u-icon>
-					</view>
-					<view class="friendList-info">
-						<span>123岁 · 123cm</span>&nbsp;<span>· 132kg</span>
-					</view>
-					<view class="friendList-label">
-						<view class="friendList-label-item">
-							<u-icon custom-prefix="custom-icon" name="map-pin-2-fill"></u-icon>
-							<span>123</span>
-						</view>
-						<view class="friendList-label-item">
-							<span>123</span>
-						</view>
-						<view class="friendList-label-item">
-							<span>123</span>
-						</view>
-					</view>
-				</view>
-			</view>
-			<u-divider color="#B6BDC3" style="margin-top:20px;" bg-color="#f4f0f0">已经到底了</u-divider>
+			<u-divider color="#B6BDC3" v-if="likeList.length ==recordsTotal" style="margin-top:20px;" bg-color="#f4f0f0">已经到底了</u-divider>
 		</view>
 	</view>
 </template>
 
 <script>
+	import * as likesApi from '@/apis/likes.js'
+	
 	export default {
 		data() {
 			return {
-				
+				likeList: [],
+				pageIndex: 1,
+				recordsTotal: 0,
 			}
 		},
-		
 		methods: {
-			
+			getLikeMeList(bl) {
+				uni.showLoading({
+					title: "加载中",
+					mask: true,
+				})
+				if (bl) {
+					this.likeList = [];
+					this.pageIndex = 1;
+				}
+				var data = {
+					pageSize:5,
+					pageIndex: this.pageIndex
+				};
+				likesApi.likeIList(data).then((res) => {
+					this.likeList = [
+						...this.likeList,
+						...res.data.data
+					];
+					this.recordsTotal = res.data.recordsTotal
+					uni.hideLoading();
+				}).catch(error => {
+					uni.showToast({
+						title: error
+					})
+				})
+			},
+			myLoadmore() {	
+				this.pageIndex += 1;
+				this.getLikeMeList()
+			},
+			onReady() {
+				this.getLikeMeList();
+			}
 		}
 	}
 </script>

pages/user/personal.vue

@@ -1,7 +1,8 @@
 <template>
 	<view>
-		<u-navbar :border-bottom="false" :background="navbarBg" back-icon-color="#fff"></u-navbar>
 		<view class="personal">
+			<u-navbar :border-bottom="false" :background="navbarBg" back-icon-color="#fff"></u-navbar>
+			
 			<view class="personalHead">
 				<u-image width="100%" height="375px" :src="personalInfo.faceImage"></u-image>
 			</view>

pagesA/pages/login/index.vue

@@ -195,6 +195,8 @@
 					var token = response ? response.data.token : '';
 					this.carhelp.setToken(token);
 					this.carhelp.setPersonInfo(response.data.memberInfo);
+					this.carhelp.setPersonInfoPlus(res.data.data);
+					
 					//this.gotoUrl("pages/user/index")
 					uni.switchTab({
 						url: '/pages/index/index'

pagesA/pages/login/register.vue

@@ -270,6 +270,7 @@
 					var token = response ? response.data.token : '';
 					this.carhelp.setToken(token);
 					this.carhelp.setPersonInfo(response.data.memberInfo);
+					this.carhelp.setPersonInfoPlus(res.data.data);
 					this.gotoUrl("/pagesB/pages/login/step1")
 					// uni.switchTab({
 					// 	url: '/pages/index/index'

pagesB/pages/login/step4.vue

@@ -206,6 +206,7 @@
 						var token = res ? res.data.data.token : '';					
 						this.carhelp.setPersonInfo(res.data.data.memberInfo );
 						this.carhelp.setToken(token);
+						this.carhelp.setPersonInfoPlus(res.data.data);
 						
 						setTimeout(()=>{
 							uni.switchTab({

utils/mixin.js

@@ -7,7 +7,9 @@ var app = {
 
 	set : (key, value) => uni.setStorageSync(prefix + key, value),
 	remove: key =>  uni.removeStorageSync(prefix + key),
-	
+	getPersonInfoPlus : () => {
+		 return uni.getStorageSync(prefix + 'personInfoPlus')
+	},
 	getPersonInfo : () => {
 		 return uni.getStorageSync(prefix + 'personInfo')
 	},
@@ -16,12 +18,9 @@ var app = {
 
 	setOpenId : (value) => uni.setStorageSync(prefix + 'wx_openId', value),
 	setPersonInfo : (value) => uni.setStorageSync(prefix + 'personInfo', value),
+	setPersonInfoPlus : (value) => uni.setStorageSync(prefix + 'personInfoPlus', value),
 	
-	getToken : () => {
-		console.log(prefix + 'token')
-		
-		return uni.getStorageSync(prefix + 'token')
-	},
+	getToken : () =>   uni.getStorageSync(prefix + 'token'),
 	setToken : (value) => {
 		uni.setStorageSync(prefix + 'token', value)
 		

utils/request.js

@@ -52,6 +52,7 @@ const request = (options) => {
 				var token = res ? res.data.data.token : '';
 				
 				carhelp.setPersonInfo(res.data.data.memberInfo );
+				carhelp.setPersonInfoPlus(res.data.data);
 				
 				carhelp.setToken(token);
 				

utils/wxJsApi.js

@@ -1,209 +0,0 @@
-import wx from 'weixin-js-sdk'
-import * as API_WeiXin from '@/apis/weixin.js'
-import * as API_Common from '@/apis/common.js'
-
-import Qs from 'qs';
-import request from './request.js'
-export function addSysLog(message) {
-
-	return request({
-		url: '/mobile/sysLogApi/submit',
-		data: Qs.stringify({
-			message: JSON.stringify(message)
-		}),
-		method: 'post',
-	})
-}
-//获取微信配置
-export function getWxConfig(jsApiList) {
-	var jsApiList = jsApiList || ['chooseImage', 'getLocalImgData', 'scanQRCode'];
-	 
-	let promise = (jsApiList => {
-		return new Promise((resolve, reject) => {
-			console.log(jsApiList);
-			API_WeiXin.getConfig().then(response => {
-				var wxconfig = response.data.wxConfig;
-			
-				wx.config({
-					debug: false, // 开启调试模式,
-					appId: wxconfig.appId, // 必填，企业号的唯一标识，此处填写企业号corpid
-					timestamp: wxconfig.timestamp, // 必填，生成签名的时间戳
-					nonceStr: wxconfig.nonceStr, // 必填，生成签名的随机串
-					signature: wxconfig.signature, // 必填，签名，见附录1
-					jsApiList: jsApiList, // 必填，需要使用的JS接口列表，所有JS接口列表见附录2
-					openTagList:['wx-open-subscribe']
-				});
-				wx.ready(function() {
-					resolve(response.data);
-				})
-				wx.error(function(res) {
-					reject('微信api配置出错');
-				});
-			}).catch(error => {
-				//mui.toast(error);
-				reject(error);
-			})
-		})
-	})(jsApiList)
-
-	return promise;
-}
-
-//选择图片,多图上传和单图上传的回调处理不一样
-export function chooseImage(count,islocalId) {
-	var count = count || 1;
-	let promise = new Promise((resolve, reject) => {
-		wx.chooseImage({
-			count: count,
-			sizeType: ['compressed'],
-			sourceType: ['album', 'camera'],
-			success: function(res) {
-				 
-				var localIds = res.localIds;
-				
-				if(islocalId){
-					
-					resolve(localIds);
-				}else{
-					if (count == 1) {
-						wx.getLocalImgData({
-							localId: localIds[0],
-							success: function(res) {
-								resolve(res);
-							}
-						});
-					} else {
-						resolve(localIds);
-					}
-				}
-				
-			}
-		});
-	});
-	return promise;
-}
-
-
-
-
-//获取图片，用于多图上传时的递归处理
-export function getLocalImgData(localId, fun) {
-	wx.getLocalImgData({
-		localId: localId,
-		success: function(res) {
-			fun(res);
-		}
-	});
-}
-
-//上传图片
-export function uploadPic(imgBase64) {
-	let promise = new Promise((resolve, reject) => {
-		var formData = new FormData();
-		formData.append('photoName', '1.jpg');
-		formData.append('photoBase64Data', imgBase64);
-
-	
-		API_Common.uploadBase64(formData).then(response => {
-			resolve(response);
-		}).catch(error => {
-			//mui.toast(error);
-			reject(error);
-		})
-	});
-	return promise;
-}
-
-//获取坐标
-export function getLocation() {
-	let promise = new Promise((resolve, reject) => {
-		wx.ready(function() {
-			wx.getLocation({
-				type: 'gcj02', // 默认为wgs84的gps坐标，可传入'gcj02'
-				success: function(res) {
-					resolve(res);
-				},
-				faile: function(res) {
-					reject(res);
-				},
-				fail: function(res) {
-					if (res.errMsg == 'getLocation:timeout') {
-						
-						res="定位超时，请检查是否开启'定位'"
-					} else if (res.errMsg == 'getLocation:ERROR_NETWORK') {
-						//mui.alert("网络异常");
-						res="定位超时，请检查是否开启'定位'"
-					} else if (res.errMsg == 'getLocation:ERROR_NOCELL&WIFI_LOCATIONSWITCHOFF') {
-						res="没开启系统定位"
-						//mui.alert("没开启系统定位");
-					} else if (res.errMsg == 'getLocation:system permission denied') {
-						res="未给微信位置授权"
-						//mui.alert("未给微信位置授权");
-					} else if (res.errMsg == 'getLocation:location permission') {
-						res="未给微信位置授权"
-						//mui.alert("未给微信位置授权");
-					} else if (res.errMsg == 'getLocation:auth denied') {
-						res="用户在小程序中未授权"
-						//mui.alert("用户在小程序中未授权");
-					} else if (res.errMsg == 'getLocation:fail authorize no response') {
-						res="用户在小程序中未授权"
-						//mui.alert("用户在小程序中未授权");
-					}
-					reject(res);
-				},
-				complete() {}
-			})
-		})
-	})
-	return promise;
-}
-
-//扫描二维码
-export function scanQRCode(needResult,obj) {
-	var needResult = needResult || 1;
-	let promise = new Promise((resolve, reject) => {
-		wx.scanQRCode({
-			needResult: needResult,
-			scanType: ["qrCode"],
-			success: function(res) {
-				var url = res.resultStr;
-				resolve(url);
-			},
-			faile: function(res) {
-				reject(res);
-			},
-			
-			fail: function(res) {
-
-				reject(res);
-			},
-			complete() {
-				if(obj){
-					obj.showLoading(false)	
-				}
-			}
-		})
-	});
-	return promise;
-}
-
-export function requestSubscribeMessage(sz) {
-	 
-	let promise = new Promise((resolve, reject) => {
-		wx.ready(function() {
-			wx.requestSubscribeMessage({
-			
-			tmplIds: sz,
-			
-				success(res) { 
-						resolve(res);
-				}
-				
-			})
-		})
-		
-
-	});
-	return promise;
-}
-

utils/wxpay.js

@@ -1,62 +0,0 @@
- 
-function onBridgeReady(params) {
-	
-	console.log("onBridgeReady+"+new Date().getTime())
-	
-	uni.showLoading({
-		mask:true,title:'加载中...'
-	})
-	//记录要回跳的url
-	// window.WeixinJSBridge.invoke(
-	// 	'getBrandWCPayRequest', {
-	// 		'appId': params.appId, // 公众号名称，由商户传入
-	// 		'timeStamp': params.timeStamp, // 时间戳，自1970年以来的秒数
-	// 		'nonceStr': params.nonceStr, // 随机串
-	// 		'package': params.package,
-	// 		'signType': params.signType, // 微信签名方式：
-	// 		'paySign': params.paySign // 微信签名
-	// 	},
-	// 	(res) => {
-	// 		//alert(JSON.stringify(res)); // 支付取消会执行 支付成功不会
-	// 		if (res.err_msg == 'get_brand_wcpay_request:ok') {
-	// 			//alert("支付成功") // 不会执行
-	// 			//var windowlocationhref = params.url
-	// 		} else if (res.err_msg == "get_brand_wcpay_request:cancel") {
-	// 			//alert("支付取消") // 会执行
-	// 			 uni.hideLoading();
-	// 		} else {
-	// 			alert("支付失败")
-	// 			 uni.hideLoading();
-	// 		}
-	// 	}
-	// )
-}
-
-export const wxPayJs = (params) => {
-	console.log("wxPayJs+"+new Date().getTime())
-	
-	uni.showLoading({
-		mask:true,title:'加载中...'
-	})
-	if (!params.url) {
-		params.url ="".split("#")[0] + "/#/";
-	}
-	//window.WeixinJSBridge
-	if (typeof "" === 'undefined') {
-		// addEventListener 小程序不支持
-		// if (document.addEventListener) {
-		// 	document.addEventListener('WeixinJSBridgeReady', function() {
-		// 		onBridgeReady(params)
-		// 	}, false)
-		// } else if (document.attachEvent) {
-		// 	document.attachEvent('WeixinJSBridgeReady', function() {
-		// 		onBridgeReady(params)
-		// 	})
-		// 	document.attachEvent('onWeixinJSBridgeReady', function() {
-		// 		onBridgeReady(params)
-		// 	})
-		// }
-	} else {
-		onBridgeReady(params)
-	}
-}