From 6da156b0f0b6fdba7de16431c795213f50ddd362 Mon Sep 17 00:00:00 2001
From: liudan <18634735655@163.com>
Date: Tue, 3 Jan 2023 09:21:58 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 page/constitutionAnalyse/constitutionAnalyse.js | 15 ++++++++++++++-
 page/identificationTwo/identificationTwo.js     |  8 ++++----
 2 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/page/constitutionAnalyse/constitutionAnalyse.js b/page/constitutionAnalyse/constitutionAnalyse.js
index 99f1ab5..67bcc47 100644
--- a/page/constitutionAnalyse/constitutionAnalyse.js
+++ b/page/constitutionAnalyse/constitutionAnalyse.js
@@ -10,7 +10,7 @@ Page({
     catelist:[],//
     user_id:0,
     detail:[],
-    cid:0,
+    cid:[],
     setcolor:['pinghezhi','qixuzhi','shirezhi','yinxuzhi','qiyuzhi','yangxuzhi','tanshizhi','xueyuzhi','tezhi'],
     minipic:'',
     picList:[
@@ -91,11 +91,24 @@ Page({
         type:1,
        }, function (data, ret) {
         if(ret.code == 1){
+          if(that.data.cid.length==0){
             that.setData({
               loading: false,
               catelist:ret.data.lists,
               detail:ret.data.detail
             });
+          }else{
+            let arr = ret.data.lists;
+            let  selectedItem = arr.filter(item=>{
+              return that.data.cid.includes(item.id)==true
+            })
+            that.setData({
+              loading: false,
+              catelist:selectedItem
+            })
+            
+          }
+           
             let piclist = []
             that.data.catelist.forEach(item=>{
               let obj = {
diff --git a/page/identificationTwo/identificationTwo.js b/page/identificationTwo/identificationTwo.js
index 21af3e4..0166645 100644
--- a/page/identificationTwo/identificationTwo.js
+++ b/page/identificationTwo/identificationTwo.js
@@ -78,16 +78,16 @@ Page({
        }, function (data, ret) {
         if(ret.code == 1){
              var detail = ret.data.detail;
-            
+             let ids = detail.child.map(item=>{
+                return item.testcate_id
+            })
              that.setData({
               loading: false,
               child:detail.child,
               detail:detail,
               ids:ids
             });
-            let ids = that.data.child.map(item=>{
-              return item.testcate_id
-           })
+           
             
             that.canvasRing = that.selectComponent("#canvasRing");
             that.canvasRing.showCanvasRing();