Merge branch 'master' of http://192.168.1.26:3000/dianliang/dl_uniapp

pages/components/subscribe.vue

@@ -77,7 +77,20 @@
 				bloggerTypeList: [],
 			}
 		},
+		onReady() {
+			console.log("onReady")
+		},
 		mounted() {
+			console.log("mounted")
+		},
+		onShow() {
+			console.log("onShow")
+		},
+		onLoad() {
+			console.log("onLoad")
+		},
+		mounted() {
+			console.log("mounted")
 			this.initData("dl_platform", "platformList")
 			this.initData("dl_blogger_type", "bloggerTypeList")
 			this.selectDataList()
@@ -180,6 +193,7 @@
 			 * 上滑加载数据
 			 */
 			onReachBottomCus() {
+				console.log("11111")
 				//判断 如果页码*页容量大于等于总条数，提示该页数据加载完毕
 				if (this.queryParams.pageNum * this.queryParams.pageSize >= this.total) {
 					toast("没有更多数据了")

pages/index.vue

@@ -5,9 +5,9 @@
 			<!-- 通告列表页 -->
 			<notice-index ref="noticeIndex" :nowUserType="nowUserType" v-if="'home'==menuCode"
 				@openVip="openVip"></notice-index>
-			<mine-index ref="minePage" :key="nowUserType" :nowUserType="nowUserType" v-if="'my'==menuCode"
+			<mine-index ref="minePageCus" :key="nowUserType" :nowUserType="nowUserType" v-if="'my'==menuCode"
 				@refreshUserType="refreshUserType()"></mine-index>
-			<subscribe :nowUserType="nowUserType" v-if="'dingyue'==menuCode"></subscribe>
+			<subscribe ref="subscribe" :nowUserType="nowUserType" v-if="'dingyue'==menuCode"></subscribe>
 			<my-notice ref="myNotice" :nowUserType="nowUserType"
 				v-if="'myNotice'==menuCode && '02'==nowUserType"></my-notice>
 			<my-notice-tg ref="myNoticeTg" :nowUserType="nowUserType"
@@ -98,7 +98,7 @@
 			},
 		},
 		onReady() {
-			this.$refs.minePage.getDetail()
+			this.$refs.minePageCus.getDetail()
 			this.$refs.myNotice.search()
 			this.$refs.myNoticeTg.search()
 		},
@@ -106,7 +106,18 @@
 			this.refreshUserType()
 		},
 		onShow() {
-			this.$refs.minePage.getDetail()
+			this.$nextTick(() => {
+				if (this.$refs.minePageCus) {
+					this.$refs.minePageCus.getDetail();
+				} else {
+					console.error('Component not found');
+				}
+				if (this.$refs.subscribe) {
+					this.$refs.subscribe.onRefresherrefresh();
+				} else {
+					console.error('Component not found');
+				}
+			});
 			this.refreshUserType()
 			setTimeout(() => {
 				this.checkUserIfLogin()

pages/mine/auth/auth-choose.vue

@@ -34,15 +34,15 @@
 				</view>
 				<image class="detail-right-img" src="@/static/mine/auth/geren.png" mode="aspectFit"></image>
 			</view>
-			<view class="item-detail" style="background-color: #F8F4FF;" @click="goForm('05')">
+			<view class="item-detail" style="background-color: #EDFFF1;" @click="goForm('05')">
 				<view class="detail-left-box">
 					<view class="left-top">
 						<image src="@/static/mine/auth/dian.png" mode="aspectFit"></image>
 						<text>转发PR</text>
 					</view>
-					<view class="left-bottom">如果你是以个人名义推广其他公司的产品，请选择“转发PR”</view>
+					<view class="left-bottom">如果你是转发其他平台的通告，请选择“转发PR”</view>
 				</view>
-				<image class="detail-right-img" src="@/static/mine/auth/geren.png" mode="aspectFit"></image>
+				<image class="detail-right-img" src="@/static/mine/auth/zhuanfaPR.png" mode="aspectFit"></image>
 			</view>
 			<view class="item-detail" style="background-color: #FEF8F3;" @click="goForm('04')">
 				<view class="detail-left-box">

pages/notice/subscribe-set.vue

@@ -334,17 +334,30 @@
 					this.dataObj[key] = []
 					this.dataObj[key].push(item.code)
 				} else {
-					let tempList = []
-					this.dataObj[key].push(item.code)
-					this.dataObj[key].forEach(it => {
-						if (it != '-1') {
-							tempList.push(it)
+					if (this.dataObj[key].includes(item.code)) {
+						//已选中，取消选中
+						let tempList = []
+						this.dataObj[key].forEach(it => {
+							if (it != '-1' && item.code != it) {
+								tempList.push(it)
+							}
+						})
+						if (tempList.length == 0) {
+							tempList.push("-1")
 						}
-					})
-					this.dataObj[key] = tempList
-
+						this.dataObj[key] = tempList
+					} else {
+						//未选中，选中
+						let tempList = []
+						this.dataObj[key].push(item.code)
+						this.dataObj[key].forEach(it => {
+							if (it != '-1') {
+								tempList.push(it)
+							}
+						})
+						this.dataObj[key] = tempList
+					}
 				}
-
 			},
 			/**
 			 * 添加关键词