wangjunchen 3 жил өмнө
parent
commit
70bd717216

+ 3 - 3
langs/TraditionalChinese.js

@@ -16,13 +16,13 @@ export default {
 	indexMSG0001:'授權成功',
 	indexMSG0002:'轉賬金額超過餘額',
 	indexMSG0003:'請輸入要授權的數量',
-	indexTips0001: '請輸入開口數',
+	indexTips0001: '請輸入開啟數量',
 	// airdrop
 	airdrop0001:'瑪麗亞',
 	airdrop0002:'合成',
 	airdrop0003:'蘇弗澤',
 	airdrop0004:'數量',
-	airdrop0005:'易斯',
+	airdrop0005:'易斯',
 	airdrop0006:'全部',
 	airdrop0007:'合成中...',
 	airdrop0008:'合成成功',
@@ -34,7 +34,7 @@ export default {
 	
 	// mining
 	mining0001:'Bony 合約地址:',
-	mining0002:'每期的骨量總量',
+	mining0002:'Bony每期總量',
 	mining0003:'一萬',
 	mining0004:'個人預計會收到',
 	mining0005:'每期總重量',

+ 2 - 0
main.js

@@ -12,6 +12,8 @@ Vue.prototype.$Request = request; //接口
 Vue.prototype.$Service = service;
 // Vue.prototype.$httpsUrl = 'http://www.blindbox.com/api'
 Vue.prototype.$httpsUrl = 'http://bony.taitr.cn/api'
+const vconsole = require('vconsole')
+new vconsole()
 
 
 

+ 54 - 1
node_modules/.package-lock.json

@@ -1,5 +1,5 @@
 {
-  "name": "Bony",
+  "name": "bony",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
@@ -15,6 +15,17 @@
         "node": ">=6.0.0"
       }
     },
+    "node_modules/@babel/runtime": {
+      "version": "7.18.9",
+      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.18.9.tgz",
+      "integrity": "sha512-lkqXDcvlFT5rvEjiu6+QYO+1GXrEHRo2LOtS7E4GtX5ESIZOgepqsZBVIj6Pv+a6zqsya9VCgiK1KAK4BvJDAw==",
+      "dependencies": {
+        "regenerator-runtime": "^0.13.4"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
     "node_modules/@vue/compiler-core": {
       "version": "3.2.37",
       "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.2.37.tgz",
@@ -132,6 +143,27 @@
       "integrity": "sha512-4rSJemR2NQIo9Klm1vabqWjD8rs/ZaJSzMxkMNeJS6lHiUjjUeYFbooN19NgFjztubEKh3WlZUeOLVdbbUWHsw==",
       "peer": true
     },
+    "node_modules/copy-text-to-clipboard": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/copy-text-to-clipboard/-/copy-text-to-clipboard-3.0.1.tgz",
+      "integrity": "sha512-rvVsHrpFcL4F2P8ihsoLdFHmd404+CMg71S756oRSeQgqk51U3kicGdnvfkrxva0xXH92SjGS62B0XIJsbh+9Q==",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/core-js": {
+      "version": "3.25.0",
+      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.25.0.tgz",
+      "integrity": "sha512-CVU1xvJEfJGhyCpBrzzzU1kjCfgsGUxhEvwUV2e/cOedYWHdmluamx+knDnmhqALddMG16fZvIqvs9aijsHHaA==",
+      "hasInstallScript": true,
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/core-js"
+      }
+    },
     "node_modules/csstype": {
       "version": "2.6.20",
       "resolved": "https://registry.npmjs.org/csstype/-/csstype-2.6.20.tgz",
@@ -153,6 +185,11 @@
         "sourcemap-codec": "^1.4.8"
       }
     },
+    "node_modules/mutation-observer": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/mutation-observer/-/mutation-observer-1.0.3.tgz",
+      "integrity": "sha512-M/O/4rF2h776hV7qGMZUH3utZLO/jK7p8rnNgGkjKUw8zCGjRQPxB8z6+5l8+VjRUQ3dNYu4vjqXYLr+U8ZVNA=="
+    },
     "node_modules/nanoid": {
       "version": "3.3.4",
       "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.4.tgz",
@@ -195,6 +232,11 @@
         "node": "^10 || ^12 || >=14"
       }
     },
