add:动态子页面

src/component/bottomTabs/bottomTabs.js

@@ -69,9 +69,78 @@ Component({
 	 * 组件的方法列表
 	 */
 	methods: {
-    handelToPage(e){
-      const {route} =  e.currentTarget.dataset
-      wxService.router(route)
+    handelToPage(event){
+      const ev = event.currentTarget.dataset;
+      let curItemType = ev.item
+      const userInfo = wx.getStorageSync('_baseUserInfo')
+
+      console.log('curItemType', curItemType, curItemType.link.type)
+      // link row
+			if (curItemType.link) {
+        let currentClickType = app.globalData.commonFunc.getLink(curItemType.link.type, curItemType)
+				if (curItemType.link.type == 1) {
+					// 触发父组件更新页面 外部小程序
+					this.setData({
+						isAuthorization: false
+					})
+					return false
+				} else if (!userInfo) {
+					this.setData({
+						isAuthorization: true
+					})
+					return false
+				} else if (userInfo && userInfo.member && !userInfo.member.mobile) {
+					wxService.openCard()
+					return false
+				}
+
+				if (curItemType.link.type == 2) {
+					// 触发父组件更新页面
+					wxService.nextTick(() => {
+						this.triggerEvent('updatePage', { pageId: currentClickType.url })
+					})
+				} else if (curItemType.link.type == 3) {
+					// 预览
+					wx.previewImage({
+						current: `${app.globalData.imageUrl}/${currentClickType.imageUrl}`, // 当前显示图片的http链接
+						urls: [`${app.globalData.imageUrl}/${currentClickType.link.url}`]  // 需要预览的图片http链接列表
+					})
+				} else if (curItemType.link.type == 4) {
+					wxService.router(`/${currentClickType}`)
+				} else if (curItemType.link.type == 5) {
+					if (currentClickType == 1) {
+						wxService.openCard()
+					} else if (currentClickType == 2) {
+						wxService.openCard()
+					}
+				} else if (curItemType.link.type == 6) {
+					wxService.router(`/${currentClickType}`)
+				} else if (curItemType.link.type == 7) {
+					// 集点详情
+					console.log('pointPath',  currentClickType)
+				  wxService.router(`${currentClickType}`)
+				}
+      } else if (curItemType.row) {
+        let rowObj = JSON.parse(curItemType.row)
+				let currentClickRow = app.globalData.commonFunc.getLinkRow(rowObj.type, rowObj)
+				console.log('bacccccccccc', currentClickRow)
+
+				if (rowObj.type == 1) { }
+				else if (rowObj.type == 2) { }
+				else if (rowObj.type == 3) { }
+				else if (rowObj.type == 4) { }
+				else if (rowObj.type == 5) { }
+				else if (rowObj.type == 6) { }
+				else if (rowObj.type == 7) { }
+				else if (rowObj.type == 8) {
+					// 商品
+					wxService.router(`/pages/productDetail/productDetail?productId=${currentClickRow}`)
+				}
+				else if (rowObj.type == 9) { 
+					// 分类
+					wxService.router(`/subPackage/page/pages/categoryPro/categoryPro?${currentClickRow}`)
+				}
+      }
     }
   }
 })

src/component/bottomTabs/bottomTabs.wxml

@@ -11,7 +11,7 @@
 		<block wx:for="{{tabBar.images}}" wx:key="{{index}}" wx:for-item="tab">
 		<view
 		 class="tab"
-		 data-route="{{tab.route}}"
+		 data-item="{{tab}}"
 		 bindtap="handelToPage"
 		>
 			<image class='tab-img' wx:if="{{currentRoute == tab.route}}" src='{{tab.activeImageUrl}}' />
@@ -21,7 +21,7 @@
 </view>
 <view class="bottom-tab fixed-bottom0" style="height: 108rpx;" wx:if="{{tabBar.num == 5}}">
 	<block wx:for="{{tabs}}" wx:key="{{index}}" wx:for-item="tab">
-		<view class="tab" data-route="{{tab.route}}" bindtap="handelToPage">
+		<view class="tab" data-item="{{tab}}" bindtap="handelToPage">
 			<image class='tab-img' wx:if="{{currentRoute == tab.route}}" src='{{tab.activeImageUrl}}' />
 			<image class='tab-img' wx:else src='{{tab.imageUrl}}' />
 		</view>

src/pages/userCenter/userCenter.json

@@ -13,6 +13,6 @@
     "bannerAd": "/component/bannerAd/bannerAd",
     "attention": "/component/attention/attention",
     "guide-page-modal": "/component/guidePageModal/guidePageModal",
-    "bottom-tabs": "./../../component/bottomTabs/bottomTabs"
+    "bottom-tabs": "/component/bottomTabs/bottomTabs"
   }
 }
