Merge branch 'feature/v4.7.39' of http://192.168.3.207:8080/qmx/jy into feature/v4.7.39

src/jfw/modules/app/src/web/staticres/jyapp/big-member/js/push_settings.js

@@ -190,6 +190,7 @@ var pushDetailSettingConf = {
             ratemode: 0,  // 推送时间1,2,3,4
             apppush: true,  // app推送开关
             mailpush: true,  // 邮箱推送开关
+            wxpush: false, // 微信推送开关
             mail: '',
         },
         detailsModuleOneConf: {
@@ -364,6 +365,7 @@ var pushDetailSettingConf = {
                 this.settingConf.mail = r.mail
                 this.settingConf.apppush = !!r.apppush
                 this.settingConf.mailpush = !!r.mailpush
+                this.settingConf.wxpush = !!r.wxpush
             }
             if (this.modulesShow.detailsModuleOne) {
                 // 1. 根据user表里的服务id判断是否展示
@@ -400,6 +402,7 @@ var pushDetailSettingConf = {
                 info.mail = this.settingConf.mail
                 info.apppush = this.settingConf.apppush - 0   // 布尔值隐式转换为数字
                 info.mailpush = this.settingConf.mailpush - 0
+                info.wxpush = this.settingConf.wxpush - 0
             }
             if (this.modulesShow.detailsModuleOne) {
                 for (var key in this.detailsModuleOneConf) {

src/web/staticres/me/js/push_setting.js

@@ -199,6 +199,7 @@ var pushDetailSettingConf = {
             ratemode: 0,  // 推送时间1,2,3,4
             wxpush: true,  // wx推送开关
             mailpush: true,  // 邮箱推送开关
+            apppush: true,  // APP推送开关
             mail: '',
         },
         detailsModuleOneConf: {
@@ -414,7 +415,8 @@ var pushDetailSettingConf = {
               success: function (res) {
                 if(res && res.error_code === 0) {
                   _this.settingConf.ratemode = res.data.ratemode
-                  _this.settingConf.wxpush = !!res.data_wxpush
+                  _this.settingConf.wxpush = !!res.data.wxpush
+                  _this.settingConf.apppush = !!res.data.apppush
                   _this.settingConf.mailpush = !!res.data.mailpush
                   _this.settingConf.mail = res.data.mail
                   // 转换并设置数据
@@ -489,6 +491,7 @@ var pushDetailSettingConf = {
                 info.mail = this.settingConf.mail
                 info.wxpush = this.settingConf.wxpush - 0   // 布尔值隐式转换为数字
                 info.mailpush = this.settingConf.mailpush - 0
+                info.apppush = this.settingConf.apppush - 0
             }
             if (this.modulesShow.detailsModuleOne) {
                 for (var key in this.detailsModuleOneConf) {