Browse Source

8-25-手续费

2312970463@qq.com 4 years ago
parent
commit
3af7d53067
6 changed files with 51 additions and 14 deletions
  1. 10 5
      .hbuilderx/launch.json
  2. 1 1
      manifest.json
  3. 2 2
      pages/set/userinfo.vue
  4. 5 3
      pages/store/apply.vue
  5. 2 2
      pages/user/user.vue
  6. 31 1
      pages/user/withdrawal.vue

+ 10 - 5
.hbuilderx/launch.json

@@ -2,10 +2,15 @@
   // launchtype项可配置值为local或remote, local代表前端连本地云函数,remote代表前端连云端云函数
     "version": "0.0",
     "configurations": [{
-            "type": "uniCloud",
-            "default": {
-                "launchtype": "remote"
-            }
-        }
+     	"default" : 
+     	{
+     		"launchtype" : "remote"
+     	},
+     	"h5" : 
+     	{
+     		"launchtype" : "remote"
+     	},
+     	"type" : "uniCloud"
+     }
     ]
 }

+ 1 - 1
manifest.json

@@ -1,6 +1,6 @@
 {
     "name" : "基础项目",
-    "appid" : "__UNI__F0EBD91",
+    "appid" : "__UNI__7E72005",
     "description" : "",
     "versionName" : "1.0.0",
     "versionCode" : "100",

+ 2 - 2
pages/set/userinfo.vue

@@ -37,9 +37,9 @@
   		<input class="input" v-model="userInfo.uid" type="text" disabled="true" placeholder-class="placeholder" style="color: #999;" />
   	</view>
 	<!-- v-if="agents!=''" -->
-	<view class="row b-b flex" v-if="userInfo.agent.length > 0">
+	<view class="row b-b flex" v-if="!Array.isArray(userInfo.agent)">
 		<text class="tit">代理区域</text>
-		<view class="agents" style="color: #999;">
+		<view class="agents" style="color: #999;text-align: right;">
 			<view class="agent" v-for="(item,index) in userInfo.agent" :key="index">
 			{{item}}	
 			</view>

+ 5 - 3
pages/store/apply.vue

@@ -437,10 +437,12 @@ export default {
 	}
 }
 .sub-btn {
-	position: fixed;
-	bottom: 0;
-	width: 750rpx;
+	// position: fixed;
+	// bottom: 0;
+	margin: 60rpx auto;
+	width: 600rpx;
 	height: 98rpx;
+	border-radius: 49rpx;
 	background: linear-gradient(180deg, #FD4646, #FF3535);
 	font-size: 36rpx;
 	font-family: PingFang SC;

+ 2 - 2
pages/user/user.vue

@@ -18,7 +18,7 @@
 								<view class="lv-3" v-if="userInfo.level == 3"><image src="../../static/img/lv03.png" mode=""></image></view>
 								<view class="lv-3" v-if="userInfo.level == 4"><image src="../../static/img/lv04.png" mode=""></image></view>
 							</view>
-							<view class="" v-if="userInfo.agent.length !=0 " style="padding-top: 5rpx; font-size: 30rpx; font-weight: 500;" @click="navTo('/pages/set/userinfo')">
+							<view class="" v-if="!Array.isArray(userInfo.agent)" style="padding-top: 5rpx; font-size: 30rpx; font-weight: 500;" @click="navTo('/pages/set/userinfo')">
 								代理区域 >
 							</view>
 						</view>
@@ -27,7 +27,7 @@
 							<view class="user-get">
 								本月业绩:¥<text style="font-weight: bold;">{{userInfo.store_sum | 0}}</text>
 							</view>
-							<view class="" v-if="userInfo.agent.length !=0 " style="padding-top: 5rpx; font-size: 30rpx; font-weight: 500;" @click="navTo('/pages/set/userinfo')">
+							<view class="" v-if="!Array.isArray(userInfo.agent)" style="padding-top: 5rpx; font-size: 30rpx; font-weight: 500;" @click="navTo('/pages/set/userinfo')">
 								代理区域 >
 							</view>
 						</view>

+ 31 - 1
pages/user/withdrawal.vue

@@ -30,6 +30,25 @@
 				<input class="input" type="number" v-model="withdrawal" :placeholder="'最低提现金额' + minPrice + '元'" placeholder-class="placeholder" />
 				<view class="buttom" @click="withdrawal = money">全部提现</view>
 			</view>
+			<template v-if="withdrawal*1 > 0">
+				<view class="sq">
+					<text class="" style="font-size: 28rpx;">
+						手续费
+					</text>
+					<text class="num" style="font-size: 28rpx;">
+						¥{{ sxf | getMoneyStyle }}
+					</text>
+				</view>
+				<view class="sq" >
+					<text class="" style="font-size: 28rpx;">
+						实际到账
+					</text>
+					<text class="num" style="font-size: 28rpx;">
+						¥{{ sjdz | getMoneyStyle }}
+					</text>
+				</view>
+			</template>
+			
 		</view>
 		<!-- #ifndef MP-WEIXIN -->
 		<view class="list" v-if="!weichatBsrowser">
@@ -98,6 +117,7 @@ export default {
 	},
 	data() {
 		return {
+			// sxf: '0.00',
 			type: 'weixin', //提现方式
 			money: '0.00', //可提现金额
 			freeze: '0.0', //冻结金额
@@ -111,6 +131,16 @@ export default {
 			
 		};
 	},
+	computed: {
+		//提现手续费
+		sxf() {
+			return (this.withdrawal*1*0.075)
+		},
+		//实际到账
+		sjdz() {
+			return (this.withdrawal*1*0.925)
+		}
+	},
 	onLoad(options) {
 		// #ifdef H5
 		this.weichatBsrowser = uni.getStorageSync('weichatBrowser');
@@ -183,7 +213,7 @@ export default {
 			let data = {
 				extract_type: this.type, //bank -银行卡 alipay-支付宝 weixin-微信
 				money: this.withdrawal, //金额
-				money_type: 1//0佣金1余额
+				money_type: 0//0佣金1余额
 			}
 			if (this.type=='alipay') {
 				data.name = this.aliData.fullname;