提交

page/begin/begin.wxml

@@ -3,6 +3,7 @@
 <view style="width: 100%">
  <view class="titleContainer">
   <view class="title">中医体质辨识专业版</view>
+  <view class="subtitle">人以健康为本 健康以体质为本</view>
    <!-- <image src="../img/title.png"></image> -->
  </view>
 

page/constitutionAnalyse/constitutionAnalyse.js

@@ -121,7 +121,7 @@ Page({
               obj.title=item.title;
               obj.kindnum=item.kindnum;
               obj.advice_content = item.advice_content;
-              obj.pic = `../img/${item.kindnum}.png`
+              obj.pic = `../img/new${item.kindnum}.jpg`
               obj.mini_shop_url = item.mini_shop_url
               piclist.push(obj)
             })

page/constitutionAnalyse/constitutionAnalyse.wxml

@@ -3,7 +3,7 @@
 <import src="../../wxParse/wxParse.wxml"/>
 <view class="index">
  <!-- <view class="header"></view> -->
- <image src="../img/abg.png" class="abg" mode="widthFix"></image>
+ <image src="../img/bg.png" class="abg" mode="widthFix"></image>
  <view class="contentContainer">
   <!-- <view>
     <view class="btnGroup" >
@@ -20,13 +20,14 @@
     <view class="title">{{item.title}}分析</view>
     <view>
       <view class="analyse">
-        <text class="itemTitle">迁延倾向</text>
+        <text class="itemTitle">总体特征</text>
+        <!-- <template is="wxParse" data="{{wxParseData:causes_content.nodes}}" /> -->
         <view>
-          <rich-text nodes="{{item.tend_content}}"></rich-text>
+          <rich-text nodes="{{item.causes_content}}"></rich-text>
         </view>
         
-        <!-- <template is="wxParse" data="{{wxParseData:tend_content.nodes}}" /> -->
       </view>
+      
       <view class="analyse">
         <text class="itemTitle">形体特征</text>
         <!-- <template is="wxParse" data="{{wxParseData:features_content.nodes}}" /> -->
@@ -52,7 +53,15 @@
         
       </view>
       <view class="analyse">
-        <text class="itemTitle">适应环境</text>
+        <text class="itemTitle">发病倾向</text>
+        <view>
+          <rich-text nodes="{{item.tend_content}}"></rich-text>
+        </view>
+        
+        <!-- <template is="wxParse" data="{{wxParseData:tend_content.nodes}}" /> -->
+      </view>
+      <view class="analyse">
+        <text class="itemTitle">对外界环境适应能力</text>
         <!-- <template is="wxParse" data="{{wxParseData:environment_content.nodes}}" /> -->
         <view>
           <rich-text nodes="{{item.environment_content}}"></rich-text>
@@ -60,13 +69,14 @@
         
       </view>
       <view class="analyse">
-        <text class="itemTitle">成因</text>
-        <!-- <template is="wxParse" data="{{wxParseData:causes_content.nodes}}" /> -->
+        <text class="itemTitle">辨识与调节方法</text>
+        <!-- <template is="wxParse" data="{{wxParseData:environment_content.nodes}}" /> -->
         <view>
-          <rich-text nodes="{{item.causes_content}}"></rich-text>
+          <rich-text nodes="{{item.identification_methods}}"></rich-text>
         </view>
         
       </view>
+     
       <!-- <view class="bottom_content">
         <text class="numFlag">{{detail.kindnum}}</text>
         <image src="{{minipic}}" class="image"></image>

page/constitutionAnalyse/constitutionAnalyse.wxss

