瀏覽代碼

1.沟通开通小程序微信认证
2.调试手机授权接口
3.调试提现接口
4.沟通返回列表类接口需要改变的数据类型
5.重新调试奖励记录接口及参数绑定

zizhong.wang 6 年之前
父節點
當前提交
070964f2c2

+ 1 - 0
App.vue

@@ -11,6 +11,7 @@
 			user_name:'',
 			user_phone:'',
 			user_headUrl:'',
+			lastId:'',
 			isAuth:true,
 			session_key: '',
 			inviteId:'',

+ 9 - 9
pages/auth/index.vue

@@ -11,7 +11,7 @@
 			<button type='default' class="refuse" @click="refuseBtn">暂不授权</button>
 			<button type='primary' class="allow" open-type="getUserInfo" @getuserinfo="getUserInfo" v-if="!isAuth">登录授权</button>
 			<button type="primary" class="allow"  open-type="getPhoneNumber"  style="font-size: 12px;"
-			bindgetphonenumber="getPhoneNumber" v-if="isAuth && !isNeedPhone">手机号码授权</button> 
+			@getphonenumber="getPhoneNumber" v-if="isAuth && !isNeedPhone">手机号码授权</button> 
 		</view>
 		
 	</view>
@@ -46,10 +46,10 @@
 			},
 			getPhoneNumber(e){
 				let that = this;
-				 if (e.detail.errMsg == 'getPhoneNumber:user deny') { //用户点击拒绝
-				 that.isNeedPhone = false;
-				} else { //允许授权执行跳转
-				  that.phoneRequest(e.detail.iv, e.detail.encryptedData, app.globalData.sessionKey)    
+				 if (e.detail.errMsg == 'getPhoneNumber:ok') { //允许授权执行跳转
+				  that.phoneRequest(e.detail.iv, e.detail.encryptedData, getApp().globalData.session_key)
+				} else { //
+				      that.isNeedPhone = false;
 				}
 			},
 			phoneRequest(myIv,myEncryptedData,sKey){
@@ -65,9 +65,9 @@
 						timestamp: getApp().globalData.globalTimestamp, //Date.now()
 						uid:getApp().globalData.user_id,
 						sign: md5('getPhoneNumber' + getApp().globalData.globalTimestamp),
-						iv:that.iv,
-						sessionKey:getApp().globalData.session_key,
-						encryptedData:that.encryptedData,
+						iv:myIv,
+						sessionKey:sKey,
+						encryptedData:myEncryptedData,
 					},
 					success: res => {
 						console.log(res)
@@ -97,7 +97,7 @@
 						// session_key:getApp().globalData.session_key,
 						// encryptedData:that.encryptedData,
 						auth_status:1,
-						shangjiid:getApp().globalData.inviteId || getApp().globalData.user_id
+						shangjiid:getApp().globalData.lastId
 					},
 					success: res => {
 						getApp().globalData.user_id = res.data.msg.id;

+ 2 - 2
pages/index/detailPage/index.vue

@@ -36,8 +36,8 @@
 				title: 'Hello'
 			}
 		},
-		onLoad() {
-
+		onLoad(option) {
+            console.log(option)
 		},
 		onShareAppMessage() {
 			console.log(111);

+ 9 - 6
pages/index/index.vue

@@ -18,7 +18,7 @@
 		<view class="product-title">推荐产品</view>
 	   
 		<view class="recommend-box">
-			<view class="product-box" v-for="item in productList" :key="item.id"  @click="goDetail">
+			<view class="product-box" v-for="item in productList" :key="item.id"  @click="goDetail(item.id)">
 				<image :src="item.imgUrl"></image>
 				<view class="detail-box">
 					<view>{{item.productTitle}}</view>
@@ -65,9 +65,10 @@
 				]
 			}
 		},
-		onLoad() {
+		onLoad(options) {
+		  getApp().globalData.lastId = options.inviteId ? options.inviteId : getApp().globalData.user_id
           this.loginRequest();
-		  this.getPageProductList();
+		  this.getPageProductList(); 
 		},
 		onShareAppMessage() {
 			console.log(111);
@@ -99,7 +100,7 @@
 									getApp().globalData.isAuth = res.data.msg.auth_status === '1';
 									getApp().globalData.user_name = res.data.msg.name;
 									getApp().globalData.user_headUrl = res.data.msg.headimg;
-									getApp().globalData.sessionId = res.data.msg.session_key;
+									getApp().globalData.session_key = res.data.msg.session_key;
 									getApp().globalData.user_phone = res.data.msg.phone;
 									// getApp().globalData.times = res.data.msg.times;
 									// getApp().globalData.total_times = res.data.msg.total_times;
@@ -132,6 +133,7 @@
 				});
 			},
 			 getPageProductList(){ //获取首页面产品列表接口
+			    let that = this;
 				uni.request({
 					url: getApp().globalData.shareUrl, //需要设置为全局
 					method: 'POST',
@@ -148,13 +150,14 @@
 					success: res => {
 						if (res.data.code === 200) {
 							console.log(res.data.msg)
+							//that.productList = res.data.msg;
 						}
 					}
 				});
 			},