+    "node_modules/regenerator-runtime": {
+      "version": "0.13.9",
+      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz",
+      "integrity": "sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA=="
+    },
     "node_modules/source-map": {
       "version": "0.6.1",
       "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
@@ -219,6 +261,17 @@
       "integrity": "sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA==",
       "peer": true
     },
+    "node_modules/vconsole": {
+      "version": "3.14.6",
+      "resolved": "https://registry.npmjs.org/vconsole/-/vconsole-3.14.6.tgz",
+      "integrity": "sha512-8Ffk2SfNe6EzKqZ0aNnNjpAVBVT7zgJo81lYEJdKySYLVYBeSawdSkWi9fSjDg3WsQhgS1vNPmRqJDTuwdVbnQ==",
+      "dependencies": {
+        "@babel/runtime": "^7.17.2",
+        "copy-text-to-clipboard": "^3.0.1",
+        "core-js": "^3.11.0",
+        "mutation-observer": "^1.0.3"
+      }
+    },
     "node_modules/vue": {
       "version": "3.2.37",
       "resolved": "https://registry.npmjs.org/vue/-/vue-3.2.37.tgz",

+ 94 - 1
package-lock.json

@@ -1,10 +1,11 @@
 {
-  "name": "Bony",
+  "name": "bony",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "dependencies": {
+        "vconsole": "^3.14.6",
         "vue-i18n": "^8.0.0",
         "vuex": "^4.0.2"
       }
@@ -21,6 +22,17 @@
         "node": ">=6.0.0"
       }
     },
+    "node_modules/@babel/runtime": {
+      "version": "7.18.9",
+      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.18.9.tgz",
+      "integrity": "sha512-lkqXDcvlFT5rvEjiu6+QYO+1GXrEHRo2LOtS7E4GtX5ESIZOgepqsZBVIj6Pv+a6zqsya9VCgiK1KAK4BvJDAw==",
+      "dependencies": {
+        "regenerator-runtime": "^0.13.4"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
     "node_modules/@vue/compiler-core": {
       "version": "3.2.37",
       "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.2.37.tgz",
@@ -138,6 +150,27 @@
       "integrity": "sha512-4rSJemR2NQIo9Klm1vabqWjD8rs/ZaJSzMxkMNeJS6lHiUjjUeYFbooN19NgFjztubEKh3WlZUeOLVdbbUWHsw==",
       "peer": true
     },
+    "node_modules/copy-text-to-clipboard": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/copy-text-to-clipboard/-/copy-text-to-clipboard-3.0.1.tgz",
+      "integrity": "sha512-rvVsHrpFcL4F2P8ihsoLdFHmd404+CMg71S756oRSeQgqk51U3kicGdnvfkrxva0xXH92SjGS62B0XIJsbh+9Q==",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/core-js": {
+      "version": "3.25.0",
+      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.25.0.tgz",
+      "integrity": "sha512-CVU1xvJEfJGhyCpBrzzzU1kjCfgsGUxhEvwUV2e/cOedYWHdmluamx+knDnmhqALddMG16fZvIqvs9aijsHHaA==",
+      "hasInstallScript": true,
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/core-js"
+      }
+    },
     "node_modules/csstype": {
       "version": "2.6.20",
       "resolved": "https://registry.npmjs.org/csstype/-/csstype-2.6.20.tgz",
@@ -159,6 +192,11 @@
         "sourcemap-codec": "^1.4.8"
       }
     },
+    "node_modules/mutation-observer": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/mutation-observer/-/mutation-observer-1.0.3.tgz",
+      "integrity": "sha512-M/O/4rF2h776hV7qGMZUH3utZLO/jK7p8rnNgGkjKUw8zCGjRQPxB8z6+5l8+VjRUQ3dNYu4vjqXYLr+U8ZVNA=="
+    },
     "node_modules/nanoid": {
       "version": "3.3.4",
       "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.4.tgz",
@@ -201,6 +239,11 @@
         "node": "^10 || ^12 || >=14"
       }
     },
