Merge branch 'dev' into byll

src/common/Label.vue

@@ -12,6 +12,7 @@
 </template>
 <script type="text/javascript">
 import Toast from '../common/Toast.vue';
+import {moduleCP} from '@utils/tools';
   export default{
     name:'Label',
     data(){
@@ -79,9 +80,9 @@ import Toast from '../common/Toast.vue';
         const temp = this.tempItem;
         // 从store中取origin的值
         let origin,newItem;
-        if(this.moduleType==2){
+        if(this.moduleType==moduleCP['diagT']){
           origin = this.$store.state.diagnose.origin
-        }else if(this.moduleType == 3){
+        }else if(this.moduleType == moduleCP['other']){
           origin = this.$store.state.others.origin
         }
         if(origin){

src/components/AddContent.vue

@@ -41,13 +41,13 @@
       </div>
       <div class="thanks">
         <p>感谢您的回答，您的病历已经自动生成。</p>
-        <p>您可以点击预览病历回顾病情；或者点击顶部修改病历采集信息。</p>
+        <p>您可以点击预览并提交病历按钮预览病历，</p>
         <p>如果没有需要修改的内容，请点击提交，医生便能看到您的病历。</p>
       </div>
     </div>
     <div class="foot">
       <span class="back" @click="back">{{'返回'+ preName}}</span>
-      <span class="next" @click="next">预览</span>
+      <span class="next" @click="next">预览并提交病历</span>
     </div>
   </div>
 </template>

src/components/DetailBox.vue

@@ -99,10 +99,12 @@
       color: #7C828E;
       i{
         position: absolute;
-        top:0.35rem;
+        top:0.64rem;
         left:0;
         font-size: .22rem;
         width:100%;
+        height: .33rem;
+        line-height: .33rem;
         display: inline-block;
         text-align: center;
       }