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

UI/src/pages/sellmanage/msgComponent.js

@@ -129,32 +129,35 @@ class MsgComponent extends React.Component {
     //点击 上传图片/重新上传
     upload1 = () => {
         let self = this;
+        self.setState({
+            imageVisiable: true,
+        })
         self.loadData();
-        if (self.state.chooseKey == 'text') {
-            self.setState({
-                imageVisiable: true,
-                imgUrlText: '',
-                mediaIdText: '',
-                selectIndex: -1,
-                imgSelect: "",
-            });
-        } else if (self.state.chooseKey == 'news') {
-            self.setState({
-                imageVisiable: true,
-                imgUrlNews: '',
-                mediaIdNews: '',
-                selectIndex: -1,
-                imgSelect: "",
-            });
-        } else if (self.state.chooseKey == 'miniprogrampage') {
-            self.setState({
-                imageVisiable: true,
-                imgUrlMini: '',
-                mediaIdMini: '',
-                selectIndex: -1,
-                imgSelect: "",
-            });
-        }
+        // if (self.state.chooseKey == 'text') {
+        //     self.setState({
+        //         imageVisiable: true,
+        //         imgUrlText: '',
+        //         mediaIdText: '',
+        //         selectIndex: -1,
+        //         imgSelect: "",
+        //     });
+        // } else if (self.state.chooseKey == 'news') {
+        //     self.setState({
+        //         imageVisiable: true,
+        //         imgUrlNews: '',
+        //         mediaIdNews: '',
+        //         selectIndex: -1,
+        //         imgSelect: "",
+        //     });
+        // } else if (self.state.chooseKey == 'miniprogrampage') {
+        //     self.setState({
+        //         imageVisiable: true,
+        //         imgUrlMini: '',
+        //         mediaIdMini: '',
+        //         selectIndex: -1,
+        //         imgSelect: "",
+        //     });
+        // }
     };
     //删除图片
     deleteImg1 = () => {
@@ -346,6 +349,11 @@ class MsgComponent extends React.Component {
         this.setState({ msgId: nextProps.msgId }, () => { self.loadImgs(); ; });
     }
   }
+//  shouldComponentUpdate(nextProps,nextState){
+//     if(this.state.imageVisiable){
+//       return false
+//     }
+//  }
   onFinish = e => {
     e.preventDefault();
     this.props.form.validateFieldsAndScroll((errors, values) => {
@@ -399,12 +407,12 @@ class MsgComponent extends React.Component {
     //添加粉丝昵称
     addfansName = () => {
         if (this.state.chooseKey == 'text') {
-            let existContent = this.props.form.getFieldValue('content');
+            let existContent = this.props.form.getFieldValue('content') ? this.props.form.getFieldValue('content') : "";
             this.props.form.setFieldsValue({ content: existContent + '|$fansName$|' });
         }
     }
     addfansNameToTitle = () => {
-        let title = this.props.form.getFieldValue('title');
+        let title = this.props.form.getFieldValue('title') ? this.props.form.getFieldValue('title') :"";
         this.props.form.setFieldsValue({ title: title + '|$fansName$|' });
     }
     //点击 -添加表情

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

@@ -93,6 +93,7 @@ class PushMessage extends React.Component {
       fromNews: {},
       fromminiprogrampage: {},
       disabled: false,
+      contentValueItem:"",
       TimePicker: [
         {
           value: [],
@@ -104,16 +105,11 @@ class PushMessage extends React.Component {
 
 
   conTroller = (checked, key) => {
-
     var initData = this.props.pushMessage && this.props.pushMessage.initData ? this.props.pushMessage.initData : undefined;
     var items = this.props.pushMessage && this.props.pushMessage.initData && this.props.pushMessage.initData.items ? this.props.pushMessage.initData.items : undefined
-
     if (items) {
       if (!items[key])
         items[key] = {};
-      let week1 = items.week;
-      var message1 = this.props.pushMessage.initData.items[key].message;
-
       items[key].disable = checked ? 0 : 1;
 
     }
@@ -124,18 +120,24 @@ class PushMessage extends React.Component {
   handleChange = (value, key) => {
     var initData = this.props.pushMessage && this.props.pushMessage.initData ? this.props.pushMessage.initData : undefined;
     var items = this.props.pushMessage && this.props.pushMessage.initData && this.props.pushMessage.initData.items ? this.props.pushMessage.initData.items : undefined
-    // console.log(this.props.pushMessage,'=------');
     if (items) {
       if (!items[key])
         items[key] = {};
-
-      items[key].week = value;
-
+        items[key].week = value;
     }
     initData.items = items;
     this.props.dispatch({ type: 'pushMessage/updateState', payload: { initData: initData } });
   }
-
+  timeReversal = val =>{
+    let timeArr = []
+    for(let i = 0;i<val.length;i++){
+        let timeList = {};
+        timeList.beginTime =  val[i].value.length > 0 ?  moment(val[i].value[0], 'HH:mm:ss').format('HH:mm:ss') : null
+        timeList.endTime =   val[i].value.length > 0 ? moment(val[i].value[1], 'HH:mm:ss').format('HH:mm:ss') : null
+        timeArr.push(timeList);
+    }
+    return timeArr
+  }
   add = key => {
     var listData = this.props.pushMessage.times ? this.props.pushMessage.times : { key: [] }
     var initData = this.props.pushMessage && this.props.pushMessage.initData ? this.props.pushMessage.initData : undefined;
@@ -154,11 +156,7 @@ class PushMessage extends React.Component {
       if (items) {
         if (!items[key])
           items[key] = {};
-        //   let week1 = items.week;
-        // var seleDate = []
-        // let timeDateItem = listData[key];
-        // initData.items = items;
-        items[key].timesList = listData[key];
+        items[key].timesList =  this.timeReversal(listData[key]);
         initData.items = items;
       }
       this.props.dispatch({ type: 'pushMessage/updateState', payload: { times: listData, initData: initData } });
@@ -168,46 +166,20 @@ class PushMessage extends React.Component {
   }
 
   remove = (key, key1) => {
-
     var listData = this.props.pushMessage && this.props.pushMessage.times ? this.props.pushMessage.times : { key: [] }
     var initData = this.props.pushMessage && this.props.pushMessage.initData ? this.props.pushMessage.initData : undefined;
     var items = this.props.pushMessage && this.props.pushMessage.initData && this.props.pushMessage.initData.items ?
-      this.props.pushMessage.initData.items : undefined
-
+    this.props.pushMessage.initData.items : undefined
     if (listData && listData[key] && listData[key].length > 1) {
       let obj = {
         value: []
       }
       listData[key].splice(key1, 1);
-      // listData[key].splice(listData[key1].length - 1, 1);
-      // listData[key].splice(key, 1);
 
       if (items) {
         if (!items[key])
-          items[key] = {};
-          let week1 = items.week;
-
-        // var seleDate = []
-        // let timeDateItem = listData[key];
-        // for (let i in timeDateItem) {
-        //   let obj = {}
-        //   let data = timeDateItem[i].value
-
-        //   if (data[0]) {
-        //     obj.beginTime = moment(data[0]._d, 'HH:mm:ss').format('HH:mm:ss');
-        //   } else {
-        //     obj.beginTime = ""
-        //   }
-        //   if (data[1]) {
-        //     obj.endTime = moment(data[1]._d, 'HH:mm:ss').format('HH:mm:ss');
-        //   } else {
-        //     obj.endTime = ""
-        //   }
-        //   seleDate.push(obj)
-        // }
-        // items[key].timesList = seleDate;
-
-        items[key].timesList = listData[key];
+        items[key] = {};
+        items[key].timesList =  this.timeReversal(listData[key]);
         initData.items = items;
       }
       this.props.dispatch({ type: 'pushMessage/updateState', payload: { times: listData, initData: initData } });
@@ -216,23 +188,20 @@ class PushMessage extends React.Component {
     }
   }
   handleSubmit = key => {
-    console.log(key);
-  
     var initData = this.props.pushMessage && this.props.pushMessage.initData ? this.props.pushMessage.initData : undefined;
     var appId = this.props.wxAppIdValue
     var items = this.props.pushMessage && this.props.pushMessage.initData && this.props.pushMessage.initData.items ? this.props.pushMessage.initData.items : undefined
 
     if (items) {
       if (!items[key])
-        items[key] = {};
+      items[key] = {};
 
-      let week1 = items.week;
       var message1 = { msgType: "text" };
-      if (this.props.pushMessage.initData.items[key] && this.props.pushMessage.initData.items[key].message){
+      if (this.props.pushMessage.initData.items[key] && this.props.pushMessage.initData.items[key].message) {
         message1 = this.props.pushMessage.initData.items[key].message;
         message1.msgType = this.props.pushMessage.initData.items[key].message.msgType ? this.props.pushMessage.initData.items[key].message.msgType : 'text'
       }
-     
+
       message1.content = this.state.msgComponent[key].props.form.getFieldValue('content')
       message1.title = this.state.msgComponent[key].props.form.getFieldValue('title')
       message1.description = this.state.msgComponent[key].props.form.getFieldValue('description')
@@ -245,6 +214,7 @@ class PushMessage extends React.Component {
     }
 
     var data = initData.items[key];
+    // console.log(data,'align-items-end');
     if (typeof (data.disable) === 'undefined')
       data.disable = 0;
 
@@ -336,7 +306,12 @@ class PushMessage extends React.Component {
 
   // 获取表单即文本内容
   cb_formChange = (formdata, allData, key) => {
-
+      console.log(formdata.content.value);
+      // if(formdata.content.value){
+      //   this.setState({
+      //       contentValueItem:formdata.content.value
+      //   })
+      // }
   }
   handleClick = (value, key1, key) => {
     var listData = this.props.pushMessage.times ? this.props.pushMessage.times : { key: [] }
@@ -376,9 +351,7 @@ class PushMessage extends React.Component {
 
     if (items) {
       if (!items[key])
-        items[key] = {};
-      let week1 = items.week;
-      var timesList = this.props.pushMessage.initData.items[key].timesList;
+      items[key] = {};
       items[key].timesList = selectTime;
     }
     this.props.dispatch({ type: 'pushMessage/updateState', payload: { times: listData, initData: initData } });
@@ -391,8 +364,6 @@ class PushMessage extends React.Component {
       fromNews: {},
       fromminiprogrampage: {}
     })
-
-    // TimePicker
   }
 
   render() {
@@ -400,7 +371,6 @@ class PushMessage extends React.Component {
     let i = 0;
     const { Option } = Select;
     const format = 'HH:mm:ss';
-   
     return (
       <div className={styles.segmentAutoReeply}>
         <div className={styles.header}>
@@ -426,26 +396,26 @@ class PushMessage extends React.Component {
 
             if (self.props.pushMessage.initData) {
               data = self.props.pushMessage.initData;
-              disable = data.items && data.items[key] && data.items[key].disable ? true : false;
-              weekItem = data.items && data.items[key] && typeof(data.items[key].week) !=='undefined' ? data.items[key].week : 1;
+              disable = data.items && data.items[key] && data.items[key].disable ? false : true;
+              weekItem = data.items && data.items[key] && typeof (data.items[key].week) !== 'undefined' ? data.items[key].week : 1;
+              // console.log(disable);
             }
-        
-
+          
             var chooseKey = 'text';
             var message1 = {};
-
             if (self.props.pushMessage && self.props.pushMessage.initData && self.props.pushMessage.initData.items[key]
-              && self.props.pushMessage.initData.items[key].message 
-              ) {
-              chooseKey = self.props.pushMessage.initData.items[key].message.msgType?self.props.pushMessage.initData.items[key].message.msgType:'text';
+              && self.props.pushMessage.initData.items[key].message
+            ) {
+              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;
+              message1.content = self.props.pushMessage.initData.items[key].message.content ? self.props.pushMessage.initData.items[key].message.content : this.state.contentValueItem
             }
-          
+            // console.log(message1);
             return (
               <div className={styles.connect} style={{ display: (key === self.state.currentState) ? "block" : "none" }}>
                 <div className={styles.Munstate}>
                   <div>状态：</div>
-                  <Switch defaultChecked={self.state.conTrollerChecked || !disable} onChange={(v) => { self.conTroller(v, key) }} />
+                  <Switch checked={ disable }  defaultChecked  onChange={(v) => { self.conTroller(v, key) }} />
                 </div>
 
                 <div className={styles.TimePickers}>

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

@@ -10,7 +10,6 @@ export function submit(param) {
  }
 
  export function getData(param) {
-   console.log(param,'paramGet');
     return request({
       url:config.WXMpAPI+"/wx/keyword/getTimesMsgList/"+param.appId,
       method: 'post',