提交修改内容

weekVerb/project/mock/week/interface.js

@@ -6,7 +6,10 @@ export const baseInfo = {
         "adMes": "1",
         "tenDjStock": 1200,
         "fiveDjStock": 2000,
-        "llbStock": 3000
+        "llbStock": 3000,
+        "llbStatus": 0,
+        "fiveDjStatus": 1,
+        "tenDjStatus": 0
     },
     "code": null,
     "message": null,
@@ -18,7 +21,7 @@ export const verbPrize = {
         "name": "奖品名称",
         "icon": "2"
     },
-    "code": 600001,
+    "code": 600006,
     "message": null,
     "success": false
 }
\ No newline at end of file

weekVerb/project/src/components/commessagemodal/commessagemodal.less

@@ -37,10 +37,10 @@
       transform-origin: 0px 0px 0px;
     }
     .titlelab {
-      width: 106px;
+      width: 150px;
       height: 48px;
       opacity: 1;
-      left: 322px;
+      left: 305px;
       top: 457px;
       position: absolute;
       transform-origin: 0px 0px 0px;
@@ -79,10 +79,10 @@
       text-align: center;
     }
     .content {
-      width: 400px;
+      width: 480px;
       height: 34px;
       opacity: 1;
-      left: 180px;
+      left: 137px;
       top: 747px;
       position: absolute;
       transform-origin: 0px 0px 0px;

weekVerb/project/src/components/comrule/comrule.jsx

+'use strict';
+
+import React, { Component } from 'react';
+import resList from '../../resconfig/resList';
+
+import './comrule.less';
+class Comrule extends Component {
+  constructor(props) {
+    super(props);
+    this.state = { resList: resList };
+  }
+  render() {
+    let { rule, onClose } = this.props;
+    return (
+      <div className="rule ">
+        <div className="rulemodal ">
+          <img className="rulebg " src={this.state.resList['7a0fb8eb-31ba-46ed-b01b-2cd177a184e7'].url} />
+          <img className="ruleborder " src={this.state.resList['92576229-ef35-4837-a6fc-3b1412d086c1'].url} />
+          <span className="ruletitle ">活动规则</span>
+          <span className="rulecontent ">
+            {rule}
+          </span>
+          <img className="ruleclosebtn " onClick={onClose} src={this.state.resList['f2faffb8-4b82-4dc4-a0e6-fa7c82c45c91'].url} />
+        </div>
+      </div>
+    );
+  }
+}
+export default Comrule;

weekVerb/project/src/components/comrule/comrule.less

+.rule {
+  top: 0px;
+  left: 0px;
+  width: 750px;
+  height: 1624px;
+  display: block;
+  position: fixed;
+
+  .rulemodal {
+    width: 750px;
+    height: 1334px;
+    opacity: 1;
+    position: absolute;
+    transform-origin: 0px 0px 0px;
+
+    .rulebg {
+      width: 750px;
+      height: 1334px;
+      opacity: 0.6;
+      position: absolute;
+      transform-origin: 0px 0px 0px;
+    }
+
+    .ruleborder {
+      width: 572px;
+      height: 802px;
+      opacity: 1;
+      left: 89px;
+      top: 266px;
+      position: absolute;
+      transform-origin: 0px 0px 0px;
+    }
+
+    .ruletitle {
+      width: 141px;
+      height: 50px;
+      opacity: 1;
+      left: 307px;
+      top: 310px;
+      position: absolute;
+      transform-origin: 0px 0px 0px;
+      font-size: 35px;
+      color: rgba(51, 51, 51, 1);
+    }
+
+    .rulecontent {
+      width: 480px;
+      height: 527px;
+      opacity: 1;
+      left: 137px;
+      top: 391px;
+      overflow: scroll;
+      position: absolute;
+      transform-origin: 0px 0px 0px;
+      font-size: 24px;
+      color: rgba(51, 51, 51, 1);
+    }
+
+    .ruleclosebtn {
+      width: 394px;
+      height: 77px;
+      opacity: 1;
+      left: 182px;
+      top: 958px;
+      position: absolute;
+      transform-origin: 0px 0px 0px;
+    }
+  }
+}
\ No newline at end of file

weekVerb/project/src/constant.js

@@ -22,7 +22,8 @@ export const MODAL_TYPE = {
     W3_PRIZE: 5,
     NO_TIMES: 6,
     END: 7,
-    NOT_START: 8
+    NOT_START: 8,
+    NOT_READY: 9
 }
 
 export const PRIZE_TYPE = {
@@ -37,7 +38,7 @@ export const CURRENT_LEVEL = {
     level3: "W3"
 }
 
-export function Modal_Lables(modalType, level) {
+export function Modal_Lables(modalType, level, openStatus) {
     let title = "";
     let desc = "";
     let content = "";
@@ -76,20 +77,38 @@ export function Modal_Lables(modalType, level) {
         content = "下次再来吧";
         img = ModalImage.END_IMG;
     }
-    console.log('level===', level);
-    if ([MODAL_TYPE.W1_PRIZE, MODAL_TYPE.W2_PRIZE, MODAL_TYPE.W3_PRIZE].includes(modalType)) {
-        content = "可前往“我的奖品”查看";
-        prize = 1;
-        img = ModalImage[level];
-    }
-    if (modalType == MODAL_TYPE.W1_PRIZE) {
-        desc = '已领取流量日包券一张';
-    }
-    if (modalType == MODAL_TYPE.W2_PRIZE) {
-        desc = '已领取5元无门槛代金券一张';
-    }
-    if (modalType == MODAL_TYPE.W3_PRIZE) {
-        desc = '已领取10元无门槛代金券一张';
+    console.log('level===', level, 'openStatus====', openStatus);
+
+    if (openStatus == 1) {
+        if ([MODAL_TYPE.W1_PRIZE, MODAL_TYPE.W2_PRIZE, MODAL_TYPE.W3_PRIZE].includes(modalType)) {
+            content = "可前往“我的奖品”查看";
+            prize = 1;
+            img = ModalImage[level];
+        }
+        if (modalType == MODAL_TYPE.W1_PRIZE) {
+            desc = '已领取流量日包券一张';
+        }
+        if (modalType == MODAL_TYPE.W2_PRIZE) {
+            desc = '已领取5元无门槛代金券一张';
+        }
+        if (modalType == MODAL_TYPE.W3_PRIZE) {
+            desc = '已领取10元无门槛代金券一张';
+        }
+    } else {
+        if (modalType == MODAL_TYPE.NOT_READY) {
+            title = "温馨提示";
+            img = ModalImage.NO_STOCK;
+            desc = "";
+        }
+        if (level == CURRENT_LEVEL.level1) {
+            content = '由于系统原因,3GB全国流量日包券暂停发放';
+        }
+        if (level == CURRENT_LEVEL.level2) {
+            content = '由于系统原因,5元无门槛代金券暂停发放';
+        }
+        if (level == CURRENT_LEVEL.level3) {
+            content = '由于系统原因,10元无门槛代金券暂停发放';
+        }
     }
     console.log("======", {
         title,
@@ -144,10 +163,10 @@ export function ERROR_MESSSAGE(errorCode) {
 }
 
 export function ERROR_TYPE(errorCode) {
-    if ([600001, 600002, 600005].includes(errorCode)) {
-        return true;
-    } else {
+    if ([600003, 600004, 600006, 600007, 600008].includes(errorCode)) {
         return false;
+    } else {
+        return true;
     }
 }
 

weekVerb/project/src/pages/pageweekverb/pageweekverb.jsx

@@ -5,11 +5,12 @@ import resList from '../../resconfig/resList';
 import { Toast, Loading, getModalHoc } from '../../../node_modules/spark-design';
 import API from '../../api';
 import { getPxToken } from '../../libs/spark_gettoken';
-import verbModal from '../../components/commessagemodal/commessagemodal.jsx'
+import verbModal from '../../components/commessagemodal/commessagemodal.jsx';
+import ruleModal from '../../components/comrule/comrule.jsx';
 import { MODAL_TYPE, Modal_Lables, ERROR_MESSSAGE, PRIZE_TYPE, ERROR_MODAL, CURRENT_LEVEL, ERROR_TYPE, JUMP_URL } from '../../constant';
 import './pageweekverb.less';
 const VerbModal = getModalHoc(verbModal);
-
+const RuleModal = getModalHoc(ruleModal);
 class Pageweekverb extends Component {
   constructor(props) {
     super(props);
@@ -25,7 +26,8 @@ class Pageweekverb extends Component {
         llbStock: ""
       },
       modalData: {},
-      pass: true
+      pass: true,
+      rule: ""
     };
   }
 
@@ -61,8 +63,16 @@ class Pageweekverb extends Component {
   }
 
   async getActivityRule() {
-    let { data, success, message } = await API.getRule();
-    console.log('data=',data);
+    let { data, success, code, message } = await API.getRule();
+    console.log('data=', data);
+    if (success) {
+      this.setState({
+        modalStatus: 2,
+        rule: data
+      })
+    } else {
+      Toast(message);
+    }
   }
 
 
@@ -77,7 +87,8 @@ class Pageweekverb extends Component {
       "adMes": "1",
       "tenDjStock": 1200,
       "fiveDjStock": 2000,
-      "llbStock": 3000
+      "llbStock": 3000,
+      llbStatus fiveDjStatus tenDjStatus
     },
     */
     console.log('======');
@@ -95,45 +106,57 @@ class Pageweekverb extends Component {
    * 领取奖品调用接口
    * @param {*} prizeType 
    */
-  verbPrizeInterface(prizeType, modalType, level) {
-    if (this.state.pass) {
-      this.submit();
-      getPxToken(
-        async token => {
-          let { success, message, code } = await API.verbPrize({ token: token, awardType: prizeType });
-          console.log("success====", success, "message-====", message);
-          if (success) {
-            console.log('领取奖品结束', modalType);
-            let modalInfo = Modal_Lables(modalType, level);
-            // modalInfo.prize = 1;
-            this.getBaseInfoData();
-            this.setState({
-              modalStatus: 1,
-              modalData: modalInfo
-            })
-          } else {
-            console.log('>>>>>', ERROR_MESSSAGE(code));
-            let isToast = ERROR_TYPE(code);
-            if (isToast) {
-              Toast(ERROR_MESSSAGE(code));
+  verbPrizeInterface(prizeType, modalType, level, openStatus) {
+    console.log('openStatus=', openStatus);
+    if (openStatus == 1) {
+      if (this.state.pass) {
+        this.submit();
+        getPxToken(
+          async token => {
+            let { success, message, code } = await API.verbPrize({ token: token, awardType: prizeType });
+            console.log("success====", success, "message-====", message);
+            if (success) {
+              console.log('领取奖品结束', modalType);
+              let modalInfo = Modal_Lables(modalType, level, openStatus);
+              // modalInfo.prize = 1;
+              this.getBaseInfoData();
+              this.setState({
+                modalStatus: 1,
+                modalData: modalInfo
+              })
             } else {
-              this.errorModal(code, this.state.baseData.vipLevel);
+              console.log('>>>>>', ERROR_MESSSAGE(code));
+              let isToast = ERROR_TYPE(code);
+              if (isToast) {
+                Toast(ERROR_MESSSAGE(code));
+              } else {
+                this.errorModal(code, this.state.baseData.vipLevel,openStatus);
+              }
             }
           }
-        }
-      )
+        )
+      }
+    } else {
+      modalType = MODAL_TYPE.NOT_READY;
+      console.log('modalType===', modalType, 'level===', level, 'openStatus===', openStatus);
+      let modalInfo = Modal_Lables(modalType, level, openStatus);
+      console.log('modalInfo-------打开弹窗', modalInfo);
+      this.setState({
+        modalStatus: 1,
+        modalData: modalInfo
+      })
+
     }
   }
-
   /**
    * 打开错误信息的弹窗
    * @param {*} errorCode 
    * @param {*} level 
    */
-  errorModal(errorCode, level) {
+  errorModal(errorCode, level, openStatus) {
     console.log("打开弹窗");
     let modalType = ERROR_MODAL(errorCode);
-    let modalInfo = Modal_Lables(modalType, level);
+    let modalInfo = Modal_Lables(modalType, level, openStatus);
     this.setState({
       modalStatus: 1,
       modalData: modalInfo
@@ -141,7 +164,7 @@ class Pageweekverb extends Component {
   }
 
   render() {
-    let { baseData, modalStatus, modalData } = this.state;
+    let { baseData, modalStatus, modalData, rule } = this.state;
     return (
       <div className="weekverb ">
         <img className="wholebg " src={this.state.resList['8c8463a4-658c-431f-ba5b-0fb00f4fda44'].url} />
@@ -152,19 +175,19 @@ class Pageweekverb extends Component {
             <img className="w1bg " src={this.state.resList['86fa1e7e-97b5-4d2d-9b73-42c629ec7c8e'].url} />
             <span className="w1limit ">W1会员及以上</span>
             <span className="w1stock ">剩余{baseData.llbStock || 0}份</span>
-            <img className="w1verb " onClick={() => { this.verbPrizeInterface(PRIZE_TYPE.W1, MODAL_TYPE.W1_PRIZE, CURRENT_LEVEL.level1) }} src={this.state.resList['1f277473-a3c7-4f2a-a473-907c1d7428eb'].url} />
+            <img className="w1verb " onClick={() => { this.verbPrizeInterface(PRIZE_TYPE.W1, MODAL_TYPE.W1_PRIZE, CURRENT_LEVEL.level1, baseData.llbStatus) }} src={this.state.resList['1f277473-a3c7-4f2a-a473-907c1d7428eb'].url} />
           </div>
           <div className="w2rewar ">
             <img className="w2bg " src={this.state.resList['fd31ffa9-c0ab-4f93-b894-c7ff817e1f30'].url} />
             <span className="w2limit ">W2会员专享</span>
             <span className="w2stock ">剩余{baseData.fiveDjStock || 0}份</span>
-            <img className="w2verb " onClick={() => { this.verbPrizeInterface(PRIZE_TYPE.W2, MODAL_TYPE.W2_PRIZE, CURRENT_LEVEL.level2) }} src={this.state.resList['1f277473-a3c7-4f2a-a473-907c1d7428eb'].url} />
+            <img className="w2verb " onClick={() => { this.verbPrizeInterface(PRIZE_TYPE.W2, MODAL_TYPE.W2_PRIZE, CURRENT_LEVEL.level2, baseData.fiveDjStatus) }} src={this.state.resList['1f277473-a3c7-4f2a-a473-907c1d7428eb'].url} />
           </div>
           <div className="w3rewar ">
             <img className="w3bg " src={this.state.resList['23116b8a-cbb7-4a44-a1f8-bbb7b23a8392'].url} />
             <span className="w3limit ">W3及以上会员专享</span>
             <span className="w3stock ">剩余{baseData.tenDjStock || 0}份</span>
-            <img className="w3verb " onClick={() => { this.verbPrizeInterface(PRIZE_TYPE.W3, MODAL_TYPE.W3_PRIZE, CURRENT_LEVEL.level3) }} src={this.state.resList['1f277473-a3c7-4f2a-a473-907c1d7428eb'].url} />
+            <img className="w3verb " onClick={() => { this.verbPrizeInterface(PRIZE_TYPE.W3, MODAL_TYPE.W3_PRIZE, CURRENT_LEVEL.level3, baseData.tenDjStatus) }} src={this.state.resList['1f277473-a3c7-4f2a-a473-907c1d7428eb'].url} />
           </div>
           <img className="myrewar " onClick={() => { this.jumpUrl(JUMP_URL.COUPON) }} src={this.state.resList['b1f11e37-165a-4bfa-8058-ceddecb14ba2'].url} />
           {/* <img className="adborde " src={this.state.resList['d45b8c4a-1eaa-436c-b992-cca999839d66'].url} /> */}
@@ -173,6 +196,7 @@ class Pageweekverb extends Component {
         </div>
 
         {modalStatus == 1 && <VerbModal data={modalData} onClose={() => { this.setState({ modalStatus: 0 }) }}></VerbModal>}
+        {modalStatus == 2 && <RuleModal rule={rule} onClose={() => { this.setState({ modalStatus: 0 }) }} ></RuleModal>}
       </div>
     );
   }

weekVerb/project/src/resconfig/resList.js

@@ -130,6 +130,24 @@ const resList = {
     ext: '.png',
     url: '//yun.duiba.com.cn/spark/assets/f34f976bebd2fa7f3680c9d1ecf801b302093066.png',
     uuid: 'b97d2668-3e0a-481e-8df8-aa2f532b1fbc'
+  },
+  '7a0fb8eb-31ba-46ed-b01b-2cd177a184e7': {
+    name: 'ruleBg',
+    ext: '.png',
+    uuid: '7a0fb8eb-31ba-46ed-b01b-2cd177a184e7',
+    url: '//yun.duiba.com.cn/spark/assets/20be88bb67da36ac8f85639e267b7c82c34fcc8f.png'
+  },
+  '92576229-ef35-4837-a6fc-3b1412d086c1': {
+    name: 'ruleBorder',
+    ext: '.png',
+    uuid: '92576229-ef35-4837-a6fc-3b1412d086c1',
+    url: '//yun.duiba.com.cn/spark/assets/2485294f2add27dc8d14306c5b7969f7cab7ba86.png'
+  },
+  'f2faffb8-4b82-4dc4-a0e6-fa7c82c45c91': {
+    name: 'ruleCloseBtn',
+    ext: '.png',
+    uuid: 'f2faffb8-4b82-4dc4-a0e6-fa7c82c45c91',
+    url: '//yun.duiba.com.cn/spark/assets/66f4aee0013fb1885e229a7f3f7773b1fa58f162.png'
   }
 
 };