2024-1-24

api/api.js

@@ -477,7 +477,7 @@ export function getCategoryVersion() {
 
 
 /**
- * 商品分类类版本
+ * 获取app版本
  */
 export function getAppVersion() {
 	return request.get('version',{},{

manifest.json

@@ -1,7 +1,7 @@
 {
-    "name" : "壹柒科技",
+    "name" : "壹柒智能",
     "appid" : "__UNI__70BC0AE",
-    "description" : "壹柒科技",
+    "description" : "壹柒智能",
     "versionName" : "2.7.7",
     "versionCode" : 277,
     "transformPx" : false,

pages/user/index.vue

@@ -246,6 +246,10 @@
 							<text class="num">{{userInfo.award_piece||0.00}}</text>
 							<view class="txt">分红值</view>
 						</view>
+						<view class="num-item"  @click="goMenuPage('/pages/users/user_spread_user/index')">
+							<text class="num">{{userInfo.brokerage_integral||0.00}}</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']"

pages/users/user_cash/index.vue

@@ -9,135 +9,117 @@
 				</view>
 			</view>
 			<view class='wrapper'>
-				<view :hidden='currentTab != 0' class='list'>
+				<view class='list'>
 					<form @submit="subCash">
-						<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 v-if="currentTab == 0">
+							<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>
 							</view>
-						</view>
-						<view class='item acea-row row-between-wrapper'>
-							<view class='name'>卡号</view>
-							<view class='input'><input type='number' placeholder='请填写卡号' placeholder-class='placeholder'
-									name="cardnum"></input></view>
-						</view>
-						<view class='item acea-row row-between-wrapper'>
-							<view class='name'>银行</view>
-							<view class='input'>
-								<picker @change="bindPickerChange" :value="index" :range="array">
-									<text class='Bank'>{{array[index]}}</text>
-									<text class='iconfont icon-qiepian38'></text>
-								</picker>
+							<view class='item acea-row row-between-wrapper'>
+								<view class='name'>卡号</view>
+								<view class='input'>
+									<input type='number' placeholder='请填写卡号' placeholder-class='placeholder'
+										name="cardnum"></input>
+								</view>
 							</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>
-						<view class='tip'>
-							当前可提现金额: <text
-								class="price">￥{{userInfo.commissionCount}}</text>,冻结佣金：￥{{userInfo.broken_commission}}
-						</view>
-						<view class='tip'>
-							提现手续费: <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}}天，到期后可提现
-						</view>
-						<button formType="submit" class='bnt bg-color'>提现</button>
-					</form>
-				</view>
-				<view :hidden='currentTab != 1' class='list'>
-					<form @submit="subCash">
-						<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 class='item acea-row row-between-wrapper'>
+								<view class='name'>银行</view>
+								<view class='input'>
+									<picker @change="bindPickerChange" :value="index" :range="array">
+										<text class='Bank'>{{array[index]}}</text>
+										<text class='iconfont icon-qiepian38'></text>
+									</picker>
+								</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>
 						</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>
-						<view class='item acea-row row-top row-between' v-if="extract_wechat_type == 0">
-							<view class='name'>收款码</view>
-							<view class="input acea-row">
-								<view class="picEwm" v-if="qrcodeUrlW">
-									<image :src="qrcodeUrlW"></image>
-									<text class='iconfont icon-guanbi1 fontcolor' @click='DelPicW'></text>
+						<view v-if="currentTab == 1">
+							<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>
-								<view class='pictrue acea-row row-center-wrapper row-column' @click='uploadpic("W")'
-									v-else>
-									<text class='iconfont icon-icon25201'></text>
-									<view>上传图片</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>
-						</view>
-						<view class='tip'>
-							当前可提现金额: <text
-								class="price">￥{{userInfo.commissionCount}}</text>,冻结佣金：￥{{userInfo.broken_commission}}
-						</view>
-						<view class='tip'>
-							提现手续费: <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}}天，到期后可提现
-						</view>
-						<button formType="submit" class='bnt bg-color'>提现</button>
-					</form>
-				</view>
-				<view :hidden='currentTab != 2' class='list'>
-					<form @submit="subCash">
-						<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 class='item acea-row row-top row-between' v-if="extract_wechat_type == 0">
+								<view class='name'>收款码</view>
+								<view class="input acea-row">
+									<view class="picEwm" v-if="qrcodeUrlW">
+										<image :src="qrcodeUrlW"></image>
+										<text class='iconfont icon-guanbi1 fontcolor' @click='DelPicW'></text>
+									</view>
+									<view class='pictrue acea-row row-center-wrapper row-column' @click='uploadpic("W")'
+										v-else>
+										<text class='iconfont icon-icon25201'></text>
+										<view>上传图片</view>
+									</view>
+								</view>
 							</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>
-						<view class='item acea-row row-top row-between'>
-							<view class='name'>收款码</view>
-							<view class="input acea-row">
-								<view class="picEwm" v-if="qrcodeUrlZ">
-									<image :src="qrcodeUrlZ"></image>
-									<text class='iconfont icon-guanbi1 fontcolor' @click='DelPicZ'></text>
+						<view v-if="currentTab == 2">
+							<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>
-								<view class='pictrue acea-row row-center-wrapper row-column' @click='uploadpic("Z")'
-									v-else>
-									<text class='iconfont icon-icon25201'></text>
-									<view>上传图片</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>
+							<view class='item acea-row row-top row-between'>
+								<view class='name'>收款码</view>
+								<view class="input acea-row">
+									<view class="picEwm" v-if="qrcodeUrlZ">
+										<image :src="qrcodeUrlZ"></image>
+										<text class='iconfont icon-guanbi1 fontcolor' @click='DelPicZ'></text>
+									</view>
+									<view class='pictrue acea-row row-center-wrapper row-column' @click='uploadpic("Z")'
+										v-else>
+										<text class='iconfont icon-icon25201'></text>
+										<view>上传图片</view>
+									</view>
 								</view>
 							</view>
 						</view>
+						<view class='item acea-row row-between-wrapper'>
+							<view class='name'>提现类型</view>
+							<view class='input'>
+								<picker @change="bindMoneyType" :value="typeMoneyIndex" range-key="name"
+									:range="typeMoney">
+									<text class='Bank'>{{typeMoney[typeMoneyIndex].name}}</text>
+									<text class='iconfont icon-qiepian38'></text>
+								</picker>
+							</view>
+						</view>
 						<view class='tip'>
-							当前可提现金额: <text
+							当前可提现佣金: <text
 								class="price">￥{{userInfo.commissionCount}}</text>,冻结佣金：￥{{userInfo.broken_commission}}
 						</view>
+						<view class='tip'>
+							当前可提现奖金: <text class="price">￥{{userInfo.brokerage_integral}}</text>
+						</view>
 						<view class='tip'>
 							提现手续费: <text class="price">{{withdraw_fee}}%</text>
 						</view>
@@ -183,8 +165,16 @@
 				currentTab: '',
 				index: 0,
 				array: [], //提现银行
+				typeMoneyIndex: 0,
+				typeMoney: [{
+					name: '佣金',
+					value: "brokerage_price"
+				}, {
+					name: '奖金',
+					value: 'brokerage_integral'
+				}],
 				minPrice: 0.00, //最低提现金额
-				userInfo: [],
+				userInfo: ["", ""],
 				isClone: false,
 				isAuto: false, //没有授权的不会自动授权
 				isShowAuth: false, //是否隐藏授权
@@ -215,7 +205,10 @@
 				deep: true
 			}
 		},
