Merge branch 'dev_7.1.0' into fixbug-ZYW

# Conflicts:
#	src/pages/myShare/myShare.js

src/component/tabSort/tabSort.wxml

@@ -20,13 +20,13 @@
 		</block>
 	</scroll-view>
 	<!-- showQrcode  2 购物车 1 会员码 0 隐藏 -->
-	<view class="scroll-view-right" bindtap="handelToVipCode" wx:if="{{categoryType.showQrcode == 1}}">
+	<view class="scroll-view-right" wx:if="{{categoryType.showQrcode == 1}}">
 		<button
 		 wx:if="{{!currentHasUserInfo}}"
 		 bindgetuserinfo="_getUserInfo"
 		 data-jflag="false"
 		 open-type='getUserInfo'
-		 class='btn btn-primary df'
+		 class='btn btn-primary btn-vip-code'
 		 hover-class="btn-hover"
 		 style="height:100%"
 		>
@@ -35,23 +35,38 @@
 			 src="/assets/imgs/7_1_0/scancode.png"
 			 mode="widthFix"
 			 lazy-load="false"
-			 binderror=""
-			 bindload=""
 			/>
+			<view
+			 class="active vip-text"
+			 selectable="false"
+			 space="false"
+			 decode="false"
+			>会员码
+			</view>
 		</button>
-		<image
+		<button
 		 wx:if="{{currentHasUserInfo}}"
+		 class='btn btn-primary btn-vip-code'
+		 hover-class="btn-hover"
+		 style="height:100%"
+		 bindtap="handelToVipCode"
+		>
+			<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
+			 class="active vip-text"
+			 selectable="false"
+			 space="false"
+			 decode="false"
+			>会员码
 			</view>
-	<view class="scroll-view-right" bindtap="handelToCart" wx:if="{{categoryType.showQrcode == 2}}">
+		</button>
+	</view>
+	<view class="scroll-view-right" wx:if="{{categoryType.showQrcode == 2}}">
 		<button
 		 wx:if="{{!currentHasUserInfo}}"
 		 bindgetuserinfo="_getUserInfo"
@@ -60,16 +75,28 @@
 		 class='btn btn-primary df'
 		 hover-class="btn-hover"
 		 style="height:100%"
-		/>
+		>
 			<image
+			 class="right-img"
+			 src="/assets/imgs/7_1_0/08_22/cart_point.png"
+			 mode="widthFix"
+			 lazy-load="false"
+			/>
+		</button>
+		<button
 		 wx:if="{{currentHasUserInfo}}"
+		 class='btn btn-primary df'
+		 hover-class="btn-hover"
+		 style="height:100%"
+		 bindtap="handelToCart"
+		>
+			<image
 			 class="right-img"
 			 src="/assets/imgs/7_1_0/08_22/cart_point.png"
 			 mode="widthFix"
 			 lazy-load="false"
-		 binderror=""
-		 bindload=""
 			/>
+		</button>
 	</view>
 </view>
 

src/component/tabSort/tabSort.wxss

@@ -24,7 +24,7 @@
 	box-shadow: -15px 0px 15px -15px rgb(168, 165, 165);
 }
 .active {
-  color: #C09A74;
+	color: #c09a74;
 }
 .right-img {
 	width: 30rpx;
@@ -36,3 +36,7 @@
 	padding-left: 8rpx;
 	box-sizing: border-box;
 }
+.btn-vip-code {
+	display: flex;
+	align-items: center;
+}

src/pages/myShare/myShare.js

@@ -61,8 +61,7 @@ wxService.page({
    */
   onShow() {
     let time = Date.parse(new Date())
-    member.premiumExpireTime ? member.premiumExpireTime : ''
-    if (member.premiumExpireTime && member.premiumExpireTime > time) {
+    if (member && member.premiumExpireTime && member.premiumExpireTime > time) {
       this.setData({
         plus: 1
       })