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

pages/luckDraw/profile.json

@@ -1,6 +1,8 @@
 {
   "navigationBarTitleText": "个人中心",
   "usingComponents": {
-    "tab-bar": "./components/tabbar"
-  }
+    "tab-bar": "./components/tabbar",
+    "topbar": "../../components/topbar"
+  },
+  "navigationStyle":"custom"
 }

pages/luckDraw/profile.wxml

@@ -1,6 +1,8 @@
 <!--pages/luckDraw/profile.wxml-->
 <!-- 首部信息 -->
 <view class="head flex-column">
+<topbar />
+  <view class="head_profile">个人中心</view> 
   <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: 120rpx;
+  margin-top: 80rpx;
 }
 
 .head_text{
@@ -287,3 +287,12 @@
   margin-top: 20rpx;
 }
 
+.head_profile{
+  width: 114rpx;
+  height: 28rpx;
+  font-size: 28rpx;
+  font-weight: 500;
+  color: #000000;
+  margin-top: 60rpx;
+}
+

pages/signIn/record/record.json

@@ -1,5 +1,5 @@
 {
   "usingComponents": {},
-  "navigationBarBackgroundColor": "#BF2637",
+  "navigationStyle":"custom",
   "navigationBarTextStyle": "white"
 }