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

src/component/attention/attention.js

@@ -29,14 +29,6 @@ Component({
 	 * 组件的方法列表
 	 */
 	methods: {
-		// 组件加载成功时触发
-		handelLoad(e) {
-			console.log('成功', e)
-		},
-		// 组件加载失败时触发
-		handelErr(e) {
-			console.log('失败', e)
-		},
 		handelTo(e) {
 			const ev = e.currentTarget.dataset;
 			let redirectId = ev.redirectId

src/component/attention/attention.wxml

@@ -7,6 +7,6 @@
   <view class="attention-right">关注</view>
 </view>-->
 <view class="attention" style="background-image:url({{baseImgUrl}}{{focusWx.imageUrl}})" data-redirectId="{{focusWx.redirectId}}" bindtap="handelTo">
-  <official-account style="width:100%;height:168rpx;" bindload="handelLoad" binderror="handelErr">
+  <official-account style="width:100%;height:168rpx;">
   </official-account>
 </view>
\ No newline at end of file

src/component/plus/plus.wxss

@@ -10,7 +10,7 @@
   position: fixed;
   bottom: 88rpx;
   padding: 36rpx 0 36rpx 30rpx;
-  background-color: #C09A74;
+  background-color: rgba(192, 154, 116, 0.2);
 }
 
 .scroll-view_H {

src/component/tabSort/tabSort.js

@@ -25,6 +25,22 @@ Component({
 		currentTab: 99,
 		isAuthorization: false, // false 不显示 true 显示
 	},
+  /*组件所在页面的生命周期 */
+  pageLifetimes: {
+    show: function () {
+      // 页面被展示
+      this.setData({
+        currentTab: 99
+      })
+    },
+    hide: function () {
+      // 页面被隐藏
+      this.setData({
+        currentTab: 99
+      })
+    },
+   
+  },
 	/**
 	 * 组件的方法列表
 	 */

src/pages/extendProduct/extendProduct.json

@@ -3,6 +3,7 @@
   "navigationBarTitleText": "推广商品",
   "usingComponents": {
     "card-modal": "/component/cardModal/cardModal",
+    "share-modal": "/component/shareModal/shareModal",
     "go-home": "/component/goHome/goHome"
   }
 }
\ No newline at end of file