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

pages/welfareMall/personal/personal.json

@@ -1,6 +1,6 @@
 {
   "usingComponents": {
-   
+    "custom-page": "../../../components/customPage/customPage"
   },
   "navigationStyle":"custom",
   "navigationBarTitleText": ""

pages/welfareMall/personal/personal.wxml

@@ -1,6 +1,7 @@
 <!--pages/welfareMall/personal/personal.wxml-->
 <view class="{{grayTheme?'page':''}}">
-  <view class="personal flex-column">
+<custom-page head-bg-color="#fff2f3">  
+  <view slot="body" class="personal flex-column">
     <!-- 首部个人信息 -->
     <view class="head flex-column">
       <view class="head-personal flex-row">
@@ -40,6 +41,7 @@
         <view></view>
       </view>
   </view>
+</custom-page>  
 </view>
 
 <!-- 使用wxs 手机号码中间四位显示为*号 -->

pages/welfareMall/personal/personal.wxss

@@ -23,7 +23,7 @@
 
 .head{
   width: 750rpx;
-  height: 690rpx;
+  height: 586rpx;
   background: #FFF2F3;
   border-radius: 0rpx 0rpx 40rpx 40rpx;
   justify-content: space-between;
@@ -34,7 +34,7 @@
   height: 136rpx;
   justify-content: flex-start;
   margin-left: 35rpx;
-  margin-top: 167rpx;
+  margin-top: 70rpx;
 }
 .head-personal-logo{
   width: 136rpx;