1

.env.production

@@ -1,3 +1,3 @@
 NODE_ENV  = 'production'
-VUE_APP_URL = 'https://saas.kaidalai.cn/api/admin/'
-VUE_APP_STATIC = 'https://saas.kaidalai.cn/api/admin/'
+VUE_APP_URL = 'https://saas.kaidalai.cn/api/admin'
+VUE_APP_STATIC = 'https://saas.kaidalai.cn/api/admin'

.eslintrc.js

@@ -0,0 +1,24 @@
+module.exports = {
+    "env": {
+        "browser": true,
+        "es6": true
+    },
+    "extends": [
+        "plugin:vue/essential",
+    ],
+    "globals": {
+        "Atomics": "readonly",
+        "SharedArrayBuffer": "readonly"
+    },
+    "parserOptions": {
+        "ecmaVersion": 2018,
+        "sourceType": "module"
+    },
+    "plugins": [
+        "vue"
+    ],
+    "rules": {
+        indent: ['error', 'tab'],
+        'no-console': 'off',
+    }
+};

src/api/login/index.js

@@ -1,10 +0,0 @@
-import httpService from "@/request"
-
-// 登录
-export function loginTel(params) {
-    return httpService({
-        url: `/manage/loginTelCode`,
-        method: 'post',
-        data: params,
-    })
-}

src/api/public/login/index.js

@@ -0,0 +1,34 @@
+import httpService from "@/request"
+
+// 注册
+export function register(params) {
+	return httpService({
+		url: `/register`,
+		method: 'post',
+		data: params,
+	})
+}
+// 登录
+export function loginPWD(params) {
+	return httpService({
+		url: `/loginPWD`,
+		method: 'post',
+		data: params,
+	})
+}
+// 登录
+export function loginTelCode(params) {
+	return httpService({
+		url: `/loginTelCode`,
+		method: 'post',
+		data: params,
+	})
+}
+// 验证码
+export function sendTelCode(params) {
+	return httpService({
+		url: `/sendTelCode`,
+		method: 'post',
+		data: params,
+	})
+}

src/main.js

@@ -11,9 +11,12 @@ import App from './App.vue'
 import './styles/index.less';
 import mixins from "@/mixins"
 import Antd from 'ant-design-vue';
+import util from '@/utils/util.js'
 import 'ant-design-vue/dist/antd.css';
+
 Vue.use(Antd);
 Vue.use(mixins);
+Vue.use(util);
 import store from "@/store";
 import router from "@/permission";
 Vue.config.productionTip = false

src/mixins/index.js

