个人中心新增绑定关系

apis/index.js

@@ -10,8 +10,8 @@ import router from '../router'
 
 // 基础配置
 const config = {
-	// apiUrl	: 'https://api.gongli.vip/api/', // 正式环境
-	apiUrl	: 'http://api.gl.shangkelian.cn/api/', //  测试
+	apiUrl	: 'https://api.gongli.vip/api/', // 正式环境
+	// apiUrl	: 'http://api.gl.shangkelian.cn/api/', //  测试
 	timeout	: 60000
 }
 

apis/interfaces/user.js

@@ -30,8 +30,31 @@ const invitationCode = () => {
 	})
 }
 
+// 绑定分享关系
+const relationsBind = (invite) => {
+	return request({
+		url: 'user/relations/bind',
+		data: {
+			invite
+		},
+		method: 'POST'
+	})
+}
+
+// 确认绑定关系
+const relationsVerify = (invite) => {
+	return request({
+		url: 'user/relations/verify',
+		data: {
+			invite
+		}
+	})
+}
+
 export {
 	info,
 	chainSeed,
-	invitationCode
+	invitationCode,
+	relationsBind,
+	relationsVerify
 }

manifest.json

@@ -2,7 +2,7 @@
     "name" : "共力生态",
     "appid" : "__UNI__DE7B0E6",
     "description" : "共力生态",
-    "versionName" : "1.0.35",
+    "versionName" : "1.0.36",
     "versionCode" : 100,
     "transformPx" : false,
     /* 5+App特有相关 */
@@ -97,9 +97,7 @@
                         "UniversalLinks" : ""
                     }
                 },
