src/common/http.js

@@ -23,8 +23,8 @@ 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') || store.state.comVal.token;
-axios.defaults.headers.get['token'] = localStorage.getItem('token') || store.state.comVal.token;
+axios.defaults.headers.post['token'] = localStorage.getItem('token');
+axios.defaults.headers.get['token'] = localStorage.getItem('token');
 
 // 请求拦截器
 axios.interceptors.request.use(
@@ -104,7 +104,7 @@ let reqUrl = ''
  */
 function get (url, params) {
   if (!axios.defaults.headers.get['token']) {
-    axios.defaults.headers.get['token'] = localStorage.getItem('token') || store.state.comVal.token;
+    axios.defaults.headers.get['token'] = localStorage.getItem('token');
 
   }
   reqUrl = basePath + url
@@ -133,7 +133,7 @@ function get (url, params) {
  */
 function post (url, params) {
   if (!axios.defaults.headers.post['token']) {
-    axios.defaults.headers.post['token'] = localStorage.getItem('token') || store.state.comVal.token;
+    axios.defaults.headers.post['token'] = localStorage.getItem('token');
   }
   reqUrl = basePath + url
   return new Promise((resolve, reject) => {

src/components/common/layout/leftMenu.vue

@@ -50,12 +50,12 @@ export default {
           icon: 'https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/icon/slices/home.png'
 
         },
-        // {
-        //   name: "测肤记录",
-        //   path: "/testSkin",
-        //   unicon: 'https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/icon/slices/unskin.png',
-        //   icon: 'https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/icon/slices/Skin.png',
-        // },
+        {
+          name: "测肤记录",
+          path: "/testSkin",
+          unicon: 'https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/icon/slices/unskin.png',
+          icon: 'https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/icon/slices/Skin.png',
+        },
         {
           name: "发券中心",
           path: "/coupon",

src/pages/confirmOrder/addOrder/index.vue

@@ -3,7 +3,8 @@
     <div class="left">
       <div class="user-info">
         <div class="user-img">
-          <img :src="userInfo.image" alt />
+          <img :src="userInfo.image"
+               alt />
         </div>
         <div class="user-span">
           <div class="name">
@@ -25,7 +26,8 @@
         </div>
       </div>
       <div class="user-record">
-        <div class="fraction" @click="isPore=true">
+        <div class="fraction"
+             @click="isPore=true">
           <div class="title">肌肤得分</div>
           <div class="num">{{userInfo.score}}分</div>
         </div>
@@ -41,7 +43,9 @@
       <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}}</div>
+          <div v-for="(item,index) in lableList"
+               :key="index"
+               class="lable-info">{{item}}</div>
         </div>
       </div>
       <div class="ps">
@@ -53,15 +57,14 @@
           <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 programmeList"
+               :key="index"
+               @click="onOperation(index)">
             <div class="programme-left">
               <div class="programme-img">
-                <img :src="item.cover_url" alt />
+                <img :src="item.cover_url"
+                     alt />
               </div>
               <div class="programme-tips">
                 <div class="tips-title">{{item.name|ellipsis(9)}}</div>
@@ -82,7 +85,8 @@
                 <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>
@@ -111,10 +115,14 @@
             共
             <span>{{order_data.project_list?order_data.project_list.length:0}}个</span>项目
           </div>
-          <div v-if="order_data.type!='one'" class="add-project" @click="addProject">添加</div>
+          <div v-if="order_data.type!='one'"
+               class="add-project"
+               @click="addProject">添加</div>
         </div>
         <div class="project-list">
-          <div class="project-info" v-for="(item,index) in order_data.project_list" :key="index">
+          <div class="project-info"
+               v-for="(item,index) in order_data.project_list"
+               :key="index">
             <div class="project-image">
               <img :src="item.cover_url" />
             </div>
@@ -129,28 +137,23 @@
               <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>
+                  <span v-if="item.device_name">{{item.device_name}}（{{item.room}}）{{item.use_time}}分钟</span>
                 </div>
                 <div v-if="order_data.type!='one'">
-                  <img
-                    @click="eidt(item)"
-                    src="https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/icon/coupon/eidt.png"
-                  />
-                  <img
-                    @click="deleteProject(item)"
-                    class="delete"
-                    src="https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/icon/coupon/delete.png"
-                    alt
-                  />
+                  <img @click="eidt(item)"
+                       src="https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/icon/coupon/eidt.png" />
+                  <img @click="deleteProject(item)"
+                       class="delete"
+                       src="https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/icon/coupon/delete.png"
+                       alt />
                 </div>
               </div>
             </div>
           </div>
         </div>
       </div>
-      <div class="cost">
+      <div class="cost"
+           v-if="!isChange || order_data.project_list.length>0">
         <div class="over-price">
           合计：
           <span class="price-num">
@@ -160,30 +163,32 @@
           </span>
         </div>
       </div>
-      <div class="payment" @click="determine">确定订单</div>
+      <div class="payment"
+           @click="determine">确定订单</div>
     </div>
     <!-- 选择优惠券 -->
     <mine-pupop :show="isCoupun">
       <div class="coupon-block">
-        <div class="delete-pupop" @click="isCoupun=false">
-          <img
-            src="https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/icon/slices/delete.png"
-            alt
-          />
+        <div class="delete-pupop"
+             @click="isCoupun=false">
+          <img src="https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/icon/slices/delete.png"
+               alt />
         </div>
         <div class="coupon-pupop-title">选择优惠券</div>
         <ul class="coupon-lists">
-          <li class="coupon-info" v-for="item,index in couponList" :key="index">
+          <li class="coupon-info"
+              v-for="item,index in couponList"
+              :key="index">
             <!-- 1: '抵扣券',
       2: '满减券',
       3: '全额减免券',
             4: '项目卡券'-->
-            <div
-              class="coupon-tips-text"
-            >{{item.type==1?'抵扣券':item.type==2?'满减券':item.type==3?'全额减免券':'项目卡券'}}</div>
+            <div class="coupon-tips-text">{{item.type==1?'抵扣券':item.type==2?'满减券':item.type==3?'全额减免券':'项目卡券'}}</div>
             <div class="top">
-              <div v-if="item.type==3" class="discount-over">全免</div>
-              <div v-else class="discount">
+              <div v-if="item.type==3"
+                   class="discount-over">全免</div>
+              <div v-else
+                   class="discount">
                 <div class="price-num">
                   <span class="size">￥</span>
                   {{item.price}}
@@ -194,18 +199,21 @@
                 <div class="tips-title">{{item.coupon_name}}</div>
                 <div class="tips-ts">有效期至{{item.ex_time}}</div>
               </div>
-              <div class="choice-icon" @click="selectPupop(item,index)">
+              <div class="choice-icon"
+                   @click="selectPupop(item,index)">
                 <img :src="item.isSelect?select:unSelect" />
               </div>
             </div>
             <div class="bottom">
-              <div class="coupon-notes" @click="isOver=!isOver">
+              <div class="coupon-notes"
+                   @click="isOver=!isOver">
                 <div class="notes-text min-size">
                   <span v-if="!isOver">{{item.coupon_desc |ellipsis(20)}}</span>
                   <span v-else>{{item.coupon_desc}}</span>
                 </div>
                 <div class="notes-icon">
-                  <img :src="isOver?open:unOpen" alt />
+                  <img :src="isOver?open:unOpen"
+                       alt />
                 </div>
               </div>
             </div>
@@ -216,136 +224,130 @@
     <!-- 选择项目 -->
     <mine-pupop :show="isProject">
       <div class="project-block">
-        <div class="delete-pupop" @click="isProject=false">
-          <img
-            src="https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/icon/slices/delete.png"
-            alt
-          />
+        <div class="delete-pupop"
+             @click="isProject=false">
+          <img src="https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/icon/slices/delete.png"
+               alt />
         </div>
         <div class="project-pupop-title">选择项目</div>
         <div class="project-select">
-          <el-select
-            v-model="projectInfo"
-            placeholder="请选择项目"
-            style="width: 295px;"
-            @change="getProducts"
-            size="mini"
-          >
-            <el-option
-              v-for="item in projectList"
-              :key="item.id"
-              :label="item.name"
-              :value="item.id"
-            ></el-option>
+          <el-select v-model="classifyInfo"
+                     placeholder="请选择分类"
+                     style="width: 295px;"
+                     @change="getClassify"
+                     size="mini">
+            <el-option v-for="item in classifyList"
+                       :key="item.id"
+                       :label="item.name"
+                       :value="item.id">
+            </el-option>
+          </el-select>
+        </div>
+        <div class="project-select">
+          <el-select v-model="projectInfo"
+                     placeholder="请选择项目"
+                     style="width: 295px;"
+                     :disabled="classifyInfo.length==0?true:false"
+                     @change="getProducts"
+                     size="mini">
+            <el-option v-for="item in projectList"
+                       :key="item.id"
+                       :label="item.name"
+                       :value="item.id"></el-option>
           </el-select>
         </div>
         <div class="products-select">
-          <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.id"
-              :label="item.name"
-              :value="item.id"
-            ></el-option>
+          <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.id"
+                       :label="item.name"
+                       :value="item.id"></el-option>
           </el-select>
         </div>
-        <div class="products-button" @click="orderUpdate">确定</div>
+        <div class="products-button"
+             @click="orderUpdate">确定</div>
       </div>
     </mine-pupop>
     <!-- 选择时间 -->
     <mine-pupop :show="isTs">
       <div class="ts-block">
-        <div class="delete-pupop" @click="isTs=false">
-          <img
-            src="https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/icon/slices/delete.png"
-            alt
-          />
+        <div class="delete-pupop"
+             @click="isTs=false">
+          <img src="https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/icon/slices/delete.png"
+               alt />
         </div>
         <div class="ts-pupop-title">选择时间</div>
         <div class="ts-content">
           <ul class="ts-table">
-            <li
-              v-for="item,index in tsTableList"
-              :key="index"
-              @click="changetsTable(index)"
-              :class="tsTableIndex==index?'ts-table-active':''"
-            >
+            <li v-for="item,index in tsTableList"
+                :key="index"
+                @click="changetsTable(index)"
+                :class="tsTableIndex==index?'ts-table-active':''">
               <div>{{item.text}}</div>
               <div>{{item.ts}}</div>
             </li>
           </ul>
           <div v-if="tsBodyList.day">
             <div class="time-slot">
-              <div
-                class="day"
-                @click="changeActive(1)"
-                :style="active==1?'color: #333333;font-weight: 600;':''"
-              >{{ tsBodyList.day.name}}</div>
-              <div
-                class="night"
-                @click="changeActive(0)"
-                :style="active==0?'color: #333333;font-weight: 600;':''"
-              >{{tsBodyList.night.name}}</div>
+              <div class="day"
+                   @click="changeActive(1)"
+                   :style="active==1?'color: #333333;font-weight: 600;':''">{{ tsBodyList.day.name}}</div>
+              <div class="night"
+                   @click="changeActive(0)"
+                   :style="active==0?'color: #333333;font-weight: 600;':''">{{tsBodyList.night.name}}</div>
             </div>
-            <ul class="ts-boty" v-if="active==1">
-              <li v-for="item,index in tsBodyList.day.list" :key="index">
-                <div
-                  :style="item.status==0?'color: #D3D3D3;':''"
-                  @click="selectTime(item)"
-                  :class="timeIndexText==item.order_time?'time-active':''"
-                >{{item.order_time}}</div>
+            <ul class="ts-boty"
+                v-if="active==1">
+              <li v-for="item,index in tsBodyList.day.list"
+                  :key="index">
+                <div :style="item.status==0?'color: #D3D3D3;':''"
+                     @click="selectTime(item)"
+                     :class="timeIndexText==item.order_time?'time-active':''">{{item.order_time}}</div>
               </li>
             </ul>
-            <ul class="ts-boty" v-else>
-              <li v-for="item,index in tsBodyList.night.list" :key="index">
-                <div
-                  :style="item.status==0?'color: #D3D3D3;':''"
-                  @click="selectTime(item)"
-                  :class="timeIndexText==item.order_time?'time-active':''"
-                >{{item.order_time}}</div>
+            <ul class="ts-boty"
+                v-else>
+              <li v-for="item,index in tsBodyList.night.list"
+                  :key="index">
+                <div :style="item.status==0?'color: #D3D3D3;':''"
+                     @click="selectTime(item)"
+                     :class="timeIndexText==item.order_time?'time-active':''">{{item.order_time}}</div>
               </li>
             </ul>
           </div>
         </div>
-        <el-button
-          class="ts-button"
-          :style="this.timeIndexText.length == 0?'background: rgb(211, 211, 211);':''"
-          @click="comfigTs"
-        >确认</el-button>
+        <el-button class="ts-button"
+                   :style="this.timeIndexText.length == 0?'background: rgb(211, 211, 211);':''"
+                   @click="comfigTs">确认</el-button>
       </div>
     </mine-pupop>
     <!-- 皮肤状态 -->
     <mine-pupop :show="isPore">
       <div class="pore-block">
-        <div class="delete-pupop" @click="isPore=false">
-          <img
-            src="https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/icon/slices/delete.png"
-            alt
-          />
+        <div class="delete-pupop"
+             @click="isPore=false">
+          <img src="https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/icon/slices/delete.png"
+               alt />
         </div>
         <div class="pore-content">
           <ul>
-            <li class="pore-info" v-for="item,index in poreList" :key="index">
+            <li class="pore-info"
+                v-for="item,index in poreList"
+                :key="index">
               <div class="pore-top">
                 <div class="pore-title">
                   <div>{{item.name}}</div>
-                  <div
-                    class="pore-medium"
-                    v-if="item.main_item"
-                  >{{item.main_item.name}}{{item.main_item.num}}</div>
+                  <div class="pore-medium"
+                       v-if="item.main_item">{{item.main_item.name}}{{item.main_item.num}}</div>
                 </div>
                 <div class="pore-over">
-                  <div
-                    class="min-size"
-                    v-for="value,index in item.items"
-                    :key="index"
-                  >{{value.name}}{{value.num}}个</div>
+                  <div class="min-size"
+                       v-for="value,index in item.items"
+                       :key="index">{{value.name}}{{value.num}}个</div>
                 </div>
               </div>
               <div class="pore-bottom min-size">{{item.suggest | ellipsis(85)}}</div>
@@ -364,7 +366,7 @@ import api from "../../../server/home";
 
 export default {
   components: { minePupop },
-  data() {
+  data () {
     return {
       open:
         "https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/icon/coupon/openNotes.png",
@@ -384,6 +386,8 @@ export default {
       }, //门店
       //项目列表
       projectList: [],
+      //项目分类列表
+      classifyList: [],
       //升级包列表
       productsList: [],
       //时间列表（头部）
@@ -409,6 +413,7 @@ export default {
       timeIndexText: "", //当前选择的时间
       weekInfo: "",
       programmeIndex: "",
+      classifyInfo: '',
       remarks: "",
       isCoupun: false, //是否展示优惠券弹窗
       isOver: false, //优惠券注释
@@ -441,16 +446,26 @@ export default {
   watch: {},
 
   methods: {
-    toHome() {
+    toHome () {
       this.$router.replace("/home");
     },
-
-    getProjectList() {
-      api.getProjectList().then(res => {
+    getProjectClassify () {
+      api.projectClassify().then(res => {
+        this.classifyList = res.data.list
+      })
+    },
+    getProjectList (e) {
+      api.getProjectList({ id: e }).then(res => {
         this.projectList = res.data.list;
       });
     },
-    getProducts(e) {
+    getClassify (e) {
+      this.projectInfo = ''
+      console.log(e);
+      this.getProjectList(e)
+    },
+
+    getProducts (e) {
       // this.productsInfo = ''
       api.getProducts({ id: e }).then(res => {
         this.productsList = res.data.list;
@@ -461,7 +476,7 @@ export default {
         });
       });
     },
-    eidt(item) {
+    eidt (item) {
       this.projectInfo = item.id;
       this.productsInfo =
         item.product_ids == "" ? "" : Number(item.product_ids);
@@ -469,7 +484,7 @@ export default {
       this.isEditProject = true;
       this.isProject = true;
     },
-    deleteProject(item) {
+    deleteProject (item) {
       this.order_data.project_list.forEach((res, index) => {
         if (item.id == res.id) {
           this.order_data.project_list.splice(index, 1);
@@ -480,14 +495,14 @@ export default {
         }
       });
     },
-    addProject() {
+    addProject () {
       this.projectInfo = "";
       this.productsInfo = "";
       this.isEditProject = false;
       this.isProject = true;
     },
     //新增
-    orderUpdate() {
+    orderUpdate () {
       // 编辑
       if (this.isEditProject) {
         if (this.productsInfo != "") {
@@ -568,7 +583,7 @@ export default {
       }
     },
     //获取最近七天的时间
-    getWeekDate() {
+    getWeekDate () {
       //获取系统当前时间
       let now = new Date();
       let nowTime = now.getTime();
@@ -592,7 +607,7 @@ export default {
       this.tsTableList = tsTableList;
     },
     //确定订单&支付
-    determine() {
+    determine () {
       if (this.order_data.project_list == 0) {
         this.$message.error(
           "项目选择不能为空!"
@@ -606,7 +621,7 @@ export default {
       this.isTs = true;
     },
     //确定时间选择
-    comfigTs() {
+    comfigTs () {
       let that = this;
       if (this.timeIndexText.length == 0) return;
       let order_data = [];
@@ -637,22 +652,22 @@ export default {
       });
     },
     //计算预约费用
-    calculationPrice() {
+    calculationPrice () {
       this.reservationPrice = 0;
       this.order_data.project_list.forEach(res => {
         this.reservationPrice += Number(res.price);
       });
     },
 
-    
-    changePayStatus() {
+
+    changePayStatus () {
       this.PayStatus = false;
       if (this.payStatusInterval) {
         //如果定时器在运行则关闭
         clearInterval(this.payStatusInterval);
       }
     },
-    payStatus() {
+    payStatus () {
       api.payStatus({ id: this.id }).then(res => {
         if (res.data.pay_status == 1) {
           clearInterval(this.payStatusInterval);
@@ -662,7 +677,7 @@ export default {
     },
 
     //数组包含关系
-    includes(arr1, arr2) {
+    includes (arr1, arr2) {
       return arr2.every(val => arr1.includes(val));
     },
     //选中优惠券
@@ -682,19 +697,19 @@ export default {
     // 3、优惠劵可以给多个项目抵扣,
     // 4、默认抵扣金额最高的
     // 5、优惠劵排序，到期时间倒叙
-    
-    changeActive(e) {
+
+    changeActive (e) {
       this.active = e;
     },
-    selectTime(item) {
+    selectTime (item) {
       if (item.status == 0) return;
       this.timeIndexText = item.order_time;
     },
-    changetsTable(index) {
+    changetsTable (index) {
       this.tsTableIndex = index;
       this.getOrderTime();
     },
-    getOrderTime() {
+    getOrderTime () {
       let ids = "",
         idsList = [];
       this.order_data.project_list.forEach(res => {
@@ -710,7 +725,7 @@ export default {
       });
     },
 
-    onOperation(index) {
+    onOperation (index) {
       if (this.programmeList[index].onSelect) {
         this.$set(
           this.programmeList[index],
@@ -722,14 +737,14 @@ export default {
       }
     },
     //获取订单折扣类型
-    getOrderDiscount() {
+    getOrderDiscount () {
       api.getOrderDiscount({ id: this.id }).then(res => {
         this.discount = res.data.discount;
         this.getOrderInfo();
       });
     },
 
-    getUserInfo() {
+    getUserInfo () {
       let that = this;
       api.getUserInfo().then(res => {
         if (res.code == 200) {
@@ -739,7 +754,7 @@ export default {
     }
   },
 
-  created() {
+  created () {
     this.getUserInfo();
     let data = this.$route.query.data;
 
@@ -747,7 +762,6 @@ export default {
     if (data) {
       this.data = JSON.parse(data);
     }
-
     this.userInfo = this.data.user;
     this.lableList = this.data.tags;
     this.remarks = this.data.remark;
@@ -755,13 +769,13 @@ export default {
     // this.order_data = this.data.order_data;
     this.reservationPrice = 0;
     this.poreList = this.data.detail_list;
-
-    this.getProjectList();
+    this.getProjectClassify()
+    // this.getProjectList();
     // this.getOrderDiscount()
   },
 
-  mounted() {},
-  destroyed() {
+  mounted () { },
+  destroyed () {
     if (this.payStatusInterval) {
       //如果定时器在运行则关闭
       clearInterval(this.payStatusInterval);
@@ -1037,7 +1051,7 @@ export default {
       }
       .project-list {
         padding-top: 10px;
-        height: 250px;
+        height: 220px;
         overflow: scroll;
         .project-info {
           margin-bottom: 10px;

src/pages/confirmOrder/details/index.vue

@@ -193,7 +193,7 @@
       4: '项目卡券' -->
             <div class="coupon-tips-text">{{item.type==1?'抵扣券':item.type==2?'满减券':item.type==3?'全额减免券':'项目卡券'}}</div>
             <div class="top">
-              <div v-if="item.type==3"
+              <div v-if="item.type==3||item.type==4"
                    class="discount-over">全免</div>
               <div v-else
                    class="discount">
@@ -230,9 +230,23 @@
                alt=""></div>
         <div class="project-pupop-title">选择项目</div>
         <div class="project-select">
+          <el-select v-model="classifyInfo"
+                     placeholder="请选择分类"
+                     style="width: 295px;"
+                     @change="getClassify"
+                     size="mini">
+            <el-option v-for="item in classifyList"
+                       :key="item.id"
+                       :label="item.name"
+                       :value="item.id">
+            </el-option>
+          </el-select>
+        </div>
+        <div class="project-select">
           <el-select v-model="projectInfo"
                      placeholder="请选择项目"
                      style="width: 295px;"
+                     :disabled="classifyInfo.length==0?true:false"
                      @change="getProducts"
                      size="mini">
             <el-option v-for="item in projectList"
@@ -417,6 +431,8 @@ export default {
       //执行方案
       programmeList: [],
       order_data: {},//门店
+      //项目分类列表
+      classifyList: [],
       //项目列表
       projectList: [],
       //升级包列表
@@ -462,6 +478,7 @@ export default {
       reservationPrice: 0,//预约费用
       projectInfo: '',
       productsInfo: '',
+      classifyInfo: '',
       timeIndexText: "",//当前选择的时间
       weekInfo: '',
       programmeIndex: '',
@@ -527,13 +544,22 @@ export default {
         this.calculationPrice()
       })
     },
-    getProjectList () {
-      api.getProjectList().then(res => {
+    getProjectClassify () {
+      api.projectClassify().then(res => {
+        this.classifyList = res.data.list
+      })
+    },
+    getProjectList (e) {
+      api.getProjectList({ id: e }).then(res => {
         this.projectList = res.data.list
       })
     },
+    getClassify (e) {
+      this.projectInfo = ''
+      console.log(e);
+      this.getProjectList(e)
+    },
     getProducts (e) {
-      // this.productsInfo = ''
       api.getProducts({ id: e }).then(res => {
         this.productsList = res.data.list
         this.productsList.forEach(item => {
@@ -765,6 +791,7 @@ export default {
             let couponInfo = {}
             couponInfo['id'] = item.projectids
             couponInfo['coupon_id'] = item.id
+            coupon_data.push(couponInfo)
           }
         })
       }
@@ -1047,8 +1074,8 @@ export default {
     if (id) {
       this.id = id
     }
+    this.getProjectClassify()
 
-    this.getProjectList()
     this.getOrderDiscount()
 
   },

src/pages/confirmOrder/index.vue

@@ -45,7 +45,7 @@ export default {
       //十分钟强制清除，防止页面崩溃
       this.checkCodeTimeout = setTimeout(() => {
         clearTimeout(this.checkCodeTimeout);
-      }, 360000);
+      }, 360000); 
     },
     getOrderByCode() {
       api.getOrderByCode({ ticket: this.ticket }).then(res => {

src/pages/historicalOrder/index.vue

@@ -61,7 +61,7 @@
                          label="状态"
                          show-overflow-tooltip>
           <template slot-scope="scope">
-            <div :style="scope.row.status==0?'color: #FC3019':scope.row.status==5?'color: #A999EA':'color: #61D09D;'">{{ scope.row.status==0?'未支付':scope.row.status==5?'已取消':'待使用' }}</div>
+            <div :style="scope.row.status==0?'color: #FC3019':scope.row.status==5?'color: #A999EA':'color: #61D09D;'">{{ scope.row.status==0?'未支付':scope.row.status==5?'已取消':scope.row.status==1?'待使用':scope.row.status==2?'正在使用':scope.row.status==3?'已结算':'' }}</div>
           </template>
         </el-table-column>
       </el-table>

src/pages/login/login.vue

@@ -31,6 +31,7 @@
 
 <script>
 import api from '../../server/home'
+import axios from 'axios';
 // import Cookies from "js-cookie"
 export default {
   components: {},
@@ -52,8 +53,8 @@ export default {
       }
       api.getToken(params).then(res => {
         if (res.code == 200) {
-          this.$store.state.comVal.token = res.data.token
           localStorage.setItem("token", res.data.token)
+          axios.defaults.headers.token = res.data.token
           this.$router.push({
             path: '/home'
           })
@@ -62,7 +63,6 @@ export default {
         }
       })
     }
-
   },
 
   created () {

src/server/home.js

@@ -69,6 +69,9 @@ export default class Home {
   static getOrderDiscount (parms) {
     return $http.get(url.getOrderDiscount, parms);
   }
+  static projectClassify (parms) {
+    return $http.get(url.projectClassify, parms);
+  }
 
   // 获取历史订单
   static getOrderList (parms) {

src/server/urls.js

@@ -39,6 +39,8 @@ export default {
   payStatus: '/v2/pad/order/pay_status',
   //活动折扣
   getOrderDiscount: '/v2/pad/order/discount',
+  //获取项目分类
+  projectClassify: '/v2/pad/project/classify',
 
   /**
    *  by ListKer