Merge branch 'master' of http://47.105.106.177:66/root/sup-server

merge

dsk-srm-server/src/api/login.js

 import network from "@/utils/network";
 
-//密码登录
 export const login = (data) => network({
     url: "/login",
     method: "post",
     data
 });
-//短信登录
 export const smsLogin = (data) => network({
     url: "/smsLogin",
     method: "post",
     data
 });
-//校验短信验证码
 export const validateSmsCode = (data) => network({
-  url: "/sms/validateSmsCode?phone="+data.phone +"&code="+data.code,
+    url: "/sms/validateSmsCode?phone=" + data.phone + "&code=" + data.code,
     method: "get",
     data
 });
-//校验图形验证码
 export const validateCaptcha = (data) => network({
-  url: "/validateCaptcha?uuid="+data.uuid +"&code="+data.code,
+    url: "/validateCaptcha?uuid=" + data.uuid + "&code=" + data.code,
     method: "get",
 });
-//忘记密码提交
 export const forgotPassword = (data) => network({
     url: "/forgotPassword",
     method: "post",
     data
 });
-//图形验证码
 export const captchaImage = () => network({
     url: "/captchaImage",
     method: "get",
 });
-//验证账号并发送短信
 export const checkUser = (data) => network({
     url: "/checkUser",
     method: "post",
@@ -44,7 +37,6 @@ export const checkUser = (data) => network({
 export const loginApi = (data) => network({
     url: "/login",
     method: "post",
-  data
 });
 
 export const loginOutApi = () => network({
@@ -56,3 +48,20 @@ export const getUserInfoApi = () => network({
     url: "/getInfo",
     method: "get"
 });
+//��Ӧ������
+export const getCategoryList = (data) => network({
+    url: "/category/list/tree",
+    method: "post",
+    data
+});
+
+export const uploadFile = (data) => network({
+    url: "/file/uploadFile",
+    method: "post",
+    data
+});
+
+export const register = (data) => network({
+    url: "/register",
+    method: "post",
+});

dsk-srm-server/src/login.vue

@@ -174,7 +174,7 @@
         <br>本条例解释权归交易平台所有。
       </div>
       <div slot="footer">
-        <el-button class="searchBtn" type="primary" style="width: 90px;" @click="agreeRegister = true,dialogVisible = false">同意</el-button>
+        <el-button class="searchBtn" type="primary" style="width: 90px;" @click="goRegister" >同意</el-button>
         <el-button @click="dialogVisible = false">取 消</el-button>
       </div>
     </el-dialog>
@@ -582,6 +582,9 @@ export default {
         this.$message.error('上传头像图片大小不能超过 2MB!');
       }
       return isJPG && isLt2M;
+    },
+    goRegister() {
+      this.$router.push('/register')
     }
   }
 }

dsk-srm-server/src/router/index.js

@@ -28,9 +28,18 @@ const routes = [
       needToken: false
     }
   },
+  {
+    path: '/register',
+    name: 'register',
+    component: () => import('@/register'),
+    meta: {
+      title: "注册页",
+      needToken: false
+    }
+  },
   {
     path: '/home',
-    redirect : "/home/index",
+    redirect: "/home/index",
     name: 'Home',
     component: () => import(/* webpackChunkName: "Home" */"@/home"),
     meta: {
@@ -55,7 +64,6 @@ const routes = [
 const router = new VueRouter({
   mode: 'history',
   base: process.env.BASE_URL,
-  routes
 });
 
 export default router;

dsk-srm-server/vue.config.js

@@ -91,7 +91,8 @@ module.exports = defineConfig({
     open: true,
     proxy: {
       [process.env.VUE_APP_BASE_API]: {
-        target: `http://139.9.157.49:8088`,
+        //target: `http://139.9.157.49:8088`,
+        target: `http://192.168.60.172:8188`,
         changeOrigin: true,
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API]: ''