add popModal

project/src/canvas/game/output.js

@@ -2561,6 +2561,57 @@ var Cat = (function (_super) {
 exports.Cat = Cat;
 
 
+/***/ }),
+
+/***/ "./src/chuansongdai/StartScene.ts":
+/*!****************************************!*\
+  !*** ./src/chuansongdai/StartScene.ts ***!
+  \****************************************/
+/*! no static exports found */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    };
+    return function (d, b) {
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CsdScene = void 0;
+var Scene_1 = __webpack_require__(/*! ../../module/views/Scene */ "./module/views/Scene.ts");
+var Ins_1 = __webpack_require__(/*! ../Ins */ "./src/Ins.ts");
+var ctrls_1 = __webpack_require__(/*! ../../module/ctrls */ "./module/ctrls/index.ts");
+var SelectCatPanel_1 = __webpack_require__(/*! ../panels/selectcatpanel/SelectCatPanel */ "./src/panels/selectcatpanel/SelectCatPanel.ts");
+var CsdScene = (function (_super) {
+    __extends(CsdScene, _super);
+    function CsdScene() {
+        return _super !== null && _super.apply(this, arguments) || this;
+    }
+    CsdScene.prototype.initUi = function () {
+        _super.prototype.initUi.call(this);
+        var sceneBg = Ins_1.Ins.initSprite("b3c8c187-e5c9-4968-9a00-a118d18ab2fc");
+        this.addChild(sceneBg);
+        this.x = (Ins_1.Ins.stageW - 750) >> 1;
+        this.y = (Ins_1.Ins.stageH - 1624) >> 1;
+        ctrls_1.showPanel(SelectCatPanel_1.SelectCatPanel);
+    };
+    CsdScene.prototype.start = function () {
+        this.initUi();
+    };
+    return CsdScene;
+}(Scene_1.Scene));
+exports.CsdScene = CsdScene;
+
+
 /***/ }),
 
 /***/ "./src/common/G_EVENT.ts":
