xiebaomin 1 year ago
parent
commit
d6ff4f91e5

+ 12 - 12
pages.json

@@ -603,37 +603,37 @@
 					}
 				},
 				{
-					"path": "club/notice-article",
+					"path": "club/notice-coupon",
 					"style": {
-						"navigationBarTitleText": "最新文章",
+						"navigationBarTitleText": "优惠促销",
 						"enablePullDownRefresh": true
 					}
 				},
 				{
-					"path": "club/notice-activity",
+					"path": "shop/notice-users",
 					"style": {
-						"navigationBarTitleText": "最新活动",
+						"navigationBarTitleText": "账户通知",
 						"enablePullDownRefresh": true
 					}
 				},
 				{
-					"path": "club/notice-coupon",
+					"path": "shop/notice-serve",
 					"style": {
-						"navigationBarTitleText": "优惠促销",
+						"navigationBarTitleText": "服务通知",
 						"enablePullDownRefresh": true
 					}
-				},
-				{
-					"path": "shop/notice-users",
+				},				
+                {
+					"path": "club/notice-article",
 					"style": {
-						"navigationBarTitleText": "账户通知",
+						"navigationBarTitleText": "最新文章",
 						"enablePullDownRefresh": true
 					}
 				},
 				{
-					"path": "shop/notice-serve",
+					"path": "club/notice-activity",
 					"style": {
-						"navigationBarTitleText": "服务通知",
+						"navigationBarTitleText": "最新活动",
 						"enablePullDownRefresh": true
 					}
 				}

+ 5 - 3
pages/h5/article/path.vue

@@ -48,9 +48,11 @@
                     URL_CONFIG = 'https://www.caimei365.com/'
                 }
                 this.activityPath = `${URL_CONFIG}/document/pdfdetails.html?type=1&src=${link}`
-            },
-            
-		},
+            }
+		},
+        onShareAppMessage(options) {
+            console.log(options)
+        }
 	}
 </script>
 	

+ 2 - 2
pages/notice/club/components/notice-cell.vue

@@ -82,7 +82,7 @@
             		<view class="cell-image">
             			<img :src="cell.mainImage" alt="">
             		</view>
-            		<view class="tui-cell-content">
+            		<view class="cell-content">
             			{{ cell.articleContent }}
             		</view> 
             	</view> 
@@ -99,7 +99,7 @@
                 	<view class="cell-image">
                 		<img :src="cell.mainImage" alt="">
                 	</view>
-                    <view class="tui-cell-content"> 
+                    <view class="cell-content"> 
                         {{ cell.activityContent }}
                     </view> 
                 </view> 

+ 16 - 4
pages/notice/club/notice-article.vue

@@ -63,7 +63,19 @@ export default {
 				pageNum: 1,
 				pageSize: 10
 			},
-			list: [],
+			list: [
+                {
+                    id: 1,
+                    time: '16546464',
+                    articleContent: 'abnwahdowadjhwadojw',
+                    link: 'https://www.caimei365.com/info/detail-7880-1.html'
+                },
+                {
+                    id: 1,
+                    time: '16546464',
+                    articleContent: 'abnwahdowadjhwadojw'
+                }
+            ],
 			isEmpty: false,
 			loadding: false,
 			pullUpOn: true,
@@ -76,15 +88,15 @@ export default {
 		this.initData(option)
 	},
 	methods: {
-		async initData(option) {
+		async initData(option) {
+            console.log(123324234)
 			const userInfo = await this.$api.getStorage()
 			this.listQuery.messageType = option.messageType
 			this.listQuery.commonId = userInfo.clubId ? userInfo.clubId : 0
 			this.getUserAuthClubMessageList()
 		},
 		handleOrderClick(cell) {
-            console.log(cell)
-			this.$api.navigateTo()
+            this.$api.navigateTo(`/pages/h5/article/path?link=${cell.link}`)
 		},
 	},
 	onReachBottom() {

+ 5 - 3
pages/tabBar/notice/index.vue

@@ -68,7 +68,7 @@
                 	<view class="notice-cell-text"> 最新文章 <text class="cell-text">官方</text> </view>
                 	<view class="notice-cell-badge" v-if="promotionCount > 0">
                 		<text class="uni-badge uni-badge-error uni-small uni-badge--small icon-num">
-                			{{ promotionCount | BadgeType }}
+                			{{ articleCount | BadgeType }}
                 		</text>
                 	</view>
                 </view>
@@ -79,7 +79,7 @@
                 	<view class="notice-cell-text"> 最新活动 <text class="cell-text">官方</text> </view>
                 	<view class="notice-cell-badge" v-if="promotionCount > 0">
                 		<text class="uni-badge uni-badge-error uni-small uni-badge--small icon-num">
-                			{{ promotionCount | BadgeType }}
+                			{{ activityCount | BadgeType }}
                 		</text>
                 	</view>
                 </view>
@@ -101,7 +101,9 @@ export default {
 			tradeCount: 0,
 			accountCount: 0,
 			notificationCount: 0,
-			promotionCount: 0
+			promotionCount: 0,
+            articleCount: 0,
+            activityCount: 0
 		}
 	},
 	onLoad() {},