@@ -12,10 +12,10 @@ export default {
 	install(Vue) {
 		Vue.mixin({
 			computed: {
-				...mapGetters(['getToken','getCommunityCode','getSelectedKeys', 'getOpenKeys'])
+				...mapGetters(['getToken','getSelectedKeys', 'getOpenKeys'])
 			},
 			methods: {
-				...mapActions(['setToken','setCommunityCode','setSelectedKeys', 'setOpenKeys'])
+				...mapActions(['setToken','setSelectedKeys', 'setOpenKeys'])
 			}
 		})
 	}

src/request/index.js

@@ -35,7 +35,7 @@ httpService.interceptors.request.use(config => {
 	const rqData = filterRequestData(config.data);
 	// post 'Content-Type' === 'application/x-www-form-urlencoded'
 	config.headers['Content-Type'] = "application/json";
-	config.headers['manage-login-token'] = store.getters.getToken;
+	config.headers['admin-login-token'] = store.getters.getToken;
 	// config.headers['device-type'] = "web";
 	if(config.method === 'post') {
 		config.data = rqData;

src/store/actions.js

@@ -10,9 +10,6 @@ const actions = {
 	setToken: ({commit}, log) => {
 		commit('setToken', log)
 	},
-	setCommunityCode: ({commit}, log) => {
-		commit('setCommunityCode', log)
-	},
 	setSelectedKeys: ({commit}, log) => {
 		commit('setSelectedKeys', log)
 	},

src/store/getters.js

@@ -16,9 +16,6 @@ const getters = {
 	getToken(state) {
 		return state.token
 	},
-	getCommunityCode(state) {
-		return state.communityCode
-	},
 }
 
 export default getters

src/store/mutations.js

@@ -21,10 +21,6 @@ const mutations = {
 		state.token = log;
 		sessionStorage.setItem('token', log);
 	},
-	setCommunityCode: (state, log) => {
-		state.communityCode = log;
-		sessionStorage.setItem('communityCode', log);
-	},
 }
 
 export default mutations

src/store/state.js

@@ -10,6 +10,5 @@ const state = {
 	selectedKeys: JSON.parse(sessionStorage.getItem('selectedKeys')) || ['/'],
 	openKeys: JSON.parse(sessionStorage.getItem('openKeys')) || [],
 	token: sessionStorage.getItem('token') || "",
-	communityCode: sessionStorage.getItem('communityCode') || "",
 }
 export default state

src/styles/index.less

@@ -20,7 +20,13 @@
     margin-left  : 10px;
     margin-bottom: 10px;
 }
-
+.back-btn{
+    font-size: 16px;
+    line-height: 22px;
+    color: #000000D9;
+    font-weight: 500;
+    cursor: pointer;
+}
 // 表格
 #commonTable {
     margin: 24px;

src/utils/util.js

@@ -0,0 +1,40 @@
+import axios from 'axios'
+import qs from 'qs'
+export default {
+	install: function (Vue) {
+		//axios
+		Vue.prototype.$axios = axios
+		Vue.prototype.qs = qs
+		// 上传
+		Vue.prototype.$upload = process.env.VUE_APP_URL + 'admin/user/upload/uploadImg'
+		// 静态地址
+		Vue.prototype.$ImgUrl = (src) => {
+			return process.env.VUE_APP_STATIC + '/' + src
+		}
+		// 时间格式化
+		Vue.prototype.formatDate = (time, fmt) => {
+			if (time > 0) {
+				let date = new Date(time * 1000)
+				if (/(y+)/.test(fmt)) {
+					fmt = fmt.replace(RegExp.$1, (date.getFullYear() + '').substr(4 - RegExp.$1.length))
+				}
+				let o = {
+					'M+': date.getMonth() + 1,
+					'd+': date.getDate(),
+					'h+': date.getHours(),
+					'm+': date.getMinutes(),
+					's+': date.getSeconds()
+				}
+				for (let k in o) {
+					if (new RegExp(`(${k})`).test(fmt)) {
+						let str = o[k] + ''
+						fmt = fmt.replace(RegExp.$1, (RegExp.$1.length === 1) ? str : ('00' + str).substr(str.length))
+					}
+				}
+				return fmt
+			} else {
+				return ''
+			}
+		}
+	}
+}

src/views/Basic/home/depend/form.vue

@@ -281,7 +281,7 @@ export default {
 			cascVal:[],
 			telephoneNum:"",
 			uploadHeaders: {
-				"manage-login-token": store.getters.getToken,
+				"admin-login-token": store.getters.getToken,
 			},
 			sexOption: [
 				{

src/views/Login/index.vue

@@ -13,8 +13,8 @@
         <!-- 登录 -->
         <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="1" tab="密码登录">
+                </a-tab-pane>
             <a-tab-pane key="2" tab="验证码登录"> </a-tab-pane>
           </a-tabs>
           <div class="login-input" v-if="activeName === '1'">
@@ -187,13 +187,13 @@
 </template>
 
 <script>
-// import { loginTel, sendTelCode } from "../../api/public/login";
+import { register, sendTelCode, loginPWD, loginTelCode } from "@/api/public/login";
 export default {
 	name: "Login",
 	data() {
 		return {
 			status: 1,
-			activeName: "2",
+			activeName: "1",
 			form: {
 				tel: "",
 				code: "",
@@ -230,7 +230,6 @@ export default {
 	},
 	created() {
 		this.keyupEnter();
-		this.setCommunityCode(123456);
 	},
 	methods: {
 		// 绑定enter事件
@@ -242,27 +241,43 @@ export default {
 				}
 			};
 		},
-		// login() {
-		// 	loginTel(this.form).then(res=>{
-		// 		if (res.code === 200) {
-		// 			this.$message.success(res.msg);
-		// 			// 存储token
-		// 			this.setToken(res.data);
-		// 			this.$router.push("/");
-		// 		} else {
-		// 			this.$message.error(res.msg);
-		// 		}
-		// 	})
-		// },
+		login() {
+			loginTelCode(this.form).then(res=>{
+				if (res.code === 200) {
+					this.$message.success(res.msg);
+					// 存储token
+					this.setToken(res.data);
+					this.$router.push("/");
+				} else {
+					this.$message.error(res.msg);
+				}
+			})
+		},
+		loginPWD() {
+			loginPWD(this.pswform).then(res=>{
+				if (res.code === 200) {
+					this.$message.success(res.msg);
+					// 存储token
+					this.setToken(res.data);
+					this.$router.push("/");
+				} else {
+					this.$message.error(res.msg);
+				}
+			})
+		},
 		// 获取验证码
-		// getCode() {
-		// 	sendTelCode(this.form).then((res) => {
-		// 		if (res) {
-		// 			// this.$message.success("取消成功");
-		// 			this.$message.success(res.msg +'   ' +res.data);
-		// 		}
-		// 	});
-		// },
+		getCode() {
+			console.log(1);
+			sendTelCode({tel:this.form.tel}).then((res) => {
+				if (res) {
+					// this.$message.success("取消成功");
+					this.$message.success(res.msg +'   ' +res.data);
+				}
+			});
+		},
+		register(){
+			register
+		},
 		onSubmit() {
 			this.$refs.ruleForm.validate((valid) => {
 				if (valid) {