2023-8-14

manifest.json

@@ -2,8 +2,8 @@
     "name" : "易趣CBB",
     "appid" : "__UNI__F0EBD91",
     "description" : "",
-    "versionName" : "1.2.4",
-    "versionCode" : 124,
+    "versionName" : "1.2.7",
+    "versionCode" : 127,
     "transformPx" : false,
     "app-plus" : {
         /* 5+App特有相关 */

pages/money/withdrawal.vue

@@ -24,7 +24,7 @@
 			</view>
 		</view>
 		<!-- #ifndef MP-WEIXIN -->
-		<view class="list" v-if="!weichatBsrowser">
+		<view class="list">
 			<radio-group @change="tabRadio">
 				<!-- <label>
 					<view class="box">
@@ -131,7 +131,7 @@
 				}) => {
 					this.aliData = data.zfb
 					this.bankData = data.bank
-					console.log(data);
+					console.log(this.aliData, 7894513);
 				})
 			},
 			// 加载余额信息
@@ -158,6 +158,9 @@
 			},
 			// 提交
 			confirm() {
+				if (this.withdrawal * 1 % 1000 != 0) {
+					return this.$api.msg('提现金额请输入1000的倍数')
+				}
 				let data = {
 					extract_type: this.type, //bank -银行卡 alipay-支付宝 weixin-微信
 					money: this.withdrawal, //金额
@@ -165,15 +168,16 @@
 					type: this.way
 				}
 				if (this.type == 'alipay') {
-					data.name = this.aliData.fullname;
-					data.alipay_code = this.aliData.alino;
+					data.name = this.aliData.name;
+					data.alipay_code = this.aliData.payment;
 				}
 				if (this.type == 'bank') {
-					data.name = this.bankData.fullname;
-					data.bankname = this.bankData.bank;
-					data.cardnum = this.bankData.bankno;
+					console.log(111);
+					data.name = this.bankData.name;
+					data.bankname = this.bankData.bank_name;
+					data.cardnum = this.bankData.payment;
 				}
-
+				console.log(data, 'info');
 
 				extractCash(data)
 					.then(e => {

pages/navigation/bdjj.vue

@@ -68,7 +68,8 @@
 		mapMutations
 	} from 'vuex';
 	import {
-		getMoneyStyle
+		getMoneyStyle,
+		getTime
 	} from '@/utils/rocessor.js';
 	import uniLoadMore from '@/components/uni-load-more/uni-load-more.vue';
 	import empty from '@/components/empty';
@@ -161,7 +162,7 @@
 					//tab切换只有第一次需要加载数据
 					return;
 				}
-				if (navItem.loadingType === 'loading') {
+				if (navItem.loadingType === 'loading' || navItem.loadingType === 'noMore') {
 					//防止重复加载
 					return;
 				}
@@ -180,6 +181,9 @@
 						this.recharge = data.sum;
 						if (data.list.length > 0) {
 							if (state == 1) {
+								data.list.forEach(e => {
+									e.add_time = getTime(e.add_time)
+								})
 								navItem.orderList = navItem.orderList.concat(data.list);
 							}
 							navItem.page++;

pages/navigation/fhsy.vue

@@ -68,7 +68,8 @@
 		mapMutations
 	} from 'vuex';
 	import {
-		getMoneyStyle
+		getMoneyStyle,
+		getTime
 	} from '@/utils/rocessor.js';
 	import uniLoadMore from '@/components/uni-load-more/uni-load-more.vue';
 	import empty from '@/components/empty';
@@ -161,7 +162,7 @@
 					//tab切换只有第一次需要加载数据
 					return;
 				}
-				if (navItem.loadingType === 'loading') {
+				if (navItem.loadingType === 'loading' || navItem.loadingType === 'noMore') {
 					//防止重复加载
 					return;
 				}
@@ -180,6 +181,9 @@
 						this.recharge = data.sum;
 						if (data.list.length > 0) {
 							if (state == 1) {
+								data.list.forEach(e => {
+									e.add_time = getTime(e.add_time)
+								})
 								navItem.orderList = navItem.orderList.concat(data.list);
 							}
 							navItem.page++;

pages/navigation/tdjj.vue

@@ -68,7 +68,8 @@
 		mapMutations
 	} from 'vuex';
 	import {
-		getMoneyStyle
+		getMoneyStyle,
+		getTime
 	} from '@/utils/rocessor.js';
 	import uniLoadMore from '@/components/uni-load-more/uni-load-more.vue';
 	import empty from '@/components/empty';
@@ -161,7 +162,7 @@
 					//tab切换只有第一次需要加载数据
 					return;
 				}
-				if (navItem.loadingType === 'loading') {
+				if (navItem.loadingType === 'loading' || navItem.loadingType === 'noMore') {
 					//防止重复加载
 					return;
 				}
@@ -180,6 +181,9 @@
 						this.recharge = data.sum;
 						if (data.list.length > 0) {
 							if (state == 1) {
+								data.list.forEach(e => {
+									e.add_time = getTime(e.add_time)
+								})
 								navItem.orderList = navItem.orderList.concat(data.list);
 							}
 							navItem.page++;

pages/navigation/team.vue

@@ -163,7 +163,7 @@
 					//tab切换只有第一次需要加载数据
 					return;
 				}
-				if (navItem.loadingType === 'loading') {
+				if (navItem.loadingType === 'loading' || navItem.loadingType === 'noMore') {
 					//防止重复加载
 					return;
 				}

pages/set/phone.vue

@@ -4,7 +4,7 @@
 			<text class="tit">手机号</text>
 			<input class="input" v-model="account" type="text" placeholder="请填写手机号" placeholder-class="placeholder" />
 		</view>
-		<view v-if="show">
+		<view>
 			<view class="row b-b">
 				<text class="tit">验证码</text>
 				<input class="input" v-model="captcha" type="text" placeholder="请填写验证码"

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.63b34199.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/index/static/js/chunk-vendors.b20269cd.js></script><script src=/index/static/js/index.5f1f859c.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.63b34199.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/index/static/js/chunk-vendors.b20269cd.js></script><script src=/index/static/js/index.02e37635.js></script></body></html>