liting2017 6 years ago
parent
commit
c0ac77da32

+ 1 - 3
js/admin/index/content.jsx

@@ -5,11 +5,10 @@ import AdmianIndex from '@/administration/index/index';
 import AchievementExamine from '@/administration/achievement/achievementExamine';
 import AchievementLibrary from '@/administration/achievement/techAchievement';
 import BusinessCategory from '@/administration/business/businessCategory';
-import BusinessProject from '@/administration/business/businessProject';
 import News from '@/administration/news/newsList';
 import Policy from '@/administration/policy/policyList';
 
-import {hashHistory,Route,Router,IndexRedirect} from 'react-router';
+import {hashHistory,Route,Router} from 'react-router';
 import {Layout} from 'antd';
 import '@/account/content.less'
 
@@ -27,7 +26,6 @@ export default class ContentRouter extends React.Component {
             <Route path="/achievementLibrary" component={AchievementLibrary} />
             <Route path="/achievementExamine" component={AchievementExamine} />
             <Route path="/businessCategory" component={BusinessCategory} />
-            <Route path="/businessProject" component={BusinessProject} />
             <Route path="/news" component={News} />
             <Route path="/policy" component={Policy} />
         </Router>

+ 0 - 1
js/admin/menu.jsx

@@ -32,7 +32,6 @@ module.exports = {
         icon: 'wallet',
         children: [
           { name: '业务分类管理', url: 'businessCategory' },
-          { name: '业务项目管理', url: 'businessProject' },
         ]
       },
       {

+ 21 - 25
js/component/administration/business/businessProject.jsx

@@ -1,13 +1,9 @@
 import React from 'react';
-import ReactDom from 'react-dom';
-import ajax from 'jquery/src/ajax/xhr.js';
 import $ from 'jquery/src/ajax';
-import moment from 'moment';
-import { citySelect,provinceList,areaSelect,provinceSelect} from '@/NewDicProvinceListAll';
-import { Form,Radio, Icon, Button, Input,Tabs, Select, Spin, Table, Switch, message, DatePicker, Modal, Upload,Popconfirm,TimePicker,Cascader, InputNumber } from 'antd';
-import {categoryState,industry,conditionOrganization,gameState} from '@/dataDic.js';
-import {getCategoryState,getGameState,splitUrl,getprovince} from '@/tools.js';
-const TabPane = Tabs.TabPane;
+import { citySelect} from '@/NewDicProvinceListAll';
+import { Form, Icon, Button, Input, Select, Spin, Table, message, DatePicker, Modal, Upload,Popconfirm,Cascader, InputNumber } from 'antd';
+import {getGameState,splitUrl,getprovince} from '@/tools.js';
+
 //图片组件
 const PicturesWall = React.createClass({
     getInitialState() {
@@ -45,7 +41,7 @@ const PicturesWall = React.createClass({
         return (
             <div style={{display:"inline-block"}}>
                 <Upload
-                    action={globalConfig.context + "/api/admin/jtBusiness/project/uploadPicture"}
+                    action={globalConfig.context + "/api/user/jtBusiness/project/uploadPicture"}
                     data={{ 'sign': 'jt_project_picture' }}
                     listType="picture-card"
                     fileList={fileList}
@@ -110,10 +106,10 @@ const BusinessProject=Form.create()(React.createClass({
 							superName:superName,
 							cname:cname,
 							city:thisdata.city,
-                            activityPrice:thisdata.activityPrice,//最低折扣
-							memberPrice:thisdata.memberPrice,//会员价
-							offset:thisdata.offset,
-                            activityPrice:thisdata.activityPrice,//活动价
+                            activityPrice:thisdata.activityPrice?thisdata.activityPrice:'',//最低折扣
+							memberPrice:thisdata.memberPrice?thisdata.memberPrice:'',//会员价
+							offset:thisdata.offset?thisdata.offset:'',
+                            activityPrice:thisdata.activityPrice?thisdata.activityPrice:'',//活动价
                             activityFlag:thisdata.activityFlag,//活动生效标识
                             status: thisdata.status,//项目状态
 							province:thisdata.province,
@@ -225,10 +221,10 @@ const BusinessProject=Form.create()(React.createClass({
             method: "get",
             dataType: "json",
             crossDomain: false,
-            url: globalConfig.context + '/api/admin/jtBusiness/category/list',
+            url: globalConfig.context + '/api/user/jtBusiness/category/list',
             data: {
                 pageNo:  1,
-				pageSize: 99999,
+				pageSize: 999,
             },
             success: function (data) {
                 let theArr = [],firstData=[];
@@ -277,8 +273,8 @@ const BusinessProject=Form.create()(React.createClass({
 			message.warning('请输入项目名称');
 			return ;
 		}
-		if(this.state.categoryId>-1){
-			message.warning('请选择项目品类');
+		if(!(parseInt(this.state.categoryId)>=0)){
+			message.warning('请选择项目业务品类');
 			return ;
 		}
 		if(!(this.state.ProvinceCity.length)){
@@ -316,7 +312,7 @@ const BusinessProject=Form.create()(React.createClass({
             method: "post",
             dataType: "json",
             crossDomain: false,
-            url: globalConfig.context + "/api/admin/jtBusiness/project/update",
+            url: globalConfig.context + "/api/user/jtBusiness/project/update",
             data: {
 				id:this.state.id,//业务名称
 				name: this.state.name,//业务名称
@@ -353,7 +349,7 @@ const BusinessProject=Form.create()(React.createClass({
             method: "get",
             dataType: "json",
             crossDomain: false,
-            url: globalConfig.context + '/api/admin/jtBusiness/project/detail',
+            url: globalConfig.context + '/api/user/jtBusiness/project/detail',
             data: {
                id:recard.id
             },
@@ -372,9 +368,9 @@ const BusinessProject=Form.create()(React.createClass({
 						categoryId: thisdata.categoryId,//业务品类
 						number:thisdata.number,
 						price: thisdata.price,//市场价
-						activityPrice:thisdata.activityPrice,//最低折扣
-						memberPrice:thisdata.memberPrice,//会员价
-						offset:thisdata.offset,
+						activityPrice:thisdata.activityPrice?thisdata.activityPrice:'',//最低折扣
+						memberPrice:thisdata.memberPrice?thisdata.memberPrice:'',//会员价
+						offset:thisdata.offset?thisdata.offset:'',
 						activityFlag:thisdata.activityFlag?thisdata.activityFlag.toString():'',//活动生效标识
 						ProvinceCity:ProvinceCityArr,
 						introduce:thisdata.introduce,
@@ -428,7 +424,7 @@ const BusinessProject=Form.create()(React.createClass({
 			method: "post",
 			dataType: "json",
 			crossDomain: false,
-			url:globalConfig.context + '/api/admin/jtBusiness/project/apply',
+			url:globalConfig.context + '/api/user/jtBusiness/project/apply',
 			data:{
 					name:this.state.categoryName,//项目名称
 					categoryId:this.state.addCid,
@@ -465,7 +461,7 @@ const BusinessProject=Form.create()(React.createClass({
             method: "get",
             dataType: "json",
             crossDomain: false,
-            url: globalConfig.context + "/api/admin/jtBusiness/project/delete",
+            url: globalConfig.context + "/api/user/jtBusiness/project/delete",
             data: {
                 id:deletedIds
             }
@@ -668,7 +664,7 @@ const BusinessProject=Form.create()(React.createClass({
 									<Select placeholder="请选择业务品类" value={this.state.categoryId} onChange={(e)=>{this.setState({categoryId:e})}}
 										notFoundContent="未获取到业务品类列表">
 										{
-											categoryList.map(function (item) {
+											firstData.map(function (item) {
 													return <Select.Option key={item.id} >{item.name}</Select.Option>
 											})
 										}

+ 2 - 2
js/component/account/index/content.jsx

@@ -13,13 +13,12 @@ import ServiceList from '@/account/index/serviceList';
 import ConsultList from '@/account/index/consultList';
 import DemandList from '@/account/demand/techDemand';
 import Achievement from '@/account/achievement/techAchievement';
-
+import BusinessProject from '@/account/business/businessProject'
 
 import {hashHistory,Route,Router} from 'react-router';
 import {Layout} from 'antd';
 import '@/account/content.less'
 
-
 const { Content } = Layout;
 
 export default class ContentRouter extends React.Component {
@@ -39,6 +38,7 @@ export default class ContentRouter extends React.Component {
             <Route path="/demand" component={DemandList} />
             <Route path="/achievement" component={Achievement} />
             <Route path="/expert" component={Expert} />
+            <Route path="/businessProject" component={BusinessProject} />
         </Router>
       </Content>
     )

+ 19 - 7
js/component/account/menu.jsx

@@ -28,14 +28,20 @@ module.exports = {
           name: '我的需求',
           url: 'sub3',
           icon: 'bulb',
-          children: [ { name: '科技需求列表', url: 'demand' } ]
+          children: [ { name: '科技需求管理', url: 'demand' } ]
         },
         {
           name: '我的成果',
           url: 'sub4',
           icon: 'compass',
-          children: [ { name: '科技成果列表', url: 'achievement' } ]
-        }
+          children: [ { name: '科技成果管理', url: 'achievement' } ]
+        },
+        {
+          name: '我的业务项目',
+          url: 'sub5',
+          icon: 'wallet',
+          children: [ { name: '业务项目管理', url: 'businessProject' }, ]
+        },
     ],
     menuInit:[
       {
@@ -47,7 +53,7 @@ module.exports = {
           // { name: '我的收藏', url: 'collection' },
           // { name: '科技订单', url: 'techList' },
           // { name: '服务订单', url: 'serviceList' },
-          // { name: '咨询订单', url: 'consultList' },
+          // { name: '咨询订单', url: 'consultList' }
         ]
       },
          {
@@ -65,13 +71,19 @@ module.exports = {
           name: '我的需求',
           url: 'sub3',
           icon: 'bulb',
-          children: [ { name: '科技需求列表', url: 'demand' } ]
+          children: [ { name: '科技需求管理', url: 'demand' } ]
         },
         {
           name: '我的成果',
           url: 'sub4',
           icon: 'compass',
-          children: [ { name: '科技成果列表', url: 'achievement' } ]
-        }
+          children: [ { name: '科技成果管理', url: 'achievement' } ]
+        },
+        {
+          name: '我的业务项目',
+          url: 'sub5',
+          icon: 'wallet',
+          children: [ { name: '业务项目管理', url: 'businessProject' }, ]
+        },
     ],
 }

+ 3 - 2
js/component/administration/news/newForm.jsx

@@ -111,13 +111,14 @@ const NewDetailForm = Form.create()(React.createClass({
                 let pageList =  thisData.newsPublishs
                 pageList.map(item=>{
 					publishPagesArr.push(item.publishPage)
-                });
+				});
+				let pageK = publishPagesArr.length?publishPagesArr:['web_index','app_policy_index']
 				provice.push(thisData.provinceId);
                 this.setState({
 					id:thisData.id,
 					data: thisData,
 					Province:provice,
-					publishPages:publishPagesArr,
+					publishPages:pageK,
 					auditStatus:thisData.auditStatus,
 					edit:thisData.content,
                     pictureUrl: thisData.titleImg ? splitUrl(thisData.titleImg, ',', globalConfig.avatarHost + '/upload') : []

+ 6 - 1
js/component/administration/policy/policy.less

@@ -1,7 +1,12 @@
 .txt{
-   
     p{
         word-wrap:break-word;
         width: 726px;
     }
+    img{
+        width: 520px;
+        height: 200px;
+        margin: 0 auto;
+    }
+
 }

+ 1 - 1
js/component/administration/policy/policyForm.jsx

@@ -112,7 +112,7 @@ const NewDetailForm = Form.create()(React.createClass({
 					id:thisData.id,
 					data: thisData,
 					Province:proArr,
-					publishPages:thisData.publishPages,
+					publishPages:thisData.publishPages?thisData.publishPages:['web_policy_main','app_policy_main'],
 					auditStatus:thisData.auditStatus,
 					edit:{content:thisData.content},
                     pictureUrl: thisData.titleImg ? splitUrl(thisData.titleImg, ',', globalConfig.avatarHost + '/upload') : []