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

src/component/attention/attention.js

@@ -13,11 +13,11 @@ Component({
 			type: Object,
 			value: null
 		}
-  },
-  attached () {
+	},
+	attached() {
 		this.setData({
-      baseImgUrl: app.globalData.imageUrl
-    })
+			baseImgUrl: app.globalData.imageUrl
+		})
 	},
 	/**
 	 * 组件的初始数据
@@ -29,10 +29,18 @@ Component({
 	 * 组件的方法列表
 	 */
 	methods: {
+		// 组件加载成功时触发
+		handelLoad(e) {
+			console.log('成功', e)
+		},
+		// 组件加载失败时触发
+		handelErr(e) {
+			console.log('失败', e)
+		},
 		handelTo(e) {
 			const ev = e.currentTarget.dataset;
 			let redirectId = ev.redirectId
 			console.log('redirectid', redirectId)
 		}
-  }
+	}
 })

src/component/attention/attention.wxml

 <!--component/attention/attention.wxml-->
-<view class="attention" style="background-image:url({{baseImgUrl}}{{focusWx.imageUrl}})" data-redirectId="{{focusWx.redirectId}}" bindtap="handelTo">
+<!--<view class="attention" style="background-image:url({{baseImgUrl}}{{focusWx.imageUrl}})" data-redirectId="{{focusWx.redirectId}}" bindtap="handelTo">
   <view class="attention-left">
     <view class="left-title">关注舞象公众号</view>
     <view class="left-tips">福利不错过!</view>
   </view>
   <view class="attention-right">关注</view>
-</view>
+</view>-->
+<view class="attention" style="background-image:url({{baseImgUrl}}{{focusWx.imageUrl}})" data-redirectId="{{focusWx.redirectId}}" bindtap="handelTo">
+  <official-account style="width:100%;height:168rpx;" bindload="handelLoad" binderror="handelErr">
+  </official-account>
+</view>
\ No newline at end of file

src/component/attention/attention.wxss

 /* component/attention/attention.wxss */
