Merge branch 'dev' of gitlab2.dui88.com:wanghongyuan/xiaoxiaole into dev

egret/src/mapScene/MapScene.ts

@@ -118,6 +118,11 @@ export default class MapScene extends Scene {
                 localStorage.setItem('nowTimer2Str' + window['CFG'].consumerId, nowTimerStr2);
             }
 
+            const backData = DataManager.ins.getData('hc_getBackReward').data;
+            if(backData) {
+                panels.push('back');
+            }
+
             const {signInfoVO} = DataManager.ins.getData('getSignInfo');
             if(signInfoVO.continueDay < 7) { //表示明天还可以签到
                 if(signInfoVO.todaySigned == 0 && oldTimerStr != nowTimerStr) {
@@ -127,8 +132,6 @@ export default class MapScene extends Scene {
             }
             this.updateSign();
 
-            PanelCtrl.instance.show('back')
-
             if(!readCache() && getHomeData().levels.length <= 0) { //引导
                 const guide = new GuideCon(() => {
 

egret/src/panels/BackPanel.ts

@@ -16,7 +16,6 @@ export default class BackPanel extends Panel {
         const {data}=DataManager.ins.getData('hc_getBackReward');
 
         this.updateOption(data);
-        this.data.url='http://yun.duiba.com.cn/db_games/1022/111.png'
     }
 
     initEvents() {
@@ -38,7 +37,6 @@ export default class BackPanel extends Panel {
                 this['numsgroup'].visible = true;
                 break;
             case 3:
-
                 this['numsgroup'].visible = true;
                 this['img'].visible = true;
                 this.data.url = `turnprize_icon${propType}_png`;

mock/happyclear/getBackReward.json

 {
     "code":"0000000000",
     "data":{
-        "appItemId":2322,
-        "categoryType":1,
-        "coinType":1,
-        "img":"1",
-        "maxValue":2,
-        "minValue":1,
-        "name":"测试商品",
-        "num":3,
-        "propType":2,
-        "rate":"概率",
-        "title":"商品信息",
-        "value":"虚拟商品标识符"
+        
+            "completePercent":"99",
+            "prizeImage":"",
+            "remainPercent":"剩余进度",
+            "scratchCardTaskId":1,
+            "categoryType":4,
+            "title":"奖品信息",
+            "coinType":1,
+            "maxValue":10,
+            "minValue":10,
+            "appItemId":2099,
+            "img":"http://yun.duiba.com.cn/db_games/1022/111.png",
+            "name":"虚拟商品名称",
+            "value":"虚拟商品编码",
+            "num":10,
+            "propType":1
+        
     },
     "desc":"OK",
     "success":true,