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

api/business/member.js

@@ -224,4 +224,12 @@ export function payout(data) {
 		method: 'post',
 		data: data
 	})
+}
+
+//判断是否领取过新人好礼 0否 1是
+export function isGetGift() {
+	return request({
+		url: '/member/member/isGetGift',
+		method: 'post'
+	})
 }

pages/index.vue

@@ -3,7 +3,7 @@
 		<!-- 主体区域 -->
 		<view class="content-body">
 			<!-- 通告列表页 -->
-			<notice-index v-if="'home'==menuCode" @openVip="openVip"></notice-index>
+			<notice-index ref="noticeIndex" v-if="'home'==menuCode" @openVip="openVip"></notice-index>
 			<mine-index ref="minePage" :key="nowUserType" :nowUserType="nowUserType" v-if="'my'==menuCode"
 				@refreshUserType="refreshUserType()"></mine-index>
 			<subscribe v-if="'dingyue'==menuCode"></subscribe>
@@ -38,7 +38,8 @@
 	} from '@/api/system/config.js'
 	import constant from '@/utils/constant'
 	import {
-		setStrData
+		setStrData,
+		getToken
 	} from '@/utils/auth.js'
 	import {
 		toast,
@@ -46,7 +47,8 @@
 	} from '@/utils/common.js'
 	import rightsCode from '@/utils/rightsCode'
 	import {
-		getMemberDetail
+		getMemberDetail,
+		isGetGift
 	} from '@/api/business/member.js'
 	export default {
 		components: {
@@ -95,8 +97,29 @@
 				this.menuCode = param.menuCode
 			}
 			this.selectSiteConfig("platform_tel")
+			this.checkUserIfLogin()
 		},
 		methods: {
+			/**
+			 * 判断用户是否登录
+			 */
+			checkUserIfLogin() {
+				debugger
+				if (getToken() && "" != getToken() && null != getToken()) {
+					//已登录。查后台判断是否已领取过新人礼
+					isGetGift().then(res => {
+						if (res.code == 200 && "1" == res.data) {
+							//已经领取过
+						} else {
+							//没领取，弹窗
+							this.$refs.noticeIndex.toggle()
+						}
+					})
+				} else {
+					//未登录，弹出领取新人礼
+					this.$refs.noticeIndex.toggle()
+				}
+			},
 			/**
 			 * 打开VIP弹窗
 			 */

pages/notice/public-notice.vue

@@ -559,6 +559,8 @@
 				if (this.validForm(this.dataObj)) {
 					return
 				}
+				let str = this.dataObj.detail.replace(/\n|\r\n/g, "<br>")
+				this.dataObj.detail = str
 				//待审核状态
 				this.dataObj.approvalStatus = '0'
 				if (this.fileList && this.fileList.length > 0) {