Merge remote-tracking branch 'origin/2.0' into 2.0

无关风月

1 天以前 cfa7d0a90e7da9b52606ab8fca364fa5bddddcd4

 cloud-server-management/src/main/webapp/static/modular/system/tShop/tShop.js

@@ -179,15 +179,17 @@
};

TCompetition.platformSet = function () {
    if (this.check()) {
    var index = layer.open({
        type: 2,
        title:'图文模块设置',
        area: ['100%', '100%'], //宽高
        fix: false, //不固定
        maxmin: true,
        content: Feng.ctxPath + '/tHomeModule/tHomeModule_platformSet/' + 1
            content: Feng.ctxPath + '/tHomeModule/tHomeModule_platformSet/' + TCompetition.seItem.id
    });
    this.layerIndex = index;
    }
};

/**