Browse Source

用劵改为技淘币

liting2017 6 years ago
parent
commit
e8798a7375

+ 1 - 1
js/admin/menu.jsx

@@ -90,7 +90,7 @@ module.exports = {
         ]
       },
       {
-        name: '抵用券',
+        name: '技淘币管理',
         url: 'sub12',
         icon: 'notification',
         children: [

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

@@ -72,12 +72,12 @@ module.exports = {
           ]
         },
         {
-	        name: '抵用券',
+	        name: '技淘币管理',
 	        url: 'sub9',
 	        icon: 'notification',
 	        children: [
 	          { name: '券面管理', url: 'vouchers' },
-	          { name: '我的抵用券', url: 'coupon' },
+	          { name: '我的技淘币', url: 'coupon' },
 	        ]
         }
     ],
@@ -155,12 +155,12 @@ module.exports = {
           ]
         },
         {
-	        name: '抵用券',
+	        name: '技淘币管理',
 	        url: 'sub9',
 	        icon: 'notification',
 	        children: [
 	          { name: '券面管理', url: 'vouchers' },
-	          { name: '我的抵用券', url: 'coupon' },
+	          { name: '我的技淘币', url: 'coupon' },
 	        ]
         }
     ],

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

@@ -173,7 +173,7 @@ class DemandList extends Component {
                                      return <Col span={8} style={{marginBottom:10}}>
                                             <Card>
                                                 <div className="discountList">
-                                                    <p>¥<span>{parseInt(item.money)}</span> 元</p>
+                                                    <p>技淘币:<span>{parseInt(item.money)}</span> 枚</p>
                                                     <div className="discountListTxt">
                                                         <p>有效天数 : {item.durationDay}</p>
                                                         <p>名称 : {item.name}</p>

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

@@ -93,7 +93,7 @@ const DemandList = React.createClass({
                     render: text => { return text&&text.length>16?text.substr(0,16)+'...':text}
                 },
                 {
-                    title: '面额(元)',
+                    title: '数量(枚)',
                     dataIndex: 'money',
                     key: 'money',
                 },
@@ -343,12 +343,12 @@ const DemandList = React.createClass({
                                  <div className="clearfix">
                                     <FormItem 
                                         {...formItemLayout}
-                                        label={<span><strong style={{color:'#f00'}}> * </strong>面额</span>}>
+                                        label={<span><strong style={{color:'#f00'}}> * </strong>数量</span>}>
                                         <div><InputNumber value={this.state.money} 
                                         formatter={(value)=>value}
                                         parser={(val)=>parseInt(val)||0}
                                         onChange={(e)=>{this.setState({money:e})}} min={0} max={999999} step={0
-                                        } placeholder="输入面额."/><span> 元</span></div>
+                                        } placeholder="输入数量."/><span> 枚</span></div>
                                     </FormItem>
                                     <FormItem 
                                         {...formItemLayout}

+ 4 - 5
js/component/administration/ticket/coupon.jsx

@@ -90,10 +90,9 @@ const DemandList = React.createClass({
                     key: 'name',
                 },
                 {
-                    title: '面额(元)',
+                    title: '数量(枚)',
                     dataIndex: 'money',
                     key: 'money',
-                    //render: text => { return text&&text.length>16?text.substr(0,16)+'...':text}
                 },
                 {
                     title: '抵用券有效期(天)',
@@ -344,13 +343,13 @@ const DemandList = React.createClass({
 		                    	 </FormItem>
 		                    	 <FormItem 
 				                     {...formItemLayout}
-				                    label={<span><strong style={{color:'#f00'}}> * </strong>面额</span>}
+				                    label={<span><strong style={{color:'#f00'}}> * </strong>数量</span>}
 			                        >
                                      <InputNumber min={0} 
                                         formatter={(value)=>value}
                                         parser={(val)=>parseInt(val)||0}
-                                        max={999999} step={0} placeholder="面额" value={this.state.money} onChange={(e) => {
-			                        this.setState({ money:  e }) }} /> 
+                                        max={999999} step={0} placeholder="数量" value={this.state.money} onChange={(e) => {
+			                        this.setState({ money:  e }) }} /> 
 		                    	 </FormItem>
 		                    	 <FormItem 
 				                     {...formItemLayout}

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

@@ -95,7 +95,7 @@ const DemandList = React.createClass({
                     key: 'name',
                 },
                 {
-                    title: '面额',
+                    title: '数量(枚)',
                     dataIndex: 'money',
                     key: 'money',
                 },

+ 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": "*"