合并dev分支

build/webpack.dev.conf.js

@@ -34,7 +34,7 @@ const devWebpackConfig = merge(baseWebpackConfig, {
     compress: true,
     // host: HOST || config.dev.host,
     // host: '192.168.3.6',
-    host: '192.168.1.101',
+    host: '192.168.1.106',
     port: PORT || config.dev.port,
     open: config.dev.autoOpenBrowser,
     overlay: config.dev.errorOverlay

src/common/CheckBox.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="check-wrap" v-if="item">
-    <img :src="datas.url.replace('{imageUrlPrefix}',imgUrl)" v-if="datas.url">
+    <!-- <img :src="datas.url.replace('{imageUrlPrefix}',imgUrl)" v-if="datas.url"> -->
     <p v-for="(it,index) in datas.questionDetailList" :key="it.id" class="list" @click="handleClick(it,index)">
       <img :src="it.select==1?check:defaultPic">
       <!-- <span :class="{'check':it.select==1}">{{it.name}}</span> -->

src/common/Radio.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="radio-wrap" v-if="item">
-    <img :src="datas.url.replace('{imageUrlPrefix}',imgUrl)" v-if="datas.url">
+    <!-- <img :src="datas.url.replace('{imageUrlPrefix}',imgUrl)" v-if="datas.url"> -->
     <p v-for="(it,index) in datas.questionDetailList" :key="it.id" class="list" @click="handleClick(it,index)">
       <img :src="it.select==1?check:defaultPic">
       <!-- <span :class="{'check':it.select==1}">{{it.name}}</span> -->

src/components/Detail.vue

@@ -3,6 +3,7 @@
     <!-- <div v-for="(item,index) in datas"> -->
     <div v-for="(item,index) in checkDatas.questionMapping">
       <p class="quest">{{index + 1 +'.' + (item.description || item.name)}}</p>
+      <img class="questionImg" :src="item.url.replace('{imageUrlPrefix}',imgUrl)" v-if="item.url">
       <Radio v-if="item.controlType==1" 
             :item="item"
             :key="item.id"
@@ -40,14 +41,15 @@ import CheckBox from '../common/CheckBox.vue';
 import Input from '../common/Input.vue';
 import ComTextArea from '../common/ComTextArea.vue';
 import MultiLineInput from '../common/MultiLineInput.vue';
-import {patt,trimDots} from '@utils/tools.js'
+import {patt,trimDots,imageUrlPrefix} from '@utils/tools.js'
 // 将获取到的数据源转换成私有数据，处理选择事件。点击完成后统一存到store中，便于回读
   export default {
     name:'Detail',
     data(){
       return{
         checkDatas:{},
-        finished:false
+        finished:false,
+        imgUrl:imageUrlPrefix,
       }
     },
     props:['datas','type','ppId'],
@@ -187,5 +189,8 @@ import {patt,trimDots} from '@utils/tools.js'
       color:#000;
       margin-bottom: .2rem;
     }
+    .questionImg {
+      width: 100%;
+    }
   }
 </style>

src/components/DiagTreat.vue

@@ -5,6 +5,7 @@
         :key="it.id"
         class="label">
       <p class="quest">{{i + 1 +'.' + (it.description||it.name)}}</p>
+      <img class="questionImg" :src="it.url.replace('{imageUrlPrefix}',imgUrl)" v-if="it.url">
         <Label v-if="it.controlType==0" 
               :item="it" 
               :indx="i" 
@@ -65,7 +66,7 @@
   import DetailBox from './DetailBox.vue';
   import Input from '../common/Input.vue';
   import ComTextArea from '../common/ComTextArea.vue';
-  import {moduleCP,patt} from '@utils/tools';
+  import {moduleCP,patt,imageUrlPrefix} from '@utils/tools';
   import Radio from '../common/Radio.vue';
   import CheckBox from '../common/CheckBox.vue';
   export default {
@@ -80,7 +81,8 @@
         labelDetail:{}, //标签明细
         checkText:text, //选中的文字-Arr
         show:false,
-        ppId:null
+        ppId:null,
+        imgUrl:imageUrlPrefix,
       }
     },
     props:['datas','preName','nextName','modluesLen'],
@@ -182,4 +184,7 @@
 .footer{
   .footer;
 }
+.questionImg {
+  width: 96%;
+}
 </style>

src/components/Others.vue

@@ -5,6 +5,7 @@
         :key="it.id"
         class="label">
         <p class="quest">{{i + 1 +'.' + (it.description||it.name)}}</p>
+        <img class="questionImg" :src="it.url.replace('{imageUrlPrefix}',imgUrl)" v-if="it.url">
         <!-- <Label v-if="it.controlType==0" -->
         <Label v-if="it.controlType==0"
               :item="it"
@@ -70,7 +71,7 @@
   import Toast from '../common/Toast.vue';
   import Input from '../common/Input.vue';
   import ComTextArea from '../common/ComTextArea.vue';
-  import {moduleCP,patt} from '@utils/tools';
+  import {moduleCP,patt,imageUrlPrefix} from '@utils/tools';
   import Radio from '../common/Radio.vue';
   import CheckBox from '../common/CheckBox.vue';
   import MultiLineInput from '../common/MultiLineInput.vue';
@@ -87,6 +88,7 @@
         checkText:text, //选中的文字
         ppId:null,
         show:false,
+        imgUrl:imageUrlPrefix,
       }
     },
     props:['datas','preName','nextName','modluesLen'],
@@ -184,5 +186,8 @@
     .mask;
     z-index: 66;
   }
+  .questionImg {
+    width: 96%;
+  }
   
 </style>