bug2572,2571,2568,2567,2566,2565,2564,2563

src/common/Label.vue

@@ -139,6 +139,7 @@
   }
 </script>
 <style lang="less" scoped>
+  @import '../less/base.less';
   .label-wrap{
     font-size: .3rem;
      .symp{
@@ -168,8 +169,7 @@
     }
     .check{
       color: #fff;
-      background: linear-gradient(-270deg, #3638EE, #4E72FF);
-      box-shadow: 0 .08rem .16rem 0 rgba(79,129,255,0.40);
+      background: #colors[btn];
     }
     .exclu{
       background:#E3E4E8;

src/common/RadioSelect.vue

@@ -17,15 +17,6 @@
       @makeSure="makeSure"
     ></SymptomLis>
     <Submit v-if="submit" :showType="showType" :fail="failMsg" @showSubmit="showSubmit"></Submit>
-    
-    <!-- <p v-for="(it,index) in datas.questionDetailList" :key="it.id" class="check">
-      <span>{{it.description||it.name}}</span>
-    </p> -->
-    <!-- <p v-for="(it,index) in datas.questionDetailList" :key="it.id" class="list">
-      <img @click="handleClick(it,index,true,1)" :src="it.select==1?check:defaultPic"> <i @click="handleClick(it,index,true,1)">有</i>&nbsp;&nbsp;&nbsp;&nbsp;
-      <img @click="handleClick(it,index,true,2)" :src="it.select==2?check:defaultPic"> <i @click="handleClick(it,index,true,2)">无</i>
-      <span v-if="((it.description||it.name).indexOf('${'))==-1" :class="{'check':it.select==1||it.select==2}">{{it.description||it.name}}</span>
-    </p> -->
   </div>
 </template>
 <script type="text/javascript">
@@ -40,6 +31,9 @@ import Submit from "../common/Submit";
       item:{
         default:''
       },
+      checkDatas:{
+        default:''
+      },
       slide:{
         default:false,
         type:Boolean
@@ -74,6 +68,10 @@ import Submit from "../common/Submit";
       this.setStr(this.datas&&this.datas.questionDetailList)
     },
     methods:{
+      resetData(){
+        this.hasStr = ''
+        this.hasStr = ''
+      },
       getStyle(detail,slide){
         if(detail == 1){
           if(slide){
@@ -191,6 +189,7 @@ import Submit from "../common/Submit";
       item:{
         handler(newVal,oldVal){
           this.datas = JSON.parse(JSON.stringify(newVal));
+          this.setStr(newVal&&newVal.questionDetailList)
         },
         deep:true
       }

src/common/Submit.vue

@@ -1,25 +1,27 @@
 <template>
-  <div>
-    <div class="modalWrap"></div>
-    <div
-      v-if="showType=='success'"
-      class="submitSuccess"
-    >
-      <img
-        src="../images/complete.png"
-        alt=""
+  <portal to="notification-outlet">
+    <div>
+      <div class="modalWrap"></div>
+      <div
+        v-if="showType=='success'"
+        class="submitSuccess"
       >
-      <p class="success">{{msg}}</p>
-      <p class="tip">{{tip}}</p>
-      <span @click="goStart">完 成</span>
-    </div>
-    <div
-      v-if="showType=='fail'"
-      class="submitFail"
-    >
-      <p>{{fail}}</p>
+        <img
+          src="../images/complete.png"
+          alt=""
+        >
+        <p class="success">{{msg}}</p>
+        <p class="tip">{{tip}}</p>
+        <span @click="goStart">完 成</span>
+      </div>
+      <div
+        v-if="showType=='fail'"
+        class="submitFail"
+      >
+        <p>{{fail}}</p>
+      </div>
     </div>
-  </div>
+  </portal>
 </template>
 <script>
 export default {
@@ -104,7 +106,7 @@ export default {
     font-size: 0.24rem;
     color: #666666;
     line-height: 0.44rem;
-    margin-bottom: 1.2rem;
+    margin-bottom: 0.5rem;
   }
   span {
     width: 4.9rem;
@@ -121,9 +123,9 @@ export default {
       from(#4f8bff),
       to(#4f4fff)
     );
-    background: -webkit-linear-gradient(right, #4f8bff, #4f4fff);
+    background: #colors[btn];
     box-shadow: 0 0.12rem 0.24rem 0 rgba(79, 129, 255, 0.4);
-    border-radius: 0.44rem;
+    border-radius: 0.2rem;
   }
 }
 .submitFail {

src/components/Detail.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="detail-wrap">
+  <div class="detail-wrap btscroll">
     <!-- <div v-for="(item,index) in datas"> -->
     <div class="head">
       <span class="icon" @click="close">
@@ -25,7 +25,8 @@
                 :slide="!!item.slide"
                 :detail="1"
                 @updata="updataData"/>
-          <RadioSelect v-if="item.controlType==8" 
+          <radioSelect                
+                v-if="item.controlType==8" 
                 :item="item"
                 :slide="!!item.slide"
                 :detail="1"
@@ -357,12 +358,14 @@ import {patt,trimDots,imageUrlPrefix,setScroll} from '@utils/tools.js';
 @import '../less/base.less';
   .detail-wrap{
     font-size: .3rem;
+    padding:0;
     .viewPrew {
       position: absolute;
       width: 100%;
       height: 100%;
       .content {
         padding-bottom: 3.88rem;
+        padding-top: 0;
       }
     }
     .quest{

src/components/DetailBox.vue

@@ -44,7 +44,7 @@
       return{
         msg:"胸痛详情",
         data:detailInfo,
-        privateData:detailInfo.detail||{},
+        privateData:this.$store.state.detailInfo.detail||{},
         compFlag:false,
         clearTxt:"是否清空当前已选内容？",
         showToast:false,
@@ -172,7 +172,7 @@
     height: 1.5rem;
   }
   .detailBox-wrap{
-    position: absolute;
+    position: fixed;
     width: 100%;
     height: 100%;
     top:1rem;
@@ -184,9 +184,9 @@
     animation: wave .4s linear;
     overflow: hidden;
     border-radius:.2rem .2rem 0px 0px;
-    .main{
-      height: 100%;
-      width:100%;
+    .content{
+      // height: 100%;
+      // width:100%;
       // padding-bottom: 1rem;
     }
   }

src/components/PathInfo.vue

@@ -281,7 +281,7 @@
       }
       .msgTitle {
         display: inline-block;
-        width: 1.5rem;
+        width: 1.6rem;
         color: #777777;
       }
       .perMsg {

src/components/Preview.vue

@@ -86,7 +86,7 @@
         <div class="personMsgDocModal" @click="handleClick(false)"></div>
         <div class="personMsgDocDetail">
           <img class="close" src="../images/small-close.png" alt="" @click="handleClick(false)">
-          <div class="personMsg personMsg2">
+          <div class="personMsg personMsg2 modal">
             <ul class="previewParts">
               <li>
                 <h4><i></i> 主诉：</h4>
@@ -151,8 +151,7 @@ export default {
       moduleCP:moduleCP,
       showDoc:false,
       trimDots:trimDots,
-      time:'',
-      err:''
+      time:''
     }
   },
   created(){
@@ -344,7 +343,6 @@ export default {
     defaultWaring(res){
       this.$store.commit('handleToggleShow', false);
       this.showType = 'fail'
-      this.err = 'sdsdsdsd'
       this.submit = true
       let timer = setTimeout(() => {
         this.submit = false
@@ -381,7 +379,11 @@ export default {
   padding: 0 0.4rem 1rem .4rem;
   overflow: hidden;
   -webkit-overflow-scrolling:touch;
-  .btscroll;  
+  .btscroll;
+  .content {
+    padding-top: 0;
+    padding-bottom: 2rem;
+  }
 }
 .tmpDiv {
   height: .3rem;
@@ -471,7 +473,7 @@ export default {
       }
       span {
         color:#777;
-        width: 1.5rem;
+        width: 1.6rem;
         display: inline-block;
       }
     }
@@ -487,6 +489,9 @@ export default {
 .personMsg2 {
   padding-right: 0;
 }
+.personMsg2.modal {
+  margin-bottom: 0;
+}
 .personMsgDoc {
   position: fixed;
   height: 100%;

src/components/Symptom.vue

@@ -158,7 +158,7 @@ export default {
         this.$refs.showHide.style.height = 'auto'
         this.slideTxt = '收起'
       }else{
-        this.$refs.showHide.style.height = '3.12rem'
+        this.$refs.showHide.style.height = '3rem'
         this.slideTxt = '展开全部'
       }
     },  
@@ -171,6 +171,7 @@ export default {
       let endTime = +new Date();
       if(endTime - this.startTime < 500){//点击事件
         this.common(item,flg);
+        this.slideTxt = '展开全部'
       }
       this.startTime = "";
     },
@@ -358,7 +359,7 @@ export default {
 @import "../less/base.less";
 .showHide {
   overflow: hidden;
-  height: 3.12rem;
+  height: 3rem;
 }
 .tip span {
   color: #colors[theme];

src/components/TabPage.vue

@@ -222,7 +222,7 @@ export default {
   padding-bottom: 0.88rem;
   padding-top: 0.82rem;
   .tab {
-    position: absolute;
+    position: fixed;
     top: 0;
     left: 0;
     width: 100%;

src/less/base.less

@@ -22,7 +22,7 @@
 .footer{
   width:100%;
   text-align: center;
-  position: fixed;
+  position: absolute;
   bottom: 0;
   left: 0;
   z-index: 998;
@@ -42,7 +42,7 @@
 .dbfooter{
   width:100%;
   font-size: .32rem;
-  position: fixed;
+  position: absolute;
   bottom: 0;
   left: 0;
   background: #fff;