2024-2-19

manifest.json

@@ -2,8 +2,8 @@
     "name" : "神英优选",
     "appid" : "__UNI__70BC0AE",
     "description" : "神英优选商城",
-    "versionName" : "2.7.8",
-    "versionCode" : 278,
+    "versionName" : "2.8.3",
+    "versionCode" : 283,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {

pages/user/index.vue

@@ -235,8 +235,6 @@
 							<view class="txt">总资金</view>
 						</view>
 					</view>
-					<!-- #ifndef APP -->
-					
 					<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">
@@ -258,7 +256,6 @@
 							<view class="txt">消费分</view>
 						</view>
 					</view>
-					<!-- #endif -->
 					<!-- 新人礼物 -->
 					<view class="num-wrapper on" v-if="!userInfo.uid">
 						<image :src="giftPic" mode="" class="img"></image>

pages/users/login/register.vue

@@ -136,12 +136,28 @@
 						showCancel: false,
 					});
 				} else {
-					getAppVersion().then((res) => {
-						console.log(res, 'res');
-						window.open(res.data.apk)
-					}).catch((err) => {
-						console.log(err, 'err');
-					})
+					uni.showModal({
+						title: '下载',
+						content: '请选择下载类型',
+						cancelText: 'IOS',
+						confirmText: 'APK',
+						success: res => {
+							if(res.confirm){
+								getAppVersion().then((res) => {
+									console.log(res, 'res');
+									window.open(res.data.apk)
+								}).catch((err) => {
+									console.log(err, 'err');
+								})
+							}
+							if(res.cancel){
+								window.location.href =  window.location.protocol + "//" + window.location.host+'home/download/iosdom.mobileconfig'
+							}
+						},
+						fail: () => {},
+						complete: () => {}
+					});
+					
 				}
 			},
 			// #endif

pages/users/user_cash/index.vue

@@ -30,6 +30,15 @@
 								</picker>
 							</view>
 						</view>
+						<view class='item acea-row row-between-wrapper'>
+							<view class='name'>类型</view>
+							<view class='input'>
+								<picker @change="typePickerChange" :value="index" :range="typeMoney" range-key="name">
+									<text class='Bank'>{{typeMoney[typeIndex].name}}</text>
+									<text class='iconfont icon-qiepian38'></text>
+								</picker>
+							</view>
+						</view>
 						<view class='item acea-row row-top row-between'>
 							<view class='name'>凭证</view>
 							<view class="input acea-row">
@@ -37,7 +46,7 @@
 									<image :src="qrcodeUrPZ"></image>
 									<text class='iconfont icon-guanbi1 fontcolor' @click='DelPicP'></text>
 								</view>
-								<view class='pictrue acea-row row-center-wrapper row-column' @click='uploadpic("Z")'
+								<view class='pictrue acea-row row-center-wrapper row-column' @click='uploadpic("P")'
 									v-else>
 									<text class='iconfont icon-icon25201'></text>
 									<view>上传图片</view>
@@ -46,7 +55,7 @@
 						</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'
+							<view class='input'><input v-model="allMoney" @input='inputNum' :maxlength="moneyMaxLeng" :placeholder='"最低提现金额：¥"+minPrice' placeholder-class='placeholder'
 									name="money" type='digit'></input></view>
 						</view>
 						<view class='tip'>
@@ -175,6 +184,14 @@
 				currentTab: '',
 				index: 0,
 				array: [], //提现银行
+				typeIndex:0,
+				typeMoney: [{
+					name:'个人',
+					value:0
+				},{
+					name:'企业',
+					value:1
+				}], //提现银行
 				minPrice: 0.00, //最低提现金额
 				userInfo: [],
 				isClone: false,
@@ -187,7 +204,8 @@
 				moneyMaxLeng: 8,
 				withdraw_fee: '0',
 				true_money: 0,
-				extract_wechat_type:0
+				extract_wechat_type:0,
+				allMoney:'',//保存当前提现金额
 			};
 		},
 		computed: mapGetters(['isLogin']),
@@ -223,7 +241,7 @@
 					this.moneyMaxLeng = 8
 				}
 				
-				let money = await calculator({money:val});
+				let money = await calculator({money:val,user_type:this.typeMoney[this.typeIndex].value});
 				this.withdraw_fee = money.data.fee;
 				this.true_money = val - this.withdraw_fee;
 			},
@@ -324,12 +342,16 @@
 			bindPickerChange: function(e) {
 				this.index = e.detail.value;
 			},
+			typePickerChange(e){
+				this.typeIndex = e.detail.value;
+				this.inputNum({detail:{value:this.allMoney}});
+			},
 			subCash: function(e) {
 				let that = this,
 					value = e.detail.value;
 				
 				if(!that.qrcodeUrPZ){
-					this.$util.Tips({
+					that.$util.Tips({
 						title: '请上传凭证'
 					})
 					return
@@ -337,13 +359,13 @@
 				value.image = that.qrcodeUrPZ;
 					
 				if (that.currentTab == 0) { //银行卡
-					if (value.name.length == 0) return this.$util.Tips({
+					if (value.name.length == 0) return that.$util.Tips({
 						title: '请填写持卡人姓名'
 					});
-					if (value.cardnum.length == 0) return this.$util.Tips({
+					if (value.cardnum.length == 0) return that.$util.Tips({
 						title: '请填写卡号'
 					});
-					if (that.index == 0) return this.$util.Tips({
+					if (that.index == 0) return that.$util.Tips({
 						title: "请选择银行"
 					});
 					value.extract_type = 'bank';
@@ -351,10 +373,10 @@
 				} else if (that.currentTab == 1) { //微信
 					value.extract_type = 'weixin';
 					if(that.extract_wechat_type == 0){
-						if (value.name.length == 0) return this.$util.Tips({
+						if (value.name.length == 0) return that.$util.Tips({
 							title: '请填写微信号'
 						});
-						if (that.qrcodeUrlW == '') return this.$util.Tips({
+						if (that.qrcodeUrlW == '') return that.$util.Tips({
 							title: '请上传图片'
 						});
 						value.weixin = value.name;
@@ -362,27 +384,30 @@
 					}
 				} else if (that.currentTab == 2) { //支付宝
 					value.extract_type = 'alipay';
-					if (value.name.length == 0) return this.$util.Tips({
+					if (value.name.length == 0) return that.$util.Tips({
 						title: '请填写账号'
 					});
-					if (that.qrcodeUrlZ == '') return this.$util.Tips({
+					if (that.qrcodeUrlZ == '') return that.$util.Tips({
 						title: '请上传图片'
 					});
 					value.alipay_code = value.name;
 					value.qrcode_url = that.qrcodeUrlZ;
 				}
-				if (value.money.length == 0) return this.$util.Tips({
+				if (value.money.length == 0) return that.$util.Tips({
 					title: '请填写提现金额'
 				});
-				if (Number(value.money) < Number(that.minPrice)) return this.$util.Tips({
+				if (Number(value.money) < Number(that.minPrice)) return that.$util.Tips({
 					title: '提现金额不能低于：¥' + that.minPrice
 				});
-				if (this.prevent) {
-					this.prevent = false
+				if (that.prevent) {
+					that.prevent = false
 				} else {
 					return
 				}
-				extractCash(value).then(res => {
+				extractCash({
+					...value,
+					user_type:that.typeMoney[that.typeIndex].value
+				}).then(res => {
 					//that.getUserInfo();
 					return this.$util.Tips({
 						title: res.msg,