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

api/business/member.js

@@ -1,6 +1,16 @@
 import upload from '@/utils/upload'
 import request from '@/utils/request'
 
+//------------------博主、通告主-----------------------
+//查询博主详情
+export function bloggerDetail(userId) {
+    return request({
+        url: '/member/member/bloggerDetail/' + userId,
+        method: 'get'
+    })
+}
+
+
 //------------------名片-----------------------
 // 查询当前登录用户的名片
 export function getUserBusiCard() {

pages/mine/mine-index.vue

@@ -137,9 +137,7 @@
 	import {
 		getJSONData
 	} from '@/utils/auth.js'
-	import {
-		bloggerDetail
-	} from '@/api/member/member.js'
+	import {bloggerDetail} from '@/api/business/member.js'
 	export default {
 		components: {
 			tabBarVue,
@@ -152,7 +150,7 @@
 			}
 		},
 		onLoad() {
-			nowUserType = getUserType()
+			this.nowUserType = getUserType()
 		},
 		mounted() {
 			if (null != getJSONData(constant.userInfo)) {

pages/notice/subscribe-set.vue

@@ -1,6 +1,8 @@
 <template>
 	<view class="dingyue-box">
-
+		<navigation-bar-vue style="width: 100%;" title="报名" background-color="#FFFFFF"
+			title-color="#3D3D3D"></navigation-bar-vue>
+		<view class="select-box-dom">
 			<view class="line-box">
 				<view class="dl-title">领域</view>
 				<view class="dl-content">
@@ -111,8 +113,8 @@
 								@change="switchChange($event,'newNotice')" />
 						</view>
 						<view class="seting-view"><text>订阅通告主新通告</text>
-						<switch v-if="dataObj.forkNotice" style="float: right;display: flex;" checked color="#FC1F3E"
-							@change="switchChange($event,'forkNotice')" />
+							<switch v-if="dataObj.forkNotice" style="float: right;display: flex;" checked
+								color="#FC1F3E" @change="switchChange($event,'forkNotice')" />
 							<switch v-else style="float: right;display: flex;" color="#FC1F3E"
 								@change="switchChange($event,'forkNotice')" />
 						</view>
@@ -122,6 +124,7 @@
 			<view class="line-box" style="align-items: center;">
 				<view class="submit-box" @click="saveSet()">保存</view>
 			</view>
+		</view>
 		<!-- 输入框示例 -->
 		<uni-popup ref="inputDialog" type="dialog" :key="keywordsValue">
 			<uni-popup-dialog ref="inputClose" mode="input" title="新增关键词" placeholder="请输入关键词"
@@ -131,6 +134,7 @@
 </template>
 
 <script>
+	import navigationBarVue from '@/components/navigation/navigationBar.vue';
 	import {
 		getCatgByCode
 	} from '@/api/system/config.js'
@@ -139,6 +143,9 @@
 		saveSubscribe
 	} from '@/api/business/subscribeSet.js'
 	export default {
+		components: {
+			navigationBarVue
+		},
 		data() {
 			return {
 				//一行显示几个
@@ -343,6 +350,7 @@
 
 <style lang="scss">
 	.dingyue-box {
+		padding-top: calc(90rpx + var(--status-bar-height));
 		border-top: 1rpx solid #F4F4F4;
 		width: 100%;
 		color: #363636;
@@ -355,6 +363,11 @@
 		justify-content: center;
 		position: relative;
 
+		.select-box-dom {
+			width: 100%;
+			height: calc(100vh - var(--status-bar-height) - var(--window-bottom) - 90rpx);
+			overflow-y: scroll;
+
 			.line-box {
 				width: 100%;
 				padding: 30rpx 30rpx 20rpx 30rpx;
@@ -473,4 +486,5 @@
 				}
 			}
 		}
+	}
 </style>