Browse Source

修复转账

master
vee 4 years ago
parent
commit
69e4a66a5f
  1. 53
      App.vue
  2. 3
      main.js
  3. 2
      pages.json
  4. 4
      pages/menu/sendToken/transfer/index.vue
  5. 4
      unpackage/dist/dev/app-plus/app-config-service.js
  6. 9276
      unpackage/dist/dev/app-plus/app-service.js
  7. 7545
      unpackage/dist/dev/app-plus/app-view.js
  8. 2
      unpackage/dist/dev/app-plus/manifest.json
  9. 0
      unpackage/dist/dev/app-plus/static/img/copy_24px_outlined.e8932d3c.svg
  10. 0
      unpackage/dist/dev/app-plus/static/img/more_vert_24px_outlined.427f4df0.svg
  11. BIN
      unpackage/dist/dev/app-plus/static/tongyonh/backj.png
  12. 2
      utils/SystemConfiguration.js
  13. 12
      utils/pc.js

53
App.vue

@ -1,5 +1,12 @@
<style lang="scss"> <style lang="scss">
@import "uview-ui/index.scss"; /* #ifdef H5 */
body {
max-width: 828rpx; //
margin: auto !important;
}
/* #endif */
@import "uview-ui/index.scss";
</style> </style>
<script> <script>
@ -68,16 +75,16 @@
console.log('当前版本号' + wgtinfo.versionCode) 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) console.log(wgtinfo.versionCode, response.data.versionId)
if (wgtinfo.versionCode < response.data.versionId) { if (wgtinfo.versionCode < response.data.versionId) {
console.log('更新了吗') console.log('更新了吗')
let that=this; let that = this;
uni.showModal({ uni.showModal({
title: that.i18n.updateTitle, title: that.i18n.updateTitle,
content: that.i18n.updateMsg, content: that.i18n.updateMsg,
confirmText: that.i18n.Confirm,// confirmText: that.i18n.Confirm, //
showCancel: false, showCancel: false,
success: function (res) { success: function(res) {
if (res.confirm) { if (res.confirm) {
plus.runtime.openURL(response.data.appUrl); plus.runtime.openURL(response.data.appUrl);
} }
@ -92,29 +99,37 @@
</script> </script>
<style lang="scss"> <style lang="scss">
button::after {
button::after {
border: none; border: none;
} }
uni-tabbar { uni-tabbar {
.uni-tabbar { // tab .uni-tabbar {
padding-top:28rpx; // tab
padding-top: 28rpx;
padding-bottom: 30rpx !important; padding-bottom: 30rpx !important;
background-image: linear-gradient(to top, #FAF8F8, #FFFFFF)!important; // tab background-image: linear-gradient(to top, #FAF8F8, #FFFFFF) !important; // tab
.uni-tabbar-border { // tabBar
background-color: #F7F4F4!important; // tabBar .uni-tabbar-border {
// tabBar
background-color: #F7F4F4 !important; // tabBar
} }
.uni-tabbar__bd { // tabBar
.uni-tabbar__icon { // .uni-tabbar__bd {
width: 48rpx!important;
height: 48rpx!important; // tabBar
.uni-tabbar__icon {
//
width: 48rpx !important;
height: 48rpx !important;
} }
.uni-tabbar__label { //
font-size: 20rpx!important; .uni-tabbar__label {
//
font-size: 20rpx !important;
} }
} }

3
main.js

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

2
pages.json

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

4
pages/menu/sendToken/transfer/index.vue

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

4
unpackage/dist/dev/app-plus/app-config-service.js

File diff suppressed because one or more lines are too long

9276
unpackage/dist/dev/app-plus/app-service.js

File diff suppressed because one or more lines are too long

7545
unpackage/dist/dev/app-plus/app-view.js

File diff suppressed because one or more lines are too long

2
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"}}

0
unpackage/dist/dev/app-plus/static/img/copy_24px_outlined.8dca7e38.svg → unpackage/dist/dev/app-plus/static/img/copy_24px_outlined.e8932d3c.svg

Before

Width:  |  Height:  |  Size: 629 B

After

Width:  |  Height:  |  Size: 629 B

0
unpackage/dist/dev/app-plus/static/img/more_vert_24px_outlined.266aaa48.svg → unpackage/dist/dev/app-plus/static/img/more_vert_24px_outlined.427f4df0.svg

Before

Width:  |  Height:  |  Size: 526 B

After

Width:  |  Height:  |  Size: 526 B

BIN
unpackage/dist/dev/app-plus/static/tongyonh/backj.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.4 KiB

2
utils/SystemConfiguration.js

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

12
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
Loading…
Cancel
Save