فهرست منبع

修改:1.设置页面样式修改;2.订单页面样式修改;3.会费缴交入口页面样式修改;4.通知/动态/指引查询详情接口url修改;5.订单列表返回参数修改

littleblue55 1 هفته پیش
والد
کامیت
b9601e76db

+ 3 - 3
api/notice.js

@@ -15,7 +15,7 @@ export function getNoticeList(data){
 // 根据id获取公告详情
 export function getNoticeDetail(id){
 	return request({
-		'url': '/notice/detail?id='+id,
+		'url': '/notice/'+id,
 		headers: {
 			isToken: true
 		},
@@ -38,7 +38,7 @@ export function getDynamicList(data){
 // 根据id获取动态详情 
 export function getDynamicDetail(id){
 	return request({
-		'url': '/dynamic/detail?id='+id,
+		'url': '/dynamic/'+id,
 		headers: {
 			isToken: true
 		},
@@ -72,7 +72,7 @@ export function getGuideList(data){
 // 根据id获取动态详情 
 export function getGuideDetail(id){
 	return request({
-		'url': '/guide/detail?id='+id,
+		'url': '/guide/'+id,
 		headers: {
 			isToken: true
 		},

+ 5 - 0
pages.json

@@ -165,6 +165,7 @@
 			"style": {
 				"navigationBarTitleText": "我的订单",
 				"enablePullDownRefresh": true,
+				"navigationBarBackgroundColor": "#8dccff",
 				"app-plus": {
 					"titleNView": false
 				}
@@ -436,6 +437,7 @@
 			"style": {
 				"navigationBarTitleText": "会费缴交",
 				"enablePullDownRefresh": false,
+				"navigationBarBackgroundColor": "#8dccff",
 				"app-plus": {
 					"titleNView": true
 				}
@@ -488,6 +490,7 @@
 			"style" : {
 				"navigationBarTitleText": "设置",
 				"enablePullDownRefresh": false,
+				"navigationBarBackgroundColor": "#8dccff",
 				"app-plus": {
 					"titleNView": false
 				}
@@ -528,6 +531,7 @@
 			"style" : {
 				"navigationBarTitleText": "删除个人信息",
 				"enablePullDownRefresh": false,
+				"navigationBarBackgroundColor": "#8dccff",
 				"app-plus": {
 					"titleNView": false
 				}
@@ -538,6 +542,7 @@
 			"style" : {
 				"navigationBarTitleText": "注销账号",
 				"enablePullDownRefresh": false,
+				"navigationBarBackgroundColor": "#8dccff",
 				"app-plus": {
 					"titleNView": false
 				}

+ 89 - 45
pages/huifeijiaojiaoRukou/huifeijiaojiaoRukou.vue

@@ -1,7 +1,19 @@
 <template>
 	<view class="container">
 		<view class="menus-box">
-			<view class="menus-item-box" @click="toPage('个人会费缴交')">
+			<view class="main-btn" @click="toPage('个人会费缴交')">
+				<image :src="`${FILE_URL}/person-fee.png`"></image>
+				<text>个人会费缴交</text>
+			</view>
+			<view class="main-btn" @click="toPage('代缴个人会费')">
+				<image :src="`${FILE_URL}/fee.png`"></image>
+				<text>代缴个人会费</text>
+			</view>
+			<view class="main-btn" @click="toPage('代缴单位会费')">
+				<image :src="`${FILE_URL}/change.png`"></image>
+				<text>代缴单位会费</text>
+			</view>
+			<!-- <view class="menus-item-box" @click="toPage('个人会费缴交')">
 				<view class="text-box">
 					个人会费缴交
 				</view>
@@ -15,15 +27,17 @@
 				<view class="text-box">
 					代缴单位会费
 				</view>
-			</view>
+			</view> -->
 		</view>
 	</view>
 </template>
 
 <script setup>
+	import configService from '@/utils/baseurl.js'
+	const FILE_URL = configService.FILE_URL;
 	function toPage(name) {
 		switch (name) {
-			case '个人会费缴交': 
+			case '个人会费缴交':
 				uni.navigateTo({
 					url: '/pages/huiFeiJiaoJiao/huiFeiJiaoJiao'
 				});
@@ -43,51 +57,81 @@
 </script>
 
 <style lang="scss">
-.container {
-	height: 100vh;
-	width: 100vw;
-	background-color: $uni-text-color-inverse;
-	.menus-box {
-		padding: 20rpx;
-	
-		.menus-item-box {
-			width: 100%;
-			padding: 35rpx 50rpx;
-			margin-bottom: 35rpx;
-			display: flex;
-			gap: 30rpx;
-			align-items: center;
-			justify-content: center;
-			background-color: #006AF4;
-			border-radius: $uni-card-border-radius;
-	
-			&:active {
-				background-color: #005AF4;
+	$certificate-width: 220rpx;
+	$certificate-height: 300rpx;
+
+	.container {
+		height: 100vh;
+		width: 100vw;
+		background: rgb(141, 204, 255);
+		background: -moz-linear-gradient(90deg, rgb(141, 204, 255) 10%, rgb(247, 247, 247) 30%);
+		background: -webkit-linear-gradient(90deg, rgb(141, 204, 255) 10%, rgb(247, 247, 247) 30%);
+		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%);
+
+		.menus-box {
+			padding: 20rpx;
+			.main-btn {
+				width: 85%;
+				background-color: #006af4;
+				border-radius: 20rpx;
+				margin: 30rpx auto;
+				padding: 40rpx 30rpx;
+				display: flex;
+				align-items: center;
+			
+				image {
+					width: 100rpx;
+					height: 100rpx;
+					flex: 0 0 auto;
+				}
+			
+				text {
+					margin-left: 20rpx;
+					color: #fff;
+					font-size: 40rpx;
+				}
 			}
-	
-			.icon-box {
-				width: 40%;
-				text-align: center;
-				width: 100rpx;
-				height: 100rpx;
-				line-height: 100rpx;
-				text-align: center;
-				border-radius: 50%;
-				border: 3rpx solid $uni-text-color-inverse;
-				background-color: #004DC9;
-	
-				.iconfont {
-					font-size: 60rpx;
+
+			.menus-item-box {
+				width: 100%;
+				padding: 35rpx 50rpx;
+				margin-bottom: 35rpx;
+				display: flex;
+				gap: 30rpx;
+				align-items: center;
+				justify-content: center;
+				background-color: #006AF4;
+				border-radius: $uni-card-border-radius;
+
+				&:active {
+					background-color: #005AF4;
+				}
+
+				.icon-box {
+					width: 40%;
+					text-align: center;
+					width: 100rpx;
+					height: 100rpx;
+					line-height: 100rpx;
+					text-align: center;
+					border-radius: 50%;
+					border: 3rpx solid $uni-text-color-inverse;
+					background-color: #004DC9;
+
+					.iconfont {
+						font-size: 60rpx;
+						color: $uni-text-color-inverse;
+					}
+				}
+
+				.text-box {
+					font-size: 50rpx;
+					font-weight: bold;
 					color: $uni-text-color-inverse;
 				}
 			}
-	
-			.text-box {
-				font-size: 50rpx;
-				font-weight: bold;
-				color: $uni-text-color-inverse;
-			}
 		}
 	}
-}
-</style>
+</style>

+ 34 - 18
pages/order/order.vue

@@ -5,27 +5,29 @@
 				<u-search
 					v-model="searchForm.keyword"
 					:clearabled="true"
-					bg-color="#E5E5E5"
-					:input-style="searchInputStyle"
 					placeholder="搜索您想要的内容"
 					@search="onSearchConfirm"
 					@custom="onSearchConfirm"
 				></u-search>
 			</view>
-			<view class="tab-box">
+			<view class="tab-box" style="margin-top: 25rpx;">
 				<u-tabs 
 					name="label"
 					:list="searchType"
 					:is-scroll="true"
 					v-model="searchForm.typeCurrent"
 					@change="onSearchTypeChange"
-					font-size="24"
-					:bold="false"
+					font-size="28"
+					bold
 					inactive-color="#000000"
-					active-color="#000000"
+					bg-color="'rgb(141, 204, 255)'"
+					active-color="#ffffff"
+					:show-bar="false"
 					:bar-style="{'background-color': '#2979ff'}"
-					:gutter="25"
-					height="45"
+					:active-item-style="{'background-color': '#2979ff', 'border-radius':'30rpx'}"
+					:gutter="40"
+					height="55"
+					duration="0"
 				></u-tabs>
 			</view>
 		</view>
@@ -57,13 +59,13 @@
 								订单时间:
 							</view>
 							<view class="text">
-								{{item.buyDate}}
+								{{item.date}}
 							</view>
 						</view>
 					</view>
 					<view class="price-box">
 						<view class="text" v-if="item.status === '1'">
-							实付款:&nbsp;¥{{item.buyPrice}}元
+							实付款:&nbsp;¥{{item.amount}}元
 						</view>
 						<view class="button error" v-if="item.status === '0'" @click.stop="onPay(item)">
 							待支付
@@ -126,8 +128,8 @@
 			title: '【市场研究】2024年11月广州市中介促成二手住宅市场交易简报',
 			type: 8,
 			orderNo: '123456789987654321',
-			buyDate: '2023年8月8日',
-			buyPrice: 9.9,
+			date: '2023年8月8日',
+			amount: 9.9,
 			invoice: true,
 			status: 1
 		},
@@ -280,23 +282,34 @@
 		onSearch()
 	})
 </script>
-
+<style>
+	::v-deep(.u-tab-item){
+		margin-right: 40rpx;
+	}
+</style>
 <style lang="scss" scoped>
+	$certificate-width: 220rpx;
+	$certificate-height: 300rpx;
 	.container {
 		height: 100vh;
 		width: 100vw;
-		background-color: $uni-text-color-inverse;
+		background: rgb(141, 204, 255);
+		background: -moz-linear-gradient(90deg, rgb(141, 204, 255) 10%, rgb(247, 247, 247) 30%);
+		background: -webkit-linear-gradient(90deg, rgb(141, 204, 255) 10%, rgb(247, 247, 247) 30%);
+		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-box {
 			padding: 0 20rpx;
-			background-color: $uni-text-color-inverse;
+			background-color: rgb(141, 204, 255);
 			@include topMagnet();
 		}
 		
 		.search-box {
 			margin-bottom: 20rpx;
 			::v-deep(.u-search) {
-				background-color: #e5e5e5;
+				// background-color: #e5e5e5;
 				border-radius: 50rpx;
 				
 				.u-action {
@@ -316,8 +329,11 @@
 		.list-box {
 			padding: 0 20rpx;
 			.list-item-box {
-				padding: 20rpx;
-				border-bottom: 5rpx solid #E6E6E6;
+				padding: 35rpx 20rpx;
+				margin: 20rpx 0;
+				/* border-bottom: 5rpx solid #E6E6E6; */
+				box-shadow: 0 5px 15px rgba(0, 0, 0, 0.15);
+				border-radius: 20rpx;
 				&:active {
 					background-color: $uni-bg-color-hover;
 				}

+ 8 - 1
pages/setting/cancelAccount/cancelAccount.vue

@@ -153,10 +153,17 @@
 </script>
 
 <style lang="scss" scoped>
+	$certificate-width: 220rpx;
+	$certificate-height: 300rpx;
 	.container {
 		height: 100vh;
 		width: 100vw;
-		background-color: $uni-bg-color;
+		background: rgb(141, 204, 255);
+		background: -moz-linear-gradient(90deg, rgb(141, 204, 255) 10%, rgb(247, 247, 247) 30%);
+		background: -webkit-linear-gradient(90deg, rgb(141, 204, 255) 10%, rgb(247, 247, 247) 30%);
+		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%);
 		padding: 20rpx;
 
 		.desc-box {

+ 8 - 1
pages/setting/removeInfo/removeInfo.vue

@@ -101,10 +101,17 @@
 	}
 </style>
 <style lang="scss" scoped>
+	$certificate-width: 220rpx;
+	$certificate-height: 300rpx;
 	.container {
 		height: 100vh;
 		width: 100vw;
-		background-color: $uni-bg-color;
+		background: rgb(141, 204, 255);
+		background: -moz-linear-gradient(90deg, rgb(141, 204, 255) 10%, rgb(247, 247, 247) 30%);
+		background: -webkit-linear-gradient(90deg, rgb(141, 204, 255) 10%, rgb(247, 247, 247) 30%);
+		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%);
 		padding: 20rpx;
 
 		.desc-box {

+ 72 - 39
pages/setting/setting.vue

@@ -27,46 +27,44 @@
 				<view class="iconfont icon-chevron-right"></view>
 			</view>
 		</view>
-		<view class="menu-item-box" @click="onRemoveInfo">
-			<view class="lebal-box">
-				删除个人信息
-			</view>
-			<view class="suffix-box">
-				<view class="iconfont icon-chevron-right"></view>
-			</view>
+		<view class="main-btn" @click="onRemoveInfo">
+			<image :src="`${FILE_URL}/delete.png`"></image>
+			<text>删除个人信息</text>
 		</view>
-		<view class="menu-item-box" @click="onCancelAccount">
-			<view class="lebal-box">
-				账号注销
-			</view>
-			<view class="suffix-box">
-				<view class="iconfont icon-chevron-right"></view>
-			</view>
+		<view class="main-btn" @click="onCancelAccount">
+			<image :src="`${FILE_URL}/user-delete.png`"></image>
+			<text>账号注销</text>
 		</view>
 	</view>
 </template>
 
 <script setup>
+	import configService from '@/utils/baseurl.js'
+	const FILE_URL = configService.FILE_URL;
 	function onUpdateTel() {
 		uni.navigateTo({
 			url: '/pages/setting/updateTel/updateTel'
 		})
 	}
+
 	function onUpdatePwd() {
 		uni.navigateTo({
 			url: '/pages/setting/updatePwd/updatePwd'
 		})
 	}
+
 	function onInfoExport() {
 		uni.navigateTo({
 			url: '/pages/setting/infoExport/infoExport'
 		})
 	}
+
 	function onRemoveInfo() {
 		uni.navigateTo({
 			url: '/pages/setting/removeInfo/removeInfo'
 		})
 	}
+
 	function onCancelAccount() {
 		uni.navigateTo({
 			url: '/pages/setting/cancelAccount/cancelAccount'
@@ -75,33 +73,68 @@
 </script>
 
 <style lang="scss" scoped>
-.container {
-	height: 100vh;
-	width: 100vw;
-	padding: 0 20rpx;
-	padding-top: 20rpx;
-	background-color: $uni-bg-color;
-	.menu-item-box {
-		padding: 20rpx 30rpx;
-		display: flex;
-		align-items: center;
-		justify-content: space-between;
-		background-color: #fff;
-		margin-bottom: 50rpx;
-		border: 1px solid #E3E3E3;
-		border-radius: 10px;
-		.lebal-box {
-			width: 60%;
-		}
-		.suffix-box {
+	$certificate-width: 220rpx;
+	$certificate-height: 300rpx;
+
+	.container {
+		height: 100vh;
+		width: 100vw;
+		padding: 0 20rpx;
+		padding-top: 20rpx;
+		background: rgb(141, 204, 255);
+		background: -moz-linear-gradient(90deg, rgb(141, 204, 255) 10%, rgb(247, 247, 247) 30%);
+		background: -webkit-linear-gradient(90deg, rgb(141, 204, 255) 10%, rgb(247, 247, 247) 30%);
+		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%);
+
+		.main-btn {
+			width: 85%;
+			background-color: #006af4;
+			border-radius: 20rpx;
+			margin: 30rpx auto;
+			padding: 40rpx 30rpx;
 			display: flex;
 			align-items: center;
-			justify-content: flex-end;
-			text-align: end;
+
+			image {
+				width: 100rpx;
+				height: 100rpx;
+				flex: 0 0 auto;
+			}
+
+			text {
+				margin-left: 20rpx;
+				color: #fff;
+				font-size: 40rpx;
+			}
 		}
-		&:active {
-			background: #e0e0e0; /* 按下的背景色 */
+
+		.menu-item-box {
+			padding: 20rpx 30rpx;
+			display: flex;
+			align-items: center;
+			justify-content: space-between;
+			background-color: #fff;
+			margin-bottom: 50rpx;
+			border: 1px solid #E3E3E3;
+			border-radius: 10px;
+
+			.lebal-box {
+				width: 60%;
+			}
+
+			.suffix-box {
+				display: flex;
+				align-items: center;
+				justify-content: flex-end;
+				text-align: end;
+			}
+
+			&:active {
+				background: #e0e0e0;
+				/* 按下的背景色 */
+			}
 		}
 	}
-}
-</style>
+</style>