feat: 上线

src/components/common/layout/layout.vue

@@ -187,11 +187,13 @@ export default {
         border-radius: 50%;
         img {
           width: 100%;
+          border-radius: 50%;
           display: block;
         }
       }
       .el-dropdown-link {
         img {
+          margin-left: 20px;
           width: 28px;
           height: 28px;
           display: block;

src/pages/confirmOrder/details/index.vue

@@ -365,7 +365,7 @@
     <mine-pupop :show="PayStatus">
       <div class="pay-block">
         <div class="delete-pupop"
-             @click="PayStatus=false"><img src="https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/icon/slices/delete.png"
+             @click="changePayStatus"><img src="https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/icon/slices/delete.png"
                alt=""></div>
         <div v-if="isPayCode">
           <div class="pay-title">请扫码支付</div>
@@ -685,9 +685,9 @@ export default {
         this.reservationPrice += Number(res.price)
       })
     },
+
     //获取订单优惠券
     onCoupon () {
-
       if (this.couponList.length > 0) {
         this.isCoupun = true
         return
@@ -769,9 +769,14 @@ export default {
 
       })
     },
+    changePayStatus () {
+      this.PayStatus = false
+      if (this.payStatusInterval) { //如果定时器在运行则关闭
+        clearInterval(this.payStatusInterval)
+      }
+    },
     payStatus () {
       api.payStatus({ id: this.id, }).then(res => {
-
         if (res.data.pay_status == 1) {
           clearInterval(this.payStatusInterval)
           this.isPayCode = false
@@ -808,9 +813,7 @@ export default {
        */
     selectPupop: function (item, index) {
 
-
       let CouPonIndex = this.couponList
-
       let selectIndex = index
       let curreValue = !CouPonIndex[selectIndex].isSelect
       let project_list = this.order_data.project_list //这里是项目列表
@@ -860,8 +863,6 @@ export default {
       this.order_data = orderDetails1
       this.couponList = CouPonIndex
       this.coupSelectType = this.couponList[selectIndex].type
-
-
       this.selectCoup()
 
     },
@@ -889,11 +890,12 @@ export default {
       let project_list = this.order_data.project_list //这里是项目列表
       let isSelectCoup = this.isSelectCoup //这里选择了的卡券列表
       let selectProjectList = [] // 适合的卡券列表
-      // let CouPonIndex = this.CouPonIndex // 卡券选择的Id
+      // let CouPonIndex = this.CouPonIndex // 卡券选择的Id\
       let productDiscount = this.couponList // 卡券列表
-        (productDiscount)
+      console.log(this.couponList, 'this.couponList');
+      (productDiscount)
       // debugger
-      if (isSelectCoup[0].type == 4) {
+      if (isSelectCoup.length > 0 && isSelectCoup[0].type && isSelectCoup[0].type == 4) {
         for (let i = 0; i < isSelectCoup.length; i++) { // 首先遍历卡券
           if (!isSelectCoup[i].projectids) { // 如果卡券没绑定项目
 
@@ -938,7 +940,7 @@ export default {
     // 计算总额
     calculateMoney () {
       let that = this
-      let money = this.order_data.price
+      let money = Number(this.order_data.price)
       let isSelectCoup = this.isSelectCoup
       let project_list = this.order_data.project_list //这里是项目列表
 
@@ -951,17 +953,17 @@ export default {
       if (isSelectCoup[0].type == 4) {
         for (let i = 0; i < project_list.length; i++) {
           if (project_list[i].cardId) {
-            money = money - project_list[i].price
+            money = money - Number(project_list[i].price)
           }
         }
         this.showMoney = money.toFixed(2)
       } else if (isSelectCoup[0].type == 3) {
         for (let i = 0; i < project_list.length; i++) {
-          money = money - project_list[i].price
+          money = money - Number(project_list[i].price)
         }
 
       } else {
-        money = money - isSelectCoup[0].price
+        money = money - Number(isSelectCoup[0].price)
       }
 
       this.showMoney = money.toFixed(2)

src/pages/coupon/index.vue

@@ -34,7 +34,7 @@
       <el-table ref="multipleTable"
                 :data="tableData"
                 tooltip-effect="dark"
-                height="354"
+                height="500"
                 style="width: 100%;border-radius: 8px;"
                 @selection-change="handleSelectionChange">
         <el-table-column type="selection"
@@ -110,7 +110,14 @@ export default {
         user_ids: selectIds.substring(1, selectIds.length),
         num: this.couponNum
       };
-      api.sendCoupon(params).then(res => { });
+      api.sendCoupon(params).then(res => {
+        if (res.code == 200) {
+          this.$message({
+            message: '发送成功',
+            type: 'success'
+          });
+        }
+      });
     },
 
     // 获取订单列表

src/pages/customerMan/details/index.vue

@@ -3,7 +3,8 @@
     <div class="left">
       <div class="user-info">
         <div class="user-img">
-          <img :src="userInfo.avatar_url" alt />
+          <img :src="userInfo.avatar_url"
+               alt />
         </div>
         <div class="user-span">
           <div class="name">
@@ -82,7 +83,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.text}}</div>
+              <div v-for="(item,index) in lableList"
+                   :key="index"
+                   class="lable-info">{{item.text}}</div>
             </div>
           </div>
           <div class="ps">
@@ -91,18 +94,22 @@
           </div>
         </div>
         <div class="right-top-list">
-          <div class="dataList" @click="toOrder(1)">
-            <img :src="userInfo.image" />
+          <div class="dataList"
+               @click="toOrder(1)">
+            <img src="https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/icon/coupon/project_icon.png" />
             <p>项目订单</p>
             <span>{{order_total.project}}</span>
           </div>
-          <div class="dataList" style="margin:18px 0px" @click="toOrder(2)">
-            <img :src="userInfo.image" />
-            <p>卡券订单</p>
+          <div class="dataList"
+               style="margin:18px 0px"
+               @click="toOrder(2)">
+            <img src="https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/icon/coupon/coupon_icon.png" />
+            <p>优惠券</p>
             <span>{{order_total.coupon}}</span>
           </div>
-          <div class="dataList" @click="toOrder(3)">
-            <img :src="userInfo.image" />
+          <div class="dataList"
+               @click="toOrder(3)">
+            <img src="https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/icon/coupon/order_total_icon.png" />
             <p>商品订单</p>
             <span>{{order_total.goods}}</span>
           </div>
@@ -114,18 +121,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="https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/home/make.png"
-                    alt
-                  />
+                  <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>
@@ -146,7 +149,8 @@
                   <span>28天</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>
@@ -162,7 +166,7 @@
 import api from "../../../server/home";
 
 export default {
-  data() {
+  data () {
     return {
       userInfo: {
         image:
@@ -195,7 +199,7 @@ export default {
   watch: {},
 
   methods: {
-    getPadUserInfo() {
+    getPadUserInfo () {
       api.getPadUserInfo({ id: this.id }).then(res => {
         this.userInfo = res.data.user;
         this.remarks = res.data.remark;
@@ -208,7 +212,7 @@ export default {
       });
     },
 
-    onOperation(index) {
+    onOperation (index) {
       if (this.programmeList[index].onSelect) {
         this.$set(
           this.programmeList[index],
@@ -219,27 +223,32 @@ export default {
         this.$set(this.programmeList[index], "onSelect", true);
       }
     },
-    toOrder(index) {
-      if (index === 1) {
+    toOrder (index) {
+      let activeName = 'first'
+      if (index == 3) {
+        activeName = 'third'
+      } else if (index == 2) {
+        activeName = 'second'
+      }
       this.$router.push({
         path: "/customerMan/projectOrder",
         query: {
-          id: this.id
+          id: this.id,
+          activeName: activeName
         }
       });
-      }
     },
-    onSubmit() {},
-    submitFrequency() {}
+    onSubmit () { },
+    submitFrequency () { }
   },
 
-  created() {
+  created () {
     let id = this.$route.query.id;
     this.id = id;
     this.getPadUserInfo();
   },
 
-  mounted() {}
+  mounted () { }
 };
 </script>
 

src/pages/customerMan/index.vue

@@ -16,7 +16,7 @@
       <el-table ref="multipleTable"
                 :data="tableData"
                 tooltip-effect="dark"
-                height="354"
+                height="500"
                 style="width: 100%;border-radius: 8px;"
                 @row-click="handleSelectionChange">
         <el-table-column label="头像"

src/pages/customerMan/myOrder/index.vue

@@ -1,8 +1,10 @@
 <template>
   <div class="order">
     <div class="warp">
-      <el-tabs type="border-card">
-        <el-tab-pane label="项目订单">
+      <el-tabs type="border-card"
+               v-model="activeName">
+        <el-tab-pane label="项目订单"
+                     name="first">
           <div class="user-list">
             <el-table ref="multipleTable"
                       :data="projectData"
@@ -41,7 +43,7 @@
                                label="状态"
                                show-overflow-tooltip>
                 <template slot-scope="scope">
-                  <div :class="'color'+scope.row.status">{{statusStr[scope.row.status]}}</div>
+                  <div :class="'color'+scope.row.status">{{scope.row.status!=5?statusStr[scope.row.status]:statusStr[statusStr.length-1]}}</div>
                 </template>
               </el-table-column>
             </el-table>
@@ -56,7 +58,8 @@
             </div>
           </div>
         </el-tab-pane>
-        <el-tab-pane label="卡卷订单">
+        <el-tab-pane label="卡卷订单"
+                     name="second">
           <div class="user-list">
             <el-table ref="multipleTable"
                       :data="couponData"
@@ -93,7 +96,7 @@ type: "全额券" -->
                                label="状态"
                                show-overflow-tooltip>
                 <template slot-scope="scope">
-                  <div :class="'color'+scope.row.status">{{statusStr[scope.row.status]}}</div>
+                  <div :class="'color'+scope.row.status">{{couponStatus[scope.row.status]}}</div>
                 </template>
               </el-table-column>
             </el-table>
@@ -109,7 +112,8 @@ type: "全额券" -->
           </div>
         </el-tab-pane>
 
-        <el-tab-pane label="商品订单">
+        <el-tab-pane label="商品订单"
+                     name="third">
           <div class="user-list">
             <el-table ref="multipleTable"
                       :data="goodData"
@@ -152,7 +156,7 @@ status: 5 -->
                                label="状态"
                                show-overflow-tooltip>
                 <template slot-scope="scope">
-                  <div :class="'classShow'+scope.$index">{{statusStr[scope.row.status]}}</div>
+                  <div :class="'classShow'+scope.$index">{{scope.row.status==1||scope.row.status==2?goodStatus[scope.row.status]:goodStatus[goodStatus.length-1]}}</div>
                 </template>
               </el-table-column>
             </el-table>
@@ -213,14 +217,23 @@ export default {
         }
       ],
       statusStr: [
-        "已预约",
         "未支付",
-        "已支付",
         "待使用",
         "正在使用",
         "已结算",
         "已取消"
       ],
+      couponStatus: [
+        '待使用',
+        '已使用',
+        '已过期'
+      ],
+      goodStatus: [
+        '未支付',
+        '已支付',
+        '已取货'
+      ],
+      activeName: 'first',
       currentPage1: 1,
       couponData: [],
       goodData: [],
@@ -282,6 +295,8 @@ export default {
 
   created () {
     let id = this.$route.query.id;
+    let activeName = this.$route.query.activeName
+    this.activeName = activeName
     this.id = id;
     this.getUserCoupon();
     this.getUserGoods();

src/pages/historicalOrder/index.vue

@@ -36,7 +36,7 @@
       <el-table ref="multipleTable"
                 :data="tableData"
                 tooltip-effect="dark"
-                height="354"
+                height="500"
                 style="width: 100%;border-radius: 8px;"
                 @row-click="handleSelectionChange">
         <el-table-column label="头像"

src/pages/home/index.vue

@@ -3,6 +3,7 @@
     <div class="tab">
       <div class="make-order"
            v-for="item,index in tabList"
+           @click="changeTable(item.type)"
            :key="index">
         <div class="make-icon">
           <img :src="item.image">
@@ -27,7 +28,8 @@
                @click="toOrderDetails(item)"
                :style="index==orderList.length-1?'border-bottom:0px':''">
             <div class="head-img">
-              <div class="new">新</div><img :src="item.avatar_url"
+              <div class="new"
+                   v-if="item.is_new==1">新</div><img :src="item.avatar_url"
                    alt="">
             </div>
             <div class="user-information">
@@ -69,17 +71,20 @@ export default {
         {
           image: 'https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/home/make.png',
           num: 0,
-          name: '预约订单'
+          name: '预约订单',
+          type: 1,
         },
         {
           image: 'https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/home/unpaid.png',
           num: 0,
-          name: '未支付订单'
+          name: '未支付订单',
+          type: 2,
         },
         {
           image: 'https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/home/cancelOrder.png',
           num: 0,
-          name: '取消订单'
+          name: '取消订单',
+          type: 3
         },
       ],
       orderList: [
@@ -87,7 +92,8 @@ export default {
       loading: false,
       finished: false,
       page: 1,
-      limit: 10
+      limit: 10,
+      type: 0
 
     }
   },
@@ -109,9 +115,16 @@ export default {
         }
       })
     },
+    changeTable (type) {
+      this.type = type
+      this.orderList = []
+      this.loading = false
+      this.finished = false
+      this.page = 1
+    },
     getToday () {
       setTimeout(() => {
-        api.getToday({ page: this.page, limit: this.limit }).then(res => {
+        api.getToday({ page: this.page, limit: this.limit, type: this.type }).then(res => {
           if (res.code = 200) {
             this.orderList = [...this.orderList, ...res.data.list]
             this.page++
@@ -209,7 +222,7 @@ export default {
     }
 
     .list-info {
-      height: 300px;
+      height: 450px;
       overflow: auto;
 
       .user-info {

src/pages/login/login.vue

@@ -57,6 +57,8 @@ export default {
           this.$router.push({
             path: '/home'
           })
+        } else {
+          this.$message.error('账号或密码错误，请核对后输入');
         }
       })
     }

src/router/map/home.js

@@ -37,7 +37,13 @@ export default {
       },
       component: CustomerManDetails
     },
-    { path: '/customerMan/projectOrder', component: projectOrder },
+    {
+      path: '/customerMan/projectOrder',
+      meta: {
+        isback: true,
+      },
+      component: projectOrder
+    },
     { path: '/historicalOrder', component: HistoricalOrder },
     {
       path: '/historicalOrder/details',