@@ -44344,7 +44395,8 @@ var Scene_1 = __webpack_require__(/*! ../../module/views/Scene */ "./module/view
 var Ins_1 = __webpack_require__(/*! ../Ins */ "./src/Ins.ts");
 var resloadingList_1 = __webpack_require__(/*! ../../../game/resloadingList */ "./resloadingList.js");
 var ctrls_1 = __webpack_require__(/*! ../../module/ctrls */ "./module/ctrls/index.ts");
-var StartScene_1 = __webpack_require__(/*! ./StartScene */ "./src/scenes/StartScene.ts");
+var StartScene_1 = __webpack_require__(/*! ../xiaoxiaole/StartScene */ "./src/xiaoxiaole/StartScene.ts");
+var StartScene_2 = __webpack_require__(/*! ../chuansongdai/StartScene */ "./src/chuansongdai/StartScene.ts");
 var LoadingScene = (function (_super) {
     __extends(LoadingScene, _super);
     function LoadingScene() {
@@ -44398,13 +44450,13 @@ var LoadingScene = (function (_super) {
         FYGE.Tween.get(this.loading, { onChange: function () { that.zhuazi.x = (that.loading.x + that.loading.width - 30); }, onChangeObj: that }).to({ x: -80 }, 200).call(function () {
             that.tweenEnd = true;
             if (that.isEnd) {
-                FYGE.Tween.get(that.loading, { onChange: function () { that.zhuazi.x = (that.loading.x + that.loading.width - 30); }, onChangeObj: that }).to({ x: 9 }, 600).call(function () { ctrls_1.changeScene(StartScene_1.StartScene); });
+                FYGE.Tween.get(that.loading, { onChange: function () { that.zhuazi.x = (that.loading.x + that.loading.width - 30); }, onChangeObj: that }).to({ x: 9 }, 600).call(function () { ctrls_1.changeScene(StartScene_1.XxlScene); });
             }
         });
         FYGE.GDispatcher.addEventListener("loadEnd", function () {
             that.isEnd = true;
             if (that.tweenEnd) {
-                FYGE.Tween.get(that.loading, { onChange: function () { that.zhuazi.x = (that.loading.x + that.loading.width - 30); }, onChangeObj: that }).to({ x: 9 }, 600).call(function () { ctrls_1.changeScene(StartScene_1.StartScene); });
+                FYGE.Tween.get(that.loading, { onChange: function () { that.zhuazi.x = (that.loading.x + that.loading.width - 30); }, onChangeObj: that }).to({ x: 9 }, 600).call(function () { ctrls_1.changeScene(StartScene_2.CsdScene); });
             }
         }, that);
     };
@@ -44552,57 +44604,6 @@ var MainScene = (function (_super) {
 exports.MainScene = MainScene;
 
 
-/***/ }),
-
-/***/ "./src/scenes/StartScene.ts":
-/*!**********************************!*\
-  !*** ./src/scenes/StartScene.ts ***!
-  \**********************************/
-/*! no static exports found */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-var __extends = (this && this.__extends) || (function () {
-    var extendStatics = function (d, b) {
-        extendStatics = Object.setPrototypeOf ||
-            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
-            function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
-        return extendStatics(d, b);
-    };
-    return function (d, b) {
-        extendStatics(d, b);
-        function __() { this.constructor = d; }
-        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
-    };
-})();
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.StartScene = void 0;
-var Scene_1 = __webpack_require__(/*! ../../module/views/Scene */ "./module/views/Scene.ts");
-var Ins_1 = __webpack_require__(/*! ../Ins */ "./src/Ins.ts");
-var ctrls_1 = __webpack_require__(/*! ../../module/ctrls */ "./module/ctrls/index.ts");
-var SelectCatPanel_1 = __webpack_require__(/*! ../panels/selectcatpanel/SelectCatPanel */ "./src/panels/selectcatpanel/SelectCatPanel.ts");
-var StartScene = (function (_super) {
-    __extends(StartScene, _super);
-    function StartScene() {
-        return _super !== null && _super.apply(this, arguments) || this;
-    }
-    StartScene.prototype.initUi = function () {
-        _super.prototype.initUi.call(this);
-        var sceneBg = Ins_1.Ins.initSprite("b3c8c187-e5c9-4968-9a00-a118d18ab2fc");
-        this.addChild(sceneBg);
-        this.x = (Ins_1.Ins.stageW - 750) >> 1;
-        this.y = (Ins_1.Ins.stageH - 1624) >> 1;
-        ctrls_1.showPanel(SelectCatPanel_1.SelectCatPanel);
-    };
-    StartScene.prototype.start = function () {
-        this.initUi();
-    };
-    return StartScene;
-}(Scene_1.Scene));
-exports.StartScene = StartScene;
-
-
 /***/ }),
 
 /***/ "./src/scenes/stage.ts":
@@ -44845,6 +44846,57 @@ var MainSceneBtnUi = (function (_super) {
 exports.MainSceneBtnUi = MainSceneBtnUi;
 
 
+/***/ }),
+
+/***/ "./src/xiaoxiaole/StartScene.ts":
+/*!**************************************!*\
+  !*** ./src/xiaoxiaole/StartScene.ts ***!
+  \**************************************/
+/*! no static exports found */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    };
+    return function (d, b) {
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.XxlScene = void 0;
+var Scene_1 = __webpack_require__(/*! ../../module/views/Scene */ "./module/views/Scene.ts");
+var Ins_1 = __webpack_require__(/*! ../Ins */ "./src/Ins.ts");
+var ctrls_1 = __webpack_require__(/*! ../../module/ctrls */ "./module/ctrls/index.ts");
+var SelectCatPanel_1 = __webpack_require__(/*! ../panels/selectcatpanel/SelectCatPanel */ "./src/panels/selectcatpanel/SelectCatPanel.ts");
+var XxlScene = (function (_super) {
+    __extends(XxlScene, _super);
+    function XxlScene() {
+        return _super !== null && _super.apply(this, arguments) || this;
+    }
+    XxlScene.prototype.initUi = function () {
+        _super.prototype.initUi.call(this);
+        var sceneBg = Ins_1.Ins.initSprite("b3c8c187-e5c9-4968-9a00-a118d18ab2fc");
+        this.addChild(sceneBg);
+        this.x = (Ins_1.Ins.stageW - 750) >> 1;
+        this.y = (Ins_1.Ins.stageH - 1624) >> 1;
+        ctrls_1.showPanel(SelectCatPanel_1.SelectCatPanel);
+    };
+    XxlScene.prototype.start = function () {
+        this.initUi();
+    };
+    return XxlScene;
+}(Scene_1.Scene));
+exports.XxlScene = XxlScene;
+
+
 /***/ })
 
 /******/ });

project/src/canvas/game/released/output.js