+    "node_modules/regenerator-runtime": {
+      "version": "0.13.9",
+      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz",
+      "integrity": "sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA=="
+    },
     "node_modules/source-map": {
       "version": "0.6.1",
       "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
@@ -225,6 +268,17 @@
       "integrity": "sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA==",
       "peer": true
     },
+    "node_modules/vconsole": {
+      "version": "3.14.6",
+      "resolved": "https://registry.npmjs.org/vconsole/-/vconsole-3.14.6.tgz",
+      "integrity": "sha512-8Ffk2SfNe6EzKqZ0aNnNjpAVBVT7zgJo81lYEJdKySYLVYBeSawdSkWi9fSjDg3WsQhgS1vNPmRqJDTuwdVbnQ==",
+      "dependencies": {
+        "@babel/runtime": "^7.17.2",
+        "copy-text-to-clipboard": "^3.0.1",
+        "core-js": "^3.11.0",
+        "mutation-observer": "^1.0.3"
+      }
+    },
     "node_modules/vue": {
       "version": "3.2.37",
       "resolved": "https://registry.npmjs.org/vue/-/vue-3.2.37.tgz",
@@ -262,6 +316,14 @@
       "integrity": "sha512-dgXcIfMuQ0kgzLB2b9tRZs7TTFFaGM2AbtA4fJgUUYukzGH4jwsS7hzQHEGs67jdehpm22vkgKwvbU+aEflgwg==",
       "peer": true
     },
+    "@babel/runtime": {
+      "version": "7.18.9",
+      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.18.9.tgz",
+      "integrity": "sha512-lkqXDcvlFT5rvEjiu6+QYO+1GXrEHRo2LOtS7E4GtX5ESIZOgepqsZBVIj6Pv+a6zqsya9VCgiK1KAK4BvJDAw==",
+      "requires": {
+        "regenerator-runtime": "^0.13.4"
+      }
+    },
     "@vue/compiler-core": {
       "version": "3.2.37",
       "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.2.37.tgz",
@@ -376,6 +438,16 @@
       "integrity": "sha512-4rSJemR2NQIo9Klm1vabqWjD8rs/ZaJSzMxkMNeJS6lHiUjjUeYFbooN19NgFjztubEKh3WlZUeOLVdbbUWHsw==",
       "peer": true
     },
+    "copy-text-to-clipboard": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/copy-text-to-clipboard/-/copy-text-to-clipboard-3.0.1.tgz",
+      "integrity": "sha512-rvVsHrpFcL4F2P8ihsoLdFHmd404+CMg71S756oRSeQgqk51U3kicGdnvfkrxva0xXH92SjGS62B0XIJsbh+9Q=="
+    },
+    "core-js": {
+      "version": "3.25.0",
+      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.25.0.tgz",
+      "integrity": "sha512-CVU1xvJEfJGhyCpBrzzzU1kjCfgsGUxhEvwUV2e/cOedYWHdmluamx+knDnmhqALddMG16fZvIqvs9aijsHHaA=="
+    },
     "csstype": {
       "version": "2.6.20",
       "resolved": "https://registry.npmjs.org/csstype/-/csstype-2.6.20.tgz",
@@ -397,6 +469,11 @@
         "sourcemap-codec": "^1.4.8"
       }
     },
+    "mutation-observer": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/mutation-observer/-/mutation-observer-1.0.3.tgz",
+      "integrity": "sha512-M/O/4rF2h776hV7qGMZUH3utZLO/jK7p8rnNgGkjKUw8zCGjRQPxB8z6+5l8+VjRUQ3dNYu4vjqXYLr+U8ZVNA=="
+    },
     "nanoid": {
       "version": "3.3.4",
       "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.4.tgz",
@@ -420,6 +497,11 @@
         "source-map-js": "^1.0.2"
       }
     },
+    "regenerator-runtime": {
+      "version": "0.13.9",
+      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz",
+      "integrity": "sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA=="
+    },
     "source-map": {
       "version": "0.6.1",
       "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
@@ -438,6 +520,17 @@
       "integrity": "sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA==",
       "peer": true
     },
