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

src/component/attention/attention.js

@@ -9,21 +9,30 @@ Component({
 	 * 组件的属性列表
 	 */
 	properties: {
-	
+		focusWx: {
+			type: Object,
+			value: null
+		}
   },
   attached () {
-	
+		this.setData({
+      baseImgUrl: app.globalData.imageUrl
+    })
 	},
 	/**
 	 * 组件的初始数据
 	 */
 	data: {
-	
+		baseImgUrl: ''
 	},
 	/**
 	 * 组件的方法列表
 	 */
 	methods: {
-	
+		handelTo(e) {
+			const ev = e.currentTarget.dataset;
+			let redirectId = ev.redirectId
+			console.log('redirectid', redirectId)
+		}
   }
 })

src/component/attention/attention.wxml

 <!--component/attention/attention.wxml-->
-<view class="attention">
+<view class="attention" style="background-image:url({{baseImgUrl}}{{focusWx.imageUrl}})" data-redirectId="{{focusWx.redirectId}}" bindtap="handelTo">
   <view class="attention-left">
     <view class="left-title">关注舞象公众号</view>
     <view class="left-tips">福利不错过!</view>

src/component/attention/attention.wxss

@@ -21,6 +21,9 @@
 	padding: 0 60rpx;
 	box-sizing: border-box;
 	color: #fff;
+	background-repeat: no-repeat;
+  background-position: center;
+  background-size: 100% 100%;
 }
 .left-title {
 	color: rgba(255, 255, 255, 1);

src/pages/userCenter/userCenter.wxml

@@ -25,7 +25,7 @@
 			<tab-sort categorys="{{pItem.categoryType.categorys}}"/>
 		</view>
 		<view class="" wx:if="{{pItem.type == 8}}">
-			<attention focusWx="{{pItem.focusWx}}"/>
+			<attention focus-wx="{{pItem.focusWx}}"/>
 		</view>
 		<view class="" wx:if="{{pItem.type == 9}}">
 			<attention/>