feat: axios完善，接口联调

package.json

@@ -14,6 +14,7 @@
     "axios": "^0.27.2",
     "crypto-js": "^3.1.9-1",
     "element-ui": "^2.8.2",
+    "js-cookie": "^3.0.1",
     "vue": "^2.6.6",
     "vue-router": "^3.0.1",
     "vuex": "^3.0.1"

src/common/http.js

@@ -5,14 +5,17 @@
 import axios from 'axios';
 import QS from 'qs';
 import store from '../store/index'
+import { Message, Loading } from 'element-ui'
+import { basePath, logFlag } from '@/config/env'
+import router from '../router/index'
 
 // 环境的切换
 if (process.env.NODE_ENV == 'development') {
-	axios.defaults.baseURL = '/api';
+  axios.defaults.baseURL = '/api';
 } else if (process.env.NODE_ENV == 'debug') {
-	axios.defaults.baseURL = '';
+  axios.defaults.baseURL = '';
 } else if (process.env.NODE_ENV == 'production') {
-	axios.defaults.baseURL = 'http://api.123dailu.com/';
+  axios.defaults.baseURL = 'http://api.123dailu.com/';
 }
 
 // 请求超时时间
@@ -20,116 +23,139 @@ axios.defaults.timeout = 10000;
 
 // post请求头
 axios.defaults.headers.post['Content-Type'] = 'application/x-www-form-urlencoded;charset=UTF-8';
+axios.defaults.headers.post['token'] = localStorage.getItem('token');
+axios.defaults.headers.get['token'] = localStorage.getItem('token');
 
 // 请求拦截器
 axios.interceptors.request.use(
-	config => {
-		// 每次发送请求之前判断是否存在token，如果存在，则统一在http请求的header都加上token，不用每次请求都手动添加了
-		// 即使本地存在token，也有可能token是过期的，所以在响应拦截器中要对返回状态进行判断
-		const token = store.state.token;
-		token && (config.headers.Authorization = token);
-		return config;
-	},
-	error => {
-		return Promise.error(error);
-	})
+  config => {
+    // 每次发送请求之前判断是否存在token，如果存在，则统一在http请求的header都加上token，不用每次请求都手动添加了
+    // 即使本地存在token，也有可能token是过期的，所以在响应拦截器中要对返回状态进行判断
+    const token = localStorage.getItem('token');
+    if (!token) {
+      router.push('/login')
+    }
+    token && (config.headers.Authorization = token);
+    return config;
+  },
+  error => {
+    return Promise.error(error);
+  })
 
 // 响应拦截器
 axios.interceptors.response.use(
-	response => {
-		if (response.status === 200) {
-			return Promise.resolve(response);
-		} else {
-			return Promise.reject(response);
-		}
-	},
-	// 服务器状态码不是200的情况
-	error => {
-		if (error.response.status) {
-			switch (error.response.status) {
-				// 401: 未登录
-				// 未登录则跳转登录页面，并携带当前页面的路径
-				// 在登录成功后返回当前页面，这一步需要在登录页操作。
-				case 401:
-					router.replace({
-						path: '/login',
-						query: { redirect: router.currentRoute.fullPath }
-					});
-					break;
-				// 403 token过期
-				// 登录过期对用户进行提示
-				// 清除本地token和清空vuex中token对象
-				// 跳转登录页面
-				case 403:
-					this.$message.error('登录过期，请重新登录');
-					// 清除token
-					localStorage.removeItem('token');
-					store.commit('loginSuccess', null);
-					// 跳转登录页面，并将要浏览的页面fullPath传过去，登录成功后跳转需要访问的页面
-					setTimeout(() => {
-						router.replace({
-							path: '/login',
-							query: {
-								redirect: router.currentRoute.fullPath
-							}
-						});
-					}, 1000);
-					break;
-				// 404请求不存在
-				case 404:
-					this.$message.error('网络请求不存在');
-					break;
-				// 其他错误，直接抛出错误提示
-				default:
-					this.$message.error(error.response.data.message);
-			}
-			return Promise.reject(error.response);
-		}
-	}
+  response => {
+    if (response.status === 200) {
+      return Promise.resolve(response);
+    } else {
+      return Promise.reject(response);
+    }
+  },
+  // 服务器状态码不是200的情况
+  error => {
+    if (error.response.status) {
+      switch (error.response.status) {
+        // 401: 未登录
+        // 未登录则跳转登录页面，并携带当前页面的路径
+        // 在登录成功后返回当前页面，这一步需要在登录页操作。
+        case 401:
+          router.replace({
+            path: '/login',
+            query: { redirect: router.currentRoute.fullPath }
+          });
+          break;
+        // 403 token过期
+        // 登录过期对用户进行提示
+        // 清除本地token和清空vuex中token对象
+        // 跳转登录页面
+        case 403:
+          this.$message.error('登录过期，请重新登录');
+          // 清除token
+          localStorage.removeItem('token');
+          store.commit('loginSuccess', null);
+          // 跳转登录页面，并将要浏览的页面fullPath传过去，登录成功后跳转需要访问的页面
+          setTimeout(() => {
+            router.replace({
+              path: '/login',
+              query: {
+                redirect: router.currentRoute.fullPath
+              }
+            });
+          }, 1000);
+          break;
+        // 404请求不存在
+        case 404:
+          this.$message.error('网络请求不存在');
+          break;
+        // 其他错误，直接抛出错误提示
+        default:
+          this.$message.error(error.response.data.message);
+      }
+      return Promise.reject(error.response);
+    }
+  }
 )
