1

common/css/font-icon.css

@@ -1,169 +1,176 @@
 @font-face {
-	font-family: "iconfont";
-	/* Project id 3674157 */
-	/* Color fonts */
-	src:
-		url('https://at.alicdn.com/t/c/font_3674157_otfqobpw55.woff2?t=1665648026258') format('woff2'),
-		url('https://at.alicdn.com/t/c/font_3674157_otfqobpw55.woff?t=1665648026258') format('woff'),
-		url('https://at.alicdn.com/t/c/font_3674157_otfqobpw55.ttf?t=1665648026258') format('truetype');
+  font-family: "iconfont"; /* Project id 3674157 */
+  /* Color fonts */
+  src: 
+       url('https://at.alicdn.com/t/c/font_3674157_mniu53a707.woff2?t=1671153198755') format('woff2'),
+       url('https://at.alicdn.com/t/c/font_3674157_mniu53a707.woff?t=1671153198755') format('woff'),
+       url('https://at.alicdn.com/t/c/font_3674157_mniu53a707.ttf?t=1671153198755') format('truetype');
 }
 
 .iconfont {
-	font-family: "iconfont" !important;
-	font-size: 16px;
-	font-style: normal;
-	-webkit-font-smoothing: antialiased;
-	-moz-osx-font-smoothing: grayscale;
+  font-family: "iconfont" !important;
+  font-size: 16px;
+  font-style: normal;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+}
+
+.icon-a-qingchuquanbuyidu:before {
+  content: "\e71c";
+}
+
+.icon-xiaoxitongzhi:before {
+  content: "\e624";
 }
 
 .icon-top:before {
-	content: "\e606";
+  content: "\e606";
 }
 
 .icon-qianggou:before {
-	content: "\e619";
+  content: "\e619";
 }
 
 .icon-cantuan:before {
-	content: "\ec43";
+  content: "\ec43";
 }
 
 .icon-liebiaoxingshi:before {
-	content: "\e742";
+  content: "\e742";
 }
 
 .icon-shitugonggeListBox:before {
-	content: "\e7ca";
+  content: "\e7ca";
 }
 
 .icon-weixin:before {
-	content: "\e73b";
+  content: "\e73b";
 }
 
 .icon-duihao:before {
-	content: "\e684";
+  content: "\e684";
 }
 
 .icon-yduishoucangshixin-copy:before {
-	content: "\e8bf";
+  content: "\e8bf";
 }
 
 .icon-yduishoucangkongxin-copy:before {
-	content: "\e8c0";
+  content: "\e8c0";
 }
 
 .icon-yduishoucangkongxin:before {
-	content: "\e6ac";
+  content: "\e6ac";
 }
 
 .icon-yduishoucangshixin:before {
-	content: "\e6ad";
+  content: "\e6ad";
 }
 
 .icon-jiantouyou:before {
-	content: "\e62d";
+  content: "\e62d";
 }
 
 .icon-fenlei-copy:before {
-	content: "\e8bb";
+  content: "\e8bb";
 }
 
 .icon-shangpinfenlei-copy:before {
-	content: "\e8bc";
+  content: "\e8bc";
 }
 
 .icon-qiyejianjie-copy:before {
-	content: "\e8bd";
+  content: "\e8bd";
 }
 
 .icon-fenlei:before {
-	content: "\e605";
+  content: "\e605";
 }
 
 .icon-shangpinfenlei:before {
-	content: "\e62f";
+  content: "\e62f";
 }
 
 .icon-qiyejianjie:before {
-	content: "\e61d";
+  content: "\e61d";
 }
 
 .icon-gengduo:before {
-	content: "\e660";
+  content: "\e660";
 }
 
 .icon-shanchu:before {
-	content: "\e625";
+  content: "\e625";
 }
 
 .icon-dingweixiao:before {
-	content: "\e8ba";
+  content: "\e8ba";
 }
 
 .icon-shangdian-copy:before {
-	content: "\e8be";
+  content: "\e8be";
 }
 
 .icon-shangdian:before {
-	content: "\e67a";
+  content: "\e67a";
 }
 
 .icon-shangjiantou:before {
-	content: "\e603";
+  content: "\e603";
 }
 
 .icon-xiajiantou:before {
-	content: "\e604";
+  content: "\e604";
 }
 
 .icon-shangjiantou-copy:before {
-	content: "\e714";
+  content: "\e714";
 }
 
 .icon-xiajiantou-copy:before {
-	content: "\e715";
+  content: "\e715";
 }
 
 .icon-del-copy:before {
-	content: "\e716";
+  content: "\e716";
 }
 
 .icon-del:before {
-	content: "\e616";
+  content: "\e616";
 }
 
 .icon-fanhuidingbu:before {
-	content: "\e713";
+  content: "\e713";
 }
 
 .icon-gouwuche:before {
-	content: "\e628";
+  content: "\e628";
 }
 
 .icon-dayufuhao:before {
-	content: "\e62b";
+  content: "\e62b";
 }
 
 .icon-daifahuo:before {
-	content: "\e600";
+  content: "\e600";
 }
 
 .icon-daifukuan:before {
-	content: "\e601";
+  content: "\e601";
 }
 
 .icon-shouhoufuwuicon:before {
-	content: "\e633";
+  content: "\e633";
 }
 
 .icon-geren2:before {
-	content: "\e6bc";
+  content: "\e6bc";
 }
 
 .icon-daishouhuo:before {
-	content: "\e612";
+  content: "\e612";
 }
 
 .icon-daipinglun:before {
-	content: "\e602";
+  content: "\e602";
 }

