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

egret/src/panels/TurntablePanel/Turntable.ts

@@ -166,9 +166,9 @@ export default class Turntable extends Panel {
                     PanelCtrl.instance.show("TurntableNoPrizePanel", {type: 3});
                 } else {
                     loadSvga(getResPath() + 'resource/assets/svgas/turnprize.svga').then(async (mv: any) => {
-                        let _data = Utils.deepClone(data);
-                        _data.mv = mv;
-                        PanelCtrl.instance.show('TurnPrizePanel', _data);
+                        // let _data = Utils.deepClone(data);
+                        data.mv = mv;
+                        PanelCtrl.instance.show('TurnPrizePanel', data);
                     });
                 }
             });

egret/src/panels/TurntablePanel/TurntablePrizePanel.ts

@@ -37,6 +37,8 @@ export default class TurnPrizePanel extends Panel {
     updateOption(option: any) {
         const { categoryType, img, num, propType } = option;// 2次数  3道具 4元宝 5实物 6优惠券 7虚拟商品
 
+        this['propnums'].text = 'x1';
+        if(num)
             this['propnums'].text = 'x' + num;
         switch (categoryType) {
             case 2:

mock/happyclear/turnabledojoin.json

-{
-    "success": true,
-    "code": "0000000000",
-    "desc": "OK",
-    "timestamp": 1572262646931,
-    "data": {
-        "isScratchCard": false,
-        "option": null,
-        "orderNum": null
-    }
-}
\ No newline at end of file
+{"success":true,"code":"0000000000","desc":"OK","timestamp":1572269035379,"data":{"isScratchCard":false,"option":{"id":"","day":null,"categoryType":3,"title":"11","rate":"11","minValue":null,"maxValue":null,"coinType":null,"propType":2,"num":null,"img":"","appItemId":null,"name":"","value":""},"orderNum":null}}
\ No newline at end of file