ok

mp-remark-v4/js/service.js

@@ -132,7 +132,9 @@ function getReadingIdByBase64(url) {
     show();
 }
 
-function getUserIdFromAvatar(avatar) {
+function getUserIdFromAvatar(callback) {
+    let img = $(".container").find(".user-portrait").children("img");
+    var avatar = img.attr("src");
     var uid = "";
     var medaInfo = $("meta[name=sn]");
     if (medaInfo.length > 0) {
@@ -162,32 +164,19 @@ function getUserIdFromAvatar(avatar) {
             if (isNaN(Manager.userId) || Manager.userId <= 0) {
                 showToast("暂时不能获取用户信息");
             }
-            show();
+            callback();
+            return;
         })
     } else {
         Manager.userId = uid;
-        show();
+        callback();
     }
 }
 
-function getAuth() {
-    getData(API.auth, {}, (res) => {
-        if (res.code.toString() === "100001") {
-            Manager.isAuth = true;
-        }
-        if (res.code.toString() === "100002") {
-            Manager.isAuth = false;
-        }
-    });
-}
-
 function assertIn() {
     let url = window.location.href;
-    let avatar = $(".container").find(".user-portrait").children("img");
-    let canOpen = false;
     if (url.indexOf("article") > -1 && url.indexOf("list") === -1) {
         Manager.isReading = true;
-        Manager.isUserInfo = true;
         getReadingIdByBase64(url);
     }
     if (url.indexOf("works") > -1 && url.indexOf("list") === -1) {
@@ -195,28 +184,11 @@ function assertIn() {
         Manager.isUserInfo = true;
         getWorksIdByBase64(url);
     }
-    if (url.indexOf("photographyer") > -1) {
-        Manager.isUserInfo = true;
-        getUserIdFromAvatar($(avatar).attr("src"));
-    }
-    if (!Manager.isUserInfo && avatar !== undefined && $("title").text().indexOf(
-        "米拍摄影社区") > -1) {
-        Manager.isUserInfo = true;
-        canOpen = true;
-    } else {
-        canOpen = true;
-    }
-    if (Manager.isUserInfo) {
-        getUserIdFromAvatar($(avatar).attr("src"));
-    }
-    return canOpen;
 }
 
 function openUi() {
-    let canOpen = assertIn();
-    Manager.canOpen = canOpen;
-    if (canOpen) {
-        //获取基本信息并显示在编辑框
+    assertIn();
+    getUserIdFromAvatar(function() {
         getData(API.getUserInfo, {
             uid: Manager.userId
         }, data => {
@@ -229,6 +201,7 @@ function openUi() {
             Manager.user.nickname = res.nickname;
             showUserInfo(Manager.user);
         });
+    });
     getData(API.getRemark, {
         object_id: Manager.userId,
         type: TYPE_USER
@@ -312,10 +285,6 @@ function openUi() {
             show();
         })
     }
-    } else {
-        Manager.err = "不在个人中心或作品详情或文章详情页";
-        show();
-    }
 }
 
 function setUserPermission(value) {