Merge branch 'master' into xbx

2020-08-04 10:42:38 +08:00
parent 35e0c39d1d 1e9f442b7b
commit 20b1c0da43
19 changed files with 269 additions and 152 deletions
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -2,7 +2,6 @@
 	<view>
 		<view class="status_bar"></view>
 		<view class="index">
-			<navigator url="/pageB/photo/index?id=28">bbb</navigator>
 			<view class="top">
 				<view class="sosuo"></view>
 				<view class="tabs">
@@ -83,7 +82,6 @@
 								</view>
 							</view>
 						</view>
-
 					</scroll-view>
 				</swiper-item>
 			</swiper>
--- a/pages/mine/index.vue
+++ b/pages/mine/index.vue
@@ -28,7 +28,7 @@
 					<view>店铺收藏</view>
 				</view>
 				<view @click="toOtherPage('/mine/ImageTextCollection')">
-					<view>9</view>
+					<view>{{ userInfo.member_fav_article_num || 0 }}</view>
 					<view>图文收藏</view>
 				</view>
 				<view @click="toOtherPage('/mine/Integral')">