@@ -2563,6 +2563,57 @@ var Cat = (function (_super) {
 exports.Cat = Cat;
 
 
+/***/ }),
+
+/***/ "./src/chuansongdai/StartScene.ts":
+/*!****************************************!*\
+  !*** ./src/chuansongdai/StartScene.ts ***!
+  \****************************************/
+/*! no static exports found */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    };
+    return function (d, b) {
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CsdScene = void 0;
+var Scene_1 = __webpack_require__(/*! ../../module/views/Scene */ "./module/views/Scene.ts");
+var Ins_1 = __webpack_require__(/*! ../Ins */ "./src/Ins.ts");
+var ctrls_1 = __webpack_require__(/*! ../../module/ctrls */ "./module/ctrls/index.ts");
+var SelectCatPanel_1 = __webpack_require__(/*! ../panels/selectcatpanel/SelectCatPanel */ "./src/panels/selectcatpanel/SelectCatPanel.ts");
+var CsdScene = (function (_super) {
+    __extends(CsdScene, _super);
+    function CsdScene() {
+        return _super !== null && _super.apply(this, arguments) || this;
+    }
+    CsdScene.prototype.initUi = function () {
+        _super.prototype.initUi.call(this);
+        var sceneBg = Ins_1.Ins.initSprite("b3c8c187-e5c9-4968-9a00-a118d18ab2fc");
+        this.addChild(sceneBg);
+        this.x = (Ins_1.Ins.stageW - 750) >> 1;
+        this.y = (Ins_1.Ins.stageH - 1624) >> 1;
+        ctrls_1.showPanel(SelectCatPanel_1.SelectCatPanel);
+    };
+    CsdScene.prototype.start = function () {
+        this.initUi();
+    };
+    return CsdScene;
+}(Scene_1.Scene));
+exports.CsdScene = CsdScene;
+
+
 /***/ }),
 
 /***/ "./src/common/G_EVENT.ts":
@@ -44346,7 +44397,8 @@ var Scene_1 = __webpack_require__(/*! ../../module/views/Scene */ "./module/view
 var Ins_1 = __webpack_require__(/*! ../Ins */ "./src/Ins.ts");
 var resloadingList_1 = __webpack_require__(/*! ../../../game/resloadingList */ "./resloadingList.js");
 var ctrls_1 = __webpack_require__(/*! ../../module/ctrls */ "./module/ctrls/index.ts");
-var StartScene_1 = __webpack_require__(/*! ./StartScene */ "./src/scenes/StartScene.ts");
+var StartScene_1 = __webpack_require__(/*! ../xiaoxiaole/StartScene */ "./src/xiaoxiaole/StartScene.ts");
+var StartScene_2 = __webpack_require__(/*! ../chuansongdai/StartScene */ "./src/chuansongdai/StartScene.ts");
 var LoadingScene = (function (_super) {
     __extends(LoadingScene, _super);
     function LoadingScene() {
@@ -44400,13 +44452,13 @@ var LoadingScene = (function (_super) {
         FYGE.Tween.get(this.loading, { onChange: function () { that.zhuazi.x = (that.loading.x + that.loading.width - 30); }, onChangeObj: that }).to({ x: -80 }, 200).call(function () {
             that.tweenEnd = true;
             if (that.isEnd) {
-                FYGE.Tween.get(that.loading, { onChange: function () { that.zhuazi.x = (that.loading.x + that.loading.width - 30); }, onChangeObj: that }).to({ x: 9 }, 600).call(function () { ctrls_1.changeScene(StartScene_1.StartScene); });
+                FYGE.Tween.get(that.loading, { onChange: function () { that.zhuazi.x = (that.loading.x + that.loading.width - 30); }, onChangeObj: that }).to({ x: 9 }, 600).call(function () { ctrls_1.changeScene(StartScene_1.XxlScene); });
             }
         });
         FYGE.GDispatcher.addEventListener("loadEnd", function () {
             that.isEnd = true;
             if (that.tweenEnd) {
-                FYGE.Tween.get(that.loading, { onChange: function () { that.zhuazi.x = (that.loading.x + that.loading.width - 30); }, onChangeObj: that }).to({ x: 9 }, 600).call(function () { ctrls_1.changeScene(StartScene_1.StartScene); });
+                FYGE.Tween.get(that.loading, { onChange: function () { that.zhuazi.x = (that.loading.x + that.loading.width - 30); }, onChangeObj: that }).to({ x: 9 }, 600).call(function () { ctrls_1.changeScene(StartScene_2.CsdScene); });
             }
         }, that);
     };
@@ -44554,57 +44606,6 @@ var MainScene = (function (_super) {
 exports.MainScene = MainScene;
 
 
-/***/ }),
-
-/***/ "./src/scenes/StartScene.ts":
-/*!**********************************!*\
-  !*** ./src/scenes/StartScene.ts ***!
-  \**********************************/
-/*! no static exports found */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-var __extends = (this && this.__extends) || (function () {
-    var extendStatics = function (d, b) {
-        extendStatics = Object.setPrototypeOf ||
-            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
-            function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
-        return extendStatics(d, b);
-    };
-    return function (d, b) {
-        extendStatics(d, b);
-        function __() { this.constructor = d; }
-        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
-    };
-})();
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.StartScene = void 0;
-var Scene_1 = __webpack_require__(/*! ../../module/views/Scene */ "./module/views/Scene.ts");
-var Ins_1 = __webpack_require__(/*! ../Ins */ "./src/Ins.ts");
-var ctrls_1 = __webpack_require__(/*! ../../module/ctrls */ "./module/ctrls/index.ts");
-var SelectCatPanel_1 = __webpack_require__(/*! ../panels/selectcatpanel/SelectCatPanel */ "./src/panels/selectcatpanel/SelectCatPanel.ts");
-var StartScene = (function (_super) {
-    __extends(StartScene, _super);
-    function StartScene() {
-        return _super !== null && _super.apply(this, arguments) || this;
-    }
-    StartScene.prototype.initUi = function () {
-        _super.prototype.initUi.call(this);
-        var sceneBg = Ins_1.Ins.initSprite("b3c8c187-e5c9-4968-9a00-a118d18ab2fc");
-        this.addChild(sceneBg);
-        this.x = (Ins_1.Ins.stageW - 750) >> 1;
-        this.y = (Ins_1.Ins.stageH - 1624) >> 1;
-        ctrls_1.showPanel(SelectCatPanel_1.SelectCatPanel);
-    };
-    StartScene.prototype.start = function () {
-        this.initUi();
-    };
-    return StartScene;
-}(Scene_1.Scene));
-exports.StartScene = StartScene;
-
-
 /***/ }),
 
 /***/ "./src/scenes/stage.ts":
@@ -44847,6 +44848,57 @@ var MainSceneBtnUi = (function (_super) {
 exports.MainSceneBtnUi = MainSceneBtnUi;
 
 
+/***/ }),
+
+/***/ "./src/xiaoxiaole/StartScene.ts":
+/*!**************************************!*\
+  !*** ./src/xiaoxiaole/StartScene.ts ***!
+  \**************************************/
+/*! no static exports found */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    };
+    return function (d, b) {
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.XxlScene = void 0;
+var Scene_1 = __webpack_require__(/*! ../../module/views/Scene */ "./module/views/Scene.ts");
+var Ins_1 = __webpack_require__(/*! ../Ins */ "./src/Ins.ts");
+var ctrls_1 = __webpack_require__(/*! ../../module/ctrls */ "./module/ctrls/index.ts");
+var SelectCatPanel_1 = __webpack_require__(/*! ../panels/selectcatpanel/SelectCatPanel */ "./src/panels/selectcatpanel/SelectCatPanel.ts");
+var XxlScene = (function (_super) {
+    __extends(XxlScene, _super);
+    function XxlScene() {
+        return _super !== null && _super.apply(this, arguments) || this;
+    }
+    XxlScene.prototype.initUi = function () {
+        _super.prototype.initUi.call(this);
+        var sceneBg = Ins_1.Ins.initSprite("b3c8c187-e5c9-4968-9a00-a118d18ab2fc");
+        this.addChild(sceneBg);
+        this.x = (Ins_1.Ins.stageW - 750) >> 1;
+        this.y = (Ins_1.Ins.stageH - 1624) >> 1;
+        ctrls_1.showPanel(SelectCatPanel_1.SelectCatPanel);
+    };
+    XxlScene.prototype.start = function () {
+        this.initUi();
+    };
+    return XxlScene;
+}(Scene_1.Scene));
+exports.XxlScene = XxlScene;
+
+
 /***/ })
 
 /******/ });

