commit -m 通知消息

App.vue

@@ -1,4 +1,5 @@
 <script>
+	
 	import appMixins from '@/mixins/appMixins.js'
 	export default {
 		mixins: [appMixins],

common/config/wxLogin.js

@@ -17,7 +17,6 @@ const wxLoginAuthorize = async function(){
         .then(response =>{
             store.commit('updateStatus',response.data)
             store.commit('login',response.data)
-            store.commit('updateNotice', response.data.savedCount)
             uni.setStorageSync('token',response.data.token)
             uni.setStorageSync('unionId',response.data.unionId)
         })
@@ -25,7 +24,6 @@ const wxLoginAuthorize = async function(){
             uni.setStorageSync('unionId',error.data.unionId)
             store.commit('logout',error.data)
             store.commit('updateStatus',error.data)
-            store.commit('updateNotice', error.data)
         })
 }
 const wxLoginQuick = async function(){// 根据微信的code获取用户登录状态:1已登录过 -1未登录过跳转
@@ -40,7 +38,6 @@ const wxLoginQuick = async function(){// 根据微信的code获取用户登录
             console.log(response)
             store.commit('updateStatus',response.data)
             store.commit('login',response.data)
-            store.commit('updateNotice', response.data.savedCount)
             uni.setStorageSync('token',response.data.token)
             uni.setStorageSync('unionId',response.data.unionId)
             if(response.data.userIdentity ==1){
@@ -55,7 +52,6 @@ const wxLoginQuick = async function(){// 根据微信的code获取用户登录
             uni.setStorageSync('unionId',error.data.unionId)
             store.commit('logout',error.data)
             store.commit('updateStatus',error.data)
-            store.commit('updateNotice', error.data)
         })
 }
 export default{

components/cm-module/orderDetails/orderInformation.vue

@@ -178,7 +178,6 @@ export default {
 		},
 		initData(res) {
 			this.orderData = res
-			console.log('this.orderData', this.orderData)
 		},
 		clipboard(data) {
 			thorui.getClipboardData(data, res => {

components/cm-module/supplier/notice.vue

@@ -17,24 +17,24 @@
 				</view>
 			</view>
 			<view class="container-notice">
-				<view class="notice-cell" @click="navigator('/pages/notice/shop/notice-users')">
+				<view class="notice-cell" @click="navigator('/pages/notice/shop/notice-users?messageType=2')">
 					<view class="notice-cell-icon">
 						<image class="icon-image" :src="StaticUrl + 'icon/icon-notice-users@2x.png'" mode=""></image>
 					</view>
 					<view class="notice-cell-text"> 账户通知 <text class="cell-text">官方</text> </view>
-					<view class="notice-cell-badge" v-if="accountCount>0">
-						<text class="uni-badge uni-badge-error uni-small uni-badge--small icon-num"> 
+					<view class="notice-cell-badge" v-if="accountCount > 0">
+						<text class="uni-badge uni-badge-error uni-small uni-badge--small icon-num">
 							{{ accountCount | BadgeType }}
 						</text>
 					</view>
 				</view>
-				<view class="notice-cell" @click="navigator('/pages/notice/shop/notice-serve')">
+				<view class="notice-cell" @click="navigator('/pages/notice/shop/notice-serve?messageType=3')">
 					<view class="notice-cell-icon">
 						<image class="icon-image" :src="StaticUrl + 'icon/icon-notice-serve@2x.png'" mode=""></image>
 					</view>
 					<view class="notice-cell-text"> 服务通知 <text class="cell-text">官方</text> </view>
-					<view class="notice-cell-badge" v-if="notificationCount>0">
-						<text class="uni-badge uni-badge-error uni-small uni-badge--small icon-num"> 
+					<view class="notice-cell-badge" v-if="notificationCount > 0">
+						<text class="uni-badge uni-badge-error uni-small uni-badge--small icon-num">
 							{{ notificationCount | BadgeType }}
 						</text>
 					</view>
@@ -51,15 +51,17 @@ export default {
 			CustomBar: this.CustomBar,
 			StatusBar: this.StatusBar,
 			StaticUrl: this.$Static,
-			skeletonShow:true,
-			shopId:0,
-			accountCount:0,
-			notificationCount:0
+			skeletonShow: true,
+			shopId: 0,
+			accountCount: 0,
+			notificationCount: 0
 		}
 	},
-	filters:{
+	filters: {
 		BadgeType(value) {
-			if(value){return value > 99 ? '99+' : value}
+			if (value) {
+				return value > 99 ? '99+' : value
+			}
 		}
 	},
 	created() {
@@ -76,14 +78,19 @@ export default {
 		},
 		clearNews() {
 			uni.vibrateShort({
-				success: function () {
-					console.log('success');
+				success: function() {
+					console.log('success')
 				}
-			});
-			this.$util.msg('已将所有消息标记为已读', 2000)
+			})
+			this.UserService.authUpdateShopMessageAsRead({ messageType: '' })
+				.then(response => {
+					this.$util.msg('已将所有消息标记为已读', 2000)
+				})
+				.catch(error => {
+					console.log('标记通知消息已读', error.msg)
+				})
 		},
 		getUserAuthShopMessageCount() {
-			console.log('获取消息通知数据')
 			//供应商详情
 			this.ShopService.getUserAuthShopMessageCount({ commonId: this.shopId })
 				.then(response => {
@@ -98,15 +105,13 @@ export default {
 		},
 		navigator(url) {
 			this.$api.navigateTo(url)
-		},
+		}
 	},
 	onPullDownRefresh() {
 		//下拉刷新
 		uni.stopPullDownRefresh()
 	},
-	onShow() {
-
-	}
+	onShow() {}
 }
 </script>
 

mixins/appMixins.js

@@ -3,7 +3,7 @@ import { mapState,mapMutations} from 'vuex'
 import authorize from '@/common/config/authorize.js'
 const appMixins = {
     computed: {
-        ...mapState(['hasLogin'])
+        ...mapState(['hasLogin','updateNoticeNum'])
     },
     methods: {
         ...mapMutations(['login','logout','isWxAuthorize']),
@@ -17,7 +17,6 @@ const appMixins = {
             })
                 .then(response =>{
                     this.$store.commit('updateStatus',response.data)
-                    this.$store.commit('updateNotice', response.data.savedCount)
                     this.login(response.data)
                     uni.setStorageSync('token',response.data.token)
                     uni.setStorageSync('unionId',response.data.unionId)
@@ -25,7 +24,6 @@ const appMixins = {
                 .catch(error =>{
                     this.logout(error.data)
                     this.$store.commit('updateStatus',error.data)
-                    this.$store.commit('updateNotice', error.data)
                     uni.setStorageSync('unionId',error.data.unionId)
                     if(!this.hasLogin){
                         if(uni.getStorageSync('isActivitySwitch')){

pages.json

@@ -513,37 +513,43 @@
 				{
 					"path": "club/notice-order",
 					"style": {
-						"navigationBarTitleText": "交易物流"
+						"navigationBarTitleText": "交易物流",
+						"enablePullDownRefresh": true
 					}
 				},
 				{
 					"path": "club/notice-users",
 					"style": {
-						"navigationBarTitleText": "账户通知"
+						"navigationBarTitleText": "账户通知",
+						"enablePullDownRefresh": true
 					}
 				},
 				{
 					"path": "club/notice-serve",
 					"style": {
-						"navigationBarTitleText": "服务通知"
+						"navigationBarTitleText": "服务通知",
+						"enablePullDownRefresh": true
 					}
 				},
 				{
 					"path": "club/notice-coupon",
 					"style": {
-						"navigationBarTitleText": "优惠促销"
+						"navigationBarTitleText": "优惠促销",
+						"enablePullDownRefresh": true
 					}
 				},
 				{
 					"path": "shop/notice-users",
 					"style": {
-						"navigationBarTitleText": "账户通知"
+						"navigationBarTitleText": "账户通知",
+						"enablePullDownRefresh": true
 					}
 				},
 				{
 					"path": "shop/notice-serve",
 					"style": {
-						"navigationBarTitleText": "服务通知"
+						"navigationBarTitleText": "服务通知",
+						"enablePullDownRefresh": true
 					}
 				}
 			]

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

@@ -5,20 +5,20 @@
 		<template v-if="cellType === 1">
 			<view class="tui-notice-cell">
 				<view class="tui-cell-top">
-					<view class="cell-title"> {{ cell.type | noticeOrderFilters }} </view>
+					<view class="cell-title"> {{ cell.orderMessageType | noticeOrderFilters }} </view>
 					<view class="cell-time"> {{ cell.time }} </view>
 				</view>
 				<view class="tui-cell-content"> 
 					<view class="cell-image">
-						<img :src="cell.image" alt="">
+						<img :src="cell.mainImage" alt="">
 					</view>
 					<view class="cell-content">
 						{{ noticeOrderText(cell)}}
 					</view>
 				</view> 
 				<view class="tui-cell-bot"> 
-					<view class="tui-cell-btn" v-if="cell.type===1">立即支付</view>
-					<view class="tui-cell-btn" v-else-if="cell.type===5">查看物流</view>
+					<view class="tui-cell-btn" v-if="cell.orderMessageType===1">立即支付</view>
+					<view class="tui-cell-btn" v-else-if="cell.orderMessageType===5">查看物流</view>
 					<view class="tui-cell-btn" v-else>查看订单</view>
 				</view>
 			</view>
@@ -27,7 +27,7 @@
 		<template v-if="cellType === 2">
 			<view class="tui-notice-cell clearfix">
 				<view class="tui-cell-top">
-					<view class="cell-title"> {{ cell.type | noticeUsersFilters }} </view>
+					<view class="cell-title"> {{ cell.accountType | noticeUsersFilters }} </view>
 					<view class="cell-time"> {{ cell.time }} </view>
 				</view>
 				<view class="tui-cell-content"> 
@@ -39,7 +39,7 @@
 		<template v-if="cellType === 3">
 			<view class="tui-notice-cell clearfix">
 				<view class="tui-cell-top">
-					<view class="cell-title"> {{ cell.type | noticeUsersFilters }} </view>
+					<view class="cell-title"> {{ cell.messageType | noticeUsersFilters }} </view>
 					<view class="cell-time"> {{ cell.time }} </view>
 				</view>
 				<view class="tui-cell-content"> 
@@ -51,7 +51,7 @@
 		<template v-if="cellType === 4">
 			<view class="tui-notice-cell clearfix">
 				<view class="tui-cell-top">
-					<view class="cell-title"> {{ cell.type | noticeCouponFilters }} </view>
+					<view class="cell-title"> {{ cell.couponMessageType | noticeCouponFilters }} </view>
 					<view class="cell-time"> {{ cell.time }} </view>
 				</view>
 				<view class="tui-cell-content"> 

pages/notice/club/mixins/notice.mixins.js

@@ -4,7 +4,8 @@ const noticeMixins = {
 
     },
     filters: {
-        noticeOrderFilters(value) { // 交易物流状态显示
+        noticeOrderFilters(value) { 
+            // 交易物流状态显示 1.下单成功通知  2.订单支付完成 3.退款/货成功通知 4.订单取消通知 5.订单发货通知 6.自动收货通知
             const map = {
                 1: '下单成功通知',
                 2: '订单支付完成',
@@ -15,7 +16,8 @@ const noticeMixins = {
             }
             return map[value]
         },
-        noticeUsersFilters(value) { // 账户通知状态
+        noticeUsersFilters(value) { 
+            // 账户通知状态 1.注册成功通知 2.购买超级会员成功 3.超级会员到期提醒 4.超级会员到期提醒 5.升级资质机构成功 6.升级资质机构失败 7.成为机构运营人员通知
             const map = {
                 1: '注册成功通知',
                 2: '购买超级会员成功',
@@ -27,58 +29,132 @@ const noticeMixins = {
             }
             return map[value]
         },
-        noticeCouponFilters(value) { // 账户通知状态
+        noticeCouponFilters(value) { 
+            // 优惠券通知状态  1.优惠券待领取通知 2.优惠券过期通知
             const map = {
                 1: '优惠券待领取通知',
-                2: '优惠券待领取通知',
-                3: '优惠券过期通知'
+                2: '优惠券过期通知',
+                3: '优惠券待领取通知'
             }
             return map[value]
         }
     },
     methods: {
+        getUserAuthClubMessageList() {
+            this.UserService.getUserAuthClubMessageList(this.listQuery)
+                .then(response => {
+                    let data = response.data
+                    this.hasNextPage = response.data.hasNextPage
+                    if (data.list && data.list.length > 0) {
+                        this.isEmpty = false
+                        this.list = [...data.list]
+                        this.pullFlag = false
+                        setTimeout(() => {
+                            this.pullFlag = true
+                        }, 500)
+                        if (this.hasNextPage) {
+                            this.pullUpOn = false
+                            this.nomoreText = '上拉显示更多'
+                        } else {
+                            if (this.list.length < 5) {
+                                this.pullUpOn = true
+                                this.loadding = false
+                            } else {
+                                this.pullUpOn = false
+                                this.loadding = false
+                                this.nomoreText = '到底了~'
+                            }
+                        }
+                    } else {
+                        this.isEmpty = true
+                    }
+                    this.skeletonShow = false
+                })
+                .catch(error => {
+                    this.$util.msg(error.msg, 2000)
+                })
+        },
+        getReachBottomData() {
+            //上拉加载
+            this.listQuery.pageNum += 1
+            this.UserService.getUserAuthClubMessageList(this.listQuery)
+                .then(response => {
+                    let data = response.data
+                    if (data.list && data.list.length > 0) {
+                        this.hasNextPage = data.hasNextPage
+                        this.list = this.list.concat(data.list)
+                        this.pullFlag = false // 防上拉暴滑
+                        setTimeout(() => {
+                            this.pullFlag = true
+                        }, 500)
+                        if (this.hasNextPage) {
+                            this.pullUpOn = false
+                            this.nomoreText = '上拉显示更多'
+                        } else {
+                            this.pullUpOn = false
+                            this.loadding = false
+                            this.nomoreText = '到底了~'
+                        }
+                    }
+                })
+                .catch(error => {
+                    this.$util.msg(error.msg, 2000)
+                })
+        },
+        deleteBtn(id,index) {
+            // 删除通知消息
+            this.UserService.authDeleteMessage({ id: id })
+                .then(response => {
+                    let _this = this
+                    uni.vibrateShort({
+                        success: function() {
+                            _this.listQuery.pageNum = 1
+                            _this.getUserAuthClubMessageList()
+                            // _this.list.splice(index, 1) 
+                        }
+                    })
+                })
+                .catch(error => {
+                    console.log('error=>', error.msg)
+                })
+        },
         noticeOrderText(cell) { // 交易物流通知文案
-            const cancelMap = {
-                0: '您的订单已成功取消！',
-                1: '您的订单因超时未确认，系统已自动取消订单！',
-                2: '您的订单因超时未付款，系统已自动取消订单！'
-            }
             const map = {
                 1: '您已成功下单！',
                 2: '您的订单已支付完成，将立即安排发货！',
-                3: `您的订单已全部退款/货成功！退款金额￥${cell.returnAmount}，到账时间可能存在延迟，具体以支付方通知为准。`,
-                4: cancelMap[cell.cancelType],
+                3: `您的订单已${cell.refundType === 1 ? '部分退' : '全部退'}款/货成功！退款金额￥${cell.content}，到账时间可能存在延迟，具体以支付方通知为准。`,
+                4: `${cell.content}`,
                 5: '您的订单已发货，请您留意物流变化！',
                 6: '您的订单因超时已被系统自动确认收货！'
             }
-            return map[cell.type]
+            return map[cell.orderMessageType]
         },
         noticeUsersText(cell) { // 账户通知文案
             const map = {
                 1: '欢迎成为采美机构用户，祝您开启愉快的采购之旅。',
-                2: `您已成功购买${cell.vipTime}采美平台超级会员服务，在服务期内每月可领多张大额优惠券，还有更多超级会员专属权益等您体验，快去看看吧 >>>`,
-                3: `您的超级会员服务将于${cell.endTime}到期，到期后将无法享受专属会员权益，赶快去续费吧 >>>`,
-                4: `您已获得采美平台赠送的${cell.vipTime}超级会员，在服务期内每月可领多张大额优惠券，还有更多超级会员专属权益等您体验，快去看看吧 >>>`,
+                2: `您已成功购买${cell.content}采美平台超级会员服务，在服务期内每月可领多张大额优惠券，还有更多超级会员专属权益等您体验，快去看看吧 >>>`,
+                3: `您的超级会员服务将于${cell.content}到期，到期后将无法享受专属会员权益，赶快去续费吧 >>>`,
+                4: `您已获得采美平台赠送的${cell.content}超级会员，在服务期内每月可领多张大额优惠券，还有更多超级会员专属权益等您体验，快去看看吧 >>>`,
                 5: '恭喜您成功升级为资质机构用户！现在可以查看更多商品的信息啦，采美平台也将为您提供更多专业服务。',
                 6: '您的账号升级资质机构失败！赶快去修改资料重新提交吧 >>>',
-                7: `恭喜您（微信昵称：${cell.wechatName}）成功成为机构运营人员，祝您开启愉快的采购之旅。`
+                7: `恭喜您（微信昵称：${cell.content}）成功成为机构运营人员，祝您开启愉快的采购之旅。`
             }
-            return map[cell.type]
+            return map[cell.accountType]
         },
         noticeCouponText(cell) { // 优惠促销通知文案
             const copunMap = {
-                0: `采美平台送您${cell.couponAmount}元优惠券，众多大牌正品等着您，赶快去领取下单吧 >>>`,
-                1: `采美平台${cell.categoryType == 1 ? '产品' : '仪器'}类商品大优惠，特送您${cell.couponAmount}元优惠券，赶快去领取下单吧 >>>`,
-                2: `为了答谢您对采美平台的支持，采美送您${cell.couponAmount}元优惠券，赶快去领取下单吧 >>>`,
-                3: `【${cell.shopName}】赠送您${cell.couponAmount}元的店铺专属优惠券，众多火爆商品等您来！赶快去领取下单吧 >>>`,
-                4: `恭喜成功注册采美平台，现赠送您${cell.couponAmount}元新用户优惠券，赶快去领取下单吧 >>>`,
+                0: `采美平台送您${cell.couponFee}元优惠券，众多大牌正品等着您，赶快去领取下单吧 >>>`,
+                1: `采美平台${cell.content}类商品大优惠，特送您${cell.couponFee}元优惠券，赶快去领取下单吧 >>>`,
+                2: `为了答谢您对采美平台的支持，采美送您${cell.couponFee}元优惠券，赶快去领取下单吧 >>>`,
+                3: `【${cell.content}】赠送您${cell.couponFee}元的店铺专属优惠券，众多火爆商品等您来！赶快去领取下单吧 >>>`,
+                4: `恭喜成功注册采美平台，现赠送您${cell.couponFee}元新用户优惠券，赶快去领取下单吧 >>>`,
             }
             const map = {
                 1: copunMap[cell.couponType],
-                2: `您有${cell.couponAmount}元优惠券尚未领取，优惠券将于${cell.endTime}后下架，赶快去领取下单吧 >>>`,
-                3: `您有${cell.couponAmount}元优惠券将于${cell.endTime}过期，赶快去查看使用吧 >>>`,
+                2: `您有${cell.couponFee}元优惠券将于${cell.endTime}过期，赶快去查看使用吧 >>>`,
+                3: `您有${cell.couponFee}元优惠券尚未领取，优惠券将于${cell.endTime}后下架，赶快去领取下单吧 >>>`,
             }
-            return map[cell.type]
+            return map[cell.couponMessageType]
         }
     }
 }

pages/notice/club/notice-coupon.vue

@@ -15,14 +15,20 @@
 					<text class="error-text">暂无任何消息~</text>
 				</view>
 				<!-- 列表 -->
-				<view class="tui-notice clearfix" v-else v-for="(cell, index) in list" :key="index">
+				<view
+					class="tui-notice clearfix"
+					v-else
+					v-for="(cell, index) in list"
+					:key="index"
+					@click.stop="handleOrderClick(cell)"
+				>
 					<tui-swipe-action :operateWidth="80" :backgroundColor="'#F7F7F7'">
 						<template v-slot:content>
 							<notice-cell :cellType="4" :cell="cell"></notice-cell>
 						</template>
 						<template v-slot:button>
 							<view class="tui-custom-btn_box">
-								<view class="tui-custom-btn" @tap="deleteBtn(cell.id)">
+								<view class="tui-custom-btn" @click.stop="deleteBtn(cell.id,index)">
 									<text class="iconfont icon-shanchu3"></text>
 								</view>
 							</view>
@@ -39,9 +45,11 @@
 </template>
 <script>
 import { mapState, mapMutations } from 'vuex'
+import noticeMixins from './mixins/notice.mixins.js'
 import noticeCell from './components/notice-cell.vue'
 export default {
-	components:{
+	mixins: [noticeMixins],
+	components: {
 		noticeCell
 	},
 	data() {
@@ -49,8 +57,9 @@ export default {
 			skeletonShow: true,
 			StaticUrl: this.$Static,
 			listQuery: {
+				source: 2,
 				commonId: 0,
-				messageType: 4,
+				messageType: 0,
 				pageNum: 1,
 				pageSize: 10
 			},
@@ -63,95 +72,23 @@ export default {
 			nomoreText: '上拉显示更多'
 		}
 	},
-	onLoad() {
-		this.initData()
-	},
-	computed: {
-		...mapState(['hasLogin', 'userInfo'])
+	onLoad(option) {
+		this.initData(option)
 	},
 	methods: {
-		async initData() {
-			const userInfo = await this.$api.getStorage()
-			this.listQuery.commonId = userInfo.clubId ? userInfo.clubId : 0
-			this.getUserAuthClubMessageList()
-		},
-		getUserAuthClubMessageList() {
-			this.UserService.getUserAuthClubMessageList(this.listQuery)
-				.then(response => {
-					let data = response.data
-					this.hasNextPage = response.data.hasNextPage
-					if (data.list && data.list.length > 0) {
-						this.isEmpty = false
-						this.list = [...data.list]
-						this.pullFlag = false
-						setTimeout(() => {
-							this.pullFlag = true
-						}, 500)
-						if (this.hasNextPage) {
-							this.pullUpOn = false
-							this.nomoreText = '上拉显示更多'
-						} else {
-							if (this.list.length < 3) {
-								this.pullUpOn = true
-								this.loadding = false
-							} else {
-								this.pullUpOn = false
-								this.loadding = false
-								this.nomoreText = '到底了'
-							}
-						}
-					} else {
-						this.isEmpty = true
-					}
-					this.skeletonShow = false
-				})
-				.catch(error => {
-					this.$util.msg(error.msg, 2000)
-				})
-			console.log('获取消息通知数据')
-		},
-		getReachBottomData(index) {
-			//上拉加载
-			this.listQuery.pageNum += 1
-			this.UserService.getUserAuthClubMessageList(this.listQuery)
-				.then(response => {
-					let data = response.data
-					if (data.list && data.list.length > 0) {
-						this.hasNextPage = data.hasNextPage
-						this.list = this.list.concat(data.list)
-						this.pullFlag = false // 防上拉暴滑
-						setTimeout(() => {
-							this.pullFlag = true
-						}, 500)
-						if (this.hasNextPage) {
-							this.pullUpOn = false
-							this.nomoreText = '上拉显示更多'
-						} else {
-							this.pullUpOn = false
-							this.loadding = false
-							this.nomoreText = '已至底部'
-						}
-					}
-				})
-				.catch(error => {
-					this.$util.msg(error.msg, 2000)
-				})
+		async initData(option) {
+		    const userInfo = await this.$api.getStorage()
+		    this.listQuery.messageType = option.messageType
+		    this.listQuery.commonId = userInfo.clubId ? userInfo.clubId : 0
+		    this.getUserAuthClubMessageList()
 		},
-		deleteBtn(id) {
-			// 删除通知消息
-			this.UserService.authDeleteMessage({ id: id })
-				.then(response => {
-					uni.vibrateShort({
-						success: function() {
-							console.log('success')
-						}
-					})
-					this.listQuery.pageNum = 1
-					this.getUserAuthClubMessageList()
-				})
-				.catch(error => {
-					console.log('error=>', error.msg)
-				})
+		handleOrderClick(cell) {
+			const linkJumpMap = {
+				1: `/pages/user/coupon/coupon-collection`,
+				2: `/pages/user/coupon/coupon`,
+				3: `/pages/user/coupon/coupon-collection`,
+			}
+			this.$api.navigateTo(linkJumpMap[cell.couponMessageType])
 		}
 	},
 	onReachBottom() {
@@ -164,7 +101,7 @@ export default {
 	onPullDownRefresh() {
 		//下拉刷新
 		this.listQuery.pageNum = 1
-		this.getUserAuthShopMessageList()
+		this.getUserAuthClubMessageList()
 		uni.stopPullDownRefresh()
 	},
 	onShow() {}
@@ -185,10 +122,10 @@ page {
 		margin-top: -300rpx;
 	}
 }
-.tui-swipeout-content{
-	white-space:normal !important;
+.tui-swipeout-content {
+	white-space: normal !important;
 }
-.tui-notice{
+.tui-notice {
 	margin-bottom: 24rpx;
 }
 .tui-notice-cell {
@@ -197,26 +134,26 @@ page {
 	background-color: #ffffff;
 	border-radius: 16rpx;
 	box-sizing: border-box;
-	padding:16rpx 24rpx;
+	padding: 16rpx 24rpx;
 	margin: 0 auto;
-	.tui-cell-top{
+	.tui-cell-top {
 		width: 100%;
 		height: 88rpx;
 		line-height: 88rpx;
 		float: left;
-		.cell-title{
+		.cell-title {
 			font-size: 32rpx;
 			color: #333333;
 			float: left;
 			font-weight: bold;
 		}
-		.cell-time{
+		.cell-time {
 			font-size: 24rpx;
 			color: #999999;
 			float: right;
 		}
 	}
-	.tui-cell-content{
+	.tui-cell-content {
 		width: 100%;
 		height: auto;
 		float: left;
@@ -224,7 +161,7 @@ page {
 		border-radius: 8rpx;
 		line-height: 44rpx;
 		padding: 24rpx;
-		background-color: #F7F7F7;
+		background-color: #f7f7f7;
 		font-size: 28rpx;
 		color: #666666;
 		text-align: justify;

pages/notice/club/notice-order.vue

@@ -15,14 +15,20 @@
 					<text class="error-text">暂无任何消息~</text>
 				</view>
 				<!-- 列表 -->
-				<view class="tui-notice" v-else v-for="(cell, index) in list" :key="index">
+				<view
+					class="tui-notice"
+					v-else
+					v-for="(cell, index) in list"
+					:key="index"
+					@click.stop="handleOrderClick(cell)"
+				>
 					<tui-swipe-action :operateWidth="80" :backgroundColor="'#F7F7F7'">
 						<template v-slot:content>
 							<notice-cell :cellType="1" :cell="cell"></notice-cell>
 						</template>
 						<template v-slot:button>
 							<view class="tui-custom-btn_box">
-								<view class="tui-custom-btn" @tap="deleteBtn(cell.id)">
+								<view class="tui-custom-btn" @click.stop="deleteBtn(cell.id,index)">
 									<text class="iconfont icon-shanchu3"></text>
 								</view>
 							</view>
@@ -39,9 +45,11 @@
 </template>
 <script>
 import { mapState, mapMutations } from 'vuex'
+import noticeMixins from './mixins/notice.mixins.js'
 import noticeCell from './components/notice-cell.vue'
 export default {
-	components:{
+	mixins: [noticeMixins],
+	components: {
 		noticeCell
 	},
 	data() {
@@ -49,8 +57,9 @@ export default {
 			skeletonShow: true,
 			StaticUrl: this.$Static,
 			listQuery: {
+				source: 2,
 				commonId: 0,
-				messageType: 1,
+				messageType: 0,
 				pageNum: 1,
 				pageSize: 10
 			},
@@ -63,95 +72,30 @@ export default {
 			nomoreText: '上拉显示更多'
 		}
 	},
-	onLoad() {
-		this.initData()
-	},
-	computed: {
-		...mapState(['hasLogin', 'userInfo'])
+	onLoad(option) {
+		this.initData(option)
 	},
 	methods: {
-		async initData() {
-			const userInfo = await this.$api.getStorage()
-			this.listQuery.commonId = userInfo.clubId ? userInfo.clubId : 0
-			this.getUserAuthClubMessageList()
-		},
-		getUserAuthClubMessageList() {
-			this.UserService.getUserAuthClubMessageList(this.listQuery)
-				.then(response => {
-					let data = response.data
-					this.hasNextPage = response.data.hasNextPage
-					if (data.list && data.list.length > 0) {
-						this.isEmpty = false
-						this.list = [...data.list]
-						this.pullFlag = false
-						setTimeout(() => {
-							this.pullFlag = true
-						}, 500)
-						if (this.hasNextPage) {
-							this.pullUpOn = false
-							this.nomoreText = '上拉显示更多'
-						} else {
-							if (this.list.length < 3) {
-								this.pullUpOn = true
-								this.loadding = false
-							} else {
-								this.pullUpOn = false
-								this.loadding = false
-								this.nomoreText = '到底了'
-							}
-						}
-					} else {
-						this.isEmpty = true
-					}
-					this.skeletonShow = false
-				})
-				.catch(error => {
-					this.$util.msg(error.msg, 2000)
-				})
-			console.log('获取消息通知数据')
-		},
-		getReachBottomData(index) {
-			//上拉加载
-			this.listQuery.pageNum += 1
-			this.UserService.getUserAuthClubMessageList(this.listQuery)
-				.then(response => {
-					let data = response.data
-					if (data.list && data.list.length > 0) {
-						this.hasNextPage = data.hasNextPage
-						this.list = this.list.concat(data.list)
-						this.pullFlag = false // 防上拉暴滑
-						setTimeout(() => {
-							this.pullFlag = true
-						}, 500)
-						if (this.hasNextPage) {
-							this.pullUpOn = false
-							this.nomoreText = '上拉显示更多'
-						} else {
-							this.pullUpOn = false
-							this.loadding = false
-							this.nomoreText = '已至底部'
-						}
-					}
-				})
-				.catch(error => {
-					this.$util.msg(error.msg, 2000)
-				})
+		async initData(option) {
+		    const userInfo = await this.$api.getStorage()
+		    this.listQuery.messageType = option.messageType
+		    this.listQuery.commonId = userInfo.clubId ? userInfo.clubId : 0
+		    this.getUserAuthClubMessageList()
 		},
-		deleteBtn(id) {
-			// 删除通知消息
-			this.UserService.authDeleteMessage({ id: id })
-				.then(response => {
-					uni.vibrateShort({
-						success: function() {
-							console.log('success')
-						}
-					})
-					this.listQuery.pageNum = 1
-					this.getUserAuthClubMessageList()
-				})
-				.catch(error => {
-					console.log('error=>', error.msg)
-				})
+		handleOrderClick(cell) {
+			const payLinkMap = {
+				0: `/pages/user/order/order-pay-list?orderId=${cell.orderId}`,
+				1: `/pages/user/order/order-payunder?orderId=${cell.orderId}`
+			}
+			const linkJumpMap = {
+				1: payLinkMap[cell.onlinePayFlag],
+				2: `/pages/user/order/order-details?orderId=${cell.orderId}`,
+				3: `/pages/user/order/order-details?orderId=${cell.orderId}`,
+				4: `/pages/user/order/order-details?orderId=${cell.orderId}`,
+				5: `/pages/user/order/order-logistics?orderId=${cell.orderId}`,
+				6: `/pages/user/order/order-details?orderId=${cell.orderId}`
+			}
+			this.$api.navigateTo(linkJumpMap[cell.orderMessageType])
 		}
 	},
 	onReachBottom() {
@@ -164,7 +108,7 @@ export default {
 	onPullDownRefresh() {
 		//下拉刷新
 		this.listQuery.pageNum = 1
-		this.getUserAuthShopMessageList()
+		this.getUserAuthClubMessageList()
 		uni.stopPullDownRefresh()
 	},
 	onShow() {}
@@ -185,7 +129,7 @@ page {
 		margin-top: -300rpx;
 	}
 }
-.tui-notice{
+.tui-notice {
 	margin-bottom: 24rpx;
 }
 .tui-notice-cell {
@@ -194,44 +138,44 @@ page {
 	background-color: #ffffff;
 	border-radius: 16rpx;
 	box-sizing: border-box;
-	padding:16rpx 24rpx;
+	padding: 16rpx 24rpx;
 	margin: 0 auto;
-	.tui-cell-top{
+	.tui-cell-top {
 		width: 100%;
 		height: 88rpx;
 		line-height: 88rpx;
-		.cell-title{
+		.cell-title {
 			font-size: 32rpx;
 			color: #333333;
 			float: left;
 			font-weight: bold;
 		}
-		.cell-time{
+		.cell-time {
 			font-size: 24rpx;
 			color: #999999;
 			float: right;
 		}
 	}
-	.tui-cell-content{
+	.tui-cell-content {
 		width: 100%;
 		height: 160rpx;
 		box-sizing: border-box;
 		padding: 16rpx;
 		border-radius: 8rpx;
-		background-color: #F7F7F7;
-		.cell-image{
+		background-color: #f7f7f7;
+		.cell-image {
 			width: 128rpx;
 			height: 128rpx;
 			border-radius: 8rpx;
 			float: left;
-			image{
+			image {
 				width: 128rpx;
 				height: 128rpx;
 				display: block;
 				border-radius: 8rpx;
 			}
 		}
-		.cell-content{
+		.cell-content {
 			width: 490rpx;
 			height: 100%;
 			box-sizing: border-box;
@@ -243,12 +187,12 @@ page {
 			float: left;
 		}
 	}
-	.tui-cell-bot{
+	.tui-cell-bot {
 		width: 100%;
 		height: 80rpx;
 		box-sizing: border-box;
 		padding: 16rpx 0 0 0;
-		.tui-cell-btn{
+		.tui-cell-btn {
 			width: 160rpx;
 			height: 64rpx;
 			border-radius: 35rpx;

pages/notice/club/notice-serve.vue

@@ -22,7 +22,7 @@
 						</template>
 						<template v-slot:button>
 							<view class="tui-custom-btn_box">
-								<view class="tui-custom-btn" @tap="deleteBtn(cell.id)">
+								<view class="tui-custom-btn" @click.stop="deleteBtn(cell.id,index)">
 									<text class="iconfont icon-shanchu3"></text>
 								</view>
 							</view>
@@ -39,8 +39,10 @@
 </template>
 <script>
 import { mapState, mapMutations } from 'vuex'
+import noticeMixins from './mixins/notice.mixins.js'
 import noticeCell from './components/notice-cell.vue'
 export default {
+	mixins: [noticeMixins],
 	components:{
 		noticeCell
 	},
@@ -49,8 +51,9 @@ export default {
 			skeletonShow: true,
 			StaticUrl: this.$Static,
 			listQuery: {
+				source: 2,
 				commonId: 0,
-				messageType: 3,
+				messageType: 0,
 				pageNum: 1,
 				pageSize: 10
 			},
@@ -63,95 +66,15 @@ export default {
 			nomoreText: '上拉显示更多'
 		}
 	},
-	onLoad() {
-		this.initData()
-	},
-	computed: {
-		...mapState(['hasLogin', 'userInfo'])
+	onLoad(option) {
+		this.initData(option)
 	},
 	methods: {
-		async initData() {
-			const userInfo = await this.$api.getStorage()
-			this.listQuery.commonId = userInfo.clubId ? userInfo.clubId : 0
-			this.getUserAuthClubMessageList()
-		},
-		getUserAuthClubMessageList() {
-			this.UserService.getUserAuthClubMessageList(this.listQuery)
-				.then(response => {
-					let data = response.data
-					this.hasNextPage = response.data.hasNextPage
-					if (data.list && data.list.length > 0) {
-						this.isEmpty = false
-						this.list = [...data.list]
-						this.pullFlag = false
-						setTimeout(() => {
-							this.pullFlag = true
-						}, 500)
-						if (this.hasNextPage) {
-							this.pullUpOn = false
-							this.nomoreText = '上拉显示更多'
-						} else {
-							if (this.list.length < 3) {
-								this.pullUpOn = true
-								this.loadding = false
-							} else {
-								this.pullUpOn = false
-								this.loadding = false
-								this.nomoreText = '到底了'
-							}
-						}
-					} else {
-						this.isEmpty = true
-					}
-					this.skeletonShow = false
-				})
-				.catch(error => {
-					this.$util.msg(error.msg, 2000)
-				})
-			console.log('获取消息通知数据')
-		},
-		getReachBottomData(index) {
-			//上拉加载
-			this.listQuery.pageNum += 1
-			this.UserService.getUserAuthClubMessageList(this.listQuery)
-				.then(response => {
-					let data = response.data
-					if (data.list && data.list.length > 0) {
-						this.hasNextPage = data.hasNextPage
-						this.list = this.list.concat(data.list)
-						this.pullFlag = false // 防上拉暴滑
-						setTimeout(() => {
-							this.pullFlag = true
-						}, 500)
-						if (this.hasNextPage) {
-							this.pullUpOn = false
-							this.nomoreText = '上拉显示更多'
-						} else {
-							this.pullUpOn = false
-							this.loadding = false
-							this.nomoreText = '已至底部'
-						}
-					}
-				})
-				.catch(error => {
-					this.$util.msg(error.msg, 2000)
-				})
-		},
-		deleteBtn(id) {
-			// 删除通知消息
-			this.UserService.authDeleteMessage({ id: id })
-				.then(response => {
-					uni.vibrateShort({
-						success: function() {
-							console.log('success')
-						}
-					})
-					this.listQuery.pageNum = 1
-					this.getUserAuthClubMessageList()
-				})
-				.catch(error => {
-					console.log('error=>', error.msg)
-				})
+		async initData(option) {
+		    const userInfo = await this.$api.getStorage()
+		    this.listQuery.messageType = option.messageType
+		    this.listQuery.commonId = userInfo.clubId ? userInfo.clubId : 0
+		    this.getUserAuthClubMessageList()
 		}
 	},
 	onReachBottom() {
@@ -164,7 +87,7 @@ export default {
 	onPullDownRefresh() {
 		//下拉刷新
 		this.listQuery.pageNum = 1
-		this.getUserAuthShopMessageList()
+		this.getUserAuthClubMessageList()
 		uni.stopPullDownRefresh()
 	},
 	onShow() {}

pages/notice/club/notice-users.vue

@@ -15,14 +15,20 @@
 					<text class="error-text">暂无任何消息~</text>
 				</view>
 				<!-- 列表 -->
-				<view class="tui-notice clearfix" v-else v-for="(cell, index) in list" :key="index">
+				<view
+					class="tui-notice clearfix"
+					v-else
+					v-for="(cell, index) in list"
+					:key="index"
+					@click.stop="handleOrderClick(cell)"
+				>
 					<tui-swipe-action :operateWidth="80" :backgroundColor="'#F7F7F7'">
 						<template v-slot:content>
 							<notice-cell :cellType="2" :cell="cell"></notice-cell>
 						</template>
 						<template v-slot:button>
 							<view class="tui-custom-btn_box">
-								<view class="tui-custom-btn" @tap="deleteBtn(cell.id)">
+								<view class="tui-custom-btn" @click.stop="deleteBtn(cell.id,index)">
 									<text class="iconfont icon-shanchu3"></text>
 								</view>
 							</view>
@@ -39,9 +45,11 @@
 </template>
 <script>
 import { mapState, mapMutations } from 'vuex'
+import noticeMixins from './mixins/notice.mixins.js'
 import noticeCell from './components/notice-cell.vue'
 export default {
-	components:{
+	mixins: [noticeMixins],
+	components: {
 		noticeCell
 	},
 	data() {
@@ -49,8 +57,9 @@ export default {
 			skeletonShow: true,
 			StaticUrl: this.$Static,
 			listQuery: {
+				source: 2,
 				commonId: 0,
-				messageType: 2,
+				messageType: 0,
 				pageNum: 1,
 				pageSize: 10
 			},
@@ -63,95 +72,24 @@ export default {
 			nomoreText: '上拉显示更多'
 		}
 	},
-	onLoad() {
-		this.initData()
-	},
-	computed: {
-		...mapState(['hasLogin', 'userInfo'])
+	onLoad(option) {
+		this.initData(option)
 	},
 	methods: {
-		async initData() {
-			const userInfo = await this.$api.getStorage()
-			this.listQuery.commonId = userInfo.clubId ? userInfo.clubId : 0
-			this.getUserAuthClubMessageList()
-		},
-		getUserAuthClubMessageList() {
-			this.UserService.getUserAuthClubMessageList(this.listQuery)
-				.then(response => {
-					let data = response.data
-					this.hasNextPage = response.data.hasNextPage
-					if (data.list && data.list.length > 0) {
-						this.isEmpty = false
-						this.list = [...data.list]
-						this.pullFlag = false
-						setTimeout(() => {
-							this.pullFlag = true
-						}, 500)
-						if (this.hasNextPage) {
-							this.pullUpOn = false
-							this.nomoreText = '上拉显示更多'
-						} else {
-							if (this.list.length < 3) {
-								this.pullUpOn = true
-								this.loadding = false
-							} else {
-								this.pullUpOn = false
-								this.loadding = false
-								this.nomoreText = '到底了'
-							}
-						}
-					} else {
-						this.isEmpty = true
-					}
-					this.skeletonShow = false
-				})
-				.catch(error => {
-					this.$util.msg(error.msg, 2000)
-				})
-			console.log('获取消息通知数据')
-		},
-		getReachBottomData(index) {
-			//上拉加载
-			this.listQuery.pageNum += 1
-			this.UserService.getUserAuthClubMessageList(this.listQuery)
-				.then(response => {
-					let data = response.data
-					if (data.list && data.list.length > 0) {
-						this.hasNextPage = data.hasNextPage
-						this.list = this.list.concat(data.list)
-						this.pullFlag = false // 防上拉暴滑
-						setTimeout(() => {
-							this.pullFlag = true
-						}, 500)
-						if (this.hasNextPage) {
-							this.pullUpOn = false
-							this.nomoreText = '上拉显示更多'
-						} else {
-							this.pullUpOn = false
-							this.loadding = false
-							this.nomoreText = '已至底部'
-						}
-					}
-				})
-				.catch(error => {
-					this.$util.msg(error.msg, 2000)
-				})
+		async initData(option) {
+		    const userInfo = await this.$api.getStorage()
+		    this.listQuery.messageType = option.messageType
+		    this.listQuery.commonId = userInfo.clubId ? userInfo.clubId : 0
+		    this.getUserAuthClubMessageList()
 		},
-		deleteBtn(id) {
-			// 删除通知消息
-			this.UserService.authDeleteMessage({ id: id })
-				.then(response => {
-					uni.vibrateShort({
-						success: function() {
-							console.log('success')
-						}
-					})
-					this.listQuery.pageNum = 1
-					this.getUserAuthClubMessageList()
-				})
-				.catch(error => {
-					console.log('error=>', error.msg)
-				})
+		handleOrderClick(cell) {
+			const linkJumpMap = {
+				2: `/pages/user/member/member`,
+				3: `/pages/user/member/member`,
+				4: `/pages/user/member/member`,
+				6: `/pages/login/apply`
+			}
+			this.$api.navigateTo(linkJumpMap[cell.accountType])
 		}
 	},
 	onReachBottom() {
@@ -164,7 +102,7 @@ export default {
 	onPullDownRefresh() {
 		//下拉刷新
 		this.listQuery.pageNum = 1
-		this.getUserAuthShopMessageList()
+		this.getUserAuthClubMessageList()
 		uni.stopPullDownRefresh()
 	},
 	onShow() {}
@@ -185,10 +123,10 @@ page {
 		margin-top: -300rpx;
 	}
 }
-.tui-swipeout-content{
-	white-space:normal !important;
+.tui-swipeout-content {
+	white-space: normal !important;
 }
-.tui-notice{
+.tui-notice {
 	margin-bottom: 24rpx;
 }
 .tui-notice-cell {
@@ -197,26 +135,26 @@ page {
 	background-color: #ffffff;
 	border-radius: 16rpx;
 	box-sizing: border-box;
-	padding:16rpx 24rpx;
+	padding: 16rpx 24rpx;
 	margin: 0 auto;
-	.tui-cell-top{
+	.tui-cell-top {
 		width: 100%;
 		height: 88rpx;
 		line-height: 88rpx;
 		float: left;
-		.cell-title{
+		.cell-title {
 			font-size: 32rpx;
 			color: #333333;
 			float: left;
 			font-weight: bold;
 		}
-		.cell-time{
+		.cell-time {
 			font-size: 24rpx;
 			color: #999999;
 			float: right;
 		}
 	}
-	.tui-cell-content{
+	.tui-cell-content {
 		width: 100%;
 		height: auto;
 		float: left;
@@ -224,7 +162,7 @@ page {
 		border-radius: 8rpx;
 		line-height: 44rpx;
 		padding: 24rpx;
-		background-color: #F7F7F7;
+		background-color: #f7f7f7;
 		font-size: 28rpx;
 		color: #666666;
 		text-align: justify;

pages/notice/shop/mixins/notice.mixins.js

@@ -22,6 +22,83 @@ const noticeMixins = {
         }
     },
     methods: {
+        getUserAuthShopMessageList() {
+            this.ShopService.getUserAuthShopMessageList(this.listQuery)
+                .then(response => {
+                    let data = response.data
+                    this.hasNextPage = response.data.hasNextPage
+                    if (data.list && data.list.length > 0) {
+                        this.isEmpty = false
+                        this.list = [...data.list]
+                        this.pullFlag = false
+                        setTimeout(() => {
+                            this.pullFlag = true
+                        }, 500)
+                        if (this.hasNextPage) {
+                            this.pullUpOn = false
+                            this.nomoreText = '上拉显示更多'
+                        } else {
+                            if (this.list.length < 3) {
+                                this.pullUpOn = true
+                                this.loadding = false
+                            } else {
+                                this.pullUpOn = false
+                                this.loadding = false
+                                this.nomoreText = '到底了'
+                            }
+                        }
+                    } else {
+                        this.isEmpty = true
+                    }
+                    this.skeletonShow = false
+                })
+                .catch(error => {
+                    this.$util.msg(error.msg, 2000)
+                })
+            console.log('获取消息通知数据')
+        },
+        getReachBottomData(index) {
+            //上拉加载
+            this.listQuery.pageNum += 1
+            this.ShopService.getUserAuthShopMessageList(this.listQuery)
+                .then(response => {
+                    let data = response.data
+                    if (data.list && data.list.length > 0) {
+                        this.hasNextPage = data.hasNextPage
+                        this.list = this.list.concat(data.list)
+                        this.pullFlag = false // 防上拉暴滑
+                        setTimeout(() => {
+                            this.pullFlag = true
+                        }, 500)
+                        if (this.hasNextPage) {
+                            this.pullUpOn = false
+                            this.nomoreText = '上拉显示更多'
+                        } else {
+                            this.pullUpOn = false
+                            this.loadding = false
+                            this.nomoreText = '已至底部'
+                        }
+                    }
+                })
+                .catch(error => {
+                    this.$util.msg(error.msg, 2000)
+                })
+        },
+        deleteBtn(id,index) {
+		    // 删除通知消息
+		    this.UserService.authDeleteMessage({ id: id })
+		        .then(response => {
+		            let _this = this
+		            uni.vibrateShort({
+		                success: function() {
+		                    _this.list.splice(index, 1) 
+		                }
+		            })
+		        })
+		        .catch(error => {
+		            console.log('error=>', error.msg)
+		        })
+        },
         noticeUsersText(cell) { // 账户通知文案
             const map = {
 			    1: '您的注册信息已审核通过，恭喜您成为采美平台供应商用户。您可以上架商品到采美商城进行出售了',

pages/notice/shop/notice-serve.vue

@@ -22,7 +22,7 @@
 						</template>
 						<template v-slot:button>
 							<view class="tui-custom-btn_box">
-								<view class="tui-custom-btn" @tap="deleteBtn(cell.id)">
+								<view class="tui-custom-btn" @click.stop="deleteBtn(cell.id,index)">
 									<text class="iconfont icon-shanchu3"></text>
 								</view>
 							</view>
@@ -49,8 +49,9 @@ export default {
 			skeletonShow: true,
 			StaticUrl: this.$Static,
 			listQuery: {
+				source: 2,
 				commonId: 0,
-				messageType: 3,
+				messageType: 0,
 				pageNum: 1,
 				pageSize: 10
 			},
@@ -63,95 +64,18 @@ export default {
 			nomoreText: '上拉显示更多'
 		}
 	},
-	onLoad() {
-		this.initData()
+	onLoad(option) {
+		this.initData(option)
 	},
 	computed: {
 		...mapState(['hasLogin', 'userInfo'])
 	},
 	methods: {
-		async initData() {
+		async initData(option) {
 			const userInfo = await this.$api.getStorage()
+			this.listQuery.messageType = option.messageType
 			this.listQuery.commonId = userInfo.shopId ? userInfo.shopId : 0
 			this.getUserAuthShopMessageList()
-		},
-		getUserAuthShopMessageList() {
-			this.ShopService.getUserAuthShopMessageList(this.listQuery)
-				.then(response => {
-					let data = response.data
-					this.hasNextPage = response.data.hasNextPage
-					if (data.list && data.list.length > 0) {
-						this.isEmpty = false
-						this.list = [...data.list]
-						this.pullFlag = false
-						setTimeout(() => {
-							this.pullFlag = true
-						}, 500)
-						if (this.hasNextPage) {
-							this.pullUpOn = false
-							this.nomoreText = '上拉显示更多'
-						} else {
-							if (this.list.length < 5) {
-								this.pullUpOn = true
-								this.loadding = false
-							} else {
-								this.pullUpOn = false
-								this.loadding = false
-								this.nomoreText = '到底了'
-							}
-						}
-					} else {
-						this.isEmpty = true
-					}
-					this.skeletonShow = false
-				})
-				.catch(error => {
-					this.$util.msg(error.msg, 2000)
-				})
-			console.log('获取消息通知数据')
-		},
-		getReachBottomData(index) {
-			//上拉加载
-			this.listQuery.pageNum += 1
-			this.ShopService.getUserAuthShopMessageList(this.listQuery)
-				.then(response => {
-					let data = response.data
-					if (data.list && data.list.length > 0) {
-						this.hasNextPage = data.hasNextPage
-						this.list = this.list.concat(list)
-						this.pullFlag = false // 防上拉暴滑
-						setTimeout(() => {
-							this.pullFlag = true
-						}, 500)
-						if (this.hasNextPage) {
-							this.pullUpOn = false
-							this.nomoreText = '上拉显示更多'
-						} else {
-							this.pullUpOn = false
-							this.loadding = false
-							this.nomoreText = '已至底部'
-						}
-					}
-				})
-				.catch(error => {
-					this.$util.msg(error.msg, 2000)
-				})
-		},
-		deleteBtn(id) {
-			// 删除通知消息
-			this.UserService.authDeleteMessage({ id: id })
-				.then(response => {
-					uni.vibrateShort({
-						success: function() {
-							console.log('success')
-						}
-					})
-					this.listQuery.pageNum = 1
-					this.getUserAuthShopMessageList()
-				})
-				.catch(error => {
-					console.log('error=>', error.msg)
-				})
 		}
 	},
 	onReachBottom() {

pages/notice/shop/notice-users.vue

@@ -22,7 +22,7 @@
 						</template>
 						<template v-slot:button>
 							<view class="tui-custom-btn_box">
-								<view class="tui-custom-btn" @tap="deleteBtn(cell.id)">
+								<view class="tui-custom-btn" @click.stop="deleteBtn(cell.id,index)">
 									<text class="iconfont icon-shanchu3"></text>
 								</view>
 							</view>
@@ -49,8 +49,9 @@ export default {
 			skeletonShow: true,
 			StaticUrl: this.$Static,
 			listQuery: {
+				source: 2,
 				commonId: 0,
-				messageType: 2,
+				messageType: 0,
 				pageNum: 1,
 				pageSize: 10
 			},
@@ -63,96 +64,20 @@ export default {
 			nomoreText: '上拉显示更多'
 		}
 	},
-	onLoad() {
-		this.initData()
+	onLoad(option) {
+		this.initData(option)
 	},
 	computed: {
 		...mapState(['hasLogin', 'userInfo'])
 	},
 	methods: {
-		async initData() {
+		async initData(option) {
 			const userInfo = await this.$api.getStorage()
+			this.listQuery.messageType = option.messageType
 			this.listQuery.commonId = userInfo.shopId ? userInfo.shopId : 0
 			this.getUserAuthShopMessageList()
 		},
-		getUserAuthShopMessageList() {
-			this.ShopService.getUserAuthShopMessageList(this.listQuery)
-				.then(response => {
-					let data = response.data
-					this.hasNextPage = response.data.hasNextPage
-					if (data.list && data.list.length > 0) {
-						this.isEmpty = false
-						this.list = [...data.list]
-						this.pullFlag = false
-						setTimeout(() => {
-							this.pullFlag = true
-						}, 500)
-						if (this.hasNextPage) {
-							this.pullUpOn = false
-							this.nomoreText = '上拉显示更多'
-						} else {
-							if (this.list.length < 3) {
-								this.pullUpOn = true
-								this.loadding = false
-							} else {
-								this.pullUpOn = false
-								this.loadding = false
-								this.nomoreText = '到底了'
-							}
-						}
-					} else {
-						this.isEmpty = true
-					}
-					this.skeletonShow = false
-				})
-				.catch(error => {
-					this.$util.msg(error.msg, 2000)
-				})
-			console.log('获取消息通知数据')
-		},
-		getReachBottomData(index) {
-			//上拉加载
-			this.listQuery.pageNum += 1
-			this.ShopService.getUserAuthShopMessageList(this.listQuery)
-				.then(response => {
-					let data = response.data
-					if (data.list && data.list.length > 0) {
-						this.hasNextPage = data.hasNextPage
-						this.list = this.list.concat(data.list)
-						this.pullFlag = false // 防上拉暴滑
-						setTimeout(() => {
-							this.pullFlag = true
-						}, 500)
-						if (this.hasNextPage) {
-							this.pullUpOn = false
-							this.nomoreText = '上拉显示更多'
-						} else {
-							this.pullUpOn = false
-							this.loadding = false
-							this.nomoreText = '已至底部'
-						}
-					}
-				})
-				.catch(error => {
-					this.$util.msg(error.msg, 2000)
-				})
-		},
-		deleteBtn(id) {
-			// 删除通知消息
-			this.UserService.authDeleteMessage({ id: id })
-				.then(response => {
-					uni.vibrateShort({
-						success: function() {
-							console.log('success')
-						}
-					})
-					this.listQuery.pageNum = 1
-					this.getUserAuthShopMessageList()
-				})
-				.catch(error => {
-					console.log('error=>', error.msg)
-				})
-		}
+		
 	},
 	onReachBottom() {
 		if (this.hasNextPage) {

pages/search/search.vue

@@ -689,7 +689,7 @@ export default {
 					}
 				})
 				.catch(error => {
-					this.$util.msg(error.msg, 2000)
+					console.log('商品搜索异常',error.msg)
 				})
 		},
 		setSearchHistoryAdd() {

pages/supplier/index/index.vue

@@ -112,7 +112,13 @@ export default {
 	methods: {
 		async initData() {
 			const userInfo = await this.$api.getStorage()
-			this.upNum = userInfo.savedCount
+			this.ShopService.getAuthShopCount({ commonId: userInfo.shopId })
+				.then(response => {
+					this.upNum = response.data.count
+				})
+				.catch(error => {
+					console.log('获取供应商未读通知消息数量')
+				})
 		},
 		// 切换组件
 		cut_index(type) {

pages/tabBar/cart/index.vue

@@ -22,7 +22,7 @@
 			...mapState(['hasLogin','userInfo','isWxAuthorize'])
 		},
 		methods:{
-			
+			...mapMutations(['updateNoticeNum'])
 		},
 		onPullDownRefresh() {//下拉刷新
 			this.$refs.cart.initData()
@@ -30,6 +30,7 @@
 		},
 		onShow(){
 			if(this.hasLogin){
+				this.updateNoticeNum()
 				this.$refs.cart.initData()
 			}else{
 				this.$refs.cart.initLogin()

pages/tabBar/home/index.vue

@@ -95,6 +95,7 @@ export default {
 			},
 			CustomBar: this.CustomBar, // 顶部导航栏高度
 			userID: 0,
+			clubId: 0,
 			clubStatus: '',
 			current: 0,
 			mode: 'round',
@@ -126,7 +127,7 @@ export default {
 		...mapState(['hasLogin', 'userInfo', 'identity', 'isActivity', 'isWxAuthorize'])
 	},
 	methods: {
-		...mapMutations(['login', 'logout']),
+		...mapMutations(['login', 'logout','updateNoticeNum']),
 		async GetWxAuthorize() {
 			const wechatCode = await authorize.getCode('weixin') // 根据微信的code获取用户登录状态:1已登录过 -1未登录过
 			const getUserInfo = await authorize.getUserInfo('weixin')
@@ -138,6 +139,7 @@ export default {
 				.then(response => {
 					this.isLogin = true
 					this.userID = response.data.userId
+					this.clubId = response.data.clubId
 					this.userIdentity = response.data.userIdentity
 					this.clubStatus = response.data.clubStatus
 					this.$store.commit('updateStatus', response.data)
@@ -221,6 +223,7 @@ export default {
 					this.GetHomeFloorInfo()
 					if (this.hasLogin) {
 						this.initShoppingCartCount()
+						this.updateNoticeNum()
 					}
 					this.isNavRequest = true
 				})

pages/tabBar/notice/index.vue

@@ -17,45 +17,45 @@
 				</view>
 			</view>
 			<view class="container-notice">
-				<view class="notice-cell" @click="navigator('/pages/notice/club/notice-order')">
+				<view class="notice-cell" @click="navigator('/pages/notice/club/notice-order?messageType=1')">
 					<view class="notice-cell-icon">
 						<image class="icon-image" :src="StaticUrl + 'icon/icon-notice-order@2x.png'" mode=""></image>
 					</view>
 					<view class="notice-cell-text"> 交易物流 <text class="cell-text">官方</text> </view>
-					<view class="notice-cell-badge" v-if="tradeCount>0">
+					<view class="notice-cell-badge" v-if="tradeCount > 0">
 						<text class="uni-badge uni-badge-error uni-small uni-badge--small icon-num">
 							{{ tradeCount | BadgeType }}
 						</text>
 					</view>
 				</view>
-				<view class="notice-cell" @click="navigator('/pages/notice/club/notice-users')">
+				<view class="notice-cell" @click="navigator('/pages/notice/club/notice-users?messageType=2')">
 					<view class="notice-cell-icon">
 						<image class="icon-image" :src="StaticUrl + 'icon/icon-notice-users@2x.png'" mode=""></image>
 					</view>
 					<view class="notice-cell-text"> 账户通知 <text class="cell-text">官方</text> </view>
-					<view class="notice-cell-badge" v-if="accountCount>0">
+					<view class="notice-cell-badge" v-if="accountCount > 0">
 						<text class="uni-badge uni-badge-error uni-small uni-badge--small icon-num">
 							{{ accountCount | BadgeType }}
 						</text>
 					</view>
 				</view>
-				<view class="notice-cell" @click="navigator('/pages/notice/club/notice-serve')">
+				<view class="notice-cell" @click="navigator('/pages/notice/club/notice-serve?messageType=3')">
 					<view class="notice-cell-icon">
 						<image class="icon-image" :src="StaticUrl + 'icon/icon-notice-serve@2x.png'" mode=""></image>
 					</view>
 					<view class="notice-cell-text"> 服务通知 <text class="cell-text">官方</text> </view>
-					<view class="notice-cell-badge" v-if="notificationCount>0">
+					<view class="notice-cell-badge" v-if="notificationCount > 0">
 						<text class="uni-badge uni-badge-error uni-small uni-badge--small icon-num">
 							{{ notificationCount | BadgeType }}
 						</text>
 					</view>
 				</view>
-				<view class="notice-cell" @click="navigator('/pages/notice/club/notice-coupon')">
+				<view class="notice-cell" @click="navigator('/pages/notice/club/notice-coupon?messageType=4')">
 					<view class="notice-cell-icon">
 						<image class="icon-image" :src="StaticUrl + 'icon/icon-notice-coupon@2x.png'" mode=""></image>
 					</view>
 					<view class="notice-cell-text"> 优惠促销 <text class="cell-text">官方</text> </view>
-					<view class="notice-cell-badge" v-if="promotionCount>0">
+					<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 }}
 						</text>
@@ -93,23 +93,30 @@ export default {
 		...mapState(['hasLogin', 'userInfo'])
 	},
 	methods: {
+		...mapMutations(['updateNoticeNum']),
 		async initData() {
 			const userInfo = await this.$api.getStorage()
 			this.skeletonShow = true //预加载圆圈
 			this.clubId = userInfo.clubId ? userInfo.clubId : 0
-			console.log('clubId',this.clubId)
+			this.updateNoticeNum()
 			this.getUserAuthClubMessageCount()
 		},
 		clearNews() {
+			// 标记消息已读
 			uni.vibrateShort({
 				success: function() {
 					console.log('success')
 				}
 			})
-			this.$util.msg('已将所有消息标记为已读', 2000)
+			this.UserService.authUpdateMessageAsRead({ messageType: '' })
+				.then(response => {
+					this.$util.msg('已将所有消息标记为已读', 2000)
+				})
+				.catch(error => {
+					console.log('标记通知消息已读', error.msg)
+				})
 		},
 		getUserAuthClubMessageCount() {
-			console.log('获取消息通知数据')
 			//供应商详情
 			this.UserService.getUserAuthClubMessageCount({ commonId: this.clubId })
 				.then(response => {

pages/tabBar/user/user.vue

@@ -456,6 +456,7 @@ export default {
 		...mapState(['hasLogin', 'userInfo', 'isWxAuthorize'])
 	},
 	methods: {
+		...mapMutations(['updateNoticeNum']),
 		getClubObtainCenter() {
 			// 获取个人中心数据
 			this.UserService.GetClubObtainCenter({ userId: this.userId })
@@ -662,6 +663,14 @@ export default {
 					break
 			}
 			return stateText
+		},
+		async initUserData(){
+			const userInfo = await this.$api.getComStorage('userInfo')
+			this.userId = userInfo.userId ? userInfo.userId : 0
+			this.getClubObtainCenter()
+			this.UserClubOrderCount()
+			this.GetInitBeansInfo()
+			this.updateNoticeNum()
 		}
 	},
 	onPageScroll(e) {
@@ -688,17 +697,7 @@ export default {
 	},
 	onShow() {
 		if (this.hasLogin) {
-			this.$api
-				.getComStorage('userInfo')
-				.then(resolve => {
-					this.userId = resolve.userId ? resolve.userId : 0
-					this.getClubObtainCenter()
-					this.UserClubOrderCount()
-					this.GetInitBeansInfo()
-				})
-				.catch(error => {
-					console.log('异常处理=========>', error)
-				})
+			this.initUserData()
 		} else {
 			this.getPhone()
 			this.$store.commit('updateAllNum', 0)

pages/user/order/create-order.vue

@@ -120,6 +120,7 @@
 	</view>
 </template>
 <script>
+	import { mapState, mapMutations } from 'vuex'
 	import choiceAddress from '@/components/cm-module/creatOrder/choiceAddress'
 	import goodsList from '@/components/cm-module/creatOrder/goodsList'
 	import invoiceTent from '@/components/cm-module/creatOrder/invoiceTent'
@@ -600,11 +601,10 @@
 						setTimeout(()=>{
 							this.isSubLoading = false
 						},2000)
-						
 						this.$api.redirectTo(`/pages/user/order/success?data=${JSON.stringify({data:{orderId:data.orderId}})}`)
 					}else{
 						this.submitState ='confirm'
-						this.$util.msg('订单提交成功',3000,true,'success')
+						this.$util.msg('订单提交成功',2000,true,'success')
 						setTimeout(()=>{
 							this.isSubLoading = false
 							if(data.onlinePayFlag === 1){
@@ -612,7 +612,7 @@
 							}else{
 								this.$api.redirectTo(`/pages/user/order/order-pay-list?orderId=${data.orderId}`)
 							}
-						},3000)
+						},2000)
 					}
 				}).catch(error =>{
 					this.isSubLoading = false

pages/user/order/order-details.vue

@@ -454,7 +454,9 @@ export default {
 				this.OrderService.CancelOrder({ orderId: this.orderId })
 					.then(response => {
 						this.$util.msg(response.msg, 2000, true, 'success')
-						this.initOrderDetaileData()
+						setTimeout(() => {
+							this.initOrderDetaileData()
+						}, 2000)
 					})
 					.catch(error => {
 						this.$util.msg(error.msg, 2000)

services/shop.service.js

@@ -273,4 +273,16 @@ export default class ShopService {
 	
 	    })
     }
+    /**
+	 *@查询供应商未读消息数量
+	 *@param commonId：供应商clubId
+	 */
+    getAuthShopCount(data = {}) {
+        return this.AjaxService.get({
+            url: '/user/login/auth/ShopCount',
+            data,
+            isLoading: false,
+        })
+    }
+	
 }

services/user.service.js

@@ -596,7 +596,7 @@ export default class UserService {
 	    return this.AjaxService.get({
 	        url: '/user/login/auth/ClubMessageList',
 	        data,
-	        isLoading: true,
+	        isLoading: false,
 	
 	    })
     }
@@ -611,4 +611,37 @@ export default class UserService {
 	        isLoading: true,
 	    })
     }
+    /**
+	 *@机构标记通知消息已读
+	 *@param messageType：''
+	 */
+    authUpdateMessageAsRead(data = {}) {
+	    return this.AjaxService.post({
+	        url: '/user/login/auth/updateMessageAsRead',
+	        data,
+	        isLoading: true,
+	    })
+    }
+    /**
+	 *@供应商通标记知消息已读
+	 *@param messageType：''
+	 */
+    authUpdateShopMessageAsRead(data = {}) {
+	    return this.AjaxService.post({
+	        url: '/user/login/auth/updateShopMessageAsRead',
+	        data,
+	        isLoading: true,
+	    })
+    }
+    /**
+	 *@查询机构未读消息数量
+	 *@param commonId：机构clubId
+	 */
+    getAuthClubCount(data = {}) {
+	    return this.AjaxService.get({
+	        url: '/user/login/auth/ClubCount',
+	        data,
+	        isLoading: false,
+	    })
+    }
 }

store/index.js

@@ -2,6 +2,9 @@ import Vue from 'vue'
 import Vuex from 'vuex'
 import api from '../common/config/caimeiApi.js'
 import authorize from '../common/config/authorize.js'
+import * as caimeiApi from '@/common/config/caimeiApi.js'
+import ajaxService from '@/services/ajax.service.js'
+import UserService from '@/services/user.service.js'
 
 Vue.use(Vuex)
 const store = new Vuex.Store({
@@ -10,6 +13,7 @@ const store = new Vuex.Store({
         hasLogin: false,
         userInfo: {},
         identity: 0,
+        noticeNum:0,
         clubType: 0, // 1: 医美机构  2：生美机构 （医美、生美机构类型）
         wechatUserInfo: {},
         cartNumber: 0,
@@ -67,22 +71,35 @@ const store = new Vuex.Store({
                 data: provider
             })
         },
-        updateNotice(state, num) {
-		    if (num >= 100) {
-		        uni.setTabBarBadge({
-		            index: 2,
-		            text: '99+'
-		        })
-		    } else if (num > 0) {
-		        uni.setTabBarBadge({
-		            index: 2,
-		            text: String(num)
-		        })
-		    } else {
-		        uni.removeTabBarBadge({
-		            index: 2,
-		        })
-		    }
+        async updateNoticeNum(state) { // 更新通知消息数量
+            console.log('全部更新通知消息数量')
+            const getUserService = new UserService(ajaxService)
+            const userInfo = await caimeiApi.getStorage()
+            const commonId = userInfo.clubId ? userInfo.clubId : 0
+            getUserService.getAuthClubCount({ commonId: commonId })
+                .then(response => {
+                    state.noticeNum = response.data.count
+                    if (state.noticeNum >= 100) {
+                        uni.setTabBarBadge({
+                            index: 2,
+                            text: '99+'
+                        })
+                    } else if (state.noticeNum > 0) {
+                        uni.setTabBarBadge({
+                            index: 2,
+                            text: String(state.noticeNum)
+                        })
+                    } else {
+                        uni.removeTabBarBadge({
+                            index: 2,
+                        })
+                    }
+                })
+                .catch(error => {
+                    uni.removeTabBarBadge({
+                        index: 2,
+                    })
+                })
         },
         updateAllNum(state, num) {
             if (num >= 100) {

utils/mixins/orderList.js

@@ -1,178 +0,0 @@
-const orderList = {
-    data() {
-        return {
-            hanldOrder: {}, // 当前要处理的订单信息
-            modal: false,
-            modalText: '',
-            buyAgainModal: false,
-            invalidList: [], // 失效商品列表
-        }
-    },
-
-    methods: {
-        // 操作订单
-        handleConfirmClick(e) {
-            const { type, order } = (this.hanldOrder = e)
-            switch (type) {
- 
-            // 其他操作
-            case 'again':
-                this.buyAgain()
-                break
-            case 'share':
-                this.handleShare()
-                break
-            case 'query':
-                this.isModalLayer = true
-                this.$api.navigateTo('/pages/order/order-logistics?orderId=' + order.orderId)
-                break
-            case 'fightDetail':
-                console.log('拼团详情')
-                this.$api.navigateTo('/pages/fight-order/fight-detail?collageId=' + order.collageId)
-                break
-            case 'fightShare':
-                console.log('分享邀请好友拼团')
-                this.$api.navigateTo('/pages/fight-order/fight-detail?collageId=' + order.collageId)
-                break
-                // 常规操作
-            case 'cancel':
-                this.modal = true
-                this.modalText = '确认取消该订单吗？'
-                break
-            case 'delete':
-                this.modal = true
-                this.modalText = '确认删除该订单吗？'
-                break
-            case 'confirm':
-                this.modal = true
-                this.modalText = '是否确认收货？'
-                break
-            case 'pay':
-                this.modal = true
-                this.modalText = '确认支付？'
-                break
-            }
-        },
-        // 确认收货
-        handleConfirm(order) {
-            console.log('确认收货')
-            return this.OrderService.ConfirmReceipt({ orderId: order.orderId })
-        },
-        // 取消订单
-        handleCancel(order) {
-            console.log('取消订单')
-            return this.OrderService.CancelOrder({ orderId: order.orderId })
-        },
-        // 删除订单
-        handleDelete(order) {
-            console.log('删除订单')
-            return this.OrderService.DeleteOrder({ orderId: order.orderId })
-        },
-        // 支付订单
-        handlePay(order) {
-            console.log('支付')
-            this.miniWxPayFor(order)
-        },
-        // 再次购买初始化查询订单商品信息
-        handleAgain(order) {
-            console.log('再次购买初始化查询订单商品信息')
-            return this.OrderService.GetOrderBuyAgain({ orderId: order.orderId })
-        },
-        // 查看物流
-        handleQuery(order) {
-            console.log('查看物流')
-        },
-        // 分享
-        handleShare(order) {
-            console.log('分享')
-        },
-        // 再次购买
-        async buyAgain() {
-            const { type, order } = this.hanldOrder
-            try {
-                await this.handleAgain(order)
-                this.joinToCart(order)
-            } catch (error) {
-                if (error.data && error.data.length > 0) {
-                    this.buyAgainModal = true
-                    this.invalidList = error.data
-                }
-            }
-        },
-
-        // 确认再次购买
-        buyAgainModalClick(e) {
-            this.buyAgainModal = false
-            if (!e.index) return
-            this.joinToCart(this.hanldOrder.order)
-        },
-
-        // 再次购买弹窗关闭
-        buyAgainModalHide() {
-            console.log('再次购买弹窗关闭')
-            this.invalidList = []
-        },
-
-        // 一键加入购物车
-        async joinToCart(order) {
-            try {
-                await this.ProductService.ShoppingAgainCart({ orderId: order.orderId })
-                this.$store.dispatch('cart/getCartNumber')
-                this.$api.switchTabTo('/pages/tabBar/cart/index')
-            } catch (error) {
-                console.log(error.message)
-                // this.$util.msg(error.msg, 2000)
-            }
-        },
-
-        // 操作订单确认事件
-        async handleModalConfirm(e) {
-            this.modal = false
-            if (!e.index) return
-
-            const { type, order } = this.hanldOrder
-
-            // 操作订单
-            const confirmFunc = {
-                cancel: this.handleCancel, //取消订单
-                delete: this.handleDelete, //删除订单
-                pay: this.handlePay, //支付订单
-                confirm: this.handleConfirm //确认收货
-            }
-            try {
-                const res = await confirmFunc[type](order)
-                // 确认操作订单成功后的回调都在这里执行 在this.$on 中监听 orderAction 事件的执行
-                this.$emit('orderAction')
-                if (res && res.msg) this.$util.msg(res.msg, 2000, true, 'success')
-            } catch (error) {
-                this.$util.msg(error.msg, 2000)
-            }
-        },
-        //订单状态文字
-        stateExpFormat(status) {
-            const stateTextObject = {
-                4: '交易完成',
-                5: '订单完成',
-                6: '已关闭',
-                7: '交易全退',
-                77: '交易全退',
-                11: '待付款待发货',
-                12: '待付款部分发货',
-                13: '待付款已发货',
-                // 21: '部分付款待发货',
-                // 22: '部分付款部分发货',
-                // 23: '部分付款已发货',
-                31: '已付款待发货',
-                32: '已付款部分发货',
-                33: '已付款已发货',
-                111: '待付款待发货',
-                81: '拼团中',
-                82: '拼团成功待发货',
-                83: '拼团成功已发货'
-            }
-            return stateTextObject[status] || ''
-        },
-    }
-}
-
-export default orderList