pzc il y a 4 ans
Parent
commit
242add0b9a
2 fichiers modifiés avec 9 ajouts et 4 suppressions
  1. 1 1
      UI/dist1/umi.js
  2. 8 3
      UI/src/pages/sellmanage/pushMessage/index.js

Fichier diff supprimé car celui-ci est trop grand
+ 1 - 1
UI/dist1/umi.js


+ 8 - 3
UI/src/pages/sellmanage/pushMessage/index.js

@@ -276,7 +276,7 @@ class PushMessage extends React.Component {
       data.disable = 0;
       data.disable = 0;
 
 
     if (typeof (data.week) === 'undefined')
     if (typeof (data.week) === 'undefined')
-      data.week = 0;
+      data.week = 1;
 
 
     if (typeof (data.tableNo) === 'undefined')
     if (typeof (data.tableNo) === 'undefined')
       data.tableNo = key;
       data.tableNo = key;
@@ -457,7 +457,7 @@ class PushMessage extends React.Component {
             if (self.props.pushMessage.initData) {
             if (self.props.pushMessage.initData) {
               data = self.props.pushMessage.initData;
               data = self.props.pushMessage.initData;
               disable = data.items && data.items[key] && data.items[key].disable ? true : false;
               disable = data.items && data.items[key] && data.items[key].disable ? true : false;
-              weekItem = data.items && data.items[key] && data.items[key].week ? data.items[key].week : 1;
+              weekItem = data.items && data.items[key] && typeof(data.items[key].week) !=='undefined' ? data.items[key].week : 1;
             }
             }
 
 
 
 
@@ -465,7 +465,12 @@ class PushMessage extends React.Component {
             var message1 = {};
             var message1 = {};
 
 
             if (self.props.pushMessage && self.props.pushMessage.initData && self.props.pushMessage.initData.items[key]
             if (self.props.pushMessage && self.props.pushMessage.initData && self.props.pushMessage.initData.items[key]
-              && self.props.pushMessage.initData.items[key].message && self.props.pushMessage.initData.items[key].message.msgId ) {
+              && self.props.pushMessage.initData.items[key].message 
+              // && (self.props.pushMessage.initData.items[key].message.msgId 
+              //   || (self.props.pushMessage.initData.items[key].message.content|| self.props.pushMessage.initData.items[key].message.mediaId)
+              //   || self.props.pushMessage.initData.items[key].message.title|| self.props.pushMessage.initData.items[key].message.miniAppTitle
+              //   )
+              ) {
               chooseKey = self.props.pushMessage.initData.items[key].message.msgType;
               chooseKey = self.props.pushMessage.initData.items[key].message.msgType;
 
 
               message1 = self.props.pushMessage.initData.items[key].message;
               message1 = self.props.pushMessage.initData.items[key].message;