Explorar o código

修改:1.修复研究报告样式问题;2.修改订单表格按钮样式;3.会费缴交按钮样式

littleblue55 hai 21 horas
pai
achega
9bc23f017a

+ 1 - 1
pages/daiJiaoGeRenChaXunJieGuo/daiJiaoGeRenChaXunJieGuo.vue

@@ -60,7 +60,7 @@
 	import { ref } from 'vue'
 	import { onLoad } from '@dcloudio/uni-app'
 	import { person, personPayment, getSubPersonCastAgree } from '@/api/cost.js'
-	
+	import { msgError, msgSuccess } from '@/utils/common'
 	import { useAuthStore } from '@/store/authStore'
 	const authStore = useAuthStore()
 	

+ 0 - 1
pages/geRenHuiFeiJiaoJiao/geRenHuiFeiJiaoJiao.vue

@@ -114,7 +114,6 @@
 						uni.navigateBack()
 					},
 				  fail (res) {
-						// console.log('支付失败', res)
 						const errMsg = res.errMsg
 						if (errMsg.indexOf('fail cancel')) {
 							msgError('已取消支付')

+ 1 - 1
pages/goOnEdu/course/courseDetail/courseDetail.vue

@@ -346,7 +346,7 @@
 		return {
 			title: courseName.value,
 			path: `/pages/goOnEdu/course/courseDetail/courseDetail?id=${courseId.value}&title=${courseName.value}`,
-			// imageUrl: courseDetail.value.cover
+			imageUrl: courseDetail.value.cover
 		};
 	})
 

+ 2 - 1
pages/huiFeiJiaoJiao/huiFeiJiaoJiao.vue

@@ -31,7 +31,7 @@
 					{{item.payed ? '是' : '否'}}
 				</view> -->
 				<view class="list-item">
-					<view class="button" :class="[item.payed ? '' : 'error']" @click="onJiaoFei(item)">
+					<view class="button" :class="[item.payed ? 'primary' : 'error']" @click="onJiaoFei(item)">
 						{{item.payed ? '已缴费' : '点击缴费'}}
 					</view>
 				</view>
@@ -211,6 +211,7 @@
 					padding: 3px 0px;
 					width: 200rpx;
 					background-color: #0069f6;
+					color: #fff;
 				}
 				
 

+ 12 - 11
pages/jixujiaoyunianjian/jixujiaoyunianjian.vue

