cmy 3 hónapja
szülő
commit
2e776ccd5d

+ 7 - 0
api/user.js

@@ -223,6 +223,13 @@ export function brokerageTrade(q) {
 	return request.post(`brokerage/trade`,q);
 }
 
+/*
+ * 消费分互转
+ * */
+export function integralTrade(q) {
+	return request.post(`integral/trade`,q);
+}
+
 /**
  * 获取分销海报图片
  * 

+ 4 - 4
config/app.js

@@ -13,15 +13,15 @@ module.exports = {
 	// 小程序配置
 	// #ifdef MP || APP-PLUS
 	// 请求域名 格式: https://您的域名
-	HTTP_REQUEST_URL: `https://www.senyinkj.cn`,
+	HTTP_REQUEST_URL: `https://test.syushop.com`,
 	// 长连接 格式:wss://您的域名 
-	VUE_APP_WS_URL: `wss://www.senyinkj.cn/ws`,
+	VUE_APP_WS_URL: `wss://test.syushop.com/ws`,
 	// #endif
 	// H5配置
 	// #ifdef H5
 	//H5接口是浏览器地址,非单独部署不用修改
-	// HTTP_REQUEST_URL:  window.location.protocol + "//" + window.location.host,
-	HTTP_REQUEST_URL:  "https://www.senyinkj.cn",
+	HTTP_REQUEST_URL:'https://test.syushop.com'  ,
+	// HTTP_REQUEST_URL:  "https://www.senyinkj.cn",
 	// 长连接地址,非单独部署不用修改
 	VUE_APP_WS_URL: `wss://${window.location.host}/ws`,
 	// #endif

+ 3 - 3
manifest.json

@@ -2,8 +2,8 @@
     "name" : "神英优选",
     "appid" : "__UNI__3F43051",
     "description" : "神英优选商城",
-    "versionName" : "2.9.9",
-    "versionCode" : 299,
+    "versionName" : "3.0.1",
+    "versionCode" : 301,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {
@@ -224,7 +224,7 @@
             "https" : false,
             "proxy" : {
                 "^/api" : {
-                    "target" : "https://www.senyinkj.cn"
+                    "target" : "http://test.syushop.com"
                 }
             }
         },

+ 14 - 1
pages.json

@@ -430,7 +430,7 @@
 						"app-plus": {
 							// #ifdef APP-PLUS
 							"titleNView": {
-								"type": "default"
+								"type": "transparent"
 							}
 							// #endif
 						}
@@ -628,6 +628,19 @@
 						}
 					}
 				},
+				{
+					"path": "user_payment/integral",
+					"style": {
+						"navigationBarTitleText": "消费分转账",
+						"app-plus": {
+							// #ifdef APP-PLUS
+							"titleNView": {
+								"type": "default"
+							}
+							// #endif
+						}
+					}
+				},
 				{
 					"path": "user_payment/energy",
 					"style": {

+ 4 - 0
pages/goods/goods_list/index.vue

@@ -332,6 +332,7 @@
 					keyword: '',
 					priceOrder: '',
 					salesOrder: '',
+					award:-1,
 					news: 0,
 					page: 1,
 					limit: 20,
@@ -362,6 +363,9 @@
 		},
 		onLoad: function(options) {
 			this.where.cid = options.cid || 0;
+			if(options.award){
+				this.where.award = options.award;
+			}
 			this.$set(this.where, 'sid', options.sid || 0);
 			this.title = options.title || '';
 			this.$set(this.where, 'keyword', options.searchValue ? decodeURIComponent(options.searchValue) : '');

+ 221 - 96
pages/user/index.vue

@@ -1,18 +1,6 @@
 <template>
 	<!-- 个人中心模块 -->
 	<view class="new-users copy-data" :style="{height:pageHeight}">
-		<!-- 自定义顶部背景颜色 -->
-		<view class="top" :style="colorStyle">
-			<!-- #ifdef MP || APP-PLUS -->
-			<view class="sys-head">
-				<view class="sys-bar" :style="{height:sysHeight}"></view>
-				<!-- #ifdef MP -->
-				<view class="sys-title" :style="member_style==3?'color:#333':''">个人中心</view>
-				<!-- #endif -->
-				<view class="bg" :style="member_style==3?'background:#f5f5f5':''"></view>
-			</view>
-			<!-- #endif -->
-		</view>
 		<!-- 自定义顶部背景颜色 -->
 		<view class="mid style-add" :style="colorStyle">
 			<scroll-view scroll-y="true" class="height-add">
@@ -62,14 +50,20 @@
 								</view>
 								<!-- #endif -->
 							</view>
+							<view class="infoDetail" v-if="parseInt(userInfo.vip_id)">
+								<view class="vipBox">
+
+									<image class="live" :src="userInfo.vip_icon">
+									</image>
+									<text>{{userInfo.vip_name}}</text>
+								</view>
+							</view>
 							<view class="info">
 								<view class="name display-add" v-if="!userInfo.uid" @click="openAuto">
 									请点击授权
 								</view>
 								<view class="name" v-if="userInfo.uid">
 									<view class="nickname line1">{{userInfo.nickname}}</view>
-									<image class="live" :src="userInfo.vip_icon" v-if="parseInt(userInfo.vip_id)">
-									</image>
 									<view class="vip" v-if="userInfo.is_money_level> 0 && stu">
 										<image src="/static/images/svip.png"></image>
 									</view>
@@ -83,26 +77,26 @@
 								<view class="phone" v-if="!userInfo.phone && isLogin && userInfo.uid" @tap="bindPhone">
 									绑定手机号</view>
 							</view>
-							<view v-if="isLogin" class="qrCode message iconfont icon-erweima-xingerenzhongxin"
-								@click="tapQrCode">
-							</view>
-							<view class="message">
-								<view @click="intoPage('/pages/users/user_set/index')">
-									<view class="iconfont icon-shezhi"></view>
+							<view class="alertRight">
+
+								<view v-if="isLogin" class="qrCode message iconfont icon-erweima-xingerenzhongxin"
+									@click="tapQrCode">
+								</view>
+								<view class="message">
+									<view @click="intoPage('/pages/users/user_set/index')">
+										<view class="iconfont icon-shezhi"></view>
+									</view>
 								</view>
 							</view>
-							<view class="message">
+							<!-- <view class="message">
 								<view @click="intoPage('/pages/users/message_center/index')">
-									<!-- <view v-if="userInfo.service_num" class="num">
-                    {{userInfo.service_num >= 100 ? '99+' : userInfo.service_num}}
-                  </view> -->
 									<uni-badge class="uni-badge-left-margin"
 										:text="userInfo.service_num >= 100 ? '99+' : userInfo.service_num"
 										absolute="rightTop">
 										<view class="iconfont icon-s-kefu"></view>
 									</uni-badge>
 								</view>
-							</view>
+							</view> -->
 							<!-- #ifdef MP -->
 							<!-- <view class="setting" @click="Setting"><text class="iconfont icon-shezhi"></text></view> -->
 							<!-- #endif -->
@@ -158,11 +152,9 @@
 							:style="{backgroundImage:'url('+imgHost+'/statics/images/grade.png'+')'}"
 							v-if="member_style==1 && memberStatus && vip_type==1">
 							<view class="left-box on">
-								<!-- <view class="small">{{userInfo.level_status==1?userInfo.vip_name:'激活会员卡 解锁更多权益'}}</view> -->
 								<view class="small">{{userInfo.level_status==1?'':'激活会员卡 解锁更多权益'}}</view>
 							</view>
 							<view class="acea-row row-middle">
-								<!-- 去激活 -->
 								<navigator
 									:url="userInfo.level_status==1?'/pages/annex/vip_grade/index':'/pages/annex/vip_grade_active/index'"
 									hover-class="none" class="btn on">{{userInfo.level_status==1?'查看会员卡':'去激活'}}
@@ -173,7 +165,6 @@
 						<view class="cardVipB acea-row row-between on"
 							:style="{backgroundImage:'url('+imgHost+'/statics/images/grade01.png'+')'}"
 							v-if="member_style==3 && memberStatus && vip_type==1">
-							<!-- <view class="small">{{userInfo.level_status==1?userInfo.vip_name:'激活会员卡 解锁更多权益'}}</view> -->
 							<view class="small">{{userInfo.level_status==1?'':'激活会员卡 解锁更多权益'}}</view>
 							<view class="acea-row">
 								<navigator
@@ -186,7 +177,6 @@
 					</view>
 					<view class="card-vip" v-if="member_style==2 && stu && vip_type==2">
 						<view class="left-box">
-							<!-- <view class="big">会员可享多项权益</view> -->
 							<view v-if="vipStatus == 1" class="small">永久</view>
 							<view v-else-if="vipStatus == 3" class="small">会员到期
 								{{ userInfo.overdue_time | dateFormat }}
@@ -207,7 +197,6 @@
 					<view class="card-vip on" v-if="member_style==2 && memberStatus && vip_type==1"
 						:style="{backgroundImage:'url('+imgHost+'/statics/images/grade01.png'+')'}">
 						<view class="left-box">
-							<!-- <view class="small">{{userInfo.level_status==1?userInfo.vip_name:'激活会员卡 解锁更多权益'}}</view> -->
 							<view class="small">{{userInfo.level_status==1?'':'激活会员卡 解锁更多权益'}}</view>
 						</view>
 						<view class="acea-row">
@@ -217,45 +206,6 @@
 							<text class="iconfont icon-xiangyou"></text>
 						</view>
 					</view>
-					<view class="flex-item-box">
-						<view class="flex-item">
-							<view class="txt">参考值</view>
-							<text class="num">{{userInfo.integral_price || 0}}</text>
-						</view>
-					</view>
-					<view class="num-wrapper"
-						:class="[member_style==3?'unNum-wrapper':member_style==2?'Tnum-wrapper':'',((vip_type==2 && stu) || (vip_type==1 && memberStatus))?'':'height']"
-						v-if="userInfo.hidden_integral=='1'">
-						<view class="num-item">
-							<text class="num">{{userInfo.sum_integral || 0}}</text>
-							<view class="txt">总积分</view>
-						</view>
-						<view class="num-item">
-							<text class="num">{{userInfo.award_lack || 0}}</text>
-							<view class="txt">总资金</view>
-						</view>
-					</view>
-					<view class="num-wrapper"
-						:class="[member_style==3?'unNum-wrapper':member_style==2?'Tnum-wrapper':'',((vip_type==2 && stu) || (vip_type==1 && memberStatus))?'':'height']"
-						v-if="userInfo.uid">
-						<view class="num-item" v-show="userInfo.balance_func_status"
-							@click="goMenuPage('/pages/users/user_money/index')">
-							<text class="num">{{userInfo.now_money || 0}}</text>
-							<view class="txt">余额</view>
-						</view>
-						<view class="num-item" @click="goMenuPage('/pages/users/user_payment/energy')">
-							<text class="num">{{userInfo.energy || 0}}</text>
-							<view class="txt">能量值</view>
-						</view>
-						<view class="num-item" @click="goMenuPage('/pages/users/user_integral/integral')">
-							<text class="num">{{userInfo.action_integral || 0}}</text>
-							<view class="txt">贡献分</view>
-						</view>
-						<view class="num-item" @click="goMenuPage('/pages/users/user_integral/integral')">
-							<text class="num">{{userInfo.static_integral || 0}}</text>
-							<view class="txt">消费分</view>
-						</view>
-					</view>
 					<!-- 新人礼物 -->
 					<view class="num-wrapper on" v-if="!userInfo.uid">
 						<image :src="giftPic" mode="" class="img"></image>
@@ -265,7 +215,7 @@
 						<view class="btn-login" @click="openAuto">去登录</view>
 					</view>
 					<!-- 新人专享 -->
-					<view class="newcomersCon" :class="newcomer_style==1?'':'on'"
+					<!-- <view class="newcomersCon" :class="newcomer_style==1?'':'on'"
 						v-if="newList.length && newcomer_status==1">
 						<view class="newcomers"
 							:style="{backgroundImage:'url('+ (newcomer_style==1?imgHost+'/statics/images/new-bg.png':newBg) +')'}">
@@ -288,7 +238,79 @@
 								</view>
 							</scroll-view>
 						</view>
+					</view> -->
+					<view class="order-wrapper addOrderWrapper">
+						<view class="order-hd flex">
+							<view class="left">我的资产</view>
+
+						</view>
+						<view class="order-bd userMoneyBox">
+							<view class="order-item" v-show="userInfo.balance_func_status"
+								@click="goMenuPage('/pages/users/user_money/index')">
+								<view class="userIconBox">
+									<image class="userIcon" src="../../static/images/userIn1.png" mode="scaleToFill">
+									</image>
+								</view>
+								<view class="money">
+									{{userInfo.now_money || 0}}
+								</view>
+								<view class="txt">余额积分</view>
+							</view>
+							<view class="order-item" @click="goMenuPage('/pages/users/user_payment/energy')">
+								<view class="userIconBox">
+									<image class="userIcon" src="../../static/images/userIn2.png" mode="scaleToFill">
+									</image>
+								</view>
+								<view class="money">
+									{{userInfo.energy || 0}}
+								</view>
+								<view class="txt">能量值</view>
+							</view>
+							<view class="order-item"
+								@click="goMenuPage('/pages/users/user_integral/integral?type=2&numType=stand_integral')">
+								<view class="userIconBox">
+									<image class="userIcon" src="../../static/images/userIn3.png" mode="scaleToFill">
+									</image>
+								</view>
+								<view class="money">
+									{{userInfo.stand_integral || 0}}
+								</view>
+								<view class="txt">参考分</view>
+							</view>
+							<view class="order-item"
+								@click="goMenuPage('/pages/users/user_integral/integral?type=3&numType=integral')">
+								<view class="userIconBox">
+									<image class="userIcon" src="../../static/images/userIn4.png" mode="scaleToFill">
+									</image>
+								</view>
+								<view class="money">
+									{{userInfo.integral || 0}}
+								</view>
+								<view class="txt">消费分</view>
+							</view>
+						</view>
 					</view>
+					<!-- <view class="box">
+						<view class="flex-item-box">
+							<view class="flex-item">
+								<view class="txt">参考值</view>
+								<text class="num">{{userInfo.integral_price || 0}}</text>
+							</view>
+						</view>
+						<view class="num-wrapper"
+							:class="[member_style==3?'unNum-wrapper':member_style==2?'Tnum-wrapper':'',((vip_type==2 && stu) || (vip_type==1 && memberStatus))?'':'height']"
+							v-if="userInfo.hidden_integral=='1'">
+							<view class="num-item">
+								<text class="num">{{userInfo.sum_integral || 0}}</text>
+								<view class="txt">总积分</view>
+							</view>
+							<view class="num-item">
+								<text class="num">{{userInfo.award_lack || 0}}</text>
+								<view class="txt">总资金</view>
+							</view>
+						</view>
+					</view> -->
+
 					<!-- 订单中心 -->
 					<view class="order-wrapper">
 						<view class="order-hd flex">
@@ -633,6 +655,8 @@
 					name: '会员码'
 				}, {
 					name: '付款码'
+				},{
+					name: 'UID'
 				}],
 				codeIndex: 0,
 				config: {
@@ -1012,13 +1036,22 @@
 				this.isextension = false
 			},
 			tapCode(index) {
+				console.log(index,"index")
 				this.codeIndex = index;
 				if (index == 1) {
 					this.getCode();
-				} else {
+					return
+				}
+				if(index==0) {
 					let code = this.userInfo.bar_code;
 					this.config.bar.code = code;
 					this.config.qrc.code = code;
+					return
+				}
+				if(index==2){
+					this.config.bar.code = this.userInfo.uid;
+					this.config.qrc.code = this.userInfo.uid;
+					return
 				}
 			},
 			getWechatuserinfo() {
@@ -1435,7 +1468,7 @@
 	.flex-item-box {
 		background-color: #fff;
 		border-radius: 16rpx;
-		padding:20rpx 30rpx;
+		padding: 20rpx 30rpx;
 		margin: 30rpx 30rpx 25rpx 30rpx;
 
 		.flex-item {
@@ -1445,7 +1478,8 @@
 			font-size: 28rpx;
 			font-weight: bold;
 			justify-content: space-between;
-			.num{
+
+			.num {
 				font-size: 40rpx;
 			}
 		}
@@ -1507,6 +1541,7 @@
 			width: 33.33%;
 			text-align: center;
 			flex-grow: 1;
+
 			&~.num-item {
 				position: relative;
 
@@ -1665,6 +1700,8 @@
 		background-color: unset !important;
 
 		.user-info {
+			text-align: center;
+
 			.info {
 				.name {
 					color: #333333 !important;
@@ -1676,9 +1713,13 @@
 
 					.num-txt {
 						height: 38rpx;
-						background-color: rgba(51, 51, 51, 0.13);
+						// background-color: rgba(51, 51, 51, 0.13);						
 						padding: 0 12rpx;
 						border-radius: 16rpx;
+						font-weight: 500;
+						font-size: 24rpx;
+						color: #666666 !important;
+
 					}
 				}
 			}
@@ -1808,6 +1849,7 @@
 		display: flex;
 		flex-direction: column;
 		height: 100%;
+		background-color: rgb(251, 247, 247);
 
 		.sys-head {
 			position: relative;
@@ -1843,16 +1885,18 @@
 			.user-card {
 				position: relative;
 				width: 100%;
-				height: 270rpx;
+				// height: 270rpx;
 				margin: 0 auto;
-				padding: 35rpx 28rpx;
-				background-size: 100% auto;
-				background-color: var(--view-theme);
+				padding: 70rpx 28rpx 100rpx 28rpx;
+				padding-top: calc(var(--status-bar-height) + 70rpx);
+				background-size: 100% 100%;
+				// background-color: var(--view-theme);
 
 				.user-info {
 					z-index: 20;
 					position: relative;
-					display: flex;
+					// display: flex;
+					text-align: center;
 
 					.headwear {
 						position: absolute;
@@ -1902,9 +1946,11 @@
 						display: flex;
 						align-items: center;
 						justify-content: center;
-						width: 120rpx;
-						height: 120rpx;
+						width: 148rpx;
+						height: 148rpx;
 						border-radius: 50%;
+						margin: 0 auto;
+						border: 2px solid #FFF;
 
 						&.on {
 							.avatar {
@@ -1917,31 +1963,30 @@
 
 					.avatar {
 						position: relative;
-						width: 120rpx;
-						height: 120rpx;
+						width: 148rpx;
+						height: 148rpx;
 						border-radius: 50%;
 
 					}
 
 					.info {
-						width: 346rpx;
-						flex: 1;
-						display: flex;
-						flex-direction: column;
-						justify-content: space-between;
-						margin-left: 20rpx;
+						// width: 346rpx;
 						padding: 20rpx 0;
 
 						.name {
 							display: flex;
 							align-items: center;
+							justify-content: center;
 							color: #fff;
 							font-size: 31rpx;
-							width: 346rpx;
+							// width: 346rpx;
 
 							.nickname {
-								max-width: 196rpx;
+								// max-width: 196rpx;
 								display: block;
+								font-weight: bold;
+								font-size: 32rpx;
+								color: #000100;
 							}
 
 							.vip {
@@ -1960,9 +2005,16 @@
 						.num {
 							display: flex;
 							align-items: center;
+							justify-content: center;
 							font-size: 24rpx;
 							color: rgba(255, 255, 255, 0.6);
 
+							.num-txt {
+								font-weight: 500;
+								font-size: 24rpx;
+								color: #666666;
+							}
+
 							image {
 								width: 22rpx;
 								height: 23rpx;
@@ -2034,12 +2086,12 @@
 			.order-wrapper {
 				background: #fff;
 				margin: 0 30rpx;
-				border-radius: 16rpx;
+				border-radius: 30rpx;
 				position: relative;
 
 				.order-hd {
 					justify-content: space-between;
-					padding: 30rpx 20rpx 10rpx;
+					padding: 30rpx 30rpx 10rpx;
 					margin-top: 25rpx;
 					font-size: 30rpx;
 					color: #282828;
@@ -2134,7 +2186,7 @@
 		.user-menus {
 			background-color: #fff;
 			margin: 0 30rpx;
-			border-radius: 16rpx;
+			border-radius: 30rpx;
 
 			.menu-title {
 				padding: 30rpx 30rpx 40rpx;
@@ -2230,6 +2282,9 @@
 	}
 
 	.card-vip {
+		border-start-end-radius: 30rpx;
+		border-start-start-radius: 30rpx;
+		overflow: hidden;
 		display: flex;
 		justify-content: space-between;
 		position: relative;
@@ -2295,7 +2350,77 @@
 		padding-bottom: constant(safe-area-inset-bottom);
 		padding-bottom: env(safe-area-inset-bottom);
 	}
-	.bottomTips{
-		
+
+	.bottomTips {}
+
+	.addOrderWrapper {
+		line-height: 1;
+		margin-top: -70rpx !important;
+
+		.userMoneyBox {
+			padding-bottom: 30rpx !important;
+
+			.order-item {
+				padding-top: 20rpx;
+				flex-grow: 1;
+				height: auto !important;
+			}
+
+			.userIconBox {
+				.userIcon {
+					width: 90rpx;
+					height: 88rpx;
+				}
+			}
+		}
+	}
+
+	.infoDetail {
+		text-align: center;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		margin-top: -30rpx;
+		position: relative;
+
+		.vipBox {
+			line-height: 1;
+			background: linear-gradient(270deg, #F8ECC6 0%, #D5B861 100%);
+			border-radius: 16px;
+			border: 1px solid #C8AB54;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			padding: 4rpx 10rpx;
+			border-radius: 100rpx;
+			color: #FFF;
+			font-weight: bold;
+			font-size: 18rpx;
+			color: #93794B;
+
+			.live {
+				margin: 0 10rpx 0 0 !important;
+			}
+		}
+	}
+	.alertRight{
+		position: absolute;
+		bottom: 230rpx;
+		right: 0rpx;
+		display: flex;
+	}
+	.codePopup{
+		.header{
+			width:auto !important;
+			margin-right: 30rpx;
+			margin-left: 30rpx;
+			.title{
+				flex-grow: 1;
+				width: auto;
+				flex-shrink: 0;
+				min-width: 33%;
+				padding: 0;
+			}
+		}
 	}
 </style>

A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 158 - 73
pages/users/user_integral/integral.vue


+ 340 - 0
pages/users/user_payment/integral.vue

@@ -0,0 +1,340 @@
+<template>
+	<view>
+		<form :style="colorStyle">
+			<view class="payment-top acea-row row-column row-center-wrapper">
+				<span class="name">我的消费分</span>
+				<view class="pic">
+					<span class="pic-font">{{userinfo.integral || 0.00}}</span>
+				</view>
+			</view>
+			<view class="payment">
+				<view class="tip picList">
+					<view class='to_uid acea-row row-between'>
+						<view class="title">转账数量</view>
+						<input class="uidbox" v-model="number"  placeholder="0.00"
+							type='number' placeholder-class='placeholderUid'  name="number"></input>
+					</view>
+					<view class='to_uid acea-row row-between'>
+						<view class="title">用户UID</view>
+						<input class="uidbox" placeholder-class='placeholderUid' placeholder="请输入转入的用户uid" v-model="uid" type='number' name="uid"></input>
+						<!-- #ifndef H5 -->
+						<image @click="qr" class="tipimg" src="../../../static/images/qrSq.png" mode=""></image>
+						<!-- #endif -->
+					</view>
+				</view>
+
+				<view class="tips-title" v-if="userinfo.shop_integral_trade_commission">
+					<view style="font-weight: bold; font-size: 26rpx;">提示:</view>
+					<view style="margin-top: 10rpx;">当前手续费为 <text
+							class='font-color'>{{userinfo.shop_integral_trade_commission*number/100}}</text></view>
+				</view>
+				<button class='but bg-color' @click="submitSub"> 立即转换</button>
+			</view>
+		</form>
+		<home v-if="navigation"></home>
+		<!-- <view v-show="false" v-html="formContent"></view> -->
+		<!-- #ifdef MP -->
+		<!-- <authorize v-if="isShowAuth" @authColse="authColse" @onLoadFun="onLoadFun"></authorize> -->
+		<!-- #endif -->
+	</view>
+</template>
+
+<script>
+	import {
+		getUserInfo,
+		integralTrade
+	} from '@/api/user.js';
+	import {
+		toLogin
+	} from '@/libs/login.js';
+	import {
+		mapGetters
+	} from "vuex";
+	import home from '@/components/home';
+	import colors from "@/mixins/color";
+	export default {
+		components: {
+			home,
+		},
+		mixins: [colors],
+		data() {
+			let that = this;
+			return {
+				number: '',
+				uid: '', //转入用户UID
+				userinfo: {},
+				// #ifdef H5
+				isWeixin: this.$wechat.isWeixin(),
+				// #endif
+			};
+		},
+		computed: mapGetters(['isLogin']),
+		watch: {
+			isLogin: {
+				handler: function(newV, oldV) {
+					if (newV) {
+						this.getUserInfo();
+					}
+				},
+				deep: true
+			}
+		},
+		onLoad(options) {
+			if (this.isLogin) {
+				this.getUserInfo();
+			} else {
+				toLogin();
+			}
+		},
+		onShow() {},
+		methods: {
+			onLunch() {
+				this.getUserInfo();
+			},
+			inputNum: function(e) {
+				let val = e.detail.value;
+				let dot = val.indexOf('.');
+				if (dot > -1) {
+					this.moneyMaxLeng = dot + 3;
+				} else {
+					this.moneyMaxLeng = 8
+				}
+			},
+			onLoadFun: function() {
+				this.getUserInfo();
+			},
+			// #ifndef H5
+			qr() {
+				const that = this;
+				uni.scanCode({
+					success: function(res) {
+						console.log('条码类型:' + res.scanType);
+						console.log('条码内容:' + res.result);
+						that.uid = res.result;
+					}
+				});
+			},
+			// #endif
+			/**
+			 * 获取用户信息
+			 */
+			getUserInfo: function() {
+				let that = this;
+				getUserInfo().then(res => {
+					that.$set(that, 'userinfo', res.data);
+
+				})
+			},
+			submitSub: function(e) {
+				let that = this
+				let value = that.number;
+				if (parseFloat(value) < 0 || parseFloat(value) == NaN || value == undefined || value == "") {
+					return that.$util.Tips({
+						title: '请输入数量'
+					});
+				}
+				// 转入余额
+				uni.showModal({
+					title: '消费分转账',
+					content: '佣金转出后无法撤回,确认是否转出消费分',
+					success(res) {
+						if (res.confirm) {
+							integralTrade({
+								to_uid: that.uid,
+								num: parseFloat(value),
+							}).then(res => {
+								// that.$set(that, 'userinfo.now_money', that.$util.$h.Add(value, that.userinfo.now_money))
+								return that.$util.Tips({
+									title: '转入成功',
+									icon: 'success'
+								}, {
+									tab: 5,
+									url: '/pages/user/index'
+								});
+							}).catch(err => {
+								return that.$util.Tips({
+									title: err
+								})
+							});
+
+						} else if (res.cancel) {
+							return that.$util.Tips({
+								title: '已取消'
+							});
+						}
+					},
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	page {
+		width: 100%;
+		height: 100%;
+		background-color: #fff;
+	}
+
+	.bgcolor {
+		background-color: var(--view-theme)
+	}
+
+	.payment {
+		position: relative;
+		width: 100%;
+		background-color: #fff;
+		border-radius: 10rpx;
+		padding-top: 25rpx;
+		border-top-right-radius: 39rpx;
+		border-top-left-radius: 39rpx;
+	}
+
+	.payment .nav {
+		height: 75rpx;
+		line-height: 75rpx;
+		padding: 0 100rpx;
+	}
+
+	.payment .nav .item {
+		font-size: 30rpx;
+		color: #333;
+	}
+
+	.payment .nav .item.on {
+		font-weight: bold;
+		border-bottom: 4rpx solid var(--view-theme);
+	}
+
+	.payment .input {
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		border-bottom: 1px dashed #dddddd;
+		margin: 60rpx auto 0 auto;
+		padding-bottom: 20rpx;
+		font-size: 56rpx;
+		color: #333333;
+		flex-wrap: nowrap;
+
+	}
+
+	.payment .input text {
+		padding-left: 106rpx;
+	}
+
+	.payment .input input {
+		padding-right: 106rpx;
+		width: 300rpx;
+		height: 94rpx;
+		text-align: center;
+		font-size: 70rpx;
+	}
+
+	.payment .placeholder {
+		color: #d0d0d0;
+		height: 100%;
+		line-height: 94rpx;
+	}
+
+	.payment .tip {
+		font-size: 26rpx;
+		color: #888888;
+		padding: 0 30rpx;
+		margin-top: 25rpx;
+	}
+
+	.payment .but {
+		color: #fff;
+		font-size: 30rpx;
+		height: 100rpx;
+		border-radius: 10rpx;
+		margin: 46rpx 50rpx 0 50rpx;
+		line-height: 100rpx;
+		background-image: linear-gradient(45deg, #ffcdd3, #ffb0b3);
+	}
+
+	.payment-top {
+		width: 100%;
+		height: 350rpx;
+		// background-color: var(--view-theme);
+		background-image: linear-gradient(45deg, rgb(255, 242, 232) 10%, #fff0f2 35%, rgb(255, 234, 247) 45%, #ffcdd3 75%, #ffb0b3);
+
+		.name {
+			font-size: 26rpx;
+			color: rgba(255, 255, 255, 0.8);
+			margin-top: -38rpx;
+			margin-bottom: 30rpx;
+		}
+
+		.pic {
+			font-size: 32rpx;
+			color: #fff;
+		}
+
+		.pic-font {
+			font-size: 78rpx;
+			color: #fff;
+		}
+	}
+
+	.picList {
+		margin: 30rpx 0;
+	}
+
+	.tips-box {
+		.tips {
+			font-size: 28rpx;
+			color: #333333;
+			font-weight: 800;
+			margin-bottom: 14rpx;
+			margin-top: 20rpx;
+		}
+
+		.tips-samll {
+			font-size: 24rpx;
+			color: #333333;
+			margin-bottom: 14rpx;
+		}
+
+		.tip-box {
+			margin-top: 30rpx;
+		}
+	}
+
+	.tips-title {
+		padding-left: 30rpx;
+		margin-top: 20rpx;
+		font-size: 24rpx;
+		color: #333;
+	}
+
+	.to_uid {
+		padding: 20rpx;
+		width: 100%;
+		line-height: 1;
+		font-size: 28rpx;
+		align-items: center;
+
+		border-bottom: 1px solid #dddddd;
+
+		.title {
+			font-weight: bold;
+		}
+
+		.uidbox {
+			flex-grow: 1;
+			text-align: right;
+		}
+
+		.placeholderUid {
+			text-align: right;
+		}
+	}
+
+	.tipimg {
+		width: 50rpx;
+		height: 50rpx;
+		margin-left: 10rpx;
+	}
+</style>

+ 2 - 2
pages/users/user_payment/user_spread.vue

@@ -289,7 +289,7 @@
 										title: '转入成功',
 										icon: 'success'
 									}, {
-										tab: 5,
+										tab: 3,
 										url: '/pages/user/index'
 									});
 								}).catch(err => {
@@ -320,7 +320,7 @@
 										title: '转入成功',
 										icon: 'success'
 									}, {
-										tab: 5,
+										tab: 3,
 										url: '/pages/user/index'
 									});
 								}).catch(err => {

BIN
static/images/qrSq.png


BIN
static/images/userIn1.png


BIN
static/images/userIn2.png


BIN
static/images/userIn3.png


BIN
static/images/userIn4.png


Nem az összes módosított fájl került megjelenítésre, mert túl sok fájl változott