Merge branch 'master' of http://192.168.20.122:3000/zhangbo/UE

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

@@ -190,7 +190,7 @@ export default {
         wx.onMenuShareAppMessage({
           title: "亮健优医", // 分享标题
           desc: that.videoList[that.page - 1].videoTitle, // 分享描述
-          link: `https://ue.360lj.com/api/Home/Login?identity=0&backurl=https://ue.360lj.com/dist/oneVideoPlayer?id=${
+          link: `https://mem.360lj.com/ym/ymallWechat/code?redirectCode=oneVideoPlayer?id=${
             that.videoList[that.page - 1].id
           }`, // 分享链接，该链接域名或路径必须与当前页面对应的公众号JS安全域名一致
           imgUrl:
@@ -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() {
@@ -275,8 +277,8 @@ export default {
               if (res.data.resultObject.length === 0) {
                 // 没有分页数据
                 this.$notify({
-                  type: "warning",
-                  message: "没有更多视频了",
+                  type: "warning",  
+                  message: "没有更多视频了", 
                   duration: 2000,
                 });
                 this.hasMoreVideo = false;