liting2017 6 years ago
parent
commit
b046c210ee

+ 1 - 1
js/admin/menu.jsx

@@ -95,7 +95,7 @@ module.exports = {
         icon: 'notification',
         children: [
           { name: '抵用券管理', url: 'vouchers' },
-          { name: '通用劵管理', url: 'coupon' },
+          { name: '劵管理', url: 'coupon' },
         ]
       }
     ]

+ 2 - 2
js/component/account/menu.jsx

@@ -76,7 +76,7 @@ module.exports = {
 	        url: 'sub9',
 	        icon: 'notification',
 	        children: [
-	          { name: '抵用券管理', url: 'vouchers' },
+	          { name: '券管理', url: 'vouchers' },
 	          { name: '我的抵用券', url: 'coupon' },
 	        ]
         }
@@ -159,7 +159,7 @@ module.exports = {
 	        url: 'sub9',
 	        icon: 'notification',
 	        children: [
-	          { name: '抵用券管理', url: 'vouchers' },
+	          { name: '券管理', url: 'vouchers' },
 	          { name: '我的抵用券', url: 'coupon' },
 	        ]
         }

+ 2 - 1
js/component/account/setAccount/account.jsx

@@ -156,7 +156,8 @@ class Account extends React.Component {
 				identifyName: this.state.identifyName,
 				mobile: this.state.mobile,
 				email: this.state.email,
-				nickname: this.state.nickname
+				nickname: this.state.nickname,
+				type:this.state.type
 			}
 		}).done(
 			function(data) {

+ 3 - 3
js/component/account/ticket/vouchers.jsx

@@ -289,10 +289,10 @@ const DemandList = React.createClass({
         return (
             <div className="user-content" >
                 <div className="content-title">
-                    <span>抵用券管理</span>
+                    <span>券管理</span>
                 </div>
                 <div className="user-search">
-              	  	<Button type="primary" onClick={this.addClick} style={{float:'right'}}>新增用劵<Icon type="plus" /></Button>
+              	  	<Button type="primary" onClick={this.addClick} style={{float:'right'}}>新增用劵<Icon type="plus" /></Button>
                     <Input placeholder="劵面名称"
                         value={this.state.nameSearch}
                         onChange={(e) => { this.setState({ nameSearch: e.target.value }); }} />
@@ -346,7 +346,7 @@ const DemandList = React.createClass({
                                         {...formItemLayout}
                                         label={<span><strong style={{color:'#f00'}}> * </strong>面额</span>}>
                                         <div><InputNumber value={this.state.money} 
-                                        onChange={(e)=>{this.setState({money:e})}} min={0} max={999999} step={0.01} placeholder="输入面额."/><span> 元</span></div>
+                                        onChange={(e)=>{this.setState({money:e})}} min={0} max={999999} step={0} placeholder="输入面额."/><span> 元</span></div>
                                     </FormItem>
                                     <FormItem 
                                         {...formItemLayout}

+ 1 - 1
js/component/administration/ticket/coupon.jsx

@@ -292,7 +292,7 @@ const DemandList = React.createClass({
         return (
             <div className="user-content" >
                 <div className="content-title">
-                    <span>通用券管理</span>
+                    <span>券管理</span>
                 </div>
                 <div className="user-search">
               	  	<Button type="primary" onClick={this.addClick} style={{float:'right'}}>新增通用劵<Icon type="plus" /></Button>

+ 1 - 1
package.json

@@ -12,7 +12,7 @@
     "buildtest": "node bin/clean.js && webpack --progress --colors --env.deploy test",
     "buildstage": "node bin/clean.js && webpack --progress --colors --env.deploy stage",
     "pro": "node bin/clean.js && webpack --progress --colors --env.deploy prod",
-    "dev": "webpack-dev-server --port 80 --devtool eval --progress --colors --hot --content-base build --env.deploy dev --env.watch watch"
+    "dev": "webpack-dev-server --port 8088 --devtool eval --progress --colors --hot --content-base build --env.deploy dev --env.watch watch"
   },
   "repository": {
     "type": "git",

+ 1 - 1
webpack-dll.config.js

@@ -10,7 +10,7 @@ let theme = {
   '@link-color': '#58a3ff'
 };
 module.exports = (function () {
-	let staticHost = 'http://192.168.0.188';   
+	let staticHost = 'http://192.168.0.188:8088';   
     switch (argv.env.deploy) {
         case 'test':
             staticHost = 'http://statics.jishutao.com';

+ 2 - 2
webpack.config.js

@@ -121,7 +121,7 @@ module.exports = (function () {
         }));
     }
 
-    let staticHost = 'http://192.168.0.188';    
+    let staticHost = 'http://192.168.0.188:8088';    
     switch (argv.env.deploy) {
         case 'test':
             staticHost = 'http://statics.jishutao.com';
@@ -157,7 +157,7 @@ module.exports = (function () {
         devServer: {
             disableHostCheck: true,
             host: '192.168.0.188',
-            port: 80,
+            port: 8088,
             allowedHosts: ['127.0.0.1','192.168.0.20','192.168.0.99'],
             headers: {
                 "Access-Control-Allow-Origin": "*"