Merge remote-tracking branch 'origin/master'

src/main/resources/static/css/userMember.css

@@ -90,7 +90,7 @@
     position: relative;
     overflow: hidden;
     background: #1caf9a;
-    height: 100px;
+    height: 120px;
     margin: 5px;
 }
 
@@ -127,6 +127,8 @@
 
 .coupon .content .left {
     display: flex;
+    flex-shrink: 0;
+    min-width: 50%;
     flex-direction: column;
     border-right: 2px dashed rgba(255,255,255,.3);
 }
@@ -136,11 +138,16 @@
 }
 
 .coupon .content .left .description{
+    font-size: 10px;
+    color: #f9d3a1;
+}
+
+.coupon .content .left .price{
     font-size: 24px;
 }
 
 .coupon .content .right {
-    text-align: right;
+    text-align: left;
     color: #d2d2d2;
 }
 

src/main/resources/static/js/movieDetail.js

@@ -19,31 +19,29 @@ $(document).ready(function(){
                    dateArray.push(item.likeTime);
                    numberArray.push(item.likeNum);
                });
-               if(window.location.href.indexOf('admin')!=-1) {
-                   // 避免user未引用echarts而报错
-                   var myChart = echarts.init($("#like-date-chart")[0]);
 
-                   // 指定图表的配置项和数据
-                   var option = {
-                       title: {
-                           text: '想看人数变化表'
-                       },
-                       xAxis: {
-                           type: 'category',
-                           data: dateArray
-                       },
-                       yAxis: {
-                           type: 'value'
-                       },
-                       series: [{
-                           data: numberArray,
-                           type: 'line'
-                       }]
-                   };
+               var myChart = echarts.init($("#like-date-chart")[0]);
 
-                   // 使用刚指定的配置项和数据显示图表。
-                   myChart.setOption(option);
-               }
+               // 指定图表的配置项和数据
+               var option = {
+                   title: {
+                       text: '想看人数变化表'
+                   },
+                   xAxis: {
+                       type: 'category',
+                       data: dateArray
+                   },
+                   yAxis: {
+                       type: 'value'
+                   },
+                   series: [{
+                       data: numberArray,
+                       type: 'line'
+                   }]
+               };
+
+               // 使用刚指定的配置项和数据显示图表。
+               myChart.setOption(option);
            },
            function (error) {
                alert(error);

src/main/resources/static/js/userMember.js

@@ -1,5 +1,6 @@
 $(document).ready(function () {
     getVIP();
+    getCoupon();
 });
 
 var isBuyState = true;
@@ -119,3 +120,42 @@ function validateForm() {
     }
     return isValidate;
 }
+
+function getCoupon() {
+    getRequest(
+        '/coupon/' + sessionStorage.getItem('id') + '/get',
+        function (res) {
+            if (res.success) {
+                var couponList = res.content;
+                var couponListContent = '';
+                for (let coupon of couponList) {
+                    couponListContent += '<div class="content">' +
+                        '<div class="col-md-8 left">' +
+                        '<div class="name">' +
+                        coupon.name +
+                        '</div>' +
+                        '<div class="description">' +
+                        coupon.description +
+                        '</div>' +
+                        '<div class="price">' +
+                        '满' + coupon.targetAmount + '减' + coupon.discountAmount +
+                        '</div>' +
+                        '</div>' +
+                        '<div class="col-md-4 right">' +
+                        '<div>有效日期：</div>' +
+                        '<div>' + formatDate(coupon.startTime) + ' ~ ' + formatDate(coupon.endTime) + '</div>' +
+                        '</div>' +
+                        '</div>'
+                }
+                $('#coupon-list').html(couponListContent);
+
+            }
+        },
+        function (error) {
+            alert(error);
+        });
+}
+
+function formatDate(date) {
+    return date.substring(5, 10).replace("-", ".");
+}

src/main/resources/templates/userMember.html

@@ -100,54 +100,7 @@
             <div class="title">优惠券</div>
         </div>
         <div class="col-md-6 coupon-wrapper">
-            <div class="coupon">
-                <div class="content">
-                    <div class="col-md-9 left">
-                        <div class="name">
-                            春季优惠券
-                        </div>
-                        <div class="description">
-                            满20减5
-                        </div>
-                    </div>
-                    <div class="col-md-3 right">
-                        永久有效
-                    </div>
-                </div>
-            </div>
-        </div>
-        <div class="col-md-6 coupon-wrapper">
-            <div class="coupon">
-                <div class="content">
-                    <div class="col-md-9 left">
-                        <div class="name">
-                            春季优惠券
-                        </div>
-                        <div class="description">
-                            满20减5
-                        </div>
-                    </div>
-                    <div class="col-md-3 right">
-                        永久有效
-                    </div>
-                </div>
-            </div>
-        </div>
-        <div class="col-md-6 coupon-wrapper">
-            <div class="coupon">
-                <div class="content">
-                    <div class="col-md-9 left">
-                        <div class="name">
-                            春季优惠券
-                        </div>
-                        <div class="description">
-                            满20减5
-                        </div>
-                    </div>
-                    <div class="col-md-3 right">
-                        永久有效
-                    </div>
-                </div>
+            <div class="coupon" id="coupon-list">
             </div>
         </div>
     </div>