cmy 2 rokov pred
rodič
commit
4970d1305d

+ 6 - 0
api/user.js

@@ -227,6 +227,12 @@ export function getBaseIntegralList(q) {
 export function getReloadIntegralList(q) {
 	return request.get("reorder_integral/list", q);
 }
+/*
+ * 余额转账
+ * */
+export function changeMoneyTarget(q) {
+	return request.post("money/transfer", q);
+}
 /**
  * 获取分销海报图片
  * 

+ 1 - 1
components/productWindow/index.vue

@@ -17,7 +17,7 @@
 					<view class="money font-color">
 						<view class="acea-row row-middle">
 							<text v-if="type =='points'">
-								<text v-if="parseFloat(attr.productSelect.integral)"><text class="num">{{ attr.productSelect.integral }}</text>积分</text>
+								<text v-if="parseFloat(attr.productSelect.integral)"><text class="num">{{ attr.productSelect.integral }}</text>绿积分</text>
 								<text v-if="parseFloat(attr.productSelect.price) && parseFloat(attr.productSelect.integral)">+</text>
 								<text v-if="parseFloat(attr.productSelect.price)">¥<text class="num">{{ attr.productSelect.price }}</text></text>
 							</text>

+ 3 - 3
manifest.json

@@ -1,9 +1,9 @@
 {
     "name" : "壹柒科技",
-    "appid" : "__UNI__B0B5BE7",
+    "appid" : "__UNI__70BC0AE",
     "description" : "壹柒科技",
-    "versionName" : "2.7.3",
-    "versionCode" : 273,
+    "versionName" : "2.7.4",
+    "versionCode" : 274,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {

+ 1 - 1
pages/points_mall/index.vue

@@ -31,7 +31,7 @@
 					<view class="info">
 						<view class="title line1">{{ item.title }}</view>
 						<view class="price-box">
-							<text v-if="parseFloat(item.integral)">{{ item.integral }}积分</text>
+							<text v-if="parseFloat(item.integral)">{{ item.integral }}绿积分</text>
 							<text v-if="parseFloat(item.integral) && parseFloat(item.price)">+</text>
 							<text v-if="parseFloat(item.price)">{{ item.price }}元</text>
 						</view>

+ 3 - 3
pages/points_mall/integral_goods_list.vue

@@ -13,7 +13,7 @@
 			<view class='nav acea-row row-middle'>
 				<view class='item line1' :class='title ? "font-num":""' @click='set_where(1)'>默认</view>
 				<view class='item' @click='set_where(2)'>
-					积分
+					绿积分
 					<image v-if="price==1" src='../../static/images/up.png'></image>
 					<image v-else-if="price==2" src='../../static/images/down.png'></image>
 					<image v-else src='../../static/images/horn.png'></image>
@@ -34,12 +34,12 @@
 					<view class='text' :class='is_switch==true?"":"on"'>
 						<view class='name line1'>{{item.title}}</view>
 						<view class='money font-color' :class='is_switch==true?"":"on"'>
-							<text class="num" v-if="parseFloat(item.integral)">{{ item.integral }}积分</text>
+							<text class="num" v-if="parseFloat(item.integral)">{{ item.integral }}绿积分</text>
 							<text class="num" v-if="parseFloat(item.integral) && parseFloat(item.price)">+</text>
 							<text class="num" v-if="parseFloat(item.price)">{{ item.price }}元</text>
 						</view>
 						<view class='vip acea-row row-between-wrapper' :class='is_switch==true?"":"on"'>
-							<view class='vip-money' v-if="item.vip_price && item.vip_price > 0">{{item.vip_price}}积分
+							<view class='vip-money' v-if="item.vip_price && item.vip_price > 0">{{item.vip_price}}绿积分
 								<image src='../../static/images/vip.png'></image>
 							</view>
 							<view class="sales">

+ 5 - 5
pages/points_mall/integral_order.vue

@@ -37,12 +37,12 @@
 							<view class='attr line1' v-if="cartInfo.attrInfo">{{cartInfo.attrInfo.suk}}
 							</view>
 							<view class='money font-color' v-if="cartInfo.attrInfo">
-								<text v-if="parseFloat(cartInfo.attrInfo.integral)">{{cartInfo.attrInfo.integral}}积分</text>
+								<text v-if="parseFloat(cartInfo.attrInfo.integral)">{{cartInfo.attrInfo.integral}}绿积分</text>
 								<text v-if="parseFloat(cartInfo.attrInfo.integral) && parseFloat(cartInfo.attrInfo.price)">+</text>
 								<text v-if="parseFloat(cartInfo.attrInfo.price)">{{cartInfo.attrInfo.price}}元</text>
 							</view>
 							<view class='money font-color' v-else>
-								<text v-if="parseFloat(cartInfo.integral)">{{cartInfo.integral}}积分</text>
+								<text v-if="parseFloat(cartInfo.integral)">{{cartInfo.integral}}绿积分</text>
 								<text v-if="parseFloat(cartInfo.integral) && parseFloat(cartInfo.price)">+</text>
 								<text v-if="parseFloat(cartInfo.price)">{{cartInfo.price}}元</text>
 							</view>
@@ -181,12 +181,12 @@
 			</view>
 			<view class='wrapper'>
 				<view class='item acea-row row-between-wrapper'>
-					<view>可用积分</view>
+					<view>可用绿积分</view>
 					<view class='discount'>{{resData.integral}}
 					</view>
 				</view>
 				<view class='item acea-row row-between-wrapper'>
-					<view>抵扣积分</view>
+					<view>抵扣绿积分</view>
 					<view class='discount'>{{resData.total_integral}}
 					</view>
 				</view>
@@ -205,7 +205,7 @@
 			<view style='height:120rpx;'></view>
 			<view class='footer acea-row row-between-wrapper'>
 				<view>合计:
-					<text class='font-color' v-if="parseFloat(resData.total_integral)">{{resData.total_integral || 0}}积分</text>
+					<text class='font-color' v-if="parseFloat(resData.total_integral)">{{resData.total_integral || 0}}绿积分</text>
 					<text class="font-color" v-if="parseFloat(resData.total_integral) && parseFloat(resData.total_price)">+</text>
 					<text class="font-color" v-if="parseFloat(resData.total_price)">{{resData.total_price || 0}}元</text>
 				</view>

+ 1 - 1
pages/points_mall/integral_order_details.vue

@@ -24,7 +24,7 @@
 							</view>
 							<view class='attr line1' v-if="cartInfo.attrInfo">{{cartInfo.attrInfo.suk}}</view>
 							<view class='money font-num'>
-								<text v-if="parseFloat(cartInfo.integral)">{{cartInfo.integral}}积分</text>
+								<text v-if="parseFloat(cartInfo.integral)">{{cartInfo.integral}}绿积分</text>
 								<text v-if="parseFloat(cartInfo.integral) && parseFloat(cartInfo.price)">+</text>
 								<text v-if="parseFloat(cartInfo.price)">{{cartInfo.price}}元</text>
 							</view>

+ 2 - 2
pages/points_mall/integral_order_status.vue

@@ -18,8 +18,8 @@
 				</view>
 				<view class='item acea-row row-between-wrapper'>
 					<view>兑换方式</view>
-					<view class="itemCom" v-if="parseFloat(order_pay_info.total_price) && parseFloat(order_pay_info.total_integral)">积分+金额兑换</view>
-					<view class='itemCom' v-else-if="parseFloat(order_pay_info.total_integral)">积分兑换</view>
+					<view class="itemCom" v-if="parseFloat(order_pay_info.total_price) && parseFloat(order_pay_info.total_integral)">绿积分+金额兑换</view>
+					<view class='itemCom' v-else-if="parseFloat(order_pay_info.total_integral)">绿积分兑换</view>
 					<view class="itemCom" v-else-if="parseFloat(order_pay_info.total_price)">金额兑换</view>
 				</view>
 				<view class='item acea-row row-between-wrapper' v-if="parseFloat(order_pay_info.total_integral)">

+ 1 - 1
pages/points_mall/logistics_details.vue

@@ -8,7 +8,7 @@
 				<view class='text acea-row row-between'>
 					<view class='name line2'>{{orderInfo.store_name}}</view>
 					<view class='money'>
-						<view>{{orderInfo.total_price}}积分</view>
+						<view>{{orderInfo.total_price}}绿积分</view>
 						<view>x{{orderInfo.total_num}}</view>
 					</view>
 				</view>

+ 79 - 46
pages/users/user_cash/index.vue

@@ -14,7 +14,9 @@
 						<view class='item acea-row row-between-wrapper'>
 							<view class='name'>持卡人</view>
 							<view class='input'><input placeholder='请输入持卡人姓名' placeholder-class='placeholder'
-									name="name" onKeypress="javascript:if(event.keyCode == 32)event.returnValue = false;"></input></view>
+									name="name"
+									onKeypress="javascript:if(event.keyCode == 32)event.returnValue = false;"></input>
+							</view>
 						</view>
 						<view class='item acea-row row-between-wrapper'>
 							<view class='name'>卡号</view>
@@ -32,15 +34,22 @@
 						</view>
 						<view class='item acea-row row-between-wrapper'>
 							<view class='name'>提现</view>
-							<view class='input'><input @input='inputNum' :maxlength="moneyMaxLeng" :placeholder='"最低提现金额:¥"+minPrice' placeholder-class='placeholder'
-									name="money" type='digit'></input></view>
+							<view class='input'><input @input='inputNum' :maxlength="moneyMaxLeng"
+									:placeholder='"最低提现金额:¥"+minPrice' placeholder-class='placeholder' name="money"
+									type='digit'></input></view>
 						</view>
 						<view class='tip'>
 							当前可提现金额: <text
 								class="price">¥{{userInfo.commissionCount}}</text>,冻结佣金:¥{{userInfo.broken_commission}}
 						</view>
 						<view class='tip'>
-							提现手续费: <text class="price">{{withdraw_fee}}%</text>,实际到账:<text class="price">¥{{true_money}}</text>
+							提现手续费: <text class="price">{{withdraw_fee}}%</text>
+						</view>
+						<view class='tip'>
+							到账复投积分: <text class="price">{{true_int}}</text>,到账余额:<text class="price">{{true_ye}}</text>
+						</view>
+						<view class='tip'>
+							实际到账:<text class="price">¥{{true_money}}</text>
 						</view>
 						<view class='tip'>
 							说明: 每笔佣金的冻结期为{{userInfo.broken_day}}天,到期后可提现
@@ -53,12 +62,15 @@
 						<view class='item acea-row row-between-wrapper' v-if="extract_wechat_type == 0">
 							<view class='name'>账号</view>
 							<view class='input'><input placeholder='请填写您的微信账号' placeholder-class='placeholder'
-									name="name" onKeypress="javascript:if(event.keyCode == 32)event.returnValue = false;"></input></view>
+									name="name"
+									onKeypress="javascript:if(event.keyCode == 32)event.returnValue = false;"></input>
+							</view>
 						</view>
 						<view class='item acea-row row-between-wrapper'>
 							<view class='name'>提现</view>
-							<view class='input'><input @input='inputNum' :maxlength="moneyMaxLeng" :placeholder='"最低提现金额:¥"+minPrice' placeholder-class='placeholder'
-									name="money" type='digit'></input></view>
+							<view class='input'><input @input='inputNum' :maxlength="moneyMaxLeng"
+									:placeholder='"最低提现金额:¥"+minPrice' placeholder-class='placeholder' name="money"
+									type='digit'></input></view>
 						</view>
 						<view class='item acea-row row-top row-between' v-if="extract_wechat_type == 0">
 							<view class='name'>收款码</view>
@@ -79,7 +91,13 @@
 								class="price">¥{{userInfo.commissionCount}}</text>,冻结佣金:¥{{userInfo.broken_commission}}
 						</view>
 						<view class='tip'>
-							提现手续费: <text class="price">{{withdraw_fee}}%</text>,实际到账:<text class="price">¥{{true_money}}</text>
+							提现手续费: <text class="price">{{withdraw_fee}}%</text>
+						</view>
+						<view class='tip'>
+							到账复投积分: <text class="price">{{true_int}}</text>,到账余额:<text class="price">{{true_ye}}</text>
+						</view>
+						<view class='tip'>
+							实际到账:<text class="price">¥{{true_money}}</text>
 						</view>
 						<view class='tip'>
 							说明: 每笔佣金的冻结期为{{userInfo.broken_day}}天,到期后可提现
@@ -92,12 +110,15 @@
 						<view class='item acea-row row-between-wrapper'>
 							<view class='name'>账号</view>
 							<view class='input'><input placeholder='请填写您的支付宝账号' placeholder-class='placeholder'
-									name="name" onKeypress="javascript:if(event.keyCode == 32)event.returnValue = false;"></input></view>
+									name="name"
+									onKeypress="javascript:if(event.keyCode == 32)event.returnValue = false;"></input>
+							</view>
 						</view>
 						<view class='item acea-row row-between-wrapper'>
 							<view class='name'>提现</view>
-							<view class='input'><input @input='inputNum' :maxlength="moneyMaxLeng" :placeholder='"最低提现金额:¥"+minPrice' placeholder-class='placeholder'
-									name="money" type='digit'></input></view>
+							<view class='input'><input @input='inputNum' :maxlength="moneyMaxLeng"
+									:placeholder='"最低提现金额:¥"+minPrice' placeholder-class='placeholder' name="money"
+									type='digit'></input></view>
 						</view>
 						<view class='item acea-row row-top row-between'>
 							<view class='name'>收款码</view>
@@ -118,7 +139,13 @@
 								class="price">¥{{userInfo.commissionCount}}</text>,冻结佣金:¥{{userInfo.broken_commission}}
 						</view>
 						<view class='tip'>
-							提现手续费: <text class="price">{{withdraw_fee}}%</text>,实际到账:<text class="price">¥{{true_money}}</text>
+							提现手续费: <text class="price">{{withdraw_fee}}%</text>
+						</view>
+						<view class='tip'>
+							到账复投积分: <text class="price">{{true_int}}</text>,到账余额:<text class="price">{{true_ye}}</text>
+						</view>
+						<view class='tip'>
+							实际到账:<text class="price">¥{{true_money}}</text>
 						</view>
 						<view class='tip'>
 							说明: 每笔佣金的冻结期为{{userInfo.broken_day}}天,到期后可提现
@@ -149,7 +176,7 @@
 	import colors from '@/mixins/color.js';
 	export default {
 		components: {},
-		mixins:[colors],
+		mixins: [colors],
 		data() {
 			return {
 				navList: [],
@@ -166,8 +193,12 @@
 				prevent: true, //避免重复提交成功多次
 				moneyMaxLeng: 8,
 				withdraw_fee: '0',
-				true_money: 0,
-				extract_wechat_type:0
+				true_money: 0, //实际到账
+				true_int: 0, //到账疾风
+				true_ye: 0, //到账余额
+				extract_wechat_type: 0,
+				cash_to_reorder_integral: 0,
+				cash_to_now_money: 0,
 			};
 		},
 		computed: mapGetters(['isLogin']),
@@ -204,12 +235,16 @@
 			inputNum: function(e) {
 				let val = e.detail.value;
 				let dot = val.indexOf('.');
-				if(dot>-1){
-					this.moneyMaxLeng = dot+3;
-				}else{
+				if (dot > -1) {
+					this.moneyMaxLeng = dot + 3;
+				} else {
 					this.moneyMaxLeng = 8
 				}
-				this.true_money = Math.floor((this.$util.$h.Mul(val,this.$util.$h.Div(this.$util.$h.Sub(100,this.withdraw_fee),100)))*100)/100 || 0;
+				let money =  Math.floor((this.$util.$h.Mul(val, this.$util.$h.Div(this.$util.$h.Sub(100, this.withdraw_fee), 100))) * 100) / 100 || 0;
+				this.true_int = this.$util.$h.Div(this.$util.$h.Mul(this.cash_to_reorder_integral, money), 100);
+				this.true_ye = this.$util.$h.Div(this.$util.$h.Mul(this.cash_to_now_money, money), 100);
+				let bfb =this.$util.$h.Add(this.cash_to_now_money,this.cash_to_reorder_integral);
+				this.true_money = Math.floor((this.$util.$h.Mul(money, this.$util.$h.Div(this.$util.$h.Sub(100, bfb), 100))) * 100) / 100 || 0;
 			},
 			// uploadpicW(){
 			// 	this.uploadpic(this.qrcodeUrlW);
@@ -259,6 +294,8 @@
 					that.minPrice = res.data.minPrice;
 					that.withdraw_fee = res.data.withdraw_fee;
 					that.extract_wechat_type = res.data.extract_wechat_type;
+					that.cash_to_reorder_integral = res.data.cash_to_reorder_integral;
+					that.cash_to_now_money = res.data.cash_to_now_money;
 				});
 			},
 			/**
@@ -268,32 +305,26 @@
 				let that = this;
 				getUserInfo().then(res => {
 					that.userInfo = res.data;
-					if(res.data.user_extract_bank_status){
-						this.navList.push(
-						{
-								'name': '银行卡',
-								'icon': 'icon-yinhangqia',
-								'id': 0
-							}
-						)
+					if (res.data.user_extract_bank_status) {
+						this.navList.push({
+							'name': '银行卡',
+							'icon': 'icon-yinhangqia',
+							'id': 0
+						})
 					}
-					if(res.data.user_extract_wechat_status){
-						this.navList.push(
-							{
-								'name': '微信',
-								'icon': 'icon-weixin2',
-								'id': 1
-							}
-						)
+					if (res.data.user_extract_wechat_status) {
+						this.navList.push({
+							'name': '微信',
+							'icon': 'icon-weixin2',
+							'id': 1
+						})
 					}
-					if(res.data.user_extract_alipay_status){
-						this.navList.push(
-							{
-								'name': '支付宝',
-								'icon': 'icon-icon34',
-								'id': 2
-							}
-						)
+					if (res.data.user_extract_alipay_status) {
+						this.navList.push({
+							'name': '支付宝',
+							'icon': 'icon-icon34',
+							'id': 2
+						})
 					}
 					this.currentTab = this.navList[0].id;
 				})
@@ -321,7 +352,7 @@
 					value.bankname = that.array[that.index];
 				} else if (that.currentTab == 1) { //微信
 					value.extract_type = 'weixin';
-					if(that.extract_wechat_type == 0){
+					if (that.extract_wechat_type == 0) {
 						if (value.name.length == 0) return this.$util.Tips({
 							title: '请填写微信号'
 						});
@@ -379,9 +410,11 @@
 	page {
 		background-color: #fff !important;
 	}
-	.fontcolor{
+
+	.fontcolor {
 		color: var(--view-theme) !important;
 	}
+
 	.cash-withdrawal .nav {
 		height: 130rpx;
 		box-shadow: 0 10rpx 10rpx #f8f8f8;
@@ -530,4 +563,4 @@
 	.price {
 		color: var(--view-priceColor);
 	}
-</style>
+</style>

+ 212 - 23
pages/users/user_money/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <!-- 我的余额模块 -->
+	<!-- 我的余额模块 -->
 	<view :style="colorStyle">
 		<view class='my-account'>
 			<view class='wrapper'>
@@ -10,14 +10,17 @@
 								<view>总资产(元)</view>
 								<view class='money'>{{userInfo.now_money || 0}}</view>
 							</view>
-							<!-- #ifdef APP-PLUS || H5 -->
-							<navigator url="/pages/users/user_payment/index" hover-class="none"
-								class='recharge'>充值</navigator>
-							<!-- #endif -->
-							<!-- #ifdef MP -->
-							<view v-if="recharge_switch" @click="openSubscribe('/pages/users/user_payment/index')"
-								class='recharge'>充值</view>
-							<!-- #endif -->
+							<view class="">
+								<!-- #ifdef APP-PLUS || H5 -->
+								<navigator url="/pages/users/user_payment/index" hover-class="none" class='recharge'>充值
+								</navigator>
+								<!-- #endif -->
+								<!-- #ifdef MP -->
+								<view v-if="recharge_switch" @click="openSubscribe('/pages/users/user_payment/index')"
+									class='recharge'>充值</view>
+								<!-- #endif -->
+								<view class='recharge-hz' @click="$refs.popup.open">互转</view>
+							</view>
 						</view>
 						<view class='cumulative acea-row row-top'>
 							<!-- #ifdef APP-PLUS || H5 -->
@@ -48,7 +51,8 @@
 						<view class='iconfont icon-s-xiaofeijilu'></view>
 						<view>消费记录</view>
 					</navigator>
-					<navigator class='item' hover-class='none' url='/pages/users/user_bill/index?type=2' v-if="recharge_switch">
+					<navigator class='item' hover-class='none' url='/pages/users/user_bill/index?type=2'
+						v-if="recharge_switch">
 						<view class='iconfont icon-s-chongzhijilu'></view>
 						<view>充值记录</view>
 					</navigator>
@@ -88,8 +92,8 @@
 								<view class='infor line1'>最新的优惠商品上架拼团</view>
 							</view>
 						</view>
-						<navigator hover-class='none' url='/pages/activity/goods_combination/index' class='bnt acea-row row-center-wrapper'
-							v-if="activity.is_pink">立即参与</navigator>
+						<navigator hover-class='none' url='/pages/activity/goods_combination/index'
+							class='bnt acea-row row-center-wrapper' v-if="activity.is_pink">立即参与</navigator>
 						<view class='bnt acea-row row-center-wrapper end' v-else>已结束</view>
 					</view>
 					<view class='item acea-row row-between-wrapper'>
@@ -100,8 +104,8 @@
 								<view class='infor line1'>最新商品秒杀进行中</view>
 							</view>
 						</view>
-						<navigator hover-class='none' url='/pages/activity/goods_seckill/index' class='bnt acea-row row-center-wrapper'
-							v-if="activity.is_seckill">立即参与</navigator>
+						<navigator hover-class='none' url='/pages/activity/goods_seckill/index'
+							class='bnt acea-row row-center-wrapper' v-if="activity.is_seckill">立即参与</navigator>
 						<view class='bnt acea-row row-center-wrapper end' v-else>已结束</view>
 					</view>
 					<view class='item acea-row row-between-wrapper'>
@@ -112,18 +116,39 @@
 								<view class='infor line1'>呼朋唤友来砍价</view>
 							</view>
 						</view>
-						<navigator hover-class='none' url='/pages/activity/goods_bargain/index' class='bnt acea-row row-center-wrapper'
-							v-if="activity.is_bargin">立即参与</navigator>
+						<navigator hover-class='none' url='/pages/activity/goods_bargain/index'
+							class='bnt acea-row row-center-wrapper' v-if="activity.is_bargin">立即参与</navigator>
 						<view class='bnt acea-row row-center-wrapper end' v-else>已结束</view>
 					</view>
 				</view>
 			</view>
 			<recommend :hostProduct="hostProduct"></recommend>
 		</view>
-		<home v-if="navigation"></home>
+		<!-- <home v-if="navigation"></home> -->
 		<!-- #ifdef MP -->
 		<authorize v-if="isShowAuth" @authColse="authColse" @onLoadFun="onLoadFun"></authorize>
 		<!-- #endif -->
+
+		<uni-popup ref="popup" type="bottom" background-color="#fff">
+			<view class="personal-data">
+				<view class='list'>
+					<view class='item acea-row row-between-wrapper'>
+						<view>余额</view>
+						<view class='input'><input type='number' placeholder="请输入要转的余额"
+								v-model='change_target.number'></input>
+						</view>
+					</view>
+					<view class='item acea-row row-between-wrapper'>
+						<view>互转ID</view>
+						<view class='input'><input type='number' placeholder="请输入要转的用户ID"
+								v-model='change_target.id'></input>
+						</view>
+					</view>
+				</view>
+				<view class="modifyBnt bg-color cartcolor acea-row row-center-wrapper" @click="targetMoney">转余额</view>
+				<view class="logOut cartcolor acea-row row-center-wrapper" @click="$refs.popup.close">关闭</view>
+			</view>
+		</uni-popup>
 	</view>
 </template>
 
@@ -136,8 +161,10 @@
 	} from '@/utils/SubscribeMessage.js';
 	import {
 		getUserInfo,
-		userActivity
+		userActivity,
+		changeMoneyTarget
 	} from '@/api/user.js';
+	
 	import {
 		toLogin
 	} from '@/libs/login.js';
@@ -164,7 +191,11 @@
 				isShowAuth: false, //是否隐藏授权
 				hotScroll: false,
 				hotPage: 1,
-				hotLimit: 10
+				hotLimit: 10,
+				change_target: {
+					id: '',
+					number: ''
+				} //互转
 			};
 		},
 		computed: mapGetters(['isLogin']),
@@ -197,6 +228,64 @@
 			uni.removeStorageSync('form_type_cart');
 		},
 		methods: {
+			// 转余额
+			targetMoney(){
+				const that = this;
+				if (!that.change_target.id) {
+					uni.showToast({
+						title: '请填写转账ID',
+						icon: "error",
+					});
+					return
+				}
+				if (!that.change_target.number) {
+					uni.showToast({
+						title: '请填写余额',
+						icon: "error",
+					});
+					return
+				}
+				if (+that.change_target.number > +that.userInfo.now_money) {
+					uni.showToast({
+						title: '余额不足无法转账',
+						icon: "error",
+					});
+					return
+				}
+				uni.showLoading({
+					title: '转账中...',
+					mask: true
+				});
+				uni.showModal({
+					title: '积分转账',
+					content: `是否转账给用户ID:${that.change_target.id}用户${that.change_target.number}余额`,
+					success: res => {
+						if (res.confirm) {
+							changeMoneyTarget({
+								uid: that.change_target.id,
+								num: that.change_target.number,
+							}).then(function(res) {
+								uni.hideLoading()
+								that.change_target.id = '';
+								that.change_target.number = '';
+								that.getUserInfo();
+								uni.showToast({
+									title: '转账成功'
+								});
+							}).catch((res) => {
+								uni.hideLoading();
+								uni.showModal({
+									title: '错误',
+									content: res,
+									showCancel: false,
+								});
+							});
+						} else {
+							uni.hideLoading()
+						}
+					},
+				});
+			},
 			onLoadFun: function() {
 				this.getUserInfo();
 				this.get_activity();
@@ -313,6 +402,18 @@
 		color: var(--view-theme);
 	}
 
+	.recharge-hz {
+		margin-top: 10rpx;
+		font-size: 28rpx;
+		width: 150rpx;
+		height: 54rpx;
+		border-radius: 27rpx;
+		background-color: #fff9f8;
+		text-align: center;
+		line-height: 54rpx;
+		color: var(--view-theme);
+	}
+
 	.my-account .wrapper .header .headerCon .cumulative {
 		margin-top: 46rpx;
 	}
@@ -328,19 +429,19 @@
 		color: #fff;
 		margin-top: 6rpx;
 	}
-	
+
 	.my-account .wrapper .nav {
 		height: 155rpx;
 		border-bottom: 1rpx solid #f5f5f5;
 	}
-	
+
 	.my-account .wrapper .nav .item {
 		flex: 1;
 		text-align: center;
 		font-size: 26rpx;
 		color: #999;
 	}
-	
+
 	.my-account .wrapper .nav .item .iconfont {
 		font-size: 44rpx;
 		margin: 0 auto;
@@ -449,4 +550,92 @@
 		background-color: #f2f2f2;
 		border-color: #f2f2f2;
 	}
-</style>
+
+	.personal-data {
+		padding:30rpx 0;
+		.list {
+			margin-top: 15rpx;
+			background-color: #fff;
+
+			.item {
+				padding: 30rpx 30rpx 30rpx 0;
+				border-bottom: 1rpx solid #f2f2f2;
+				margin-left: 30rpx;
+				font-size: 32rpx;
+				color: #282828;
+
+				.label {
+					margin-right: 30rpx;
+				}
+
+				.phone {
+					width: 160rpx;
+					height: 56rpx;
+					font-size: 24rpx;
+					color: #fff;
+					line-height: 56rpx;
+					border-radius: 32rpx
+				}
+
+				.pictrue {
+					width: 88rpx;
+					height: 88rpx;
+
+					image {
+						width: 100%;
+						height: 100%;
+						border-radius: 50%;
+					}
+				}
+
+				.input {
+					width: 460rpx;
+					text-align: right;
+					color: #868686;
+
+					input {
+						text-align: right;
+					}
+
+					.picker {
+						width: 400rpx;
+					}
+
+					.id {
+						width: 414rpx;
+					}
+
+					.iconfont {
+						font-size: 35rpx;
+						color: #868686;
+					}
+				}
+			}
+		}
+
+		.cartcolor {
+			color: var(--view-theme);
+			border: 1px solid var(--view-theme);
+		}
+
+		.modifyBnt {
+			font-size: 32rpx;
+			color: #fff;
+			width: 690rpx;
+			height: 90rpx;
+			border-radius: 50rpx;
+			text-align: center;
+			line-height: 90rpx;
+			margin: 76rpx auto 0 auto;
+		}
+
+		.logOut {
+			font-size: 32rpx;
+			text-align: center;
+			width: 690rpx;
+			height: 90rpx;
+			border-radius: 45rpx;
+			margin: 30rpx auto 0 auto;
+		}
+	}
+</style>