修改22

src/common/fetching/occupyImage.jsx

@@ -12,7 +12,7 @@ import React, {Component} from "react";
                      top:0,
                      zIndex:9999
                  }}>
-                     <img src={this.props.imageUrl} alt="" style={{width:"100%",height:"100%"}}/>
+                     {/* <img src={this.props.imageUrl} alt="" style={{width:"100%",height:"100%"}}/> */}
                  </div>
              );
          }else{

src/components/menulearn/menulearn.jsx

@@ -402,7 +402,7 @@ class Menulearn extends React.Component {
            {/* 新消息icon */}
            <div style={{
             position:'fixed',
-            top:'47%',
+            top:'50%',
             right:'0'
            }}> 
             <img style={{width:'180px'}} src={MessageIcon} alt="" />

src/components/menume/menume.css

@@ -186,12 +186,11 @@
   width: 90%;
   margin: 20px auto;
   background-color: #fff;
-  padding: 35px 35px 15px 35px;
+  padding: 25px 35px;
 }
 .my-menu-body .mess-list .mess-item {
   display: flex;
   justify-content: space-between;
-  margin-bottom: 25px;
 }
 .my-menu-body .menume-quit-login {
   width: 100%;
@@ -205,7 +204,7 @@
   background-color: #fff;
   line-height: 84px;
   font-size: 36px;
-  color: #4285f4;
+  color: #666666;
   font-weight: 400;
   text-align: center;
 }

src/components/menume/menume.jsx

@@ -48,6 +48,18 @@ const mapList = {
     text: "我的问卷",
     url: "/mysurvey",
   },
+  MyDwsjxx: {
+    text: "党委书记信箱",
+    url: "/mysurvey",
+  },
+  MyJjxx: {
+    text: "纪检信箱",
+    url: "/mysurvey",
+  },
+  MyLy: {
+    text: "我的留言",
+    url: "/mysurvey",
+  },
 };
 
 class Menume extends React.Component {
@@ -396,11 +408,11 @@ class Menume extends React.Component {
           <div className="study-record-info">
             <div className="study-item">
               <img
-                style={{ width: "45px", marginRight: "30px" }}
+                style={{ width: "45px" }}
                 src={jinbi}
                 alt=""
               />
-              <span style={{ fontSize: "36px", fontWeight: "bold" }}>
+              <span style={{ fontSize: "32px", fontWeight: "bold" }}>
                 做任务，赢积分
               </span>
               <div className="study-jf">我的积分</div>
@@ -433,16 +445,6 @@ class Menume extends React.Component {
         </div>
         <div className="mess-list">
           <div className="mess-item">
-            <span style={{ fontSize: "32px" }}>我要留言</span>
-            <span>
-              <IconFont
-                className="arraw-icon"
-                style={{ fontSize: "50px" }}
-                type="icon-chevron"
-              ></IconFont>
-            </span>
-          </div>
-          <div className="mess-item">
             <span style={{ fontSize: "32px" }}>关于智慧党建</span>
             <span>
               <IconFont
@@ -458,10 +460,6 @@ class Menume extends React.Component {
             {intl.get("quitLogin") || "退出登录"}
           </div>
         </div>
-        {
-          // navigator.appVersion.indexOf("iPhone") != -1 ?
-          <div style={{ width: "100%", height: 100, background: "#eee" }}></div>
-        }
         <Modal
           visible={this.state.PickerView}
           onClose={this.closePikDate}

src/components/menume/menume.less

@@ -209,11 +209,10 @@
     width: 90%;
     margin: 20px auto;
     background-color: #fff;
-    padding: 35px 35px 15px 35px;
+    padding: 25px 35px;
     .mess-item{
       display: flex;
       justify-content: space-between;
-      margin-bottom: 25px;
     }
   }
   .menume-quit-login {
@@ -228,7 +227,7 @@
       background-color: #fff;
       line-height: 84px;
       font-size: 36px;
-      color: @themeColor;
+      color: #666666;
       font-weight: 400;
       text-align: center;
     }

src/components/mycontribute/action.js

+import excute from '../../util/fetchUtil';
+import API from '../../util/urlconfig';
+import { Toast } from "antd-mobile";
+export function VoteListApi(params, callback) {
+  const url = `${API.voteListApi}?researchId=${params.id}`;
+  return (dispatch) => {
+    return excute.get(
+      url,
+      (response) => {
+        if (callback) {
+          callback(response.data);
+        }
+      }
+    );
+  };
+}
+export function voteSumbitApi(params, callback) {
+  return (dispatch) => {
+    return excute.post(
+      API.voteSumbitApi,
+      params,
+      (response) => {
+        if (Number.parseFloat(response.code) === 1000) {
+          Toast.info("提交成功");
+          if (callback) {
+            callback(response.data);
+          }
+        }
+
+      }
+    );
+  };
+}
+export function voteSumbitSecondApi(params, callback) {
+  const url = `${API.voteSumbitSecondApi}?researchId=${params.researchId}`;
+  return (dispatch) => {
+    return excute.get(
+      url,
+      (response) => {
+        if (Number.parseFloat(response.code) === 1000) {
+          if (callback) {
+            callback(response.data);
+          }
+        }
+
+      }
+    );
+  };
+}
+//获取排行榜
+export function voteTopApi(params, callback) {
+  const url = `${API.voteTopApi}?researchId=${params.id}`;
+  return (dispatch) => {
+    return excute.get(
+      url,
+      (response) => {
+        if (Number.parseFloat(response.code) === 1000) {
+          if (callback) {
+            callback(response.data);
+          }
+        }
+      }
+    );
+  };
+}
\ No newline at end of file

src/components/mycontribute/index.jsx

+import React, { Component } from "react";
+import "./style.less";
+import { hashHistory } from "react-router";
+import func from "../../util/commonFunc";
+import moment from "moment";
+import { connect } from "react-redux";
+import { bindActionCreators } from "redux";
+import { VoteListApi, voteSumbitApi, voteSumbitSecondApi } from "./action";
+import { Modal } from "antd-mobile";
+class Mycontribute extends Component {
+  constructor(props) {
+    super(props);
+    this.state = {
+      mapList: [
+        {
+          name: "党务直通",
+        },
+        {
+          name: "廉洁作风",
+        },
+        {
+          name: "机电视窗",
+        },
+        {
+          name: "支部风采",
+        },
+        {
+          name: "年度专栏",
+        },
+        {
+          name: "工团快讯",
+        },
+        {
+          name: "学习栏目",
+        },
+        {
+          name: "其他",
+        },
+      ],
+    };
+    document.title = "我要投稿";
+  }
+
+  componentDidMount() {}
+
+  render() {
+    let { mapList } = this.state;
+    return (
+      <div className="mycontribute-out">
+        <div className="mycontribute-tit">请选择投稿类型</div>
+        <div className="mycontribute-box">
+          {mapList.map((item) => {
+            return (
+              <div className="item-box">
+                <div className="item-name">{item.name}</div>
+              </div>
+            );
+          })}
+        </div>
+        <div className="mycontribute-btn">写稿</div>
+      </div>
+    );
+  }
+}
+const mapStateToProps = (state) => {
+  return {};
+};
+const mapDispatchToProps = (dispatch) => {
+  return {
+    VoteListApi: bindActionCreators(VoteListApi, dispatch),
+    voteSumbitApi: bindActionCreators(voteSumbitApi, dispatch),
+    voteSumbitSecondApi: bindActionCreators(voteSumbitSecondApi, dispatch),
+  };
+};
+export default connect(mapStateToProps, mapDispatchToProps)(Mycontribute);

src/components/mycontribute/style.css

+.mycontribute-out {
+  background-color: #f7f7f7;
+}
+.mycontribute-out .mycontribute-tit {
+  font-size: 40px;
+  font-weight: bold;
+  padding: 40px 25px;
+  margin-left: 10px;
+  color: #333;
+}
+.mycontribute-out .mycontribute-box {
+  background-color: #fff;
+  width: 92%;
+  margin: 0 auto;
+  padding: 40px 25px;
+  display: flex;
+  flex-wrap: wrap;
+  justify-content: space-between;
+}
+.mycontribute-out .mycontribute-box .item-box {
+  width: 48%;
+  margin-bottom: 20px;
+}
+.mycontribute-out .mycontribute-box .item-box .item-name {
+  width: 100%;
+  height: 80px;
+  line-height: 80px;
+  background-color: #f7f7f7;
+  text-align: center;
+  font-size: 38px;
+  color: #454343;
+}
+.mycontribute-out .mycontribute-btn {
+  width: 92%;
+  margin: 0 auto;
+  text-align: center;
+  padding: 20px 0;
+  background: linear-gradient(270deg, #eb6c53 0%, #d23a29);
+  border-radius: 5px;
+  color: #fff;
+  font-size: 36px;
+}

src/components/mycontribute/style.less

+.mycontribute-out {
+  background-color: #f7f7f7;
+  .mycontribute-tit {
+    font-size: 40px;
+    font-weight: bold;
+    padding: 40px 25px;
+    margin-left: 10px;
+    color: #333;
+  }
+  .mycontribute-box {
+    background-color: #fff;
+    width: 92%;
+    margin: 0 auto;
+    padding: 40px 25px;
+    display: flex;
+    flex-wrap: wrap;
+    justify-content: space-between;
+    .item-box {
+      width: 48%;
+      margin-bottom: 20px;
+      .item-name {
+        width: 100%;
+        height: 80px;
+        line-height: 80px;
+        background-color: #f7f7f7;
+        text-align: center;
+        font-size: 38px;
+        color: #454343;
+      }
+    }
+  }
+  .mycontribute-btn {
+    width: 92%;
+    margin: 0 auto;
+    text-align: center;
+    padding: 20px 0;
+    background: linear-gradient(270deg, #eb6c53 0%, #d23a29);
+    border-radius: 5px;
+    color: #fff;
+    font-size: 36px;
+  }
+}

src/components/nav/menuhomeNav.jsx

@@ -75,7 +75,6 @@ class mehomeNav extends React.Component {
             >
               <SearchBar
                 placeholder='搜索'
-                className="custom-search-bar"
                 maxLength={8}
               />
             </div>

src/components/news/details.jsx

@@ -9,7 +9,6 @@ import intl from "react-intl-universal";
 class NewsDetails extends React.Component {
   constructor(props){
      super(props);
-    //  this.props.changeTitle("新闻资讯")
   }
 
   componentDidMount(){

src/components/newsList/index.jsx

@@ -36,7 +36,8 @@ class NewsListPage extends Component {
   }
 
   componentDidMount() {
-    document.title = intl.get("Information") || "新闻资讯";
+    let relationFuncName =  this.props.location.query.relationFuncName;
+    document.title = relationFuncName;
     let _this = this;
     this.props.getNewsBannerList(
       { bannerName: "NEWS", terminalName: "WECHAT" },

src/components/newsMessage/NewsMessage.js

@@ -92,22 +92,11 @@ class NewsMessage extends Component {
     }
 
     componentWillMount() {
-        document.title = intl.get('News&Information')||"新闻资讯";
+        
         let screenHeight = document.body.clientHeight;
         let actualHeight = screenHeight - 210;
         this.setState({ DyListHeight: actualHeight })
-        //请求轮播图 //liyuan banner点不进去，令业换了接口
-        // this.props.getNewsBannerList({ "terminalName": "MOBILE", "bannerName": "新闻资讯" }, () => {
-        //     console.log("获取轮播图 ok");
-        //     this.setState({
-        //         imageList: this.props.newsBannerList,
-        //         isBanner: this.props.newsBannerList.length > 0? true:false,
-                
-        //     })
-        // })
-
         this.props.newGetNewsBannerList({"bannerName":"NEWS","terminalName":"WECHAT"}, () => {
-            console.log("获取轮播图 ok");
             this.setState({
                 imageList: this.props.newsBannerList,
                 isBanner: this.props.newsBannerList.length > 0? true:false,

src/locales/newWord.json

@@ -31,7 +31,12 @@
         "AreYouSureToForbiddenUser": "你确定禁言该用户并屏蔽该用户此帖中已有回复？",
         "PleaseInputYourTitle": "请输入职级",
         "docType": "资料类型",
-        "pwd.error.times": "密码错误次数大于5",
+        "pwd.error.times": "您已连续输错5次登录密码，账号已被锁定，需5分钟后自动解锁，或联系系统管理员",
+        "pwd.error.times4": "密码错误！您还有1次机会",
+        "pwd.error.times3": "密码错误！您还有2次机会",
+        "pwd.error.times5": "密码错误！您还有0次机会",
+        "pwd.error.times2": "密码错误！您还有3次机会",
+        "pwd.error.times1": "密码错误！您还有4次机会",
         "ResultClosedNotice": "管理员已关闭成绩显示",
         "batchMark": "批量评分",
         "Replyer": "回复人",
@@ -1366,12 +1371,8 @@
         "company.not.exist": "公司不存在",
         "outsideRanking": "未上榜",
         "homeworkUploadTip2": "个文件",
-        "pwd.error.times4": "密码错误！您还有1次机会",
-        "pwd.error.times3": "密码错误！您还有2次机会",
         "WatchingZhong": "监听中",
-        "pwd.error.times5": "密码错误！您还有0次机会",
-        "pwd.error.times2": "密码错误！您还有3次机会",
-        "pwd.error.times1": "密码错误！您还有4次机会",
+        
         "Rating": "课程打分",
         "hadSubmit": "已提交",
         "SummitAgain": "继续提交",

src/locales/weichatLanguage.json

@@ -876,7 +876,12 @@
     "fileLimitSize": "文件大小不可超过",
     "Non-compliant.password": "密码格式不正确",
     "account.pwd.error": "用户名或密码错误",
-    "pwd.error.times": "密码错误次数大于5",
+    "pwd.error.times": "您已连续输错5次登录密码，账号已被锁定，需5分钟后自动解锁，或联系系统管理员",
+    "pwd.error.times4": "密码错误！您还有1次机会",
+    "pwd.error.times3": "密码错误！您还有2次机会",
+    "pwd.error.times5": "密码错误！您还有0次机会",
+    "pwd.error.times2": "密码错误！您还有3次机会",
+    "pwd.error.times1": "密码错误！您还有4次机会",
     "Passwordonlysupportsletters": "密码控制只能输入字母、数字、特殊符号(~!@#$%^&*()_+[]{}|\\;:'\",./<>?).",
     "bitsinlengthandmustinclude3ofthefollowing": "长度 8-20 位，必须包括大小写字母、数字、特殊符号中的3种",
     "Passwordcannotincludeuserinformation": "密码不能包含用户名信息",

src/locales/zh-CN.js

@@ -103,7 +103,12 @@ module.exports = {
     "notStartYet": "签到活动暂未开始",
     "ReportingManagement": "举报管理",
     "Submit": "提交",
-    "pwd.error.times": "密码错误次数大于5",
+    "pwd.error.times": "您已连续输错5次登录密码，账号已被锁定，需5分钟后自动解锁，或联系系统管理员",
+        "pwd.error.times4": "密码错误！您还有1次机会",
+        "pwd.error.times3": "密码错误！您还有2次机会",
+        "pwd.error.times5": "密码错误！您还有0次机会",
+        "pwd.error.times2": "密码错误！您还有3次机会",
+        "pwd.error.times1": "密码错误！您还有4次机会",
     "ResultClosedNotice": "本场考试成绩不显示",
     "ApplyTime": "报名时间",
     "InputMaxNotice": "最多输入200个字符",
@@ -1806,7 +1811,7 @@ module.exports = {
 	"fileLimitSize": "文件大小不可超过",
 	"Non-compliant.password": "密码格式不正确",
 	"account.pwd.error": "用户名或密码错误",
-	"pwd.error.times": "密码错误次数大于5",
+	"pwd.error.times": "您已连续输错5次登录密码，账号已被锁定，需5分钟后自动解锁，或联系系统管理员",
 	"Passwordonlysupportsletters": "密码控制只能输入字母、数字、特殊符号(~!@#$%^&*()_+[]{}|\\;:'\",./<>?).",
 	"bitsinlengthandmustinclude3ofthefollowing": "长度 8-20 位，必须包括大小写字母、数字、特殊符号中的3种",
 	"Passwordcannotincludeuserinformation": "密码不能包含用户名信息",

src/main.js

@@ -186,6 +186,12 @@ const VoteDetail = LazyLoad(() =>
 const TheCharts = LazyLoad(() =>
   import('./components/vote/theCharts')
 )
+
+//我要投稿
+const Mycontribute = LazyLoad(() =>
+  import('./components/mycontribute')
+)
+
 const MediaPreview = LazyLoad(() =>
   import('./common/preview/preview')
 )
@@ -365,7 +371,8 @@ class AppRouter extends React.Component {
           <Route path="/*/*/vote" component={Vote} />
           <Route path="/*/*/voteDetail" component={VoteDetail} />
           <Route path="/*/*/theCharts" component={TheCharts} />
-          
+          {/* 我要投稿 */}
+          <Route path="/*/*/mycontribute" component={Mycontribute} />
           {/*empty*/}
           <Route path="/*/*/empty" component={Empty} />
 

src/util/fetchUtil.js

@@ -585,7 +585,7 @@ function goToEmpty() {
 
 function catchError(response) {
     //Toast.info("接口调用失败", 1);
-    console.log(response);
+    console.log(response,'接口调用失败');
 }
 
 function goToCloseSite(text) {

src/util/navDirector.js

@@ -68,12 +68,12 @@ const linkMap = {
         name: '我的项目',
         list: '/train/mytraining',
         detail: '/mytraining/trainingsteps',
-    }, 
+    },
     myhome: {
         name: '我的',
         list: '/menume',
         detail: '/menume',
-    }, 
+    },
     mycourse: {
         name: '我的课程',
         list: '/mycourse',
@@ -233,7 +233,12 @@ const linkMap = {
         name: "我的钱包",
         list: "/myWallet",
         detail: false
-    }
+    },
+    mycontribute: {
+        name: "我要投稿",
+        list: "/mycontribute",
+        detail: false
+    },
 
 }
 
@@ -243,11 +248,10 @@ window.routerBefore = func.routerBefore();
 
 
 const fnNavigate = (item, jumpType) => {
-
     // sessionStorage.setItem("dontAPI","no")
     // 根据type判断跳转
 
-    const { type, kind, relationId } = item;
+    const { type, kind, relationId, relationFuncName } = item;
     let clearTime = "";//bug-12616-cwj
     console.log('kind', kind);
     console.log('type', type);
@@ -371,7 +375,8 @@ const fnNavigate = (item, jumpType) => {
                         hashHistory.push({
                             pathname: routerBefore + url,
                             query: {
-                                id: relationId
+                                id: relationId,
+                                relationFuncName: relationFuncName
                             }
                         });
                     }, 10);

src/util/tempZh_CN.js

 export default {
-    "marketing":"营销",
-    "marketingCourse":"营销课程",
-    "juyoucai":"聚有财",
-    "authLogining":"正在授权登陆",
-    "pleaseInputUsername":"请输入账号",
-    "keyword":"关键字",
-    "studyActivity":"学习活动",
-    "taixue":"太学",
-    "historySearch":"历史搜索",
-    "clearHistorySearch":"清空历史搜索",
-    "sumSearchText1":"共搜索到",
-    "sumSearchText2":"条结果",
-    "noMoreData":"没有更多了",
-    "loading":"加载中",
-    "findNoData":"没找到相关内容",
-    "notYetData":"暂时没有信息",
-    "insideMake":"内部定制",
-    "outsideMake":"外部定制",
-    "outsideBuy":"外部采购",
-    "courseMarket":"课程营销",
-    "upToLoadMore":"上拉加载更多",
-    "copySuccess":"复制成功",
-    "toggleHideInfo":"收起以下名片信息",
-    "toggleShowInfo":"展开以下名片信息",
-    "call":"拨打",
-    "copy":"复制",
-    "browserNot":"该浏览器不支持",
-    "telephone":"电话",
-    "myMakeCourse":"我的作课",
-    "myShare":"我的分享",
-    "myMessage":"我的消息",
-    "myReport":"我的报告",
-    "myBBS":"我的论坛",
-    "persionalCenter":"个人中心",
-    "startTimeNotMax":"起始时间不能大于结束时间",
-    "onlyTomorrow":"只能选择一天前的日期",
-    "month":"月",
-    "signCard":"打卡",
-    "studyLog":"学习记录",
-    "sumStudyTime":"累计学习时间",
-    "cellphone":"手机",
+    "marketing": "营销",
+    "marketingCourse": "营销课程",
+    "juyoucai": "聚有财",
+    "authLogining": "正在授权登陆",
+    "pleaseInputUsername": "请输入账号",
+    "keyword": "关键字",
+    "studyActivity": "学习活动",
+    "taixue": "太学",
+    "historySearch": "历史搜索",
+    "clearHistorySearch": "清空历史搜索",
+    "sumSearchText1": "共搜索到",
+    "sumSearchText2": "条结果",
+    "noMoreData": "没有更多了",
+    "loading": "加载中",
+    "findNoData": "没找到相关内容",
+    "notYetData": "暂时没有信息",
+    "insideMake": "内部定制",
+    "outsideMake": "外部定制",
+    "outsideBuy": "外部采购",
+    "courseMarket": "课程营销",
+    "upToLoadMore": "上拉加载更多",
+    "copySuccess": "复制成功",
+    "toggleHideInfo": "收起以下名片信息",
+    "toggleShowInfo": "展开以下名片信息",
+    "call": "拨打",
+    "copy": "复制",
+    "browserNot": "该浏览器不支持",
+    "telephone": "电话",
+    "myMakeCourse": "我的作课",
+    "myShare": "我的分享",
+    "myMessage": "我的消息",
+    "myReport": "我的报告",
+    "myBBS": "我的论坛",
+    "persionalCenter": "个人中心",
+    "startTimeNotMax": "起始时间不能大于结束时间",
+    "onlyTomorrow": "只能选择一天前的日期",
+    "month": "月",
+    "signCard": "打卡",
+    "studyLog": "学习记录",
+    "sumStudyTime": "累计学习时间",
+    "cellphone": "手机",
 
 
 
@@ -103,7 +103,12 @@ export default {
     "notStartYet": "签到活动暂未开始",
     "ReportingManagement": "举报管理",
     "Submit": "提交",
-    "pwd.error.times": "密码错误次数大于5",
+    "pwd.error.times": "您已连续输错5次登录密码，账号已被锁定，需5分钟后自动解锁，或联系系统管理员",
+    "pwd.error.times4": "密码错误！您还有1次机会",
+    "pwd.error.times3": "密码错误！您还有2次机会",
+    "pwd.error.times5": "密码错误！您还有0次机会",
+    "pwd.error.times2": "密码错误！您还有3次机会",
+    "pwd.error.times1": "密码错误！您还有4次机会",
     "ResultClosedNotice": "本场考试成绩不显示",
     "ApplyTime": "报名时间",
     "InputMaxNotice": "最多输入200个字符",
@@ -932,6 +937,6 @@ export default {
 
 var mainJson = {
 
-   
+
 
 }
\ No newline at end of file

src/util/urlconfig.js

@@ -20,9 +20,9 @@ if (
   host.indexOf("172.") != -1
 ) {
   //开发环境
-  baseUrl = "http://192.168.1.106:8090";
+  // baseUrl = "http://192.168.1.106:8090";
   //生产环境
-  // baseUrl = "http://10.23.1.180:8090";
+  baseUrl = "http://10.23.1.180:8090";
 
 } else if (
   host.indexOf("192.168.1.131") != -1 ||