-	/**
-	 * get方法，对应get请求
-	 * @param {String} url [请求的url地址]
-	 * @param {Object} params [请求时携带的参数]
-	 */
-function get(url, params){
-	return new Promise((resolve, reject) =>{
-		axios.get(url, {
-			params: params
-		})
-			.then(res => {
-				resolve(res.data);
-			})
-			.catch(err => {
-				reject(err.data)
-			})
-	});
+let reqUrl = ''
+/**
+ * get方法，对应get请求
+ * @param {String} url [请求的url地址]
+ * @param {Object} params [请求时携带的参数]
+ */
+function get (url, params) {
+  reqUrl = basePath + url
+  return new Promise((resolve, reject) => {
+    axios.get(reqUrl, {
+      params: params
+    })
+      .then(res => {
+        if (res.data.code != 200) {
+          Message({
+            message: res.data.msg,
+            type: 'error'
+          });
+        }
+        console.log(res.data);
+        resolve(res.data);
+      })
+      .catch(err => {
+        reject(err.data)
+      })
+  });
 }
 /**
  * post方法，对应post请求
  * @param {String} url [请求的url地址]
  * @param {Object} params [请求时携带的参数]
  */
-function post(url, params) {
-	return new Promise((resolve, reject) => {
-		axios.post(url, QS.stringify(params))
-			.then(res => {
-				resolve(res.data);
-			})
-			.catch(err => {
-				reject(err.data)
-			})
-	});
+function post (url, params) {
+  reqUrl = basePath + url
+  return new Promise((resolve, reject) => {
+    axios.post(reqUrl, QS.stringify(params))
+      .then(res => {
+        console.log(res, 'resres');
+        if (res.data.code != 200) {
+          Message({
+            message: res.data.msg,
+            type: 'error'
+          });
+        }
+        resolve(res.data);
+      })
+      .catch(err => {
+        console.log(err, 'errerrerr');
+        reject(err.data)
+      })
+  });
 }
 
 
 
 export default () => {
-	if (typeof window.$http == 'undefined') {
-		window.$http = {
-			post: post,
-			get: get
-		}
-	}
+  if (typeof window.$http == 'undefined') {
+    window.$http = {
+      post: post,
+      get: get
+    }
+  }
 }
 

src/common/utils.js

@@ -1,7 +1,27 @@
 // 自定义全局方法封装
 const utils = {
   test: function () { },
-  isBack: false
+  isBack: false,
+  formatTime: function (date, fmt) {
+    var date = new Date(date);
+    if (/(y+)/.test(fmt)) {
+      fmt = fmt.replace(RegExp.$1, (date.getFullYear() + '').substr(4 - RegExp.$1.length));
+    }
+    var o = {
+      'M+': date.getMonth() + 1,
+      'd+': date.getDate(),
+      'h+': date.getHours(),
+      'm+': date.getMinutes(),
+      's+': date.getSeconds()
+    };
+    for (var k in o) {
+      if (new RegExp('(' + k + ')').test(fmt)) {
+        var str = o[k] + '';
+        fmt = fmt.replace(RegExp.$1, (RegExp.$1.length === 1) ? str : ('00' + str).substr(str.length));
+      }
+    }
+    return fmt;
+  },
 
 }
 

src/config/env.js

@@ -1,26 +1,6 @@
 // 环境配置
-let appId = 102;       //sso登录服务的appid，传0表示走老的授权登录
-let appVersion = 1;    //sso登录服务的版本，默认为第一版
-let logFlag = {
-  dev: false,    			// 开发和测试环境是否上报log
-  from: false,   			// 是否上传页面来源
-  packageName: 'web-init'
-};
-let basePath = 'https://store.api.ijolijoli.com/'; 	// api请求地址
-let ssoPath = 'https://sso.51yund.com';		// 授权登录地址
-let localPath = 'https://51yund.com';       // 获取定位地址
-let logPath = 'https://api.51yund.com';     // 上传日志地址
-let jumpPath = 'https://d.51yund.com';		// 跳转登录地址
-let filterErr = ['sskey过期'];  //过滤掉某些错不上报
+let basePath = 'https://store.api.ijolijoli.com'; 	// api请求地址
 
 export {
   basePath,
-  ssoPath,
-  localPath,
-  jumpPath,
-  logPath,
-  logFlag,
-  appId,
-  appVersion,
-  filterErr
 }

src/main.js

@@ -3,18 +3,18 @@ import App from './App.vue'
 import router from './router/index'
 import store from './store/index'
 import login from './common/login'
-import auth from './common/auth'
-import { injectGlobal } from './common/'
 import ElementUI from 'element-ui'
 import 'element-ui/lib/theme-chalk/index.css'
+import auth from './common/auth'
+import { injectGlobal } from './common/'
 import './style/reset.less'
 import './style/common.less'
 import './assets/font/iconfont.css'
 import './style/index.less'
 import './filters/filter'
 //全局注入
-injectGlobal()
 Vue.use(ElementUI)
+injectGlobal()
 
 window.globalVue = "";
 // login((hasLogin)=>{

src/pages/home/index.vue

@@ -1,7 +1,9 @@
 <template>
   <div class="home">
     <div class="tab">
-      <div class="make-order" v-for="item in tabList">
+      <div class="make-order"
+           v-for="item,index in tabList"
+           :key="index">
         <div class="make-icon">
           <img :src="item.image">
         </div>
@@ -14,15 +16,24 @@
     <div class="order-list">
       <div class="title">预约订单列表</div>
       <div class="list-info">
-        <div class="user-info" v-for="(item,index) in orderList" :style="index==orderList.length-1?'border-bottom:0px':''">
-          <div class="head-img"> <div class="new">新</div><img :src="item.img" alt=""></div>
+        <div class="user-info"
+             v-for="(item,index) in orderList"
+             :key="index"
+             :style="index==orderList.length-1?'border-bottom:0px':''">
+          <div class="head-img">
+            <div class="new">新</div><img :src="item.img"
+                 alt="">
+          </div>
           <div class="user-information">
             <div class="name">客户昵称：<span>{{ item.name }}</span></div>
             <div class="name">预约项目时间：<span>{{ item.ts }}</span></div>
             <div class="name">预约项目数量：<span>{{ item.num }}</span></div>
           </div>
           <ul class="product-list">
-            <li class="product-image" v-for="value in item.imgList"><img :src="value" alt=""></li>
+            <li class="product-image"
+                v-for="value,i in item.imgList"
+                :key="i"><img :src="value"
+                   alt=""></li>
           </ul>
           <div class="status">
             {{ item.status }}
@@ -38,22 +49,22 @@ import api from '@/server/home'
 
 export default {
   name: 'home',
-  data() {
+  data () {
     return {
       tabList: [
         {
           image: 'https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/home/make.png',
-          num: 0,
+          num: 3,
           name: '预约订单'
         },
         {
           image: 'https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/home/unpaid.png',
-          num: 0,
+          num: 4,
           name: '未支付订单'
         },
         {
           image: 'https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/home/cancelOrder.png',
-          num: 0,
+          num: 9,
           name: '取消订单'
         },
       ],
@@ -126,10 +137,27 @@ export default {
 
   },
   created: function () {
-
+    this.getTotal()
+    this.getToday()
+    console.log(this.$store.state.comVal.token, 'this.$store.state.comVal.token');
   },
   methods: {
-    initData() {
+    getTotal () {
+      api.getTotal().then(res => {
+        if (res.code == 200) {
+          this.tabList[0].num = res.data.order_num
+          this.tabList[1].num = res.data.wait_pay_num
+          this.tabList[2].num = res.data.cancel_num
+        }
+        console.log(res, 'res====');
+      })
+    },
+    getToday () {
+      api.getToday().then(res => {
+        console.log(res, 'res');
+      })
+    },
+    initData () {
 
     },
   },
@@ -151,7 +179,7 @@ export default {
     .make-order {
       width: 274px;
       padding: 14px 30px;
-      background: #FFFFFF;
+      background: #ffffff;
       box-shadow: 0px 2px 4px 0px rgba(184, 191, 198, 0.2);
       border-radius: 8px;
       display: flex;
@@ -189,7 +217,7 @@ export default {
   .order-list {
     margin-top: 18px;
     width: 100%;
-    background: #FFFFFF;
+    background: #ffffff;
     box-shadow: 0px 2px 4px 0px rgba(184, 191, 198, 0.2);
     border-radius: 8px;
     padding: 14px 12px;
@@ -210,14 +238,14 @@ export default {
 
       .user-info {
         padding: 14px 0;
-        border-bottom: 1px solid #E6E6E6;
+        border-bottom: 1px solid #e6e6e6;
         display: flex;
         align-items: center;
 
         .head-img {
           position: relative;
           width: 72px;
-          .new{
+          .new {
             position: absolute;
             top: -2px;
             right: -2px;
@@ -228,9 +256,9 @@ export default {
             font-size: 12px;
             font-family: PingFangSC-Regular, PingFang SC;
             font-weight: 400;
-            color: #FFFFFF;
+            color: #ffffff;
             line-height: 17px;
-            background: #FF6945;
+            background: #ff6945;
             border-radius: 50%;
           }
 
@@ -264,32 +292,27 @@ export default {
           overflow-y: hidden;
           padding-left: 8px;
 
-
           .product-image {
             display: inline-block;
             margin-left: 16px;
             width: 72px;
-            img{
+            img {
               border-radius: 8px;
               width: 100%;
               display: block;
             }
-
           }
-
         }
-        .status{
+        .status {
           margin-left: 56px;
           font-size: 16px;
           font-family: SourceHanSansCN-Regular, SourceHanSansCN;
           font-weight: 400;
-          color: #FC3019;
+          color: #fc3019;
           line-height: 24px;
         }
       }
     }
-
   }
 }
-
 </style>

src/pages/login/login.vue

@@ -2,17 +2,27 @@
   <div class="mine">
     <div class="login-info">
       <div class="logo">
-        <img src="https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/logo%402x.png" alt="">
+        <img src="https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/logo%402x.png"
+             alt="">
       </div>
       <div class="login-title">JOLIJOLI店员端</div>
       <div class="content">
         <div class="value-inp">
-          <img src="https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/num_icon.png" alt="">
-          <el-input placeholder="请输入账号名" v-model="account"></el-input>
+          <img src="https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/num_icon.png"
+               alt="">
+          <el-input placeholder="请输入账号名"
+                    v-model="account"></el-input>
         </div>
         <div class="value-inp">
-          <img src="https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/password_icon.png" alt="">
-          <el-input placeholder="请输入密码" v-model="password" show-password></el-input>
+          <img src="https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/password_icon.png"
+               alt="">
+          <el-input placeholder="请输入密码"
+                    v-model="password"
+                    show-password></el-input>
+        </div>
+        <div class="onLogin"
+             @click="onLogin">
+          登录
         </div>
       </div>
     </div>
@@ -20,25 +30,49 @@
 </template>
 
 <script>
+import api from '../../server/home'
+// import Cookies from "js-cookie"
 export default {
   components: {},
-  data() {
+  data () {
     return {
-      account:"",
-      password:""
+      account: "",
+      password: ""
 
     };
   },
   computed: {},
   watch: {},
 
-  methods: {},
+  methods: {
+    onLogin () {
+      let params = {
+        username: this.account,
+        password: this.password
+      }
+      api.getToken(params).then(res => {
+        if (res.code == 200) {
+          this.$store.state.comVal.token = res.data.token
+          console.log(this.$store.state.comVal.token, 'this.$store.');
+          localStorage.setItem("token", res.data.token)
+          this.$router.push({
+            path: '/home'
+          })
+        }
+      })
+    }
 
-  created() {
+  },
 
+  created () {
+    if (localStorage.getItem("token")) {
+      this.$router.push({
+        path: '/home'
+      })
+    }
   },
 
-  mounted() {
+  mounted () {
 
   },
 }
@@ -49,68 +83,86 @@ export default {
 .mine {
   width: 100%;
   min-height: 100vh;
-  background: linear-gradient(315deg, #FF9F7E 0%, #FF926C 0%, #FF9D55 100%);
+  background: linear-gradient(315deg, #ff9f7e 0%, #ff926c 0%, #ff9d55 100%);
   position: relative;
-  .login-info{
+  .login-info {
     position: absolute;
     left: 50%;
     top: 15%;
     transform: translateX(-50%);
     width: 460px;
     height: 460px;
-    background: url("https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/login_bg.png") no-repeat;
+    background: url("https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/login_bg.png")
+      no-repeat;
     background-size: 100% 100%;
-    .logo{
+    .logo {
       width: 100px;
       height: 100px;
       position: relative;
       left: 50%;
       transform: translateX(-50%);
       top: -17px;
-      img{
+      img {
         width: 100%;
         display: block;
       }
     }
-    .login-title{
+    .login-title {
       margin-top: 7px;
       font-size: 28px;
       font-family: PingFangSC-Medium, PingFang SC;
       font-weight: 500;
       text-align: center;
-      color: #EB5C21;
+      color: #eb5c21;
       line-height: 40px;
     }
-    .content{
+    .content {
       padding-top: 15px;
       position: relative;
-      .value-inp{
+      .value-inp {
         position: relative;
         margin-top: 20px;
         left: 50%;
         transform: translateX(-50%);
         width: 336px;
         height: 53px;
-        background: url("https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/input_bg.png") no-repeat;
+        background: url("https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/input_bg.png")
+          no-repeat;
         background-size: 100% 100%;
         display: flex;
         padding: 0 24px;
         justify-content: space-between;
         align-items: center;
-        img{
+        img {
           width: 32px;
           height: 32px;
         }
-       /deep/ .el-input__inner{
-          background-color:transparent;
-         border: 0px solid #DCDFE6;
-         height: 53px;
-         line-height: 53px;
-         font-size: 18px;
-         font-family: PingFangSC-Regular, PingFang SC;
-         font-weight: 400;
+        /deep/ .el-input__inner {
+          background-color: transparent;
+          border: 0px solid #dcdfe6;
+          height: 53px;
+          line-height: 53px;
+          font-size: 18px;
+          font-family: PingFangSC-Regular, PingFang SC;
+          font-weight: 400;
         }
       }
+      .onLogin {
+        margin-top: 29px;
+        position: relative;
+        left: 50%;
+        transform: translateX(-50%);
+        width: 214px;
+        height: 53px;
+        line-height: 53px;
+        background: #fa7d22;
+        border-radius: 27px;
+        font-size: 18px;
+        font-family: PingFangSC-Medium, PingFang SC;
+        font-weight: 500;
+        color: #ffffff;
+        text-align: center;
+      }
     }
   }
 }

src/pages/testSkin/index.vue

@@ -15,7 +15,8 @@
            class="el-input__icon el-icon-search"></i>
       </el-input>
       <el-button type="primary"
-                 class="searchButton">搜索</el-button>
+                 class="searchButton"
+                 @click="getSkinList">搜索</el-button>
     </div>
     <div class="list">
       <div class="tab">
@@ -30,21 +31,21 @@
              v-for="(item,index) in userList"
              :key="index"
              @click="onDetails">
-          <div class="head-img"><img :src="item.img"
+          <div class="head-img"><img :src="item.avatar_url"
                  alt=""></div>
-          <div class="head-name">{{ item.name }}</div>
-          <div class="head-phone">{{ item.phone }}</div>
-          <div class="head-ts">{{ item.ts }}</div>
-          <div class="head-status">{{ item.status }}</div>
+          <div class="head-name">{{ item.nickname }}</div>
+          <div class="head-phone">{{ item.mobile }}</div>
+          <div class="head-ts">{{ item.check_time }}</div>
+          <div class="head-status"
+               :style="item.status==1?'color: #61D09D;':'color: #FC3019;'">{{ item.status==1?'已面诊':'未面诊'}}</div>
         </div>
       </div>
       <div class="pagin">
         <el-pagination background
                        layout="prev, pager, next"
-                       @size-change="handleSizeChange"
                        @current-change="handleCurrentChange"
                        :current-page.sync="currentPage1"
-                       :total="1000">
+                       :total="total">
         </el-pagination>
       </div>
     </div>
@@ -52,111 +53,59 @@
 </template>
 
 <script>
+import api from '../../server/home'
 export default {
   components: {},
   data () {
     return {
-      dates: '',
+      dates: [],
       searchText: '',
-      userList: [
-        {
-          img:
-            'https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/home/make.png',
-          name: '张三',
-          phone: 4556455645,
-          ts: '2022.04.15  14:30-16:30',
-          status: '标签信息未填写'
-        },
-        {
-          img:
-            'https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/home/make.png',
-          name: '张三',
-          phone: 4556455645,
-          ts: '2022.04.15  14:30-16:30',
-          status: '标签信息未填写'
-        },
-        {
-          img:
-            'https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/home/make.png',
-          name: '张三',
-          phone: 4556455645,
-          ts: '2022.04.15  14:30-16:30',
-          status: '标签信息未填写'
-        },
-        {
-          img:
-            'https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/home/make.png',
-          name: '张三',
-          phone: 4556455645,
-          ts: '2022.04.15  14:30-16:30',
-          status: '标签信息未填写'
-        },
-        {
-          img:
-            'https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/home/make.png',
-          name: '张三',
-          phone: 4556455645,
-          ts: '2022.04.15  14:30-16:30',
-          status: '标签信息未填写'
-        },
-        {
-          img:
-            'https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/home/make.png',
-          name: '张三',
-          phone: 4556455645,
-          ts: '2022.04.15  14:30-16:30',
-          status: '标签信息未填写'
-        },
-        {
-          img:
-            'https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/home/make.png',
-          name: '张三',
-          phone: 4556455645,
-          ts: '2022.04.15  14:30-16:30',
-          status: '标签信息未填写'
-        },
-        {
-          img:
-            'https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/home/make.png',
-          name: '张三',
-          phone: 4556455645,
-          ts: '2022.04.15  14:30-16:30',
-          status: '标签信息未填写'
-        },
-        {
-          img:
-            'https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/home/make.png',
-          name: '张三',
-          phone: 4556455645,
-          ts: '2022.04.15  14:30-16:30',
-          status: '标签信息未填写'
-        },
-        {
-          img:
-            'https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/home/make.png',
-          name: '张三',
-          phone: 4556455645,
-          ts: '2022.04.15  14:30-16:30',
-          status: '标签信息未填写'
-        }
-      ],
-      currentPage1: 2
+      userList: [],
+      currentPage1: 1,
+      limit: 10,
+      total: 0,
     }
   },
   computed: {},
   watch: {},
 
   methods: {
+    getSkinList () {
+      let start_date = '', end_date = ''
+      if (this.dates && this.dates.length > 0) {
+        start_date = utils.formatTime(this.dates[0], 'yyyy-MM-dd')
+        end_date = utils.formatTime(this.dates[1], 'yyyy-MM-dd')
+      }
+      console.log(start_date, end_date, 'end_date');
+      let params = {
+        page: this.currentPage1,
+        limit: this.limit,
+        keywords: this.searchText,
+        start_date: start_date,
+        end_date: end_date,
+      }
+      api.getSkinList(params).then(res => {
+        if (res.code == 200) {
+          this.userList = res.data.list
+          this.total = res.data.total
+        }
+      })
+    },
     onDetails () {
       this.$router.push({
         path: '/testSkin/details'
       })
     },
-    handleCurrentChange () { },
-    handleSizeChange () { }
+    handleCurrentChange (e) {
+      this.currentPage1 = e
+      this.getSkinList
+      console.log(e, 'eeeeee');
+    }
   },
 
-  created () { },
+  created () {
+    this.getSkinList()
+  },
 
   mounted () { }
 }

src/router/map/home.js

@@ -16,7 +16,7 @@ import Coupon from '@/pages/coupon/index'
 import projectOrder from '@/pages/customerMan/myOrder'
 
 export default {
-  path: '/',
+  path: '/layout',
   name: '首页',
   component: layout,
   children: [

src/router/map/login.js

@@ -1,8 +1,13 @@
 // 登录
 export default [
-	{	
-		path: '/login',
-		name: 'login',
-		component: () => import('@/pages/login/login.vue') 
-	}
+  {
+    path: '/',
+    name: 'login',
+    component: () => import('@/pages/login/login.vue')
+  },
+  {
+    path: '/login',
+    name: 'login',
+    component: () => import('@/pages/login/login.vue')
+  }
 ]

src/server/home.js

@@ -3,14 +3,26 @@
 import url from './urls'
 
 export default class Home {
-	/**
-	 * @描述  1.1	获取用户信息
-	 */
-	static getUserMess(parms) {
-		return $http.post(url.getUserMess,parms);
-    }
+  /**
+   * @描述  1.1	获取用户信息
+   */
+  static getToken (parms) {
+    return $http.post(url.getToken, parms);
+  }
+
+  static getTotal (parms) {
+    return $http.get(url.getTotal, parms);
+  }
+
+  static getToday (parms) {
+    return $http.get(url.getToday, parms);
+  }
+
+  static getSkinList (parms) {
+    return $http.get(url.getSkinList, parms);
+  }
 }
 
- 
- 
+
+
 

src/server/urls.js

@@ -1,5 +1,10 @@
 export default {
-	//登录
-	getsskey: '/sport/get_session_key',
-	getUserMess: '/enterprise/check_user_auth'
+  //登录
+  getToken: '/v2/pad/login',
+  //首页数据
+  getTotal:'/v2/pad/home/total',
+  //今日订单列表
+  getToday:'/v2/pad/order/today',
+  //测肤记录列表
+  getSkinList:'/v2/pad/skin/list',
 }

src/store/modules/comVal.js

@@ -1,5 +1,6 @@
 const state = {
-  name: 666
+  name: 666,
+  token: null
 }
 
 const actions = {