music

src/components/AssistCountPanel/AssistCountPanel.jsx

@@ -25,7 +25,7 @@ class AssistCountPanel extends React.Component {
     return <div className="AssistCountPanel modal_center">
       <div className="bg"/>
       <div className="txt">一共有{store.setIndex.newAssistUser}位好友助力</div>
-      <Button className="btn" onClick={this.clickOk} />
+      <Button className="btn md12" onClick={this.clickOk} />
       <Button className="close" onClick={this.clickClose} />
     </div>;
   }

src/components/AssistFailPanel/AssistFailPanel.jsx

@@ -10,6 +10,18 @@ import { PAGE_MAP } from "@src/utils/constants";
 class AssistFailPanel extends React.Component {
 
   componentDidMount = async () => {
+    const { message, code } = this.props.popData;
+
+    const md = {
+      200306: 18,
+      200304: 17,
+      200302: 16,
+      20002: 15
+    }[+code] || message;
+
+    this.setState({
+      md: md
+    });
 
   };
 
@@ -24,10 +36,27 @@ class AssistFailPanel extends React.Component {
   }
 
   render() {
+
+    const { message, code } = this.props.popData;
+
+    const msg = {
+      200306: "无法为自己助力",
+      200304: "好友今日被助力次数达到上限",
+      200302: "只有新用户才可助力",
+      20002: "活动已结束"
+    }[+code] || message;
+
+    const md = {
+      200306: "md18",
+      200304: "md17",
+      200302: "md16",
+      20002: "md15"
+    }[+code];
+
     return <div className="AssistFailPanel modal_center">
       <div className="bg"/>
-      <div className="tip">活动已结束</div>
-      <Button className="btn" onClick={this.clickOk} />
+      <div className="tip">{msg}</div>
+      <Button className={`btn ${md}`} onClick={this.clickOk} />
       <Button className="close" onClick={this.clickClose} />
     </div>;
   }

src/components/AssistSucPanel/AssistSucPanel.jsx

@@ -29,7 +29,7 @@ class AssistSucPanel extends React.Component {
     return <div className="AssistSucPanel modal_center">
       <SvgaPlayer className="effect" src={RES_PATH + "svga/4输出弹窗氛围.svga"}/>
       <div className="bg"/>
-      <Button className="btn" onClick={this.clickOk} />
+      <Button className="btn md14" onClick={this.clickOk} />
       <Button className="close" onClick={this.clickClose} />
     </div>;
   }

src/components/CarvePanel/CarvePanel.jsx

@@ -28,7 +28,7 @@ class CarvePanel extends React.Component {
       <SvgaPlayer className="effect" src={RES_PATH + "svga/4输出弹窗氛围.svga"}/>
       <div className="bg"/>
       <div className="txt">一共有{store.setIndex.newAssistUser}位好友助力</div>
-      <Button className="btn" onClick={this.clickOk} />
+      <Button className="btn md13" onClick={this.clickOk} />
       <Button className="close" onClick={this.clickClose} />
     </div>;
   }

src/components/RulePop/RulePop.jsx

@@ -23,7 +23,7 @@ class RulePop extends React.Component {
       <div className="bg">
        <div className="rankText" dangerouslySetInnerHTML={{__html: store.ruleInfo}}/>
       </div>
-      <Button className="close md42" onClick={this.clickClose}/>
+      <Button className="close" onClick={this.clickClose}/>
     </div>;
   }
 }

src/components/yinsirulepop/yinsirulepop.jsx

@@ -37,7 +37,7 @@ class Yinsirulepop extends React.Component {
               />
           </span>
         <Button className="close" onClick={this.clickClose}></Button>
-        <Button className="btn md44" onClick={this.clickTo}></Button>
+        <Button className="btn md29" onClick={this.clickTo}></Button>
       </div>
     );
   }

src/pages/prizepage/prizepage.jsx

@@ -274,7 +274,7 @@ class Prizepage extends React.Component {
               </div>
             )}
           </div>
-          <Button className="back md43" onClick={this.back}></Button>
+          <Button className="back" onClick={this.back}></Button>
         </div>
       </div>
     );

src/pages/sharepage/sharepage.jsx

