hwq 1 éve
szülő
commit
e43baa9a40

+ 8 - 1
pages.json

@@ -190,7 +190,14 @@
 		{
 			"path": "pages/user/yjzye",
 			"style": {
-				"navigationBarTitleText": "佣金转消费积分"
+				"navigationBarTitleText": "余额转消费积分"
+
+			}
+		},
+		{
+			"path": "pages/user/zye",
+			"style": {
+				"navigationBarTitleText": "佣金转余额"
 
 			}
 		},

+ 3 - 0
pages/product/product.vue

@@ -368,6 +368,9 @@
 						obj.goodsNumberMax = 1
 					}
 					console.log(obj.goodIntegral, 'obj.goodIntegral')
+					if (obj.goodsObjact.give_award_range * 1 > 0) {
+						obj.isbao = 1
+					}
 					// #ifdef H5
 					obj.shareDate();
 					// #endif

+ 2 - 2
pages/user/award.vue

@@ -22,10 +22,10 @@
 						佣金提现
 					</view>
 				</view>
-				<view class="money-btn" @click="navto('/pages/user/yjzye')">
+				<view class="money-btn" @click="navto('/pages/user/zye')">
 					<image class="money-btn-icon" src="../../static/img/tr.png" mode=""></image>
 					<view class="money-font">
-						转换消费积分
+						转换余额
 					</view>
 				</view>
 			</view>

+ 5 - 1
pages/user/money.vue

@@ -16,7 +16,11 @@
 				<view>我的余额</view>
 			</view>
 			<view class="moneybtn-box">
-				<view class="money-btn">
+				<view class="money-btn" @click="navto('/pages/user/yjzye')">
+					<image class="money-btn-icon" src="../../static/img/tr.png" mode=""></image>
+					<view class="money-font">
+						转换消费积分
+					</view>
 				</view>
 				<view class="money-btn" @click="navto('/pages/money/wallet')">
 					<image class="money-btn-icon" src="../../static/img/tr.png" mode=""></image>

+ 2 - 2
pages/user/yjzye.vue

@@ -3,7 +3,7 @@
 		<view class="content-money">
 			<view class="flex">
 				<view class="buttom">
-					<view class="icon">{{ userInfo.brokerage_price | getMoneyStyle }}</view>
+					<view class="icon">{{ userInfo.money | getMoneyStyle }}</view>
 					<text class="text">可转换消费积分</text>
 				</view>
 			</view>
@@ -14,7 +14,7 @@
 				<!-- <text class="tit">¥</text> -->
 				<input class="input" type="number" v-model="withdrawal" placeholder="转换金额"
 					placeholder-class="placeholder" />
-				<view class="buttom" @click="withdrawal = userInfo.brokerage_price*1">全部转换</view>
+				<view class="buttom" @click="withdrawal = userInfo.money*1">全部转换</view>
 				<!-- <view class="buttom" @click="withdrawal = userInfo.dynamic_integral" v-if="type== 2">全部转账</view> -->
 			</view>
 		</view>

+ 339 - 0
pages/user/zye.vue