\ No newline at end of file

src/pages/userCenter/userCenter.wxml

@@ -19,7 +19,7 @@
 		</view>-->
 		<view class="" wx:if="{{ pItem.type  == 9 ?  pItem.type  == 9 : pItem.type == 5}}">
 		<!--	<attention wx:if="{{pItem.type == 9}}" /> wx:else -->
-			<bottom-tabs  tab-bar="{{pItem.tabBar}}" />
+			<bottom-tabs bind:updatePage="updatePage" tab-bar="{{pItem.tabBar}}" />
 		</view>
 		<view class="" wx:if="{{pItem.type == 6}}">
 			<announcement notice="{{pItem.notice}}" />
@@ -34,54 +34,7 @@
 			<attention/>
 		</view>-->
 	</block>
-	<!--	
-<tab-sort/>
-<view class="page-bgc">
-
-		<image-swiper/>
-
-		<announcement/>
-
-		<icon-swiper/>
-
-		<pic-nav/>
-	</view>
-	<view class="person-hot border_box">
-		<text class="person-text">- 人气热卖</text>
-		<span class="hot border_box">HOT -</span>
-	</view>
-
-
-	<hot-item/>
-
-
-	<attention/>
-
-
-	<bannerAd/>-->
-
-	<!--	<block wx:for="{{pages}}" wx:key="{{index}}" wx:for-item="pItem">
-		<view class="pd1530" wx:if="{{pItem.type == 1}}">
-			<image-swiper bind:updatePage="updatePage" image-data="{{pItem.rotationchart.images}}" />
-		</view>
-		<view class="pd1530" wx:if="{{pItem.type == 2}}">
-			<person-center
-			 base-user-info="{{baseUserInfo}}"
-			 person-data="{{pItem.customer}}"
-			 integral-num="{{integralNum}}"
-			 coupon-num="{{couponNum}}"
-			 token="{{token}}"
-			/>
-		</view>
-
-		<view class="pd1520" wx:if="{{pItem.type == 3}}">
-			<pic-nav bind:updatePage="updatePage" pic-nav="{{pItem.navigation.images}}" />
-		</view>
-		<view class="" wx:if="{{pItem.type == 4}}">
-			<bottom bind:updatePage="updatePage" bottom="{{pItem.bottom}}" />
-		</view>
-	</block>-->
 </view>
-<!--<authorization-modal isAuthorization='{{isAuthorization}}' />-->
+<authorization-modal isAuthorization='{{isAuthorization}}' />
 <guide-page-modal show="{{guidePageModalShow}}" />
 

src/project.config.json