-/* .banner-ad {
-	margin: 0 auto;
-	width: 710rpx;
-	height: 155rpx;
-	border-radius: 10rpx;
-	background-color: rgba(246, 243, 242, 1);
-	box-shadow: 0px 0px 10rpx 0px rgba(0, 0, 0, 0.05);
-} */
 .attention {
 	margin: 0 auto;
 	width: 710rpx;
@@ -18,7 +10,6 @@
 	display: flex;
 	align-items: center;
 	justify-content: space-between;
-	padding: 0 60rpx;
 	box-sizing: border-box;
 	color: #fff;
 	background-repeat: no-repeat;

src/component/bottomTabs/bottomTabs.js

@@ -9,7 +9,10 @@ Component({
 	 * 组件的属性列表
 	 */
 	properties: {
-	
+    tabBar:{
+      type: Object,
+      value: null
+    }
   },
   attached () {
 	

src/component/bottomTabs/bottomTabs.wxml

 <!--component/bottomTabs/bottomTabs.wxml-->
-<view class='bgc fixed-bottom0' style="background-image:url('/assets/imgs/7_1_0/bg.png')" wx:if="{{type == 1}}">
+<view class='bgc fixed-bottom0' style="background-color:#FFF;background-image:url({{tabBar.num == 4 ? '': '/assets/imgs/7_1_0/bg.png'}});{{tabBar.num == 4 ? 'height: 108rpx':'height: 144rpx'}}" wx:if="{{tabBar.num == 4}}">
+	<!--
+		activeImageUrl: "http://testimg3.bigaka.com/group3/M00/00/1C/Cv6CBF1mT1OAERvZAAAE9OdIB14989.png"
+		desc: ""
+		imageUrl: "http://testimg3.bigaka.com/group3/M00/00/1C/Cv6CBF1mTzmAL7sKAAADJzlh7Tk417.png"
+		number: 0
+		redirectId: ""
+		type: 0
+	-->
+		<block wx:for="{{tabBar.images}}" wx:key="{{index}}" wx:for-item="tab">
+		<view
+		 class="tab"
+		 data-route="{{tab.route}}"
+		 bindtap="handelToPage"
+		>
+			<image class='tab-img' wx:if="{{currentRoute == tab.route}}" src='{{tab.activeImageUrl}}' />
+			<image class='tab-img' wx:else src='{{tab.imageUrl}}' />
+		</view>
+	</block>
+</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">
+			<image class='tab-img' wx:if="{{currentRoute == tab.route}}" src='{{tab.activeImageUrl}}' />
+			<image class='tab-img' wx:else src='{{tab.imageUrl}}' />
+		</view>
+	</block>
+
+
+
+<!--	<block wx:for="{{tabs}}" wx:key="{{index}}" wx:for-item="tab">
 		<view
 		 class="tab"
 		 data-route="{{tab.route}}"
@@ -17,5 +46,5 @@
 			<image class='tab-img' wx:if="{{currentRoute == tab.route}}" src='{{tab.active}}' />
 			<image class='tab-img' wx:else src='{{tab.inactive}}' />
 		</view>
-	</block>
+	</block>-->
 </view>

src/component/bottomTabs/bottomTabs.wxss

 /* component/bottomTabs/bottomTabs.wxss */
 @import './../../base/base.wxss';
 .bottom-tab {
-  display: flex;
-  align-items: center;
-  justify-content: center;
+	display: flex;
+	align-items: center;
+	justify-content: center;
 }
 .tab-img {
-  width: 50rpx;
-  height: 50rpx;
+	width: 50rpx;
+	height: 50rpx;
 }
 .tab {
-  flex: 1;
-  text-align: center;
+	flex: 1;
+	text-align: center;
 }
 
 .bgc {
-  height: 144rpx;
-  background-size: 100% 100%;
-  background-repeat: no-repeat;
-  display: flex;
-  align-items: center;
-  justify-content: center;
+	background-size: 100% 100%;
+	background-repeat: no-repeat;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	background-color: rgba(255, 255, 255, 1);
+	box-shadow: 0px -4px 10px 0px rgba(232, 232, 232, 0.95);
 }
 .pdt {
-  padding-top: 50rpx;
-}
+	padding-top: 50rpx;
+}
\ No newline at end of file

src/component/tabSort/tabSort.js

@@ -3,7 +3,6 @@ var app = getApp()
 const wxService = require('../../utils/wxService')
 const utils = require('../../utils/util')
 const envInfo = require('../../config/index').envInfo
-var order = ['red', 'yellow', 'blue', 'green', 'red']
 
 Component({
 	/**
@@ -28,6 +27,9 @@ Component({
 	 * 组件的方法列表
 	 */
 	methods: {
+		handelToVipCode() {
+      wxService.router(`/pages/memberOfOwn/memberOfOwn`)
+		},
 		// 设置tab active
 		switchNav(event) {
 			const ev = event.currentTarget.dataset;

src/component/tabSort/tabSort.wxml

@@ -18,7 +18,7 @@
 			</view>
 		</block>
 	</scroll-view>
-	<view class="scroll-view-right">
+	<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="" />
     <text class="active vip-text" selectable="false" space="false" decode="false">会员码</text>
   </view>

src/pages/userCenter/userCenter.js

@@ -86,9 +86,9 @@ wxService.page({
         isAuthorization: false
       },()=>{
         // 积分数量
-        this.getMemberPointInfo()
+        // this.getMemberPointInfo()
         // 优惠券数量
-        this.getMemberCouponInfo()
+        // this.getMemberCouponInfo()
       })
     } 
     else if(!baseUserInfo && reLoginErrFlag){
@@ -154,6 +154,9 @@ wxService.page({
         wx.setNavigationBarTitle({
           title: data.page.title
         })
+        // tabBar
+        const currentTabBar = data.paragraphs.filter(item=> item.type == 5)
+        console.log('---', currentTabBar)
         // 段落
         const products = data.paragraphs
         const filterResult = products.map((res,index)=>{

src/pages/userCenter/userCenter.wxml

@@ -2,38 +2,39 @@
 <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">
-	{{pItem.type}} 
 		<view wx:if="{{pItem.type == 1}}">
-			<image-swiper image-data="{{pItem.rotationchart.images}}"/>
+			<image-swiper image-data="{{pItem.rotationchart.images}}" />
 		</view>
 		<view class="" wx:if="{{pItem.type == 2}}">
-			<person-center person-data="{{pItem.customer}}"/>
+			<person-center person-data="{{pItem.customer}}" />
 		</view>
 		<view class="" wx:if="{{pItem.type == 3}}">
-			<pic-nav pic-nav="{{pItem.navigation.images}}"/>
+			<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 tabBar="{{pItem.tabBar}}"/>
+		<!--<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}}" />
+			<bottom-tabs wx:else tab-bar="{{pItem.tabBar}}" />
 		</view>
 		<view class="" wx:if="{{pItem.type == 6}}">
-			<announcement notice="{{pItem.notice}}"/>
+			<announcement notice="{{pItem.notice}}" />
 		</view>
 		<view class="" wx:if="{{pItem.type == 7}}">
-			<tab-sort categorys="{{pItem.categoryType.categorys}}"/>
+			<tab-sort categorys="{{pItem.categoryType.categorys}}" />
 		</view>
 		<view class="" wx:if="{{pItem.type == 8}}">
-			<attention focus-wx="{{pItem.focusWx}}"/>
+			<attention focus-wx="{{pItem.focusWx}}" />
 		</view>
-		<view class="" wx:if="{{pItem.type == 9}}">
+	<!--	<view class="" wx:if="{{pItem.type == 9}}">
 			<attention/>
-		</view>
+		</view>-->
 	</block>
-
 	<!--	
-
 <tab-sort/>
 <view class="page-bgc">
 
@@ -84,4 +85,3 @@
 <!--<authorization-modal isAuthorization='{{isAuthorization}}' />-->
 <guide-page-modal show="{{guidePageModalShow}}" />
 
-

src/project.config.json

@@ -12,7 +12,7 @@
 		"autoAudits": false
 	},
 	"compileType": "miniprogram",
-	"libVersion": "2.6.6",
+	"libVersion": "2.8.1",
 	"appid": "wxc3b64b09b1d3dfc2",
 	"projectname": "%E5%BE%AE%E5%95%86%E5%9F%8E",
 	"debugOptions": {