Merge branch 'master' of http://git.weirui0755.com/jack/bitcooo

App.vue

@@ -1,4 +1,11 @@
 <style lang="scss">
+	/*  #ifdef  H5  */
+	body {
+		max-width: 828rpx; //最大宽度自己可以调整
+		margin: auto !important;
+	}
+
+	/*  #endif  */
 	@import "uview-ui/index.scss";
 </style>
 
@@ -92,7 +99,6 @@
 </script>
 
 <style lang="scss">
-
 	button::after {
 		border: none;
 	}
@@ -101,19 +107,28 @@ button::after {
 
 
 	uni-tabbar {
-        .uni-tabbar { // tab背景
+		.uni-tabbar {
+			// tab背景
 			padding-top: 28rpx;
 			padding-bottom: 30rpx !important;
 			background-image: linear-gradient(to top, #FAF8F8, #FFFFFF) !important; // tab背景图片或者渐变色，背景色和背景图片最多选择一个进行设置
-            .uni-tabbar-border { // tabBar上边框
+
+			.uni-tabbar-border {
+				// tabBar上边框
 				background-color: #F7F4F4 !important; // tabBar上边框的颜色
 			}
-            .uni-tabbar__bd { // tabBar单项
-                .uni-tabbar__icon { // 图标
+
+			.uni-tabbar__bd {
+
+				// tabBar单项
+				.uni-tabbar__icon {
+					// 图标
 					width: 48rpx !important;
 					height: 48rpx !important;
 				}
-                .uni-tabbar__label { // 文字
+
+				.uni-tabbar__label {
+					// 文字
 					font-size: 20rpx !important;
 
 				}

main.js

@@ -14,6 +14,9 @@ import util from 'ethereumjs-util'
 
 import store from './store'
 import walletUtil from './utils/WalletUtil.js'
+// #ifdef H5
+import "./utils/pc.js";
+// #endif
 Vue.prototype.$store = store
 Vue.prototype.tronweb = tronweb
 Vue.prototype.bip32 = bip32

pages.json

@@ -384,7 +384,9 @@
 	"globalStyle": {
 		"navigationBarTextStyle": "black",
 		"navigationBarBackgroundColor": "#fff",
+		
 		"style": {
+			
 			"app-plus": {
 				"titleNView": false
 			}

pages/menu/sendToken/transfer/index.vue

@@ -292,7 +292,7 @@
 				for (let i=0; i<this.userObj.coinList.length;i++) {
 					
 					if(this.coin.contractAddress==this.userObj.coinList[i].contractAddress){
-						this.coin=this.userObj.coinList[i]
+						this.coin.balance=this.userObj.coinList[i].balance
 						break;
 					}
 					
@@ -423,6 +423,7 @@
 			},
 			// 唤起指纹
 			confirmTo(type) {
+				
 				if (!this.passShow) {
 					this.goPassword();
 				} else {
@@ -451,6 +452,7 @@
 			// 确认提交
 			Confirm() {
 				// 做判断
+				debugger
 				if (this.transInfoPass.amount == '') {
 					uni.showToast({
 						title: this.$t('index').enterthetransferamount,

pages/menu/token/btc/index.css

@@ -221,7 +221,14 @@ page{
 	position: relative;
 	border-radius: 24rpx;
 }
-
+.main .money_con4 {
+	margin-top: 32rpx;
+	background-image: linear-gradient(to right, #0FB294, #31E2B5);
+	height: 354rpx;
+	padding: 40rpx 36rpx;
+	position: relative;
+	border-radius: 24rpx;
+}
 .select_con .item1 .rig_con .text1 text {
 	margin-left: 10rpx;
 }

pages/menu/token/btc/index.vue

@@ -9,7 +9,7 @@
 		</navigation>
 		<view class="main">
 			<view class="money_con"
-				:class="{'money_con': coin.type=='ETH', 'money_con2': coin.type=='BTC', 'money_con3': coin.type=='TRX'}">
+				:class="{'money_con': coin.type=='ETH'&&coin.name!='USDT-ERC20', 'money_con2': coin.type=='BTC', 'money_con3': coin.type=='TRX'&&coin.name!='USDT-TRC20', 'money_con4': coin.name=='USDT-TRC20'||coin.name=='USDT-ERC20'}">
 				<view class="textcon1">
 					<text class="text1">
 						<view class="">
@@ -26,12 +26,14 @@
 					<image src="../../../../static/tongyonh/Frame28.png" mode="aspectFit" class="img1"
 						v-if="coin.type=='BTC'&&!coin.contractAddress"></image>
 					<image src="../../../../static/tongyonh/tronicon.png" mode="aspectFit" class="img1"
-						v-if="coin.type=='TRX'&&!coin.contractAddress"></image>
+						v-if="coin.type=='TRX'&&!coin.name=='USDT-TRC20'"></image>
+					<image src="../../../../static/tongyonh/usdticon.png" mode="aspectFit" class="img1"
+							v-if="coin.name=='USDT-TRC20'||coin.name=='USDT-ERC20'"></image>
 				</view>
-				<view class="textcon1">
+				<view class="textcon1" v-if="coin.name=='TRX'">
 					<view class="v1">
 						<view class="t1">
-							0.0
+							{{coin.balance}}
 						</view>
 						<view class="t2">
 							{{i18n.Existingbalance}}

unpackage/dist/dev/app-plus/manifest.json

@@ -1 +1 @@
-{"@platforms":["android","iPhone","iPad"],"id":"__UNI__1ECBEE1","name":"BITCOOO","version":{"name":"1.0.0","code":100},"description":"","launch_path":"__uniappview.html","developer":{"name":"","email":"","url":""},"permissions":{"FaceID":{},"Fingerprint":{},"UniNView":{"description":"UniNView原生渲染"}},"plus":{"useragent":{"value":"uni-app","concatenate":true},"splashscreen":{"target":"id:1","autoclose":true,"waiting":true,"delay":0},"popGesture":"close","launchwebview":{"render":"always","id":"1","kernel":"WKWebview"},"statusbar":{"immersed":"supportedDevice","style":"dark","background":"#fff"},"compatible":{"ignoreVersion":true},"usingComponents":true,"nvueStyleCompiler":"uni-app","compilerVersion":3,"distribute":{"icons":{"android":{"hdpi":"unpackage/res/icons/72x72.png","xhdpi":"unpackage/res/icons/96x96.png","xxhdpi":"unpackage/res/icons/144x144.png","xxxhdpi":"unpackage/res/icons/192x192.png"},"ios":{"appstore":"unpackage/res/icons/1024x1024.png","ipad":{"app":"unpackage/res/icons/76x76.png","app@2x":"unpackage/res/icons/152x152.png","notification":"unpackage/res/icons/20x20.png","notification@2x":"unpackage/res/icons/40x40.png","proapp@2x":"unpackage/res/icons/167x167.png","settings":"unpackage/res/icons/29x29.png","settings@2x":"unpackage/res/icons/58x58.png","spotlight":"unpackage/res/icons/40x40.png","spotlight@2x":"unpackage/res/icons/80x80.png"},"iphone":{"app@2x":"unpackage/res/icons/120x120.png","app@3x":"unpackage/res/icons/180x180.png","notification@2x":"unpackage/res/icons/40x40.png","notification@3x":"unpackage/res/icons/60x60.png","settings@2x":"unpackage/res/icons/58x58.png","settings@3x":"unpackage/res/icons/87x87.png","spotlight@2x":"unpackage/res/icons/80x80.png","spotlight@3x":"unpackage/res/icons/120x120.png"}}},"splashscreen":{"androidStyle":"default","iosStyle":"default","android":{"hdpi":"","xhdpi":"","xxhdpi":""}},"google":{"permissions":["<uses-feature android:name=\"android.hardware.camera\"/>","<uses-feature android:name=\"android.hardware.camera.autofocus\"/>","<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>","<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>","<uses-permission android:name=\"android.permission.CAMERA\"/>","<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>","<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>","<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>","<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>","<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>","<uses-permission android:name=\"android.permission.READ_LOGS\"/>","<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>","<uses-permission android:name=\"android.permission.USE_FINGERPRINT\"/>","<uses-permission android:name=\"android.permission.VIBRATE\"/>","<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>","<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"]},"apple":{},"plugins":{"ad":{},"audio":{"mp3":{"description":"Android平台录音支持MP3格式文件"}}}},"allowsInlineMediaPlayback":true,"uni-app":{"compilerVersion":"3.2.16","control":"uni-v3","nvueCompiler":"uni-app","renderer":"auto","nvue":{"flex-direction":"column"},"nvueLaunchMode":"normal"},"launch_path":"__uniappview.html"}}
+{"@platforms":["android","iPhone","iPad"],"id":"__UNI__1ECBEE1","name":"BitCooo","version":{"name":"1.1.1","code":111},"description":"","launch_path":"__uniappview.html","developer":{"name":"","email":"","url":""},"permissions":{"FaceID":{},"Fingerprint":{},"UniNView":{"description":"UniNView原生渲染"}},"plus":{"useragent":{"value":"uni-app","concatenate":true},"splashscreen":{"target":"id:1","autoclose":true,"waiting":true,"delay":0},"popGesture":"close","launchwebview":{"render":"always","id":"1","kernel":"WKWebview"},"statusbar":{"immersed":"supportedDevice","style":"dark","background":"#fff"},"compatible":{"ignoreVersion":true},"usingComponents":true,"nvueStyleCompiler":"uni-app","compilerVersion":3,"distribute":{"icons":{"android":{"hdpi":"unpackage/res/icons/72x72.png","xhdpi":"unpackage/res/icons/96x96.png","xxhdpi":"unpackage/res/icons/144x144.png","xxxhdpi":"unpackage/res/icons/192x192.png"},"ios":{"appstore":"unpackage/res/icons/1024x1024.png","ipad":{"app":"unpackage/res/icons/76x76.png","app@2x":"unpackage/res/icons/152x152.png","notification":"unpackage/res/icons/20x20.png","notification@2x":"unpackage/res/icons/40x40.png","proapp@2x":"unpackage/res/icons/167x167.png","settings":"unpackage/res/icons/29x29.png","settings@2x":"unpackage/res/icons/58x58.png","spotlight":"unpackage/res/icons/40x40.png","spotlight@2x":"unpackage/res/icons/80x80.png"},"iphone":{"app@2x":"unpackage/res/icons/120x120.png","app@3x":"unpackage/res/icons/180x180.png","notification@2x":"unpackage/res/icons/40x40.png","notification@3x":"unpackage/res/icons/60x60.png","settings@2x":"unpackage/res/icons/58x58.png","settings@3x":"unpackage/res/icons/87x87.png","spotlight@2x":"unpackage/res/icons/80x80.png","spotlight@3x":"unpackage/res/icons/120x120.png"}}},"splashscreen":{"androidStyle":"default","iosStyle":"default","android":{"hdpi":"","xhdpi":"","xxhdpi":""}},"google":{"permissions":["<uses-feature android:name=\"android.hardware.camera\"/>","<uses-feature android:name=\"android.hardware.camera.autofocus\"/>","<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>","<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>","<uses-permission android:name=\"android.permission.CAMERA\"/>","<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>","<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>","<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>","<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>","<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>","<uses-permission android:name=\"android.permission.READ_LOGS\"/>","<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>","<uses-permission android:name=\"android.permission.USE_FINGERPRINT\"/>","<uses-permission android:name=\"android.permission.VIBRATE\"/>","<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>","<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"]},"apple":{},"plugins":{"ad":{},"audio":{"mp3":{"description":"Android平台录音支持MP3格式文件"}}}},"allowsInlineMediaPlayback":true,"uni-app":{"compilerVersion":"3.2.16","control":"uni-v3","nvueCompiler":"uni-app","renderer":"auto","nvue":{"flex-direction":"column"},"nvueLaunchMode":"normal"},"launch_path":"__uniappview.html"}}

utils/SystemConfiguration.js

@@ -1,5 +1,5 @@
 
-let isTest = false;
+let isTest = true;
 const bitcoin = require('bitcoinjs-lib')
 const constant = isTest ? {
 	//服务端连接

utils/WalletUtil.js

@@ -27,7 +27,7 @@ let fullWallet = {
 				icon: require('@/static/tongyonh/Frame3299.png')
 			},
 			{
-				name: "USDT",
+				name: "USDT-ERC20",
 				xname: 'Tether USD',
 				balance: 0,
 				contractAddress: '0xdac17f958d2ee523a2206206994597c13d831ec7',
@@ -46,7 +46,7 @@ let fullWallet = {
 				icon: require('@/static/tongyonh/tron1.png')
 			},
 			{
-				name: "USDT",
+				name: "USDT-TRC20",
 				xname: 'Tether USD',
 				balance: 0,
 				contractAddress: 'TR7NHqjeKQxGTCi8q8ZY4pL8otSzgjLj6t',
@@ -256,6 +256,10 @@ let WalletUtil = {
 					.coinList[1].balance * usdtU.data.priceInUsd).toFixed(2);
 				wallet.coinList[1].balanceCnyPrice = (wallet
 					.coinList[1].balance * usdtU.data.priceCny).toFixed(2);
+				if(wallet.coinList[1].name==='USDT')
+				{
+					wallet.coinList[1].name='USDT-ERC20'
+				}
 				break;
 			case 'TRX':
 				// console.log("进来TRX")
@@ -277,6 +281,10 @@ let WalletUtil = {
 						
 					}else
 					if (tronCoin.data[i].tokenAbbr === 'USDT') {
+						if(newList[1].name==='USDT')
+						{
+							newList[1].name='USDT-TRC20'
+						}
 						newList[1].balance = (Number(tronCoin.data[i].balance) / Math.pow(10, tronCoin
 							.data[i].tokenDecimal));
 						newList[1].tokenType = "trc20"
@@ -328,6 +336,7 @@ let WalletUtil = {
 				break;
 			}
 		}
+		console.log(walletInfo,123456)
 		uni.setStorageSync('walletInfo', walletInfo);
 		uni.setStorageSync('isWallet', false);
 		return wallet;

utils/locales/en.js

@@ -190,8 +190,8 @@ export default {
 		Importmnemonics: 'Import mnemonics',
 		Mnemonicsimportverification: 'Mnemonics import verification',
 		Language: 'Language',
-		langfan: 'Traditional Chinese',
-		langjian: 'Simplified Chinese',
+		langfan: '繁體中文',
+		langjian: '简体中文',
 		eng: 'English',
 		edit: 'Edit',
 		Delete: 'Delete',

utils/locales/zh-F.js

@@ -190,8 +190,8 @@ export default {
 		Mnemonicsimportverification: '助記詞輸入驗證',
 		Language: '語言',
 		langfan: '繁體中文',
-		langjian: '簡體中文',
-		eng: '英文',
+		langjian: '简体中文',
+		eng: 'English',
 		edit: '修改',
 		Delete: '删除',
 		DELETE: '删除',

utils/locales/zh.js

@@ -187,9 +187,9 @@ export default {
 		Importmnemonics: '导入助记词',
 		Mnemonicsimportverification: '助记词输入验证',
 		Language: '语言',
-		langfan: '繁体中文',
+		langfan: '繁體中文',
 		langjian: '简体中文',
-		eng: '英文',
+		eng: 'English',
 		edit: '修改',
 		Delete: '删除',
 		DELETE: '删除',

utils/pc.js

@@ -0,0 +1,12 @@
+// #ifdef H5
+(function () {
+  var u = navigator.userAgent,
+    w = window.innerWidth;
+  if (!u.match(/AppleWebKit.*Mobile.*/) || u.indexOf("iPad") > -1) {
+    window.innerWidth = 750 * (w / 1920);
+    window.onload = function () {
+      window.innerWidth = w;
+    };
+  }
+})();
+// #endif