m

.idea/workspace.xml

@@ -2,20 +2,11 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="0d3cb18d-e144-41a0-bc8b-4877c2e1fef1" name="默认的" comment="">
-      <change afterPath="$PROJECT_DIR$/resource/helpPanel/helpBg.png" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/resource/helpPanel/helpBtn.png" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/panels/HelpPanel.ts" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/mock/miniTb/feile.queryVipInfo.json" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/mock/miniTb/aa.json" beforeDir="false" afterPath="$PROJECT_DIR$/mock/miniTb/aa.json" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/mock/miniTb/mine.getAppData.json" beforeDir="false" afterPath="$PROJECT_DIR$/mock/miniTb/mine.getAppData.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/output.js" beforeDir="false" afterPath="$PROJECT_DIR$/output.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/output.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/output.js.map" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/resource/res.json" beforeDir="false" afterPath="$PROJECT_DIR$/resource/res.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/ResJson.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/ResJson.ts" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/TaoBaoNet.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/TaoBaoNet.ts" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Tools.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/Tools.ts" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/scene/LoadingScene.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/scene/LoadingScene.ts" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/scene/map/MapScene.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/scene/map/MapScene.ts" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/panels/HelpPanel.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/panels/HelpPanel.ts" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -143,7 +134,7 @@
       <workItem from="1612662929222" duration="40609000" />
       <workItem from="1613698993022" duration="22309000" />
       <workItem from="1613785579125" duration="17751000" />
-      <workItem from="1613958457445" duration="11432000" />
+      <workItem from="1613958457445" duration="11823000" />
     </task>
     <task id="LOCAL-00001" summary="斐乐消消乐">
       <created>1612581213298</created>
@@ -453,7 +444,14 @@
       <option name="project" value="LOCAL" />
       <updated>1614051416478</updated>
     </task>
-    <option name="localTasksCounter" value="45" />
+    <task id="LOCAL-00045" summary="m">
+      <created>1614064323435</created>
+      <option name="number" value="00045" />
+      <option name="presentableId" value="LOCAL-00045" />
+      <option name="project" value="LOCAL" />
+      <updated>1614064323435</updated>
+    </task>
+    <option name="localTasksCounter" value="46" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">

mock/miniTb/feile.queryVipInfo.json

+{
+  "success": true,
+  "data": {
+    "isvip": false,
+    "url": "https://www.baidu.com"
+  }
+}

mock/miniTb/mine.getAppData.json

@@ -3,12 +3,12 @@
     "data": {
         "avatar": "https://source.unsplash.com/user/erondu/76x76",
         "nickName": "我啊是大请问",
-        "activityId": "string",
-        "openId": "string",
+        "activityId": "activityId",
+        "openId": "openId",
         "isFirstLogin": true,
         "loginAddPower": 3,
         "isNewUser": true,
-        "inviteId": "string",
+        "inviteId": "inviteId",
         "isFollow": true
     }
 }

src/TaoBaoNet.ts

@@ -18,6 +18,8 @@ export enum TbNetName {
 
     doHelp = "feile.doHelp",
 
+    queryVipInfo = "feile.queryVipInfo",
+
     /**
      * 活动基本信息
      * @param activityId

src/panels/HelpPanel.ts

@@ -34,24 +34,29 @@ export class HelpPanel extends Panel {
         Tools.globalData.inviteId = '';
     }
 
-    doHelp() {
-        if(Tools.globalData.inviteId == Tools.globalData.openId){
+    async doHelp() {
+        if (Tools.globalData.inviteId == Tools.globalData.openId) {
             this.hidePanel();
             return;
         }
-        sendTbNet(TbNetName.doHelp, { inviteId: Tools.globalData.inviteId },
-            (success, res) => {
-                if (!success) { // 失败唤起入会插件 /// TODO 是自己？
-                    if (res.data && !res.data.isvip) {
-                        showToast('请入会后参与');
-                        setTimeout(() => {
-                            sendTbNet(TbNetName.openMember);
-                        }, 1500);
+        const { success: vipSuc, data: vipInfo } = await sendTbNet(TbNetName.queryVipInfo);
+
+        if (vipSuc && vipInfo.isvip) {
+            sendTbNet(TbNetName.doHelp, { inviteId: Tools.globalData.inviteId },
+                (success, res) => {
+                    if (!success) { // 失败唤起入会插件 /// TODO 是自己？
+                        showToast(res.message);
+                        return;
                     }
-                    return;
-                }
-                this.hidePanel();
-            });
+                    showToast('接受成功');
+                    this.hidePanel();
+                });
+        } else {
+            showToast('请入会后参与');
+            setTimeout(() => {
+                sendTbNet(TbNetName.openMember);
+            }, 1500);
+        }
     }
 
     initEvents() {