pages.json

@@ -222,6 +222,13 @@
 						"enablePullDownRefresh": true
 					}
 				},
+				{
+					"path": "notice/index",
+					"style": {
+						"navigationBarTitleText": "消息通知",
+						"enablePullDownRefresh": true
+					}
+				},
 				{
 					"path": "market/type",
 					"style": {

pages/home/index.vue

@@ -5,8 +5,15 @@
 			<view class="list-scroll-view">
 				<view class="main">
 					<view class="zero one">
-						<input type="text" placeholder="搜索商品" @tap="toCommon('pagesHome/market/search')"
-							placeholder-class="placss">
+						<view class="one_1">
+							<input type="text" placeholder="搜索商品" @tap="toCommon('pagesHome/market/search')"
+								placeholder-class="placss">
+						</view>
+						<view class="one_2" @tap="toNotice()">
+							<uni-badge :text="notice_total" absolute="rightTop" size="normal">
+								<text class="iconfont icon-xiaoxitongzhi"></text>
+							</uni-badge>
+						</view>
 					</view>
 					<view class="zero two">
 						<swiper class="swiper" circular :indicator-dots="true" indicator-color="#ffffff"
@@ -120,14 +127,17 @@
 				skip: 0,
 				limit: 10,
 				page: 0,
+				// 未读消息
+				notice_total:0,
 				// 返回顶部
 				scrollTop: 0,
 				old_scrollTop: 0
 			};
 		},
