临时提交

src/api/login.js

@@ -19,6 +19,26 @@ export function login(username, password, code, uuid) {
   })
 }
 
+// 普通用户登录方法
+export function userLogin(username, password, code, uuid) {
+  const data = {
+    username,
+    password,
+    code,
+    uuid
+  }
+  return request({
+    url: '/userLogin',
+    headers: {
+      isToken: false,
+      repeatSubmit: false
+    },
+    method: 'post',
+    data: data
+  })
+}
+
+
 // 注册方法
 export function register(data) {
   return request({
@@ -57,4 +77,4 @@ export function getCodeImg() {
     method: 'get',
     timeout: 20000
   })
-}
+}

src/layout/components/Navbar.vue

@@ -9,14 +9,6 @@
       <template v-if="device!=='mobile'">
         <search id="header-search" class="right-menu-item" />
 
-        <el-tooltip content="源码地址" effect="dark" placement="bottom">
-          <ruo-yi-git id="ruoyi-git" class="right-menu-item hover-effect" />
-        </el-tooltip>
-
-        <el-tooltip content="文档地址" effect="dark" placement="bottom">
-          <ruo-yi-doc id="ruoyi-doc" class="right-menu-item hover-effect" />
-        </el-tooltip>
-
         <screenfull id="screenfull" class="right-menu-item hover-effect" />
 
         <el-tooltip content="布局大小" effect="dark" placement="bottom">
@@ -31,7 +23,7 @@
           <i class="el-icon-caret-bottom" />
         </div>
         <el-dropdown-menu slot="dropdown">
-          <router-link to="/user/profile">
+          <router-link to="/user/profile" v-if="userType === UserType.ADMIN">
             <el-dropdown-item>个人中心</el-dropdown-item>
           </router-link>
           <el-dropdown-item @click.native="setting = true">
@@ -56,6 +48,7 @@ import SizeSelect from '@/components/SizeSelect'
 import Search from '@/components/HeaderSearch'
 import RuoYiGit from '@/components/RuoYi/Git'
 import RuoYiDoc from '@/components/RuoYi/Doc'
