修改导航

src/app.json

@@ -122,10 +122,6 @@
     "contactPlugin": {
       "version": "1.0.12",
       "provider": "wx104a1a20c3f81ec2"
-    },
-    "live-player-plugin": {
-      "version": "1.0.0",
-      "provider": "wx2b03c6e691cd7370"
     }
   },
   "permission": {

src/component/floatNav/floatNav.js

@@ -128,7 +128,8 @@ Component({
       }
     },
     //点击menu
-    bindNav(event ) {
+    bindNav(event) {
+      console.log(event)
       utilLink.currentLinkRouter(event, this)
     },
     //弹出nav动画

src/config/index.js

@@ -6,7 +6,7 @@
 // 修改 BRANCH_ID 为对应的商户id
 // app.js 中brandId 修改为对应
 
-const PROJECT_ENV = 'test' // 生产 prod, 开发 dev, 测试 test , 测试门户 test_store, 预生产 pre
+const PROJECT_ENV = 'prod' // 生产 prod, 开发 dev, 测试 test , 测试门户 test_store, 预生产 pre
 //仅生产环境时 配置 ： 
 //3001 3001 ,  wx313ec36b710125d4
 //2006 泰华 , wx40fec8944623c8b3
@@ -21,7 +21,7 @@ const PROJECT_ENV = 'test' // 生产 prod, 开发 dev, 测试 test , 测试门
 //2015 花在花园
 //2016 阿吉豆
 //2017 ACTREE wx2aae34874e88cdf5
-const BRANCH_ID = 1002
+const BRANCH_ID = 2006
 const isMall = true
 
 // const needMock = '' //

src/pages/IntegralMall/IntegralMall.wxml

@@ -42,6 +42,6 @@
 	<!--<no-more wx:if="{{noMore}}"/>-->
 	<!--goHome-->
 	<go-home/>
-  <floatNav bind:getAuth="_getUserInfo"/>
+  <floatNav bind:getAuth="_getUserInfo" bind:updatePage="updatePage"/>
 </view>
 

src/pages/addAddress/addAddress.wxml

@@ -75,6 +75,6 @@
 	</view>
 	<!--goHome-->
 	<go-home/>
-  <floatNav bind:getAuth="_getUserInfo"/>
+  <floatNav bind:getAuth="_getUserInfo" bind:updatePage="updatePage"/>
 </view>
 

src/pages/cart/cart.wxml

@@ -56,7 +56,7 @@
 	</view>
 	<!--goHome-->
 	<go-home/>
-  <floatNav bind:getAuth="_getUserInfo"/>
+  <floatNav bind:getAuth="_getUserInfo" bind:updatePage="updatePage"/>
 </view>
 
 <go-guid/>
\ No newline at end of file

src/pages/category/category.wxml

@@ -66,5 +66,5 @@
 <go-home/>
 
 <!-- 导航 -->
-<floatNav bind:getAuth="_getUserInfo"/>
+<floatNav bind:getAuth="_getUserInfo" bind:updatePage="updatePage"/>
 <go-guid />
\ No newline at end of file

src/pages/confirmOrder/confirmOrder.wxml

@@ -249,6 +249,6 @@
 </view>
 <!--goHome-->
 <go-home/>
-<floatNav bind:getAuth="_getUserInfo"/>
+<floatNav bind:getAuth="_getUserInfo" bind:updatePage="updatePage"/>
 <select-coupon show="{{showSelectCoupon}}" bind:updateCoupon="updateCoupon" coupon-list="{{currentOrderList.couponDiscountPreviews}}"/>
 

src/pages/consumptionDetails/consumptionDetails.wxml

@@ -53,5 +53,5 @@
 </view>
 <!--goHome-->
 <go-home/>
-<floatNav bind:getAuth="_getUserInfo"/>
+<floatNav bind:getAuth="_getUserInfo" bind:updatePage="updatePage"/>
 <go-guid />

src/pages/couponCodeDetail/couponCodeDetail.wxml

@@ -18,7 +18,7 @@
 	</view>
 	<!--goHome-->
 	<go-home/>
-  <floatNav bind:getAuth="_getUserInfo"/>
+  <floatNav bind:getAuth="_getUserInfo" bind:updatePage="updatePage"/>
 </view>
 
 <go-guid />

src/pages/couponDetail/couponDetail.wxml

@@ -28,7 +28,7 @@
 </view>
 <!--goHome-->
 <go-home/>
-<floatNav bind:getAuth="_getUserInfo"/>
+<floatNav bind:getAuth="_getUserInfo" bind:updatePage="updatePage"/>
 <view class="position-bottom">
 	<button type='primary' class="redeem-now" bindtap='handelPresentCouponCode'>出示券码</button>
 </view>

src/pages/coupons/coupons.wxml

@@ -90,6 +90,6 @@
 </view>
 <!--goHome-->
 <go-home/>
-<floatNav bind:getAuth="_getUserInfo"/>
+<floatNav bind:getAuth="_getUserInfo" bind:updatePage="updatePage"/>
 <go-guid />
 

src/pages/deliveryService/deliveryService.wxml

@@ -3,6 +3,6 @@
 	<pic-nav-serve pic-nav="{{pItem.navigation.images}}" />
 	<!--goHome-->
 	<go-home/>
-  <floatNav bind:getAuth="_getUserInfo"/>
+  <floatNav bind:getAuth="_getUserInfo" bind:updatePage="updatePage"/>
 </block>
 

src/pages/extendProduct/extendProduct.wxml

@@ -201,5 +201,5 @@ pagePath="{{pagePath}}"
 code-img="{{codeImg}}"></share-poster>
 <!--goHome-->
 <go-home/>
-<floatNav bind:getAuth="_getUserInfo"/>
+<floatNav bind:getAuth="_getUserInfo" bind:updatePage="updatePage"/>
 <go-guid/>
\ No newline at end of file

src/pages/integralMallDetail/integralMallDetail.wxml

@@ -31,5 +31,5 @@
 <exchange-coupon-modal exchangeId="{{integralMallDetail.id}}" exchangePoint="{{integralMallDetail.point}}" isExchange='{{isExchange}}' />
 <!--goHome-->
 <go-home/>
-<floatNav bind:getAuth="_getUserInfo"/>
+<floatNav bind:getAuth="_getUserInfo" bind:updatePage="updatePage"/>
 <go-guid />

src/pages/logistics/logistics.wxml

@@ -66,5 +66,5 @@
 
 <!--goHome-->
 <go-home/>
-<floatNav bind:getAuth="_getUserInfo"/>
+<floatNav bind:getAuth="_getUserInfo" bind:updatePage="updatePage"/>
 <go-guid/>
\ No newline at end of file

src/pages/memberRules/memberRules.wxml

@@ -3,6 +3,6 @@
 	<image class='rule-img' src='{{ruleImg}}' mode="widthFix" />
 	<!--goHome-->
 	<go-home/>
-  <floatNav bind:getAuth="_getUserInfo"/>
+  <floatNav bind:getAuth="_getUserInfo" bind:updatePage="updatePage"/>
 </view>
 <go-guid />

src/pages/myAddress/myAddress.wxml

@@ -55,7 +55,7 @@
 </view>
 <!--goHome-->
 <go-home/>
-<floatNav bind:getAuth="_getUserInfo"/>
+<floatNav bind:getAuth="_getUserInfo" bind:updatePage="updatePage"/>
 <share-poster
  id="getPoster"
  bindmyevent="myEventListener"

src/pages/myShare/myShare.wxml

@@ -57,4 +57,4 @@
 
 <!--goHome-->
 <go-home/>
-<floatNav bind:getAuth="_getUserInfo"/>
+<floatNav bind:getAuth="_getUserInfo" bind:updatePage="updatePage"/>

src/pages/mySpend/mySpend.wxml

@@ -24,4 +24,4 @@
 <!--goHome-->
 <go-home/>
 <go-guid />
-<floatNav bind:getAuth="_getUserInfo"/>
+<floatNav bind:getAuth="_getUserInfo" bind:updatePage="updatePage"/>

src/pages/order/order.wxml

@@ -185,5 +185,5 @@
 <apply-refund show="{{showApplyRefundModal}}" refundId="{{refundId}}" bind:ok="onDeliveryOk" />
 <!--goHome-->
 <go-home/>
-<floatNav bind:getAuth="_getUserInfo"/>
+<floatNav bind:getAuth="_getUserInfo" bind:updatePage="updatePage"/>
 <go-guid/>
\ No newline at end of file

src/pages/orderDetail/orderDetail.wxml

@@ -166,5 +166,5 @@
 </view>
 <!--goHome-->
 <go-home/>
-<floatNav bind:getAuth="_getUserInfo"/>
+<floatNav bind:getAuth="_getUserInfo" bind:updatePage="updatePage"/>
 <go-guid/>
\ No newline at end of file

src/pages/refund/refund.wxml

@@ -88,6 +88,6 @@
 
 <!--goHome-->
 <go-home/>
-<floatNav bind:getAuth="_getUserInfo"/>
+<floatNav bind:getAuth="_getUserInfo" bind:updatePage="updatePage"/>
 <go-guid/>
 

src/pages/refundDetail/refundDetail.wxml

@@ -126,5 +126,5 @@
 
 <!--goHome-->
 <go-home/>
-<floatNav bind:getAuth="_getUserInfo"/>
+<floatNav bind:getAuth="_getUserInfo" bind:updatePage="updatePage"/>
 <go-guid/>

src/pages/userCenter/userCenter.js

@@ -147,12 +147,6 @@ wxService.page({
    * */
   updatePage(ev) {
     const { pageId } = ev.detail
-    // this.setData({
-    //   pages: [],
-    //   pageId
-    // },()=>{
-    //   this.initPage(pageId)
-    // })
     wxService.router(`/subPackage/page/pages/subPage/subPage`).search({ pageId })
   },
   /**

src/pages/wantToBuyDetail/wantToBuyDetail.wxml

@@ -90,5 +90,5 @@
 
 <!--goHome-->
 <go-home/>
-<floatNav bind:getAuth="_getUserInfo"/>
+<floatNav bind:getAuth="_getUserInfo" bind:updatePage="updatePage"/>
 <go-guid/>
\ No newline at end of file

src/project.config.json

@@ -13,7 +13,7 @@
 	},
 	"compileType": "miniprogram",
 	"libVersion": "2.8.2",
-	"appid": "wxac09792264c49b5c",
+	"appid": "wx40fec8944623c8b3",
 	"projectname": "%E5%BE%AE%E5%95%86%E5%9F%8E",
 	"debugOptions": {
 		"hidedInDevtools": []

src/subPackage/page/pages/IntegralMallGoods/IntegralMallGoods.wxml

@@ -119,7 +119,7 @@
 	<!--<no-more wx:if="{{noMore}}"/>-->
 	<!--goHome-->
 	<go-home/>
-  <floatNav bind:getAuth="_getUserInfo"/>
+  <floatNav bind:getAuth="_getUserInfo" bind:updatePage="updatePage"/>
 </view>
 <!-- 库存没了 -->
 <dialog-stock-empty show="{{dialogStockEmpty}}"/>

src/subPackage/page/pages/IntegrateGoodsExchangeInfo/IntegrateGoodsExchangeInfo.wxml

@@ -25,7 +25,7 @@
 </view>
 <!--goHome-->
 <go-home/>
-<floatNav bind:getAuth="_getUserInfo"/>
+<floatNav bind:getAuth="_getUserInfo" bind:updatePage="updatePage"/>
 <dialog-user-limit show="{{dialogUserLimit}}"/>
 <dialog-stock-empty show="{{dialogStockEmpty}}" bind:btnClick="onDialogBtnCallBack"/>
 

src/subPackage/page/pages/categoryPro/categoryPro.wxml

@@ -21,7 +21,7 @@
 	</view>
 	<!--goHome-->
 	<go-home/>
-  <floatNav bind:getAuth="_getUserInfo"/>
+  <floatNav bind:getAuth="_getUserInfo" bind:updatePage="updatePage"/>
 </view>
 
 <go-guid/>
\ No newline at end of file

src/subPackage/page/pages/couponCenter/couponCenter.wxml

@@ -47,7 +47,7 @@
 
 <go-guid />
 <go-home/>
-<floatNav bind:getAuth="_getUserInfo"/>
+<floatNav bind:getAuth="_getUserInfo" bind:updatePage="updatePage"/>
 
 
 

src/subPackage/page/pages/friendShareList/friendShareList.wxml

@@ -50,5 +50,5 @@
 
 <!--goHome-->
 <go-home/>
-<floatNav bind:getAuth="_getUserInfo"/>
+<floatNav bind:getAuth="_getUserInfo" bind:updatePage="updatePage"/>
 <go-guid/>
\ No newline at end of file

src/subPackage/page/pages/fun/fun.wxml

@@ -11,6 +11,6 @@
 	</view>
 	<!--goHome-->
 	<go-home/>
-  <floatNav bind:getAuth="_getUserInfo"/>
+  <floatNav bind:getAuth="_getUserInfo" bind:updatePage="updatePage"/>
 </view>
 

src/subPackage/page/pages/grassCommunity/grassCommunity.wxml

@@ -53,7 +53,7 @@
 </form>
 	<!--goHome-->
 <go-home />
-<floatNav bind:getAuth="_getUserInfo"/>
+<floatNav bind:getAuth="_getUserInfo" bind:updatePage="updatePage"/>
 <select-tab showSelectTabModal="{{showSelectTabModal}}" bind:_selectTab="_selectTab" />
 <select-related-goods show="{{showSelectRelatedGoods}}" bind:_selectGoods="_selectGoods" pro-goods="{{proGoods}}"/>
 

src/subPackage/page/pages/liveVideo/liveVideo.js

@@ -38,7 +38,6 @@ wxService.page({
 })
 
 // 直播开通需要 配置plugin ： 
-  // ,
 // "live-player-plugin": {
 //   "version": "1.0.0",
 //     "provider": "wx2b03c6e691cd7370"

src/subPackage/page/pages/myInvite/myInvite.wxml

@@ -16,7 +16,7 @@
       <image src="{{isGoToInvite ?  inviteBanner : speadProductsBanner}}"  mode="widthFix"></image>
     </view>
   <go-home/>
-  <floatNav bind:getAuth="_getUserInfo"/>
+  <floatNav bind:getAuth="_getUserInfo" bind:updatePage="updatePage"/>
 </view>
 
 <go-guid/>

src/subPackage/page/pages/myInviteRecords/myInviteRecords.wxml

@@ -26,4 +26,4 @@
   </view>
   <!--goHome-->
 	<go-home/>
-  <floatNav bind:getAuth="_getUserInfo"/>
+  <floatNav bind:getAuth="_getUserInfo" bind:updatePage="updatePage"/>

src/subPackage/page/pages/myRelease/myRelease.wxml

@@ -36,7 +36,7 @@
 </view>
 <!--goHome-->
 <go-home/>
-<floatNav bind:getAuth="_getUserInfo"/>
+<floatNav bind:getAuth="_getUserInfo" bind:updatePage="updatePage"/>
 <water-flow-layout
  type="2"
  image-data="{{contentList}}"

src/subPackage/page/pages/myReleaseDetail/myReleaseDetail.wxml

@@ -72,7 +72,7 @@
 </view> -->
 <!--goHome-->
 <go-home/>
-<floatNav bind:getAuth="_getUserInfo"/>
+<floatNav bind:getAuth="_getUserInfo" bind:updatePage="updatePage"/>
 <x-dialog show="{{showDialig}}" bind:_closeDialog="closeDialog" />
 <card-modal
  show-card-modal="{{showCardModal}}"

src/subPackage/page/pages/orderBenefit/orderBenefit.wxml

@@ -24,6 +24,6 @@
   </view>
   	<!--goHome-->
 	<go-home />
-  <floatNav bind:getAuth="_getUserInfo"/>
+  <floatNav bind:getAuth="_getUserInfo" bind:updatePage="updatePage"/>
 </view>
 <go-guid/>

src/subPackage/page/pages/paymentStatus/paymentStatus.wxml

@@ -42,6 +42,6 @@
 	</view>
 	<!--goHome-->
 	<go-home/>
-  <floatNav bind:getAuth="_getUserInfo"/>
+  <floatNav bind:getAuth="_getUserInfo" bind:updatePage="updatePage"/>
 </view>
 

src/subPackage/page/pages/plus/plus.wxml

@@ -2,5 +2,5 @@
 <plus sku-list="{{skuVOList}}"/>
 	<!--goHome-->
 	<go-home />
-  <floatNav bind:getAuth="_getUserInfo"/>
+  <floatNav bind:getAuth="_getUserInfo" bind:updatePage="updatePage"/>
 <go-guid/>
\ No newline at end of file

src/subPackage/page/pages/share/share.wxml

@@ -68,5 +68,5 @@
  
 <!--goHome-->
 <go-home />
-<floatNav bind:getAuth="_getUserInfo"/>
+<floatNav bind:getAuth="_getUserInfo" bind:updatePage="updatePage"/>
 <go-guid/>
\ No newline at end of file

src/utils/currentLinkRouter.js

@@ -10,6 +10,7 @@ function currentLinkRouter(event, _this) {
     //处理返回值是空对象时 导致跳转失败
     if (Object.keys(curItemType.link).length > 0){
       let currentClickType = app.globalData.commonFunc.getLink(curItemType.link.type, curItemType)
+      console.log(currentClickType)
       if (curItemType.link.type == 1) {
         // 触发父组件更新页面 外部小程序
       } else if (curItemType.link.type == 2) {

src/utils/wxService.js

@@ -723,6 +723,13 @@ class WXService extends Http {
         }
         config.onLoad && config.onLoad.apply(page, args);
       },
+      /** 
+      * 监听子组件事件
+      * */
+      updatePage(ev) {
+        const { pageId } = ev.detail
+        wxService.router(`/subPackage/page/pages/subPage/subPage`).search({ pageId })
+      },
       onShow: function (...args) {
         const isExperiencer = wx.getStorageSync('isExperiencer')
         const page = this