-                "ad" : {
-                    "sigmob" : {}
-                },
+                "ad" : {},
                 "push" : {},
                 "geolocation" : {
                     "system" : {

pages/life/capacity.vue

@@ -128,7 +128,9 @@
                     confirmText: '立即重置',
                     cancelColor: '#999',
                     cancelText: '再想想',
-                    success: (res1) => {
+                    success: (res1) => {
+						this.Sign()
+						return
                         if (res1.confirm) {
                             this.checkIMEI().then(res => {
                                 switch (res) {

pages/life/life.vue

@@ -33,12 +33,12 @@
 				</view>
 			</view>
 			<!-- 微信阅读 -->
-			<view class="reading" v-if="!isOver">
+			<!-- <view class="reading" v-if="!isOver">
 				<view class="reading-icon number-float" @click="onReading">
 					<image class="reading-icon-image" :src="require('@/static/icon/reading_btn.png')" alt="签到"></image>
 				</view>
 				<view class="reading-title">共力分加成</view>
-			</view>
+			</view> -->
 			<image class="life-cover-back" :src="require('@/static/life/back.png')"></image>
 			<view class="life-role">
 				<image class="life-role-src" :src="figurePath" mode="widthFix" />
@@ -221,7 +221,10 @@
 				if(this.isSign){
 					this.$Router.push({name: 'Capacity'})
 					return
-				}
+				}
+				// 签到
+				this.Sign()
+				return
 				this.checkIMEI().then(res => {
 					switch (res) {
 						case 'Permanent':

pages/user/index.vue

@@ -130,7 +130,19 @@
                 供应商入驻
                 <uni-icons class="forward" type="forward" color="#999" />
             </view>
-        </view>
+        </view>
+		<view class="btns-box">
+			<view class="btns-box-item" @click="onShare">
+			    <image class="icon" src="@/static/user/userIcon_14.png" mode="widthFix" />
+			    绑定分享关系
+				<block v-if="share == null">
+					<uni-icons class="forward" type="forward" color="#999" />
+				</block>
+				<block v-else>
+					<text class="forward" style="color: gray;">{{share.nickname}}</text>
+				</block>
+			</view>
+		</view>
         <view class="btns-box">
             <view class="btns-box-item" @click="onBtn('Feedback', {})">
                 <image class="icon" src="@/static/user/userIcon_06.png" mode="widthFix" />
@@ -190,21 +202,46 @@
                         placeholder="输入支付密码" />
                 </view>
             </slot>
-        </u-modal>
+        </u-modal>
+		<!-- 绑定分享关系 -->
+		<u-modal
+			:show="showBind"
+			confirmColor="#34CE98"
+			:showCancelButton="true"
+			:confirmText="isInvitation ? '校验邀请码': '绑定关系'"
+			@cancel="()=> {
+				this.showBind = false
+				this.isInvitation = true
+				this.invitation = ''
+			}"
+			@confirm="onBind"
+		>
+			<slot>
+				<view class="bind-view" v-if="isInvitation">
+					<view class="bind-title">邀请码</view>
+					<view class="bind-subtitle">请输入好友的邀请码</view>
+					<view class="bind-input">
+						<input type="text" v-model="invitation" placeholder="输入邀请码">
+					</view>
+				</view>
+				<view class="bind-user" v-else>
+					<view class="bind-title">邀请用户</view>
+					<view class="bind-subtitle">请确认绑定关系用户信息</view>
+					<view class="bind-acitve">
+						<image :src="invitationUser.avatar" mode="aspectFill"></image>
+					</view>
+					<view class="bind-nickname">{{invitationUser.nickname}}</view>
+					<view class="bind-username">{{invitationUser.username}}</view>
+				</view>
+			</slot>
+		</u-modal>
     </view>
 </template>
 
 <script>
-    import {
-        info,
-        chainSeed
-    } from '@/apis/interfaces/user';
-    import {
-        payPassword
-    } from '@/apis/interfaces/account.js'
-    import {
-        getVersions
-    } from '@/apis/interfaces/versions.js'
+    import { info, chainSeed, relationsBind, relationsVerify } from '@/apis/interfaces/user';
+    import { payPassword } from '@/apis/interfaces/account.js'
+    import { getVersions } from '@/apis/interfaces/versions.js'
     export default {
         data() {
             return {
@@ -243,7 +280,13 @@
                 canSeeData: false,
                 messages:0,
                 wbtAccount:'',
-                wbtShow:false,
+                wbtShow:false,
+				// 绑定关系
+				share			: null,
+				showBind		: false,
+				invitation		: '',
+				isInvitation	: true,
+				invitationUser	: {}
             };
         },
         onShow() {
@@ -252,7 +295,6 @@
         },
         methods: {
             onWbt(){
-                console.log(this.wbtAccount);
                 if(this.wbtAccount === ''){
                     uni.showModal({
                         title:'温馨提示',
@@ -266,40 +308,86 @@
                         }
                     })
                 }else{
-                    console.log('....')
                     this.wbtShow = true;
                 }
-            },
+            },
+			// 绑定分享关系
+			onShare(){
+				if(this.share != null){
+					return
+				}
+				this.showBind = true
+			},
+			// 绑定邀请码
+			onBind(){
+				// 检验邀请码
+				if(this.isInvitation){
+					if(this.invitation === ''){
+						uni.showToast({
+							title: '请输入邀请码',
+							icon : 'none'
+						})
+						return
+					}
+					relationsVerify(this.invitation).then(res => {
+						this.invitationUser = res
+						this.isInvitation = false
+					}).catch(err => {
+						uni.showToast({
+							title: err.message,
+							icon : 'none'
+						})
+					})
+					return
+				}
+				// 绑定关系
+				relationsBind(this.invitation).then(res => {
+					this.showBind = false
+					uni.showModal({
+						title		: '提示',
+						content		: '关系绑定成功',
+						showCancel	: false,
+						success		: res => {
+							this.getInfo()
+						}
+					})
+				}).catch(err => {
+					uni.showToast({
+						title: err.message,
+						icon : 'none'
+					})
+				})
+			},
             // 用户信息
             getInfo() {
                 if (this.$store.state.token === '') return;
                 info().then(res => {
-                        uni.setNavigationBarTitle({
-                            title: res.nickname
-                        });
-                        this.canSeeData = res.can_see_data
-                        this.order = res.order
-                        this.cardText = res.identity_array
-                        this.userInfo = {
-                            nickname: res.nickname,
-                            addr: res.addr,
-                            avatar: res.avatar,
-                            isOpenVip: res.is_open_vip,
-                            username: res.username
-                        }
-                        this.identity = res.identity;
-                        this.account = res.account;
-                        this.serial = res.serial;
-                        this.hasPassword = res.has_transfer_password;
-                        this.messages = Number(res.messages);
-                        this.wbtAccount = res.wbt_account;
-                    })
-                    .catch(err => {
-                        uni.showToast({
-                            title: err.message,
-                            icon: 'none'
-                        });
-                    });
+					uni.setNavigationBarTitle({
+						title: res.nickname
+					});
+					this.share		= String(res.share) == '' ? null : res.share
+					this.canSeeData = res.can_see_data
+					this.order = res.order
+					this.cardText = res.identity_array
+					this.userInfo = {
+						nickname: res.nickname,
+						addr: res.addr,
+						avatar: res.avatar,
+						isOpenVip: res.is_open_vip,
+						username: res.username
+					}
+					this.identity = res.identity;
+					this.account = res.account;
+					this.serial = res.serial;
+					this.hasPassword = res.has_transfer_password;
+					this.messages = Number(res.messages);
+					this.wbtAccount = res.wbt_account;
+				}).catch(err => {
+					uni.showToast({
+						title: err.message,
+						icon: 'none'
+					});
+				});
             },
             // 导出助记词
             onMnemonic() {
@@ -499,8 +587,82 @@
     .content {
         background: $window-color;
         min-height: 100vh;
-    }
-
+    }
+	
+	// 邀请码
+	.bind-view{
+		padding: 15rpx 30rpx;
+		width: 100%;
+		box-sizing: border-box;
+		.bind-title{
+			text-align: center;
+			font-size: 36rpx;
+			font-weight: bold;
+		}
+		.bind-subtitle{
+			line-height: 40rpx;
+			font-size: 28rpx;
+			color: gray;
+			padding-top: 15rpx;
+			text-align: center;
+		}
+		.bind-input{
+			padding-top: 30rpx;
+			input{
+				background: #f8f8f8;
+				width: 100%;
+				height: 80rpx;
+				padding: 0 30rpx;
+				border-radius: 40rpx;
+				text-align: center;
+				box-sizing: border-box;
+				font-size: 32rpx;
+				font-weight: bold;
+			}
+		}
+	}
+	// 确认绑定用户关系
+	.bind-user{
+		padding: 15rpx 30rpx;
+		width: 100%;
+		box-sizing: border-box;
+		.bind-title{
+			text-align: center;
+			font-size: 36rpx;
+			font-weight: bold;
+		}
+		.bind-subtitle{
+			line-height: 40rpx;
+			font-size: 28rpx;
+			color: gray;
+			padding-top: 15rpx;
+			text-align: center;
+		}
+		.bind-acitve{
+			text-align: center;
+			padding-top: 30rpx;
+			image{
+				width: 108rpx;
+				height: 108rpx;
+				background: #f8f8f8;
+				border-radius: 50%;
+			}
+		}
+		.bind-nickname{
+			text-align: center;
+			font-size: 32rpx;
+			color: #333;
+			font-weight: bold;
+			line-height: 40rpx;
+			padding-top: 20rpx;
+		}
+		.bind-username{
+			text-align: center;
+			font-weight: bold;
+			font-size: 28rpx;
+			color: gray;
+		}
+	}
     // 版权信息
     .footer-text {
         text-align: center;