project/src/canvas/game/src/scenes/StartScene.ts

@@ -15,7 +15,7 @@ export class StartScene extends Scene {
     this.x = (Ins.stageW - 750)>>1;
     this.y = (Ins.stageH - 1624)>>1;
 
-    showPanel(SelectCatPanel);
+    // showPanel(SelectCatPanel);
     // this.addChild(new MainScene());
 
   }

taobao_mini/client/app.js

@@ -11,6 +11,12 @@ App({
   cloudName: 'floor', // 主云函数项目名 base clientTemplate2C
   cloud,
   tbcc,
+
+  // 全局可用数据
+  globalData: {
+
+  },
+
   onLaunch(options) {
     this.handleQuery(options.query || {});
   },

taobao_mini/client/components/comPrizesModal/comPrizesModal.acss

+.prizes-modal {
+  position: fixed;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  z-index: 20;
+}
+
+.prizes-modal__shade {
+  position: absolute;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  background-color: rgba(0, 0, 0, 0.75);
+}
+
+
+.jiang_pin_dan_chuang {
+  width: 500rpx;
+  height: 672rpx;
+  opacity: 1;
+  left: 125rpx;
+  top: calc(50% - 336rrpx);
+  position: absolute;
+}
+
+
+.dan_chuang_bei_jing01 {
+  width: 100%;
+  height: 100%;
+  opacity: 1;
+  top: 0;
+  left: 0;
+  position: absolute;
+}
+.tai_zi_kao_bei3 {
+  width: 318rpx;
+  height: 131rpx;
+  opacity: 1;
+  left: 91rpx;
+  top: 436rpx;
+  position: absolute;
+}
+.hao_yun_lai_lin {
+  width: 100%;
+  height: 60rpx;
+  line-height: 60rpx;
+  left: 0;
+  top: 96rpx;
+  position: absolute;
+  display: inline-block;
+  font-size: 50rpx;
+  text-align: center;
+  color: transparent;
+  background: linear-gradient(to top, #b65443, #ec8268);
+  -webkit-background-clip: text;
+  font-weight: 700;
+}
+.cha_kan_jiang_pin {
+  width: 299rpx;
+  height: 88rpx;
+  opacity: 1;
+  left: 102rpx;
+  top: 581rpx;
+  position: absolute;
+}
+.shang_pin {
+  width: 91rpx;
+  height: 236rpx;
+  opacity: 1;
+  left: 206rpx;
+  top: 256rpx;
+  position: absolute;
+}
+.an_niu_guan_bi_dan_chuang_kao_bei24 {
+  width: 50rpx;
+  height: 50rpx;
+  opacity: 0.5019607843137255;
+  left: 514rpx;
+  position: absolute;
+}

taobao_mini/client/components/comPrizesModal/comPrizesModal.axml

+<view class="prizes-modal">
+	<view class="prizes-modal__shade modal-animate-fade-in">
+
+      <view class="jiang_pin_dan_chuang">
+        <image class="dan_chuang_bei_jing01" src="{{resList['c34046a2-1b15-47e8-95f3-376deb238e43'].url}}" />
+        <image class="tai_zi_kao_bei3" src="{{resList['d3e951d6-4d66-4f5b-b0f0-47e28ff04614'].url}}" />
+        <text class="hao_yun_lai_lin">好运来临</text>
+        <image class="cha_kan_jiang_pin" src="{{resList['715120cb-b41f-425f-b8fa-bce3f4a6680a'].url}}" />
+        <image class="shang_pin" src="{{resList['bf24cd04-e4f7-4859-beb6-212aa712f48e'].url}}" />
+        <image onTap="onModalClose"
+          class="an_niu_guan_bi_dan_chuang_kao_bei24"
+          src="{{resList['4abc8bb6-5779-49ad-84b4-b4ade4f51fcb'].url}}"
+        />
+      </view>
+
+
+  </view>
+</view>
\ No newline at end of file

taobao_mini/client/components/rewardsModal/rewardsModal.js → taobao_mini/client/components/comPrizesModal/comPrizesModal.js

 import resList from '../../resconfig/resList'
 
 Component({
-  methods: {
   data: {
     resList: resList
   },
+  methods: {
     onModalClose() {
       const { onModalClose } = this.props;
       onModalClose && onModalClose();

taobao_mini/client/components/comPrizesModal/comPrizesModal.json

+{
+  "component": true
+}
\ No newline at end of file

taobao_mini/client/components/rewardsModal/rewardsModal.acss → taobao_mini/client/components/comRewardsModal/comRewardsModal.acss

@@ -16,90 +16,86 @@
   background-color: rgba(0, 0, 0, 0.75);
 }
 
-.ju_xing791 {
-  width: 752px;
-  height: 1626px;
-  opacity: 0.7019607843137254;
-  left: -1px;
-  top: -1px;
-  position: absolute;
-  transform-origin: 0px 0px 0px;
-  background-color: rgba(0, 0, 0, 1);
-}
 .jiang_li_dan_chuang {
-  width: 564px;
-  height: 545px;
+  width: 500rpx;
+  height: 523rpx;
   opacity: 1;
-  left: 125px;
-  top: 442px;
+  left: 125rpx;
+  top: calc(50% - 261rpx);
   position: absolute;
-  transform-origin: 0px 0px 0px;
 }
 
 .dan_chuang_bei_jing2 {
-  width: 500px;
-  height: 523px;
+  width: 100%;
+  height: 100%;
   opacity: 1;
-  top: 22px;
+  top: 0;
+  left: 0;
   position: absolute;
-  transform-origin: 0px 0px 0px;
 }
 .qu_chou_jiang {
-  width: 209px;
-  height: 88px;
+  width: 209rpx;
+  height: 88rpx;
   opacity: 1;
-  left: 31px;
-  top: 423px;
+  left: 31rpx;
+  bottom: 36rpx;
   position: absolute;
-  transform-origin: 0px 0px 0px;
 }
 .ji_xu_guan_kan {
-  width: 209px;
-  height: 88px;
+  width: 209rpx;
+  height: 88rpx;
   opacity: 1;
-  left: 262px;
-  top: 423px;
+  left: 262rpx;
+  bottom: 36rpx;
   position: absolute;
-  transform-origin: 0px 0px 0px;
 }
 .kan_shi_pin_jiang_li {
-  width: 258px;
-  height: 49px;
+  width: 100%;
+  height: 56rpx;
+  line-height: 56rpx;
   opacity: 1;
-  left: 121px;
-  top: 102px;
+  left: 0;
+  top: 100rpx;
   position: absolute;
-  transform-origin: 0px 0px 0px;
-  font-size: 51.33333px;
-  color: rgba(244, 231, 229, 1);
+  display: inline-block;
+  font-size: 50rpx;
+  text-align: center;
+  color: transparent;
+  background: linear-gradient(to top, #b65443, #ec8268);
+  -webkit-background-clip: text;
+  font-weight: 700;
 }
 .huo_de_ya_dun_bi {
-  width: 146px;
-  height: 28px;
+  width: 100%;
+  height: 32rpx;
+  line-height: 32rpx;
   opacity: 1;
-  left: 177px;
-  top: 230px;
+  left: 0;
+  top: 230rpx;
+  text-align: center;
   position: absolute;
-  transform-origin: 0px 0px 0px;
-  font-size: 29.33333px;
+  font-size: 32rpx;
   color: rgba(200, 82, 73, 1);
+  font-weight: 500;
 }
 .tu_ceng40 {
-  width: 94px;
-  height: 43px;
+  width: 100%;
+  height: 60rpx;
+  line-height: 60rpx;
+  text-align: center;
   opacity: 1;
-  left: 204px;
-  top: 291px;
+  left: 0;
+  top: 288rpx;
   position: absolute;
-  transform-origin: 0px 0px 0px;
-  font-size: 55px;
+  font-size: 55rpx;
   color: rgba(200, 82, 73, 1);
+  font-weight: 500;
 }
 .an_niu_guan_bi_dan_chuang_kao_bei23 {
-  width: 50px;
-  height: 50px;
-  opacity: 0.5019607843137255;
-  left: 514px;
+  width: 50rpx;
+  height: 50rpx;
+  opacity: 0.5;
+  right: -50rpx;
+  top: -50rpx;
   position: absolute;
-  transform-origin: 0px 0px 0px;
 }

taobao_mini/client/components/rewardsModal/rewardsModal.axml → taobao_mini/client/components/comRewardsModal/comRewardsModal.axml

@@ -6,7 +6,7 @@
       <image className="dan_chuang_bei_jing2" src="{{resList['7203516e-8791-4974-955e-c8a044e16c80'].url}}"/>
       <image className="qu_chou_jiang" src="{{resList['b71e74b5-16ad-4260-a382-8cf200e9e5a7'].url}}" />
       <image className="ji_xu_guan_kan" src="{{resList['8da146cc-69cd-41fa-bed3-e7194ce037aa'].url}}" />
-      <view className="kan_shi_pin_jiang_li">看视频奖励</view>
+      <text className="kan_shi_pin_jiang_li">看视频奖励</text>
       <view className="huo_de_ya_dun_bi">获得雅顿币</view>
       <view className="tu_ceng40">+40</view>
       <image

taobao_mini/client/components/comRewardsModal/comRewardsModal.js

+import resList from '../../resconfig/resList'
+
+Component({
+  data: {
+    resList: resList
+  },
+  methods: {
+    onModalClose() {
+      const { onModalClose } = this.props;
+      onModalClose && onModalClose();
+    }
+  }
+});
\ No newline at end of file

taobao_mini/client/components/comjiang_pin_dan_chuangwrapper/comjiang_pin_dan_chuangwrapper.jsx

-'use strict';
-
-import React, { Component } from 'react';
-import resList from '../../resconfig/resList';
-
-import './comjiang_pin_dan_chuangwrapper.less';
-class Comjiang_pin_dan_chuangwrapper extends Component {
-  constructor(props) {
-    super(props);
-    this.state = this.state || { resList: resList };
-  }
-  render() {
-    return (
-      <div className="jiang_pin_dan_chuangwrapper">
-        <div className="ju801" />
-        <div className="jiang_pin_dan_chuang">
-          <img className="dan_chuang_bei_jing01" src={this.state.resList['c34046a2-1b15-47e8-95f3-376deb238e43'].url} />
-          <img className="tai_zi_kao_bei3" src={this.state.resList['d3e951d6-4d66-4f5b-b0f0-47e28ff04614'].url} />
-          <span className="hao_yun_lai_lin">好运来临</span>
-          <img className="cha_kan_jiang_pin" src={this.state.resList['715120cb-b41f-425f-b8fa-bce3f4a6680a'].url} />
-          <img className="shang_pin" src={this.state.resList['bf24cd04-e4f7-4859-beb6-212aa712f48e'].url} />
-          <img
-            className="an_niu_guan_bi_dan_chuang_kao_bei24"
-            src={this.state.resList['4abc8bb6-5779-49ad-84b4-b4ade4f51fcb'].url}
-          />
-        </div>
-      </div>
-    );
-  }
-}
-export default Comjiang_pin_dan_chuangwrapper;

taobao_mini/client/components/comjiang_pin_dan_chuangwrapper/comjiang_pin_dan_chuangwrapper.less

-.jiang_pin_dan_chuangwrapper {
-  top: 0px;
-  left: 0px;
-  width: 750px;
-  height: 1624px;
-  display: block;
-  position: absolute;
-  .ju801 {
-    width: 752px;
-    height: 1626px;
-    opacity: 0.7019607843137254;
-    left: -1px;
-    top: -1px;
-    position: absolute;
-    transform-origin: 0px 0px 0px;
-    background-color: rgba(0, 0, 0, 1);
-  }
-  .jiang_pin_dan_chuang {
-    width: 564px;
-    height: 694px;
-    opacity: 1;
-    left: 125px;
-    top: 442px;
-    position: absolute;
-    transform-origin: 0px 0px 0px;
-    .dan_chuang_bei_jing01 {
-      width: 500px;
-      height: 672px;
-      opacity: 1;
-      top: 22px;
-      position: absolute;
-      transform-origin: 0px 0px 0px;
-    }
-    .tai_zi_kao_bei3 {
-      width: 318px;
-      height: 131px;
-      opacity: 1;
-      left: 91px;
-      top: 436px;
-      position: absolute;
-      transform-origin: 0px 0px 0px;
-    }
-    .hao_yun_lai_lin {
-      width: 205px;
-      height: 49px;
-      opacity: 1;
-      left: 147px;
-      top: 102px;
-      position: absolute;
-      transform-origin: 0px 0px 0px;
-      font-size: 51.33333px;
-      color: rgba(244, 231, 229, 1);
-    }
-    .cha_kan_jiang_pin {
-      width: 299px;
-      height: 88px;
-      opacity: 1;
-      left: 102px;
-      top: 581px;
-      position: absolute;
-      transform-origin: 0px 0px 0px;
-    }
-    .shang_pin {
-      width: 91px;
-      height: 236px;
-      opacity: 1;
-      left: 206px;
-      top: 256px;
-      position: absolute;
-      transform-origin: 0px 0px 0px;
-    }
-    .an_niu_guan_bi_dan_chuang_kao_bei24 {
-      width: 50px;
-      height: 50px;
-      opacity: 0.5019607843137255;
-      left: 514px;
-      position: absolute;
-      transform-origin: 0px 0px 0px;
-    }
-  }
-}

taobao_mini/client/pages/homePage/homePage.axml

@@ -8,8 +8,8 @@
     <!-- 头部 规则-奖品 按钮 -->
     <view class="head">
       <image class="head_ruler" onTap="showRewardsModal" src="{{resList['ee8882be-4b1d-43eb-bad7-8d96318c5022'].url}}" />
-      <!-- <image class="head_ruler" onTap="showRulerModal" src="{{resList['ee8882be-4b1d-43eb-bad7-8d96318c5022'].url}}" /> -->
-      <image class="head_rewards" src="{{resList['74a63fd3-6776-44a2-990e-fadac00fb757'].url}}" />
+      <!-- <image class="head_ruler" onTap="" src="{{resList['ee8882be-4b1d-43eb-bad7-8d96318c5022'].url}}" /> -->
+      <image class="head_rewards" onTap="showPrizesModal" src="{{resList['74a63fd3-6776-44a2-990e-fadac00fb757'].url}}" />
     </view>
 
 
@@ -78,4 +78,5 @@
 </view>
 
 <rule-modal a:if="{{ruleModalVisible}}" onModalClose="closeRuleModal"><text>{{rule}}</text></rule-modal>
-<rewards-modal a:if="{{rewardsModalVisible}}" onModalClose="closerewardsModal"></rewards-modal>
+<rewards-modal a:if="{{rewardsModalVisible}}" onModalClose="closeRewardsModal"></rewards-modal>
+<prizes-modal a:if="{{prizesModalVisible}}" onModalClose="closePrizesModal"></prizes-modal>

taobao_mini/client/pages/homePage/homePage.js

@@ -26,7 +26,8 @@ Page({
     commonModalConfirm: null,
     commonModalVisible: false,
     ruleModalVisible: false,
-    rewardsModalVisible: false
+    rewardsModalVisible: false,
+    prizesModalVisible: false
   },
   onLoad(query) {
     // 页面加载
@@ -50,32 +51,20 @@ Page({
     this.setData({ videoBottom: true })
   },
   
-  openShowChooseGame () {
-    if (!this.data.showChooseGame) {
-      this.setData({ showChooseGame: true })
+
+  doStart() {
+    this.showCommonModal({
+      content: '活动还未开始\n请稍后',
+      btnText: '我知道了',
+      commonModalVisible: true,
+      confirmCallback: () => {
+        this.closeCommonModal();
       }
+    });
   },
 
-  closeShowChooseGame () {
-    console.log('1')
-    this.setData({ showChooseGame: false })
-  },
 
-  onUnload() {
-    // 页面被关闭
-  },
-  onTitleClick() {
-    // 标题被点击
-  },
-  onPullDownRefresh() {
-    // 页面被下拉
-  },
-  onReachBottom() {
-    // 页面被拉到底部
-  },
-  /**
-   * 获取用户授权信息
-   */
+  // 获取用户授权信息
   async getAuth() {
     const userInfo = await getAuthUserInfo().catch(err => {
       console.log('未授权成功', err);
@@ -88,9 +77,8 @@ Page({
       this.login();
     }
   },
-  /**
-   * 获取主接口
-   */
+  
+  // 获取主接口
   async getIndex() {
     const { success, data } = await API.getIndex().catch(res => {
       commonToast(res && res.message);
@@ -101,9 +89,8 @@ Page({
       this.setData({ title, content, rule });
     }
   },
-  /**
-   * 登录接口
-   */
+  
+  // 登录接口
   async login() {
     const { nickName, avatar } = app;
     const { success } = await API.login({ userNick: nickName, avatar }).catch(res => {
@@ -115,32 +102,13 @@ Page({
     }
   },
 
-  showRuleModal() { this.setData({ ruleModalVisible: true }) },
-  showRewardsModal() { this.setData({ rewardsModalVisible: true }) },
-  /**
-   * 通用弹出确认按钮回调
-   */
-  confirmCommonModal() {
-    const { commonModalConfirm } = this.data;
-    commonModalConfirm && commonModalConfirm();
-  },
-  /**
-   * 执行开始
-   */
-  doStart() {
-    this.showCommonModal({
-      content: '活动还未开始\n请稍后',
-      btnText: '我知道了',
-      commonModalVisible: true,
-      confirmCallback: () => {
-        this.closeCommonModal();
-      }
-    });
+  // 分享
+  onShareAppMessage() {
+    // 返回自定义分享信息
+    return SHARE_CONFIG;
   },
-  /**
-   * 显示通用弹层
-   * @param {object} options content: 通用弹层内容 btnText:按钮文案 confirmCallback: 按钮确认回调
-   */
+  
+  // 显示通用弹层
   showCommonModal({ content, btnText, confirmCallback }) {
     this.setData({
       commonModalConfirm: confirmCallback || null,
@@ -148,26 +116,50 @@ Page({
       commonModalData: { content, btnText }
     });
   },
-  /**
-   * 跳转到天猫页面
-   */
-  goTmallPage() {
-    navigateToOutside(REDIRECT_URL['tmall']);
+  // 跳转到天猫页面
+  goTmallPage() { navigateToOutside(REDIRECT_URL['tmall']); },
+
+  // 选择游戏 小窗
+  openShowChooseGame () { if (!this.data.showChooseGame) { this.setData({ showChooseGame: true }) } },
+  closeShowChooseGame () { this.setData({ showChooseGame: false }) },
+
+  // 弹窗控制 - 开启
+  showRuleModal() { this.setData({ ruleModalVisible: true }) },
+  showRewardsModal() { this.setData({ rewardsModalVisible: true }) },
+  showPrizesModal() { this.setData({ prizesModalVisible: true }) },
+
+  // 弹窗控制 - 关闭
+  closeRuleModal() { this.setData({ ruleModalVisible: false }) },
+  closeRewardsModal () { this.setData({ rewardsModalVisible: false}) },
+  closePrizesModal () { this.setData({ prizesModalVisible: false}) },
+
+  // 通用弹层 - 开启
+  confirmCommonModal() {
+    const { commonModalConfirm } = this.data;
+    commonModalConfirm && commonModalConfirm();
   },
-  /**
-   * 关闭通用弹层
-   */
+
+  // 通用弹层 - 关闭
   closeCommonModal() {
     this.setData({
       commonModalVisible: false
     });
   },
 
-  closeRuleModal() { this.setData({ ruleModalVisible: false }) },
-  closeRewardsModal () { this.setData({ rewardsModalVisible: false}) },
 
-  onShareAppMessage() {
-    // 返回自定义分享信息
-    return SHARE_CONFIG;
+
+  onUnload() {
+    // 页面被关闭
+  },
+  onTitleClick() {
+    // 标题被点击
   },
+  onPullDownRefresh() {
+    // 页面被下拉
+  },
+  onReachBottom() {
+    // 页面被拉到底部
+  },
+
+
 });

taobao_mini/client/pages/homePage/homePage.json

 {
   "usingComponents": {
     "rule-modal": "/components/ruleModal/ruleModal",
-    "rewards-modal": "/components/rewardsModal/rewardsModal",
+    "rewards-modal": "/components/comRewardsModal/comRewardsModal",
+    "prizes-modal": "/components/comPrizesModal/comPrizesModal",
     "common-modal": "/components/commonModal/commonModal",
     "end-modal": "/components/endModal/endModal"
   }