lhl 3 years ago
parent
commit
7db7166f02

BIN
baseinfo/1080.9.png


BIN
baseinfo/480.9.png


BIN
baseinfo/720.9.png


+ 1 - 0
baseinfo/baseinfo.txt

@@ -0,0 +1 @@
+别名:inc.hy.com

BIN
baseinfo/hy.keystore


BIN
baseinfo/logo.png


+ 5 - 5
manifest.json

@@ -2,8 +2,8 @@
     "name" : "GRAYSCALE",
     "appid" : "__UNI__F0EBD91",
     "description" : "",
-    "versionName" : "1.0.3",
-    "versionCode" : 103,
+    "versionName" : "1.0.4",
+    "versionCode" : 104,
     "transformPx" : false,
     "app-plus" : {
         /* 5+App特有相关 */
@@ -83,9 +83,9 @@
             "splashscreen" : {
                 "androidStyle" : "default",
                 "android" : {
-                    "hdpi" : "unpackage/res/启动图/480.9.png",
-                    "xhdpi" : "unpackage/res/启动图/720.9.png",
-                    "xxhdpi" : "unpackage/res/启动图/1080.9.png"
+                    "hdpi" : "baseinfo/480.9.png",
+                    "xhdpi" : "baseinfo/720.9.png",
+                    "xxhdpi" : "baseinfo/1080.9.png"
                 }
             }
         }

+ 6 - 3
pages/heyue/heyue.vue

@@ -166,8 +166,8 @@
 					<view @click="closeorder(item)" v-if="ddType == 1" class="usdtListButtom">{{ $t('hy.pc') }}</view>
 				</view>
 				<view class="tip ">
-					<text v-if="item.direction == 1">{{ $t('hy.wtsj') }}:{{ item.wttime }}</text>
-					<text v-if="item.direction == 2">{{ $t('hy.kcsj') }}:{{ item.addtime }}</text>
+					<text v-if="ddType == 0">{{ $t('hy.wtsj') }}:{{ item.wttime }}</text>
+					<text v-if="ddType == 1">{{ $t('hy.kcsj') }}:{{ item.addtime }}</text>
 				</view>
 				<view class="flex" style="flex-wrap: wrap;">
 					<view v-if="ddType == 0" class="tipList">
@@ -403,6 +403,8 @@ export default {
 								confirmText: that.$t('hy.qr'),
 								showCancel: false
 							});
