Merge remote-tracking branch 'origin/jeffrey/feat/coupon-center' into jeffrey/feat/coupon-center

pages/luckDraw/common.js

@@ -27,7 +27,7 @@ export default {
         let nowY = now.getFullYear()
         let nowM = now.getMonth() + 1
         let nowD = now.getDate()
-        const Ymd = nowY + "-" + nowM + "-" + nowD;
+        const Ymd = nowY + "/" + nowM + "/" + nowD;
         dayBeginTime = this.toTimeStamp(dayBeginTime, Ymd)
         dayEndTime = this.toTimeStamp(dayEndTime, Ymd)
         beginTime = this.toTimeStamp(beginTime)

pages/luckDraw/index.js

@@ -102,13 +102,12 @@ Page({
             if (v.timeType == 1 || endTime == null) {
                 endTime = ""
             }
-            beginTime && (v._beginTime = parseTime(beginTime, "{y}.{m}.{d} {h}:{i}:{s}"))
-            endTime && (v._endTime = parseTime(endTime, "{y}.{m}.{d} {h}:{i}:{s}"))
+            beginTime && (v._beginTime = parseTime(beginTime, "{y}.{m}.{d}"))
+            endTime && (v._endTime = parseTime(endTime, "{y}.{m}.{d}"))
 
             if (v.activityTitle && v.activityTitle.length > 20) {
                 v.activityTitle = v.activityTitle.substr(0, 20) + "..."
             }
-
         })
         this.data.activityList = this.data.activityList.concat(...data)
         this.setData({
@@ -117,6 +116,8 @@ Page({
         this.calcActivityCountdown()
     },
 
+    
+
     /**
      * 页面上拉触底事件的处理函数
      */

pages/luckDraw/index.wxml

@@ -12,9 +12,15 @@
                     <view class="_title">{{item.activityTitle}}</view>
                     <view class="_subtitle">{{item.activitySubtitle}}</view>
                     <view class="_time" wx:if="{{item.timeType == 1}}">
-                    长期
+                    长期 <text class="_sub_time">每天{{item.dayBeginTime}}-{{item.dayEndTime}}</text>
                     </view>
-                    <view class="_time" wx:else>{{item._beginTime}}-{{item._endTime}}</view>
+                    <block wx:else>
+                        <view class="_time">{{item._beginTime}}-{{item._endTime}}</view>
+                        <view class="_time">
+                            <text class="_sub_time">每天{{item.dayBeginTime}}-{{item.dayEndTime}}</text>
+                        </view>
+                    </block>
+                    
                 </view>
                 <view class="_status">
                     <view wx:if="{{item.status==1||item.status==4||item.status==5}}" class="_status_btn _status{{item.status}}">

pages/luckDraw/index.wxss

@@ -68,6 +68,10 @@ page {
     font-size: 28rpx;
     color: #8c8c8c;
 }
+._sub_time {
+    font-size: 26rpx;
+    color: #aaa;
+}
 
 ._status_btn {
     width: 174rpx;
@@ -80,7 +84,7 @@ page {
     margin: 60rpx 0 0 0;
 }
 ._status2 {
-    border: 1rpx solid #CF4F58;
+    border: 2rpx solid #CF4F58;
     background: #FFE3E5;
     color: #BD1925;
 }

pages/luckDraw/profile.json

@@ -1,5 +1,5 @@
 {
-  "navigationBarTitleText": "个人中心",
+  "navigationBarTitleText": "",
   "usingComponents": {
     "tab-bar": "./components/tabbar",
     "topbar": "../../components/topbar",

pages/luckDraw/profile.wxml

@@ -1,7 +1,7 @@
 <!--pages/luckDraw/profile.wxml-->
 <!-- 首部信息 -->
 <view class="head flex-column">
-<topbar title="抽奖记录" topbar-title-class="profile-topbar"/>
+<topbar title="中奖记录" topbar-title-class="profile-topbar"/>
   <image wx:if="{{!isLogin}}" class="head_portrait" src="/images/welfareMall/head-portrait.png" />
   <!-- 获取用户头像 -->
   <open-data wx:if="{{isLogin}}" class="head_portrait" type="userAvatarUrl"></open-data>