Merge branch 'dev_7.1.0' into feature-zyw-sc

src/component/attention/attention.js

+// component/attention/attention.js
+var app = getApp()
+const wxService = require('../../utils/wxService')
+const utils = require('../../utils/util')
+const envInfo = require('../../config/index').envInfo
+
+Component({
+	/**
+	 * 组件的属性列表
+	 */
+	properties: {
+	
+  },
+  attached () {
+	
+	},
+	/**
+	 * 组件的初始数据
+	 */
+	data: {
+	
+	},
+	/**
+	 * 组件的方法列表
+	 */
+	methods: {
+	
+  }
+})

src/component/attention/attention.json

+{
+  "component": true,
+  "usingComponents": {}
+}
\ No newline at end of file

src/component/attention/attention.wxml

+<!--component/attention/attention.wxml-->
+<view class="attention">
+  <view class="attention-left">
+    <view class="left-title">关注舞象公众号</view>
+    <view class="left-tips">福利不错过!</view>
+  </view>
+  <view class="attention-right">关注</view>
+</view>

src/component/attention/attention.wxss

+/* component/attention/attention.wxss */
+/* .banner-ad {
+	margin: 0 auto;
+	width: 710rpx;
+	height: 155rpx;
+	border-radius: 10rpx;
+	background-color: rgba(246, 243, 242, 1);
+	box-shadow: 0px 0px 10rpx 0px rgba(0, 0, 0, 0.05);
+} */
+.attention {
+	margin: 0 auto;
+	width: 710rpx;
+	height: 133rpx;
+	border-radius: 16rpx;
+	background-color: rgba(192, 154, 116, 1);
+	margin-top: 50rpx;
+	margin-bottom: 100rpx;
+	display: flex;
+	align-items: center;
+	justify-content: space-between;
+	padding: 0 60rpx;
+	box-sizing: border-box;
+	color: #fff;
+}
+.left-title {
+	color: rgba(255, 255, 255, 1);
+	font-size: 25rpx;
+	font-family: PingFangSC-Semibold;
+}
+.left-tips {
+	color: rgba(255, 255, 255, 1);
+	font-size: 30rpx;
+	font-family: PingFangSC-Semibold;
+}
+.attention-right {
+	width: 130rpx;
+	height: 70rpx;
+	line-height: 70rpx;
+	border-radius: 35rpx;
+	background-color: rgba(203, 60, 60, 1);
+	text-align: center;
+}
\ No newline at end of file

src/pages/userCenter/userCenter.json

@@ -10,6 +10,7 @@
     "announcement": "/component/announcement/announcement",
     "icon-swiper": "/component/iconSwiper/iconSwiper",
     "hot-item": "/component/hotItem/hotItem",
-    "bannerAd": "/component/bannerAd/bannerAd"
+    "bannerAd": "/component/bannerAd/bannerAd",
+    "attention": "/component/attention/attention"
   }
 }
\ No newline at end of file

src/pages/userCenter/userCenter.wxml

@@ -20,6 +20,10 @@
 
 	<!-- 商品活动 人气hot -->
 	<hot-item/>
+
+	<!-- 关注 -->
+	<attention/>
+
 	<!-- 图片广告 -->
 	<bannerAd/>
 

src/pages/userCenter/userCenter.wxss

@@ -2,7 +2,7 @@
 @import './../../base/base.wxss';
 .user-center{
   box-sizing: border-box;
-  padding-bottom: 160rpx;
+  padding-bottom: 200rpx;
   height: 100%;
 }