@@ -0,0 +1,339 @@
+<template>
+	<view class="content">
+		<view class="content-money">
+			<view class="flex">
+				<view class="buttom">
+					<view class="icon">{{ userInfo.brokerage_price  | getMoneyStyle }}</view>
+					<text class="text">可转换佣金</text>
+				</view>
+			</view>
+		</view>
+		<view class="row-box">
+			<view class="title">转换余额</view>
+			<view class="row">
+				<!-- <text class="tit">¥</text> -->
+				<input class="input" type="number" v-model="withdrawal" placeholder="转换金额"
+					placeholder-class="placeholder" />
+				<view class="buttom" @click="withdrawal = userInfo.brokerage_price*1">全部转换</view>
+				<!-- <view class="buttom" @click="withdrawal = userInfo.dynamic_integral" v-if="type== 2">全部转账</view> -->
+			</view>
+		</view>
+		<button class="add-btn up" :class="{ action: loding }" @click="!loding ? confirm() : ''">转换</button>
+	</view>
+</template>
+
+<script>
+	import {
+		getMoneyStyle
+	} from '@/utils/rocessor.js';
+	import {
+		getUserInfo,
+	} from '@/api/user.js';
+	import {
+		rechargeWechat
+	} from '@/api/wallet.js'
+	import {
+		mapMutations,
+		mapState
+	} from 'vuex';
+	export default {
+		filters: {
+			getMoneyStyle
+		},
+		data() {
+			return {
+				phone: '',
+				money: '0.00', //可提现金额
+				withdrawal: '', //提现金额
+				password: '', //支付密码
+				card: '', //转账卡号
+				name: '',
+				// #ifdef H5
+				weichatBsrowser: false,
+				// #endif
+				loding: false,
+				type: 0
+			};
+		},
+		onLoad(options) {
+			// #ifdef H5
+			this.weichatBsrowser = uni.getStorageSync('weichatBrowser');
+			// #endif
+			this.dataUp();
+			if (options.type) {
+				this.type = options.type;
+
+			}
+		},
+		computed: {
+			...mapState('user', ['userInfo'])
+		},
+		methods: {
+			...mapMutations('user', ['setUserInfo', 'login']),
+			// 更新数据
+			dataUp() {
+				let obj = this;
+				getUserInfo({})
+					.then(e => {
+						obj.login();
+						// 保存返回用户数据
+						obj.setUserInfo(e.data);
+					})
+					.catch(e => {
+						console.log(e);
+					});
+			},
+			// 切换选中对象
+			tabRadio(e) {
+				this.type = e.detail.value;
+			},
+			// 提交
+			confirm() {
+				let obj = this;
+				obj.loding = true;
+				if (obj.withdrawal == 0) {
+					obj.loding = false;
+					uni.showModal({
+						title: '提示',
+						content: '转换金额不要为0'
+					});
+					return;
+				}
+
+				let data = {
+					from: 'weixinh5', //
+					price: obj.withdrawal, //金额
+					type: 2 //0佣金1余额
+				};
+				rechargeWechat(data)
+					.then(e => {
+						// 允许按钮点击
+						obj.loding = false;
+						// 初始化提现金额
+						obj.withdrawal = '';
+						uni.showToast({
+							title: '转换成功',
+							duration: 2000,
+							position: 'top'
+						});
+						obj.dataUp();
+					})
+					.catch(e => {
+						obj.$api.msg(e.msg);
+						obj.loding = false;
+						console.log();
+					});
+			},
+		}
+	};
+</script>
+
+<style lang="scss">
+	page {
+		height: 100%;
+	}
+
+	.content-money {
+		padding: 30rpx 0;
+		background: #ffffff;
+	}
+
+	.item {
+		padding: 0 $page-row-spacing;
+		background-color: #ffffff;
+	}
+
+	.flex {
+		background-color: #ffffff;
+		text-align: center;
+		margin: 0 30rpx;
+		border-radius: $border-radius-sm;
+		justify-content: center;
+
+		.buttom {
+			font-size: $font-lg;
+			width: 50%;
+		}
+
+		.interval {
+			width: 2px;
+			height: 60rpx;
+			background-color: #eeeeee;
+		}
+
+		.icon {
+			background-size: 100%;
+			font-size: 42rpx;
+			color: $font-color-dark;
+			font-weight: bold;
+			background-repeat: no-repeat;
+			background-position: center;
+		}
+
+		.text {
+			color: $font-color-light;
+		}
+	}
+
+	.row-box {
+		margin-top: 30rpx;
+		padding: 20rpx 30rpx;
+		background: #fff;
+
+		.title {
+			font-size: $font-base + 2rpx;
+			color: $font-color-dark;
+		}
+
+		.row {
+			display: flex;
+			align-items: center;
+			position: relative;
+			height: 80rpx;
+
+			.tit {
+				flex-shrink: 0;
+				width: 40rpx;
+				font-size: 30rpx;
+				color: $font-color-dark;
+			}
+
+			.input {
+				flex: 1;
+				font-size: 30rpx;
+				color: $font-color-dark;
+			}
+
+			.iconlocation {
+				font-size: 36rpx;
+				color: $font-color-light;
+			}
+
+			.buttom {
+				color: #f21f5d;
+				font-size: $font-base;
+			}
+		}
+	}
+
+	.add-btn {
+		width: 520rpx;
+		height: 80rpx;
+		border-radius: 20rpx;
+		margin: 140rpx auto 0;
+		font-size: 36rpx;
+		font-weight: bold;
+		color: #fff;
+		background: linear-gradient(90deg, #CA57DC, #65B2E9);
+	}
+
+	.back-btn {
+		width: 520rpx;
+		height: 80rpx;
+		border-radius: 20rpx;
+		margin: 40rpx auto;
+		font-size: 36rpx;
+		font-weight: bold;
+		color: #303030;
+		background-color: #F8DABA;
+	}
+
+	.name {
+		background: #fff;
+		padding: 30rpx;
+	}
+
+	.list {
+		padding-left: 30rpx;
+		margin-top: 30rpx;
+		background-color: #ffffff;
+
+		.box {
+			display: flex;
+			align-items: center;
+			width: 100%;
+			height: 120rpx;
+			border-bottom: 1px solid $border-color-light;
+
+			.icon {
+				font-size: 48rpx;
+				padding-right: 20rpx;
+
+				.icon-img {
+					height: 50rpx;
+					width: 50rpx;
+				}
+			}
+
+			.iconweixin1 {
+				color: #18bf16;
+			}
+
+			.iconzhifubao {
+				color: #08aaec;
+			}
+
+			.title-box {
+				flex-grow: 1;
+				text-align: left;
+
+				.title {
+					font-size: $font-base + 2rpx;
+					color: $font-color-base;
+				}
+
+				.node {
+					font-size: $font-sm;
+					color: $font-color-light;
+				}
+			}
+		}
+	}
+
+	.tip {
+		padding: 20rpx;
+		color: #ff0000;
+	}
+
+	/deep/ .uni-radio-input {
+		width: 45rpx;
+		height: 45rpx;
+	}
+
+	.psw-wrapper {
+		width: 548rpx;
+		height: 344rpx;
+		background-color: #FFFFFF;
+		border-radius: 15rpx 15rpx;
+
+		.psw-title {
+			width: 100%;
+			font-size: 35rpx;
+			padding: 43rpx 0 49rpx;
+			text-align: center;
+			font-weight: 800;
+		}
+
+		.psw-ipt {
+			display: block;
+			background-color: #dce3ed;
+			height: 90rpx;
+			width: 464rpx;
+			padding-left: 30rpx;
+			margin: 0 auto;
+			font-size: 80rpx;
+		}
+
+		.psw-btn text {
+			display: inline-block;
+			text-align: center;
+			width: 50%;
+			padding-top: 29rpx;
+			font-size: 35rpx;
+		}
+
+		.psw-qd {
+			color: #5771DF;
+		}
+	}
+</style>

BIN
unpackage/dist/build/h5/7-6-1.rar → unpackage/dist/build/h5/8-10-1.rar


+ 1 - 1
unpackage/dist/build/h5/index.html

@@ -1,2 +1,2 @@
 <!DOCTYPE html><html lang=zh-CN><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><title>挺酒</title><script>var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') || CSS.supports('top: constant(a)'))
-            document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=/index/static/index.97465e7b.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/index/static/js/chunk-vendors.67030921.js></script><script src=/index/static/js/index.027fec9e.js></script></body></html>
+            document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=/index/static/index.97465e7b.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/index/static/js/chunk-vendors.67030921.js></script><script src=/index/static/js/index.83ab3652.js></script></body></html>

A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 0 - 0
unpackage/dist/build/h5/static/js/index.027fec9e.js


A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 0 - 0
unpackage/dist/build/h5/static/js/index.83ab3652.js


A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-product-product.76eceda5.js


A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-product-product.8023cbdc.js


A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-user-award.216df0c1.js


A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-user-award.c7244f6e.js


A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-user-money.e86eb2b8.js


A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-user-money.f84463c3.js


A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-user-yjzye.0b94a798.js


A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-user-yjzye.30d447ce.js


A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-user-zye.5a0909d2.js


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