基础功能静态页面，登录接口，拦截器更改

3 years ago · e98c23261a
parent 74de427762
commit e98c23261a
22 changed files with 309 additions and 144 deletions
--- a/.env.development
+++ b/.env.development
@ -1,3 +1,3 @@
 NODE_ENV = 'development'
-VUE_APP_URL = 'http://121.41.26.225:8004'
-VUE_APP_CDN = 'http://121.41.26.225:8004'
+VUE_APP_URL = 'http://121.41.26.225:8004/'
+VUE_APP_CDN = 'http://121.41.26.225:8004/'
--- a/.env.production
+++ b/.env.production
@ -1,3 +1,3 @@
 NODE_ENV  = 'production'
-VUE_APP_URL = 'http://121.41.26.225:8004'
-VUE_APP_CDN = 'http://121.41.26.225:8004'
+VUE_APP_URL = 'http://121.41.26.225:8004/'
+VUE_APP_CDN = 'http://121.41.26.225:8004/'
--- a/src/api/basic/estate/index.js
+++ b/src/api/basic/estate/index.js
--- a/src/api/basic/organization/index.js
+++ b/src/api/basic/organization/index.js
@ -0,0 +1,10 @@
+import httpService from "@/request"
+
+// 获取预报列表
+export function functionName(params) {
+    return httpService({
+        url: `url`,
+        method: 'post',
+        data: params,
+    })
+}
--- a/src/api/public/login/index.js
+++ b/src/api/public/login/index.js
@ -3,7 +3,7 @@ import httpService from "@/request"
 // 发送验证码
 export function sendTelCode(params) {
    return httpService({
-        url: `/manage/sendTelCode`,
+        url: `/sendTelCode`,
        method: 'post',
        data: params,
    })
@ -11,8 +11,9 @@ export function sendTelCode(params) {
 // 登录
 export function loginTel(params) {
    return httpService({
-        url: `/manage/loginTelCode`,
+        url: `/loginTelCode`,
        method: 'post',
        data: params,
    })
 }
+// 退出登录
--- a/src/mixins/index.js
+++ b/src/mixins/index.js
@ -12,10 +12,10 @@ export default {
    install(Vue) {
        Vue.mixin({
            computed: {
-                ...mapGetters(['getSelectedKeys', 'getOpenKeys'])
+                ...mapGetters(['getToken','getSelectedKeys', 'getOpenKeys','getLoginStep'])
            },
            methods: {
-                ...mapActions(['setSelectedKeys', 'setOpenKeys'])
+                ...mapActions(['setToken','setSelectedKeys', 'setOpenKeys','setLoginStep'])
            }
        })
    }
--- a/src/permission.js
+++ b/src/permission.js
@ -1,18 +1,18 @@
-/*
- * @Author: your name
- * @Date: 2021-11-18 17:34:50
- * @LastEditTime: 2021-11-18 17:37:15
- * @LastEditors: Please set LastEditors
- * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
- * @FilePath: /ansu-business/src/permission.js
- */
 import NProgress from "nprogress"
 import "nprogress/nprogress.css"
 import router from "@/router"
+import store from '@/store'

+const whitePath = [ '/login']
+// 判断登录
 router.beforeEach((to, from, next) => {
    NProgress.start()
-    next();
+    const token = store.getters.getToken;
+    if(!token && !whitePath.includes(to.path)) {
+        next('/login');
+    } else {
+        next();
+    }
 })

 router.afterEach(() => {
--- a/src/request/index.js
+++ b/src/request/index.js
@ -1,3 +1,11 @@
+/*
+ * @Author: your name
+ * @Date: 2021-10-13 09:28:02
+ * @LastEditTime: 2022-01-05 13:44:32
+ * @LastEditors: Please set LastEditors
+ * @Description: In User Settings Edit
+ * @FilePath: /data-show/src/request/index.js
+ */
 import axios from 'axios';
 // import qs from 'qs';
 import router from "@/permission"
@ -17,10 +25,10 @@ function filterRequestData(obj) {
 }
 //创建axios的实例
 const httpService = axios.create({
-    baseURL: process.env.VUE_APP_URL + '/1',// TODO:具体的配置可以根据项目情况而来
+    baseURL: process.env.VUE_APP_URL+'123456/manage',// TODO:具体的配置可以根据项目情况而来
    timeout: 5000
 })
-// + communityCode
+
 //axios的拦截--request
 httpService.interceptors.request.use(config => {
    const rqParams = filterRequestData(config.params);
@ -28,7 +36,7 @@ httpService.interceptors.request.use(config => {
    // post 'Content-Type' === 'application/x-www-form-urlencoded'
    config.headers['Content-Type'] = "application/json";
    config.headers['manage-login-token'] = store.getters.getToken;
-    config.headers['device-type'] = "web";
+    // config.headers['device-type'] = "web";
    if(config.method === 'post') {
        config.data = rqData;
    } else {
@ -43,14 +51,18 @@ httpService.interceptors.request.use(config => {
 //4、axios的拦截--response
 httpService.interceptors.response.use(response => {
 	// TODO:具体的code对应的处理可继续添加修改
-    let data = null;
+    // let data = null;
    let msg = '';
    let res = response.data;
-    if(res.code == 0){
-        data = res.data;
-        msg = res.msg || "";
-        return {data, msg};
-    } else if(res.code == 100000) {
+    // console.log(response);
+    if(res.code === 200){
+        // code = 200;
+        // data = res.data;
+        // msg = res.msg || "";
+        // console.log(msg);
+        // console.log(data);
+        return res;
+    } else if(res.code == '超时') {
        router.replace({
            path: '/login'
          });
--- a/src/store/actions.js
+++ b/src/store/actions.js
@ -7,6 +7,9 @@
 * @FilePath: /ansu-business/src/store/actions.js
 */
 const actions = {
+    setToken: ({commit}, log) => {
+        commit('setToken', log)
+    },
    setSelectedKeys: ({commit}, log) => {
        commit('setSelectedKeys', log)
    },
--- a/src/store/getters.js
+++ b/src/store/getters.js
@ -12,7 +12,10 @@ const getters = {
    },
    getOpenKeys(state) {
        return state.openKeys
-    }
+    },
+    getToken(state) {
+        return state.token
+    },
 }

 export default getters
--- a/src/store/mutations.js
+++ b/src/store/mutations.js
@ -17,6 +17,10 @@ const mutations = {
        let str = JSON.stringify(log);
        sessionStorage.setItem('openKeys', str);
    },
+    setToken: (state, log) => {
+        state.token = log;
+        sessionStorage.setItem('token', log);
+    },
 }

 export default mutations
--- a/src/store/state.js
+++ b/src/store/state.js
@ -8,6 +8,7 @@
 */
 const state = {
    selectedKeys: JSON.parse(sessionStorage.getItem('selectedKeys')) || ['/'],
-    openKeys: JSON.parse(sessionStorage.getItem('openKeys')) || []
+    openKeys: JSON.parse(sessionStorage.getItem('openKeys')) || [],
+    token: sessionStorage.getItem('token') || ""
 }
 export default state
--- a/src/views/Basic/WorkOrder/addWorkOrder.vue
+++ b/src/views/Basic/WorkOrder/addWorkOrder.vue
@ -0,0 +1,71 @@
+<template>
+  <div>
+    <a-drawer
+      title="抽屉"
+      :width="720"
+      :visible="isVisibleDrawe"
+      :body-style="{ paddingBottom: '80px' }"
+      @close="onClose"
+    >
+      <div class="drawer-content">
+        <a-form-model
+          title="1d2"
+          layout="vertical"
+          ref="ruleForm"
+          :model="form"
+          :rules="rules"
+          :wrapper-col="{ span: 18 }"
+        >
+          <div>基本信息</div>
+          <a-divider></a-divider>
+          <a-row>
+            <a-col :span="12">
+              <a-form-model-item label="申请人身份" prop="identity">
+                <a-select
+                  v-model="form.identity"
+                  placeholder="请选择申请人身份"
+                />
+              </a-form-model-item>
+            </a-col>
+          </a-row>
+        </a-form-model>
+      </div>
+      <div class="drawer-footer">
+        <a-button :style="{ marginRight: '8px' }" @click="onClose">
+          关闭
+        </a-button>
+        <a-button type="primary" @click="onClose"> 提交 </a-button>
+      </div>
+    </a-drawer>
+  </div>
+</template>
+<script>
+export default {
+  name: "addWork",
+  data() {
+    return {
+      isVisibleDrawe: false,
+    };
+  },
+  props: {
+    visible: Boolean,
+    form:Object,
+    rules:Object
+  },
+  methods: {
+    onClose() {
+      this.$emit("onClose");
+    },
+  },
+  watch: {
+    visible: {
+      handler(newValue) {
+        this.isVisibleDrawe = newValue;
+      },
+      immediate: true,
+    },
+  },
+};
+</script>
+<style lang="less" scoped>
+</style>
--- a/src/views/Basic/WorkOrder/index.vue
+++ b/src/views/Basic/WorkOrder/index.vue
@ -41,7 +41,7 @@
          </a-space>
        </a-col>
        <a-col :span="4">
-            <a-button class='add-btn'>添加工单</a-button>
+            <a-button class='add-btn' @click="show=true">添加工单</a-button>
        </a-col>
      </a-row>
    </div>
@ -116,13 +116,23 @@
        </span>
      </a-table>
    </div>
+    <add-work :visible='show' :form="form" @onClose="onClose" :rules="rules"></add-work>
  </div>
 </template>

 <script>
+import addWork from "../WorkOrder/addWorkOrder.vue"
 export default {
+  components:{
+    addWork
+  },
  data() {
    return {
+      form:{
+        identity:null
+      },
+      rules:{},
+      show: false,
      activeName:'0',
      pagination: {
        current: 1,
@ -145,7 +155,7 @@ export default {
      //   列
      columns: [
        {
-          title: "申请人身份",
+          title: "工单状态",
          key: "tags",
          width: "14%",
          dataIndex: "status",
@ -186,7 +196,7 @@ export default {
        },
      ],
      //   数据
-      tableData: [
+      tableData: [{},
      ],
      ActionsList: [
        {
@ -209,6 +219,9 @@ export default {
        this.searchForm.status = e.target.value
          this.getData()
    },
+    onClose(){
+      this.show = false;
+    },
    // 下发至工单池
    put(){

--- a/src/views/Layout/index.vue
+++ b/src/views/Layout/index.vue
@ -74,14 +74,14 @@ export default {
                    label: "智慧商城",
                    value: "smartMall"
                },
-                {
-                    label: "运营管理",
-                    value: "operation"
-                },
-                {
-                    label: "设置",
-                    value: "setting"
-                }
+                // {
+                //     label: "运营管理",
+                //     value: "operation"
+                // },
+                // {
+                //     label: "设置",
+                //     value: "setting"
+                // }
            ],
        };
    },
@ -109,7 +109,7 @@ export default {
 }

 #components-layout-demo-custom-trigger .logo {
-    height: 42px;
+    height: 62px;
    display: flex;
    justify-content: center;
    align-items: center;
@ -122,7 +122,7 @@ export default {
    .s1 {
        display: block;
        color: #d6d6d6;
-        font-size: 16px;
+        font-size: 18px;
        margin-left: 10px;
        font-weight: 500;
    }
@ -148,7 +148,7 @@ export default {
        .s1 {
             border-bottom: 2px solid #5679b1;
        }
-       
+
    }
 }
 .h-d2 {
--- a/src/views/Login/index.vue
+++ b/src/views/Login/index.vue
@ -11,53 +11,78 @@
        </a-col> -->
        <!-- <a-col :span="1" class="box-cen"></a-col> -->
        <!-- 登录 -->
-        <a-col  class="box-b" v-if="status === 1">
-           <a-tabs v-model="activeName" @change="tabsSwitch">
-                <!-- <a-tab-pane key="1" tab="密码登录">
+        <a-col class="box-b" v-if="status === 1">
+          <a-tabs v-model="activeName" @change="tabsSwitch">
+            <!-- <a-tab-pane key="1" tab="密码登录">
                </a-tab-pane> -->
-                <a-tab-pane key="2" tab="验证码登录">
-                </a-tab-pane>
-            </a-tabs>
-            <div class="login-input" v-if="activeName==='1'">
-                <a-input placeholder="请输入手机号码"></a-input>
-                <a-input type="password" placeholder="请输入密码"></a-input>
-                <a-row>
-                  <a-col :span="12" style="margin-left:23px"><a-checkbox></a-checkbox>&nbsp;&nbsp;三天之内免登陆</a-col>
-                </a-row>
-                <a-button type="primary" @click='login' style="width:90%;margin:30px">
-                    登录
-                </a-button>
-                <a-row style="margin-top:20px;margin-left:23px">
-                  <a-col :span="14">
-                    <a-checkbox></a-checkbox>&nbsp;&nbsp;我已同意用户协议
-                  </a-col>
-                   <a-col :span="10">
-                    <span class="logintext" @click="status=3">忘记密码</span>&nbsp;&nbsp;&nbsp;&nbsp;<span class="logintext" @click="status=2">免费注册</span>
-                  </a-col>
-                </a-row>
-            </div>
-            <div class="login-input" v-else-if="activeName==='2'">
-                <a-input placeholder="请输入手机号码"></a-input>
-                <a-input type="password" placeholder="请输入验证码" style="width:60%"></a-input>
-                <a-button type="primary" @click='getCode'>获取验证码</a-button>
-                <a-row>
-                  <a-col :span="12" style="margin-left:23px"><a-checkbox></a-checkbox>&nbsp;&nbsp;三天之内免登陆</a-col>
-                </a-row>
-                <a-button type="primary" @click='login' style="width:90%;margin:30px">
-                    登录
-                </a-button>
-                <a-row style="margin-top:20px;margin-left:23px">
-                  <a-col :span="14">
-                    <a-checkbox></a-checkbox>&nbsp;&nbsp;我已同意用户协议
-                  </a-col>
-                   <a-col :span="10">
-                    <span class="logintext" @click="status=3">忘记密码</span>&nbsp;&nbsp;&nbsp;&nbsp;<span class="logintext" @click="status=2">免费注册</span>
-                  </a-col>
-                </a-row>
-            </div>
+            <a-tab-pane key="2" tab="验证码登录"> </a-tab-pane>
+          </a-tabs>
+          <div class="login-input" v-if="activeName === '1'">
+            <a-input placeholder="请输入手机号码"></a-input>
+            <a-input type="password" placeholder="请输入密码"></a-input>
+            <a-row>
+              <a-col :span="12" style="margin-left: 23px"
+                ><a-checkbox></a-checkbox>&nbsp;&nbsp;三天之内免登陆</a-col
+              >
+            </a-row>
+            <a-button
+              type="primary"
+              @click="login"
+              style="width: 90%; margin: 30px"
+            >
+              登录
+            </a-button>
+            <a-row style="margin-top: 20px; margin-left: 23px">
+              <a-col :span="14">
+                <a-checkbox></a-checkbox>&nbsp;&nbsp;我已同意用户协议
+              </a-col>
+              <a-col :span="10">
+                <span class="logintext" @click="status = 3">忘记密码</span
+                >&nbsp;&nbsp;&nbsp;&nbsp;<span
+                  class="logintext"
+                  @click="status = 2"
+                  >免费注册</span
+                >
+              </a-col>
+            </a-row>
+          </div>
+          <div class="login-input" v-else-if="activeName === '2'">
+            <a-input placeholder="请输入手机号码" v-model="form.tel"></a-input>
+            <a-input
+              placeholder="请输入验证码"
+              v-model="form.code"
+              style="width: 60%"
+            ></a-input>
+            <a-button type="primary" @click="getCode">获取验证码</a-button>
+            <a-row>
+              <a-col :span="12" style="margin-left: 23px"
+                ><a-checkbox></a-checkbox>&nbsp;&nbsp;三天之内免登陆</a-col
+              >
+            </a-row>
+            <a-button
+              type="primary"
+              @click="login"
+              style="width: 90%; margin: 30px"
+            >
+              登录
+            </a-button>
+            <a-row style="margin-top: 20px; margin-left: 23px">
+              <a-col :span="14">
+                <a-checkbox></a-checkbox>&nbsp;&nbsp;我已同意用户协议
+              </a-col>
+              <a-col :span="10">
+                <span class="logintext" @click="status = 3">忘记密码</span
+                >&nbsp;&nbsp;&nbsp;&nbsp;<span
+                  class="logintext"
+                  @click="status = 2"
+                  >免费注册</span
+                >
+              </a-col>
+            </a-row>
+          </div>
        </a-col>
        <!-- 注册 -->
-        <a-col  class="box-b" v-if="status === 2">
+        <a-col class="box-b" v-if="status === 2">
          <div class="cardTitle">新建账号</div>
          <a-form-model
            ref="ruleForm"
@ -79,7 +104,7 @@
              <a-row style="margin-top: 20px">
                <a-col :span="16" style="margin-right: 10px">
                  <a-input
-                    style="width:100%"
+                    style="width: 100%"
                    v-model="form.verificationCode"
                    placeholder="请输入验证码"
                  />
@ -92,23 +117,22 @@
              </a-row>
            </a-form-model-item>
            <a-form-model-item label="设置密码" prop="psw">
-                <a-input placeholder="请输入密码"/>
+              <a-input placeholder="请输入密码" />
            </a-form-model-item>
            <a-form-model-item label="确认密码" prop="confirmPsw">
-                <a-input placeholder="请再次输入密码"/>
+              <a-input placeholder="请再次输入密码" />
            </a-form-model-item>
            <a-form-model-item>
-                <a-button type="primary" style="width:100%">
-                    确定
-                </a-button>
+              <a-button type="primary" style="width: 100%"> 确定 </a-button>
            </a-form-model-item>
            <a-form-model-item>
-                <span>已有账号？</span><span class="logintext" @click="status=1">登录</span>
+              <span>已有账号？</span
+              ><span class="logintext" @click="status = 1">登录</span>
            </a-form-model-item>
          </a-form-model>
        </a-col>
        <!-- 找回密码 -->
-        <a-col  class="box-b" v-if="status === 3">
+        <a-col class="box-b" v-if="status === 3">
          <div class="cardTitle">找回密码</div>
          <a-form-model
            ref="ruleForm"
@ -130,7 +154,7 @@
              <a-row style="margin-top: 20px">
                <a-col :span="16" style="margin-right: 10px">
                  <a-input
-                    style="width:100%"
+                    style="width: 100%"
                    v-model="form.verificationCode"
                    placeholder="请输入验证码"
                  />
@ -143,18 +167,17 @@
              </a-row>
            </a-form-model-item>
            <a-form-model-item label="设置密码" prop="psw">
-                <a-input placeholder="请输入密码"/>
+              <a-input placeholder="请输入密码" />
            </a-form-model-item>
            <a-form-model-item label="确认密码" prop="confirmPsw">
-                <a-input placeholder="请再次输入密码"/>
+              <a-input placeholder="请再次输入密码" />
            </a-form-model-item>
            <a-form-model-item>
-                <a-button type="primary" style="width:100%">
-                    确定
-                </a-button>
+              <a-button type="primary" style="width: 100%"> 确定 </a-button>
            </a-form-model-item>
            <a-form-model-item>
-                <span>已有账号？</span><span class="logintext" @click="status=1">登录</span>
+              <span>已有账号？</span
+              ><span class="logintext" @click="status = 1">登录</span>
            </a-form-model-item>
          </a-form-model>
        </a-col>
@ -164,15 +187,16 @@
 </template>

 <script>
-import { loginTel,sendTelCode } from "../../api/login"
+import { loginTel, sendTelCode } from "../../api/public/login";
 export default {
  name: "Login",
  data() {
    return {
      status: 1,
-      activeName:'2',
-      form:{
-          tel:''
+      activeName: "2",
+      form: {
+        tel: "",
+        code: "",
      },
      rules: {
        tel: [
@ -204,21 +228,38 @@ export default {
      },
    };
  },
+  created() {
+        this.keyupEnter();
+    },
  methods: {
-   async login() {
-      let res = await loginTel({
-        tel:'11',
-        code:'111111'
+    // 绑定enter事件
+    keyupEnter() {
+      document.onkeydown = (e) => {
+        if (e.keyCode === 13 && e.target.baseURI.match(/loginTel/)) {
+          //回车后执行搜索方法
+          this.login();
+        }
+      };
+    },
+    login() {
+      loginTel(this.form).then(res=>{
+        if (res.code === 200) {
+          this.$message.success(res.msg);
+          this.setToken(res.data);
+          this.$router.push("/");
+      } else {
+        this.$message.error(res.msg);
+      }
      })
-      console.log(res);
    },
    // 获取验证码
-    getCode(){
-      sendTelCode(this.form).then(res=>{
-        if(res){
-          this.$message.success(res.msg)
+    getCode() {
+      sendTelCode(this.form).then((res) => {
+        if (res) {
+          // this.$message.success("取消成功");
+          this.$message.success(res.msg +'   ' +res.data);
        }
-      })
+      });
    },
    onSubmit() {
      this.$refs.ruleForm.validate((valid) => {
@ -234,18 +275,18 @@ export default {
    resetForm() {
      this.$refs.ruleForm.resetFields();
    },
-    tabsSwitch(){
-        console.log(this.activeName);
-    }
+    tabsSwitch() {
+      console.log(this.activeName);
+    },
  },
 };
 </script>

 <style lang="less" scoped>
-.bg{
+.bg {
  background-image: url(../../assets/images/loginBg.png);
  height: 100vh;
-  background-size:cover;
+  background-size: cover;
 }
 .logo-box {
  text-align: left;
@ -261,8 +302,12 @@ export default {
    margin-left: 42px;
    margin-bottom: 13px;
  }
-  .title{
-    font-size:28px;color:#333333;font-weight:500;margin-left: 20px;line-height: 93px;
+  .title {
+    font-size: 28px;
+    color: #333333;
+    font-weight: 500;
+    margin-left: 20px;
+    line-height: 93px;
  }
 }
 .login-box {
@ -282,31 +327,31 @@ export default {
 .box-b {
  height: 500px;
  text-align: left;
-  padding:30px;
+  padding: 30px;
 }
-.cardTitle{
-    margin-left: -10px;
-    font-size: 18px;
-    color: #000000;
-    font-weight: 500;
-    margin-bottom: 40px;
+.cardTitle {
+  margin-left: -10px;
+  font-size: 18px;
+  color: #000000;
+  font-weight: 500;
+  margin-bottom: 40px;
 }
-.logintext{
-    color: #205FBD;
-    cursor: pointer;
+.logintext {
+  color: #205fbd;
+  cursor: pointer;
 }
-/deep/.ant-form-item{
-    margin-top:-10px;
+/deep/.ant-form-item {
+  margin-top: -10px;
 }
-.login-input{
+.login-input {
  text-align: left;
  margin-top: 20px;
-    /deep/.ant-input{
-        border: 0px;
-        border-bottom: 1px solid #f4eded;
-        border-radius:0 ;
-        width: 90%;
-        margin: 25px;
-    }
+  /deep/.ant-input {
+    border: 0px;
+    border-bottom: 1px solid #f4eded;
+    border-radius: 0;
+    width: 90%;
+    margin: 25px;
+  }
 }
 </style>
--- a/src/views/ShopMall/AccumulatePoints/index.vue
+++ b/src/views/ShopMall/AccumulatePoints/index.vue
--- a/src/views/ShopMall/AfterSale/index.vue
+++ b/src/views/ShopMall/AfterSale/index.vue
--- a/src/views/ShopMall/BusinessManage/index.vue
+++ b/src/views/ShopMall/BusinessManage/index.vue
--- a/src/views/ShopMall/GoodsManage/index.vue
+++ b/src/views/ShopMall/GoodsManage/index.vue
--- a/src/views/ShopMall/OrderManage/index.vue
+++ b/src/views/ShopMall/OrderManage/index.vue
--- a/vue.config.js
+++ b/vue.config.js
@ -9,7 +9,9 @@
 module.exports = {
    // ...
    runtimeCompiler: true,
-    
-   
+    devServer: {
+      port: "8443",
+    },
+
    // ...
  };