提交修改

weekVerb/project/package.json

@@ -10,6 +10,7 @@
   "dependencies": {
     "axios": "^0.19.2",
     "css-loader": "^3.6.0",
+    "duiba-utils": "git+ssh://git@gitlab2.dui88.com/spark/duiba-utils.git",
     "fyge-tbmini": "^1.3.1",
     "postcss-loader": "^3.0.0",
     "prettier": "^2.0.5",
@@ -19,9 +20,11 @@
     "react-redux": "^5.0.7",
     "redux": "^4.0.0",
     "redux-thunk": "^2.3.0",
-    "style-loader": "^1.2.1",
+    "spark-design": "^0.2.0",
     "spark-utils": "^0.0.2",
-    "duiba-utils": "git+ssh://git@gitlab2.dui88.com/spark/duiba-utils.git"
+    "style-loader": "^1.2.1"
   },
-  "devDependencies": { "mockjs": "^1.1.0" }
+  "devDependencies": {
+    "mockjs": "^1.1.0"
+  }
 }

weekVerb/project/src/constant.js

+export const ModalImage = {
+    NO_STOCK: "9b80be59-4fa3-4f6a-b629-2debba82ac8c",
+    VIP_CHECK: "c9af4a2c-f766-48f8-b3bb-840d8bb2ae22",
+    W1_PRIZE: "42783179-c885-470c-9eae-6b59493f2986",
+    W2_PRIZE: "f16d3f74-51d1-4c29-aaa2-ec78963483a1",
+    W3_PRIZE: "40ed1f27-265b-4bc8-84f4-91780e389a98"
+}
+export const AWARD_TYPE = {
+    PRIZE_W1: 1,
+    PRIZE_W2: 2,
+    PRIZE_W3: 3
+
+};
+
+export const MODAL_TYPE = {
+    NO_STOCK: 1,
+    VIP_CHECK: 2,
+    W1_PRIZE: 3,
+    W2_PRIZE: 4,
+    W3_PRIZE: 5
+}
+
+export function Modal_Lables(modalType, imgUuid, level) {
+    let title = "";
+    let desc = "";
+    let content = "";
+    let img = "";
+    if ([MODAL_TYPE.NO_STOCK, MODAL_TYPE.VIP_CHECK].includes(modalType)) {
+        title = "很抱歉"
+    } else {
+        title = "恭喜您"
+    }
+    if (modalType = MODAL_TYPE.NO_STOCK) {
+        desc = "券已领完";
+        content = "下次早点来哦";
+        img = imgUuid;
+    }
+    if (modalType = MODAL_TYPE.VIP_CHECK) {
+        desc = `您暂时还不是${level}用户`;
+        content = "暂时无法领取代金券";
+        img = imgUuid;
+    }
+    if ([MODAL_TYPE.W1_PRIZE, MODAL_TYPE.W2_PRIZE, MODAL_TYPE.W3_PRIZE].includes(modalType) = MODAL_TYPE.W1_PRIZE) {
+        content = "可前往“我的奖品”查看";
+        img = imgUuid;
+    }
+    if (modalType = MODAL_TYPE.W1_PRIZE) {
+        desc = '已领取流量日包券一张';
+    }
+    if (modalType = MODAL_TYPE.W2_PRIZE) {
+        desc = '已领取5元无门槛代金券一张';
+    }
+    if (modalType = MODAL_TYPE.W3_PRIZE) {
+        desc = '已领取10元无门槛代金券一张';
+    }
+    return {
+        title,
+        desc,
+        content,
+        img
+    }
+}
+
+

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

@@ -36,7 +36,7 @@ class Pageweekverb extends Component {
             <img className="w3verb " src={this.state.resList['1f277473-a3c7-4f2a-a473-907c1d7428eb'].url} />
           </div>
           <img className="myrewar " src={this.state.resList['b1f11e37-165a-4bfa-8058-ceddecb14ba2'].url} />
-          <img className="adborde " src={this.state.resList['d45b8c4a-1eaa-436c-b992-cca999839d66'].url} />
+          {/* <img className="adborde " src={this.state.resList['d45b8c4a-1eaa-436c-b992-cca999839d66'].url} /> */}
           <img className="adimg " src={this.state.resList['f2366ce5-dc77-4941-a8bf-48f35b4e0536'].url} />
           <span className="adslot ">广告位</span>
         </div>

weekVerb/project/src/pages/pageweekverb/pageweekverb.less

 .weekverb {
-  top: 0px;
+  top: -17.2vw;
   left: 0px;
   width: 750px;
-  height: 1624px;
+  height: 1774px;
   display: block;
   position: absolute;
+  overflow-x: hidden;
   .wholebg {
     width: 750px;
     height: 2278px;