修复转账

App.vue

@@ -1,5 +1,12 @@
 <style lang="scss">
-@import "uview-ui/index.scss";
+	/*  #ifdef  H5  */
+	body {
+		max-width: 828rpx; //最大宽度自己可以调整
+		margin: auto !important;
+	}
+
+	/*  #endif  */
+	@import "uview-ui/index.scss";
 </style>
 
 <script>
@@ -11,53 +18,53 @@
 		},
 		onLaunch: function() {
 			// #ifdef APP-PLUS
-				 	this.appVersion()
-				 	this.getIp();
-				 	console.log('App Launch')
+			this.appVersion()
+			this.getIp();
+			console.log('App Launch')
 			// #endif
-			
-			
+
+
 		},
 		onShow: function() {
-	
+
 			console.log('App Show')
 		},
 		onHide: function() {
 			console.log('App Hide')
 		},
 		methods: {
-		async getIp() {
-			let param = {
-				'key': 'is_ban_china'
-			}
-		
-			try {
-				const response = await this.$api.getConfig(param);
-				if (response.data.value == 'Y') {
-					const response2 = await this.$api.checkIp();
-					if (response2.data.country == '中国') {
-						uni.showModal({
-							content: this.i18n.mainInfo,
-							showCancel: false,
-							confirmText: this.i18n.Confirm, //这块是确定按钮的文字
-							success: function(res) {
-								if (res.confirm) {
-									// #ifdef APP-PLUS 
-							 	plus.runtime.quit();
-					    // #endif
+			async getIp() {
+				let param = {
+					'key': 'is_ban_china'
+				}
+
+				try {
+					const response = await this.$api.getConfig(param);
+					if (response.data.value == 'Y') {
+						const response2 = await this.$api.checkIp();
+						if (response2.data.country == '中国') {
+							uni.showModal({
+								content: this.i18n.mainInfo,
+								showCancel: false,
+								confirmText: this.i18n.Confirm, //这块是确定按钮的文字
+								success: function(res) {
+									if (res.confirm) {
+										// #ifdef APP-PLUS 
+										plus.runtime.quit();
+										// #endif
+									}
 								}
-							}
-						});
+							});
+						}
 					}
+
+
+				} catch (e) {
+					console.log(e)
+
 				}
-		
-		
-			} catch (e) {
-				console.log(e)
-		
-			}
-		},
-			
+			},
+
 			async appVersion() {
 				let param = {
 					'appId': uni.getSystemInfoSync().platform
@@ -66,25 +73,25 @@
 				const response = await this.$api.versionUpgrade(param)
 				plus.runtime.getProperty(plus.runtime.appid, (wgtinfo) => {
 					console.log('当前版本号' + wgtinfo.versionCode)
-					
+
 					console.log((wgtinfo.versionCode < response.data.versionId))
-					console.log(wgtinfo.versionCode , response.data.versionId)
+					console.log(wgtinfo.versionCode, response.data.versionId)
 					if (wgtinfo.versionCode < response.data.versionId) {
 						console.log('更新了吗')
-						let that=this;
+						let that = this;
 						uni.showModal({
 							title: that.i18n.updateTitle,
 							content: that.i18n.updateMsg,
-							confirmText: that.i18n.Confirm,//这块是确定按钮的文字
-							showCancel: false, 
-							success: function (res) {
+							confirmText: that.i18n.Confirm, //这块是确定按钮的文字
+							showCancel: false,
+							success: function(res) {
 								if (res.confirm) {
 									plus.runtime.openURL(response.data.appUrl);
 								}
 							}
 						});
-						
-					} 
+
+					}
 				});
 			},
 		}
@@ -92,32 +99,40 @@
 </script>
 
 <style lang="scss">
+	button::after {
+		border: none;
+	}
+
+
+
+
+	uni-tabbar {
+		.uni-tabbar {
+			// tab背景
+			padding-top: 28rpx;
+			padding-bottom: 30rpx !important;
+			background-image: linear-gradient(to top, #FAF8F8, #FFFFFF) !important; // tab背景图片或者渐变色，背景色和背景图片最多选择一个进行设置
 
-button::after {
-     border: none;
-    }
-	
-	
-	
-	
-uni-tabbar {
-        .uni-tabbar { // tab背景
-		    padding-top:28rpx;
-		     padding-bottom: 30rpx !important;
-            background-image: linear-gradient(to top, #FAF8F8, #FFFFFF)!important; // tab背景图片或者渐变色，背景色和背景图片最多选择一个进行设置
-            .uni-tabbar-border { // tabBar上边框
-                background-color: #F7F4F4!important; // tabBar上边框的颜色
-            }
-            .uni-tabbar__bd { // tabBar单项
-                .uni-tabbar__icon { // 图标
-                    width: 48rpx!important;
-                    height: 48rpx!important;
-                }
-                .uni-tabbar__label { // 文字
-                    font-size: 20rpx!important;
-					
-                }
-            }
-        }
-    }
+			.uni-tabbar-border {
+				// tabBar上边框
+				background-color: #F7F4F4 !important; // tabBar上边框的颜色
+			}
+
+			.uni-tabbar__bd {
+
+				// tabBar单项
+				.uni-tabbar__icon {
+					// 图标
+					width: 48rpx !important;
+					height: 48rpx !important;
+				}
+
+				.uni-tabbar__label {
+					// 文字
+					font-size: 20rpx !important;
+
+				}
+			}
+		}
+	}
 </style>

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,

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/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