-		onLoad() {
+		onLoad(opt) {
+			if (opt.type) {
+				this.typeMoneyIndex = opt.type;
+			}
 			if (this.isLogin) {
 				this.getUserInfo();
 				this.getUserExtractBank();
@@ -240,11 +233,13 @@
 				} else {
 					this.moneyMaxLeng = 8
 				}
-				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;
+				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;
+				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);
@@ -335,9 +330,13 @@
 			bindPickerChange: function(e) {
 				this.index = e.detail.value;
 			},
+			bindMoneyType: function(e) {
+				this.typeMoneyIndex = e.detail.value;
+			},
 			subCash: function(e) {
 				let that = this,
 					value = e.detail.value;
+					value.from = that.typeMoney[that.typeMoneyIndex].value;
 				if (that.currentTab == 0) { //银行卡
 					if (value.name.length == 0) return this.$util.Tips({
 						title: '请填写持卡人姓名'

pages/users/user_spread_user/index.vue

@@ -61,6 +61,15 @@
 				<view class="com-count" @click="jumbPath(6)">
 					{{userInfo.commissionCount || 0.00}}
 				</view>
+				<view class="box-top" style="margin-top:20rpx">
+					<view class="" @click="jumbPath(11)">
+						可提现奖金
+						<text class="iconfont icon-xiangyou"></text>
+					</view>
+				</view>
+				<view class="com-count">
+					{{userInfo.brokerage_integral || 0.00}}
+				</view>
 				<view class="box-btn">
 					<view class="item">
 						<view class="text">
@@ -297,6 +306,7 @@
 					'/pages/users/promoter-order/index',
 					'/pages/users/promoter-list/index',
 					'/pages/users/user_distribution_level/index',
+					'/pages/users/user_cash/index?type=1',
 				]
 
 				uni.navigateTo({