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

App.vue

@@ -3,21 +3,87 @@
 </style>
 
 <script>
-	
-	
-	
-	
-	
-	
 	export default {
-	
-		onLaunch: function(e) {
-	
-
+		computed: {
+			i18n() {
+				return this.$t('index')
+			},
+		},
+		onLaunch: function() {
+			this.appVersion()
+			this.getIp();
 			console.log('App Launch')
+			
 		},
 		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
+								}
+							}
+						});
+					}
+				}
+		
+		
+			} catch (e) {
+				console.log(e)
+		
+			}
+		},
+			
+			async appVersion() {
+				let param = {
+					'appId': uni.getSystemInfoSync().platform
+				}
+				console.log('ss' + JSON.stringify(uni.getSystemInfoSync()))
+				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)
+					if (wgtinfo.versionCode < response.data.versionId) {
+						console.log('更新了吗')
+						let that=this;
+						uni.showModal({
+							title: that.i18n.updateTitle,
+							content: that.i18n.updateMsg,
+							confirmText: that.i18n.Confirm,//这块是确定按钮的文字
+							showCancel: false, 
+							success: function (res) {
+								if (res.confirm) {
+									plus.runtime.openURL(response.data.appUrl);
+								}
+							}
+						});
+						
+					} 
+				});
+			},
 		}
 	}
 </script>

manifest.json

@@ -2,8 +2,8 @@
     "name" : "BITCOOO",
     "appid" : "__UNI__1ECBEE1",
     "description" : "",
-    "versionName" : "1.3",
-    "versionCode" : 130,
+    "versionName" : "1.8",
+    "versionCode" : 180,
     "transformPx" : false,
     "networkTimeout" : {
         "request" : 10000 //多长时间算超时(单位毫秒)

pages/menu/wallet/index.vue

@@ -124,9 +124,6 @@
 			this.userObj = uni.getStorageSync('wallet');
 			console.log('eth有走这吗')
 			this.updateBalance();
-			// #ifdef APP-PLUS
-			//this.appVersion()
-			// #endif
 			
 
 		},
@@ -147,31 +144,7 @@
 				
 				this.userObj = await this.$walletUtil.updateBalance();
 			},
-			async appVersion() {
-				let param = {
-					'appId': uni.getSystemInfoSync().platform
-				}
-				console.log('ss' + JSON.stringify(uni.getSystemInfoSync()))
-				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))
-					if (wgtinfo.versionCode < response.data.versionId) {
-						let that=this;
-						// uni.showModal({
-						// 	title: that.i18n.updateTitle,
-						// 	content: that.i18n.updateMsg,
-						// 	success: function (res) {
-						// 		if (res.confirm) {
-						// 			plus.runtime.openURL(response.data.appUrl);
-						// 		}
-						// 	}
-						// });
 			
-					} 
-				});
-			},
 			goOther() {
 
 				uni.navigateTo({

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

@@ -1 +1 @@
-{"@platforms":["android","iPhone","iPad"],"id":"__UNI__1ECBEE1","name":"BITCOOO","version":{"name":"1.3","code":130},"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.15","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.8","code":180},"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"}}

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

@@ -1 +1 @@
-{"@platforms":["android","iPhone","iPad"],"id":"__UNI__1ECBEE1","name":"BITCOOO","version":{"name":"1.3","code":130},"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.15","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.7","code":170},"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

@@ -8,7 +8,8 @@ const constant = isTest ? {
 	ethChainId:1,
 	btcNetwork:'',
 	ethTransctionDetail:'https://cn.etherscan.com/tx/',
-	trxTransctionDetail:'https://tronscan.io/#/transaction/'
+	trxTransctionDetail:'https://tronscan.io/#/transaction/',
+	checkIp:'https://app.bilibili.com'
 } : {
 	//服务端连接
 	serverUrl: 'https://api.bitcooo.com/',
@@ -21,5 +22,5 @@ const constant = isTest ? {
 }
 
 export default {
-	constant
+	constant,isTest
 }

utils/api.js

@@ -13,7 +13,9 @@ const api = {
 	getChainDataList: (params) => Vue.prototype.$axios.get('/api/chainData/getChainDataList?' + qs.stringify(params)),
 	getCoinTickerList: (params) => Vue.prototype.$axios.get('/api/coinTicker/getCoinTickerList'),
 	getBalance: (params) => Vue.prototype.$axios.get('/api/balance/getBalance?' + qs.stringify(params)),
-	versionUpgrade: (params) => Vue.prototype.$axios.get('/api/home/versionUpgrade?' + qs.stringify(params))
+	versionUpgrade: (params) => Vue.prototype.$axios.get('/api/home/versionUpgrade?' + qs.stringify(params)),
+	checkIp: () => Vue.prototype.$axios.get('/x/resource/ip'),
+	getConfig: (params) => Vue.prototype.$axios.get('/api/home/getConfig?'+ qs.stringify(params)),
 	//--------------------------------- free ---------------------------------
 }
 

utils/axios.js

@@ -14,7 +14,7 @@ const service = axios.create({
 service.interceptors.request.use(
 	config => {
 		
-		console.log(config)
+		console.log(config,777777777777)
 		let isWallet= uni.getStorageSync('isWallet');
 		if(!isWallet){
 			uni.showLoading({
@@ -31,7 +31,14 @@ service.interceptors.request.use(
 
 		// 	config.url = baseURL.serverUrl + config.url
 		// }
-		config.baseURL = baseURL.serverUrl
+		console.log(config,77777777777777777777)
+		if (config.url.indexOf('/x/resource/ip')>-1 ){
+			
+			config.baseURL = baseURL.checkIp
+		}else{
+			config.baseURL = baseURL.serverUrl
+		}
+		
 		config.url = config.url
 
 		//  if (token) {

utils/locales/en.js

@@ -1,6 +1,7 @@
 // en.js
 export default {
 	index: {
+		mainInfo:'According to relevant laws and regulations, it is currently unable to provide services to your location, which has caused you inconvenience. I am very sorry.',
 		walletname: 'Please enter wallet name',
 		Namecannot: 'Name cannot be empty',
 		// 底部导航栏

utils/locales/zh-F.js

@@ -1,6 +1,7 @@
 // zhf.js
 export default {
 	index: {
+		mainInfo:'依據相關法規，當前無法對你所在地提供服務，給你帶來不便，非常抱歉。',
 		selectWallet:'選擇錢包',
 		walletname: '請輸入錢包名稱',
 		Namecannot: '輸入名稱不能為空',

utils/locales/zh.js

@@ -1,6 +1,7 @@
 // zh.js
 export default {
 	index: {
+		mainInfo:'依据相关法规，当前无法对你所在地提供服务，给你带来不便，非常抱歉。',
 		selectWallet:'选择钱包',
 		walletname: '请输入钱包名称',
 		Namecannot: '输入名称不能为空',