Merge branch 'jeffrey/feat/coupon-center' of http://git.ahamu.cn:9202/xing.li/share_activity into jeffrey/feat/coupon-center

pages/luckDraw/detail.wxml

@@ -1,7 +1,7 @@
 <!--pages/luckDraw/detail.wxml-->
 <view class="page" wx:if="{{showPage}}">
     <view class="head-bg">
-       <image src="/images/luck-draw/head-bg.png" />
+       <image src="https://dy.shpr.top/welfareGo/head-bg-draw.png" mode="widthFix"/>
     </view>
     <!-- 抽奖视图 -->
     <view class="luck-draw-box">
@@ -49,7 +49,7 @@
 
         <!-- 背景 -->
         <view class="luck-draw-bg">
-            <image src="/images/luck-draw/gift-box.png" />
+            <image src="https://dy.shpr.top/welfareGo/gift-box.png" />
         </view>
 
     </view>

pages/luckDraw/detail.wxss

@@ -12,7 +12,7 @@ page {
 }
 .head-bg image {
     width: 750rpx;
-    height: 576rpx
+    /* height: 576rpx */
 }
 
 .luck-draw-box {

pages/luckDraw/profile.wxml

@@ -1,8 +1,7 @@
 <!--pages/luckDraw/profile.wxml-->
 <!-- 首部信息 -->
 <view class="head flex-column">
-<topbar />
-  <view class="head_profile">个人中心</view> 
+<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>

pages/luckDraw/profile.wxss

@@ -28,7 +28,7 @@
   height: 144rpx;
   border-radius: 50%;
   overflow :  hidden ;
-  margin-top: 80rpx;
+  margin-top: 170rpx;
 }
 
 .head_text{
@@ -36,7 +36,7 @@
   font-family: Source Han Sans CN;
   font-weight: 400;
   color: #FEFEFE;
-  margin-top: 40rpx;
+  margin-top: 30rpx;
 }
 
 .sigin-isLogin{
@@ -287,10 +287,9 @@
   margin-top: 20rpx;
 }
 
-.head_profile{
-  font-size: 28rpx;
+.profile-topbar{
+  font-size: 56rpx;
   font-weight: 500;
-  color: #000000;
-  margin-top: 60rpx;
+  color: #ffffff;
 }
 

pages/signIn/record/record.wxml

@@ -3,9 +3,9 @@
   <!-- 首部信息 -->
   <view class="head flex-column">
     <topbar />
-    <view class="head_profile" wx:if="{{noCoupon}}">签到优惠券</view>
-    <view class="head_profile" wx:if="{{noDetail}}">获取明细</view>
-    <view class="head_profile" wx:if="{{noUtility}}">使用/失效</view>
+    <topbar wx:if="{{noCoupon}}" title="签到优惠券" topbar-title-class="record-topbar"/>
+    <topbar wx:if="{{noDetail}}" title="获取明细" topbar-title-class="record-topbar"/>
+    <topbar wx:if="{{noUtility}}" title="使用/失效" topbar-title-class="record-topbar"/>
     <view class="head_num" wx:if="{{!isLogin}}">{{notUseNum}}</view>
     <view class="head_num" wx:if="{{isLogin}}">{{notUseNum?notUseNum:0}}</view>
     <view class="head_text" wx:if="{{isLogin}}">请在优惠券有效期内尽快使用</view>

pages/signIn/record/record.wxss

@@ -33,7 +33,7 @@
   font-family: Source Han Sans CN;
   font-weight: 500;
   color: #FEFEFE;
-  margin-top: 80rpx;
+  margin-top: 170rpx;
 }
 
 .head_text{
@@ -313,10 +313,9 @@
 	text-overflow: ellipsis;
 }
 
-.head_profile{
-  font-size: 28rpx;
+.record-topbar{
+  font-size: 56rpx;
   font-weight: 500;
-  color: #000000;
-  margin-top: 60rpx;
+  color: #ffffff;
 }
 

pages/welfareMall/historical/historical.wxml

@@ -12,7 +12,7 @@
         <view class="content-middle flex-row">
           <view class="middle-it flex-row">
             <image class="middle-img" src="{{item.goodsList[0].fullCoverImg}}" />
-            <view class="middle-text">{{item.goodsList[0].activityName}}</view>
+            <view class="middle-text over-ellipsis">{{item.goodsList[0].activityName}}</view>
           </view>
           <view class="middle-num flex-column">
             <view class="middle-num-money">￥{{item.payPriceFormatter}}</view>

pages/welfareMall/historical/historical.wxss

@@ -81,15 +81,12 @@ page{
 }
 
 .middle-text{
-  width: 180rpx;
+  width: 240rpx;
   height: 36rpx;
   font-size: 28rpx;
   font-weight: 500;
   color: #444444;
   margin-left: 36rpx;
-  overflow: hidden;
-	white-space: nowrap;
-  text-overflow: ellipsis;
   margin-bottom: 34rpx;
 }
 

pages/welfareMall/order/orderCompletion.wxss

@@ -88,7 +88,7 @@ page{
 }
 
 .middle-text{
-  width: 180rpx;
+  width: 240rpx;
   height: 36rpx;
   font-size: 28rpx;
   font-weight: 500;