@@ -73,16 +73,17 @@
 	`)
 	function onXuexi(val) {
 		if (val.finish) {
-			uni.showModal({
-				title: '提示',
-				content: '本年度学分已完成,请您前往广州市房地产中介协会办理年检。地址:广州市越秀区越华路2号二楼',
-				showCancel: false,
-				confirmText: '确定',
-				success: function(res) {
-					if (res.confirm) {
-					}
-				}
-			})
+			return;
+			// uni.showModal({
+			// 	title: '提示',
+			// 	content: '本年度学分已完成,请您前往广州市房地产中介协会办理年检。地址:广州市越秀区越华路2号二楼',
+			// 	showCancel: false,
+			// 	confirmText: '确定',
+			// 	success: function(res) {
+			// 		if (res.confirm) {
+			// 		}
+			// 	}
+			// })
 		} else {
 			wx.navigateToMiniProgram({
 				appId: 'wx65323471c83da344', // 例如:wx1234567890abcdef
@@ -198,7 +199,7 @@
 					background-color: $uni-color-primary;
 				}
 				.error {
-					padding: 5rpx 15rpx;
+					padding: 5rpx 25rpx;
 					color: $uni-text-color-inverse;
 					background-color: $uni-color-error;
 				}

+ 84 - 69
pages/order/order.vue

@@ -2,43 +2,19 @@
 	<view class="container">
 		<view class="header-box">
 			<view class="search-box">
-				<u-search
-					v-model="searchForm.keyword"
-					:clearabled="true"
-					placeholder="搜索您想要的内容"
-					@search="onSearchConfirm"
-					@custom="onSearchConfirm"
-				></u-search>
+				<u-search v-model="searchForm.keyword" :clearabled="true" placeholder="搜索您想要的内容"
+					@search="onSearchConfirm" @custom="onSearchConfirm"></u-search>
 			</view>
 			<view class="tab-box" style="padding: 40rpx 0 35rpx;">
-				<u-tabs 
-					name="label"
-					:list="searchType"
-					:is-scroll="true"
-					v-model="searchForm.typeCurrent"
-					@change="onSearchTypeChange"
-					font-size="32"
-					inactive-color="#000000"
-					bg-color="'rgb(141, 204, 255)'"
-					active-color="#ffffff"
-					
-					:bar-style="{'background-color': '#2979ff'}"
-					:active-item-style="{'background-color': '#2979ff', 'border-radius':'30rpx'}"
-					:gutter="40"
-					height="55"
-					:show-bar="false"
-					duration="0"
-				></u-tabs>
+				<u-tabs name="label" :list="searchType" :is-scroll="true" v-model="searchForm.typeCurrent"
+					@change="onSearchTypeChange" font-size="32" inactive-color="#000000" bg-color="'rgb(141, 204, 255)'"
+					active-color="#ffffff" :bar-style="{'background-color': '#2979ff'}"
+					:active-item-style="{'background-color': '#2979ff', 'border-radius':'30rpx'}" :gutter="40"
+					height="55" :show-bar="false" duration="0"></u-tabs>
 			</view>
 		</view>
-		<u-empty
-			mode="data"
-			v-if="list.length === 0"
-			iconSize="120"
-			textSize="58"
-			text="暂无数据"
-			margin-top="400"
-		>
+		<!-- <view class="header-content"></view> -->
+		<u-empty mode="data" v-if="list.length === 0" iconSize="120" textSize="58" text="暂无数据" margin-top="400">
 		</u-empty>
 		<view class="list-box">
 			<view class="list-item-box" v-for="item in list" :key="item.id" @click="onItem(item)">
@@ -89,16 +65,27 @@
 </template>
 
 <script setup>
-	import { ref } from 'vue'
-	import { onLoad, onReachBottom, onPullDownRefresh } from '@dcloudio/uni-app'
-	import { query, byId } from '@/api/order.js'
-	import { msgError, msgSuccess } from '@/utils/common'
-	
+	import {
+		ref
+	} from 'vue'
+	import {
+		onLoad,
+		onReachBottom,
+		onPullDownRefresh
+	} from '@dcloudio/uni-app'
+	import {
+		query,
+		byId
+	} from '@/api/order.js'
+	import {
+		msgError,
+		msgSuccess
+	} from '@/utils/common'
+
 	const searchInputStyle = {
 		backgroundColor: '#E5E5E5'
 	}
-	const searchType = [
-		{
+	const searchType = [{
 			label: '全部',
 			value: null
 		},
@@ -130,7 +117,7 @@
 		pageNumber: 1,
 		pageSize: 10
 	})
-	
+
 	const list = ref([
 		// {
 		// 	id: '01',
@@ -143,6 +130,7 @@
 		// 	status: 1
 		// },
 	])
+
 	function onItem(order) {
 		if (order.status === '2') {
 			uni.showToast({
@@ -176,18 +164,19 @@
 			uni.hideLoading()
 		})
 	}
+
 	function onPay(order) {
 		wx.requestPayment({
-		  timeStamp: order.prepay.timeStamp,
-		  nonceStr: order.prepay.nonceStr,
-		  package: order.prepay.package,
-		  signType: order.prepay.signType,
-		  paySign: order.prepay.paySign,
-		  success (res) {
+			timeStamp: order.prepay.timeStamp,
+			nonceStr: order.prepay.nonceStr,
+			package: order.prepay.package,
+			signType: order.prepay.signType,
+			paySign: order.prepay.paySign,
+			success(res) {
 				msgSuccess('支付成功')
 				onSearch()
 			},
-		  fail (res) {
+			fail(res) {
 				// console.log('支付失败', res)
 				const errMsg = res.errMsg
 				if (errMsg.indexOf('fail cancel')) {
@@ -196,20 +185,20 @@
 			}
 		})
 	}
-	
+
 	function onSearchConfirm() {
 		searchForm.value.pageNumber = 1
 		pageNum.value = 1
 		onSearch()
 	}
-	
+
 	function onSearchClear() {
 		searchForm.value.keyword = null
 		searchForm.value.pageNumber = 1
 		pageNum.value = 1
 		onSearch()
 	}
-	
+
 	function onSearch() {
 		loadMoreStatus.value = 'more'
 		query(searchForm.value).then(res => {
@@ -221,12 +210,12 @@
 			}
 		})
 	}
-	
+
 	function onSearchTypeChange(val) {
 		searchForm.value.type = searchType[val].value
 		onSearchConfirm()
 	}
-	
+
 	// 前往发票申请
 	function onToInvoiceApplication() {
 		uni.navigateTo({
@@ -251,7 +240,7 @@
 			uni.stopPullDownRefresh()
 		})
 	})
-	
+
 	onReachBottom(async () => {
 		if (loadMoreStatus.value === 'noMore') {
 			uni.showToast({
@@ -274,7 +263,7 @@
 							list.value.push(...res.data)
 							loadMoreStatus.value = 'more'
 							visualLoadMore.value = false
-						}							
+						}
 					} else {
 						loadMoreStatus.value = 'noMore'
 						visualLoadMore.value = true
@@ -286,22 +275,24 @@
 			}
 		})
 	})
-	
+
 	onLoad(() => {
 		onSearch()
 	})
 </script>
 <style>
-	::v-deep(.u-tab-item){
+	::v-deep(.u-tab-item) {
 		margin-right: 20rpx;
 	}
-	::v-deep(.u-empty){
+
+	::v-deep(.u-empty) {
 		height: auto !important;
 	}
 </style>
 <style lang="scss" scoped>
 	$certificate-width: 220rpx;
 	$certificate-height: 300rpx;
+
 	.container {
 		height: 100vh;
 		width: 100vw;
@@ -311,20 +302,24 @@
 		background: -o-linear-gradient(90deg, rgb(141, 204, 255) 10%, rgb(247, 247, 247) 30%);
 		background: -ms-linear-gradient(90deg, rgb(141, 204, 255) 10%, rgb(247, 247, 247) 30%);
 		background: linear-gradient(180deg, rgb(141, 204, 255) 10%, rgb(247, 247, 247) 30%);
-		
+
+		$header-bg-color: #8dccff;
+		// $transition-duration: 0.4s;
 		.header-box {
-			padding: 0 20rpx;
-			// background-color: rgb(141, 204, 255);
+			padding: 0 20px;
+			// 应用顶部磁吸效果
 			@include topMagnet();
+			// 初始状态:透明背景
+			background-color: $header-bg-color;
 		}
-		
 		.search-box {
 			padding-top: 10rpx;
+
 			// margin-bottom: 20rpx;
 			::v-deep(.u-search) {
 				// background-color: #e5e5e5;
 				border-radius: 50rpx;
-				
+
 				.u-action {
 					width: 18%;
 					background-color: $uni-color-primary;
@@ -338,9 +333,10 @@
 				}
 			}
 		}
-		
+
 		.list-box {
 			padding: 0 20rpx;
+
 			.list-item-box {
 				padding: 40rpx 20rpx;
 				margin: 35rpx 0;
@@ -348,51 +344,67 @@
 				box-shadow: 0 5px 15px rgba(0, 0, 0, 0.1);
 				background-color: #fff;
 				border-radius: 20rpx;
-				&:first-child{
-					padding: 0 20rpx 40rpx;
+
+				&:first-child {
+					// padding: 0 20rpx 40rpx;
+					margin-top: 0;
 				}
+
 				&:active {
 					background-color: $uni-bg-color-hover;
 				}
+
 				.title-box {
 					font-size: 28rpx;
 					font-weight: bold;
 					margin-bottom: 20rpx;
 					@include text-overflow()
 				}
+
 				.main-box {
 					display: flex;
 					justify-content: space-between;
 					// padding-left: 20rpx;
+					position: relative;
+
 					.info-box {
 						// width: 50%;
 						width: 100%;
 						flex: 1 1 auto;
+
 						.info-item-box {
 							display: flex;
 							font-size: 22rpx;
 							color: $uni-text-color-grey;
 							line-height: 40rpx;
+
 							.label {
+								flex: 0 0 auto;
 								// width: 80rpx;
 								margin-right: 10rpx;
 							}
 						}
 					}
+
 					.price-box {
-						flex: 0 0 auto;
+						// flex: 0 0 auto;
+						position: absolute;
+						right: 0;
+						bottom: 0;
 						display: flex;
 						align-items: flex-end;
 						text-align: right;
 						color: $uni-color-error;
 						font-size: $uni-title-font-size-3;
 						font-weight: bold;
+
 						.button {
 							background-color: #CCCCCC;
 							color: $uni-text-color-inverse;
 							padding: 6rpx 25rpx;
 							border-radius: $uni-card-border-radius;
 						}
+
 						.error {
 							background-color: $uni-color-error;
 						}
@@ -400,11 +412,12 @@
 				}
 			}
 		}
-	
+
 		.buttom-block {
-			height: 100rpx;			
+			height: 100rpx;
 			padding-bottom: env(5rpx + safe-area-inset-bottom, 0);
 		}
+
 		.bottom-box {
 			text-align: center;
 			font-size: $uni-title-font-size-2;
@@ -412,6 +425,7 @@
 			position: fixed;
 			bottom: 0;
 			width: 100%;
+
 			.button {
 				width: 100%;
 				height: 100rpx;
@@ -419,6 +433,7 @@
 				color: $uni-color-primary;
 				letter-spacing: 2rpx;
 				border: 1rpx solid #E9E9E9;
+
 				&:active {
 					background-color: $uni-bg-color-hover;
 				}

+ 127 - 10
pages/researchReport/reportHome/reportHome.vue

@@ -63,7 +63,7 @@
 						</view>
 						<view class="func">
 							<view v-if="item.viewMode==='1'" class="func-box" style="justify-content: flex-end;">
-								<view class="button free" >免费</view>
+								<view class="button free">免费</view>
 							</view>
 							<view v-else-if="item.viewMode==='2' && isMember" class="func-box">
 								<view class="price">¥{{ item.price }}元</view>
@@ -120,9 +120,7 @@
 						@custom="searchMy(searchForm.keyword, 1)"></u-search>
 				</view>
 			</view>
-			<u-empty 
-			margin-top="50"
-			mode="data" v-if="list2.length === 0" iconSize="120" textSize="58" text="暂无数据">
+			<u-empty margin-top="50" mode="data" v-if="list2.length === 0" iconSize="120" textSize="58" text="暂无数据">
 			</u-empty>
 			<view class="list-box">
 				<view class="list-item-box" v-for="item in list2" :key="item.id" @click="onClickReport(item)">
@@ -310,9 +308,9 @@
 
 	function onClickReport(report) {
 		let id;
-		if(menuCurrent.value===1){
+		if (menuCurrent.value === 1) {
 			id = report.reportId
-		}else{
+		} else {
 			id = report.id
 		}
 		uni.navigateTo({
@@ -347,6 +345,7 @@
 
 <style lang="scss" scoped>
 	$image-width: 200rpx;
+	$image-height: 160rpx;
 
 	.container {
 		height: 100vh;
@@ -380,6 +379,99 @@
 			}
 		}
 
+		// .list-box {
+		// 	padding: 0 20rpx;
+
+		// 	.list-item-box {
+		// 		padding: 30rpx 20rpx;
+		// 		display: flex;
+		// 		gap: 20rpx;
+		// 		height: 210rpx;
+		// 		border-bottom: 5rpx solid #E6E6E6;
+
+		// 		&:active {
+		// 			background-color: $uni-bg-color-hover;
+		// 		}
+
+		// 		.image-box {
+		// 			width: $image-width;
+		// 			height: $image-height;
+
+		// 			image {
+		// 				width: $image-width;
+		// 				flex: 0 0 $image-width;
+		// 				height: 100%;
+		// 				border-radius: $uni-card-border-radius;
+		// 			}
+		// 		}
+
+		// 		.info-box {
+		// 			width: 100%;
+		// 			.title {
+		// 				font-size: $uni-title-font-size-2;
+		// 				font-weight: bold;
+		// 				line-height: 40rpx;
+		// 				margin-bottom: 15rpx;
+		// 				@include text-line-overflow(2);
+		// 			}
+
+		// 			.time {
+		// 				font-size: $uni-font-size-2;
+		// 				color: $uni-text-color-grey;
+
+		// 				.iconfont {
+		// 					font-size: $uni-font-size-2;
+		// 					padding-right: 10rpx;
+		// 				}
+		// 			}
+
+		// 			.func {
+		// 				display: flex;
+		// 				justify-content: flex-end;
+		// 				font-size: $uni-font-size-2;
+		// 				font-weight: bold;
+
+		// 				.func-box {
+		// 					display: flex;
+		// 					justify-content: space-between;
+		// 					width: 100%;
+		// 					align-items: center;
+		// 				}
+
+		// 				.button {
+		// 					text-align: center;
+		// 					width: 130rpx;
+		// 				}
+
+		// 				.price {
+		// 					color: $uni-color-error;
+		// 					font-size: $uni-title-font-size-2;
+		// 				}
+
+		// 				.buy {
+		// 					padding: 6rpx 25rpx;
+		// 					background-color: $uni-color-error;
+		// 					border-radius: $uni-card-border-radius;
+		// 					color: $uni-text-color-inverse;
+		// 				}
+
+		// 				.free {
+		// 					padding: 6rpx 25rpx;
+		// 					background-color: $uni-color-primary;
+		// 					border-radius: $uni-card-border-radius;
+		// 					color: $uni-text-color-inverse;
+		// 				}
+
+		// 				.member-free {
+		// 					padding: 10rpx 20rpx;
+		// 					@include backgroundImg('https://www.gzrea.cn/wxmp/static/icon/bg-label.png');
+		// 					color: $uni-text-color;
+		// 				}
+		// 			}
+		// 		}
+		// 	}
+		// }
+
 		.list-box {
 			padding: 0 20rpx;
 
@@ -387,15 +479,20 @@
 				padding: 30rpx 20rpx;
 				display: flex;
 				gap: 20rpx;
-				height: 210rpx;
+				// height: 210rpx;
 				border-bottom: 5rpx solid #E6E6E6;
 
+				// &:first-child {
+				// 	padding: 0 20rpx 30rpx;
+				// }
+
 				&:active {
 					background-color: $uni-bg-color-hover;
 				}
 
 				.image-box {
 					width: $image-width;
+					height: $image-height;
 
 					image {
 						width: $image-width;
@@ -406,6 +503,8 @@
 				}
 
 				.info-box {
+					width: 100%;
+
 					.title {
 						font-size: $uni-title-font-size-2;
 						font-weight: bold;
@@ -415,7 +514,7 @@
 					}
 
 					.time {
-						font-size: $uni-font-size-2;
+						font-size: $uni-font-size-1;
 						color: $uni-text-color-grey;
 
 						.iconfont {
@@ -424,11 +523,22 @@
 						}
 					}
 
+					.type {
+						font-size: $uni-font-size-2;
+
+						.iconfont {
+							font-size: $uni-font-size-2;
+							padding-right: 10rpx;
+						}
+					}
+
 					.func {
 						display: flex;
-						justify-content: flex-end;
+						justify-content: space-between;
+						align-items: flex-end;
 						font-size: $uni-font-size-2;
 						font-weight: bold;
+						margin-top: 10rpx;
 
 						.func-box {
 							display: flex;
@@ -444,7 +554,13 @@
 
 						.price {
 							color: $uni-color-error;
-							font-size: $uni-title-font-size-2;
+							font-size: $uni-title-font-size-3;
+						}
+
+						.not-member-price {
+							font-size: $uni-font-size-4;
+							color: $uni-text-color-grey;
+							text-align: end;
 						}
 
 						.buy {
@@ -475,6 +591,7 @@
 			// padding: 0 20rpx;
 			width: 85%;
 			margin: 0 auto;
+
 			.menus-item-box {
 				width: 100%;
 				// padding: 35rpx 50rpx;

+ 4 - 2
pages/researchReport/reportList/reportList.vue

@@ -21,7 +21,7 @@
 				<view class="image-box">
 					<image :src="item.cover" mode="aspectFill"></image>
 				</view>
-				<view class="info-box">
+				<view class="info-box" style="width: 100%;">
 					<view class="title">
 						{{item.title}}
 					</view>
@@ -222,7 +222,7 @@
 </style>
 <style lang="scss">
 	$image-width: 230rpx;
-
+	$image-height: 180rpx;
 	.container {
 		// height: 100vh;
 		width: 100vw;
@@ -275,6 +275,7 @@
 
 				.image-box {
 					width: $image-width;
+					height: $image-height;
 
 					image {
 						width: $image-width;
@@ -285,6 +286,7 @@
 				}
 
 				.info-box {
+					width: 100%;
 					.title {
 						font-size: $uni-title-font-size-2;
 						font-weight: bold;