Merge branch 'shortVideoV1' into master

src/views/shortVideo/Attention.vue

@@ -77,7 +77,7 @@ export default {
   methods: {
     // 跳转医生主页
     goDoctorDetail(id) {
-      this.$router.push({ name: "doctorDetail", query: { id } })
+      // this.$router.push({ name: "doctorDetail", query: { id } })
     },
     // 取消关注 方法
     cancelAttention(id, index) {

src/views/shortVideo/ShortVideo.vue

@@ -209,12 +209,14 @@ export default {
     jumpUpload() {
       // window.location.replace('http://ue.360lj.com/api/Home/Login?identity=2&backurl=http://ue.360lj.com/dist/uploadFile')
       // window.location.replace('http://linyi.natapp1.cc/api/Home/Login?identity=2&backurl=http://linyi.natapp1.cc/dist/uploadFile')
-      var doctorUserLoginUrl = process.env.VUE_APP_DoctorUserLoginUrl.replace(
-        "SignUp",
-        "uploadFile"
-      );
-      console.log("uploadUrl: ", doctorUserLoginUrl);
-      window.location.replace(doctorUserLoginUrl);
+      // var doctorUserLoginUrl = process.env.VUE_APP_DoctorUserLoginUrl.replace(
+      //   "SignUp",
+      //   "uploadFile"
+      // );
+      // console.log("uploadUrl: ", doctorUserLoginUrl);
+      // window.location.replace(doctorUserLoginUrl);
+      
+      this.$router.push({ name: 'UploadFile', query: {} })
     },
     // 获取用户基本信息
     _getUserInfo() {