+    "vconsole": {
+      "version": "3.14.6",
+      "resolved": "https://registry.npmjs.org/vconsole/-/vconsole-3.14.6.tgz",
+      "integrity": "sha512-8Ffk2SfNe6EzKqZ0aNnNjpAVBVT7zgJo81lYEJdKySYLVYBeSawdSkWi9fSjDg3WsQhgS1vNPmRqJDTuwdVbnQ==",
+      "requires": {
+        "@babel/runtime": "^7.17.2",
+        "copy-text-to-clipboard": "^3.0.1",
+        "core-js": "^3.11.0",
+        "mutation-observer": "^1.0.3"
+      }
+    },
     "vue": {
       "version": "3.2.37",
       "resolved": "https://registry.npmjs.org/vue/-/vue-3.2.37.tgz",

+ 1 - 0
package.json

@@ -1,5 +1,6 @@
 {
   "dependencies": {
+    "vconsole": "^3.14.6",
     "vue-i18n": "^8.0.0",
     "vuex": "^4.0.2"
   }

+ 44 - 17
pages/index/index.vue

@@ -226,9 +226,10 @@
 						});
 					})
 					.on('error', error => {
-						console.log(error,'')
+						console.log(error, '')
 						this.likai()
-						if(error.message == 'The requested account and/or method has not been authorized by the user.') {
+						if (error.message ==
+							'The requested account and/or method has not been authorized by the user.') {
 							uni.showToast({
 								title: this.$t('indexMSG0004'),
 								icon: 'none',
@@ -272,6 +273,15 @@
 								})
 							} else {
 								this.likai()
+								console.log('err1',err);
+								console.log('err2',err.message);
+								if(err.message == 'execution reverted: BEP20: transfer amount exceeds balance') {
+									uni.showToast({
+										title: this.$t('indexMSG0002'),
+										icon: 'none',
+										duration: 2000
+									});
+								}
 								let json = JSON.parse(err.message.split('.')[1])
 								if (json.message == 'execution reverted: BEP20: transfer amount exceeds balance') {
 									uni.showToast({
@@ -336,19 +346,30 @@
 									}
 								})
 								.on('error', err => {
-									console.log(11);
+									console.log('1111-1');
 									this.likai()
 									console.log('err', err);
 								})
 						} else {
-							let json = JSON.parse(err.message.split('.')[1])
-							console.log(json)
-							this.getUserCode()
 							this.likai()
+							console.log(err);
+							// if(err.message === 'execution reverted: BEP20: transfer amount exceeds balance') {
+							// }
+							// let json = JSON.parse(err.message.split('.')[1])
+							// console.log('json',json);
+							// if(json.message === 'execution reverted: BEP20: transfer amount exceeds balance') {
+							// 	uni.showToast({
+							// 		title: 'execution reverted: BEP20: transfer amount exceeds balance',
+							// 		icon: 'none',
+							// 		duration: 2000
+							// 	});
+							// }
+							
 							this.$Service.send('/user/login', {
 								username: this.$store.state.address,
 								code: this.$store.state.user,
 							}, (res) => {
+								console.log('1116');
 								console.log(77);
 								console.log('登录成功', res);
 								this.$store.commit('changetoken', res.userinfo.token)
@@ -375,27 +396,28 @@
 								})
 							}
 						}
-					}
-				)
+					})
 			},
-			getUserCode() {
+			async getUserCode() {
+				console.log('1114');
 				contracts.contract.methods
 					.getUserCode()
 					.call({
 						from: this.$store.state.address
 					}, (err, res) => {
 						if (res) {
+							console.log('1115');
 							console.log('res', res);
 							this.$store.commit('changeuser', res)
+							console.log('11152');
 						}
 
 					})
 			},
-			clickregister() {
+			 async clickregister() {
 				// contractmethod.login()
-				this.register()
-				
-				this.getUserCode()
+				 await this.getUserCode()
+				 await this.register()
 			}
 
 		},
@@ -417,14 +439,19 @@
 				Tdialog: false
 			}
 		},
-		onLoad() {
+		async onLoad() {
 			// console.log(this.$store.state.address);
 			this.state = 0
-			this.getgameInfo()
-			this.register()
+			await this.getgameInfo()
+			await this.register()
+			await this.getUserCode()
+			
 		},
 		mounted() {
-			
+
+		},
+		created() {
+			// this.register()
 		}
 	}
 </script>