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

egret/libs/tw/manager/NetManager.ts

@@ -2210,21 +2210,6 @@ export class NetManager extends ABNetManager {
         this.send(net);
     }
 
-    public getSignConfig(callback: Function): void {
-        const net: INetData = {
-            name: 'getSignConfig',
-            uri: window['duiba'] + '/customActivity/happyclear/getSignConfig',
-            type: 'get',
-            dataType: 'json',
-            hideMsg: true,
-            param: {
-                activityId: DataManager.ins.customCfgData.actId
-            },
-            callback: callback
-        };
-        this.send(net);
-    }
-
     /**
      * 获取邀请码
      * @param callback

egret/resource/skins/SignSkin.exml

 <?xml version="1.0" encoding="utf-8"?>
 <e:Skin class="SignSkin" width="750" height="1206" xmlns:e="http://ns.egret.com/eui" xmlns:w="http://ns.egret.com/wing">
 	<e:Image source="signbg_png" y="66.75" horizontalCenter="0"/>
-	<e:Button id="closeBtn" label="" x="630" y="211.77">
+	<e:Button id="closeBtn" label="" x="632" y="257.77">
 		<e:skinName>
 		<e:Skin states="up,down,disabled" xmlns:w="http://ns.egret.com/wing">
 			<e:Image width="100%" height="100%" source="closeCommonBtn_png" source.down="closeCommonBtn_png" source.disabled="closeCommonBtn_png"/>

egret/src/panels/SignPanel.ts

@@ -10,6 +10,7 @@ import PanelCtrl from "../../libs/new_wx/ctrls/panelCtrl";
 import { getlogItem } from "../Main";
 import {hortileLayout} from "../layout/hortileLayout";
 import Utils from "../Utils";
+import { NetName } from "../../libs/tw/enum/NetName";
 export default class SignPanel extends Panel {
 
     list: eui.List;
@@ -134,9 +135,10 @@ export default class SignPanel extends Panel {
     // { nums: 'x1', type: 'steps' },
     // { nums: '0.3元', type: 'quan30' }
     private getConfigs() {
-        const getSignConfig = DataManager.ins.getData('getSignConfig');
-        if (getSignConfig && getSignConfig.data && getSignConfig.data.sixDaysBeforeOptions && getSignConfig.data.theSeventhDayOptions) {
-            const { sixDaysBeforeOptions, theSeventhDayOptions } = getSignConfig.data;
+        let config = DataManager.ins.getData(NetName.GET_CONFIG).data;
+        let getSignConfig = config && config.signConf;
+        if (getSignConfig && getSignConfig.sixDaysBeforeOptions && getSignConfig.theSeventhDayOptions) {
+            const { sixDaysBeforeOptions, theSeventhDayOptions } = getSignConfig;
             const result = [];
             sixDaysBeforeOptions.forEach(option => { //todo假设按天数排序
                 //类型 2 次数，3 道具，4 元宝，5其他