-		onLoad: function() {
+		onLoad:async function() {
 			const that = this;
-			that.search();
+			await that.search();
+			await that.notice();
 		},
 		onPullDownRefresh: async function() {
 			const that = this;
@@ -136,6 +146,20 @@
 			uni.stopPullDownRefresh();
 		},
 		methods: {
+			// 消息通知
+			notice(){
+				const that = this;
+				uni.getStorage({
+					key: 'token',
+					success: async (res) => {
+						let user = that.$jwt(res.data);
+						if (user && user._id) {
+							let res = await that.$api(`/notice`, 'GET',{customer: user._id,status:'0'});
+							if (res.errcode == '0') that.$set(that, `notice_total`,res.total);
+						}
+					}
+				})
+			},
 			async search() {
 				const that = this;
 				let res;
@@ -186,6 +210,12 @@
 					that.$set(that, `total`, res.total)
 				}
 			},
+			// 系统消息页
+			toNotice(){
+				uni.navigateTo({
+					url: `/pagesHome/notice/index`
+				})
+			},
 			// 公共跳转
 			toCommon(e) {
 				uni.navigateTo({
@@ -304,20 +334,33 @@
 		}
 
 		.one {
-			background-color: var(--fFB1Color);
-			border-radius: 20px;
-			padding: 0 2vw;
-
-			input {
-				font-size: var(--font15Size);
-				color: var(--fffColor);
-				border-radius: 14px;
-				width: 100%;
-				padding: 1.5vw 0;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			.one_1{
+				width: 88vw;
+				background-color: var(--fFB1Color);
+				border-radius: 20px;
+				padding: 0 2vw;
+				
+				input {
+					font-size: var(--font15Size);
+					color: var(--fffColor);
+					border-radius: 14px;
+					width: 100%;
+					padding: 1.5vw 0;
+				}
+				
+				.placss {
+					color: var(--fffColor);
+				}
 			}
-
-			.placss {
-				color: var(--fffColor);
+			.one_2{
+				width: 12vw;
+				text-align: center;
+				.iconfont{
+					font-size: 24px;
+				}
 			}
 
 		}

pagesHome/notice/index.vue

@@ -0,0 +1,216 @@
+<template>
+	<mobile-frame>
+		<view class="main">
+			<view class="one">
+				<scroll-view scroll-y="true" class="scroll-view" @scrolltolower="toPage">
+					<view class="list-scroll-view">
+						<view class="one_1" @tap="toNotice()"><text class="iconfont icon-a-qingchuquanbuyidu"></text>全部已读</view>
+						<view class="list" v-for="(item,index) in list" :key="index">
+							<uni-badge class="badge" :text="item.num" absolute="leftTop" size="normal">
+								<view class="list_1">
+									<view class="source">来源：<text>{{item.zhSource||'暂无'}}</text></view>
+									<view class="content">内容：<text>{{item.content||'暂无'}}</text></view>
+								</view>
+								<view class="list_2">
+									发送时间：<text>{{item.time||'暂无'}}</text>
+								</view>
+							</uni-badge>
+						</view>
+					</view>
+				</scroll-view>
+			</view>
+		</view>
+	</mobile-frame>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				user: {},
+				list: [],
+				// 状态
+				statusList:[],
+				// 来源
+				sourceList:[],
+				total: 0,
+				page: 0,
+				skip: 0,
+				limit: 10,
+			};
+		},
+		onShow: async function(e) {
+			const that = this;
+			await that.searchOther();
+			await that.watchLogin();
+		},
+		onPullDownRefresh: async function() {
+			const that = this;
+			that.clearPage();
+			await that.search();
+			uni.stopPullDownRefresh();
+		},
+		methods: {
+			// 监听用户是否登录
+			watchLogin() {
+				const that = this;
+				uni.getStorage({
+					key: 'token',
+					success: function(res) {
+						let user = that.$jwt(res.data);
+						that.$set(that, `user`, user);
+						that.search()
+					},
+					fail: function(err) {
+						uni.navigateTo({
+							url: `/pages/login/index`
+						})
+					}
+				})
+			},
+			// 查询列表
+			async search() {
+				const that = this;
+					let info = {
+						skip: that.skip,
+						limit: that.limit,
+						customer:that.user._id
+					}
+					const res = await that.$api(`/notice`, `GET`, {
+						...info,
+					})
+					if (res.errcode == '0') {
+						let list = [...that.list, ...res.data];
+						for (let val of list) {
+							if (val.status) val.zhStatus = that.searchStatus(val.status)
+							if (val.source) val.zhSource = that.searchSource(val.source)
+							if(val.status!='1')val.num=1
+						}
+						that.$set(that, `list`, list)
+						that.$set(that, `total`, res.total)
+				}
+			},
+			// 查询状态
+			searchStatus(e) {
+				const that = this;
+				let data = that.statusList.find((i) => i.value == e);
+				if (data) return data.label
+				else return '暂无'
+			},
+			// 查询来源
+			searchSource(e) {
+				const that = this;
+				let data = that.sourceList.find((i) => i.value == e);
+				if (data) return data.label
+				else return '暂无'
+			},
+			// 全部已读
+			async toNotice(){
+				const that = this;
+				let list =that.list.filter((i) => i.status != '1');
+				for (let val of list) {
+					const res = await that.$api(`/notice/${val._id}`, `POST`, {
+						status:'1'
+					})
+					if (res.errcode == '0') {
+						that.clearPage();
+						that.search();
+					}
+				}
+			},
+			// 查询其他信息
+			async searchOther() {
+				const that = this;
+				let res;
+				res = await that.$api(`/dictData`, 'GET', {
+					code: "notice_status"
+				});
+				if (res.errcode == '0') that.$set(that, `statusList`, res.data)
+				res = await that.$api(`/dictData`, 'GET', {
+					code: "notice_source"
+				});
+				if (res.errcode == '0') that.$set(that, `sourceList`, res.data)
+			},
+			// 分页
+			toPage() {
+				const that = this;
+				let list = that.list;
+				let limit = that.limit;
+				if (that.total > list.length) {
+					uni.showLoading({
+						title: '加载中',
+						mask: true
+					})
+					let page = that.page + 1;
+					that.$set(that, `page`, page)
+					let skip = page * limit;
+					that.$set(that, `skip`, skip)
+					that.search();
+					uni.hideLoading();
+				} else {}
+			},
+			// 清空列表
+			clearPage() {
+				const that = this;
+				that.$set(that, `list`, [])
+				that.$set(that, `skip`, 0)
+				that.$set(that, `limit`, 6)
+				that.$set(that, `page`, 0)
+			}
+		},
+
+	}
+</script>
+
+<style lang="scss">
+	.main {
+		.one {
+			.one_1{
+				padding: 2vw;
+				text-align: center;
+				.iconfont{
+					color:#707070;	
+				}
+				color:#707070;
+			}
+			.list {
+				display: flex;
+				justify-content: space-between;
+				margin: 2vw 2vw 0 2vw;
+				padding: 2vw;
+				border-radius: 5px;
+				border: 1px solid #f5f5f5;;
+				.badge{
+					display: flex;
+					justify-content: space-between;
+					.list_1{
+						padding: 2vw 0 0 0;
+						font-size: 14px;
+						text{
+							color: var(--f85Color);
+						}
+					}
+					.list_2{
+						font-size: 12px;
+						text{
+							color: var(--f85Color);
+						}
+					}
+				}
+			}
+		}
+	}
+
+	.scroll-view {
+		position: absolute;
+		top: 0;
+		left: 0;
+		right: 0;
+		bottom: 0;
+
+		.list-scroll-view {
+			display: flex;
+			flex-direction: column;
+		}
+	}
+</style>

pagesMy/assets/index.vue

@@ -5,9 +5,9 @@
 				<view class="one_1">
 					<text>¥</text><text>{{money}}</text>
 				</view>
-				<!-- <view class="one_2" @tap="toCash">
+				<view class="one_2" @tap="toCash">
 					<button type="default" size="mini">提现</button>
-				</view> -->
+				</view>
 			</view>
 			<view class="two">
 				<tabs :tabs="tabs" @tabsChange="tabsChange">
@@ -21,7 +21,7 @@
 											<view class="time">{{item.time}}</view>
 										</view>
 										<view class="other_2">
-											<view class="money">{{item.money}}</view>
+											<view class="money"><text>{{item.source=='-2'||item.source=='-1'?'-':'+'}}</text> {{item.money}}</view>
 											<text class="iconfont icon-jiantouyou"></text>
 										</view>
 									</view>
@@ -31,7 +31,7 @@
 											<view class="time">{{item.apply_time}}</view>
 										</view>
 										<view class="other_2">
-											<view class="money">{{item.money}}</view>
+											<view class="money">-{{item.money}}</view>
 											<text class="iconfont icon-jiantouyou"></text>
 										</view>
 									</view>
@@ -48,13 +48,19 @@
 		<uni-popup ref="popup" background-color="#fff" type="bottom">
 			<view class="popup">
 				<uni-forms ref="form" :rules="rules" :model="form" label-width="auto">
-					<uni-forms-item label="姓名" name="name">
-						<uni-easyinput disabled v-model="form.name" placeholder="请输入姓名" />
+					<uni-forms-item label="真实姓名" name="card_name">
+						<uni-easyinput v-model="form.card_name" placeholder="请输入真实姓名" />
+					</uni-forms-item>
+					<uni-forms-item label="所属银行" name="card_bank">
+						<uni-easyinput v-model="form.card_bank" placeholder="请输入所属银行" />
+					</uni-forms-item>
+					<uni-forms-item label="银行卡号" name="card">
+						<uni-easyinput v-model="form.card" placeholder="请输入银行卡号" />
 					</uni-forms-item>
 					<uni-forms-item label="提现金额" name="money">
 						<uni-easyinput type="digit" v-model="form.money" @input="toMoney" placeholder="请输入提现金额" />
 						<view class="money">
-							可提现金额为{{moneyInfo.payTotal||0}},<text @tap="toAll">全部提现</text>
+							可提现金额为{{canGet||0}}(收货{{config.reward_day}}天以后才可提现),<text @tap="toAll">全部提现</text>
 						</view>
 					</uni-forms-item>
 					<uni-forms-item label="提现理由" name="apply_reason">
@@ -96,10 +102,28 @@
 					]
 				},
 				// 提现金额
