庄逸洲 4 years ago
parent
commit
6c74e18731

+ 0 - 4
config/dev.env.js View File

@@ -6,11 +6,7 @@
6 6
 module.exports = {
7 7
   NODE_ENV: '"development"',
8 8
   ENV_CONFIG: '"dev"',
9
-<<<<<<< HEAD
10 9
   BASE_API: '"http://api.xt.test.sgjyun.com"', // '"http://localhost:9529"'//http://api.xt.test.sgjyun.com
11
-=======
12
-  BASE_API: '"http://localhost:9529"', // '"http://localhost:9529"'//http://api.xt.test.sgjyun.com
13
->>>>>>> 6e94af4e074e2cc83d5157bc0976574072610f7e
14 10
   PATIENT_SIT: '"http://test1.sgjyun.com"',
15 11
   MIRCOMALL_SIT: '"http://mall.test.sgjyun.com"'
16 12
 }

+ 0 - 6
config/index.js View File

@@ -17,15 +17,9 @@ module.exports = {
17 17
     // can be overwritten by process.env.HOST
18 18
     // if you want dev by ip, please set host: '0.0.0.0'
19 19
 
20
-<<<<<<< HEAD
21 20
     host: 'xt.test.sgjyun.com',
22 21
     // host: 'xt.kuyicloud.com',
23 22
     // host: 'localhost',
24
-=======
25
-  //  host: 'xt.test.sgjyun.com',
26
-    // host: 'xt.kuyicloud.com',
27
-    host: 'localhost',
28
->>>>>>> 6e94af4e074e2cc83d5157bc0976574072610f7e
29 23
     port: 9528, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
30 24
     autoOpenBrowser: true,
31 25
     errorOverlay: true,

+ 0 - 4
src/xt_pages/user/components/PatientForm.vue View File

@@ -280,11 +280,7 @@
280 280
           <el-form-item label="治疗状态(转归) : " class="is-required" prop="lapseto" >
281 281
             <el-radio-group v-model="form.lapseto">
282 282
               <!-- <el-radio :disabled="isEdit" v-for="item in lapsetoOptions" :key="item.value" :label="item.value" :value="item.value" >{{item.label}}</el-radio> -->
283
-<<<<<<< HEAD
284
-              <el-radio :disabled="isEdit" v-for="item in lapsetoOptions" :key="item.value" :label="item.value" :value="item.value" >{{item.label}}</el-radio>
285
-=======
286 283
               <el-radio v-for="item in lapsetoOptions" :key="item.value" :label="item.value" :value="item.value" >{{item.label}}</el-radio>
287
->>>>>>> 6e94af4e074e2cc83d5157bc0976574072610f7e
288 284
             </el-radio-group>
289 285
           </el-form-item>
290 286
         </el-col>

+ 0 - 8
src/xt_pages/user/doctorAdvice.vue View File

@@ -735,11 +735,7 @@
735 735
                                 <span >{{advice.advice_desc}}</span>
736 736
                                 <!-- <span v-if="advice.drug_spec">{{advice.drug_spec}}{{advice.drug_spec_unit}}</span> -->
737 737
                                 <span v-if="advice.prescribing_number">*{{advice.prescribing_number}}{{advice.prescribing_number_unit}}</span>
738
-<<<<<<< HEAD
739 738
                                 <span v-if="advice.single_dose != 0"> 单次用量 {{advice.single_dose}}{{advice.single_dose_unit}}</span>
740
-=======
741
-                                <span v-if="advice.single_dose">单次用量 {{advice.single_dose}}{{advice.single_dose_unit}}</span>
742
->>>>>>> 6e94af4e074e2cc83d5157bc0976574072610f7e
743 739
                                 <span >{{advice.delivery_way}}</span>
744 740
                                 <span >{{advice.execution_frequency}}</span>
745 741
                         </td>
@@ -848,11 +844,7 @@
848 844
                                 <span >{{advice.advice_desc}}</span>
849 845
                                 <!-- <span v-if="advice.drug_spec">{{advice.drug_spec}}{{advice.drug_spec_unit}}</span> -->
850 846
                                 <span v-if="advice.prescribing_number">*{{advice.prescribing_number}}{{advice.prescribing_number_unit}}</span>
851
-<<<<<<< HEAD
852 847
                                 <span v-if="advice.single_dose != 0">单次用量 {{advice.single_dose}}{{advice.single_dose_unit}}</span>
853
-=======
854
-                                <span v-if="advice.single_dose">单次用量 {{advice.single_dose}}{{advice.single_dose_unit}}</span>
855
->>>>>>> 6e94af4e074e2cc83d5157bc0976574072610f7e
856 848
                                 <span >{{advice.delivery_way}}</span>
857 849
                                 <span >{{advice.execution_frequency}}</span>
858 850
                         </td>