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/errorHandler.js

@@ -1,38 +1,38 @@
 import Vue from 'vue'
-import {logFlag} from '@/config/env'
-export default () =>{
-    const errorHandler = (err, vm, info) => {
-        // `info` 是 Vue 特定的错误信息，比如错误所在的生命周期钩子
-        let compName = "";
-        if (vm) {
-            compName = _formatComponentName(vm);
-            compName = compName.replace(/\\/g, "/");
-        }
-        let obj = {
-            component: compName, 
-            hook: info, 
-            err_msg: err + ''
-        }
-        let hosts = location.host;
-        if((hosts.indexOf("localhost") > -1 || hosts.indexOf("test") > -1)){
-            console.table(obj);
-        }
-        tool.$throwJS(obj);
+import { logFlag } from '@/config/env'
+export default () => {
+  const errorHandler = (err, vm, info) => {
+    // `info` 是 Vue 特定的错误信息，比如错误所在的生命周期钩子
+    let compName = "";
+    if (vm) {
+      compName = _formatComponentName(vm);
+      compName = compName.replace(/\\/g, "/");
     }
-    Vue.config.errorHandler = errorHandler;
+    let obj = {
+      component: compName,
+      hook: info,
+      err_msg: err + ''
+    }
+    let hosts = location.host;
+    if ((hosts.indexOf("localhost") > -1 || hosts.indexOf("test") > -1)) {
+      console.table(obj);
+    }
+    tool.$throwJS(obj);
+  }
+  Vue.config.errorHandler = errorHandler;
 }
 
 //获取当前组件的路径
-function _formatComponentName(vm) {
-    if (vm.$root === vm) return 'root';
-    let name = vm._isVue
-        ? (vm.$options && vm.$options.name) ||
-        (vm.$options && vm.$options._componentTag)
-        : vm.name;
-    return (
-        (name ? 'component <' + name + '>' : 'anonymous component') +
-        (vm._isVue && vm.$options && vm.$options.__file
-            ? ' at ' + (vm.$options && vm.$options.__file)
-            : '')
-    );
+function _formatComponentName (vm) {
+  if (vm.$root === vm) return 'root';
+  let name = vm._isVue
+    ? (vm.$options && vm.$options.name) ||
+    (vm.$options && vm.$options._componentTag)
+    : vm.name;
+  return (
+    (name ? 'component <' + name + '>' : 'anonymous component') +
+    (vm._isVue && vm.$options && vm.$options.__file
+      ? ' at ' + (vm.$options && vm.$options.__file)
+      : '')
+  );
 }

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/index.js

@@ -1,11 +1,11 @@
 // 全局注入 
-import { injectTool } from './tool'
+// import { injectTool } from './tool'
 import injectHttp from './http'
-import errorLog from './errorHandler.js'
+// import errorLog from './errorHandler.js'
 import utils from './utils'
 
 export const injectGlobal = () => {
-  injectTool();
+  // injectTool();
   injectHttp();
   utils()
   // errorLog();

src/common/utils.js

@@ -1,7 +1,30 @@
 // 自定义全局方法封装
 const utils = {
+  userInfo:{
+    
+  },
   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/components/common/layout/layout.vue

@@ -12,11 +12,11 @@
                alt=""></div>
         <div class="left"
              v-if="menuIndex==0">
-          <div class="address">JOLIJOLI（西安）</div>
+          <div class="address">{{userInfo.store_name}}</div>
         </div>
         <div class="right">
           <div class="news"><img src="https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/home/news.png"></div>
-          <div class="head-img"><img src="https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/home/cancelOrder.png"></div>
+          <div class="head-img"><img :src="userInfo.avatar_url"></div>
         </div>
       </header>
       <div class="main-wrapper">
@@ -29,7 +29,6 @@
 <script type="text/javascript">
 import leftMenu from './leftMenu'
 import api from '@/server/home'
-import { mapState } from 'vuex'
 
 export default {
   data () {
@@ -37,26 +36,27 @@ export default {
       isFold: false,    //导航菜单面板是否折叠
       userId: 0,
       menuIndex: 0,
-      isback: false
+      isback: false,
+      userInfo: {
+        name: '333'
+      }
     }
   },
   created () {
-    this.initData();
+    this.getUserInfo()
   },
   components: {
     leftMenu,
   },
   methods: {
-    initData () {
-      let sskey = tool.getYdUserKey("session_key");
-      let userId = tool.getYdUserKey('user_id');
-      let enterprise_id = tool.getYdUserKey('enterprise_id');
-      if (!userId || !sskey) {
-        tool.toLogin();
-        return;
-      }
-      this.userId = userId;
-      // this.$router.replace('/home');
+    getUserInfo () {
+      let that = this
+      api.getUserInfo().then(res => {
+        if (res.code == 200) {
+          this.userInfo = res.data
+
+        }
+      })
     },
     loginOut () {
       let keys = document.cookie.match(/[^ =;]+(?=\=)/g);
@@ -64,7 +64,6 @@ export default {
         for (let i = keys.length; i--;)
           document.cookie = keys[i] + '=0;expires=' + new Date(0).toUTCString()
       }
-      tool.toLogin();
     },
     changeMenu (index) {
       this.menuIndex = index
@@ -74,7 +73,6 @@ export default {
     }
   },
   computed: {
-    ...mapState(['user']),
     routerItems () {
       let resultArr = [];
       let routeNow = this.$route;

src/components/common/layout/leftMenu.vue

@@ -37,6 +37,7 @@
 
 <script>
 // import memberLogic from '@/server/memberLogic.js'
+
 export default {
   props: ['isCollapse'],
   data () {
@@ -96,6 +97,7 @@ export default {
     })
   },
   methods: {
+
     handleSelect (index, item) {
       this.nowIndex = index
       this.$router.push({

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/confirmOrder/details/index.vue

@@ -258,8 +258,8 @@
 </template>
 
 <script>
-import { lstat } from 'fs';
 import minePupop from '../../../components/minePupop/index.vue'
+import api from '../../../server/home'
 
 export default {
   components: { minePupop },
@@ -268,11 +268,6 @@ export default {
       select: 'https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/icon/coupon/select.png',
       unSelect: 'https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/icon/coupon/unSelect.png',
       userInfo: {
-        image: "https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/home/make.png",
-        name: '张三',
-        sex: '女',
-        age: '23',
-        skinType: '中性皮肤'
       },
       //面部标签
       lableList: [
@@ -466,7 +461,7 @@ export default {
           mini: 242
         }
       ],
-    
+
       couponList: [
         {
 
@@ -483,6 +478,7 @@ export default {
       isProject: false,//是否展示选择项目弹窗
       isTs: false,//是否展示选择时间弹窗
       isPore: false,//皮肤状态弹窗
+      id: 0,//订单id
     };
   },
   computed: {
@@ -491,6 +487,12 @@ export default {
   watch: {},
 
   methods: {
+    getOrderInfo () {
+      api.getOrderInfo({ id: this.id }).then(res => {
+        this.userInfo = res.data.user
+
+      })
+    },
     onOperation (index) {
       if (this.programmeList[index].onSelect) {
         this.$set(this.programmeList[index], 'onSelect', !this.programmeList[index].onSelect)
@@ -505,7 +507,11 @@ export default {
   },
 
   created () {
-
+    let id = this.$route.query.id
+    if (id) {
+      this.id = id
+    }
+    this.getOrderInfo()
   },
 
   mounted () {

src/pages/coupon/index.vue

@@ -1,179 +1,152 @@
 <template>
   <div class="mine">
     <div class="table">
-      <el-input class="search-input"
-                placeholder="请输入内容"
-                prefix-icon="el-icon-search"
-                size="mini"
-                v-model="searckItem">
-      </el-input>
+      <el-input
+        class="search-input"
+        placeholder="请输入内容"
+        prefix-icon="el-icon-search"
+        size="mini"
+        v-model="searckItem"
+      ></el-input>
       <div class="search-button">搜索</div>
       <div class="coupon">选择优惠券</div>
-      <el-select class="coupon-select"
-                 v-model="coupon"
-                 size="mini"
-                 placeholder="选择优惠券">
-        <el-option v-for="item in couponList"
-                   :key="item.value"
-                   :label="item.label"
-                   :value="item.value">
-        </el-option>
+      <el-select class="coupon-select" v-model="coupon" size="mini" placeholder="选择优惠券">
+        <el-option v-for="item in couponList" :key="item.id" :label="item.name" :value="item.id"></el-option>
       </el-select>
       <div class="num-tips">数量</div>
       <div class="coupon-num">
-        <div class="reduce"
-             @click="reduceNum">-</div>
+        <div class="reduce" @click="reduceNum">-</div>
         <div class="num">{{couponNum}}</div>
-        <div class="add"
-             @click="couponNum++">+</div>
+        <div class="add" @click="couponNum++">+</div>
       </div>
-      <div class="send-coupon"
-           style="margin-left: 39px;"
-           @click="sendCoupon">发送</div>
+      <div class="send-coupon" style="margin-left: 39px;" @click="sendCoupon">发送</div>
     </div>
     <div class="user-list">
-      <el-table ref="multipleTable"
-                :data="tableData"
-                tooltip-effect="dark"
-                height="454"
-                style="width: 100%;border-radius: 8px;"
-                @selection-change="handleSelectionChange">
-        <el-table-column type="selection"
-                         width="55">
-        </el-table-column>
-        <el-table-column label="头像"
-                         width="120">
+      <el-table
+        ref="multipleTable"
+        :data="tableData"
+        tooltip-effect="dark"
+        height="354"
+        style="width: 100%;border-radius: 8px;"
+        @selection-change="handleSelectionChange"
+      >
+        <el-table-column type="selection" width="55"></el-table-column>
+        <el-table-column label="头像" width="120">
           <template slot-scope="scope">
-            <div class="head-img"><img :src="scope.row.headImg"
-                   alt=""></div>
+            <div class="head-img">
+              <img :src="scope.row.avatar_url" alt />
+            </div>
           </template>
         </el-table-column>
-        <el-table-column prop="name"
-                         label="姓名"
-                         width="120">
-        </el-table-column>
-        <el-table-column prop="phone"
-                         label="联系电话"
-                         show-overflow-tooltip>
-        </el-table-column>
-        <el-table-column prop="date"
-                         label="注册时间"
-                         show-overflow-tooltip>
-        </el-table-column>
+        <el-table-column prop="nickname" label="昵称" width="120"></el-table-column>
+        <el-table-column prop="mobile" label="联系电话" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="create_time" label="注册时间" show-overflow-tooltip></el-table-column>
       </el-table>
+
+      <div class="pagin">
+        <el-pagination
+          background
+          layout="prev, pager, next"
+          @size-change="handleSizeChange"
+          @current-change="handleCurrentChange"
+          :current-page.sync="currentPage1"
+          :total="total"
+        ></el-pagination>
+      </div>
     </div>
   </div>
 </template>
 
 <script>
+import api from "../../server/home";
+
 export default {
   components: {},
-  data () {
+  data() {
     return {
-      searckItem: '',
-      couponList: [
-        {
-          value: '选项1',
-          label: '黄金糕'
-        }, {
-          value: '选项2',
-          label: '双皮奶'
-        }
-      ],
-      tableData: [{
-        date: '2022.04.25  14:30',
-        name: '滴滴滴',
-        headImg: 'https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/home/unpaid.png',
-        phone: '13346783645'
-      }, {
-        date: '2022.04.25  14:30',
-        name: '滴滴滴',
-        headImg: 'https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/home/unpaid.png',
-        phone: '13346783645'
-      }, {
-        date: '2022.04.25  14:30',
-        name: '滴滴滴',
-        headImg: 'https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/home/unpaid.png',
-        phone: '13346783645'
-      }, {
-        date: '2022.04.25  14:30',
-        name: '滴滴滴',
-        headImg: 'https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/home/unpaid.png',
-        phone: '13346783645'
-      }, {
-        date: '2022.04.25  14:30',
-        name: '滴滴滴',
-        headImg: 'https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/home/unpaid.png',
-        phone: '13346783645'
-      }, {
-        date: '2022.04.25  14:30',
-        name: '滴滴滴',
-        headImg: 'https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/home/unpaid.png',
-        phone: '13346783645'
-      }, {
-        date: '2022.04.25  14:30',
-        name: '滴滴滴',
-        headImg: 'https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/home/unpaid.png',
-        phone: '13346783645'
-      }, {
-        date: '2022.04.25  14:30',
-        name: '滴滴滴',
-        headImg: 'https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/home/unpaid.png',
-        phone: '13346783645'
-      }, {
-        date: '2022.04.25  14:30',
-        name: '滴滴滴',
-        headImg: 'https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/home/unpaid.png',
-        phone: '13346783645'
-      }, {
-        date: '2022.04.25  14:30',
-        name: '滴滴滴',
-        headImg: 'https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/home/unpaid.png',
-        phone: '13346783645'
-      }, {
-        date: '2022.04.25  14:30',
-        name: '滴滴滴',
-        headImg: 'https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/home/unpaid.png',
-        phone: '13346783645'
-      }, {
-        date: '2022.04.25  14:30',
-        name: '滴滴滴',
-        headImg: 'https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/home/unpaid.png',
-        phone: '13346783645'
-      }, {
-        date: '2022.04.25  14:30',
-        name: '滴滴滴',
-        headImg: 'https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/home/unpaid.png',
-        phone: '13346783645'
-      },
-      ],
-      multipleSelection: [],//选中的列表
-      coupon: '',
-      couponNum: 1,//优惠券数量
+      searckItem: "",
+      couponList: [],
+      tableData: [],
+      multipleSelection: [], //选中的列表
+      coupon: "",
+      couponNum: 1, //优惠券数量
+      currentPage1: 1
     };
   },
   computed: {},
   watch: {},
 
   methods: {
-    reduceNum () {
-      this.couponNum > 1 ? this.couponNum-- : this.couponNum = 1
+    reduceNum() {
+      this.couponNum > 1 ? this.couponNum-- : (this.couponNum = 1);
     },
-    handleSelectionChange (val) {
+    handleSelectionChange(val) {
       this.multipleSelection = val;
+      console.log(this.multipleSelection);
+    },
+    // 发送优惠券
+    sendCoupon() {
+      console.log(this.coupon);
+      let selectIds = "";
+      for (let i = 0; i < this.multipleSelection.length; i++) {
+        selectIds = selectIds + ","+this.multipleSelection[i].id;
+      }
+      let params = {
+        id: this.coupon,
+        user_ids: selectIds.substring(1,selectIds.length),
+        num: this.couponNum
+      };
+      api.sendCoupon(params).then(res => {});
+    },
+
+    // 获取订单列表
+    getUserList() {
+      console.log("xxxxxxx");
+      let params = {
+        page: this.currentPage1,
+        limit: this.limit,
+        keywords: this.searchText
+      };
+      api.getUserList(params).then(res => {
+        if (res.code == 200) {
+          this.tableData = res.data.list;
+          this.total = res.data.total;
+        }
+      });
     },
-    sendCoupon () { },
-  },
 
-  created () {
+    // 获取优惠券列表
+    getCouponInfo() {
+      console.log("xxxxxxx");
+      let params = {
+        page: this.currentPage1,
+        limit: 100
+      };
+      api.getCouponInfo(params).then(res => {
+        if (res.code == 200) {
+          this.couponList = res.data.list;
+        }
+      });
+    },
 
-  },
+    handleCurrentChange(e) {
+      this.currentPage1 = e;
+      this.getUserList();
+      console.log(e, "eeeeee");
+    },
 
-  mounted () {
+    handleSizeChange(val) {
+      console.log(`每页 ${val} 条`);
+    }
+  },
 
+  created() {
+    this.getUserList();
+    this.getCouponInfo();
   },
-}
 
+  mounted() {}
+};
 </script>
 
 <style lang='less' scoped>
@@ -252,6 +225,12 @@ export default {
         height: 100%;
       }
     }
+    .pagin {
+      padding: 20px 0;
+      .el-pagination {
+        text-align: center;
+      }
+    }
     /deep/ .el-table th > .cell {
       font-size: 14px !important;
       font-family: PingFangSC-Regular, PingFang SC;

src/pages/customerMan/details/index.vue

@@ -2,235 +2,303 @@
   <div class="mine">
     <div class="left">
       <div class="user-info">
-        <div class="user-img"><img :src="userInfo.image"
-               alt=""></div>
+        <div class="user-img">
+          <img :src="userInfo.image" alt />
+        </div>
         <div class="user-span">
-          <div class="name">昵称：<span>{{userInfo.name}}</span></div>
-          <div class="sex">性别：<span>{{userInfo.sex}}</span></div>
-          <div class="age">肤龄：<span>{{userInfo.age}}</span></div>
-          <div class="skin-type">肤质：<span>{{userInfo.skinType}}</span></div>
+          <div class="name">
+            昵称：
+            <span>{{userInfo.name}}</span>
+          </div>
+          <div class="sex">
+            性别：
+            <span>{{userInfo.sex}}</span>
+          </div>
+          <div class="age">
+            肤龄：
+            <span>{{userInfo.age}}</span>
+          </div>
+          <div class="skin-type">
+            肤质：
+            <span>{{userInfo.skinType}}</span>
+          </div>
         </div>
-        
       </div>
       <div class="personage-data">
-           <div class="myDataList">肌肤得分：<span class="bigSixe">56分</span></div>
-          <div class="myDataList">皮肤状态：<span>肤质一般</span></div>
-          <div class="myDataList">上传检测时间：<span>2022.0418 16:04</span></div>
-          <div class="myDataList">出生日期：<span>2000.02.29</span></div>
-          <div class="myDataList">联系电话：<span>13334597987</span></div>
-
-          <div class="myDataList">所在地：<span>广东省，深圳市，南山区</span></div>
-
-          <div class="myDataList">开卡店铺：<span>JOLIJOLI(西安店)</span></div>
+        <div class="myDataList">
+          肌肤得分：
+          <span class="bigSixe">56分</span>
+        </div>
+        <div class="myDataList">
+          皮肤状态：
+          <span>肤质一般</span>
+        </div>
+        <div class="myDataList">
+          上传检测时间：
+          <span>2022.0418 16:04</span>
+        </div>
+        <div class="myDataList">
+          出生日期：
+          <span>2000.02.29</span>
+        </div>
+        <div class="myDataList">
+          联系电话：
+          <span>13334597987</span>
+        </div>
 
-          <div class="myDataList">卡卷数量：<span>5</span></div>
+        <div class="myDataList">
+          所在地：
+          <span>广东省，深圳市，南山区</span>
+        </div>
 
-          <div class="myDataList">储值金额：<span class="JEcolor">￥<span class="bigSixe">500</span>.00</span></div>
-          <div class="myDataList">积分：<span>200</span></div>
+        <div class="myDataList">
+          开卡店铺：
+          <span>JOLIJOLI(西安店)</span>
+        </div>
 
+        <div class="myDataList">
+          卡卷数量：
+          <span>5</span>
+        </div>
 
+        <div class="myDataList">
+          储值金额：
+          <span class="JEcolor">
+            ￥
+            <span class="bigSixe">500</span>.00
+          </span>
+        </div>
+        <div class="myDataList">
+          积分：
+          <span>200</span>
+        </div>
       </div>
     </div>
-    <div class="right"> 
-       <div class="right-top">
-            <div class="right-top-data">
-                <div class="lable">
-                    <div class="lable-title">
-                        面诊标签
-                    </div>
-                    <div class="lable-list">
-                        <div v-for="(item,index) in lableList"
-                            :key="index"
-                            class='lable-info'>
-                        {{item.text}}
-                        </div>
-                    </div>
+    <div class="right">
+      <div class="right-top">
+        <div class="right-top-data">
+          <div class="lable">
+            <div class="lable-title">面诊标签</div>
+            <div class="lable-list">
+              <div v-for="(item,index) in lableList" :key="index" class="lable-info">{{item.text}}</div>
+            </div>
+          </div>
+          <div class="ps">
+            <div class="ps-title">备注</div>
+            <div class="ps-text">{{'富婆富婆富婆富婆富婆富婆富婆富婆富婆富婆富婆富婆富婆富婆富婆富婆富婆' | ellipsis(20)}}</div>
+          </div>
+        </div>
+        <div class="right-top-list" @click="toOrder(1)">
+          <div class="dataList">
+            <img :src="userInfo.image" />
+            <p>项目订单</p>
+            <span>19</span>
+          </div>
+          <div class="dataList" style="margin:18px 0px">
+            <img :src="userInfo.image" />
+            <p>项目订单</p>
+            <span>19</span>
+          </div>
+          <div class="dataList">
+            <img :src="userInfo.image" />
+            <p>项目订单</p>
+            <span>19</span>
+          </div>
+        </div>
+      </div>
+      <div class="right-bottom">
+        <div class="programme">
+          <div class="tab">
+            <div class="tab-title">执行方案</div>
+          </div>
+          <div class="programme-list">
+            <div
+              :class="['programme-info',item.onSelect?'programme-active':'']"
+              v-for="(item,index) in programmeList"
+              :key="index"
+              @click="onOperation(index)"
+            >
+              <div class="programme-left">
+                <div class="programme-img">
+                  <img
+                    src="https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/home/make.png"
+                    alt
+                  />
                 </div>
-                <div class="ps">
-                    <div class="ps-title">
-                        备注
-                    </div>
-                    <div class="ps-text">{{'富婆富婆富婆富婆富婆富婆富婆富婆富婆富婆富婆富婆富婆富婆富婆富婆富婆' | ellipsis(20)}}</div>
-                    </div>
-            </div>  
-            <div class="right-top-list" @click="toOrder(1)">
-                <div class="dataList">
-                    <img :src="userInfo.image">
-                    <p>项目订单</p>
-                    <span>19</span>
+                <div class="programme-tips">
+                  <div class="tips-title">{{'【清洁补水】华熙智慧…'|ellipsis(9)}}</div>
+                  <div class="tips-title">{{'美白、祛痘、抗皱'|ellipsis(9)}}</div>
+                  <div class="tips-title">
+                    仪器：
+                    <span>{{'无创水光'|ellipsis(9)}}</span>
+                  </div>
                 </div>
-                <div class="dataList" style="margin:18px 0px">
-                     <img :src="userInfo.image">
-                    <p>项目订单</p>
-                    <span>19</span>
+              </div>
+              <div class="programme-right">
+                <div class="frequency">
+                  执行频率：
+                  <span>一周一次</span>
                 </div>
-                <div class="dataList">
-                     <img :src="userInfo.image">
-                    <p>项目订单</p>
-                    <span>19</span>
+                <div class="duration">
+                  持续时长：
+                  <span>28天</span>
                 </div>
-            </div>
-       </div>
-       <div class="right-bottom">
-           <div class="programme">
-        <div class="tab">
-          <div class="tab-title">执行方案</div>
-        </div>
-        <div class="programme-list">
-          <div :class="['programme-info',item.onSelect?'programme-active':'']"
-               v-for="(item,index) in programmeList"
-               :key="index"
-               @click="onOperation(index)">
-            <div class="programme-left">
-              <div class="programme-img"><img src="https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/home/make.png"
-                     alt=""></div>
-              <div class="programme-tips">
-                <div class="tips-title">{{'【清洁补水】华熙智慧…'|ellipsis(9)}}</div>
-                <div class="tips-title">{{'美白、祛痘、抗皱'|ellipsis(9)}}</div>
-                <div class="tips-title">仪器：<span>{{'无创水光'|ellipsis(9)}}</span></div>
               </div>
-            </div>
-            <div class="programme-right">
-              <div class="frequency">执行频率：<span>一周一次</span></div>
-              <div class="duration">持续时长：<span>28天</span></div>
-            </div>
-            <div class="operation"
-                 v-if="item.onSelect">
-              <div class="edit">编辑</div>
-              <div class="delete">删除</div>
+              <div class="operation" v-if="item.onSelect">
+                <div class="edit">编辑</div>
+                <div class="delete">删除</div>
+              </div>
             </div>
           </div>
         </div>
       </div>
-       </div>
     </div>
-      
   </div>
 </template>
 
 <script>
+import api from "../../../server/home";
 
 export default {
-  data () {
+  data() {
     return {
       userInfo: {
-        image: "https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/home/make.png",
-        name: '张三',
-        sex: '女',
-        age: '23',
-        skinType: '中性皮肤'
+        image:
+          "https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/home/make.png",
+        name: "张三",
+        sex: "女",
+        age: "23",
+        skinType: "中性皮肤"
       },
       //面部标签
       lableList: [
         {
-          text: '对话框的',
+          text: "对话框的",
           disabled: false
         },
         {
-          text: '对话框的',
+          text: "对话框的",
           disabled: true
         },
         {
-          text: '对话框的',
+          text: "对话框的",
           disabled: false
         },
         {
-          text: '对话框的',
+          text: "对话框的",
           disabled: false
         },
         {
-          text: '对话框的',
+          text: "对话框的",
           disabled: false
-        },
-       
+        }
       ],
       //执行方案
       programmeList: [
         {
-          image: 'https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/home/make.png',
-          title: '水氧活肤华熙智慧玻尿酸基水氧活肤华熙智慧玻尿酸基底',
-          tips: '+润百颜精华',
-          zoom: '皮肤综合仪（30号房）',
-          ts: '30分钟',
-          price: '79.00'
+          image:
+            "https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/home/make.png",
+          title: "水氧活肤华熙智慧玻尿酸基水氧活肤华熙智慧玻尿酸基底",
+          tips: "+润百颜精华",
+          zoom: "皮肤综合仪（30号房）",
+          ts: "30分钟",
+          price: "79.00"
         },
         {
-          image: 'https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/home/make.png',
-          title: '水氧活肤华熙智慧玻尿酸基水氧活肤华熙智慧玻尿酸基底',
-          tips: '+润百颜精华',
-          zoom: '皮肤综合仪（30号房）',
-          ts: '30分钟',
-          price: '79.00'
+          image:
+            "https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/home/make.png",
+          title: "水氧活肤华熙智慧玻尿酸基水氧活肤华熙智慧玻尿酸基底",
+          tips: "+润百颜精华",
+          zoom: "皮肤综合仪（30号房）",
+          ts: "30分钟",
+          price: "79.00"
         },
         {
-          image: 'https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/home/make.png',
-          title: '水氧活肤华熙智慧玻尿酸基水氧活肤华熙智慧玻尿酸基底',
-          tips: '+润百颜精华',
-          zoom: '皮肤综合仪（30号房）',
-          ts: '30分钟',
-          price: '79.00'
-        },
+          image:
+            "https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/home/make.png",
+          title: "水氧活肤华熙智慧玻尿酸基水氧活肤华熙智慧玻尿酸基底",
+          tips: "+润百颜精华",
+          zoom: "皮肤综合仪（30号房）",
+          ts: "30分钟",
+          price: "79.00"
+        }
       ],
       //项目列表
-      projectList: [{
-        value: '选项1',
-        label: '黄金糕'
-      }, {
-        value: '选项2',
-        label: '双皮奶'
-      }, {
-        value: '选项3',
-        label: '蚵仔煎'
-      }, {
-        value: '选项4',
-        label: '龙须面'
-      }, {
-        value: '选项5',
-        label: '北京烤鸭'
-      }],
-      timesInfo: '',
-      projectInfo: '',
-      weekInfo: '',
-      programmeIndex: '',
-      remarks: '',
+      projectList: [
+        {
+          value: "选项1",
+          label: "黄金糕"
+        },
+        {
+          value: "选项2",
+          label: "双皮奶"
+        },
+        {
+          value: "选项3",
+          label: "蚵仔煎"
+        },
+        {
+          value: "选项4",
+          label: "龙须面"
+        },
+        {
+          value: "选项5",
+          label: "北京烤鸭"
+        }
+      ],
+      timesInfo: "",
+      projectInfo: "",
+      weekInfo: "",
+      programmeIndex: "",
+      remarks: "",
       isPupop: false
     };
   },
-  computed: {
-
-  },
+  computed: {},
   watch: {},
 
   methods: {
-    onOperation (index) {
+    getUserInfo() {
+      api.getUserInfo({ code: this.id }).then(res => {
+        this.userInfo = res.data.user;
+        this.order_data = res.data.order_data;
+        this.lableList = res.data.tags;
+        this.programmeList = res.data.order_data.project_list;
+        this.coupon_list = res.data.order_data.coupon_list;
+        this.remarks = res.data.remark;
+      });
+    },
+
+    onOperation(index) {
       if (this.programmeList[index].onSelect) {
-        this.$set(this.programmeList[index], 'onSelect', !this.programmeList[index].onSelect)
+        this.$set(
+          this.programmeList[index],
+          "onSelect",
+          !this.programmeList[index].onSelect
+        );
       } else {
-        this.$set(this.programmeList[index], 'onSelect', true)
+        this.$set(this.programmeList[index], "onSelect", true);
       }
     },
-    toOrder(index){
-        if(index === 1){
-           this.$router.push({
-            path: '/customerMan/projectOrder'
-            })
-        }
-    },
-    onSubmit () {
-
+    toOrder(index) {
+      if (index === 1) {
+        this.$router.push({
+          path: "/customerMan/projectOrder"
+        });
+      }
     },
-    submitFrequency () { },
-  },
-
-  created () {
-
+    onSubmit() {},
+    submitFrequency() {}
   },
 
-  mounted () {
-
+  created() {
+    let id = this.$route.query.id;
+    this.id = id;
+    this.getUserInfo();
   },
-}
 
+  mounted() {}
+};
 </script>
 
 <style lang='less' scoped>
@@ -262,14 +330,14 @@ export default {
       }
       .user-span {
         margin-left: 12px;
-        .sex{
-            margin-top: 8px;
+        .sex {
+          margin-top: 8px;
         }
-         .age{
-            margin-top: 8px;
+        .age {
+          margin-top: 8px;
         }
-         .skin-type{
-            margin-top: 8px;
+        .skin-type {
+          margin-top: 8px;
         }
 
         span {
@@ -277,232 +345,229 @@ export default {
         }
       }
     }
-    .personage-data{
-        margin-top: 30px;
-        .myDataList{
-          margin-top: 15px;
-          .bigSixe{
-              font-size: 18px;
-              color: #FA7D22;
-          }
-          span{
-             color: #333333;
-          }
-          .JEcolor{
-              color: #FA7D22;
-          }
+    .personage-data {
+      margin-top: 30px;
+      .myDataList {
+        margin-top: 15px;
+        .bigSixe {
+          font-size: 18px;
+          color: #fa7d22;
+        }
+        span {
+          color: #333333;
         }
+        .JEcolor {
+          color: #fa7d22;
+        }
+      }
     }
-  }  
- 
+  }
+
   .right {
     margin-left: 18px;
     position: relative;
     flex: 1;
-    .right-top{
-        height: 205px;
-        // border: 1px solid red;
+    .right-top {
+      height: 205px;
+      // border: 1px solid red;
+      display: flex;
+      .right-top-list {
+        width: 239ppx;
+        margin-left: 18px;
         display: flex;
-        .right-top-list{
-            width: 239ppx;
-            margin-left: 18px;
-            display: flex;
-            flex-direction: column;
-            .dataList{
-                height: 56px;
-                // width: 239ppx;
-                background: #ffffff;
-                box-shadow: 0px 2px 4px 0px rgba(184, 191, 198, 0.2);
-                border-radius: 8px;
-                padding: 16px 12px 12px 12px;
-                display: flex;
-                align-items: center;
-                img{
-                    width: 33px;
-                    height: 33px;
-                }
-                p{
-                    font-size: 14px;
-                    margin-left:14px;
-                    margin-right: 80px;
-                }
-                span{
-                    font-size: 16px;
-                    margin-right: 20px;
-                }
-            }
-
+        flex-direction: column;
+        .dataList {
+          height: 56px;
+          // width: 239ppx;
+          background: #ffffff;
+          box-shadow: 0px 2px 4px 0px rgba(184, 191, 198, 0.2);
+          border-radius: 8px;
+          padding: 16px 12px 12px 12px;
+          display: flex;
+          align-items: center;
+          img {
+            width: 33px;
+            height: 33px;
+          }
+          p {
+            font-size: 14px;
+            margin-left: 14px;
+            margin-right: 80px;
+          }
+          span {
+            font-size: 16px;
+            margin-right: 20px;
+          }
         }
-        .right-top-data{
-            background: #ffffff;
-            box-shadow: 0px 2px 4px 0px rgba(184, 191, 198, 0.2);
-            border-radius: 8px;
-            padding: 16px 12px 12px 12px;
-            width: 310px;
-            height: 100%;
-            .lable {
-            //   margin-top: 23px;
-                width: 100%;
-                overflow: scroll;
-                background: #ffffff;
-            .lable-title {
+      }
+      .right-top-data {
+        background: #ffffff;
+        box-shadow: 0px 2px 4px 0px rgba(184, 191, 198, 0.2);
+        border-radius: 8px;
+        padding: 16px 12px 12px 12px;
+        width: 310px;
+        height: 100%;
+        .lable {
+          //   margin-top: 23px;
+          width: 100%;
+          overflow: scroll;
+          background: #ffffff;
+          .lable-title {
             font-size: 14px;
             font-family: PingFangSC-Medium, PingFang SC;
             font-weight: 500;
             color: #333333;
             line-height: 20px;
             margin-bottom: 14px;
-            }
-            .lable-list {
+          }
+          .lable-list {
             width: 100%;
             min-height: 105rpx;
             .lable-info {
-                display: inline-block;
-                padding: 0 12px;
-                margin-left: 10px;
-                height: 24px;
-                line-height: 24px;
-                border-radius: 2px;
-                border: 1px solid #d6d6d6;
-                margin-bottom: 10px;
+              display: inline-block;
+              padding: 0 12px;
+              margin-left: 10px;
+              height: 24px;
+              line-height: 24px;
+              border-radius: 2px;
+              border: 1px solid #d6d6d6;
+              margin-bottom: 10px;
             }
             .add-lable {
-                display: inline-block;
-                width: 27px;
-                height: 24px;
-                line-height: 24px;
-                font-size: 12px;
-                font-family: PingFang-SC-Regular, PingFang-SC;
-                font-weight: 400;
-                color: #333333;
-                text-align: center;
-                margin-left: 10px;
-                border-radius: 2px;
-                border: 1px solid #d6d6d6;
-            }
+              display: inline-block;
+              width: 27px;
+              height: 24px;
+              line-height: 24px;
+              font-size: 12px;
+              font-family: PingFang-SC-Regular, PingFang-SC;
+              font-weight: 400;
+              color: #333333;
+              text-align: center;
+              margin-left: 10px;
+              border-radius: 2px;
+              border: 1px solid #d6d6d6;
             }
-            .remarks {
+          }
+          .remarks {
             /deep/ .el-textarea__inner:focus {
-                border-color: #fa852f;
-            }
+              border-color: #fa852f;
             }
-    }
-    .ps {
-      font-size: 14px;
-      font-family: PingFangSC-Medium, PingFang SC;
-      font-weight: 500;
-      color: #333333;
-      line-height: 20px;
-      .ps-text {
-        margin-top: 10px;
-        font-size: 12px;
-        font-weight: 400;
-        color: #666666;
-        line-height: 17px;
-      }
-    }
+          }
         }
-    }
-   .right-bottom{
-      margin-top: 18px;
-      background: #ffffff;
-      box-shadow: 0px 2px 4px 0px rgba(184, 191, 198, 0.2);
-      border-radius: 8px;
-      padding: 16px 61px 12px 12px;
-      .programme {
-    //   margin-top: 20px;
-      width: 100%;
-      background: #ffffff;
-      border-radius: 8px;
-        
-      .tab {
-        display: flex;
-        align-items: center;
-        justify-content: space-between;
-        .tab-title {
+        .ps {
           font-size: 14px;
           font-family: PingFangSC-Medium, PingFang SC;
           font-weight: 500;
           color: #333333;
           line-height: 20px;
+          .ps-text {
+            margin-top: 10px;
+            font-size: 12px;
+            font-weight: 400;
+            color: #666666;
+            line-height: 17px;
+          }
         }
       }
-      .programme-list {
-        margin-top: 10px;
-        position: relative;
-        z-index: 1;
-        .programme-info {
-          position: relative;
-          margin-bottom: 10px;
-          border-radius: 4px;
-          border: 1px solid #f5f5f5;
+    }
+    .right-bottom {
+      margin-top: 18px;
+      background: #ffffff;
+      box-shadow: 0px 2px 4px 0px rgba(184, 191, 198, 0.2);
+      border-radius: 8px;
+      padding: 16px 61px 12px 12px;
+      .programme {
+        //   margin-top: 20px;
+        width: 100%;
+        background: #ffffff;
+        border-radius: 8px;
+
+        .tab {
           display: flex;
-          justify-content: space-between;
-          padding: 8px 8px 8px 10px;
           align-items: center;
-          .programme-left {
+          justify-content: space-between;
+          .tab-title {
+            font-size: 14px;
+            font-family: PingFangSC-Medium, PingFang SC;
+            font-weight: 500;
+            color: #333333;
+            line-height: 20px;
+          }
+        }
+        .programme-list {
+          margin-top: 10px;
+          position: relative;
+          z-index: 1;
+          .programme-info {
+            position: relative;
+            margin-bottom: 10px;
+            border-radius: 4px;
+            border: 1px solid #f5f5f5;
             display: flex;
+            justify-content: space-between;
+            padding: 8px 8px 8px 10px;
             align-items: center;
-            .programme-img {
-              width: 48px;
-              display: inline-block;
-              img {
-                width: 100%;
-                display: block;
+            .programme-left {
+              display: flex;
+              align-items: center;
+              .programme-img {
+                width: 48px;
+                display: inline-block;
+                img {
+                  width: 100%;
+                  display: block;
+                }
+              }
+              .programme-tips {
+                display: inline-block;
+                margin-left: 10px;
+                font-size: 10px;
+                font-family: PingFangSC-Regular, PingFang SC;
+                font-weight: 400;
+                color: #999999;
+                line-height: 14px;
+                zoom: 0.83;
               }
             }
-            .programme-tips {
-              display: inline-block;
-              margin-left: 10px;
-              font-size: 10px;
+            .programme-right {
+              font-size: 12px;
               font-family: PingFangSC-Regular, PingFang SC;
               font-weight: 400;
-              color: #999999;
-              line-height: 14px;
-              zoom: 0.83;
+              color: #333333;
+              line-height: 17px;
+              .duration {
+                margin-top: 14px;
+              }
             }
-          }
-          .programme-right {
-            font-size: 12px;
-            font-family: PingFangSC-Regular, PingFang SC;
-            font-weight: 400;
-            color: #333333;
-            line-height: 17px;
-            .duration {
-              margin-top: 14px;
+            .operation {
+              position: absolute;
+              left: 50%;
+              transform: translateX(-50%);
+              top: 10px;
+              z-index: 10;
+              width: 44px;
+              background: #ffffff;
+              box-shadow: 0px 9px 28px 8px rgba(0, 0, 0, 0.05),
+                0px 6px 16px 0px rgba(0, 0, 0, 0.08),
+                0px 3px 6px -4px rgba(0, 0, 0, 0.12);
+              border-radius: 2px;
+              padding: 10px;
+              font-size: 12px;
+              font-family: PingFangSC-Regular, PingFang SC;
+              font-weight: 400;
+              color: #333333;
+              line-height: 17px;
+              .delete {
+                margin-top: 20px;
+              }
             }
           }
-          .operation {
-            position: absolute;
-            left: 50%;
-            transform: translateX(-50%);
-            top: 10px;
-            z-index: 10;
-            width: 44px;
-            background: #ffffff;
-            box-shadow: 0px 9px 28px 8px rgba(0, 0, 0, 0.05),
-              0px 6px 16px 0px rgba(0, 0, 0, 0.08),
-              0px 3px 6px -4px rgba(0, 0, 0, 0.12);
-            border-radius: 2px;
-            padding: 10px;
-            font-size: 12px;
-            font-family: PingFangSC-Regular, PingFang SC;
-            font-weight: 400;
-            color: #333333;
-            line-height: 17px;
-            .delete {
-              margin-top: 20px;
-            }
+          .programme-active {
+            border: 1px solid #fa852f;
           }
         }
-        .programme-active {
-          border: 1px solid #fa852f;
-        }
       }
     }
-   }
-   
-
   }
 }
 </style>

src/pages/customerMan/index.vue

@@ -9,7 +9,7 @@
       </el-input>
       <el-button type="primary"
                  class="searchButton"
-                 @click="search">搜索</el-button>
+                 @click="getUserList()">搜索</el-button>
     </div>
 
     <div class="user-list">
@@ -22,19 +22,19 @@
         <el-table-column label="头像"
                          width="120">
           <template slot-scope="scope">
-            <div class="head-img"><img :src="scope.row.headImg"
+            <div class="head-img"><img :src="scope.row.avatar_url"
                    alt=""></div>
           </template>
         </el-table-column>
-        <el-table-column prop="name"
+        <el-table-column prop="nickname"
                          label="昵称"
                          width="120">
         </el-table-column>
-        <el-table-column prop="phone"
+        <el-table-column prop="mobile"
                          label="联系电话"
                          show-overflow-tooltip>
         </el-table-column>
-        <el-table-column prop="date"
+        <el-table-column prop="create_time"
                          label="注册时间"
                          show-overflow-tooltip>
         </el-table-column>
@@ -46,7 +46,7 @@
                        @size-change="handleSizeChange"
                        @current-change="handleCurrentChange"
                        :current-page.sync="currentPage1"
-                       :total="1000">
+                       :total="total">
         </el-pagination>
       </div>
     </div>
@@ -54,6 +54,7 @@
 </template>
 
 <script>
+import api from "../../server/home";
 export default {
   components: {},
   data () {
@@ -70,22 +71,7 @@ export default {
           label: '双皮奶'
         }
       ],
-      tableData: [{
-        date: '2022.04.25  14:30',
-        name: '滴滴滴',
-        headImg: 'https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/home/unpaid.png',
-        phone: '13346783645',
-        status: '已完成'
-      },
-      {
-        date: '2022.04.25  14:30',
-        name: '滴滴滴',
-        headImg: 'https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/home/unpaid.png',
-        phone: '13346783645',
-        status: '已完成'
-      },
-
-      ],
+      tableData: [],
       currentPage1: 1,
       multipleSelection: ''
 
@@ -95,24 +81,47 @@ export default {
   watch: {},
 
   methods: {
-    search () { },
-    handleSizeChange (val) {
-      console.log(`每页 ${val} 条`);
+    
+  // 获取订单列表
+    getUserList() {
+      console.log("xxxxxxx");
+      let params = {
+        page: this.currentPage1,
+        limit: this.limit,
+        keywords: this.searchText,
+      };
+      api.getUserList(params).then(res => {
+        if (res.code == 200) {
+          this.tableData = res.data.list;
+          this.total = res.data.total;
+        }
+      });
     },
-    handleCurrentChange (val) {
-      console.log(`当前页: ${val}`);
+    
+    handleCurrentChange(e) {
+      this.currentPage1 = e;
+      this.getUserList();
+      console.log(e, "eeeeee");
     },
-    handleSelectionChange (row, column, event) {
-      this.$router.push({
-        path: '/customerMan/details'
-      })
+
+    handleSizeChange(val) {
+      console.log(`每页 ${val} 条`);
     },
+    handleSelectionChange(row, column, event) {
+      this.$router.push({
+        path: '/customerMan/details',
+        query: {
+          id: row.id
+        }
+      });
+    }
   },
 
-  created () {
-
+  created() {
+    this.getUserList();
   },
 
+
   mounted () {
 
   },

src/pages/historicalOrder/details/index.vue

@@ -2,71 +2,87 @@
   <div class="mine">
     <div class="left">
       <div class="user-info">
-        <div class="user-img"><img :src="userInfo.image"
-               alt=""></div>
+        <div class="user-img">
+          <img :src="userInfo.avatar_url" alt />
+        </div>
         <div class="user-span">
-          <div class="name">昵称：<span>{{userInfo.name}}</span></div>
-          <div class="sex">性别：<span>{{userInfo.sex}}</span></div>
-          <div class="age">肤龄：<span>{{userInfo.age}}</span></div>
-          <div class="skin-type">肤质：<span>{{userInfo.skinType}}</span></div>
+          <div class="name">
+            昵称：
+            <span>{{userInfo.nickname}}</span>
+          </div>
+          <div class="sex">
+            性别：
+            <span>{{userInfo.sex==1?'男':'女'}}</span>
+          </div>
+          <div class="age">
+            肤龄：
+            <span>{{userInfo.age}}</span>
+          </div>
+          <div class="skin-type">
+            肤质：
+            <span>{{userInfo.skin}}</span>
+          </div>
         </div>
       </div>
       <div class="user-record">
         <div class="fraction">
           <div class="title">肌肤得分</div>
-          <div class="num">37分</div>
+          <div class="num">{{userInfo.score}}分</div>
         </div>
         <div class="status">
           <div class="title">皮肤状态</div>
-          <div class="tips">肤质一般</div>
+          <div class="tips">{{userInfo.skin_status}}</div>
         </div>
         <div class="times">
           <div class="title">上传检测时间</div>
-          <div class="ts">2022.04.18 16:04</div>
+          <div class="ts">{{userInfo.check_time}}</div>
         </div>
       </div>
       <div class="lable">
-        <div class="lable-title">
-          面诊标签
-        </div>
+        <div class="lable-title">面诊标签</div>
         <div class="lable-list">
-          <div v-for="(item,index) in lableList"
-               :key="index"
-               class='lable-info'>
-            {{item.text}}
-          </div>
+          <div v-for="(item,index) in lableList" :key="index" class="lable-info">{{item.text}}</div>
         </div>
       </div>
       <div class="ps">
-        <div class="ps-title">
-          备注
-        </div>
-        <div class="ps-text">{{'富婆富婆富婆富婆富婆富婆富婆富婆富婆富婆富婆富婆富婆富婆富婆富婆富婆' | ellipsis(20)}}</div>
+        <div class="ps-title">备注</div>
+        <div class="ps-text">{{remarks | ellipsis(20)}}</div>
       </div>
       <div class="programme">
         <div class="tab">
           <div class="tab-title">执行方案</div>
         </div>
         <div class="programme-list">
-          <div :class="['programme-info',item.onSelect?'programme-active':'']"
-               v-for="(item,index) in programmeList"
-               :key="index"
-               @click="onOperation(index)">
+          <div
+            :class="['programme-info',item.onSelect?'programme-active':'']"
+            v-for="(item,index) in scheme_list"
+            :key="index"
+            @click="onOperation(index)"
+          >
             <div class="programme-left">
-              <div class="programme-img"><img src="https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/home/make.png"
-                     alt=""></div>
+              <div class="programme-img">
+                <img src="https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/home/make.png" alt />
+              </div>
               <div class="programme-tips">
                 <div class="tips-title">{{'【清洁补水】华熙智慧…'|ellipsis(9)}}</div>
                 <div class="tips-title">{{'美白、祛痘、抗皱'|ellipsis(9)}}</div>
-                <div class="tips-title">仪器：<span>{{'无创水光'|ellipsis(9)}}</span></div>
+                <div class="tips-title">
+                  仪器：
+                  <span>{{'无创水光'|ellipsis(9)}}</span>
+                </div>
               </div>
             </div>
             <div class="programme-right">
-              <div class="frequency">执行频率：<span>{{item.frequency}}</span></div>
-              <div class="duration">持续时长：<span>{{item.duration}}</span></div>
+              <div class="frequency">
+                执行频率：
+                <span>{{item.frequency}}</span>
+              </div>
+              <div class="duration">
+                持续时长：
+                <span>{{item.duration}}</span>
+              </div>
             </div>
-            <div class="operation"
-                 v-if="item.onSelect">
+            <div class="operation" v-if="item.onSelect">
               <div class="edit">编辑</div>
               <div class="delete">删除</div>
             </div>
@@ -76,26 +92,39 @@
     </div>
     <div class="right">
       <div class="shop-info">
-        <div class="shpo-name">预约店铺：<span>JOLIJOLI（西安店）</span></div>
-        <div class="shpo-address">门店地址：<span>JOLIJOLI（西安店）</span></div>
-        <div class="shpo-ts">美容时间：<span>JOLIJOLI（西安店）</span></div>
+        <div class="shpo-name">
+          预约店铺：
+          <span>{{order_data.store_name}}</span>
+        </div>
+        <div class="shpo-address">
+          门店地址：
+          <span>{{order_data.address}}</span>
+        </div>
+        <div class="shpo-ts">
+          美容时间：
+          <span>{{order_data.order_time}}</span>
+        </div>
       </div>
       <div class="project">
         <div class="project-title">
-          共<span>3个</span>项目
+          共
+          <span>{{order_data.project_num}}个</span>项目
         </div>
         <div class="project-list">
-          <div class="project-info"
-               v-for="(item,index) in programmeList"
-               :key="index">
-            <div class="project-image"><img :src="item.image"></div>
+          <div class="project-info" v-for="(item,index) in programmeList" :key="index">
+            <div class="project-image">
+              <img :src="item.cover_url" />
+            </div>
             <div class="project-content">
               <div class="title-price">
-                <div class="project-tit">{{item.title | ellipsis(14)}}</div>
-                <div class="project-price"><span class="min-size">￥</span>{{item.price}}</div>
+                <div class="project-tit">{{item.name | ellipsis(14)}}</div>
+                <div class="project-price">
+                  <span class="min-size">￥</span>
+                  {{item.price}}
+                </div>
               </div>
-              <div class="project-tips">{{item.tips}}</div>
-              <div class="project-zoom">{{item.zoom}}{{item.ts}}</div>
+              <div class="project-tips">{{item.product_names}}</div>
+              <div class="project-zoom">{{item.room}}{{item.use_time}}分钟</div>
             </div>
           </div>
         </div>
@@ -103,25 +132,33 @@
       <div class="cost">
         <div class="cost-title">
           <div>预约费用</div>
-          <div>¥399</div>
+          <div>¥{{order_data.original_price}}</div>
         </div>
         <div class="cost-coupon-list">
           <div class="coupon">
             <div class="coupon-tips">
-              <div class="coupon-icon"><img src="https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/icon/slices/couponIcon.png"
-                     alt=""></div>
+              <div class="coupon-icon">
+                <img
+                  src="https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/icon/slices/couponIcon.png"
+                  alt
+                />
+              </div>
               <div class="coupon-title">优惠卷</div>
               <div class="coupon-tip">已选推荐优惠</div>
             </div>
             <div class="on-icon">></div>
           </div>
-          <div class="coupon-ps">
-            <div>【敏感维稳】多元修护加乘维稳</div>
-            <div class="cou-price">-¥100</div>
+          <div class="coupon-ps" v-for="(item,index) in coupon_list" :key="index">
+            <div>{{item.coupon_name}}</div>
+            <div class="cou-price">-¥{{item.price}}</div>
           </div>
         </div>
         <div class="over-price">
-          合计： <span><span class="min-size">￥</span>399<span class="min-size">.00</span></span>
+          合计：
+          <span>
+            <span class="min-size">￥</span>{{order_data.price}}
+            <!-- <span class="min-size">.00</span> -->
+          </span>
         </div>
       </div>
     </div>
@@ -129,140 +166,160 @@
 </template>
 
 <script>
-
+import api from "../../../server/home";
 export default {
-  data () {
+  data() {
     return {
       userInfo: {
-        image: "https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/home/make.png",
-        name: '张三',
-        sex: '女',
-        age: '23',
-        skinType: '中性皮肤'
       },
-      //面部标签
-      lableList: [
-        {
-          text: '对话框的',
-          disabled: false
-        },
-        {
-          text: '对话框的',
-          disabled: true
-        },
-        {
-          text: '对话框的',
-          disabled: false
-        },
-        {
-          text: '对话框的',
-          disabled: false
-        },
-        {
-          text: '对话框的',
-          disabled: false
-        },
-        {
-          text: '对话框的',
-          disabled: false
-        },
-        {
-          text: '对话框的',
-          disabled: false
-        },
-        {
-          text: '对话框的',
-          disabled: false
-        },
-        {
-          text: '对话框的',
-          disabled: false
-        },
-        {
-          text: '对话框的',
-          disabled: false
-        },
-      ],
-      //执行方案
-      programmeList: [
-        {
-          image: 'https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/home/make.png',
-          title: '水氧活肤华熙智慧玻尿酸基水氧活肤华熙智慧玻尿酸基底',
-          tips: '+润百颜精华',
-          zoom: '皮肤综合仪（30号房）',
-          ts: '30分钟',
-          price: '79.00'
-        },
-        {
-          image: 'https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/home/make.png',
-          title: '水氧活肤华熙智慧玻尿酸基水氧活肤华熙智慧玻尿酸基底',
-          tips: '+润百颜精华',
-          zoom: '皮肤综合仪（30号房）',
-          ts: '30分钟',
-          price: '79.00'
-        },
-        {
-          image: 'https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/home/make.png',
-          title: '水氧活肤华熙智慧玻尿酸基水氧活肤华熙智慧玻尿酸基底',
-          tips: '+润百颜精华',
-          zoom: '皮肤综合仪（30号房）',
-          ts: '30分钟',
-          price: '79.00'
-        },
-      ],
-      //项目列表
-      projectList: [{
-        value: '选项1',
-        label: '黄金糕'
-      }, {
-        value: '选项2',
-        label: '双皮奶'
-      }, {
-        value: '选项3',
-        label: '蚵仔煎'
-      }, {
-        value: '选项4',
-        label: '龙须面'
-      }, {
-        value: '选项5',
-        label: '北京烤鸭'
-      }],
-      timesInfo: '',
-      projectInfo: '',
-      weekInfo: '',
-      programmeIndex: '',
-      remarks: '',
-      isPupop: false
+      lableList:{},
+      programmeList:{},
+      scheme_list:{},
+      // //面部标签
+      // lableList: [
+      //   {
+      //     text: "对话框的",
+      //     disabled: false
+      //   },
+      //   {
+      //     text: "对话框的",
+      //     disabled: true
+      //   },
+      //   {
+      //     text: "对话框的",
+      //     disabled: false
+      //   },
+      //   {
+      //     text: "对话框的",
+      //     disabled: false
+      //   },
+      //   {
+      //     text: "对话框的",
+      //     disabled: false
+      //   },
+      //   {
+      //     text: "对话框的",
+      //     disabled: false
+      //   },
+      //   {
+      //     text: "对话框的",
+      //     disabled: false
+      //   },
+      //   {
+      //     text: "对话框的",
+      //     disabled: false
+      //   },
+      //   {
+      //     text: "对话框的",
+      //     disabled: false
+      //   },
+      //   {
+      //     text: "对话框的",
+      //     disabled: false
+      //   }
+      // ],
+      // //执行方案
+      // programmeList: [
+      //   {
+      //     image:
+      //       "https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/home/make.png",
+      //     title: "水氧活肤华熙智慧玻尿酸基水氧活肤华熙智慧玻尿酸基底",
+      //     tips: "+润百颜精华",
+      //     zoom: "皮肤综合仪（30号房）",
+      //     ts: "30分钟",
+      //     price: "79.00"
+      //   },
+      //   {
+      //     image:
+      //       "https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/home/make.png",
+      //     title: "水氧活肤华熙智慧玻尿酸基水氧活肤华熙智慧玻尿酸基底",
+      //     tips: "+润百颜精华",
+      //     zoom: "皮肤综合仪（30号房）",
+      //     ts: "30分钟",
+      //     price: "79.00"
+      //   },
+      //   {
+      //     image:
+      //       "https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/home/make.png",
+      //     title: "水氧活肤华熙智慧玻尿酸基水氧活肤华熙智慧玻尿酸基底",
+      //     tips: "+润百颜精华",
+      //     zoom: "皮肤综合仪（30号房）",
+      //     ts: "30分钟",
+      //     price: "79.00"
+      //   }
+      // ],
+      // //项目列表
+      // projectList: [
+      //   {
+      //     value: "选项1",
+      //     label: "黄金糕"
+      //   },
+      //   {
+      //     value: "选项2",
+      //     label: "双皮奶"
+      //   },
+      //   {
+      //     value: "选项3",
+      //     label: "蚵仔煎"
+      //   },
+      //   {
+      //     value: "选项4",
+      //     label: "龙须面"
+      //   },
+      //   {
+      //     value: "选项5",
+      //     label: "北京烤鸭"
+      //   }
+      // ],
+      timesInfo: "",
+      projectInfo: "",
+      weekInfo: "",
+      programmeIndex: "",
+      remarks: "",
+      coupon_list:"",
+      order_data:"",
+      isPupop: false,
+      id:""
     };
   },
-  computed: {
-
-  },
+  computed: {},
   watch: {},
 
   methods: {
-    onOperation (index) {
+    getOrderInfo() {
+      api.getOrderInfo({ id: this.id }).then(res => {
+        this.userInfo = res.data.user;
+        this.order_data = res.data.order_data;
+        this.lableList = res.data.tags;
+        this.programmeList = res.data.order_data.project_list;
+        this.coupon_list = res.data.order_data.coupon_list;
+        this.remarks = res.data.remark;
+      });
+    },
+
+    onOperation(index) {
       if (this.programmeList[index].onSelect) {
-        this.$set(this.programmeList[index], 'onSelect', !this.programmeList[index].onSelect)
+        this.$set(
+          this.programmeList[index],
+          "onSelect",
+          !this.programmeList[index].onSelect
+        );
       } else {
-        this.$set(this.programmeList[index], 'onSelect', true)
+        this.$set(this.programmeList[index], "onSelect", true);
       }
     },
-    onSubmit () {
-
-    },
-    submitFrequency () { },
+    onSubmit() {},
+    submitFrequency() {}
   },
 
-  created () {
-
+  created() {
+    let id = this.$route.query.id;
+    this.id = id;
+    this.getOrderInfo();
   },
 
-  mounted () {
-
-  },
-}
-
+  mounted() {}
+};
 </script>
 
 <style lang='less' scoped>

src/pages/historicalOrder/index.vue

@@ -1,155 +1,183 @@
 <template>
   <div class="mine">
     <div class="condition">
-      <el-date-picker v-model="dates"
-                      type="daterange"
-                      range-separator="->"
-                      start-placeholder="开始日期"
-                      end-placeholder="结束日期">
-      </el-date-picker>
-      <el-select class="coupon-select"
-                 v-model="coupon"
-                 placeholder="项目名称">
-        <el-option v-for="item in couponList"
-                   :key="item.value"
-                   :label="item.label"
-                   :value="item.value">
-        </el-option>
+      <el-date-picker
+        v-model="dates"
+        type="daterange"
+        range-separator="->"
+        start-placeholder="开始日期"
+        end-placeholder="结束日期"
+      ></el-date-picker>
+      <el-select class="coupon-select" v-model="coupon" placeholder="项目名称">
+        <el-option
+          v-for="item in couponList"
+          :key="item.value"
+          :label="item.label"
+          :value="item.value"
+        ></el-option>
       </el-select>
-      <el-select class="coupon-select"
-                 v-model="coupon"
-                 placeholder="卡券名称">
-        <el-option v-for="item in couponList"
-                   :key="item.value"
-                   :label="item.label"
-                   :value="item.value">
-        </el-option>
+      <el-select class="coupon-select" v-model="coupon" placeholder="卡券名称">
+        <el-option
+          v-for="item in couponList"
+          :key="item.value"
+          :label="item.label"
+          :value="item.value"
+        ></el-option>
       </el-select>
 
-      <el-input placeholder="请输入内容"
-                class="search"
-                v-model="searchText">
-        <i slot="prefix"
-           class="el-input__icon el-icon-search"></i>
+      <el-input placeholder="请输入内容" class="search" v-model="searchText">
+        <i slot="prefix" class="el-input__icon el-icon-search"></i>
       </el-input>
-      <el-button type="primary"
-                 class="searchButton"
-                 @click="search">搜索</el-button>
+      <el-button type="primary" class="searchButton" @click="getOrderList()">搜索</el-button>
     </div>
 
     <div class="user-list">
-      <el-table ref="multipleTable"
-                :data="tableData"
-                tooltip-effect="dark"
-                height="354"
-                style="width: 100%;border-radius: 8px;"
-                @row-click="handleSelectionChange">
-        <el-table-column label="头像"
-                         width="120">
+      <el-table
+        ref="multipleTable"
+        :data="tableData"
+        tooltip-effect="dark"
+        height="354"
+        style="width: 100%;border-radius: 8px;"
+        @row-click="handleSelectionChange"
+      >
+        <el-table-column label="头像" width="120">
           <template slot-scope="scope">
-            <div class="head-img"><img :src="scope.row.headImg"
-                   alt=""></div>
+            <div class="head-img">
+              <img :src="scope.row.avatar_url" alt />
+            </div>
           </template>
         </el-table-column>
-        <el-table-column prop="name"
-                         label="昵称"
-                         width="120">
-        </el-table-column>
-        <el-table-column prop="phone"
-                         label="联系电话"
-                         show-overflow-tooltip>
-        </el-table-column>
-        <el-table-column prop="date"
-                         label="预约时间"
-                         show-overflow-tooltip>
-        </el-table-column>
-        <el-table-column prop="date"
-                         label="状态"
-                         show-overflow-tooltip>
+        <el-table-column prop="nickname" label="昵称" width="120"></el-table-column>
+        <el-table-column prop="mobile" label="联系电话" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="order_time" label="预约时间" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="date" label="状态" show-overflow-tooltip>
           <template slot-scope="scope">
-            <div>{{scope.row.status}}</div>
+            <div :class="'color'+scope.row.status">{{statusStr[scope.row.status]}}</div>
           </template>
         </el-table-column>
       </el-table>
 
       <div class="pagin">
-        <el-pagination background
-                       layout="prev, pager, next"
-                       @size-change="handleSizeChange"
-                       @current-change="handleCurrentChange"
-                       :current-page.sync="currentPage1"
-                       :total="1000">
-        </el-pagination>
+        <el-pagination
+          background
+          layout="prev, pager, next"
+          @size-change="handleSizeChange"
+          @current-change="handleCurrentChange"
+          :current-page.sync="currentPage1"
+          :total="total"
+        ></el-pagination>
       </div>
     </div>
   </div>
 </template>
 
 <script>
+import api from "../../server/home";
+
 export default {
   components: {},
-  data () {
+  data() {
     return {
-      searchText: '',
-      dates: '',
-      coupon: '',
+      searchText: "",
+      dates: "",
+      coupon: "",
+      limit: 10,
+      total: 0,
+      statusStr: [
+        "已预约",
+        "未支付",
+        "已支付",
+        "待使用",
+        "正在使用",
+        "已结算",
+        "已取消"
+      ],
       couponList: [
         {
-          value: '选项1',
-          label: '黄金糕'
-        }, {
-          value: '选项2',
-          label: '双皮奶'
+          value: "选项1",
+          label: "黄金糕"
+        },
+        {
+          value: "选项2",
+          label: "双皮奶"
         }
       ],
-      tableData: [{
-        date: '2022.04.25  14:30',
-        name: '滴滴滴',
-        headImg: 'https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/home/unpaid.png',
-        phone: '13346783645',
-        status: '已完成'
-      },
-      {
-        date: '2022.04.25  14:30',
-        name: '滴滴滴',
-        headImg: 'https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/home/unpaid.png',
-        phone: '13346783645',
-        status: '已完成'
-      },
-
+      tableData: [
+        {
+          date: "2022.04.25  14:30",
+          name: "滴滴滴",
+          headImg:
+            "https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/home/unpaid.png",
+          phone: "13346783645",
+          status: "已完成"
+        },
+        {
+          date: "2022.04.25  14:30",
+          name: "滴滴滴",
+          headImg:
+            "https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/home/unpaid.png",
+          phone: "13346783645",
+          status: "已完成"
+        }
       ],
       currentPage1: 1,
-      multipleSelection: ''
-
+      multipleSelection: ""
     };
   },
   computed: {},
   watch: {},
 
   methods: {
-    search () { },
-    handleSizeChange (val) {
-      console.log(`每页 ${val} 条`);
-    },
-    handleCurrentChange (val) {
-      console.log(`当前页: ${val}`);
+    // 获取订单列表
+    getOrderList() {
+      console.log("xxxxxxx");
+      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.getOrderList(params).then(res => {
+        if (res.code == 200) {
+          this.tableData = res.data.list;
+          this.total = res.data.total;
+        }
+      });
     },
-    handleSelectionChange (row, column, event) {
-      this.$router.push({
-        path: '/historicalOrder/details'
-      })
+    
+    handleCurrentChange(e) {
+      this.currentPage1 = e;
+      this.getOrderList();
+      console.log(e, "eeeeee");
     },
-  },
-
-  created () {
 
+    handleSizeChange(val) {
+      console.log(`每页 ${val} 条`);
+    },
+    handleSelectionChange(row, column, event) {
+      this.$router.push({
+        path: "/historicalOrder/details",
+        query: {
+          id: row.id
+        }
+      });
+    }
   },
 
-  mounted () {
-
+  created() {
+    this.getOrderList();
   },
-}
 
+  mounted() {}
+};
 </script>
 
 <style lang='less' scoped>
@@ -208,5 +236,26 @@ export default {
       border-bottom: none;
     }
   }
+  .color0 {
+    color: #fc3019;
+  }
+  .color1 {
+    color: #3ef3ed;
+  }
+  .color2 {
+    color: #00eeee;
+  }
+  .color3 {
+    color: #61D09D;
+  }
+  .color4 {
+    color: #3115cc;
+  }
+  .color5 {
+    color: #fc3019;
+  }
+  .color6 {
+    color: #A999EA;
+  }
 }
 </style>

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>
@@ -13,22 +15,38 @@
     </div>
     <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 v-if="orderList.length>0"
+           class="list-info"
+           @click="toOrderDetails(item)">
+        <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.avatar_url"
+                 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 class="name">客户昵称：<span>{{ item.nickname }}</span></div>
+            <div class="name">预约项目时间：<span>{{ item.order_time }}</span></div>
+            <div class="name">预约项目数量：<span>{{ item.project_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.project_list"
+                :key="i"><img :src="value.cover_url"
+                   alt=""></li>
           </ul>
-          <div class="status">
-            {{ item.status }}
+          <div class="status"
+               :style="item.status==0?'color: #FC3019':item.status==5?'color: #A999EA':'color: #61D09D;'">
+            {{ item.status==0?'未支付':item.status==5?'已取消':'待使用' }}
           </div>
         </div>
       </div>
+      <div v-else
+           class="empty">
+        暂无数据
+      </div>
     </div>
   </div>
 </template>
@@ -38,86 +56,26 @@ 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: '取消订单'
         },
       ],
       orderList: [
-        {
-          img: 'https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/home/make.png',
-          name: '滴滴滴',
-          ts: '2022.04.25  14:30-16:30',
-          num: '5',
-          imgList: [
-            'https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/home/make.png',
-            'https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/home/make.png',
-            'https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/home/make.png',
-            'https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/home/make.png',
-            'https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/home/make.png',
-            'https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/home/make.png',
-          ],
-          status: '未支付'
-        },
-        {
-          img: 'https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/home/make.png',
-          name: '滴滴滴',
-          ts: '2022.04.25  14:30-16:30',
-          num: '5',
-          imgList: [
-            'https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/home/make.png',
-            'https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/home/make.png',
-            'https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/home/make.png',
-            'https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/home/make.png',
-            'https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/home/make.png',
-            'https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/home/make.png',
-          ],
-          status: '未支付'
-        },
-        {
-          img: 'https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/home/make.png',
-          name: '滴滴滴',
-          ts: '2022.04.25  14:30-16:30',
-          num: '5',
-          imgList: [
-            'https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/home/make.png',
-            'https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/home/make.png',
-            'https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/home/make.png',
-            'https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/home/make.png',
-            'https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/home/make.png',
-            'https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/home/make.png',
-          ],
-          status: '未支付'
-        },
-        {
-          img: 'https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/home/make.png',
-          name: '滴滴滴',
-          ts: '2022.04.25  14:30-16:30',
-          num: '5',
-          imgList: [
-            'https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/home/make.png',
-            'https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/home/make.png',
-            'https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/home/make.png',
-            'https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/home/make.png',
-            'https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/home/make.png',
-            'https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/home/make.png',
-          ],
-          status: '未支付'
-        },
       ],
 
     }
@@ -126,10 +84,39 @@ 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 => {
+        if (res.code = 200) {
+          this.orderList = res.data.list
+        }
+        console.log(res, 'res');
+      })
+    },
+    toOrderDetails (e) {
+      if (e.status != 0) return
+      this.$router.push({
+        path: '/confirmOrder/details',
+        query: {
+          id: e.id
+        }
+      })
+    },
+    initData () {
 
     },
   },
@@ -151,7 +138,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 +176,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 +197,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 +215,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 +251,34 @@ 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;
         }
       }
     }
-
+    .empty {
+      height: 300px;
+      line-height: 300px;
+      width: 100%;
+      font-size: 28px;
+      color: slategrey;
+    }
   }
 }
-
 </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/details/index.vue

@@ -2,46 +2,47 @@
   <div class="mine">
     <div class="left">
       <div class="user-info">
-        <div class="user-img"><img :src="userInfo.image"
+        <div class="user-img"><img :src="userInfo.avatar_url"
                alt=""></div>
         <div class="user-span">
-          <div class="name">昵称：<span>{{userInfo.name}}</span></div>
+          <div class="name">昵称：<span>{{userInfo.nickname}}</span></div>
           <div class="sex">性别：<span>{{userInfo.sex}}</span></div>
           <div class="age">肤龄：<span>{{userInfo.age}}</span></div>
-          <div class="skin-type">肤质：<span>{{userInfo.skinType}}</span></div>
+          <div class="skin-type">肤质：<span>{{userInfo.skin}}</span></div>
         </div>
       </div>
       <div class="user-record">
         <div class="fraction">
           <div class="title">肌肤得分</div>
-          <div class="num">37分</div>
+          <div class="num">{{userInfo.score}}分</div>
         </div>
         <div class="status">
           <div class="title">皮肤状态</div>
-          <div class="tips">肤质一般</div>
+          <div class="tips">{{userInfo.skin_status}}</div>
         </div>
         <div class="times">
           <div class="title">上传检测时间</div>
-          <div class="ts">2022.04.18 16:04</div>
+          <div class="ts">{{userInfo.check_time}}</div>
         </div>
       </div>
       <div class="summary">
         <div class="left-title">皮肤总结</div>
         <div class="summary-list">
-          <div class="summary-info">
+          <div class="summary-info"
+               v-for="item,index in detail_list"
+               :key="index">
             <div class="result">
               <div class="result-left">
-                <div class="title">RGB毛孔：</div>
-                <div class="tips">粗大毛孔个数144</div>
+                <div class="title">{{item.name}}：</div>
+                <div class="tips">{{item.main_item.name}}{{item.main_item.num}}</div>
               </div>
-              <div class="right">
-                <span>粗大毛孔个数：144个</span><br>
-                <span>中等毛孔个数：409个</span><br>
-                <span>细小毛孔个数：299个</span>
+              <div class="right min-size">
+                <div v-for="value,i in item.items"
+                     :key="i">{{value.name}}：{{value.num}}个</div>
               </div>
             </div>
             <div class="bottom-tips">
-              <span>皮肤状态一般，污物阻塞导致，油脂分泌旺盛，皮肤状态一般，污物阻塞导致，油脂分泌旺盛</span>
+              <span>{{item.suggest}}</span>
             </div>
           </div>
         </div>
@@ -55,8 +56,8 @@
         <div class="lable-list">
           <div v-for="(item,index) in lableList"
                :key="index"
-               :class="['lable-info', item.disabled?'active':'']">
-            {{item.text}}
+               :class="['lable-info', tags.indexOf(item)>-1?'active':'']">
+            {{item}}
           </div>
           <div class="add-lable">
             +
@@ -86,12 +87,12 @@
                :key="index"
                @click="onOperation(index)">
             <div class="programme-left">
-              <div class="programme-img"><img src="https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/home/make.png"
+              <div class="programme-img"><img :src="item.cover_url"
                      alt=""></div>
               <div class="programme-tips">
-                <div class="tips-title">{{'【清洁补水】华熙智慧…'|ellipsis(9)}}</div>
-                <div class="tips-title">{{'美白、祛痘、抗皱'|ellipsis(9)}}</div>
-                <div class="tips-title">仪器：<span>{{'无创水光'|ellipsis(9)}}</span></div>
+                <div class="tips-title">{{item.name|ellipsis(9)}}</div>
+                <div class="tips-title">{{item.desc|ellipsis(9)}}</div>
+                <div class="tips-title">仪器：<span>{{item.device_name|ellipsis(9)}}</span></div>
               </div>
             </div>
             <div class="programme-right">
@@ -122,9 +123,9 @@
                    class="project-select"
                    size="mini">
           <el-option v-for="item in projectList"
-                     :key="item.value"
-                     :label="item.label"
-                     :value="item.value">
+                     :key="item.id"
+                     :label="item.name"
+                     :value="item.id">
           </el-option>
         </el-select>
         <div class="frequency">
@@ -158,63 +159,21 @@
 </template>
 
 <script>
-import { mapActions } from 'vuex'
 import minePupop from '../../../components/minePupop/index.vue'
+import api from '../../../server/home'
 
 export default {
   components: { minePupop },
   data () {
     return {
       userInfo: {
-        image: "https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/home/make.png",
-        name: '张三',
-        sex: '女',
-        age: '23',
-        skinType: '中性皮肤'
       },
+      //皮肤总结
+      detail_list: [],
       //面部标签
-      lableList: [
-        {
-          text: '对话框的',
-          disabled: false
-        },
-        {
-          text: '对话框的',
-          disabled: true
-        },
-        {
-          text: '对话框的',
-          disabled: false
-        },
-        {
-          text: '对话框的',
-          disabled: false
-        },
-        {
-          text: '对话框的',
-          disabled: false
-        },
-        {
-          text: '对话框的',
-          disabled: false
-        },
-        {
-          text: '对话框的',
-          disabled: false
-        },
-        {
-          text: '对话框的',
-          disabled: false
-        },
-        {
-          text: '对话框的',
-          disabled: false
-        },
-        {
-          text: '对话框的',
-          disabled: false
-        },
-      ],
+      lableList: [],
+      //后台默认的标签
+      tags: [],
       //执行方案
       programmeList: [
         {
@@ -267,12 +226,14 @@ export default {
           label: '2'
         },
       ],
-      timesInfo: '',
-      projectInfo: '',
-      weekInfo: '',
+      timesInfo: '',//次数
+      projectInfo: '',//项目
+      projectId: '',//项目id
+      weekInfo: '',//周次
       programmeIndex: '',
-      remarks: '',
-      isPupop: false
+      remarks: '',//备注
+      isPupop: false,
+      id: 0
     };
   },
   computed: {
@@ -281,6 +242,34 @@ export default {
   watch: {},
 
   methods: {
+    getSkinInfo () {
+      api.getSkinInfo({ id: this.id }).then(res => {
+        this.userInfo = res.data.user
+        this.detail_list = res.data.detail_list
+        this.lableList = res.data.tags
+        this.programmeList = res.data.scheme_list
+        this.remarks = res.data.remark
+      })
+    },
+    getSkinTags () {
+      api.getSkinTags().then(res => {
+        this.tags = res.data.tags
+      })
+    },
+    getProject () {
+      api.getProject().then(res => {
+        this.projectList = res.data.list
+      })
+    },
+    getSkinUpdate () {
+      let params = {
+        remark: this.remarks,
+        tags: this.lableList.toString()
+      }
+      api.getSkinUpdate().then(res => {
+
+      })
+    },
     onOperation (index) {
       if (this.programmeList[index].onSelect) {
         this.$set(this.programmeList[index], 'onSelect', !this.programmeList[index].onSelect)
@@ -289,13 +278,17 @@ export default {
       }
     },
     onSubmit () {
-
+      this.getSkinUpdate()
     },
     submitFrequency () { },
   },
 
   created () {
-
+    let id = this.$route.query.id
+    this.id = id
+    this.getSkinInfo()
+    this.getProject()
+    this.getSkinTags()
   },
 
   mounted () {
@@ -328,6 +321,7 @@ export default {
         width: 96px;
         img {
           width: 100%;
+          border-radius: 5px;
           display: block;
         }
       }
@@ -404,11 +398,11 @@ export default {
             }
             .right {
               font-size: 12px;
-              transform: scale(0.83);
               font-family: PingFangSC-Regular, PingFang SC;
               font-weight: 400;
               color: #666666;
-              line-height: 16px;
+              line-height: 20px;
+              text-align: end;
             }
           }
           .bottom-tips {

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">
@@ -29,22 +30,22 @@
         <div class="tab user-info"
              v-for="(item,index) in userList"
              :key="index"
-             @click="onDetails">
-          <div class="head-img"><img :src="item.img"
+             @click="onDetails(item.id)">
+          <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,62 @@
 </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: {
-    onDetails () {
+    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 (e) {
       this.$router.push({
-        path: '/testSkin/details'
+        path: '/testSkin/details',
+        query: {
+          id: e
+        }
       })
     },
-    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,73 @@
 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);
+  }
+  static getSkinInfo (parms) {
+    return $http.get(url.getSkinInfo, parms);
+  }
+  static getProject (parms) {
+    return $http.get(url.getProject, parms);
+  }
+  static getUserInfo (parms) {
+    return $http.get(url.getUserInfo, parms);
+  }
+  static getSkinTags (parms) {
+    return $http.get(url.getSkinTags, parms);
+  }
+  static getSkinUpdate (parms) {
+    return $http.post(url.getSkinUpdate, parms);
+  }
+
+  // 获取历史订单
+  static getOrderList (parms) {
+    return $http.get(url.getOrderList, parms);
+  }
+
+  // 获取订单详情
+  static getOrderInfo (parms) {
+    return $http.get(url.getOrderInfo, parms);
+  }
+
+  // 获取用户列表
+  static getUserList (parms) {
+    return $http.get(url.getUserList, parms);
+  }
+  
+  // 获取用户详情
+  static getUserInfo (parms) {
+    return $http.get(url.getUserInfo, parms);
+  }
+  
+  // 获取优惠券列表
+  static getCouponInfo (parms) {
+    return $http.get(url.getCouponInfo, parms);
+  }
+
+  // 发送优惠券接口
+  static sendCoupon (parms) {
+    return $http.post(url.sendCoupon, parms);
+  }
+  
+
 }
 
- 
- 
+
+
 

src/server/urls.js

@@ -1,5 +1,43 @@
 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',
+  //测肤记录详情
+  getSkinInfo: '/v2/pad/skin/info',
+  //获取项目列表
+  getProject: '/v2/pad/scheme/project',
+  //获取用户信息
+  getUserInfo: '/v2/pad/account/info',
+  //后台默认的标签
+  getSkinTags: '/v2/pad/skin/tags',
+  //保存测肤记录
+  getSkinUpdate:'/v2/pad/skin/update',
+
+  /**
+   *  by ListKer
+   */
+
+  // 获取历史订单
+  getOrderList:'/v2/pad/order/list',
+
+  //获取订单详情
+  getOrderInfo: '/v2/pad/order/info',
+
+  // 获取用户列表
+  getUserList:'/v2/pad/user/list',
+  
+  // 获取用户详情
+  getUserInfo:'/v2/pad/user/info',
+  
+  // 获取优惠券列表
+  getCouponInfo:'/v2/pad/coupon/list',
+  
+  // 发送优惠券接口
+  sendCoupon:'/v2/pad/coupon/send',
+
 }

src/store/modules/comVal.js

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