+import { UserType } from '@/utils/constants'
 
 export default {
   components: {
@@ -69,10 +62,14 @@ export default {
     RuoYiDoc
   },
   computed: {
+    UserType() {
+      return UserType
+    },
     ...mapGetters([
       'sidebar',
       'avatar',
-      'device'
+      'device',
+      'userType'
     ]),
     setting: {
       get() {

src/layout/components/Sidebar/Logo.vue

@@ -16,6 +16,8 @@
 <script>
 import logoImg from '@/assets/logo/logo.png'
 import variables from '@/assets/styles/variables.scss'
+import { mapGetters } from 'vuex'
+import { UserType } from '@/utils/constants'
 
 export default {
   name: 'SidebarLogo',
@@ -26,19 +28,19 @@ export default {
     }
   },
   computed: {
+    ...mapGetters(["userType", "title"]),
     variables() {
       return variables;
     },
     sideTheme() {
       return this.$store.state.settings.sideTheme
-    }
+    },
   },
   data() {
     return {
-      title: process.env.VUE_APP_TITLE,
       logo: logoImg
     }
-  }
+  },
 }
 </script>
 

src/store/getters.js

@@ -8,6 +8,8 @@ const getters = {
   token: state => state.user.token,
   avatar: state => state.user.avatar,
   name: state => state.user.name,
+  userType: state => state.user.userType,
+  title: state => state.user.title,
   introduction: state => state.user.introduction,
   roles: state => state.user.roles,
   permissions: state => state.user.permissions,

src/store/modules/user.js

@@ -1,5 +1,6 @@
-import { login, logout, getInfo } from '@/api/login'
+import { login, logout, getInfo, userLogin } from '@/api/login'
 import { getToken, setToken, removeToken } from '@/utils/auth'
+import { UserType } from '@/utils/constants'
 
 const user = {
   state: {
@@ -8,7 +9,9 @@ const user = {
     name: '',
     avatar: '',
     roles: [],
-    permissions: []
+    permissions: [],
+    userType: '',
+    title: process.env.VUE_APP_TITLE
   },
 
   mutations: {
@@ -29,6 +32,12 @@ const user = {
     },
     SET_PERMISSIONS: (state, permissions) => {
       state.permissions = permissions
+    },
+    SET_USER_TYPE: (state, userType) => {
+      state.userType = userType
+    },
+    SET_TITLE: (state, title) => {
+      state.title = title;
     }
   },
 
@@ -41,6 +50,23 @@ const user = {
       const uuid = userInfo.uuid
       return new Promise((resolve, reject) => {
         login(username, password, code, uuid).then(res => {
+          setToken(res.token)
+          commit('SET_USER_TYPE', UserType.ADMIN)
+          commit('SET_TOKEN', res.token)
+          resolve()
+        }).catch(error => {
+          reject(error)
+        })
+      })
+    },
+    // 普通用户登录
+    UserLogin({ commit }, userInfo) {
+      const username = userInfo.username.trim()
+      const password = userInfo.password
+      const code = userInfo.code
+      const uuid = userInfo.uuid
+      return new Promise((resolve, reject) => {
+        userLogin(username, password, code, uuid).then(res => {
           setToken(res.token)
           commit('SET_TOKEN', res.token)
           resolve()
@@ -49,7 +75,6 @@ const user = {
         })
       })
     },
-
     // 获取用户信息
     GetInfo({ commit, state }) {
       return new Promise((resolve, reject) => {
@@ -65,6 +90,12 @@ const user = {
           commit('SET_ID', user.userId)
           commit('SET_NAME', user.userName)
           commit('SET_AVATAR', avatar)
+
+          let userType = res.userType;
+          commit('SET_USER_TYPE', userType)
+          if (userType === UserType.APP) {
+            commit('SET_TITLE', "智能开关-商户中心")
+          }
           resolve(res)
         }).catch(error => {
           reject(error)

src/utils/constants.js

@@ -2,3 +2,8 @@
 export const views = {
   user: 'user',
 }
+
+export const UserType = {
+  ADMIN: "1", // 管理员
+  APP: "2"      // 普通用户
+}

src/utils/wx.js

@@ -15,6 +15,5 @@ export function getWxIndexUrl(query) {
       url += `?${query}`;
     }
   }
-  console.log("wx_url", url);
   return url;
 }

src/views/index.vue

@@ -1,26 +1,27 @@
 <template>
   <div class="dashboard-editor-container">
+    <template v-if="userType === UserType.ADMIN">
+      <el-card header="舆情分析" class="card-box">
+        <brief />
+      </el-card>
 
-    <el-card header="舆情分析" class="card-box">
+      <el-row :gutter="8">
-      <brief />
+        <el-col :span="12">
-    </el-card>
+          <el-card header="每日充值提现" class="card-box">
+            <daily-bill-report />
+          </el-card>
+        </el-col>
+        <el-col :span="12">
+          <el-card header="每日充值利润" class="card-box">
+            <daily-profit-report />
+          </el-card>
+        </el-col>
+      </el-row>
 
-    <el-row :gutter="8">
+      <el-card header="余额时段分析" class="card-box">
-      <el-col :span="12">
+        <balance-period-report/>
-        <el-card header="每日充值提现" class="card-box">
+      </el-card>
-          <daily-bill-report />
+    </template>
-        </el-card>
-      </el-col>
-      <el-col :span="12">
-        <el-card header="每日充值利润" class="card-box">
-          <daily-profit-report />
-        </el-card>
-      </el-col>
-    </el-row>
-
-    <el-card header="余额时段分析" class="card-box">
-      <balance-period-report/>
-    </el-card>
 
   </div>
 </template>
@@ -30,6 +31,8 @@ import DailyBillReport from "@/views/dashboard/DailyBillReport.vue";
 import BalancePeriodReport from "@/views/dashboard/BalancePeriodReport.vue";
 import Brief from "@/views/dashboard/Brief.vue";
 import DailyProfitReport from "@/views/dashboard/DailyProfitReport.vue";
+import { mapGetters } from 'vuex'
+import { UserType } from '@/utils/constants'
 
 export default {
   name: 'Index',
@@ -39,13 +42,12 @@ export default {
     BalancePeriodReport,
     DailyBillReport,
   },
-  data() {
+  computed: {
-    return {
+    UserType() {
-
+      return UserType
-    }
+    },
+    ...mapGetters(["userType"]),
   },
-  methods: {
-  }
 }
 </script>
 

src/views/login.vue

@@ -1,13 +1,18 @@
 <template>
   <div class="login">
     <el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form">
-      <h3 class="title">智能开关后台管理系统</h3>
+<!--      <h3 class="title">智能开关后台管理系统</h3>-->
+      <el-tabs v-model="loginType">
+        <el-tab-pane label="管理员登录" name="admin"/>
+        <el-tab-pane label="商户登录" name="mch"/>
+      </el-tabs>
+
       <el-form-item prop="username">
         <el-input
           v-model="loginForm.username"
           type="text"
           auto-complete="off"
-          placeholder="账号"
+          placeholder="账号/手机号"
         >
           <svg-icon slot="prefix" icon-class="user" class="el-input__icon input-icon" />
         </el-input>
@@ -70,17 +75,19 @@ export default {
   name: "Login",
   data() {
     return {
+      // 登录类型
+      loginType: "admin",
       codeUrl: "",
       loginForm: {
-        username: "admin",
+        username: null,
-        password: "admin123",
+        password: null,
         rememberMe: false,
         code: "",
         uuid: ""
       },
       loginRules: {
         username: [
-          { required: true, trigger: "blur", message: "请输入您的账号" }
+          { required: true, trigger: "blur", message: "请输入您的账号/手机号" }
         ],
         password: [
           { required: true, trigger: "blur", message: "请输入您的密码" }
@@ -101,6 +108,12 @@ export default {
         this.redirect = route.query && route.query.redirect;
       },
       immediate: true
+    },
+    loginType(nv, ov) {
+      // if (nv != ov) {
+      //   this.loginForm.username = null;
+      //   this.loginForm.password = null;
+      // }
     }
   },
   created() {
@@ -140,14 +153,25 @@ export default {
             Cookies.remove("password");
             Cookies.remove('rememberMe');
           }
-          this.$store.dispatch("Login", this.loginForm).then(() => {
+          if (this.loginType === "admin") {
-            this.$router.push({ path: this.redirect || "/" }).catch(()=>{});
+            this.$store.dispatch("Login", this.loginForm).then(() => {
-          }).catch(() => {
+              this.$router.push({ path: this.redirect || "/" }).catch(()=>{});
-            this.loading = false;
+            }).catch(() => {
-            if (this.captchaEnabled) {
+              this.loading = false;
-              this.getCode();
+              if (this.captchaEnabled) {
-            }
+                this.getCode();
-          });
+              }
+            });
+          } else if (this.loginType === "mch") {
+            this.$store.dispatch("UserLogin", this.loginForm).then(() => {
+              this.$router.push({ path: this.redirect || "/" }).catch(()=>{});
+            }).catch(() => {
+              this.loading = false;
+              if (this.captchaEnabled) {
+                this.getCode();
+              }
+            });
+          }
         }
       });
     }

src/views/ss/suit/index.vue

@@ -144,7 +144,7 @@
           </el-input>
         </el-form-item>
         <el-form-item label="价格" prop="price">
-          <el-input-number v-model="form.price" placeholder="请输入价格(元）" :min="0.01" :precision="2"/> 元
+          <el-input-number v-model="form.price" placeholder="请输入价格(元）" :min="0" :precision="2"/> 元
         </el-form-item>
         <el-form-item label="详细说明" prop="description">
           <el-input v-model="form.description" placeholder="请输入详细说明" type="textarea" />