src/common/http.js

@@ -23,14 +23,16 @@ 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');
+console.log(store.state.comVal.token, 'this.$store.state.comVal.token111', localStorage.getItem('token'));
+axios.defaults.headers.post['token'] = localStorage.getItem('token') || store.state.comVal.token;
+axios.defaults.headers.get['token'] = localStorage.getItem('token') || store.state.comVal.token;
 
 // 请求拦截器
 axios.interceptors.request.use(
   config => {
     // 每次发送请求之前判断是否存在token，如果存在，则统一在http请求的header都加上token，不用每次请求都手动添加了
     // 即使本地存在token，也有可能token是过期的，所以在响应拦截器中要对返回状态进行判断
+
     const token = localStorage.getItem('token');
     if (!token) {
       router.push('/login')
@@ -102,13 +104,17 @@ let reqUrl = ''
  * @param {Object} params [请求时携带的参数]
  */
 function get (url, params) {
+  if (!axios.defaults.headers.get['token']) {
+    axios.defaults.headers.get['token'] = localStorage.getItem('token') || store.state.comVal.token;
+
+  }
   reqUrl = basePath + url
   return new Promise((resolve, reject) => {
     axios.get(reqUrl, {
       params: params
     })
       .then(res => {
-        if (res.data.code != 200) {
+        if (res.data.code != 200 && localStorage.getItem('token')) {
           Message({
             message: res.data.msg,
             type: 'error'
@@ -128,12 +134,15 @@ function get (url, params) {
  * @param {Object} params [请求时携带的参数]
  */
 function post (url, params) {
+  if (!axios.defaults.headers.post['token']) {
+    axios.defaults.headers.post['token'] = localStorage.getItem('token') || store.state.comVal.token;
+  }
   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) {
+        if (res.data.code != 200 && localStorage.getItem('token')) {
           Message({
             message: res.data.msg,
             type: 'error'

src/common/utils.js

@@ -1,7 +1,7 @@
 // 自定义全局方法封装
 const utils = {
-  userInfo:{
-    
+  userInfo: {
+
   },
   test: function () { },
   isBack: false,
@@ -25,6 +25,7 @@ const utils = {
     }
     return fmt;
   },
+ 
 
 }
 

src/components/common/layout/layout.vue

@@ -17,6 +17,17 @@
         <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="userInfo.avatar_url"></div>
+          <el-dropdown trigger="click"
+                       placement="top"
+                       @command="loginOut">
+            <span class="el-dropdown-link">
+              <img src="https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/icon/coupon/logOut.png"
+                   alt="">
+            </span>
+            <el-dropdown-menu slot="dropdown">
+              <el-dropdown-item>退出登录</el-dropdown-item>
+            </el-dropdown-menu>
+          </el-dropdown>
         </div>
       </header>
       <div class="main-wrapper">
@@ -59,11 +70,8 @@ export default {
       })
     },
     loginOut () {
-      let keys = document.cookie.match(/[^ =;]+(?=\=)/g);
-      if (keys) {
-        for (let i = keys.length; i--;)
-          document.cookie = keys[i] + '=0;expires=' + new Date(0).toUTCString()
-      }
+      localStorage.removeItem('token');
+      location.reload();
     },
     changeMenu (index) {
       this.menuIndex = index
@@ -153,6 +161,7 @@ export default {
     .right {
       float: right;
       display: flex;
+      align-items: center;
 
       .news {
         width: 24px;
@@ -173,6 +182,13 @@ export default {
           display: block;
         }
       }
+      .el-dropdown-link {
+        img {
+          width: 28px;
+          height: 28px;
+          display: block;
+        }
+      }
     }
   }
 

src/components/common/layout/leftMenu.vue

@@ -86,6 +86,18 @@ export default {
       nowIndex: 0
     }
   },
+  watch: {
+    $route (to, from) {
+      let patname = `/${window.location.pathname.split('/')[1]}`
+      console.log(patname, 'patname');
+      this.menu.forEach((item, index) => {
+        if (patname == item.path) {
+          this.nowIndex = index
+          this.$emit('changeMenu', index)
+        }
+      })
+    }
+  },
   mounted () {
     let patname = `/${window.location.pathname.split('/')[1]}`
     console.log(patname, 'patname');
@@ -97,7 +109,6 @@ export default {
     })
   },
   methods: {
-
     handleSelect (index, item) {
       this.nowIndex = index
       this.$router.push({

src/filters/filter.js

@@ -101,3 +101,6 @@ Vue.filter("ellipsis", function (value, lmit) {
   }
   return value
 })
+
+
+

src/pages/confirmOrder/details/index.vue

@@ -5,24 +5,24 @@
         <div class="user-img"><img :src="userInfo.image"
                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="age">肤龄：<span>{{userInfo.age==1?'男':userInfo.age==2?'女':'保密'}}</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">
@@ -33,7 +33,7 @@
           <div v-for="(item,index) in lableList"
                :key="index"
                class='lable-info'>
-            {{item.text}}
+            {{item}}
           </div>
         </div>
       </div>
@@ -41,7 +41,7 @@
         <div class="ps-title">
           备注
         </div>
-        <div class="ps-text">{{'富婆富婆富婆富婆富婆富婆富婆富婆富婆富婆富婆富婆富婆富婆富婆富婆富婆' | ellipsis(20)}}</div>
+        <div class="ps-text">{{remarks | ellipsis(20)}}</div>
       </div>
       <div class="programme">
         <div class="tab">
@@ -53,16 +53,16 @@
                :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">
-              <div class="frequency">执行频率：<span>{{item.frequency}}</span></div>
+              <div class="frequency">执行频率：<span>{{item.rate}}</span></div>
               <div class="duration">持续时长：<span>{{item.duration}}</span></div>
             </div>
             <div class="operation"
@@ -76,27 +76,36 @@
     </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">
-          <div>共<span>3个</span>项目</div>
-          <div class="add-project">添加</div>
+          <div>共<span>{{order_data.project_num}}个</span>项目</div>
+          <div class="add-project"
+               @click="isProject=true">添加</div>
         </div>
         <div class="project-list">
           <div class="project-info"
-               v-for="(item,index) in programmeList"
+               v-for="(item,index) in order_data.project_list"
                :key="index">
-            <div class="project-image"><img :src="item.image"></div>
+            <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-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">
+                <div> <span v-if="item.device_name">{{item.device_name}}（{{item.room}}）{{item.use_time}}分钟</span></div>
+                <div><img @click="eidt(item)"
+                       src="https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/icon/coupon/eidt.png">
+                  <img class="delete"
+                       src="https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/icon/coupon/delete.png"
+                       alt="">
+                </div>
+              </div>
             </div>
           </div>
         </div>
@@ -125,7 +134,7 @@
           合计： <span class="price-num"><span class="min-size">￥</span>399<span class="min-size">.00</span></span>
         </div>
       </div>
-      <div class="payment">立即支付</div>
+      <div class="payment">{{order_data.status==0?'立即支付':'确定订单'}}</div>
     </div>
     <!-- 选择优惠券 -->
     <mine-pupop :show="isCoupun">
@@ -176,11 +185,12 @@
           <el-select v-model="projectInfo"
                      placeholder="请选择项目"
                      style="width: 295px;"
+                     @change="getProducts"
                      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>
@@ -188,15 +198,17 @@
           <el-select v-model="productsInfo"
                      placeholder="请选择升级产品包"
                      style="width: 295px;"
+                     :disabled="projectInfo.length==0?true:false"
                      size="mini">
             <el-option v-for="item in productsList"
-                       :key="item.value"
-                       :label="item.label"
-                       :value="item.value">
+                       :key="item.id"
+                       :label="item.name"
+                       :value="item.id">
             </el-option>
           </el-select>
         </div>
-        <div class="products-button">确定</div>
+        <div class="products-button"
+             @click="orderUpdate">确定</div>
       </div>
     </mine-pupop>
     <!-- 选择时间 -->
@@ -270,109 +282,14 @@ export default {
       userInfo: {
       },
       //面部标签
-      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: [],
       //执行方案
-      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'
-        },
-      ],
+      programmeList: [],
+      order_data: {},//门店
       //项目列表
-      projectList: [{
-        value: '选项1',
-        label: '黄金糕'
-      }, {
-        value: '选项2',
-        label: '双皮奶'
-      }, {
-        value: '选项3',
-        label: '蚵仔煎'
-      }, {
-        value: '选项4',
-        label: '龙须面'
-      }, {
-        value: '选项5',
-        label: '北京烤鸭'
-      }],
-      //产品列表
-      productsList: [{
-        value: '选项1',
-        label: '黄金糕'
-      }, {
-        value: '选项2',
-        label: '双皮奶'
-      }, {
-        value: '选项3',
-        label: '蚵仔煎'
-      }, {
-        value: '选项4',
-        label: '龙须面'
-      }, {
-        value: '选项5',
-        label: '北京烤鸭'
-      }],
+      projectList: [],
+      //升级包列表
+      productsList: [],
       //时间列表（头部）
       tsTableList: [
         {
@@ -490,8 +407,60 @@ export default {
     getOrderInfo () {
       api.getOrderInfo({ id: this.id }).then(res => {
         this.userInfo = res.data.user
+        this.lableList = res.data.tags
+        this.remarks = res.data.remark
+        this.programmeList = res.data.scheme_list
+        this.order_data = res.data.order_data
+      })
+    },
+    getProjectList () {
+      api.getProjectList().then(res => {
+        this.projectList = res.data.list
+      })
+    },
+    getProducts (e) {
+      this.productsInfo = ''
+      api.getProducts({ id: e }).then(res => {
+        this.productsList = res.data.list
+      })
+    },
+    eidt () {
 
+    },
+    //新增
+    orderUpdate () {
+      if (this.projectInfo.length == 0) return
+      //项目包重组
+      let projectInfo = {}, nowProjectInfo = {}, productsInfo = {}
+      this.projectList.forEach(item => {
+        if (this.projectInfo == item.id) {
+          nowProjectInfo = item
+        }
       })
+      if (this.productsInfo.length != 0) {
+        this.productsList.forEach(item => {
+          if (item.id == this.productsInfo) {
+            productsInfo = item
+          }
+        })
+      }
+      console.log(nowProjectInfo, 'nowProjectInfo', productsInfo);
+      projectInfo['name'] = nowProjectInfo.name
+      projectInfo['cover_url'] = nowProjectInfo.cover_url
+      projectInfo['device_name'] = ''
+      projectInfo['room'] = ''
+      projectInfo['use_time'] = ''
+      projectInfo['price'] = nowProjectInfo.price
+      projectInfo['product_names'] = ''
+
+      if (Object.keys(productsInfo).length > 0) {
+        projectInfo['product_id'] = productsInfo.id
+        projectInfo.product_names = productsInfo.name
+        projectInfo.price += Number(productsInfo.price)
+      }
+      this.order_data.project_list.push(projectInfo)
+      this.isProject = false
+
     },
     onOperation (index) {
       if (this.programmeList[index].onSelect) {
@@ -512,6 +481,7 @@ export default {
       this.id = id
     }
     this.getOrderInfo()
+    this.getProjectList()
   },
 
   mounted () {
@@ -826,6 +796,15 @@ export default {
               font-weight: 400;
               color: #fa7d22;
               line-height: 18px;
+              display: flex;
+              align-items: center;
+              justify-content: space-between;
+              img {
+                width: 20px;
+              }
+              .delete {
+                margin-left: 10px;
+              }
             }
           }
         }

src/pages/coupon/index.vue

@@ -1,57 +1,71 @@
 <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>
-      <div class="search-button">搜索</div>
+      <el-input class="search-input"
+                placeholder="请输入内容"
+                prefix-icon="el-icon-search"
+                size="mini"
+                v-model="searckItem"></el-input>
+      <div class="search-button"
+           @click="getUserList">搜索</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.id" :label="item.name" :value="item.id"></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="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">
+      <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.avatar_url" alt />
+              <img :src="scope.row.avatar_url"
+                   alt />
             </div>
           </template>
         </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-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>
+        <el-pagination background
+                       layout="prev, pager, next"
+                       @size-change="handleSizeChange"
+                       @current-change="handleCurrentChange"
+                       :current-page.sync="currentPage1"
+                       :total="total"></el-pagination>
       </div>
     </div>
   </div>
@@ -62,7 +76,7 @@ import api from "../../server/home";
 
 export default {
   components: {},
-  data() {
+  data () {
     return {
       searckItem: "",
       couponList: [],
@@ -70,42 +84,44 @@ export default {
       multipleSelection: [], //选中的列表
       coupon: "",
       couponNum: 1, //优惠券数量
-      currentPage1: 1
+      currentPage1: 1,
+      total: 0,
+      limit: 10,
     };
   },
   computed: {},
   watch: {},
 
   methods: {
-    reduceNum() {
+    reduceNum () {
       this.couponNum > 1 ? this.couponNum-- : (this.couponNum = 1);
     },
-    handleSelectionChange(val) {
+    handleSelectionChange (val) {
       this.multipleSelection = val;
       console.log(this.multipleSelection);
     },
     // 发送优惠券
-    sendCoupon() {
+    sendCoupon () {
       console.log(this.coupon);
       let selectIds = "";
       for (let i = 0; i < this.multipleSelection.length; i++) {
-        selectIds = selectIds + ","+this.multipleSelection[i].id;
+        selectIds = selectIds + "," + this.multipleSelection[i].id;
       }
       let params = {
         id: this.coupon,
-        user_ids: selectIds.substring(1,selectIds.length),
+        user_ids: selectIds.substring(1, selectIds.length),
         num: this.couponNum
       };
-      api.sendCoupon(params).then(res => {});
+      api.sendCoupon(params).then(res => { });
     },
 
     // 获取订单列表
-    getUserList() {
+    getUserList () {
       console.log("xxxxxxx");
       let params = {
         page: this.currentPage1,
         limit: this.limit,
-        keywords: this.searchText
+        keywords: this.searckItem
       };
       api.getUserList(params).then(res => {
         if (res.code == 200) {
@@ -116,7 +132,7 @@ export default {
     },
 
     // 获取优惠券列表
-    getCouponInfo() {
+    getCouponInfo () {
       console.log("xxxxxxx");
       let params = {
         page: this.currentPage1,
@@ -129,23 +145,23 @@ export default {
       });
     },
 
-    handleCurrentChange(e) {
+    handleCurrentChange (e) {
       this.currentPage1 = e;
       this.getUserList();
       console.log(e, "eeeeee");
     },
 
-    handleSizeChange(val) {
+    handleSizeChange (val) {
       console.log(`每页 ${val} 条`);
     }
   },
 
-  created() {
+  created () {
     this.getUserList();
     this.getCouponInfo();
   },
 
-  mounted() {}
+  mounted () { }
 };
 </script>
 

src/pages/historicalOrder/index.vue

@@ -8,22 +8,14 @@
         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>
+
+      <el-input placeholder="请输入项目" class="search" v-model="product">
+        <i slot="prefix" class="el-input__icon el-icon-search"></i>
+      </el-input>
+
+      <el-input placeholder="请输入优惠券" class="search" v-model="coupon">
+        <i slot="prefix" class="el-input__icon el-icon-search"></i>
+      </el-input>
 
       <el-input placeholder="请输入内容" class="search" v-model="searchText">
         <i slot="prefix" class="el-input__icon el-icon-search"></i>
@@ -83,6 +75,8 @@ export default {
       coupon: "",
       limit: 10,
       total: 0,
+      product:"",
+      coupon:"",
       statusStr: [
         "已预约",
         "未支付",
@@ -142,6 +136,8 @@ export default {
         page: this.currentPage1,
         limit: this.limit,
         keywords: this.searchText,
+        project_name:this.product,
+        coupon_name:this.coupon,
         start_date: start_date,
         end_date: end_date
       };

src/pages/home/index.vue

@@ -16,11 +16,11 @@
     <div class="order-list">
       <div class="title">预约订单列表</div>
       <div v-if="orderList.length>0"
-           class="list-info"
-           @click="toOrderDetails(item)">
+           class="list-info">
         <div class="user-info"
              v-for="(item,index) in orderList"
              :key="index"
+             @click="toOrderDetails(item)"
              :style="index==orderList.length-1?'border-bottom:0px':''">
           <div class="head-img">
             <div class="new">新</div><img :src="item.avatar_url"
@@ -61,17 +61,17 @@ export default {
       tabList: [
         {
           image: 'https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/home/make.png',
-          num: 3,
+          num: 0,
           name: '预约订单'
         },
         {
           image: 'https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/home/unpaid.png',
-          num: 4,
+          num: 0,
           name: '未支付订单'
         },
         {
           image: 'https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/home/cancelOrder.png',
-          num: 9,
+          num: 0,
           name: '取消订单'
         },
       ],
@@ -108,6 +108,7 @@ export default {
       })
     },
     toOrderDetails (e) {
+      console.log(e);
       if (e.status != 0) return
       this.$router.push({
         path: '/confirmOrder/details',

src/pages/testSkin/details/index.vue

@@ -6,7 +6,7 @@
                alt=""></div>
         <div class="user-span">
           <div class="name">昵称：<span>{{userInfo.nickname}}</span></div>
-          <div class="sex">性别：<span>{{userInfo.sex}}</span></div>
+          <div class="sex">性别：<span>{{userInfo.sex==1?'男':userInfo.sex==2?'女':'未知'}}</span></div>
           <div class="age">肤龄：<span>{{userInfo.age}}</span></div>
           <div class="skin-type">肤质：<span>{{userInfo.skin}}</span></div>
         </div>
@@ -49,63 +49,51 @@
       </div>
     </div>
     <div class="right">
-      <div class="lable">
+      <div class="lable"
+           :style="isOpen?'height: 275px;':'height: 76px;'">
         <div class="lable-title">
-          面诊标签
+          <div>面诊标签</div>
+          <div class="edit">编辑</div>
         </div>
-        <div class="lable-list">
-          <div v-for="(item,index) in lableList"
-               :key="index"
-               :class="['lable-info', tags.indexOf(item)>-1?'active':'']">
-            {{item}}
+        <div class="problem">
+          <div class="problem-title">问题标签</div>
+          <div class="problem-lable">
+            <div class="lable-text"
+                 v-for="item,index in problem"
+                 :key="index"
+                 :style='{background:item.bgcolor,borderColor:item.bdcolor}'>
+              {{item.text}}
+            </div>
           </div>
-          <div class="add-lable">
-            +
+        </div>
+        <div class="problem">
+          <div class="problem-title">面部标签</div>
+          <div class="problem-lable">
+            <div class="lable-text"
+                 v-for="item,index in lableList"
+                 :key="index"
+                 :style='{background:item.bgcolor,borderColor:item.bdcolor}'>
+              {{item.text}}
+            </div>
           </div>
         </div>
+
         <div class="lable-title">
           备注
         </div>
-        <div class="remarks">
-          <el-input type="textarea"
-                    autosize
-                    resize="none"
-                    placeholder="多行输入"
-                    v-model="remarks">
-          </el-input>
-        </div>
+        <div class="remarks-text">{{remarks}}</div>
+        <div class="open-icon"
+             @click="isOpen = !isOpen"><img :src="isOpen?'https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/icon/coupon/unOpen.png':'https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/icon/coupon/open.png'"
+               alt=""></div>
       </div>
-      <div class="programme">
+      <div class="programme"
+           :style="isOpen?'height: 165px;':'height: 364px;'">
         <div class="tab">
           <div class="tab-title">执行方案</div>
           <div class="add"
                @click="isPupop=true">新增</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="item.cover_url"
-                     alt=""></div>
-              <div class="programme-tips">
-                <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">
-              <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="edit">编辑</div>
-              <div class="delete">删除</div>
-            </div>
-          </div>
-        </div>
+        <div class=""></div>
       </div>
       <div class="submit"
            @click="onSubmit">保存</div>
@@ -170,8 +158,9 @@ export default {
       },
       //皮肤总结
       detail_list: [],
+      problem: [{ text: '干性（干燥）' }, { text: '干性（干燥、脱皮、缺水）' }, { text: '干性（干燥、脱皮、缺水）' }, { text: '干性（干燥、脱皮、缺水）' }, { text: '干性（干燥、脱皮、缺水）' }, { text: '干性（干燥、脱皮、缺水）' }],
       //面部标签
-      lableList: [],
+      lableList: [{ text: '干性（干燥）' }, { text: '干性（干燥、脱皮、缺水）' }, { text: '干性（干燥、脱皮、缺水）' }, { text: '干性（干燥、脱皮、缺水）' }, { text: '干性（干燥、脱皮、缺水）' }, { text: '干性（干燥、脱皮、缺水）' }],
       //后台默认的标签
       tags: [],
       //执行方案
@@ -231,9 +220,10 @@ export default {
       projectId: '',//项目id
       weekInfo: '',//周次
       programmeIndex: '',
-      remarks: '',//备注
+      remarks: '打架和考到几点拉进来的',//备注
       isPupop: false,
-      id: 0
+      id: 0,
+      isOpen: true,//是否展开
     };
   },
   computed: {
@@ -246,9 +236,8 @@ export default {
       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
+        // this.remarks = res.data.remark
       })
     },
     getSkinTags () {
@@ -281,6 +270,25 @@ export default {
       this.getSkinUpdate()
     },
     submitFrequency () { },
+    randomColor (type) {
+      let arr = [
+        { background: 'rgba(244, 247, 255, 1)', border: 'rgba(85, 124, 255, 1)' },
+        { background: 'rgba(245, 252, 245, 1)', border: 'rgba(66, 211, 81, 1)' },
+        { background: 'rgba(254, 244, 237, 1)', border: 'rgba(250, 125, 34, 1)' },
+        { background: 'rgba(249, 245, 255, 1)', border: 'rgba(136, 50, 255, 1)' },
+        { background: 'rgba(255, 252, 245, 1)', border: 'rgba(204, 116, 42, 1)' },]
+      this.problem.forEach(res => {
+        let color = Math.floor((Math.random() * arr.length))
+        this.$set(res, 'bgcolor', arr[color].background)
+        this.$set(res, 'bdcolor', arr[color].border)
+      })
+      this.lableList.forEach(res => {
+        let color = Math.floor((Math.random() * arr.length))
+        this.$set(res, 'bgcolor', arr[color].background)
+        this.$set(res, 'bdcolor', arr[color].border)
+      })
+
+    }
   },
 
   created () {
@@ -292,7 +300,7 @@ export default {
   },
 
   mounted () {
-
+    this.randomColor()
   },
 }
 
@@ -429,64 +437,94 @@ export default {
     flex: 1;
     .lable {
       width: 100%;
-      height: 230px;
-      overflow: scroll;
       padding: 12px;
       background: #ffffff;
       box-shadow: 0px 2px 4px 0px rgba(184, 191, 198, 0.2);
       border-radius: 8px;
+      overflow: hidden;
+      position: relative;
       .lable-title {
         font-size: 14px;
         font-family: PingFangSC-Medium, PingFang SC;
         font-weight: 500;
         color: #333333;
         line-height: 20px;
-        margin-bottom: 14px;
+        margin-bottom: 8px;
+        display: flex;
+        justify-content: space-between;
+        .edit {
+          width: 60px;
+          height: 28px;
+          background: #fa7d22;
+          border-radius: 8px;
+          font-size: 14px;
+          font-family: PingFangSC-Medium, PingFang SC;
+          font-weight: 500;
+          color: #ffffff;
+          line-height: 28px;
+          text-align: center;
+        }
       }
-      .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;
+      .remarks-text {
+        font-size: 12px;
+        font-family: PingFangSC-Regular, PingFang SC;
+        font-weight: 400;
+        color: #666666;
+        line-height: 17px;
+      }
+      .problem {
+        display: flex;
+        .problem-title {
+          font-size: 13px;
+          font-family: PingFangSC-Regular, PingFang SC;
+          font-weight: 400;
+          color: #333333;
+          line-height: 18px;
         }
-        .add-lable {
-          display: inline-block;
-          width: 27px;
-          height: 24px;
-          line-height: 24px;
+        .problem-lable {
+          flex: 1;
+          overflow-y: hidden;
+          width: 100%;
+          height: 68px;
           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;
-        }
-        .active {
-          background: url(https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/icon/slices/%E9%80%89%E4%B8%AD2%402x.png)
-            no-repeat;
-          background-size: 100% 100%;
-          border: 0px solid #d6d6d6;
+          line-height: 17px;
+          display: flex;
+          flex-flow: column wrap;
+          list-style-type: none;
+          overflow-x: scroll;
+          align-items: baseline;
+
+          .lable-text {
+            margin-left: 10px;
+            margin-bottom: 10px;
+            height: 24px;
+            line-height: 24px;
+            border: 1px solid #42d351;
+            padding: 0 12px;
+            border-radius: 2px;
+          }
         }
       }
-      .remarks {
-        /deep/ .el-textarea__inner:focus {
-          border-color: #fa852f;
+      .open-icon {
+        width: 100%;
+        padding-top: 10px;
+        position: absolute;
+        height: 38px;
+        background: #ffffff;
+        bottom: 0;
+        text-align: center;
+
+        img {
+          width: 24px;
         }
       }
     }
     .programme {
       margin-top: 18px;
       width: 100%;
-      // height: 208px;
       background: #ffffff;
       box-shadow: 0px 2px 4px 0px rgba(184, 191, 198, 0.2);
       border-radius: 8px;

src/server/home.js

@@ -36,6 +36,12 @@ export default class Home {
   static getSkinUpdate (parms) {
     return $http.post(url.getSkinUpdate, parms);
   }
+  static getProjectList (parms) {
+    return $http.get(url.getProjectList, parms);
+  }
+  static getProducts (parms) {
+    return $http.get(url.getProducts, parms);
+  }
 
   // 获取历史订单
   static getOrderList (parms) {
@@ -51,12 +57,12 @@ export default class Home {
   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);
@@ -66,7 +72,7 @@ export default class Home {
   static sendCoupon (parms) {
     return $http.post(url.sendCoupon, parms);
   }
-  
+
 
 }
 

src/server/urls.js

@@ -16,28 +16,32 @@ export default {
   //后台默认的标签
   getSkinTags: '/v2/pad/skin/tags',
   //保存测肤记录
-  getSkinUpdate:'/v2/pad/skin/update',
+  getSkinUpdate: '/v2/pad/skin/update',
+  //获取项目列表
+  getProjectList: '/v2/pad/project/list',
+  //获取升级包
+  getProducts:'/v2/pad/project/product',
 
   /**
    *  by ListKer
    */
 
   // 获取历史订单
-  getOrderList:'/v2/pad/order/list',
+  getOrderList: '/v2/pad/order/list',
 
   //获取订单详情
   getOrderInfo: '/v2/pad/order/info',
 
   // 获取用户列表
-  getUserList:'/v2/pad/user/list',
-  
+  getUserList: '/v2/pad/user/list',
+
   // 获取用户详情
-  getUserInfo:'/v2/pad/user/info',
-  
+  getUserInfo: '/v2/pad/account/info',
+
   // 获取优惠券列表
-  getCouponInfo:'/v2/pad/coupon/list',
-  
+  getCouponInfo: '/v2/pad/coupon/list',
+
   // 发送优惠券接口
-  sendCoupon:'/v2/pad/coupon/send',
+  sendCoupon: '/v2/pad/coupon/send',
 
 }