feat: 联调0517

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/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,5 +1,8 @@
 // 自定义全局方法封装
 const utils = {
+  userInfo:{
+    
+  },
   test: function () { },
   isBack: false,
   formatTime: function (date, 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/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/home/index.vue

@@ -15,31 +15,38 @@
     </div>
     <div class="order-list">
       <div class="title">预约订单列表</div>
-      <div class="list-info">
+      <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.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,i in item.imgList"
-                :key="i"><img :src="value"
+                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>
@@ -69,66 +76,6 @@ export default {
         },
       ],
       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: '未支付'
-        },
       ],
 
     }
@@ -154,9 +101,21 @@ export default {
     },
     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 () {
 
     },
@@ -313,6 +272,13 @@ export default {
         }
       }
     }
+    .empty {
+      height: 300px;
+      line-height: 300px;
+      width: 100%;
+      font-size: 28px;
+      color: slategrey;
+    }
   }
 }
 </style>

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

@@ -30,7 +30,7 @@
         <div class="tab user-info"
              v-for="(item,index) in userList"
              :key="index"
-             @click="onDetails">
+             @click="onDetails(item.id)">
           <div class="head-img"><img :src="item.avatar_url"
                  alt=""></div>
           <div class="head-name">{{ item.nickname }}</div>
@@ -91,9 +91,12 @@ export default {
         }
       })
     },
-    onDetails () {
+    onDetails (e) {
       this.$router.push({
-        path: '/testSkin/details'
+        path: '/testSkin/details',
+        query: {
+          id: e
+        }
       })
     },
     handleCurrentChange (e) {

src/server/home.js

@@ -21,6 +21,24 @@ export default class Home {
   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 getOrderInfo (parms) {
+    return $http.get(url.getOrderInfo, parms);
+  }
+  static getSkinTags (parms) {
+    return $http.get(url.getSkinTags, parms);
+  }
+  static getSkinUpdate (parms) {
+    return $http.post(url.getSkinUpdate, parms);
+  }
 }
 
 

src/server/urls.js

@@ -2,9 +2,21 @@ export default {
   //登录
   getToken: '/v2/pad/login',
   //首页数据
-  getTotal:'/v2/pad/home/total',
+  getTotal: '/v2/pad/home/total',
   //今日订单列表
-  getToday:'/v2/pad/order/today',
+  getToday: '/v2/pad/order/today',
   //测肤记录列表
-  getSkinList:'/v2/pad/skin/list',
+  getSkinList: '/v2/pad/skin/list',
+  //测肤记录详情
+  getSkinInfo: '/v2/pad/skin/info',
+  //获取项目列表
+  getProject: '/v2/pad/scheme/project',
+  //获取用户信息
+  getUserInfo: '/v2/pad/account/info',
+  //获取订单详情
+  getOrderInfo: '/v2/pad/order/info',
+  //后台默认的标签
+  getSkinTags: '/v2/pad/skin/tags',
+  //保存测肤记录
+  getSkinUpdate:'/v2/pad/skin/update',
 }