feat: 代码提交

src/pages/testSkin/details/index.vue

@@ -149,7 +149,7 @@
             v-for="item,index in skinTag"
             :key="index"
             @click="selectSkingTag(index)"
-          >{{item.title}}</div>
+          >{{item.name}}</div>
         </div>
 
         <div class="submit-frequency" @click="submitFrequency(1)">下一步</div>
@@ -168,14 +168,14 @@
 
         <div class="faceTag">
           <div class="faceTagContent" v-for="item,index in faceTagData" :key="index">
-            <div class="faceTagTitle">{{item.title}}</div>
+            <div class="faceTagTitle">{{item.name}}</div>
             <div class="faceTagHor">
               <div
                 :class="tag.select?'faceTagItem':'faceTagItem-not'"
-                v-for="tag,index1 in item.item"
+                v-for="tag,index1 in item.dataS"
                 :key="index1"
                 @click="selectfaceTag(index,index1)"
-              >{{tag.title}}</div>
+              >{{tag.name}}</div>
             </div>
           </div>
         </div>
@@ -194,7 +194,7 @@
         </div>
         <div class="pupop-title">备注</div>
 
-        <textarea type="text" class="noticeInput" placeholder="备注"></textarea>
+        <textarea type="text" class="noticeInput" placeholder="备注" v-model="noticeInput"></textarea>
 
         <div class="noticeSubmit">
           <div class="submit-back" @click="backSubmit(3)">返回</div>
@@ -274,6 +274,7 @@ export default {
       ],
       //后台默认的标签
       tags: [],
+      noticeInput: "",
       notice: false,
       //执行方案
       programmeList: [
@@ -291,110 +292,9 @@ export default {
         }
       ],
       faceTag: false,
-      faceTagData: [
-        {
-          title: "额头",
-          item: [
-            { title: "title", select: false },
-            { title: "title", select: false },
-            { title: "title", select: false }
-          ]
-        },
-        {
-          title: "额头",
-          item: [
-            { title: "title", select: false },
-            { title: "title", select: false },
-            { title: "title", select: false },
-            { title: "title", select: false }
-          ]
-        },
-        {
-          title: "额头",
-          item: [
-            { title: "title", select: false },
-            { title: "title", select: false },
-            { title: "title", select: false },
-            { title: "title", select: false },
-            { title: "title", select: false },
-            { title: "title", select: false }
-          ]
-        },
-        {
-          title: "额头",
-          item: [
-            { title: "title", select: false },
-            { title: "title", select: false },
-            { title: "title", select: false }
-          ]
-        },
-        {
-          title: "额头",
-          item: [
-            { title: "title", select: false },
-            { title: "title", select: false }
-          ]
-        },
-        {
-          title: "额头",
-          item: [
-            { title: "title", select: false },
-            { title: "title", select: false }
-          ]
-        },
-        {
-          title: "额头",
-          item: [
-            { title: "title", select: false },
-            { title: "title", select: false },
-            { title: "title", select: false },
-            { title: "title", select: false }
-          ]
-        }
-      ],
+      faceTagData: [],
       selectWeek: 0,
-      skinTag: [
-        {
-          title: "啥子标签",
-          id: "1",
-          select: true
-        },
-        {
-          title: "啥子标签",
-          id: "1",
-          select: false
-        },
-        {
-          title: "啥子标签",
-          id: "1",
-          select: false
-        },
-        {
-          title: "啥子标签",
-          id: "1",
-          select: false
-        },
-        {
-          title: "啥子标签",
-          id: "1",
-          select: false
-        },
-        {
-          title: "啥子标签",
-          id: "1",
-          select: false
-        },
-        {
-          title: "啥子标签",
-          id: "1",
-          select: false
-        },
-        {
-          title: "啥子标签",
-          id: "1",
-          select: false
-        }
-      ],
+      skinTag: [],
 
       //项目列表
       projectList: [
@@ -465,6 +365,41 @@ export default {
         // this.remarks = res.data.remark
       });
     },
