Merge branch 'master' of http://47.115.223.229:8888/yangjun/sadjv3_user

pages/index/index.vue

@@ -2919,7 +2919,10 @@
 	.smrz {
 	    display: flex;
 	    justify-content: space-between;
+		margin-top: 5px;
 		padding-left: 20%;
 		padding-right: 20%;
+	    /* padding-left: 48%;
+	    padding-right: 5px; */
 	}
 </style>

pages/my/index.vue

@@ -97,28 +97,40 @@
 			<view class="my-serve-title">我的服务</view>
 			<view class="my-serve-view">
 				<view class="my-serve-list" @click="meServe('服务套餐')">
+					<div class="wdfw-dsy" v-show="wdfwTj.fwtc>0">
+					</div>
 					<image src="../../static/my-fuwu.png" mode=""></image>
 					<span class="my-serve-list-text">服务套餐</span>
 				</view>
 				<view class="my-serve-list" @click="meServe('项目次卡')">
+					<div class="wdfw-dsy" v-show="wdfwTj.xmck>0">
+					</div>
 					<image src="../../static/my-cika.png" mode=""></image>
 					<span class="my-serve-list-text">项目次卡</span>
 				</view>
 				<view class="my-serve-list" @click="meServe('服务疗程')">
+					<div class="wdfw-dsy" v-show="wdfwTj.fwlc>0">
+					</div>
 					<image src="../../static/my-liaocheng.png" mode=""></image>
 					<span class="my-serve-list-text">服务疗程</span>
 				</view>
 			</view>
 			<view class="my-serve-view">
 				<view class="my-serve-list" @click="tuangou()">
+					<div class="wdfw-dsy" v-show="wdfwTj.pt>0">
+					</div>
 					<image src="../../static/my-liaocheng2.png" mode=""></image>
 					<span class="my-serve-list-text">拼团</span>
 				</view>
 				<view class="my-serve-list" @click="miaoshao()">
+					<div class="wdfw-dsy" v-show="wdfwTj.xsms>0">
+					</div>
 					<image src="../../static/my-liaocheng3.png" mode=""></image>
 					<span class="my-serve-list-text">限时秒杀</span>
 				</view>
 				<view class="my-serve-list" @click="qiye()">
+					<div class="wdfw-dsy" v-show="wdfwTj.qyyy>0">
+					</div>
 					<image src="../../static/my-liaocheng1.png" mode=""></image>
 					<span class="my-serve-list-text">企业预约</span>
 				</view>
@@ -304,6 +316,14 @@
 				blIsQds: '', //1是渠道商 0不是渠道商
 				kfInterval: null, //是否有新客服消息逻辑定时任务
 				haveNewMsg: false, //是否有新消息
+				wdfwTj: { //我得服务各内容未使用数量统计 个别服务统计结果并非最终未使用数 不能作为未使用数量依据
+					fwtc: 0,
+					xmck: 0,
+					fwlc: 0,
+					pt: 0,
+					xsms: 0,
+					qyyy: 0
+				},
 			}
 		},
 		onLoad(e) {
@@ -316,6 +336,7 @@
 			this.getDataX()
 		},
 		onShow() {
+			this.queryKytcs()
 			this.hyCheck = this.$queue.getData('hyCheck');
 			this.tgCheck = this.$queue.getData('tgCheck');
 			this.userId = uni.getStorageSync('userId')
@@ -345,6 +366,43 @@
 			}
 		},
 		methods: {
+			//查询可用套餐数量
+			queryKytcs() {
+				let that = this
+				this.$Request.get('/app/user/package/queryKytcs', {
+					userId: uni.getStorageSync('userId'),
+					type: '104'
+				}).then(res => {
+					if (res.data) {
+						res.data.forEach(item => {
+							if (item.type == 104) that.wdfwTj.fwtc = item.count
+							if (item.type == 105) that.wdfwTj.xmck = item.count
+							if (item.type == 106) that.wdfwTj.fwlc = item.count
+							if (item.type == 111) that.wdfwTj.pt = item.count
+							if (item.type == 112) that.wdfwTj.xsms = item.count
+							if (item.type == 114) that.wdfwTj.qyyy = item.count
+						});
+					} else {
+						that.wdfwTj = {
+							fwtc: 0,
+							xmck: 0,
+							fwlc: 0,
+							pt: 0,
+							xsms: 0,
+							qyyy: 0
+						}
+					}
+				}).catch(res => {
+					that.wdfwTj = {
+						fwtc: 0,
+						xmck: 0,
+						fwlc: 0,
+						pt: 0,
+						xsms: 0,
+						qyyy: 0
+					}
+				})
+			},
 			selectMsg() {
 				let keFuLastMsgCount = this.$queue.getData('keFuLastMsgCount');
 				let keFuNewMsgCount = this.$queue.getData('keFuNewMsgCount');
@@ -1071,6 +1129,7 @@
 		flex-direction: column;
 		align-items: center;
 		justify-content: center;
+		position: relative;
 	}
 
 	.my-serve-list image {
@@ -1394,4 +1453,17 @@
 		height: auto;
 		/* 自动调整高度 */
 	}
+
+	.wdfw-dsy {
+		position: absolute;
+		top: 0px;
+		right: 8px;
+		width: 11px;
+		height: 11px;
+		display: inline-block;
+		background-color: #ff5b56;
+		border-radius: 12px;
+		border: 3px solid #fff;
+		z-index: 99;
+	}
 </style>