-				moneyInfo: {},
+				canGet: 0,
 				// 提现
 				form: {},
 				rules: {
+					card_name: {
+						rules: [{
+							required: true,
+							errorMessage: '请输入真实姓名',
+						}]
+					},
+					card_bank: {
+						rules: [{
+							required: true,
+							errorMessage: '请输入所属银行',
+						}]
+					},
+					card: {
+						rules: [{
+							required: true,
+							errorMessage: '请输入银行卡号',
+						}]
+					},
 					money: {
 						rules: [{
 							required: true,
@@ -196,7 +220,10 @@
 					let arr = await that.$api(`/cashBack/computedTotal`, 'GET', {
 						customer: user._id
 					})
-					if (arr.errcode == '0') that.$set(that, `money`, arr.data);
+					if (arr.errcode == '0'){
+						 that.$set(that, `money`, arr.data.total);
+						 that.$set(that, `canGet`, arr.data.canGet);
+					}
 				}
 			},
 			// 查询其他信息
@@ -254,14 +281,13 @@
 			// 提现
 			toCash() {
 				const that = this;
-				let user = that.user;
-				that.$set(that.form, `name`, user.name)
+				that.$set(that, `form`, {})
 				that.$refs.popup.open()
 			},
 			// 提现金额
 			toMoney(value) {
 				const that = this;
-				let money = that.moneyInfo.payTotal;
+				let money = that.canGet;
 				if (parseFloat(value) > parseFloat(money)) {
 					uni.showToast({
 						title: '输入金额不能超过可提现金额',
@@ -272,36 +298,43 @@
 			// 全部提现
 			toAll() {
 				const that = this;
-				that.$set(that.form, `money`, that.moneyInfo.payTotal)
+				that.$set(that.form, `money`, that.canGet)
 			},
 			// 提交保存
 			async onSubmit(ref) {
 				const that = this;
-				let money = that.moneyInfo.payTotal;
+				let money = that.canGet;
 				that.$refs[ref].validate().then(async params => {
-					if (parseFloat(params.money) > parseFloat(money)) {
-						uni.showToast({
-							title: '输入金额不能超过可提现金额',
-							icon: 'none'
-						})
-					} else {
-						params.customer = that.user._id;
-						params.apply_time = moment().format('YYYY-MM-DD HH:mm:ss')
-						const arr = await that.$api(`/cashOut`, 'POST', params);
-						if (arr.errcode == '0') {
+					if(parseFloat(params.money)>0){
+						if (parseFloat(params.money) > parseFloat(money)) {
 							uni.showToast({
-								title: `提现申请成功`,
-								icon: 'success',
-							});
-							that.$refs.popup.close();
-							that.clearPage();
-							that.search()
-						} else {
-							uni.showToast({
-								title: arr.errmsg,
-								icon: 'none',
+								title: '输入金额不能超过可提现金额',
+								icon: 'none'
 							})
+						} else {
+							params.customer = that.user._id;
+							params.apply_time = moment().format('YYYY-MM-DD HH:mm:ss')
+							const arr = await that.$api(`/cashOut`, 'POST', params);
+							if (arr.errcode == '0') {
+								uni.showToast({
+									title: `提现申请成功`,
+									icon: 'success',
+								});
+								that.$refs.popup.close();
+								that.clearPage();
+								that.search()
+							} else {
+								uni.showToast({
+									title: arr.errmsg,
+									icon: 'none',
+								})
+							}
 						}
+					}else{
+						uni.showToast({
+							title: '输入金额不能为0',
+							icon: 'none'
+						})
 					}
 				})
 			},

pagesMy/assets/info.vue

@@ -4,53 +4,65 @@
 			<view class="info" v-if="type=='0'">
 				<view class="one">
 					<view class="left">返现金额</view>
-					<view class="right">+{{info.money}}</view>
+					<view class="right">+{{info.money||0}}</view>
 				</view>
 				<view class="two">
 					<view class="left">状态</view>
-					<view class="right">{{info.zhStatus}}</view>
+					<view class="right">{{info.zhStatus||'暂无'}}</view>
 				</view>
 				<view class="two">
 					<view class="left">返现时间</view>
-					<view class="right">{{info.time}}</view>
+					<view class="right">{{info.time||'暂无'}}</view>
 				</view>
 				<view class="two">
 					<view class="left">推荐人</view>
-					<view class="right">{{info.inviter_name}}</view>
+					<view class="right">{{info.inviter_name||'暂无'}}</view>
 				</view>
 				<view class="two">
 					<view class="left">来源</view>
-					<view class="right">{{info.zhSource}}</view>
+					<view class="right">{{info.zhSource||'暂无'}}</view>
 				</view>
 			</view>
 			<view class="info" v-else>
 				<view class="one">
 					<view class="left">提现金额</view>
-					<view class="right">-{{info.money}}</view>
+					<view class="right">-{{info.money||0}}</view>
+				</view>
+				<view class="two">
+					<view class="left">真实姓名</view>
+					<view class="right">{{info.card_name||'暂无'}}</view>
+				</view>
+				<view class="two">
+					<view class="left">所属银行</view>
+					<view class="right">{{info.card_bank||'暂无'}}</view>
+				</view>
+				<view class="two">
+					<view class="left">银行卡号</view>
+					<view class="right">{{info.card||'暂无'}}</view>
 				</view>
 				<view class="two">
 					<view class="left">审核处理人</view>
-					<view class="right">{{info.deal_person}}</view>
+					<view class="right">{{info.person_name||'暂无'}}</view>
 				</view>
 				<view class="two">
 					<view class="left">申请时间</view>
-					<view class="right">{{info.apply_time}}</view>
+					<view class="right">{{info.apply_time||'暂无'}}</view>
 				</view>
 				<view class="two">
 					<view class="left">审核时间</view>
-					<view class="right">{{info.exam_time}}</view>
+					<view class="right">{{info.exam_time||'暂无'}}</view>
 				</view>
 				<view class="two">
 					<view class="left">申请理由</view>
-					<view class="right">{{info.apply_reason}}</view>
+					<view class="right">{{info.apply_reason||'暂无'}}</view>
 				</view>
 				<view class="two">
 					<view class="left">审核理由</view>
-					<view class="right">{{info.exam_reason}}</view>
+					<view class="right">{{info.exam_reason||'暂无'}}</view>
 				</view>
 				<view class="two">
 					<view class="left">审核状态</view>
-					<view class="right">{{info.zhStatus}}</view>
+					<view class="right">{{info.zhStatus||'暂无'}}</view>
 				</view>
 			</view>
 		</view>
@@ -134,6 +146,9 @@
 									if (arr.errcode == '0') {
 										let status = that.cashstatusList.find(i => i.value == arr.data.status)
 										if (status) arr.data.zhStatus = status.label;
+										// 审核处理人信息
+										let res = await that.$api(`/admin/${arr.data.deal_person}`, 'GET');
+										if (res.errcode == '0') arr.data.person_name = res?.data?.name
 										that.$set(that, `info`, arr.data)
 									}
 								}

pagesMy/order/service.vue

@@ -286,10 +286,19 @@
 				const that = this;
 				let status = that.status;
 				that.$refs[ref].validate().then(async params => {
-					if (status == '3') {
-						that.Receip(params)
+					// 判断是否团长提现完成 如果提现成功不能退款 过了规定日期
+					let arr = await that.$api(`/groupAfterSale/canRefund/${that.id}`, 'GET', {},'group');
+					if (arr.data == true) {
+						if (status == '3') {
+							that.Receip(params)
+						} else {
+							that.orderCancel(params)
+						}
 					} else {
-						that.orderCancel(params)
+						uni.showToast({
+							title: '该商品时间超时不允许退款或退货',
+							icon: 'none'
+						})
 					}
 				})
 			},