合并

config/dev.env.js

 module.exports = {
   NODE_ENV: '"development"',
   ENV_CONFIG: '"dev"',
-<<<<<<< HEAD
   BASE_API: '"http://api.xt.test.sgjyun.com"', // '"http://localhost:9529"'//http://api.xt.test.sgjyun.com
-=======
-  BASE_API: '"http://localhost:9529"', // '"http://localhost:9529"'//http://api.xt.test.sgjyun.com
->>>>>>> 6e94af4e074e2cc83d5157bc0976574072610f7e
   PATIENT_SIT: '"http://test1.sgjyun.com"',
   MIRCOMALL_SIT: '"http://mall.test.sgjyun.com"'
 }

config/index.js

     // can be overwritten by process.env.HOST
     // if you want dev by ip, please set host: '0.0.0.0'
 
-<<<<<<< HEAD
     host: 'xt.test.sgjyun.com',
     // host: 'xt.kuyicloud.com',
     // host: 'localhost',
-=======
-  //  host: 'xt.test.sgjyun.com',
-    // host: 'xt.kuyicloud.com',
-    host: 'localhost',
->>>>>>> 6e94af4e074e2cc83d5157bc0976574072610f7e
     port: 9528, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
     autoOpenBrowser: true,
     errorOverlay: true,

src/xt_pages/user/components/PatientForm.vue

           <el-form-item label="治疗状态(转归) : " class="is-required" prop="lapseto" >
             <el-radio-group v-model="form.lapseto">
               <!-- <el-radio :disabled="isEdit" v-for="item in lapsetoOptions" :key="item.value" :label="item.value" :value="item.value" >{{item.label}}</el-radio> -->
-<<<<<<< HEAD
-              <el-radio :disabled="isEdit" v-for="item in lapsetoOptions" :key="item.value" :label="item.value" :value="item.value" >{{item.label}}</el-radio>
-=======
               <el-radio v-for="item in lapsetoOptions" :key="item.value" :label="item.value" :value="item.value" >{{item.label}}</el-radio>
->>>>>>> 6e94af4e074e2cc83d5157bc0976574072610f7e
             </el-radio-group>
           </el-form-item>
         </el-col>

src/xt_pages/user/doctorAdvice.vue

                                 <span >{{advice.advice_desc}}</span>
                                 <!-- <span v-if="advice.drug_spec">{{advice.drug_spec}}{{advice.drug_spec_unit}}</span> -->
                                 <span v-if="advice.prescribing_number">*{{advice.prescribing_number}}{{advice.prescribing_number_unit}}</span>
-<<<<<<< HEAD
                                 <span v-if="advice.single_dose != 0"> 单次用量 {{advice.single_dose}}{{advice.single_dose_unit}}</span>
-=======
-                                <span v-if="advice.single_dose">单次用量 {{advice.single_dose}}{{advice.single_dose_unit}}</span>
->>>>>>> 6e94af4e074e2cc83d5157bc0976574072610f7e
                                 <span >{{advice.delivery_way}}</span>
                                 <span >{{advice.execution_frequency}}</span>
                         </td>
                                 <span >{{advice.advice_desc}}</span>
                                 <!-- <span v-if="advice.drug_spec">{{advice.drug_spec}}{{advice.drug_spec_unit}}</span> -->
                                 <span v-if="advice.prescribing_number">*{{advice.prescribing_number}}{{advice.prescribing_number_unit}}</span>
-<<<<<<< HEAD
                                 <span v-if="advice.single_dose != 0">单次用量 {{advice.single_dose}}{{advice.single_dose_unit}}</span>
-=======
-                                <span v-if="advice.single_dose">单次用量 {{advice.single_dose}}{{advice.single_dose_unit}}</span>
->>>>>>> 6e94af4e074e2cc83d5157bc0976574072610f7e
                                 <span >{{advice.delivery_way}}</span>
                                 <span >{{advice.execution_frequency}}</span>
                         </td>