BF-202205051124\Administrator vor 3 Jahren
Ursprung
Commit
fc1d711190
10 geänderte Dateien mit 68 neuen und 30 gelöschten Zeilen
  1. 2 2
      .env.dev.js
  2. 2 2
      .env.prod.js
  3. 4 7
      api/ajax.js
  4. 2 2
      api/member.js
  5. 4 0
      common/js/tools.js
  6. 4 12
      common/router/router.js
  7. 2 2
      manifest.json
  8. 6 0
      pages.json
  9. 18 3
      pages/login/index.vue
  10. 24 0
      pages/login/register.vue

+ 2 - 2
.env.dev.js

@@ -1,6 +1,6 @@
 const config = {
-	baseUrl: 'testapi.jhcs888.com',
-	socketUrl: 'testapi.jhcs888.com',
+	baseUrl: '',
+	socketUrl: '',
     appName:'开发环境'
 }
 module.exports = config;

+ 2 - 2
.env.prod.js

@@ -1,6 +1,6 @@
 const config = {
-    baseUrl: 'testapi.jhcs888.com',
-    socketUrl: 'testapi.jhcs888.com',
+    baseUrl: '',
+    socketUrl: '',
     appName:'正式环境'
 }
 module.exports = config;

+ 4 - 7
api/ajax.js

@@ -1,6 +1,5 @@
 import tools from "@/common/js/tools";
 import store from '@/store/index'
-let BASE_URL ='https://' + process.uniEnv.baseUrl;
 
 
 /**
@@ -13,6 +12,7 @@ export const request = (url, method, data, show = false) => {
   if (show) {
     tools.showLoading();
   }
+  console.log(data)
   if (data === undefined) {
     data = {};
   }
@@ -20,12 +20,11 @@ export const request = (url, method, data, show = false) => {
     // 封装主体:网络请求
     console.log(url)
     uni.request({
-      url:BASE_URL+  url,
+      url:  url,
       data: data,
       method: method || 'post',
       header: {
         'content-type': 'application/json',
-        'apikey': '01ABA77B8BA6F26243D85B5A50FFB88624951C7B3A4078B3F9971983E667D5B8',
         'hversion': '1.0',
         'Authorization': token
       },
@@ -69,7 +68,7 @@ export const uploadImage = (filePath, imageName, data) => {
   tools.showLoading();
   return new Promise((resolve, reject) => {
     uni.uploadFile({
-      url: BASE_URL + '/api/common/upload',
+      url: '/api/common/upload',
       // header: {
       // 	'Authorization': JSON.parse(uni.getStorageSync('userInfo')).token
       // },
@@ -94,15 +93,13 @@ export const uploadFile = (url, file) => {
   let token = uni.getStorageSync('token') || '';
   // data.app_version = plus.runtime.version;
   // console.log('请求地址-----------------------')
-  // console.log(BASE_URL + url)
   // console.log('请求参数-----------------------')
   // console.log(data)
   console.log(file)
   return new Promise((resolve, reject) => {
     // 封装主体:网络请求
-    console.log(BASE_URL + url)
     uni.uploadFile({
-      url: BASE_URL + url, //仅为示例,非真实的接口地址
+      url: url, //仅为示例,非真实的接口地址
       filePath: file,
       name: 'file',
       header: {

+ 2 - 2
api/login.js → api/member.js

@@ -1,6 +1,6 @@
 import {request} from './ajax.js'
 
-const newsUrl = '/api/user/'
+const newsUrl = '/api/member/'
 // 登陆
-export const login = (data) => request(newsUrl + 'login', 'post', { ...data },false)
+export const member = (data) => request(newsUrl + 'login', 'post', { ...data },false)
 export const resetPwd = (data) => request(newsUrl + 'resetpwd', 'post', { ...data },false)

+ 4 - 0
common/js/tools.js

@@ -230,5 +230,9 @@ tools.toError=function (errorMsg){
     });
 }
 
+tools.setLoginInfo=function (data){
+    uni.setStorageSync('token', data.token);
+}
+
 
 export default tools

+ 4 - 12
common/router/router.js

@@ -8,24 +8,16 @@ const router = createRouter({
     routes: [...ROUTES]
 });
 //全局路由前置守卫
-const whiteList = ['/','/pages/index/error']
+const whiteList = ['/','/pages/index/error','/pages/login/register','/pages/login/index']
 
 router.beforeEach((to, from, next) => {
     let token = to.query.token;
-    let m_id = to.query.m_id;
-    if (token && m_id) {
-        // store.commit("setCookie", { 'token': token, 'm_id': m_id });
+    if (token) {
         uni.setStorageSync('token',token);
-        uni.setStorageSync('m_id',m_id);
-        next('/pages/index/index');
     }
     const userToken = uni.getStorageSync('token')
-    const userMid = uni.getStorageSync('m_id')
-    console.log('登陆信息-------'+userToken+'--------------'+userMid)
-    if((!userToken || !userMid)  && whiteList.indexOf(to.fullPath)<0){
-        console.log('暂无登陆信息')
-        console.log(to.fullPath )
-        if(to.fullPath!=='/pages/login/index'){
+    if(!userToken  ){
+        if(whiteList.indexOf(to.path)<0){
             next('/pages/login/index');
         }
     }

+ 2 - 2
manifest.json

@@ -72,10 +72,10 @@
     "vueVersion" : "2",
     "h5" : {
         "devServer" : {
-            "https" : false,
+            "disableHostCheck" : true,
             "proxy" : {
                 "/api" : {
-                    "target" : "jn-api.test.cc",
+                    "target" : "http://qc-api.test.cc",
                     "changeOrigin" : true,
                     "secure" : false
                 }

+ 6 - 0
pages.json

@@ -12,6 +12,12 @@
 				"navigationBarTitleText": "首页演示"
 			}
 		},
+		{
+			"path": "pages/login/register",
+			"style": {
+				"navigationBarTitleText": "注册"
+			}
+		},
 		{
 			"path": "pages/index/error",
 			"style": {

+ 18 - 3
pages/login/index.vue

@@ -7,6 +7,7 @@
   import EnLoading from "../../components/en-utils/en-loading/en-loading";
   import bitkeepTron from "../../common/wallet/bitkeep-wallet/bitkeep-tron";
   import tools from "../../common/js/tools";
+  import {member} from "@/api/member";
   export default {
     components: {
       EnLoading
@@ -27,15 +28,29 @@
       getAccount(){
         bitkeepTron.getAccounts().then((Address)=>{
           if(Address){
-            console.log('Address:'+Address)
-
+            this.login(Address)
           }else {
             tools.toError('信息获取失败!')
           }
-
         }).catch((e)=>{
           tools.toError('信息获取失败!')
         })
+      },
+      login(Address){
+        member({'address':Address}).then((res)=>{
+          if(res.code===1){
+            tools.setLoginInfo(res.data)
+            setTimeout(()=>{
+              // uni.reLaunch({
+              //   url: '/pages/index/index'
+              // })
+            },50)
+          }else {
+            uni.reLaunch({
+              url: 'pages/login/register?address='+Address
+            })
+          }
+        })
       }
     },
   }

+ 24 - 0
pages/login/register.vue

@@ -0,0 +1,24 @@
+<template>
+  <view>
+
+  </view>
+</template>
+<script>
+export default {
+  name: "register",
+  props: {},
+  components: {},
+  data() {
+    return {}
+  },
+  mounted() {
+
+  },
+  methods: {}
+
+}
+</script>
+
+<style scoped lang="scss">
+
+</style>