Merge branch 'dev_7.1.0' into fixbug-ZYW

# Conflicts:
#	src/component/plus/plus.js
#	src/utils/Http.js

src/component/bottomTabs/bottomTabs.wxml

@@ -42,7 +42,7 @@
 		</view>
 	</block>
 </view>
-<view class="bottom-tab fixed-bottom0" wx:if="{{tabBar.num == 5}}">
+<view class="bottom-tab bgc fixed-bottom0" wx:if="{{tabBar.num == 5}}">
 	<block wx:for="{{tabBarList}}" wx:key="{{index}}" wx:for-item="tab">
 		<view class="tab" data-item="{{tab}}" bindtap="handelToPage">
 			<!--当前页面需要授权 且未授权-->

src/component/plus/plus.js

@@ -44,7 +44,7 @@ Component({
       wxService.request({
         url: app.globalData.ctx + '/sale/premium/query',
         header: {
-          'tunnel-token' : 'aa8a1bfb7f6c5031d172d94b6574293ef954a6f2d4e16657da008e0cc15588feD'
+          'tunnel-token' : 'aa8a1bfb7f6c5031d172d94b6574293ef954a6f2d4e16657da008e0cc15588feD' // 测试
           // 'tunnel-token' : 'd6db651f8b9c7db4176465accfc1c913843fd9ad328cd5f4fe201d918072c9e8' // 生产
         },
         success: (res) => {

src/component/productListStyleTwo/productListStyleTwo.wxml

@@ -9,7 +9,7 @@
         </view>
         <view class="hot-item-desc border_box">
           <view class="item-name">{{item.productName}}</view>
-          <view class="item-desc">{{item.productStatusDesc}}</view>
+         <!-- <view class="item-desc">{{item.productStatusDesc}}</view>-->
           <view class="item-vip-price weui-flex"> 
             <text class="vip-sale-price border_box">￥{{item.memberPrice ? utils.numberFormat(item.memberPrice / 100) : utils.numberFormat(item.minSalePrice / 100)}}</text>
             <view class="" >

src/component/shareModal/shareModal.wxml

@@ -6,7 +6,7 @@
 <view class="share-modal-list " id="bottom-query" hidden="{{!show}}">
     <view class="share-modal-item" bindtap="onTapForward">转发</view>
     <view class="share-modal-item">添加到我的小程序</view>
-    <view class="share-modal-item">关于聚FUN</view>
+<!--    <view class="share-modal-item">关于聚FUN</view>-->
     <view class="share-modal-item">返回</view>
   </view>
 

src/component/tabSort/tabSort.js

@@ -17,6 +17,10 @@ Component({
 		categoryType: {
 			type: Object,
 			value: null
+		},
+		currHomePageId: {
+			type: String,
+			value: ''
 		}
 	},
 	attached() {

src/component/tabSort/tabSort.wxml

@@ -7,19 +7,19 @@
 		 wx:for-item="navItem"
 		 wx:key="idx"
 		>
-			<view wx:if="{{navItem.needAuth}}" class="scroll-view-item {{currentTab == idx ?'active':''}}" style="width:{{navItemWidth}}%">
-				<view wx:if="{{!currentHasUserInfo}}" class="scroll-view-item {{currentTab == idx ?'active':''}}" style="width: {{navItemWidth}}%;height: 80rpx;display: flex;">
+			<view wx:if="{{navItem.needAuth}}" class="scroll-view-item {{currHomePageId == (navItem.link.type == '2' ? navItem.link.url : '')? 'active' : ''}}" style="width:{{navItemWidth}}%">
+				<view wx:if="{{!currentHasUserInfo}}" class="scroll-view-item {{currHomePageId == (navItem.link.type == '2' ? navItem.link.url : '')? 'active' : ''}}" style="width: {{navItemWidth}}%;height: 80rpx;display: flex;">
 					<button
 					 bindgetuserinfo="_getUserInfo"
 					 data-jflag="false"
 					 open-type='getUserInfo'
-					 class="scroll-view-item {{currentTab == idx ?'active':''}}"
+					 class="scroll-view-item {{currHomePageId == (navItem.link.type == '2' ? navItem.link.url : '')? 'active' : ''}}"
 					 hover-class="btn-hover"
 					>
 					{{navItem.title}}
 					</button>
 				</view>
-				<view wx:else class="scroll-view-item {{currentTab == idx ?'active':''}}" style="width:{{navItemWidth}}%">
+				<view wx:else class="scroll-view-item {{currHomePageId == (navItem.link.type == '2' ? navItem.link.url : '')? 'active' : ''}}" style="width:{{navItemWidth}}%">
 					<view
 					 data-current="{{idx}}"
 					 data-redirectId="{{navItem.redirectId}}"
@@ -30,7 +30,7 @@
 				</view>
 			</view>
 
-			<view wx:else class="scroll-view-item {{currentTab == idx ?'active':''}}" style="width:{{navItemWidth}}%">
+			<view wx:else class="scroll-view-item {{currHomePageId == (navItem.link.type == '2' ? navItem.link.url : '')? 'active' : ''}}" style="width:{{navItemWidth}}%">
 				<view
 				 data-current="{{idx}}"
 				 data-redirectId="{{navItem.redirectId}}"

src/config/index.js

@@ -4,9 +4,9 @@ const needMock = '' //
 // appid_dev_wx   wxc3b64b09b1d3dfc2
 // appid_test_wx  wx857ea77f4f7f4f34 wxac09792264c49b5c
 // appid_pre_711  wx358b56af62edbde1
-// appid_prod_711  wx700028bf32a3be66 wx313ec36b710125d4---3001 ---  tunnel-token
+// appid_prod_711  wx700028bf32a3be66 wx313ec36b710125d4---3001 ---
 
-// 1 2 3 步!!!!!!!!!!!!!!!!!!!!!!  prod appid brandId
+// 1 2 3 4步!!!!!!!!!!!!!!!!!!!!!!  prod appid brandId tunnel-token
 
 // const devCtx = 'http://111.231.86.64'
 const devCtx = 'http://buyer.devapi.bigaka.net' // 开发环境 1

src/pages/cart/cart.js

@@ -81,11 +81,11 @@ wxService.page({
         if (result == 0) {
           wx.hideLoading()
           // item.checked
-          data.skuVOList.forEach(item=>{
+          data && data.skuVOList.forEach(item=>{
             item.checked = false
           })
           this.setData({
-            cartList: data.skuVOList
+            cartList: data && data.skuVOList || []
           })
         }
       }

src/pages/myShare/myShare.wxss

@@ -64,7 +64,8 @@ scroll-view{
   color: #ffffff;
   position: fixed;
   right: 22rpx;
-  bottom: 35rpx;
+  bottom: 357rpx;
+  /* bottom: 35rpx; */
   z-index: 99;
 
 }

src/pages/userCenter/userCenter.wxml

@@ -21,7 +21,7 @@
 			<announcement notice="{{pItem.notice}}"/>
 		</view>
 		<view class="" wx:if="{{pItem.type == 7}}">
-			<tab-sort category-type="{{pItem.categoryType}}" bind:getAuth="_getUserInfo" currentHasUserInfo="{{currentHasUserInfo}}" bind:updatePage="updatePage"/>
+			<tab-sort currHomePageId="{{currHomePageId}}" category-type="{{pItem.categoryType}}" bind:getAuth="_getUserInfo" currentHasUserInfo="{{currentHasUserInfo}}" bind:updatePage="updatePage"/>
 		</view>
 		<view class="" wx:if="{{pItem.type == 8}}">
 			<attention focus-wx="{{pItem.focusWx}}" />

src/subPackage/page/pages/fun/fun.json

 {
-  "navigationBarTitleText": "聚FUN",
+  "navigationBarTitleText": "商品列表",
   "enablePullDownRefresh": true,
   "usingComponents": {
     "tab-sort": "/component/tabSort/tabSort",

src/subPackage/page/pages/myRelease/myRelease.wxss

@@ -48,7 +48,8 @@
   color: #ffffff;
   position: fixed;
   right: 22rpx;
-  bottom: 35rpx;
+  bottom: 357rpx;
+  /* bottom: 35rpx; */
   z-index: 99;
 }
 

src/subPackage/page/pages/subPage/subPage.wxml

@@ -21,7 +21,7 @@
 			<announcement notice="{{pItem.notice}}"/>
 		</view>
 		<view class="" wx:if="{{pItem.type == 7}}">
-			<tab-sort category-type="{{pItem.categoryType}}" bind:getAuth="_getUserInfo" currentHasUserInfo="{{currentHasUserInfo}}" bind:updatePage="updatePage"/>
+			<tab-sort currHomePageId="{{currHomePageId}}" category-type="{{pItem.categoryType}}" bind:getAuth="_getUserInfo" currentHasUserInfo="{{currentHasUserInfo}}" bind:updatePage="updatePage"/>
 		</view>
 		<view class="" wx:if="{{pItem.type == 8}}">
 			<attention focus-wx="{{pItem.focusWx}}" />

src/utils/Http.js

@@ -99,7 +99,7 @@ class Http {
         url,
         method: 'GET',
         header: {
-          'tunnel-token': 'aa8a1bfb7f6c5031d172d94b6574293ef954a6f2d4e16657da008e0cc15588feD',
+          'tunnel-token': 'aa8a1bfb7f6c5031d172d94b6574293ef954a6f2d4e16657da008e0cc15588feD', // 测试
           // 'tunnel-token' : 'd6db651f8b9c7db4176465accfc1c913843fd9ad328cd5f4fe201d918072c9e8', // 生产
           'tentacle-content': this.getTentacle(),
           // 'tentacle-content': '{"id":"621346354647797760","tentacleType":3,"tentacleId":"611969009872691200","contentType":1}'
@@ -131,7 +131,7 @@ class Http {
         url,
         method: 'POST',
         header: {
-          'tunnel-token': 'aa8a1bfb7f6c5031d172d94b6574293ef954a6f2d4e16657da008e0cc15588feD',
+          'tunnel-token': 'aa8a1bfb7f6c5031d172d94b6574293ef954a6f2d4e16657da008e0cc15588feD', // 测试
           // 'tunnel-token' : 'd6db651f8b9c7db4176465accfc1c913843fd9ad328cd5f4fe201d918072c9e8', // 生产
           'tentacle-content': this.getTentacle()
           // 'tentacle-content': '{"id":"621346354647797760","tentacleType":3,"tentacleId":"611969009872691200","contentType":1}'

src/utils/wxService.js

@@ -397,11 +397,10 @@ class WXService extends Http {
           // 对应的path
           let currentPaths = [];
           localPath.forEach(item => {
-            console.log('---------', item, data)
             if (item.hasOwnProperty(data)) {
               currentPaths = item[data]
             } else {
-              console.log(222);
+             
             }
           })
           return Promise.resolve({ currentPaths })