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

src/component/tabSort/tabSort.js

@@ -9,9 +9,9 @@ Component({
 	 * 组件的属性列表
 	 */
 	properties: {
-		categorys:{
-      type: Array,
-      value: []
+		categoryType:{
+      type: Object,
+      value: null
     }
 	},
 	attached() {
@@ -21,7 +21,8 @@ Component({
 	 * 组件的初始数据
 	 */
 	data: {
-		currentTab: 0
+		// currentTab: 0,
+		currentTab: 99,
 	},
 	/**
 	 * 组件的方法列表
@@ -30,6 +31,9 @@ Component({
 		handelToVipCode() {
       wxService.router(`/pages/memberOfOwn/memberOfOwn`)
 		},
+		handelToCart() {
+			wxService.router(`/pages/cart/cart`)
+		},
 		// 设置tab active
 		switchNav(event) {
 			const ev = event.currentTarget.dataset;

src/component/tabSort/tabSort.wxml

 <!--component/tabSort/tabSort.wxml-->
-<view class="tab-sort" wx:if="{{categorys}}">
+<view class="tab-sort" wx:if="{{categoryType.categorys}}">
 	<scroll-view scroll-x class="scroll-view_H" scroll-with-animation="{{true}}">
 		<block
-		 wx:for="{{categorys}}"
+		 wx:for="{{categoryType.categorys}}"
 		 wx:for-index="idx"
 		 wx:for-item="navItem"
 		 wx:key="idx"
@@ -11,34 +11,35 @@
 			 class="scroll-view-item {{currentTab == idx ?'active':''}}"
 			 style="width:{{navItemWidth}}%"
 			 data-current="{{idx}}"
-			 data-redirectId ="{{navItem.redirectId}}"
+			 data-redirectId="{{navItem.redirectId}}"
 			 bindtap="switchNav"
 			>
 				<view>{{navItem.title}}</view>
 			</view>
 		</block>
 	</scroll-view>
-	<view class="scroll-view-right" bindtap="handelToVipCode">
-    <image class="right-img" src="./../../assets/imgs/7_1_0/scancode.png" mode="widthFix" lazy-load="false" binderror="" bindload="" />
+	<!-- showQrcode  2 购物车 1 会员码 0 隐藏 -->
+	<view class="scroll-view-right" bindtap="handelToVipCode" wx:if="{{categoryType.showQrcode == 1}}">
+		<image
+		 class="right-img"
+		 src="/assets/imgs/7_1_0/scancode.png"
+		 mode="widthFix"
+		 lazy-load="false"
+		 binderror=""
+		 bindload=""
+		/>
 		<text class="active vip-text" selectable="false" space="false" decode="false">会员码</text>
 	</view>
+	<view class="scroll-view-right" bindtap="handelToCart" wx:if="{{categoryType.showQrcode == 2}}">
+		<image
+		 class="right-img"
+		 src="/assets/imgs/7_1_0/08_22/cart_point.png"
+		 mode="widthFix"
+		 lazy-load="false"
+		 binderror=""
+		 bindload=""
+		/>
+	</view>
 </view>
-<!-- 页面内容 -->
-<!--<view>
-	<swiper
-	 current="{{currentTab}}"
-	 duration="300"
-	 bindchange="switchTab"
-	>
-		<swiper-item
-		 wx:for="{{categorys}}"
-		 wx:for-item="navItem"
-		 wx:for-index="idx"
-		 wx:key="idx"
-		 class="tab-content-clock"
-		>
-			<view>{{navItem.label}}</view>
-		</swiper-item>
-	</swiper>
-</view>-->
+
 

src/pages/userCenter/userCenter.wxml

@@ -18,14 +18,14 @@
 			<bottom-tabs tab-bar="{{pItem.tabBar}}" />
 		</view>-->
 		<view class="" wx:if="{{ pItem.type  == 9 ?  pItem.type  == 9 : pItem.type == 5}}">
-			<attention wx:if="{{pItem.type == 9}}" />
-			<bottom-tabs wx:else tab-bar="{{pItem.tabBar}}" />
+		<!--	<attention wx:if="{{pItem.type == 9}}" /> wx:else -->
+			<bottom-tabs  tab-bar="{{pItem.tabBar}}" />
 		</view>
 		<view class="" wx:if="{{pItem.type == 6}}">
 			<announcement notice="{{pItem.notice}}" />
 		</view>
 		<view class="" wx:if="{{pItem.type == 7}}">
-			<tab-sort categorys="{{pItem.categoryType.categorys}}" />
+			<tab-sort category-type="{{pItem.categoryType}}" />
 		</view>
 		<view class="" wx:if="{{pItem.type == 8}}">
 			<attention focus-wx="{{pItem.focusWx}}" />