@@ -22,7 +22,7 @@ page{
 .contentContainer{
     position: relative;
     z-index: 9;
-    margin-top: -450rpx;
+    margin-top: -1100rpx;
     background-color: transparent;
 }
 

page/identificationTwo/identificationTwo.js

@@ -11,7 +11,11 @@ Page({
     user_id:0,
     health:0,//是否是平和质,0不是，1是
     detail:[],
-    ids:[]
+    ids:[],
+    pianpo_Title:"",
+    pianpo_text:"",
+    qinxiang_title:"",
+    qinxiang_text:""
   },
 
   /**
@@ -78,6 +82,10 @@ Page({
        }, function (data, ret) {
         if(ret.code == 1){
              var detail = ret.data.detail;
+             let pianpo_Title = detail.pianpo_text.split(':')[0]
+             let pianpo_text = detail.pianpo_text.split(':')[1]
+             let qinxiang_title = detail.qinxiang_text.split(':')[0]
+             let qinxiang_text = detail.qinxiang_text.split(':')[1]
              let ids = detail.child.map(item=>{
                 return item.testcate_id
             })
@@ -85,7 +93,12 @@ Page({
               loading: false,
               child:detail.child,
               detail:detail,
-              ids:ids
+              ids:ids,
+              pianpo_Title:pianpo_Title,
+              pianpo_text:pianpo_text,
+              qinxiang_title:qinxiang_title,
+              qinxiang_text:qinxiang_text
+
             });
            
             

page/identificationTwo/identificationTwo.wxml

@@ -12,14 +12,19 @@
        </view>
      </view>
    </view>
+   <view class="tizhitype" style="margin-bottom:30rpx;">
+    {{detail.orichild.length>1?'混合体质':'单一体质'}}
+   </view>
    <view class="typeDetail">
     {{detail.desc_text}}
    </view>
    <view class="typeDetail">
-    {{detail.pianpo_text}}
+   <view>{{pianpo_Title}}:</view>
+    {{pianpo_text}}
    </view>
    <view class="typeDetail">
-    {{detail.qinxiang_text}}
+   <view>{{qinxiang_title}}:</view>
+    {{qinxiang_text}}
    </view>
    <!-- <view class="typeContent"> -->
      <!-- <view class="getDetailsInfo" wx:for="{{child}}">

page/identificationTwo/identificationTwo.wxss

@@ -10,7 +10,8 @@
 }
 .tizhitype{
   color: #212121;
-  font-size:45rpx;
+  font-size:55rpx;
+  /* width: 63%; */
 }
 .NumPic{
   display:flex;
@@ -22,7 +23,7 @@
 }
 .typeDetail{
   color: #212121;
-  font-size:40rpx;
+  font-size:50rpx;
 }
 .typeContent{
   background-color: #f4f4f4;

page/shetai/shetai.wxml

@@ -6,7 +6,7 @@
     <view class="picimg">
       <view class="shetaipiccontent">
       <image src="../../assets/images/pic.png" mode="widthFix" class="shetaipic" wx:if="{{imgPath==''}}"></image>
-        <image src="https://mini.nanjingchuangyou.com{{imgPath}}"  wx:else></image>
+        <image src="https://mini.nanjingchuangyou.com{{imgPath}}" mode="heightFix"   wx:else></image>
       </view>
       <view class="btngrounp">
         <view class="uploadbtn" bindtap="getimg">上传照片</view>

page/twoTest/twoTest.js

@@ -151,6 +151,15 @@ Page({
           upgrade_index:setindex,
           upshow:1,
         })
+        // this.data.detail.selectcenter.forEach((item,index)=>{
+        //   if(setindex==index){
+        //     this.data.detail.selectcenter[setindex].setindex = setindex
+        //   }else{
+        //     this.data.detail.selectcenter[setindex].setindex = true
+        //   }
+        // })
+        
+        console.log(this.data.detail.selectcenter,"9999")
         var dealgrade   = Number(this.data[c_title])+Number(grade);  
         console.log(this.data.uptest_id_index)
         var resindex    = this.data.index+1;
@@ -159,7 +168,7 @@ Page({
         this.setData({per:progressNum})
         //end进度条
         if(resindex>=this.data.count){
-           this.setData({
+          this.setData({
                [c_title] :dealgrade,
           })
           console.log("已结束")
@@ -211,7 +220,7 @@ Page({
                cate_title:res_detail.cate_title,
                [c_title] :dealgrade,
           })
-          
+          this.data.testlist[resindex-1].setindex = this.data.setindex
         }
   },
 

page/twoTest/twoTest.wxml

@@ -18,7 +18,7 @@
       <view class="ask">{{detail.title}}</view>
       <view class="formitem" wx:for="{{detail.selectcenter}}" data-pid="{{detail.pid}}" data-c_title="pidgrade{{detail.pid}}" data-grade="{{item.grade}}" data-setindex = "{{index}}" bindtap="startClick">
         <view class="formItemInfo">
-          <text style="background-color: {{index == setindex?setcolor:''}}">{{item.title}}</text>
+          <text style="background-color: {{index == detail.setindex||index == setindex?setcolor:''}}">{{item.title}}</text>
         </view>
         <view class="arrow">
           <image src="../img/arrow.png"></image>