Browse Source

no message

DESKTOP-70VPDLK\Administrator 6 months ago
parent
commit
73147e42d6

File diff suppressed because it is too large
+ 2 - 15033
package-lock.json


+ 0 - 1
package.json

@@ -9,7 +9,6 @@
   },
   "dependencies": {
     "axios": "^1.9.0",
-    "core-js": "^3.8.3",
     "element-ui": "^2.15.14",
     "ethers": "^5.7.2",
     "lib-flexible": "^0.3.2",

+ 5 - 3
src/common/wallet/tokenpocket-wallet/tokenpocket-bnb.js

@@ -27,7 +27,7 @@ tokenpocketBnb.getProvider= function (){
     console.log(chainId)
     if(!chainId){
         provider.request({method:'eth_chainId'}).then((ethChainId)=>{
-            console.log(ethChainId)
+            console.log(ethChainId,"ethChainId---------------------------------")
             // if(ethChainId!=='0x38'){
             //     // uni.$emit('noBan',false)
             // }else {
@@ -35,6 +35,7 @@ tokenpocketBnb.getProvider= function (){
             // }
             if(ethChainId!=='0x38'){
                 // uni.$emit('noBan',false)
+                chainId=ethChainId
             }else {
                 chainId=ethChainId
             }
@@ -48,7 +49,7 @@ tokenpocketBnb.getProvider= function (){
  * @returns {any}
  */
 tokenpocketBnb.getMyAddress=function () {
-   // return  uni.getStorageSync('babAddress')
+   return   localStorage.getItem('babAddress')
 }
 
 /**
@@ -63,7 +64,8 @@ tokenpocketBnb.getAccounts=async function (){
                 console.log(address)
                 if(address.length>0){
                     // uni.setStorageSync('babAddress',address[0])
-                    // resolve(address[0])
+                    localStorage.setItem('babAddress',address[0])
+                    resolve(address[0])
                 }else {
                     resolve(false)
                 }

+ 2 - 2
src/utils/request.js

@@ -24,7 +24,7 @@ service.interceptors.response.use((response) => {
         endLoading();
     }
     const res = response.data
-    if (res.code == 1) {
+    if (res.code === 1) {
         return res
     } else if( res.code === 0) {
         // Message({
@@ -35,7 +35,7 @@ service.interceptors.response.use((response) => {
         Message({
             message: '登录信息过期,请重新登录',type: 'error',duration: 3 * 1000,
             onClose: () => {
-                window.location.href = '/'
+                window.location.href = '/login'
             }
         })
     } else if (res.code === 402) {

+ 1 - 1
src/utils/routerEach.js

@@ -3,7 +3,7 @@ import router from '../router/index.js'
 // const routeList = router.options.routes[0].children
 
 
-const whiteList = ['/','/invite']
+const whiteList = ['/login','/invite']
 router.beforeEach((to, from, next) => {
   let userToken = window.localStorage.getItem('token')
   console.log('--------------------------------aaaaaaaaaaaaaaaaaa',userToken)

+ 40 - 5
src/views/login/invite.vue

@@ -1,27 +1,62 @@
 <script>
+import tokenpocketBnb from "@/common/wallet/tokenpocket-wallet/tokenpocket-bnb";
+import {register} from "@/api/member";
+
 export default {
   name: "invite-page",
   components: {},
   data() {
     return {
-      code: ''
+      formData: {
+        address: '',
+        inviteCode: ''
+      }
     };
   },
   mounted() {
   },
-  methods: {},
+  methods: {
+    async getAccount(){
+      console.log('---------------------------------',tokenpocketBnb)
+      tokenpocketBnb.getAccounts().then(async (Address) => {
+        console.log(Address)
+        if (Address) {
+          this.formData.address=Address
+          this.login()
+        } else {
+          // tools.goToError(2)
+        }
+      }).catch((e)=>{
+        console.log(e)
+        // tools.goToError(2)
+      })
+    },
+    login(){
+      register(this.formData).then((res) => {
+        if(res.code === 1) {
+          localStorage.setItem('token',res.data.token)
+          this.$router.push('/cc_list')
+        } if(res.code === 403) {
+          this.$router.push('/invite')
+        }else {
+          this.$message.error(res.msg)
+        }
+      })
+    }
+
+  },
 }
 </script>
 
 <template>
   <div class="flex-common-css box-b align-items-center flex-justify-center">
     <div class="fs-14 fc-f mb-10">
-      请输入邀请码
+      请输入邀请地址
     </div>
     <div class="w-80 mb-50">
-      <el-input v-model="code" placeholder="请输入邀请码"></el-input>
+      <el-input v-model="formData.inviteCode" placeholder="请输入邀请地址"></el-input>
     </div>
-    <div class="but-b b-rad-20 text-align-center fc-f fs-14">
+    <div class="but-b b-rad-20 text-align-center fc-f fs-14" @click="getAccount">
       确认绑定
     </div>
   </div>

+ 23 - 21
src/views/login/login_index.vue

@@ -1,5 +1,5 @@
 <script>
-// import {register} from "@/api/member";
+import {register} from "@/api/member";
 import tokenpocketBnb from "@/common/wallet/tokenpocket-wallet/tokenpocket-bnb";
 
 export default {
@@ -18,28 +18,30 @@ export default {
   methods: {
     async getAccount(){
       console.log('---------------------------------',tokenpocketBnb)
-      // tokenpocketBnb.getAccounts().then(async (Address) => {
-      //   console.log(Address)
-      //   if (Address) {
-      //     this.formData.address=Address
-      //     this.login()
-      //   } else {
-      //     // tools.goToError(2)
-      //   }
-      // }).catch((e)=>{
-      //   console.log(e)
-      //   // tools.goToError(2)
-      // })
+      tokenpocketBnb.getAccounts().then(async (Address) => {
+        console.log(Address)
+        if (Address) {
+          this.formData.address=Address
+          this.login()
+        } else {
+          // tools.goToError(2)
+        }
+      }).catch((e)=>{
+        console.log(e)
+        // tools.goToError(2)
+      })
     },
     login(){
-      // register(this.formData).then((res) => {
-      //   if(res.code === 1) {
-      //     localStorage.setItem('token',res.data.token)
-      //     this.$router.push('/cc_list')
-      //   }else {
-      //     this.$message.error(res.msg)
-      //   }
-      // })
+      register(this.formData).then((res) => {
+        if(res.code === 1) {
+          localStorage.setItem('token',res.data.token)
+          this.$router.push('/cc_list')
+        } if(res.code === 403) {
+          this.$router.push('/invite')
+        }else {
+          this.$message.error(res.msg)
+        }
+      })
     },
     goToUrl() {
       this.$router.push('/invite')

Some files were not shown because too many files changed in this diff