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

pages/components/notice-index.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="dl-notice-box-index">
 		<!-- 标题 -->
-		<view class="dl-title">
+		<view :class="['dl-title','01'==nowUserType?'dl-tgz':'']">
 			<view class="right-text">
 				<text class="dl-text">通告</text>
 			</view>
@@ -208,6 +208,12 @@
 		treeCity
 	} from '@/api/business/base.js'
 	export default {
+		props: {
+			nowUserType: {
+				type: String,
+				default: null
+			}
+		},
 		components: {
 			noticeItem
 		},
@@ -616,7 +622,7 @@
 	}
 
 	.dl-notice-box-index {
-		padding-top: var(--status-bar-height);
+		// padding-top: var(--status-bar-height);
 		width: 100%;
 		color: #363636;
 		background-color: white;
@@ -628,13 +634,20 @@
 		justify-content: start;
 		position: relative;
 
+		.dl-tgz {
+			background-color: #4260ff !important;
+		}
 
 		.dl-title {
 			width: 100%;
 			display: flex;
 			position: relative;
 			z-index: 10;
-			padding: 25rpx 10rpx 10rpx 15rpx;
+			padding-top: calc(var(--status-bar-height) + 25rpx);
+			padding-left: 15rpx;
+			padding-right: 10rpx;
+			padding-bottom: 10rpx;
+			// padding: 25rpx 10rpx 10rpx 15rpx;
 			border-bottom: 1px solid #F4F4F4;
 
 

pages/index.vue

@@ -3,7 +3,8 @@
 		<!-- 主体区域 -->
 		<view class="content-body">
 			<!-- 通告列表页 -->
-			<notice-index ref="noticeIndex" v-if="'home'==menuCode" @openVip="openVip"></notice-index>
+			<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"
 				@refreshUserType="refreshUserType()"></mine-index>
 			<subscribe v-if="'dingyue'==menuCode"></subscribe>
@@ -103,6 +104,7 @@
 			this.refreshUserType()
 		},
 		onShow() {
+			this.$refs.minePage.getDetail()
 			this.refreshUserType()
 			setTimeout(() => {
 				this.checkUserIfLogin()
@@ -113,7 +115,7 @@
 				this.menuCode = param.menuCode
 			}
 			this.selectSiteConfig("platform_tel")
-      this.selectSiteConfig("join_community")
+			this.selectSiteConfig("join_community")
 			let that = this
 
 		},
@@ -249,8 +251,8 @@
 						} else if (constant.wechat_img == item.name) {
 							setStrData(constant.wechat_img, item.value)
 						} else if (constant.join_str == item.name) {
-              setStrData(constant.join_str, item.value)
-            }
+							setStrData(constant.join_str, item.value)
+						}
 					})
 				}).catch((e) => {
 					uni.showToast({

pages/mine/card/card-detail.vue

@@ -342,8 +342,6 @@
 		padding-top: calc(90rpx + var(--status-bar-height));
 		border-top: 1rpx solid #F4F4F4;
 		background-color: white;
-		padding-left: 30rpx;
-		padding-right: 30rpx;
 		width: 100%;
 		color: #363636;
 		font-size: 30rpx;
@@ -358,7 +356,7 @@
 			height: calc(100vh - var(--status-bar-height) - var(--window-bottom) - 95rpx);
 			overflow-y: scroll;
 			width: 100%;
-			padding: 20rpx;
+			padding: 20rpx 30rpx;
 			background-color: white;
 			border-radius: 20rpx;
 			display: flex;

pages/mine/member/member-index.vue

@@ -14,21 +14,21 @@
 					</view>
 					<view v-if="null != member.identityName" class="renzheng-dom">
 						<image src="@/static/mine/auth/renzhen.png" mode="aspectFit"></image>
-            认证{{ member.identityName }}
+						认证{{ member.identityName }}
+					</view>
+					<view v-else class="renzheng-dom">
+						未认证
 					</view>
-          <view v-else class="renzheng-dom">
-            未认证
-          </view>
 				</view>
 				<view class="opt-box">
 					<view class="guanzhu" v-if="!isLove" @click="forkUser('1')">关注</view>
 					<view class="guanzhu" v-if="isLove" @click="forkUser('0')">取消关注</view>
 				</view>
 			</view>
-<!--			<view class="bozhu-type-box">-->
-<!--				<view class="item-dom">好物</view>-->
-<!--				<view class="item-dom">颜值</view>-->
-<!--			</view>-->
+			<!--			<view class="bozhu-type-box">-->
+			<!--				<view class="item-dom">好物</view>-->
+			<!--				<view class="item-dom">颜值</view>-->
+			<!--			</view>-->
 			<view class="pingjia-box">
 				<view class="pingjia-content">
 					<view class="top-title">
@@ -36,7 +36,9 @@
 						合作博主评价：
 					</view>
 					<view class="item-box">
-						<view v-for="item in member.evaluates" class="item-dom">{{item.evaluate}}(<text>{{ item.num }}</text>)</view>
+						<view v-for="item in member.evaluates" class="item-dom">
+							{{item.evaluate}}(<text>{{ item.num }}</text>)
+						</view>
 					</view>
 				</view>
 			</view>
@@ -47,7 +49,7 @@
 			<view class="data-list-box">
 				<scroll-view style="height: 100%;" scroll-y="true" @scrolltolower="onReachBottomCus" refresher-enabled
 					@refresherrefresh="onRefresherrefresh" :refresher-triggered="isTriggered">
-					<notice-item v-if="dataList.length>0" :dataList="dataList" ></notice-item>
+					<notice-item v-if="dataList.length>0" :dataList="dataList"></notice-item>
 					<view style="text-align: center" v-if="dataList.length==0">
 						<image class="" src="@/static/images/nothing.png"></image>
 					</view>
@@ -58,13 +60,21 @@
 </template>
 
 <script>
-	import {toast} from '@/utils/common.js'
-  import {queryListByUserId} from '@/api/business/notice.js'
-  import {announcerDetail} from '@/api/business/member.js'
+	import {
+		toast
+	} from '@/utils/common.js'
+	import {
+		queryListByUserId
+	} from '@/api/business/notice.js'
+	import {
+		announcerDetail
+	} from '@/api/business/member.js'
 	import noticeItem from '@/pages/components/notice-item.vue'
 	import navigationBarVue from '@/components/navigation/navigationBar.vue';
-  import config from '@/config'
-  import {postForkUser} from '@/api/business/base.js'
+	import config from '@/config'
+	import {
+		postForkUser
+	} from '@/api/business/base.js'
 	export default {
 		components: {
 			navigationBarVue,
@@ -72,83 +82,83 @@
 		},
 		data() {
 			return {
-        imageUrl: '',
-			  member:{},
+				imageUrl: '',
+				member: {},
 				dataList: ['', ''],
 				queryParams: {
 					pageNum: 1,
 					pageSize: 10,
-          userId:null,
-          status:'进行中',
+					userId: null,
+					status: '进行中',
 				},
-        userId:null,
+				userId: null,
 				total: 0,
 				//下来刷新状态
 				isTriggered: false,
-        //当前用户是否关注该博主
-        isLove: false,
+				//当前用户是否关注该博主
+				isLove: false,
 			}
 		},
 
-    onLoad(option){
-		  this.userId = option.userId
-      this.queryParams.userId = option.userId
-      this.isLove = option.isLove
-      this.initMember()
-      this.initNotice()
-    },
+		onLoad(option) {
+			this.userId = option.userId
+			this.queryParams.userId = option.userId
+			this.isLove = option.isLove
+			this.initMember()
+			this.initNotice()
+		},
 
 		methods: {
 
-      /**
-       * 关注、取消关注
-       * @param {Object} isLove
-       */
-      forkUser(isLove) {
-        postForkUser({
-          userId: this.userId,
-          isLove: isLove
-        }).then(res => {
-          if (res.code == 200) {
-            uni.showToast({
-              icon: 'success',
-              duration: 2000,
-              title: '操作成功'
-            });
-            this.isLove = isLove == '1'
-          }
-        }).catch((e) => {
-          uni.showToast({
-            icon: 'error',
-            duration: 2000,
-            title: e
-          });
-        })
-      },
+			/**
+			 * 关注、取消关注
+			 * @param {Object} isLove
+			 */
+			forkUser(isLove) {
+				postForkUser({
+					userId: this.userId,
+					isLove: isLove
+				}).then(res => {
+					if (res.code == 200) {
+						uni.showToast({
+							icon: 'success',
+							duration: 2000,
+							title: '操作成功'
+						});
+						this.isLove = isLove == '1'
+					}
+				}).catch((e) => {
+					uni.showToast({
+						icon: 'error',
+						duration: 2000,
+						title: e
+					});
+				})
+			},
 
-		  /**出初始化通告主详情*/
-		  initMember(){
-        announcerDetail(this.userId).then(res=>{
-          if (res.code ==200){
-            this.member = res.data
-          }
-        })
-      },
+			/**出初始化通告主详情*/
+			initMember() {
+				announcerDetail(this.userId).then(res => {
+					if (res.code == 200) {
+						this.member = res.data
+					}
+				})
+			},
 
-      /**初始化通告列表*/
-      initNotice(){
-        queryListByUserId(this.queryParams).then(res=>{
-          this.isTriggered = false
-          if (res.code == 200){
-            if (this.queryParams.pageNum == 1) {
-              this.dataList = res.data.records
-            } else {
-              this.dataList = this.dataList.concat(res.data.records)
-            }
-            this.total = res.data.total
-          }
-        })
-      },
+			/**初始化通告列表*/
+			initNotice() {
+				queryListByUserId(this.queryParams).then(res => {
+					this.isTriggered = false
+					if (res.code == 200) {
+						if (this.queryParams.pageNum == 1) {
+							this.dataList = res.data.records
+						} else {
+							this.dataList = this.dataList.concat(res.data.records)
+						}
+						this.total = res.data.total
+					}
+				})
+			},
 
 			/**
 			 * 上滑加载数据
@@ -161,7 +171,7 @@
 				}
 				//页码+1,调用获取数据的方法获取第二页数据
 				this.queryParams.pageNum++
-        this.initNotice()
+				this.initNotice()
 			},
 			/**
 			 * 下拉刷新数据
@@ -170,7 +180,7 @@
 				this.isTriggered = true
 				this.queryParams.pageNum = 1
 				this.total = 0
-        this.initNotice()
+				this.initNotice()
 			},
 		}
 	}
@@ -192,6 +202,8 @@
 		position: relative;
 
 		.choose-detail {
+			height: calc(100vh - 150rpx);
+			overflow-y: scroll;
 			border-top: 1rpx solid #F4F4F4;
 			width: 100%;
 			background-color: #F2F2F2;
@@ -394,4 +406,4 @@
 			}
 		}
 	}
-</style>
+</style>

pages/mine/mine-index.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="mine-container">
 		<!-- 切换身份 -->
-		<view :class="['dl-title',ifHasCard?'has-member-card':''] ">
+		<view :class="['dl-title','01'==localUserType?'dl-tgz':''] ">
 			<view class="left-search" @click="changeUserType('01'==localUserType?'02':'01')">
 				<image v-if="!ifHasCard" class="dl-image" src="@/static/mine/qiehuan.png" mode="aspectFit"></image>
 				<image v-else class="dl-image" src="@/static/mine/change_member.png" mode="aspectFit"></image>
@@ -9,7 +9,7 @@
 			</view>
 		</view>
 		<!-- 头像信息 -->
-		<view :class="['dl-person-box',ifHasCard?'has-member-card':''] ">
+		<view :class="['dl-person-box'] ">
 			<view class="user-image-box">
 				<view class="dl-image-box">
 					<image v-if="!userInfo.avatar" class="touxiang" src="@/static/images/profile.jpg"
@@ -140,10 +140,10 @@
 				<view class="box-room">
 					<view class="detail-title">其他信息</view>
 					<view class="menu-box">
-						 <view class="menu-item" @click="viewNewPeople()">
-						<image src="@/static/mine/caise/shouce.png" mode="aspectFit"></image>
-						<view>新人手册</view>
-					</view>
+						<view class="menu-item" @click="viewNewPeople()">
+							<image src="@/static/mine/caise/shouce.png" mode="aspectFit"></image>
+							<view>新人手册</view>
+						</view>
 						<view class="menu-item" style="position: relative;">
 							<!-- <image src="@/static/mine/kefu.png" mode="aspectFit"></image> -->
 							<image src="@/static/mine/caise/kefu.png" mode="aspectFit"></image>
@@ -230,8 +230,8 @@
 				imageUrl: '',
 				//公众号二维码
 				wechat_img: constant.wechat_img,
-        //加入社区
-        join_str: constant.join_str,
+				//加入社区
+				join_str: constant.join_str,
 				//客服二维码
 				customer_service: constant.customer_service,
 				//弹窗照片
@@ -288,24 +288,24 @@
 			dialogConfirm() {
 				this.goPoints()
 			},
-      toggle(type, key) {
-        this.type = type
-        if (type == 'center') {
-          //公众号跳转
-          wx.openOfficialAccountProfile({
-            username: 'tonggaokuaijie', // 此处填写公众号的微信号
-            success: res => {},
-            fail: res => {}
-          })
-        }
-      },
+			toggle(type, key) {
+				this.type = type
+				if (type == 'center') {
+					//公众号跳转
+					wx.openOfficialAccountProfile({
+						username: 'tonggaokuaijie', // 此处填写公众号的微信号
+						success: res => {},
+						fail: res => {}
+					})
+				}
+			},
 
-      getCommunity(type, key){
-        this.type = type
-        this.popupImgUrl = getStrData(key)
-        // open 方法传入参数 等同在 uni-popup 组件上绑定 type属性
-        this.$refs.popup.open(type)
-      },
+			getCommunity(type, key) {
+				this.type = type
+				this.popupImgUrl = getStrData(key)
+				// open 方法传入参数 等同在 uni-popup 组件上绑定 type属性
+				this.$refs.popup.open(type)
+			},
 			getDetail() {
 				let param = {
 					userId: this.userInfo.userId,
@@ -393,33 +393,33 @@
 					.userId)
 			},
 			viewNewPeople() {
-			  if (this.localUserType == '02'){
-          uni.downloadFile({
-            url: 'https://www.ddtg.site/bz.docx',
-            success: function(res) {
-              var filePath = res.tempFilePath;
-              uni.openDocument({
-                filePath: filePath,
-                showMenu: true,
-                success: function(res) {}
-              });
-            }
-          });
-        } else {
-          uni.downloadFile({
-            url: 'https://www.ddtg.site/tgz.docx',
-            success: function(res) {
-              var filePath = res.tempFilePath;
-              uni.openDocument({
-                filePath: filePath,
-                showMenu: true,
-                success: function(res) {}
-              });
-            }
-          });
-        }
+				if (this.localUserType == '02') {
+					uni.downloadFile({
+						url: 'https://www.ddtg.site/bz.docx',
+						success: function(res) {
+							var filePath = res.tempFilePath;
+							uni.openDocument({
+								filePath: filePath,
+								showMenu: true,
+								success: function(res) {}
+							});
+						}
+					});
+				} else {
+					uni.downloadFile({
+						url: 'https://www.ddtg.site/tgz.docx',
+						success: function(res) {
+							var filePath = res.tempFilePath;
+							uni.openDocument({
+								filePath: filePath,
+								showMenu: true,
+								success: function(res) {}
+							});
+						}
+					});
+				}
 
-        // this.$tab.navigateTo(
+				// this.$tab.navigateTo(
 				// 	`/pages/common/richview/index?title=${this.globalConfig.appInfo.agreements[3].title}&code=${this.globalConfig.appInfo.agreements[3].code}`
 				// )
 			}
@@ -491,6 +491,10 @@
 			}
 		}
 
+		.dl-tgz {
+			background-color: #4260ff !important;
+		}
+
 
 		.dl-person-box {
 			width: 100%;
@@ -611,12 +615,14 @@
 				justify-content: center;
 				height: 100rpx;
 				width: 100%;
-				background: url('/static/index/member-bg.png');
-				background-size: 100% 100%;
-				background-position: center;
-				/* 图片居中显示 */
-				background-repeat: no-repeat;
-				/* 不重复背景图片 */
+				color: #ffffff;
+				background-color: #1c1c1c;
+				// background: url('/static/index/member-bg.png');
+				// background-size: 100% 100%;
+				// /* 图片居中显示 */
+				// background-position: center;
+				// /* 不重复背景图片 */
+				// background-repeat: no-repeat;
 
 				.dl-left {
 					display: flex;
@@ -624,7 +630,7 @@
 					padding-left: 30rpx;
 					align-items: center;
 					font-size: 30rpx;
-					color: #623109;
+					// color: #623109;
 					justify-content: left;
 
 					.dl-icon {
@@ -642,8 +648,8 @@
 						display: flex;
 						align-items: center;
 						justify-content: center;
-						background-color: #F5D8A5;
-						color: #623109;
+						background: linear-gradient(to right, #f4e6a5, #f2c479);
+						color: #461c00;
 						padding: 10rpx 25rpx;
 						float: right;
 						border-radius: 30rpx;
@@ -898,4 +904,4 @@
 			}
 		}
 	}
-</style>
+</style>