+							that.zyMoney = ''
+							that.zsMoney = ''
 							obj.levertadeLaverorder();
 						})
 						.catch(() => {
@@ -556,8 +558,9 @@ export default {
 			const that = this;
 			uni.showModal({
 				title: that.$t('hy.cx'),
-				content: that.$t('hy.ljcx'),
+				content: that.$t('hy.sfljcx'),
 				confirmText: that.$t('hy.qr'),
+				cancelText: that.$t('cb.qx'),
 				success: res => {
 					if (res.confirm) {
 						uni.showLoading({

+ 5 - 1
pages/heyue/tradlist.vue

@@ -57,7 +57,11 @@
 								<view class="nameTip">{{ $t('hy.dqjg') }}</view>
 								<view class="text">{{ listOBj[item.symbol.replace('/', '-')].last }}</view>
 							</view> -->
-							<view v-if="current != 0" class="tipList">
+							<view v-if="current == 1" class="tipList">
+								<view class="nameTip">{{ $t('hy.dqjg') }}</view>
+								<view class="text">{{ listOBj[item.symbol.replace('/', '-')].last || 0 }}</view>
+							</view>
+							<view v-if="current == 2" class="tipList">
 								<view class="nameTip">{{ $t('hy.pcjg') }}</view>
 								<view class="text">{{ item.pc_price || 0 }}</view>
 							</view>

+ 196 - 172
pages/public/register.vue

@@ -1,6 +1,8 @@
 <template>
 	<view class="container">
-		<view class="wjmm" style="text-align: right;padding-right: 30rpx;font-size: 36rpx;" @click="dl()">{{ $t('login.dl') }}</view>
+		<view class="wjmm" style="text-align: right;padding-right: 30rpx;font-size: 36rpx;" @click="dl()">
+			{{ $t('login.dl') }}
+		</view>
 		<view class="tit" style="padding-top:120rpx;">{{ $t('login.yx') }}</view>
 		<input type="text" class="shuru" :placeholder="$t('login.qsryx')" v-model="email" />
 		<view class="tit">{{ $t('login.yxyzm') }}</view>
@@ -20,7 +22,8 @@
 				{{ $t('login.zcjbsty') }}
 				<text style="color: #fcd535;">{{ $t('login.yhfwxy') }}</text>
 			</view>
-			<image src="../../static/icon/goto.png" mode="" style="width: 97rpx;height: 97rpx;" @click="register()"></image>
+			<image src="../../static/icon/goto.png" mode="" style="width: 97rpx;height: 97rpx;" @click="register()">
+			</image>
 		</view>
 		<!-- <view class="login_text">
 			<view class="login_input flex">
@@ -52,198 +55,219 @@
 	</view>
 </template>
 <script>
-import { register, verify, getYzm, zc } from '@/api/login.js';
-export default {
-	data() {
-		return {
-			loaded: false,
-			lpwd: '',
-			relpwd: '',
-			invit: '',
-			email: '',
-			phone: '', //用户
-			password: '', //密码
-			repassword: '',
-			invitation: '', //邀请码
-			code: '', //验证码
-			time: '', //保存倒计时对象
-			countDown: 0 //倒计时
-		};
-	},
-	onLoad() {
-		uni.setNavigationBarTitle({ title: this.$t('login.zc') });
-		// 获取扫码邀请人id
-		this.invitation = uni.getStorageSync('spread') || '';
-	},
-	watch: {
-		// 监听倒计时
-		countDown(i) {
-			if (i == 0) {
-				clearInterval(this.time);
-			}
-		}
-	},
-	methods: {
-		dl() {
-			uni.navigateTo({
-				url: '/pages/public/login'
+	import {
+		register,
+		verify,
+		getYzm,
+		zc
+	} from '@/api/login.js';
+	export default {
+		data() {
+			return {
+				loaded: false,
+				lpwd: '',
+				relpwd: '',
+				invit: '',
+				email: '',
+				phone: '', //用户
+				password: '', //密码
+				repassword: '',
+				invitation: '', //邀请码
+				code: '', //验证码
+				time: '', //保存倒计时对象
+				countDown: 0 //倒计时
+			};
+		},
+		onLoad() {
+			uni.setNavigationBarTitle({
+				title: this.$t('login.zc')
 			});
+			// 获取扫码邀请人id
+			this.invitation = uni.getStorageSync('spread') || '';
 		},
-		// 注册
-		register() {
-			let obj = this;
-			if (obj.loaded) {
-				return;
-			}
-			if (obj.email == '') {
-				obj.$api.msg(this.$t('login.qsryx'));
-				return;
-			}
-			if (obj.lpwd == '') {
-				obj.$api.msg(this.$t('login.qsrmm'));
-				return;
-			}
-			if (obj.relpwd == '') {
-				obj.$api.msg(this.$t('mm.qsrqrmm'));
-				return;
-			}
-			if (obj.relpwd != obj.lpwd) {
-				obj.$api.msg(this.$t('mm.lcmmbyz'));
-				return;
-			}
-			// if ((obj.invitation = '')) {
-			// 	obj.$api.msg('请输入邀请码');
-			// 	return;
-			// }
-			if (obj.code == '') {
-				obj.$api.msg(this.$t('login.qsryzm'));
-				return;
+		watch: {
+			// 监听倒计时
+			countDown(i) {
+				if (i == 0) {
+					clearInterval(this.time);
+				}
 			}
-			obj.loaded = true;
-			zc({
-				email: obj.email,
-				lpwd: obj.lpwd,
-				invit: obj.invit,
-				phone: obj.phone,
-				yincang: 1,
-				ecode: obj.code
-			})
-				.then(function(e) {
-					obj.loaded = false;
+		},
+		methods: {
+			dl() {
+				uni.navigateTo({
+					url: '/pages/public/login'
+				});
+			},
+			// 注册
+			register() {
+				let obj = this;
+				if (obj.loaded) {
+					return;
+				}
+				if (obj.email == '') {
+					obj.$api.msg(this.$t('login.qsryx'));
+					return;
+				}
+				if (obj.lpwd == '') {
+					obj.$api.msg(this.$t('login.qsrmm'));
+					return;
+				}
+				if (obj.relpwd == '') {
+					obj.$api.msg(this.$t('mm.qsrqrmm'));
+					return;
+				}
+				if (obj.relpwd != obj.lpwd) {
+					obj.$api.msg(this.$t('mm.lcmmbyz'));
+					return;
+				}
+				if (obj.code == '') {
+					obj.$api.msg(this.$t('login.qsryzm'));
+					return;
+				}
+				obj.loaded = true;
+				zc({
+					email: obj.email,
+					lpwd: obj.lpwd,
+					invit: obj.invit,
+					phone: obj.phone,
+					yincang: 1,
+					ecode: obj.code
+				}).then(res => {
+					console.log('注册成功+++++++++')
 					uni.showToast({
 						title: this.$t('login.zccg'),
-						duration: 2000,
-						position: 'top'
+						icon: 'success',
+						duration: 2000
 					});
 					setTimeout(function() {
+						obj.loaded = false;
 						uni.navigateTo({
 							url: '/pages/public/login'
 						});
-					}, 1000);
-				})
-				.catch(err => {
+					}, 2000);
+				}).catch(err => {
 					obj.loaded = false;
-				});
-			//调用注册接口,成功跳转登录页
-		},
-		isEmailAvailable(obj) {
-			let email = /^([a-zA-Z0-9]+[_|\_|\.]?)*[a-zA-Z0-9]+@([a-zA-Z0-9]+[_|\_|\.]?)*[a-zA-Z0-9]+\.[a-zA-Z]{2,3}$/;
-			if (!email.test(obj)) {
-				return false;
-			}
-			return true;
-		},
-		//发送验证码
-		verification() {
-			let obj = this;
-			if (obj.email == '') {
-				return obj.$api.msg(this.$t('login.qsryx'));
-			}
-			if (!obj.isEmailAvailable(obj.email)) {
-				return obj.$api.msg(this.$t('login.qsrzqdyx'));
-			}
-			// 判断是否在倒计时
-			if (obj.countDown > 0) {
-				return false;
-			} else {
-				obj.countDown = 60;
-				obj.time = setInterval(() => {
-					obj.countDown--;
-				}, 1000);
-				//调用验证码接口
-				getYzm({
-					email: obj.email
-					// type: 'register'
 				})
-					.then(({ data }) => {})
-					.catch(err => {
-						console.log(err);
-					});
+				// .then(function(e) {
+				// 	// console.log('注册成功+++++++++')
+
+				// 	uni.showToast({
+				// 		title: this.$t('login.zccg'),
+				// 		icon: 'success',
+				// 		duration: 2000
+				// 	});
+				// 	// setTimeout(function() {
+				// 	// 	obj.loaded = false;
+				// 	// 	uni.navigateTo({
+				// 	// 		url: '/pages/public/login'
+				// 	// 	});
+				// 	// }, 1000);
+				// })
+				// .catch(err => {
+				// 	obj.loaded = false;
+				// });
+			},
+			isEmailAvailable(obj) {
+				let email = /^([a-zA-Z0-9]+[_|\_|\.]?)*[a-zA-Z0-9]+@([a-zA-Z0-9]+[_|\_|\.]?)*[a-zA-Z0-9]+\.[a-zA-Z]{2,3}$/;
+				if (!email.test(obj)) {
+					return false;
+				}
+				return true;
+			},
+			//发送验证码
+			verification() {
+				let obj = this;
+				if (obj.email == '') {
+					return obj.$api.msg(this.$t('login.qsryx'));
+				}
+				if (!obj.isEmailAvailable(obj.email)) {
+					return obj.$api.msg(this.$t('login.qsrzqdyx'));
+				}
+				// 判断是否在倒计时
+				if (obj.countDown > 0) {
+					return false;
+				} else {
+					obj.countDown = 60;
+					obj.time = setInterval(() => {
+						obj.countDown--;
+					}, 1000);
+					//调用验证码接口
+					getYzm({
+							email: obj.email
+							// type: 'register'
+						})
+						.then(({
+							data
+						}) => {})
+						.catch(err => {
+							console.log(err);
+						});
+				}
+			},
+			login() {
+				//返回登录
+				uni.navigateTo({
+					url: '/pages/public/login'
+				});
 			}
-		},
-		login() {
-			//返回登录
-			uni.navigateTo({
-				url: '/pages/public/login'
-			});
 		}
-	}
-};
+	};
 </script>
 
 <style lang="scss">
-page {
-	height: 100%;
-	background-color: #fff;
-	font-size: 32rpx;
-}
+	page {
+		height: 100%;
+		background-color: #fff;
+		font-size: 32rpx;
+	}
 
-.container {
-	width: 100%;
-	height: 100%;
-	background-size: 100%;
-}
+	.container {
+		width: 100%;
+		height: 100%;
+		background-size: 100%;
+	}
 
-.shuru {
-	display: block;
-	background-color: #f5f5f5;
-	width: 673rpx;
-	height: 95rpx;
-	margin: auto;
-	padding-left: 30rpx;
-	text-align: 95rpx;
-}
+	.shuru {
+		display: block;
+		background-color: #f5f5f5;
+		width: 673rpx;
+		height: 95rpx;
+		margin: auto;
+		padding-left: 30rpx;
+		text-align: 95rpx;
+	}
 
-.tit {
-	padding: 40rpx 48rpx 20rpx;
-}
+	.tit {
+		padding: 40rpx 48rpx 20rpx;
+	}
 
-.gologin {
-	width: 204rpx;
-	height: 98rpx;
-	line-height: 98rpx;
-	background-color: #fcd535;
-	text-align: center;
-	border-radius: 20rpx;
-}
+	.gologin {
+		width: 204rpx;
+		height: 98rpx;
+		line-height: 98rpx;
+		background-color: #fcd535;
+		text-align: center;
+		border-radius: 20rpx;
+	}
 
-.wjmm {
-	color: #fcd535;
-}
+	.wjmm {
+		color: #fcd535;
+	}
 
-.yzm {
-	width: 400rpx;
-	height: 95rpx;
-	padding-left: 30rpx;
-	background-color: #f5f5f5;
-}
+	.yzm {
+		width: 400rpx;
+		height: 95rpx;
+		padding-left: 30rpx;
+		background-color: #f5f5f5;
+	}
 
-.yzmbtn {
-	width: 234rpx;
-	height: 95rpx;
-	background-color: #f5f5f5;
-	text-align: center;
-	line-height: 95rpx;
-	color: #fcd535;
-}
+	.yzmbtn {
+		width: 234rpx;
+		height: 95rpx;
+		background-color: #f5f5f5;
+		text-align: center;
+		line-height: 95rpx;
+		color: #fcd535;
+	}
 </style>

+ 4 - 0
pages/transaction/bbjy.vue

@@ -393,6 +393,8 @@ export default {
 						showCancel: false
 					});
 					obj.levertadeLaverorder();
+				}).catch(err => {
+					this.upDataLoding = false;
 				});
 			}
 			if (that.typeIndex == 2) {
@@ -412,6 +414,8 @@ export default {
 						showCancel: false
 					});
 					obj.levertadeLaverorder();
+				}).catch(err => {
+					this.upDataLoding = false;
 				});
 			}
 			// that.bond().then(() => {

+ 1 - 1
pages/transaction/bblist.vue

@@ -293,7 +293,7 @@
 				const that = this;
 				uni.showModal({
 					title: that.$t('hy.cx'),
-					content: that.$t('hy.ljcx'),
+					content: that.$t('hy.sfljcx'),
 					confirmText: that.$t('hy.qr'),
 					success: res => {
 						if (res.confirm) {

+ 4 - 3
pages/user/coininfo.vue

@@ -38,7 +38,7 @@
 		</view>
 		<uni-load-more :status="loadingType"></uni-load-more>
 		<view class="tianc" style="height: 120rpx;background-color: #fff;"></view>
-		<view class="btm-btn flex">
+		<view class="btm-btn flex" v-if="info.czstatus == 1 || info.txstatus == 1 || id == 4">
 			<view class="btnbox_a " v-if="info.czstatus == 1" @click="navto('/pages/transaction/cbdetail?type=' + id)">{{ $t('user.cb') }}</view>
 			<view class="btnbox_b " v-if="info.txstatus == 1" @click="navto('/pages/transaction/tbdetail?type=' + id)">{{ $t('user.tb') }}</view>
 			<view class="btnbox_b " v-if="id == 4" @click="navto('/pages/transaction/transfer')">{{ $t('user.hz') }}</view>
@@ -102,6 +102,7 @@ export default {
 				console.log(res);
 				// if()
 				obj.list = obj.list.concat(res.data);
+				obj.page++
 				if (obj.limit == res.data.length) {
 					obj.loadingType = 'more';
 				} else {
@@ -154,7 +155,7 @@ page {
 }
 .cwjl-wrap {
 	width: 660rpx;
-	height: 180rpx;
+	// height: 180rpx;
 	border-bottom: 1px solid #f5f5f5;
 	margin: auto;
 	padding: 10rpx 20rpx;
@@ -164,7 +165,7 @@ page {
 	}
 	.jl-info {
 		justify-content: space-between;
-
+		align-items: flex-start;
 		.info-item {
 			width: 33%;
 			.item-name {

BIN
unpackage/cache/apk/__UNI__F0EBD91_cm.apk


+ 1 - 1
unpackage/cache/apk/apkurl

@@ -1 +1 @@
-https://ide.dcloud.net.cn/build/download/5f1d2b00-6cb9-11ed-a946-f1fa0c87f73d
+https://ide.dcloud.net.cn/build/download/d8d6c7f0-6d96-11ed-9d15-bb710cb884ab

File diff suppressed because it is too large
+ 0 - 0
unpackage/cache/apk/cmManifestCache.json


+ 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>GRAYSCALE</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.b0707a6a.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/index/static/js/chunk-vendors.01ecbba6.js></script><script src=/index/static/js/index.8e3be0ab.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.b0707a6a.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/index/static/js/chunk-vendors.e856e85b.js></script><script src=/index/static/js/index.14d276e4.js></script></body></html>

BIN
unpackage/release/apk/__UNI__F0EBD91__20221125200453.apk


Some files were not shown because too many files changed in this diff