解决冲突

.env.test

@@ -1,7 +1,7 @@
 VUE_APP_Name='测试环境'
-VUE_APP_Host='https://mem.360lj.com/ym2'
-VUE_APP_DoctorUserLoginUrl='https://mem.360lj.com/ym2/api/Home/Login?identity=1&backurl=https://mem.360lj.com/ym2/SignUp'
-VUE_APP_PartnerUserLoginUrl='https://mem.360lj.com/ym1/api/Home/Login?identity=2&backurl=https://mem.360lj.com/ym2/SignUp'
-VUE_APP_PatientUserLoginUrl='https://mem.360lj.com/ym1/api/Home/Login?identity=0&backurl=hhttps://mem.360lj.com/ym2/PatientUser'
-VUE_APP_Url='https://mem.360lj.com/ym2'
-VUE_APP_DoctorAPIUrl = 'https://mem.360lj.com/ym2'
+VUE_APP_Host='https://mem.360lj.com/ym1'
+VUE_APP_DoctorUserLoginUrl='https://mem.360lj.com/ym1/api/Home/Login?identity=1&backurl=https://mem.360lj.com/ym1/SignUp'
+VUE_APP_PartnerUserLoginUrl='https://mem.360lj.com/ym1/api/Home/Login?identity=2&backurl=https://mem.360lj.com/ym1/SignUp'
+VUE_APP_PatientUserLoginUrl='https://mem.360lj.com/ym1/api/Home/Login?identity=0&backurl=hhttps://mem.360lj.com/ym1/PatientUser'
+VUE_APP_Url='https://mem.360lj.com/ym1'
+VUE_APP_DoctorAPIUrl = 'https://mem.360lj.com/ym1'

src/views/patient/reservation/specialist.vue

@@ -185,13 +185,8 @@ export default {
     // 获取首页轮播图
     GetRotationChartList() {
       this.$http.GetRotationChartList(1).then(({ data }) => {
-<<<<<<< HEAD
-        if (data.IsSuccess) {
-          var arr = data.ResultObject.filter(a => !a.IsDelete);
-=======
         if (data.isSuccess) {
           var arr = data.resultObject.filter((a) => !a.IsDelete);
->>>>>>> shortVideoV1
           this.images = arr;
         } else {
           // 失败

src/views/shortVideo/SearchVideo.vue

@@ -86,11 +86,7 @@ export default {
     return {
       selectName: '全部科室',
       active: -1,
-<<<<<<< HEAD
-      typeList: [{ DepartmentName: "全部", ID: "", active: true }], //疾病种类列表
-=======
       typeList: [{ departmentname: "全部", id: "", active: true }], //疾病种类列表
->>>>>>> shortVideoV1
       popupShow: false,       // 右侧弹出框
       loadingShow: false,      // 是否显示加载按钮
       // isRequest: false,    // 是否正在发请求