123

components/navigation/navigation.vue

@@ -62,20 +62,23 @@
     }
    
 	.nav-head{
-		line-height: 40rpx;
+		height: 40rpx;
 		// background-color: #fff;
 		text-align: center;
 		font-weight: 700;
 		font-size: 36rpx;
 		color: #000;
-		position: relative;
+		padding: 40rpx 16rpx;
-		padding: 0 16rpx;
 		margin-top: 50rpx;
 		display: flex;
 		justify-content: center;
 		flex-direction: row-reverse;
 		align-items: center;
 		margin-top: 80rpx;
+		position: sticky;
+		    top: 40px;
+		width: 100%;
+		
 	}
 	.back{
 		width: 30rpx;

pages/menu/about/index.css

@@ -1,3 +1,10 @@
+
+.bitcooo{
+ 	text-align: center;
+    font-size: 60rpx;
+	font-weight: bold;
+	margin-top: 20rpx;
+}
 .main{
 	padding:0 24rpx
 }

pages/menu/about/index.vue

@@ -7,9 +7,10 @@
 
 			<view class="bot_con">
 				<view class="topcon">
-					<!-- <image src="../../../static/tongyonh/Group285.png" mode="aspectFit" class="img"></image> -->
 					<image src="../../../static/tongyonh/Group285.png" mode="aspectFit" class="img"></image>
-					<image src="../../../static/tongyonh/textt.png" mode="aspectFit" class="img2"></image>
+				          <view class="bitcooo">
+				          BitCooo
+				          </view>
 				</view>
 				<view class="flex item">
 					<view class="text1">
@@ -19,12 +20,12 @@
 						{{version}}
 					</view>
 				</view>
-				<view class="flex item">
+				<view class="flex item" @click="goWeb">
 					<view class="text1">
 						{{i18n.Officialwebsite}}
 					</view>
 					<view class="text2 gray">
-						https://bitcooo.com
+						https://www.bitcooo.com
 					</view>
 				</view>
 				<view class="flex item" @click="goTerms">
@@ -76,6 +77,9 @@
 			// #endif
 		},
 		methods: {
+			goWeb(){
+				plus.runtime.openURL('https://www.bitcooo.com/');
+			},
 			goTerms() {
 				uni.navigateTo({
 					url: './terms/index'

pages/menu/sendToken/address/index.css

@@ -9,6 +9,9 @@
 	    top: 50%;
 		transform: translateY(-50%);
 	}
+/deep/ .u-empty{
+	margin-top: 180rpx !important;
+}
 .renYou{
 	width: 48rpx;
 	height: 48rpx;

pages/menu/sendToken/address/index.vue

@@ -139,6 +139,8 @@
 		<u-mask z-index="10" :show="show" @click="show = false"></u-mask>
 		<u-mask z-index="10" :show="show2" @click="show2 = false"></u-mask>
 		<u-mask z-index="10" :show="show3" @click="show3 = false"></u-mask>
+		
+		<u-empty :text="teee" mode="list" v-if="showInfo"></u-empty>
 	</view>
 
 
@@ -150,14 +152,16 @@
 	export default {
 		data() {
 			return {
+				teee: this.$t('index').Nocontent,
+				showInfo: false,
 				sourcePage: '',
 				ethIndex: 0,
 				btcIndex: 0,
 				trxIndex: 0,
 				showImte: false,
-				BTCAddressInfo: {},
+				BTCAddressInfo: [],
-				ETHAddressInfo: {},
+				ETHAddressInfo: [],
-				TRXAddressInfo: {},
+				TRXAddressInfo: [],
 				walletIndex: -1,
 				itemCoin: '',
 				itemAddress: '',
@@ -263,9 +267,12 @@
 					this.showImte = true;
 					this.show = false;
 					setTimeout(() => {
+						uni.redirectTo({
+							url:'/pages/menu/sendToken/address/index'
+						})
 						this.showImte = false;
 					}, 1500)
-
+                
 				}
 				if (this.itemCoin == 'ETH') {
 					if (this.ETHAddressInfo.length == 1) {
@@ -280,9 +287,12 @@
 					this.showImte = true;
 					this.show2 = false;
 					setTimeout(() => {
+						uni.redirectTo({
+							url:'/pages/menu/sendToken/address/index'
+						})
 						this.showImte = false;
 					}, 1500)
-
+             
 				}
 				if (this.itemCoin == 'TRX') {
 					if (this.TRXAddressInfo.length == 1) {
@@ -295,9 +305,12 @@
 					this.showImte = true;
 					this.show3 = false;
 					setTimeout(() => {
+						uni.redirectTo({
+							url:'/pages/menu/sendToken/address/index'
+						})
 						this.showImte = false;
 					}, 1500)
-
+         
 				}
 			},
 			goAddress() {
@@ -307,7 +320,7 @@
 			}
 		},
 		onLoad(item) {
-
+		
 			this.sourcePage = uni.getStorageSync('sourcePage')
 			// 判断是否是从交易页面来的
 			if (item.item) {
@@ -327,6 +340,14 @@
 				this.TRXAddressInfo = uni.getStorageSync('TRXAddressInfo')
 				console.log(this.TRXAddressInfo, 777)
 			}
+			console.log(this.BTCAddressInfo.length)
+			console.log(this.ETHAddressInfo.length)
+			console.log(this.TRXAddressInfo.length)
+			if(this.BTCAddressInfo.length==0&&this.ETHAddressInfo.length==0&&this.TRXAddressInfo.length==0){
+				 this.showInfo=true;
+			}else{
+				this.showInfo=false;
+			}
 		}
 	};
 </script>

pages/menu/sendToken/transfer/index.vue

@@ -80,7 +80,7 @@
 					</view>
 				</view>
 
-				<view class="item">
+				<!-- <view class="item">
 					<view class="top flex">
 						<view class="text1">
 							{{i18n.Transactionfee}}
@@ -95,7 +95,7 @@
 							<text class="text2">{{coin.type}}</text>
 						</view>
 					</view>
-				</view>
+				</view> -->
 			</view>
 		</view>
 
@@ -452,7 +452,7 @@
 			// 确认提交
 			Confirm() {
 				// 做判断
-				debugger
+				// debugger
 				if (this.transInfoPass.amount == '') {
 					uni.showToast({
 						title: this.$t('index').enterthetransferamount,
@@ -485,7 +485,6 @@
 					})
 					return
 				}
-				
 				let that = this
 				if (this.coin.type === 'ETH') {
 					if(!this.$Token.validateEth(this.transInfoPass.toAddress))

pages/register/index.css

@@ -1,3 +1,9 @@
+
+.lans{
+	
+}
+
+
 .main{
 	margin-top: 120rpx;
 }
@@ -37,7 +43,7 @@
 }
 /deep/ uni-swiper .uni-swiper-dots-horizontal {
     left: 50%;
-    bottom: -5px;
+    bottom: -76rpx;
 	}
 /deep/ .uni-swiper-dot{
 	width: 20rpx !important;
@@ -51,7 +57,7 @@
 	background-color: #5B53FF!important;
 }
 .reg_con{
-	margin-top: 60rpx;
+	margin-top: 100rpx;
 	padding: 0 40rpx;
 }
 .reg{

pages/register/index.vue

@@ -1,5 +1,9 @@
 <template>
 	<view class="main">
+		<!-- <u-button @click="show = true">打开</u-button> -->
+		<view class="lans">
+			{{i18n.lans}}
+		</view>
 		<view class="wrap">
 			<swiper class="swiper" :indicator-dots="indicatorDots" :autoplay="autoplay" :interval="interval">
 				<swiper-item>
@@ -7,31 +11,29 @@
 						<image src="../../static/tongyonh/phone_image.png" class="img1" mode="aspectFit"></image>
 						<view class="text_con">
 							<view class="text1">
-								Decentralised wallets,
+								{{i18n.Decentralised}}
-								self-directed assets
 							</view>
 							<view class="text2">
-								Local storage of private keys, safe and secure
+							{{i18n.Localstorage}}
 							</view>
 						</view>
 
 					</view>
 				</swiper-item>
-				<swiper-item>
+		<swiper-item>
-					<view class="swiper-item">
+			<view class="swiper-item">
-						<image src="../../static/tongyonh/phone_image.png" class="img1" mode="aspectFit"></image>
+				<image src="../../static/tongyonh/phone_image.png" class="img1" mode="aspectFit"></image>
-						<view class="text_con">
+				<view class="text_con">
-							<view class="text1">
+					<view class="text1">
-								Decentralised wallets,
+						{{i18n.Decentralised}}
-								self-directed assets
-							</view>
-							<view class="text2">
-								Local storage of private keys, safe and secure
-							</view>
-						</view>
-
 					</view>
-				</swiper-item>
+					<view class="text2">
+					{{i18n.Localstorage}}
+					</view>
+				</view>
+		
+			</view>
+		</swiper-item>
 			</swiper>
 		</view>
 
@@ -47,10 +49,10 @@
 							</image>
 							<view class="textcon">
 								<view class="text1">
-									Create a wallet
+									{{i18n.crewalllet}}
 								</view>
 								<view class="text2">
-									One identity management
+									{{i18n.Oneidentity}}
 								</view>
 							</view>
 						</view>
@@ -65,10 +67,10 @@
 						<image src="../../static/tongyonh/login_wallet.png" mode="aspectFit" class="letimg"></image>
 						<view class="textcon">
 							<view class="text1">
-								Login to wallet
+							{{i18n.Logintowallet}}
 							</view>
 							<view class="text2">
-								Restore existing wallets
+								{{i18n.Restoreexisting}}
 							</view>
 						</view>
 					</view>
@@ -84,12 +86,13 @@
 			<view class="select">
 				<u-checkbox-group @change="checkboxGroupChange">
 					<u-checkbox @change="checkboxChange" v-for="(item, index) in list2" :key="index"
-						v-model="item.checked" :name="item.name" active-color="#5B53FF"> <text class="name">I have read and agree to the
+						v-model="item.checked" :name="item.name" active-color="#5B53FF"> <text class="name">{{i18n.AgreementConfirmation}}
-							<text class="active" @click.stop="Terms">Terms of Service</text>
+							<text class="active" @click.stop="Terms">{{i18n.TermsofService}}</text>
 						</text> </u-checkbox>
 				</u-checkbox-group>
 			</view>
 		</view>
+<u-select v-model="show" :list="list3"></u-select>
 
 
 
@@ -106,6 +109,17 @@
 	export default {
 		data() {
 			return {
+				show: false,
+				list3: [
+									{
+										value: '1',
+										label: '江'
+									},
+									{
+										value: '2',
+										label: '湖'
+									}
+								],
 				list2: [{
 					name: '',
 					checked: false,
@@ -119,7 +133,11 @@
 				walletInfo: {},
 			}
 		},
-
+	computed: {
+			i18n() {
+				return this.$t('index')
+			},
+		},
 		onLoad() {},
 		onShow() {
 			console.log(uni.getStorageSync('walletInfo'))
@@ -132,6 +150,7 @@
 			this.list2.checked = false;
 		},
 		methods: {
+			
 			checkboxGroupChange() {
 
 			},

utils/locales/en.js

@@ -1,6 +1,15 @@
 // en.js
 export default {
 	index: {
+		// regis
+		Decentralised:'Decentralised wallets,self-directed assets',
+		Localstorage:'Local storage of private keys, safe and secure',
+		Oneidentity:'One identity management',
+		Logintowallet:'Login to wallet',
+		Restoreexisting:'Restore existing wallets',
+		
+		
+		
 		tela:'Enter the token name or contract address',
 	tokensfound:'No related tokens found',
 	thetokenname:'Please enter the token name or contract address to search',

utils/locales/zh-F.js

@@ -1,6 +1,14 @@
 // zhf.js
 export default {
 	index: {
+		
+		// regis
+		Decentralised:'去中心化錢包，自主資產',
+		Localstorage:'私鑰本地存儲，安全有保障',
+		Oneidentity:'身份管理',
+		Logintowallet:'導入錢包',
+		Restoreexisting:'恢復現有錢包',
+		
 		tela:'请輸入代幣名稱或合約地址',
 		tokensfound:'未找到相關代幣',
 		thetokenname:'請輸入要搜索的代幣名稱或合約地址',

utils/locales/zh.js

@@ -1,6 +1,15 @@
 // zh.js
 export default {
 	index: {
+		// regis
+		Decentralised:'去中心化钱包，自主资产',
+		Localstorage:'私钥本地存储，安全有保障',
+		Oneidentity:'身份管理',
+		Logintowallet:'导入钱包',
+		Restoreexisting:'恢复现有钱包',
+		
+		
+		
 		tela:'请输入代币名称或合约地址',
 		tokensfound:'未找到相关代币',
 		thetokenname:'请输入要搜索的代币名称或合约地址',