@@ -133,9 +133,9 @@ class Sharepage extends React.Component {
     const inviteCode = getUrlParam("inviteCode")
 
     if(inviteCode) {
-      return <Button className="assist_btn" onClick={this.toWeActHandle} />;
+      return <Button className="assist_btn md30" onClick={this.toWeActHandle} />;
     } else {
-      return <Button className="normal_btn" onClick={this.toWeActHandle} />;
+      return <Button className="normal_btn md31" onClick={this.toWeActHandle} />;
     }
   }
 

src/pages/userhomepage/userhomepage.jsx

@@ -35,8 +35,6 @@ class Userhomepage extends React.Component {
     this.flushCD();
     shareStore.doAssist();
 
-    modalStore.pushPop("AssistFailPanel")
-
   }
 
   /** 规则按钮*/
@@ -145,31 +143,31 @@ class Userhomepage extends React.Component {
         <div className="subTitle">活动时间：{sTxt}-{eTxt}</div>
         <div className="uid">用户ID：{userId}</div>
         <div className="strategy" />
-        <Button className="rule" onClick={this.clickRule} />
-        <Button className="prize" onClick={this.clickPrize} />
-        <Button className="inviteDetails" onClick={this.clickDetails} />
+        <Button className="rule md5" onClick={this.clickRule} />
+        <Button className="prize md6" onClick={this.clickPrize} />
+        <Button className="inviteDetails md7" onClick={this.clickDetails} />
 
-        <Button className="visitList" onClick={this.clickVisit}>
+        <Button className="visitList md8" onClick={this.clickVisit}>
           <SvgaPlayer
             className="visitListSvga"
             src={RES_PATH + "svga/2输出拜访.svga"}
           />
         </Button>
 
-        <Button className="shareBtn" onClick={this.clickShare}>
+        <Button className="shareBtn md9" onClick={this.clickShare}>
           <SvgaPlayer
             className="shareBtnSvga"
             src={RES_PATH + "svga/1输出分析好友.svga"}
           />
         </Button>
 
-        <Button className="drawBtn" onClick={this.clickDraw}>
+        <Button className="drawBtn md11" onClick={this.clickDraw}>
           <SvgaPlayer
             className="drawBtnSvga"
             src={RES_PATH + "svga/7输出抽奖.svga"}
           />
         </Button>
-        <Button className="inviteBtn" onClick={this.clickInvite}>
+        <Button className="inviteBtn md10" onClick={this.clickInvite}>
           <div className="inviteBtnImg" />
         </Button>
 

src/store/share.js

@@ -20,8 +20,8 @@ const shareStore = makeAutoObservable({
     if (isWeChat()) {
       // 微信环境分享
       const _url = `${CFG.domain}${CFG.indexLogin}${encodeURIComponent(
-        `${CFG.domain}${CFG.shareUrl}${`&ykCode=${CFG.workerCode || CFG.agentCode || ""
-        }`}${`&channel=${CFG.defaultChannel}`}&agentCode=${CFG.agentCode}&actPlatforms=${CFG.actPlatforms}&actId=${CFG.actId
+        `${CFG.domain}${CFG.shareUrl}&ykCode=${CFG.workerCode || CFG.agentCode || ""
+        }&channel=${CFG.defaultChannel}&agentCode=${CFG.agentCode}&actPlatforms=${CFG.actPlatforms}&actId=${CFG.actId
         }`
       )}`;
       console.info("分享链接", _url);
@@ -60,9 +60,7 @@ const shareStore = makeAutoObservable({
       // app分享
       // app参数
       const _url = `${CFG.domain}${CFG.indexLogin}${encodeURIComponent(
-        `${CFG.domain}${CFG.shareUrl}${`&ykCode=${CFG.workerCode || CFG.agentCode || ""
-        }`}${`&channel=${CFG.defaultChannel}`}&agentCode=${CFG.agentCode}&actPlatforms=${CFG.actPlatforms}&actId=${CFG.actId
-        }`
+        `${CFG.domain}${CFG.shareUrl}&ykCode=${CFG.workerCode || CFG.agentCode || ""}&channel=${CFG.defaultChannel}&agentCode=${CFG.agentCode}&actPlatforms=${CFG.actPlatforms}&actId=${CFG.actId}`
       )}`;
       console.info("分享链接", _url);
       if (CFG.channel == "1") {
@@ -103,10 +101,9 @@ const shareStore = makeAutoObservable({
     const shareInfo = JSON.parse(store.frontVariable.shareInfoInvite);
     const { success, data } = await API.getInviteCode();
     const _url = `${CFG.domain}${CFG.indexLogin}${encodeURIComponent(
-      `${CFG.domain}${CFG.shareUrl}${CFG.workerCode ? `&ykCode=${CFG.workerCode}` : ""
-      }${`&channel=${CFG.defaultChannel}`}` +
-      (data?.inviteCode ? `&inviteCode=${data.inviteCode}` : "") +
-      `&agentCode=${CFG.agentCode}&actPlatforms=${CFG.actPlatforms}&actId=${CFG.actId}`
+      `${CFG.domain}${CFG.shareUrl}${CFG.workerCode ? `&ykCode=${CFG.workerCode}` : ""}&channel=${CFG.defaultChannel}`
+      + (data?.inviteCode ? `&inviteCode=${data.inviteCode}` : "")
+      + `&agentCode=${CFG.agentCode}&actPlatforms=${CFG.actPlatforms}&actId=${CFG.actId}`
     )}`;
     console.info("邀请链接>>>", _url);
     // const { success:success2, data:data2 } = await API.getLongLinkQrcode({
@@ -119,10 +116,9 @@ const shareStore = makeAutoObservable({
       if (isWeChat()) {
         // 微信环境分享
         const _url = `${CFG.domain}${CFG.indexLogin}${encodeURIComponent(
-          `${CFG.domain}${CFG.shareUrl}${CFG.workerCode ? `&ykCode=${CFG.workerCode}` : ""
-          }${`&channel=${CFG.defaultChannel}`}` +
-          (data?.inviteCode ? `&inviteCode=${data.inviteCode}` : "") +
-          `&agentCode=${CFG.agentCode}&actPlatforms=${CFG.actPlatforms}&actId=${CFG.actId}`
+          `${CFG.domain}${CFG.shareUrl}${CFG.workerCode ? `&ykCode=${CFG.workerCode}` : ""}&channel=${CFG.defaultChannel}`
+          + (data?.inviteCode ? `&inviteCode=${data.inviteCode}` : "")
+          + `&agentCode=${CFG.agentCode}&actPlatforms=${CFG.actPlatforms}&actId=${CFG.actId}`
         )}`;
         console.info("邀请链接>>>", _url);
         if (isMiniprogram()) {
@@ -161,10 +157,9 @@ const shareStore = makeAutoObservable({
       } else {
         // app分享
         const _url = `${CFG.domain}${CFG.indexLogin}${encodeURIComponent(
-          `${CFG.domain}${CFG.shareUrl}${CFG.workerCode ? `&ykCode=${CFG.workerCode}` : ""
-          }${`&channel=${CFG.defaultChannel}`}` +
-          (data?.inviteCode ? `&inviteCode=${data.inviteCode}` : "") +
-          `&agentCode=${CFG.agentCode}&actPlatforms=${CFG.actPlatforms}&actId=${CFG.actId}`
+          `${CFG.domain}${CFG.shareUrl}${CFG.workerCode ? `&ykCode=${CFG.workerCode}` : ""}&channel=${CFG.defaultChannel}`
+          + (data?.inviteCode ? `&inviteCode=${data.inviteCode}` : "")
+          + `&agentCode=${CFG.agentCode}&actPlatforms=${CFG.actPlatforms}&actId=${CFG.actId}`
         )}`;
         console.info("分享链接>>>", _url);
         // app参数
@@ -190,13 +185,14 @@ const shareStore = makeAutoObservable({
     if (!CFG.inviteCode) return false;
     console.info("进入助力！！！");
     if (sessionStorage.getItem("inviteCode")) return false;
-    const { success, code, data, message } = await API.doAssist({ inviteCode: CFG.inviteCode });
+    const { success, code, message } = await API.doAssist({ inviteCode: CFG.inviteCode });
     if (success) {
       modalStore.pushPop("AssistSucPanel");
       // Toast("助力成功～")
     } else {
-      // modalStore.pushPop("AssistFail", {message, code});
-      // modalStore.pushPop("Assistfailpop", { message, code });
+      modalStore.pushPop("AssistFailPanel", {
+        message, code
+      });
     }
     sessionStorage.setItem("inviteCode", CFG.inviteCode);
     history.replaceState({}, "", location.href.replace(new RegExp(`[?&]inviteCode=[^&]*`), ""));