@@ -39,7 +39,7 @@
 			"list": []
 		},
 		"miniprogram": {
-			"current": 25,
+			"current": 13,
 			"list": [
 				{
 					"id": -1,
@@ -123,7 +123,8 @@
 					"id": 13,
 					"name": "subPage",
 					"pathName": "subPackage/page/pages/subPage/subPage",
-					"query": "pageId=4"
+					"query": "pageId=14",
+					"scene": null
 				},
 				{
 					"id": 14,

src/subPackage/page/pages/subPage/subPage.json

@@ -5,6 +5,14 @@
     "person-center": "/component/personCenter/personCenter",
     "pic-nav": "/component/picNav/picNav",
     "bottom": "/component/bottom/bottom",
-    "authorization-modal": "/component/authorization-modal/authorization-modal"
+    "authorization-modal": "/component/authorization-modal/authorization-modal",
+    "tab-sort": "/component/tabSort/tabSort",
+    "announcement": "/component/announcement/announcement",
+    "icon-swiper": "/component/iconSwiper/iconSwiper",
+    "hot-item": "/component/hotItem/hotItem",
+    "bannerAd": "/component/bannerAd/bannerAd",
+    "attention": "/component/attention/attention",
+    "guide-page-modal": "/component/guidePageModal/guidePageModal",
+    "bottom-tabs": "/component/bottomTabs/bottomTabs"
   }
 }
\ No newline at end of file

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

 <!--subPackage/page/pages/subPage/subPage.wxml-->
-<view class='user-center'>
-<!-- 1 轮播 2 个人中心 3 图片导航 4 底部-->
+<!--<view class='user-center'>
 <block wx:for="{{pages}}" wx:key="{{index}}" wx:for-item="pItem">
- 
-<!--{{pItem.type}}-->
-  <!-- 轮播 -->
   <view class="pd1530" wx:if="{{pItem.type == 1}}">
     <image-swiper  bind:updatePage="updatePage" image-data="{{pItem.rotationchart.images}}" />
   </view>
 
-    <!-- 个人中心  {{pItem.customer}}-->
+  
   <view class="pd1530" wx:if="{{pItem.type == 2}}">
    <person-center person-data="{{pItem.customer}}" integral-num="{{integralNum}}" coupon-num="{{couponNum}}" token="{{token}}"/>
   </view>
 
-    <!-- 图片导航 {{pItem.navigation.images}} pd1530-->
+
   <view class="pd1520" wx:if="{{pItem.type == 3}}">
     <pic-nav bind:updatePage="updatePage" pic-nav="{{pItem.navigation.images}}" />
   </view>
-    <!-- 底部 -->
+
   <view class="" wx:if="{{pItem.type == 4}}">
     <bottom bind:updatePage="updatePage" bottom="{{pItem.bottom}}"/>
   </view>
   </block>
+</view>-->
+
+
+<view class='user-center' style="background: {{pageBackgroundColor == 1? '#eee': '#fff'}};min-height: {{outoHeigth}}px">
+	<!-- 1 轮播 2 个人中心 3 图片导航 4 底部左划 5 底部 Tab 6 公告 7 分类 8 关注公众号 9 plus(9/5-权重高)-->
+	<block wx:for="{{pages}}" wx:key="{{index}}" wx:for-item="pItem">
+		<view wx:if="{{pItem.type == 1}}">
+			<image-swiper image-data="{{pItem.rotationchart.images}}" />
+		</view>
+		<view class="" wx:if="{{pItem.type == 2}}">
+			<person-center person-data="{{pItem.customer}}" />
+		</view>
+		<view class="" wx:if="{{pItem.type == 3}}">
+			<pic-nav pic-nav="{{pItem.navigation.images}}" />
+		</view>
+		<view class="" wx:if="{{pItem.type == 4}}">
+			<bottom bottom="{{pItem.bottom}}" />
+		</view>
+		<!--<view class="" wx:if="{{pItem.type == 5}}">
+			<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}}" /> wx:else -->
+			<bottom-tabs bind:updatePage="updatePage" 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 category-type="{{pItem.categoryType}}" />
+		</view>
+		<view class="" wx:if="{{pItem.type == 8}}">
+			<attention focus-wx="{{pItem.focusWx}}" />
+		</view>
+	<!--	<view class="" wx:if="{{pItem.type == 9}}">
+			<attention/>
+		</view>-->
+	</block>
 </view>
-<authorization-modal isAuthorization='{{isAuthorization}}'/>
+<authorization-modal isAuthorization='{{isAuthorization}}' />
+<guide-page-modal show="{{guidePageModalShow}}" />