-			 goDetail(){
+			 goDetail(id){
 				uni.navigateTo({
-					url: '/pages/index/detailPage/index',
+					url: '/pages/index/detailPage/index?detailId='+id,
 					success: res => {},
 					fail: () => {},
 					complete: () => {}

+ 29 - 24
pages/selfCenter/awardPage/index.vue

@@ -4,7 +4,7 @@
 		<view class="header-box"></view>
 		<view class="header-title">
 			<text style="margin-top: 4%;">累计积分</text>
-			<text style="margin-top: 2%;font-size: 36rpx;">66261</text>
+			<text style="margin-top: 2%;font-size: 36rpx;">{{totalNums || '0'}}</text>
 		</view>
 		
 		
@@ -15,10 +15,10 @@
 			</view>
 			
 			<view class="leader-info" v-for="item in teamList" :key='item.id'>
-				<image src="/static/bed2-bg.png"></image>
+				<image :src="item.headimg"></image>
 				<view class="leader-column">
 					<view>
-						<text>{{item.name}}</text>
+						<text>{{item.name || '-'}}</text>
 						<text style="visibility: hidden;">A</text>
 						<text>购买了产品</text>
 					</view>
@@ -27,7 +27,7 @@
 					</view>
 				</view>
 				<view class="count-sum">
-					{{item.count}}
+					{{item.score}}
 				</view>
 			</view>
 		
@@ -42,6 +42,7 @@ export default {
 	data() {
 		return {
 			title: 'selfCenter',
+			totalNums:'',
 			teamList: [
 				{
 					name: '晚霞',
@@ -75,26 +76,30 @@ export default {
 	},
 	methods: {
 		 getScoreList(){
-					 uni.request({
-					 	url: getApp().globalData.shareUrl, //需要设置为全局
-					 	method: 'POST',
-					 	header: {
-					 		'content-type': 'application/x-www-form-urlencoded'
-					 	},
-					 	data: {
-					 		method: 'getScoreList',
-					 		timestamp: getApp().globalData.globalTimestamp, //Date.now()
-					 		page: '',
-					 		pageSize:'',
-							uid:'1',
-					 		sign: md5('getScoreList' + getApp().globalData.globalTimestamp)
-					 	},
-					 	success: res => {
-					 		if (res.data.code === 200) {
-					 			console.log(res.data.msg)
-					 		}
-					 	}
-					 });
+			 let that = this;
+			 uni.request({
+				url: getApp().globalData.shareUrl, //需要设置为全局
+				method: 'POST',
+				header: {
+					'content-type': 'application/x-www-form-urlencoded'
+				},
+				data: {
+					method: 'getScoreList',
+					timestamp: getApp().globalData.globalTimestamp, //Date.now()
+					page: '',
+					pageSize:'',
+					//uid:getApp().globalData.user_id,
+					uid:'1',
+					sign: md5('getScoreList' + getApp().globalData.globalTimestamp)
+				},
+				success: res => {
+					if (res.data.code === 200) {
+						console.log(res.data.msg)
+						that.totalNums = res.data.msg.totality;
+						that.teamList = res.data.msg.list;
+					}
+				}
+			 });
 		}
 	}
 };

+ 78 - 4
pages/selfCenter/cashoutPage/applyPage/index.vue

@@ -6,28 +6,102 @@
 		
 		<view class="cash-input-box">
 			<text>¥</text>
-			<input type="number">
+			<input type="number" v-model="money">
 		</view>
 		
 		<view class="all-cash-out-box">
-			<text>当前积分为23982,可抵现金239.82,</text>
-			<text style="color: #1a9ed3;">全部提现</text>
+			<text>当前积分为{{userInfoObj.scorenumber || '0'}},可抵现金{{userInfoObj.nowmoney || '0'}},</text>
+			<text style="color: #1a9ed3;" @click.stop="getAll">全部提现</text>
 		</view>
 		
-		<button type="primary">提现</button>
+		<button type="primary" @click="getCash">提现</button>
 		
 	</view>
 </template>
 
 <script>
+var md5 = require('../../../../common/md5.js')
 export default {
 	data() {
 		return {
+			money:'',
+			userInfoObj:{},
 		};
 	},
 	onLoad() {
 	},
+	onShow() {
+		this.getUserInfo();
+	},
 	methods: {
+		getUserInfo(){
+				  let that = this;
+					 uni.request({
+						url: getApp().globalData.shareUrl, //需要设置为全局
+						method: 'POST',
+						header: {
+							'content-type': 'application/x-www-form-urlencoded'
+						},
+						data: {
+							method: 'getUserInfo',
+							timestamp: getApp().globalData.globalTimestamp, //Date.now()
+							uid:getApp().globalData.user_id,
+							sign: md5('getUserInfo' + getApp().globalData.globalTimestamp)
+						},
+						success: res => {
+							if (res.data.code === 200) {
+								console.log(res.data.msg)
+								that.userInfoObj = res.data.msg
+							}
+						}
+					 });
+		},
+		getCash(){
+			  let that = this;
+			  if(that.money > 0){
+			  	 uni.request({
+					url: getApp().globalData.shareUrl, //需要设置为全局
+					method: 'POST',
+					header: {
+						'content-type': 'application/x-www-form-urlencoded'
+					},
+					data: {
+						method: 'tixian',
+						timestamp: getApp().globalData.globalTimestamp, //Date.now()
+						uid:getApp().globalData.user_id,
+						num:that.money,
+						sign: md5('tixian' + getApp().globalData.globalTimestamp)
+					},
+					success: res => {
+						if (res.data.code === 200) {
+							uni.showToast({
+								title: '提现成功',
+								icon: 'none',
+								duration:2000
+							});
+							that.money = 0;
+							that.getUserInfo();
+						}else{
+						   uni.showToast({
+							title: res.data.msg,
+							icon: 'none',
+							duration:2000
+						   });
+					  }
+					}
+			  	});
+			  }else {
+				  uni.showToast({
+				  	title: '您的提现金额不足',
+				  	icon: 'none',
+					duration:2000
+				  });
+			  }
+				
+		   },
+		   getAll(){
+			   this.money = this.userInfoObj.nowmoney
+		   }
 	}
 };
 </script>

+ 1 - 1
pages/selfCenter/cashoutPage/index.vue

@@ -98,7 +98,7 @@ export default {
 					 		timestamp: getApp().globalData.globalTimestamp, //Date.now()
 					 		page: '',
 					 		pageSize:'',
-							uid:'1',
+							uid:getApp().globalData.user_id,
 					 		sign: md5('getWithdrawdepositList' + getApp().globalData.globalTimestamp)
 					 	},
 					 	success: res => {

+ 58 - 33
pages/selfCenter/index.vue

@@ -10,17 +10,17 @@
 					<text style="margin-left: 10%;">{{userName}}</text>
 					<text style="margin-left: 10%;font-size: 28rpx;" v-if="isAuthPhone">{{userPhone}} </text>
 					<button type="primary" class="authPhone"  open-type="getPhoneNumber"  style="font-size: 12px;"
-					bindgetphonenumber="getPhoneNumber" v-else>手机号码授权</button> 
+					@getphonenumber="getPhoneNumber" v-else>手机号码授权</button> 
 				</view>
 			</view>
 
 			<view class="self-content">
 				<view>
-					<text>13982</text>
+					<text>{{userInfoObj.scorenumber || '0'}}</text>
 					<text style="font-size: 28rpx;">我的积分</text>
 				</view>
 				<view>
-					<text>127.83元</text>
+					<text>{{userInfoObj.num || '0'}}元</text>
 					<text style="font-size: 28rpx;">已提现</text>
 				</view>
 			</view>
@@ -93,11 +93,14 @@ export default {
 			userHead:getApp().globalData.user_headUrl || '/static/logo.png',
 			userPhone:getApp().globalData.user_phone  || '156****3232',
 			isAuth:getApp().globalData.isAuth,
-			isAuthPhone:getApp().globalData.user_phone
+			isAuthPhone:getApp().globalData.user_phone,
+			userInfoObj:{}
 		}
 	},
 	onLoad() {
-      this.getUserInfo();
+	},
+	onShow() {
+		this.getUserInfo();
 	},
 	methods: {
 	 getUserInfo(){
@@ -111,24 +114,30 @@ export default {
 				data: {
 					method: 'getUserInfo',
 					timestamp: getApp().globalData.globalTimestamp, //Date.now()
-					uid:'1',
+					uid:getApp().globalData.user_id,
 					sign: md5('getUserInfo' + getApp().globalData.globalTimestamp)
 				},
 				success: res => {
 					if (res.data.code === 200) {
 						console.log(res.data.msg)
+						that.userInfoObj = res.data.msg
 						//that.cashOutList = res.data.msg
 					}
 				}
 			 });
 	 },
         goTeamDetail(){
-		 uni.navigateTo({
-		 	url: '/pages/selfCenter/recommendTeam/index',
-		 	success: res => {},
-		 	fail: () => {},
-		 	complete: () => {}
-		 });
+		 if(getApp().globalData.isAuth){
+			 uni.navigateTo({
+				url: '/pages/selfCenter/recommendTeam/index',
+				success: res => {},
+				fail: () => {},
+				complete: () => {}
+			}); 
+		 }else {
+			 this.goAuth()
+		 }	
+		
 	 },
 	 goRecommend(){
 		uni.switchTab({
@@ -136,20 +145,30 @@ export default {
 		})
 	 },
 	 goAward(){
-		  uni.navigateTo({
-		 	url: '/pages/selfCenter/awardPage/index',
-		 	success: res => {},
-		 	fail: () => {},
-		 	complete: () => {}
-		 });
+		 if(getApp().globalData.isAuth){
+			   uni.navigateTo({
+			 	url: '/pages/selfCenter/awardPage/index',
+			 	success: res => {},
+			 	fail: () => {},
+			 	complete: () => {}
+			 });
+		 }else {
+			 this.goAuth()
+		 }
+		
 	 },
 	 goCashOut(){
-	 	uni.navigateTo({
-	 		url: '/pages/selfCenter/cashoutPage/index',
-	 		success: res => {},
-	 		fail: () => {},
-	 		complete: () => {}
-	 	 });
+		 if(getApp().globalData.isAuth){
+			uni.navigateTo({
+				url: '/pages/selfCenter/cashoutPage/index',
+				success: res => {},
+				fail: () => {},
+				complete: () => {}
+			 }); 
+		 }else {
+			 this.goAuth()
+		 }
+	 	
 	 },
 	 goHelpPage(){
 	 	uni.navigateTo({
@@ -178,13 +197,17 @@ export default {
 	 },
 	 getPhoneNumber(e){
 	 	let that = this;
-	 	 if (e.detail.errMsg == 'getPhoneNumber:user deny') { //用户点击拒绝
-	 	 that.isNeedPhone = false;
-	 	} else { //允许授权执行跳转
-	 	  that.phoneRequest(e.detail.iv, e.detail.encryptedData, app.globalData.sessionKey)    
+		console.log(e)
+	 	 if (e.detail.errMsg == 'getPhoneNumber:ok') { //允许授权执行跳转
+		     console.log(e.detail.iv)
+			that.phoneRequest(e.detail.iv, e.detail.encryptedData, getApp().globalData.session_key)  
+			} 
+		else { 
+			 that.isNeedPhone = false;
 	 	}
 	 },
-	 		phoneRequest(myIv,myEncryptedData,sKey){
+	 phoneRequest(myIv,myEncryptedData,sKey){
+		 console.log(11111)
 	 	let that = this;
 	 	uni.request({
 	 		url:getApp().globalData.shareUrl, //需要设置为全局
@@ -197,12 +220,14 @@ export default {
 	 			timestamp: getApp().globalData.globalTimestamp, //Date.now()
 	 			uid:getApp().globalData.user_id,
 	 			sign: md5('getPhoneNumber' + getApp().globalData.globalTimestamp),
-	 			iv:that.iv,
-	 			sessionKey:getApp().globalData.session_key,
-	 			encryptedData:that.encryptedData,
+	 			iv:myIv,
+	 			sessionKey:sKey,
+	 			encryptedData:myEncryptedData,
 	 		},
 	 		success: res => {
-	 			console.log(res)
+	 			if(res.data.code === 200){
+					getApp().globalData.user_phone = res.data.msg.phoneNumber;
+				}
 	 		} 
 	 	});
 	 },

+ 24 - 0
pages/selfCenter/recommendTeam/index.vue

@@ -46,6 +46,7 @@
 </template>
 
 <script>
+var md5 = require('../../../common/md5.js')
 export default {
 	data() {
 		return {
@@ -98,6 +99,7 @@ export default {
 	},
 	onLoad() {
 		this.filterSelf();
+		this.getTeamRequest()
 	},
 	methods: {
 		filterSelf() {
@@ -113,6 +115,28 @@ export default {
 				that.arrowFlagList.push(false);
 			}
 		},
+		getTeamRequest(){
+			  let that = this;
+						 uni.request({
+							url: getApp().globalData.shareUrl, //需要设置为全局
+							method: 'POST',
+							header: {
+								'content-type': 'application/x-www-form-urlencoded'
+							},
+							data: {
+								method: 'getUserTeamList',
+								timestamp: getApp().globalData.globalTimestamp, //Date.now()
+								uid:getApp().globalData.user_id,
+								sign: md5('getUserTeamList' + getApp().globalData.globalTimestamp)
+							},
+							success: res => {
+								if (res.data.code === 200) {
+									console.log(res.data.msg)
+									//that.cashOutList = res.data.msg
+								}
+							}
+						 });
+		},
 		showChild(index) {
 			this.arrowFlagList.splice(index, 1, !this.arrowFlagList[index]);
 		}