Merge branch 'master' of http://192.168.20.122:3000/root/qiyewechatApp

UI/src/pages/sellmanage/pushMessage/index.js

@@ -436,29 +436,11 @@ class PushMessage extends React.Component {
 
             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.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?self.props.pushMessage.initData.items[key].message.msgType:'text';
               message1 = self.props.pushMessage.initData.items[key].message;
-
             }
-            // if (self.state.msgComponent[key] && self.state.msgComponent[key].props.form
-            //   && ((self.state.msgComponent[key].props.form.getFieldValue('content')
-            //     || self.state.msgComponent[key].state.mediaId)
-            //     || self.state.msgComponent[key].props.form.getFieldValue('title')
-            //     || self.state.msgComponent[key].props.form.getFieldValue('miniAppTitle'))) {
-            //   message1.content = self.state.msgComponent[key].props.form.getFieldValue('content')
-            //   message1.title = self.state.msgComponent[key].props.form.getFieldValue('title')
-            //   message1.description = self.state.msgComponent[key].props.form.getFieldValue('description')
-            //   message1.url = self.state.msgComponent[key].props.form.getFieldValue('url')
-            //   message1.miniAppTitle = self.state.msgComponent[key].props.form.getFieldValue('miniAppTitle')
-            //   message1.miniProgramAppId = self.state.msgComponent[key].props.form.getFieldValue('miniProgramAppId')
-            //   message1.pagepath = self.state.msgComponent[key].props.form.getFieldValue('pagepath')
-            // }
-
+          
             return (
               <div className={styles.connect} style={{ display: (key === self.state.currentState) ? "block" : "none" }}>
                 <div className={styles.Munstate}>

UI/src/pages/sellmanage/pushMessage/model.js

@@ -27,7 +27,7 @@ export default {
         try{
           const data = yield call(getData, {appId:wxAppIdValue});
           let defaulttimesList = data.items;
-      
+          console.log(data);
           let times = {};
           var tempItem ={};
           var newItems = [];

UI/src/pages/sellmanage/templateMessage/index.js

@@ -378,8 +378,6 @@ class TemplateMessage extends React.Component {
     var pagePath = self.props.TemplateMessage.Information && self.props.TemplateMessage.Information.result.pagePath
     var miniProgramAppId = self.props.TemplateMessage.Information && self.props.TemplateMessage.Information.result.miniProgramAppId
     var ItemFromMation = self.props.TemplateMessage.Information && self.props.TemplateMessage.Information.result.contentValueList
-    var content = "{{first.DATA}}↵用药时间：{{keyword1.DATA}}↵药品名称及用法用量：{{keyword2.DATA}}↵{{remark.DATA}}"
-    console.log(content);
     const formItemLayout = {
       labelCol: {
         xs: { span: 24 },