+
+    // 获取问题标签
+    skinFace_tags() {
+      api.skinFace_tags().then(res => {
+        let doSkin = [];
+        for (let i = 0; i < res.data.list.length; i++) {
+          let skinItem = res.data.list[i];
+          skinItem.dataS = [];
+          for (let j = 0; j < skinItem.question_name.length; j++) {
+            let doNow = {
+              name: skinItem.question_name[j],
+              select: false
+            };
+            skinItem.dataS.push(doNow);
+          }
+          doSkin.push(skinItem);
+        }
+        console.log(doSkin);
+        this.faceTagData = doSkin;
+      });
+    },
+
+    // 获取皮肤问题标签
+    skinSkin_tags() {
+      api.skinSkin_tags().then(res => {
+        let doSkin = [];
+        for (let i = 0; i < res.data.list.length; i++) {
+          let skinItem = res.data.list[i];
+          skinItem.select = false;
+          doSkin.push(skinItem);
+        }
+        this.skinTag = doSkin;
+      });
+    },
+
     getSkinTags() {
       api.getSkinTags().then(res => {
         this.tags = res.data.tags;
@@ -476,8 +411,8 @@ export default {
     },
 
     selectfaceTag(index, index1) {
-      this.faceTagData[index].item[index1].select = !this.faceTagData[index]
-        .item[index1].select;
+      this.faceTagData[index].dataS[index1].select = !this.faceTagData[index]
+        .dataS[index1].select;
     },
 
     getProject() {
@@ -513,7 +448,7 @@ export default {
       this.getSkinUpdate();
     },
     submitFrequency(e) {
-      console.log(e);
+      console.log(this.noticeInput);
       if (e == 1) {
         this.isSkin = false;
         this.faceTag = true;
@@ -525,14 +460,50 @@ export default {
       }
 
       if (e == 4) {
-        this.$router.push({
-          path: "/testSkin/updates",
-          query: {
-            id: e
+        this.schemeSave();
+      }
+    },
+
+    // 面部标签值，如：额头:颜色,横纹;眼部:下垂;
+    schemeSave() {
+      let skinTags = "";
+      let FaceTags = "";
+      for (let i = 0; i < this.skinTag.length; i++) {
+        if (this.skinTag[i].select) {
+          skinTags = this.skinTag[i].id;
+        }
+      }
+
+      for (let i = 0; i < this.faceTagData.length; i++) {
+        for (let j = 0; j < this.faceTagData[i].dataS.length; j++) {
+          if (this.faceTagData[i].dataS[j].select) {
+            FaceTags =
+              FaceTags +
+              "," +
+              this.faceTagData[i].name +
+              ":" +
+              this.faceTagData[i].dataS[j].name;
           }
-        });
+        }
       }
+
+      api
+        .schemeSave({
+          user_id: this.id,
+          skin_id: skinTags,
+          face_names: FaceTags.substring(1,FaceTags.length),
+          remark: this.noticeInput
+        })
+        .then(res => {
+          this.$router.push({
+            path: "/testSkin/updates",
+            query: {
+              id: 1
+            }
+          });
+        });
     },
+
     randomColor(type) {
       let arr = [
         {
@@ -572,6 +543,8 @@ export default {
   created() {
     let id = this.$route.query.id;
     this.id = id;
+    this.skinFace_tags();
+    this.skinSkin_tags();
     this.getSkinInfo();
     this.getProject();
     this.getSkinTags();

src/server/home.js

@@ -6,85 +6,85 @@ export default class Home {
   /**
    * @描述  1.1	获取用户信息
    */
-  static getToken (parms) {
+  static getToken(parms) {
     return $http.post(url.getToken, parms);
   }
 
-  static getTotal (parms) {
+  static getTotal(parms) {
     return $http.get(url.getTotal, parms);
   }
 
-  static getToday (parms) {
+  static getToday(parms) {
     return $http.get(url.getToday, parms);
   }
 
-  static getSkinList (parms) {
+  static getSkinList(parms) {
     return $http.get(url.getSkinList, parms);
   }
-  static getSkinInfo (parms) {
+  static getSkinInfo(parms) {
     return $http.get(url.getSkinInfo, parms);
   }
-  static getProject (parms) {
+  static getProject(parms) {
     return $http.get(url.getProject, parms);
   }
-  static getUserInfo (parms) {
+  static getUserInfo(parms) {
     return $http.get(url.getUserInfo, parms);
   }
-  static getSkinTags (parms) {
+  static getSkinTags(parms) {
     return $http.get(url.getSkinTags, parms);
   }
-  static getSkinUpdate (parms) {
+  static getSkinUpdate(parms) {
     return $http.post(url.getSkinUpdate, parms);
   }
-  static getProjectList (parms) {
+  static getProjectList(parms) {
     return $http.get(url.getProjectList, parms);
   }
-  static getProducts (parms) {
+  static getProducts(parms) {
     return $http.get(url.getProducts, parms);
   }
-  static getOrderTime (parms) {
+  static getOrderTime(parms) {
     return $http.get(url.getOrderTime, parms);
   }
-  static setOrderUpdate (parms) {
+  static setOrderUpdate(parms) {
     return $http.post(url.setOrderUpdate, parms);
   }
-  static getOrderCoupon (parms) {
+  static getOrderCoupon(parms) {
     return $http.get(url.getOrderCoupon, parms);
   }
-  static getAuthCode (parms) {
+  static getAuthCode(parms) {
     return $http.get(url.getAuthCode, parms);
   }
-  static checkCode (parms) {
+  static checkCode(parms) {
     return $http.get(url.checkCode, parms);
   }
-  static getOrderByCode (parms) {
+  static getOrderByCode(parms) {
     return $http.get(url.getOrderByCode, parms);
   }
-  static orderPay (parms) {
+  static orderPay(parms) {
     return $http.post(url.orderPay, parms);
   }
-  static payStatus (parms) {
+  static payStatus(parms) {
     return $http.get(url.payStatus, parms);
   }
-  static getOrderDiscount (parms) {
+  static getOrderDiscount(parms) {
     return $http.get(url.getOrderDiscount, parms);
   }
-  static projectClassify (parms) {
+  static projectClassify(parms) {
     return $http.get(url.projectClassify, parms);
   }
 
   // 获取历史订单
-  static getOrderList (parms) {
+  static getOrderList(parms) {
     return $http.get(url.getOrderList, parms);
   }
 
   // 获取订单详情
-  static getOrderInfo (parms) {
+  static getOrderInfo(parms) {
     return $http.get(url.getOrderInfo, parms);
   }
 
   // 获取用户列表
-  static getUserList (parms) {
+  static getUserList(parms) {
     return $http.get(url.getUserList, parms);
   }
 
@@ -94,42 +94,53 @@ export default class Home {
   // }
 
   // 获取优惠券列表
-  static getCouponInfo (parms) {
+  static getCouponInfo(parms) {
     return $http.get(url.getCouponInfo, parms);
   }
 
   // 发送优惠券接口
-  static sendCoupon (parms) {
+  static sendCoupon(parms) {
     return $http.post(url.sendCoupon, parms);
   }
 
   // 获取用户详情接口
-  static getPadUserInfo (parms) {
+  static getPadUserInfo(parms) {
     return $http.get(url.getPadUserInfo, parms);
   }
 
   // 获取优惠券订单
-  static getUserCoupon (parms) {
+  static getUserCoupon(parms) {
     return $http.get(url.getUserCoupon, parms);
   }
 
   // 获取商品订单
-  static getUserGoods (parms) {
+  static getUserGoods(parms) {
     return $http.get(url.getUserGoods, parms);
   }
 
   // 获取项目订单
-  static getUserProject (parms) {
+  static getUserProject(parms) {
     return $http.get(url.getUserProject, parms);
   }
 
   // 新增项目订单
-  static padOrderAdd (parms) {
+  static padOrderAdd(parms) {
     return $http.post(url.padOrderAdd, parms);
   }
 
-}
-
-
-
+  // 面部问题标签
+  static skinFace_tags(parms) {
+    return $http.get(url.skinFace_tags, parms);
+  }
 
+  // 皮肤问题标签
+  static skinSkin_tags(parms) {
+    return $http.get(url.skinSkin_tags, parms);
+  }
+  
+  // 新增项目订单
+  static schemeSave(parms) {
+    return $http.post(url.schemeSave, parms);
+  }
+  
+}

src/server/urls.js

@@ -79,4 +79,13 @@ export default {
   // 获取优惠券订单
   padOrderAdd: '/v2/pad/order/add',
 
+  // 面部问题标签
+  skinFace_tags: '/v2/pad/skin/face_tags',
+
+  // 皮肤问题标签
+  skinSkin_tags: '/v2/pad/skin/skin_tags',
+
+  // 创建标签
+  schemeSave: '/v2/pad/scheme/save',
+
 }