liting2017 6 роки тому
батько
коміт
521ebd9de1

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

@@ -174,12 +174,12 @@ class DemandList extends Component {
                                             <Card>
                                                 <div className="discountList">
                                                     <p>¥<span>{parseInt(item.money)}</span> 元</p>
-                                                    <div className="intro">
-                                                        <p>名称 : {item.name}</p>
+                                                    <div className="discountListTxt">
                                                         <p>有效天数 : {item.durationDay}</p>
+                                                        <p>名称 : {item.name}</p>
+                                                        <p>有效日期 : {(item.starTime.split(' ')[0]).replace(/-/g,'.')} - {(item.endTime.split(' ')[0]).replace(/-/g,'.')}</p>
                                                     </div>
                                                 </div>
-                                                <p>有效日期 : {(item.starTime.split(' ')[0]).replace(/-/g,'.')} - {(item.endTime.split(' ')[0]).replace(/-/g,'.')}</p>
                                             </Card>
                                         </Col>
                                     })

+ 14 - 16
js/component/account/ticket/coupon.less

@@ -36,27 +36,25 @@
     .ant-card-body{
         background: #69afeb;
         color: #fff;
-        >p{
-            clear: both;
-            text-align: center;
-            font-size: 16px;
-            padding-top: 20px;
-            border-top: 1px solid #cccccc;
-        }
+       
     }
     .discountList{
-        display: flex;
-        display: -webkit-flex;
-        justify-content: space-between;
-        margin-bottom: 5px;
+        p{
+            font-size: 16px;
+        }
         >p{
-            width: 124px;
-            overflow: hidden;
-            height: 68px;
+            border-bottom: 1px solid #cccc;
             text-align: center;
-            line-height: 75px;
             span{
-                font-size: 40px;
+                font-size: 60px;
+                margin: 0 10px;
+                display: inline-block;
+            }
+            padding-bottom: 10px;
+        }
+        .discountListTxt {
+            p{
+                margin-top: 10px;
             }
         }
     }

+ 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 8088 --devtool eval --progress --colors --hot --content-base build --env.deploy dev --env.watch watch"
+    "dev": "webpack-dev-server --port 80 --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:8088';   
+	let staticHost = 'http://192.168.0.188';   
     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:8088';    
+    let staticHost = 'http://192.168.0.188';    
     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: 8088,
+            port: 80,
             allowedHosts: ['127.0.0.1','192.168.0.20','192.168.0.99'],
             headers: {
                 "Access-Control-Allow-Origin": "*"