供应商

pages.json

@@ -34,7 +34,22 @@
 		        "enablePullDownRefresh": false,
 				"navigationBarBackgroundColor": "#9CC1FA",
 				"navigationBarTextStyle": "#FFFFFF"
-				// "navigationStyle": "custom"
+		    }
+		},
+		{
+		    "path" : "pages/index/supplier",
+		    "style" :                                                                                    
+		    {
+		        "navigationBarTitleText": "供应商",
+		        "enablePullDownRefresh": false
+		    }
+		},
+		{
+		    "path" : "pages/index/supplierDetail",
+		    "style" :                                                                                    
+		    {
+		        "navigationBarTitleText": "供应商详情",
+		        "enablePullDownRefresh": false
 		    }
 		},
 		{
@@ -53,7 +68,14 @@
 		    }
 		    
 		},
-		
+		{
+		    "path" : "pages/ucenter/mineNotes",
+		    "style" :                                                                                    
+		    {
+		        "navigationBarTitleText": "我的记录",
+		        "enablePullDownRefresh": false
+		    }
+		},
 		{
 		    "path" : "pages/userAgreement/index",
 		    "style" :                                                                                    

pages/index/index.vue

@@ -41,13 +41,13 @@
 							已完成可查看
 						</view>
 					</view>
-					<view class="page-home-order-item">
+					<view class="page-home-order-item" @click="gotoOrder(1)">
 						<image class="page-home-order-img" src="@/static/home-order-four.png" mode=""></image>
 						<view class="page-home-order-name">
-							处理备案
+							{{'未处理(' + noDeal + ')'}}
 						</view>
 						<view class="page-home-order-remark">
-							备案故障处理
+							已生成未处理工单
 						</view>
 					</view>
 				</view>
@@ -57,12 +57,12 @@
 					换电站供应商
 				</view>
 				<mescroll-body ref="mescrollRef" @init="mescrollInit" @down="downCallback" @up="upCallback" :up="upOption">
-					<view class="page-home-supplier-items" v-for="(item,index) in stationDataVoList" :key="index">
+					<view class="page-home-supplier-items" v-for="(item,index) in stationDataVoList" :key="index" @click="gotoSupplier">
 						<view class="page-home-supplier-items-title">
 							{{item.stationName}}
 						</view>
 						<view class="page-home-supplier-number">
-							{{9}}
+							{{item.num}}
 						</view>
 					</view>
 				</mescroll-body>
@@ -94,7 +94,11 @@
 					orderByWays: 'desc'
 				},
 				noData: null,
-				stationDataVoList: [],
+				stationDataVoList: [
+					{stationName: '皋兰换电站', num: 2},
+					{stationName: '西安换电站', num: 3},
+					{stationName: '唐山换电站', num: 4},
+				],
 				isLoadAll: false,
 				totalPages: 0, // 总页数
 				upOption: {
@@ -147,7 +151,7 @@
 			this.screenHeight = systemInfoSync.screenHeight - 500;
 		},
 		mounted() {
-			this.mapSelect()
+			// this.mapSelect()
 		},
 		methods: {
 			//跳转工单上报
@@ -162,6 +166,12 @@
 					url: '/pages/index/order?type=' + type,
 				})
 			},
+			//跳转供应商页面
+			gotoSupplier() {
+				uni.navigateTo({
+					url: "/pages/index/supplier"
+				})
+			},
 			//重新获取定位
 			resetPosition() {
 				this.mapSelect()
@@ -501,12 +511,11 @@
 					padding: 0 18rpx;
 					border-radius: 16rpx;
 					.page-home-order-item {
-						width: calc(50% - 44rpx);
+						width: calc(50% - 28rpx);
 						height: 128rpx;
 						position: relative;
 						margin: 0 12rpx 26rpx 12rpx;
 						padding: 24rpx;
-						border: 1rpx #979797 dashed;
 						.page-home-order-img {
 							height: 100%;
 							width: 100%;
@@ -550,7 +559,7 @@
 					font-weight: 500;
 					color: #1E2128;
 					line-height: 38rpx;
-					padding: 32rpx 26rpx;
+					padding: 32rpx 0rpx;
 				}
 				.page-home-supplier-items {
 					display: flex;

pages/index/orderDetail.vue

@@ -107,8 +107,32 @@
 				
 			</view>
 		</view>
-		<view class="order-detail-content" v-if="currIndex == 2">
-			
+		<view class="order-detail-timeLine" v-if="currIndex == 2">
+			<u-time-line>
+				<u-time-line-item nodeTop="2" v-for="(item, index) in timeDatas" :key="index">
+					<template v-slot:node>
+						<view class="time-line-node">
+							流转
+						</view>
+					</template>
+					<template v-slot:content>
+						<view>
+							<view class="u-order-title">
+								<span class="u-order-time">2023-09-23 23:22</span>
+								<span class="u-order-name">艾强>蒋科</span>
+							</view>
+							<view class="u-order-desc">分析处理中</view>
+							<view class="u-order-images">
+								<image :src="img.image" v-for="(img, i) in imgList" :key="i" class="u-order-img"></image>
+							</view>
+							<view class="u-order-images">
+								<video :src="video" v-for="(video, i) in videos" :key="i" class="u-order-img"></video>
+							</view>
+							
+						</view>
+					</template>
+				</u-time-line-item>
+			</u-time-line>
 		</view>
 	</view>
 </template>
@@ -134,8 +158,30 @@
 					{
 						image: 'https://cdn.uviewui.com/uview/swiper/3.jpg',
 						title: '谁念西风独自凉，萧萧黄叶闭疏窗，沉思往事立残阳'
+					},
+					{
+						image: 'https://cdn.uviewui.com/uview/swiper/1.jpg',
+						title: '昨夜星辰昨夜风，画楼西畔桂堂东'
+					},
+					{
+						image: 'https://cdn.uviewui.com/uview/swiper/1.jpg',
+						title: '昨夜星辰昨夜风，画楼西畔桂堂东'
+					},
+					{
+						image: 'https://cdn.uviewui.com/uview/swiper/2.jpg',
+						title: '身无彩凤双飞翼，心有灵犀一点通'
+					},
+					{
+						image: 'https://cdn.uviewui.com/uview/swiper/3.jpg',
+						title: '谁念西风独自凉，萧萧黄叶闭疏窗，沉思往事立残阳'
+					},
+					{
+						image: 'https://cdn.uviewui.com/uview/swiper/1.jpg',
+						title: '昨夜星辰昨夜风，画楼西畔桂堂东'
 					}
-				]
+				],
+				timeDatas: [[],[],[],[],[],[],[],[],[],[],[],[],[]],
+				videos: ['https://media.w3.org/2010/05/sintel/trailer.mp4']
 			} 
 		},
 		methods: {
@@ -382,5 +428,62 @@
 				}
 			}
 		}
+		.order-detail-timeLine {
+			background: #FFFFFF;
+			padding: 30rpx 30rpx 30rpx 60rpx;
+			margin: 0 30rpx;
+			border-radius: 0rpx 0rpx 16rpx 16rpx;
+			min-height: 220rpx;
+			.time-line-node {
+				height: 80rpx;
+				background: #3F8CFF;
+				line-height: 80rpx;
+				width: auto;
+				padding: 0 10rpx;
+				border-radius: 50%;
+				font-size: 28rpx;
+				font-family: PingFang SC-Regular, PingFang SC;
+				font-weight: 500;
+				color: #FFFFFF;
+			}
+			.u-order-title {
+				display: flex;
+				.u-order-time {
+					font-size: 28rpx;
+					font-family: PingFang SC-Regular, PingFang SC;
+					font-weight: 400;
+					color: #1D2129;
+					line-height: 32rpx;
+				}
+				.u-order-name {
+					flex: 1;
+					text-align: right;
+					font-size: 22rpx;
+					font-family: PingFang SC-Regular, PingFang SC;
+					font-weight: 400;
+					color: #C9CDD4;
+					line-height: 32rpx;
+				}
+			}
+		}
+		.u-order-desc {
+			font-size: 24rpx;
+			font-family: PingFang SC-Regular, PingFang SC;
+			font-weight: 400;
+			color: #86909C;
+			line-height: 28rpx;
+			margin-top: 20rpx;
+		}
+		.u-order-images {
+			display: flex;
+			margin-top: 20rpx;
+			width: 100%;
+			flex-wrap: wrap;
+			.u-order-img {
+				width: 120rpx;
+				height: 120rpx;
+				margin: 0 10rpx 10rpx 0;
+			}
+		}
 	}
 </style>

pages/index/supplier.vue

@@ -0,0 +1,92 @@
+<template>
+	<view class="supplier-container">
+		<view class="supplier-info" v-for="(item, index) in dataList" :key="index" @click="gotoSupplierDetail(item)">
+			<view class="supplier-title">
+				<view class="supplier-title-text">
+					皋兰五金门店
+				</view>
+				<view class="supplier-title-contacts">
+					张三
+				</view>
+			</view>
+			<view class="supplier-tel">
+				18022222222
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+	  data() {
+	    return {
+			dataList: [[],[],[],[],[]]
+	    }
+	  },
+		//第一次加载
+		onLoad(e) {
+			  
+		},
+	   onReady() {
+	        
+	    },
+		//页面显示
+		onShow() {
+	
+		},
+		methods: {
+			//跳转详情页
+			gotoSupplierDetail(item) {
+				uni.navigateTo({
+					url: '/pages/index/supplierDetail',
+				})
+			}
+		}	
+	}
+</script>
+
+<style lang="scss" scoped>
+	.supplier-container {
+		height: 100vh;
+		position: relative;
+		box-sizing: border-box;
+		background: $uni-bg-color;
+		padding-bottom: calc(20rpx + env(safe-area-inset-bottom));
+		padding-top: 30rpx;
+		.supplier-info {
+			height: 160rpx;
+			background: #FFFFFF;
+			border-radius: 16rpx 16rpx 16rpx 16rpx;
+			margin: 0 30rpx 30rpx;
+			padding: 30rpx;
+			.supplier-title {
+				display: flex;
+				.supplier-title-text {
+					flex: 1;
+					font-size: 30rpx;
+					font-family: PingFang SC-Regular, PingFang SC;
+					font-weight: 400;
+					color: #1D2129;
+					line-height: 44rpx;
+				}
+				.supplier-title-contacts {
+					font-size: 30rpx;
+					font-family: PingFang SC-Regular, PingFang SC;
+					font-weight: 400;
+					color: #1D2129;
+					line-height: 44rpx;
+					text-align: right;
+				}
+			}
+			.supplier-tel {
+				text-align: right;
+				font-size: 26rpx;
+				font-family: PingFang SC-Regular, PingFang SC;
+				font-weight: 400;
+				color: #86909C;
+				line-height: 44rpx;
+				margin-top: 20rpx;
+			}
+		}
+	}
+</style>

pages/index/supplierDetail.vue

@@ -0,0 +1,182 @@
+<template>
+	<view class="supp-detail-container">
+		<view class="supp-detail-info">
+			<view class="supplier-detail-title">
+				<view class="supplier-detail-title-text">
+					皋兰五金门店
+				</view>
+				<view class="supplier-detail-title-contacts">
+					张三
+				</view>
+			</view>
+			<view class="supplier-detail-tel">
+				18022222222
+			</view>
+		</view>
+		<view class="supplier-detail-basic">
+			<view class="supplier-detail-telphone" @click="makeOhoneHandle">
+				<u-icon name="phone"></u-icon>
+				<span style="margin-left: 10rpx;">18580506017</span>
+			</view>
+			<view class="supplier-detail-address" @click="getLocalHandle">
+				<u-icon name="map"></u-icon>
+				<span style="margin-left: 10rpx;">重庆市渝北区汇流路美联广场15-2</span>
+			</view>
+			<view class="supp-detail-scope-title">
+				供应范围
+			</view>
+			<view class="supp-detail-scope-text">
+				什么都有、什么都有、什么都有、什么都有、什么都有、什么都有、什么都有、什么都有、什么都有、什么都有、什么都有、什么都有、什么都有、什么都有、什么都有
+			</view>
+			<view class="supp-detail-annex-title">
+				附件
+			</view>
+			<view class="supp-detail-annex-text">
+				<image class="supp-detail-annex-img" src="" mode=""></image>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+	  data() {
+	    return {
+	    }
+	  },
+		//第一次加载
+		onLoad(e) {
+			  
+		},
+	   onReady() {
+	        
+	    },
+		//页面显示
+		onShow() {
+	
+		},
+		methods: {
+			//拨打电话
+			makeOhoneHandle() {
+				uni.makePhoneCall({
+					phoneNumber: '18580506017'
+				})
+			},
+			//唤起导航
+			getLocalHandle(lat, lng, address, name) {
+				if (lat && lng && address && name) {
+					uni.openLocation({
+						latitude: lat,
+						longitude: lng,
+						name: name,
+						address: address
+					})
+				} else {
+					this.$utils.msg("位置信息丢失");
+				}
+			}
+		}	
+	}
+</script>
+
+<style lang="scss" scoped>
+	.supp-detail-container {
+		height: 100vh;
+		position: relative;
+		box-sizing: border-box;
+		background: $uni-bg-color;
+		padding-bottom: calc(20rpx + env(safe-area-inset-bottom));
+		padding-top: 30rpx;
+		.supp-detail-info {
+			height: 160rpx;
+			background: #FFFFFF;
+			border-radius: 16rpx 16rpx 16rpx 16rpx;
+			margin: 0 30rpx 30rpx;
+			padding: 30rpx;
+			.supplier-detail-title {
+				display: flex;
+				.supplier-detail-title-text {
+					flex: 1;
+					font-size: 30rpx;
+					font-family: PingFang SC-Regular, PingFang SC;
+					font-weight: 400;
+					color: #1D2129;
+					line-height: 44rpx;
+				}
+				.supplier-detail-title-contacts {
+					font-size: 30rpx;
+					font-family: PingFang SC-Regular, PingFang SC;
+					font-weight: 400;
+					color: #1D2129;
+					line-height: 44rpx;
+					text-align: right;
+				}
+			}
+			.supplier-detail-tel {
+				text-align: right;
+				font-size: 26rpx;
+				font-family: PingFang SC-Regular, PingFang SC;
+				font-weight: 400;
+				color: #86909C;
+				line-height: 44rpx;
+				margin-top: 20rpx;
+			}
+		}
+		.supplier-detail-basic {
+			background: #FFFFFF;
+			border-radius: 16rpx 16rpx 16rpx 16rpx;
+			margin: 0 30rpx 30rpx;
+			padding: 30rpx;
+			.supplier-detail-telphone {
+				font-size: 30rpx;
+				font-family: PingFang SC-Regular, PingFang SC;
+				font-weight: 400;
+				color: #1D2129;
+				line-height: 44rpx;
+			}
+			.supplier-detail-address {
+				font-size: 30rpx;
+				font-family: PingFang SC-Regular, PingFang SC;
+				font-weight: 400;
+				color: #1D2129;
+				line-height: 44rpx;
+				margin-top: 20rpx;
+			}
+			.supp-detail-scope-title {
+				font-size: 30rpx;
+				font-family: PingFang SC-Regular, PingFang SC;
+				font-weight: 600;
+				color: #1D2129;
+				line-height: 44rpx;
+				margin-top: 20rpx;
+			}
+			.supp-detail-scope-text {
+				font-size: 30rpx;
+				font-family: PingFang SC-Regular, PingFang SC;
+				font-weight: 400;
+				color: #1D2129;
+				line-height: 44rpx;
+				margin-top: 10rpx;
+			}
+			.supp-detail-annex-title {
+				font-size: 30rpx;
+				font-family: PingFang SC-Regular, PingFang SC;
+				font-weight: 600;
+				color: #1D2129;
+				line-height: 44rpx;
+				margin-top: 20rpx;
+			}
+			.supp-detail-annex-text {
+				display: flex;
+				margin-top: 20rpx;
+				width: 100%;
+				flex-wrap: wrap;
+				.supp-detail-annex-img {
+					width: 120rpx;
+					height: 120rpx;
+					margin: 0 10rpx 10rpx 0;
+				}
+			}
+		}
+	}
+</style>

pages/ucenter/index.vue

@@ -1,93 +1,85 @@
 <template>
-  <view class="personal-page">
-	  <u-navbar :is-back="false" title="个人中心" :title-color="'#FFFFFF'" :background="{ background: background }"></u-navbar>
-    <view class="top">
-      <view class="icon-container" @click="toTargetPage">
-        <image class="icon-wrap":src="userinfo.avatar || '../../static/ucenter/big-avatar.png'"></image>
-        <view class="top-name">
-          <view class="top-title">{{userinfo.nickName || '微信用户'}}</view>
-          <view class="top-phone">{{userinfo.telephone}}</view>
-        </view>
-      </view>
-    </view>
-
-    <view class="toPage">
-      <view class="items">
-        <u-cell-group style="width: 100%">
-          <u-cell-item v-for="(item, index) in dataList" :title-style='{fontSize: "26rpx", marginLeft: "20rpx"}' :key="index" icon="order" :title="item.title" @click="toPage(item.path)"></u-cell-item>
-        </u-cell-group>
-      </view>
-    </view>
-    <!-- <tab-bar></tab-bar> -->
-  </view> 
+	<view class="personal-page">
+		<!-- <u-navbar :is-back="false" title="个人中心" :title-color="'#FFFFFF'" :background="{ background: background }"></u-navbar> -->
+		<view class="personal-place"></view>
+		<view class="personal-info">
+			<view class="personal-info-left">
+				<view class="personal-name">
+					<span>张子熙</span>
+					<span class="personal-phone">{{' / ' + '18580506017'}}</span>
+				</view>
+				<view class="personal-role">
+					西南运维部/值守人员
+				</view>
+			</view>
+			<view class="personal-info-right">
+				{{usernameFirst}}
+			</view>
+		</view>
+
+		<view class="toPage">
+			<view class="toPage-items" v-for="(item, index) in dataList" :key="index"  @click="toPage(item)">
+				<u-icon size="40" name="order"></u-icon>
+				<view class="toPage-title">
+					{{item.title}}
+				</view>
+				<view class="toPage-next">
+					>
+				</view>
+			</view>
+		</view>
+	</view> 
 </template>
 
 <script>
-// import { outletInfo } from '@/service/outlet'
-// import {
-// 	getStorage,
-// 	setStorage,
-// 	wxLogin
-// } from "@/utils"
-import {myPrimary} from '@/uni.scss'
-export default {
-  data() {
-    return {
-      dataList: [
-        {
-          title: '我的订单',
-          icon: '../../static/ucenter/big-avatar.png',
-          path: '/pages/ucenter/order'
-        },
-        {
-          title: '申请主体',
-          icon: '../../static/ucenter/duizhang.png',
-          path: '/mine/pages/PageOutlets'
-        },
-        {
-          title: '证书管理',
-          icon: '../../static/ucenter/duizhang.png',
-          path: '/mine/pages/PageUpdatePassword'
-        },
-        {
-          title: '个人信息',
-          icon: '../../static/ucenter/duizhang.png',
-          path: '/mine/pages/PageAboutUs'
-        }
-      ],
-      dataInfo: {},
-	  background: null,
-	  userinfo: this.$store.state.users,
-    }
-  },
-  onLoad() {
-	  this.background = myPrimary;
-    // this.loadData()
-  },
-  methods: {
-    toPage(path) {
-      uni.navigateTo({
-        url: path
-      })
-    },
-    loadData() {
-      outletInfo({}).then(res => {
-        if(res.code === 200) {
-          this.dataInfo = res.data || {}
-        } else if (res.code === 501) {
-          uni.reLaunch({
-            url: '/pages/system/SystemLogin'  // 这里的pages前面一定要加上/，不然它不跳转的，我试的时候是这样子的
-          })
-        }
-      })
-    },
-    async logout() {
-      // await setStorage('WX_Token', '')
-      // await setStorage('longin-acount-info', '')
-      // uni.reLaunch({ url: '/pages/system/SystemLogin' })
-    }
-  }
-}
+	import {myPrimary} from '@/uni.scss'
+	export default {
+		data() {
+			return {
+				dataList: [
+					{
+					  title: '工单上报',
+					  path: '/pages/ucenter/mineNotes',
+					  type: 0,
+					},
+					{
+					  title: '处理记录',
+					  path: '/pages/ucenter/mineNotes',
+					  type: 0,
+					}
+				],
+				dataInfo: {},
+				background: null,
+				userinfo: this.$store.state.users,
+			}
+		},
+		created() {
+			
+		},
+		computed: {
+			usernameFirst: {
+				get() {
+			        let name = '李梓熙';
+			        let first = name?.charAt(0);
+			        if (new RegExp("[\u4E00-\u9FA5]+").test(first)) {
+						return first;
+			        } else if (new RegExp("[A-Za-z]+").test(first)) {
+						return first?.toUpperCase();
+			        }
+			    },
+			},
+		},
+		onLoad() {
+			this.background = myPrimary;
+		},
+		methods: {
+			toPage(item) {
+				uni.navigateTo({
+					url: item.path + '?type=' + item.type
+				})
+			},
+		}
+	}
 </script>
 
 <style>
@@ -101,131 +93,86 @@ export default {
 
 <style lang="scss" scoped>
 	.personal-page {
-		height: 100%;
+		background: linear-gradient(180deg, #9CC1FA 2%, #78B1FE 15%, #E5EEFD 76%, #F7F8FA 100%);
+		height: 100vh;
 		position: relative;
 		box-sizing: border-box;
-		background: #FFFFFF;
-		// padding-bottom: calc(100rpx + env(safe-area-inset-bottom));
-		overflow-y: auto;
-		padding-bottom: 150rpx;
-
-		.top {
-			height: 450rpx;
-			background: $uni-color-primary;
-			border-radius: 0rpx 0rpx 48rpx 48rpx;
-			margin-top: -1rpx;
-			  .icon-container {
-				display: flex;
-				position: absolute;
-				top: 220rpx;
-				left: 90rpx;
-
-				.icon-wrap {
-				  height: 150rpx;
-				  width: 150rpx;
-				  border-radius: 100%;
-				  margin-bottom: 16rpx;
-				  background: #FFFFFF;
-				}
-
-				.top-name{
-				  
-
-				  .top-title {
+		padding-bottom: calc(20rpx + env(safe-area-inset-bottom));
+		padding-top: 15rpx;
+		.personal-place {
+			height: calc(200rpx + env(safe-area-inset-top));
+		}
+		.personal-info {
+			height: 200rpx;
+			display: flex;
+			padding: 0 30rpx;
+			.personal-info-left {
+				width: 70%;
+				.personal-name {
 					font-size: 40rpx;
-					text-align: center;
-					color: #fff;
-					margin-left: 40rpx;
-					line-height: 60rpx;
-				  }
-
-				  .top-phone {
+					font-family: PingFang SC-Semibold, PingFang SC;
+					font-weight: 600;
+					color: #1D2129;
+					line-height: 50rpx;
+					.personal-phone {
+						font-size: 30rpx;
+						font-family: PingFang SC-Regular, PingFang SC;
+						font-weight: 400;
+						color: #4E5969;
+						line-height: 50px;
+					}
+				}
+				.personal-role {
 					font-size: 30rpx;
-					text-align: center;
-					color: #fff;
-					margin-left: 40rpx;
-					line-height: 60rpx;
-				  }
+					font-family: PingFang SC-Regular, PingFang SC;
+					font-weight: 400;
+					color: #4E5969;
+					line-height: 50rpx;
 				}
-			  }
-		}
-
-		.shop {
-		  height: 300rpx;
-		  background: #fff;
-		  margin: 0 40rpx;
-		  transform: translateY(-100rpx);
-		  border-radius: 10rpx;
-		  display: flex;
-
-		  .img {
-			padding: 50rpx 0 50rpx 50rpx;
-			border-radius: 10rpx;
-		  }
-
-		  .shop-info {
-			margin: 70rpx 0 0 20rpx;
-
-			.title {
-			  font-size: 40rpx;
-			  font-family: PingFang SC;
-			  font-weight: 400;
-			  color: #100F06;
-			  line-height: 41rpx;
 			}
-
-			.id {
-			  font-size: 30rpx;
-			  font-family: PingFang SC;
-			  font-weight: 400;
-			  color: #B5B5B5;
-			  line-height: 41rpx;
-			}
-
-			.address {
-			  font-size: 24rpx;
-			  font-family: PingFang SC;
-			  font-weight: 400;
-			  color: #B5B5B5;
-			  line-height: 41rpx;
-			  margin-top: 40rpx;
+			.personal-info-right {
+				height: 128rpx;
+				width: 128rpx;
+				line-height: 128rpx;
+				text-align: center;
+				border-radius: 50%;
+				background: #3aabf6;
+				color: #FFFFFF;
+				font-size: 50rpx;
+				font-family: PingFang SC-Regular, PingFang SC;
+				font-weight: 600;
+				margin-top: 20rpx;
 			}
-
-			.time {
-			  font-size: 30rpx;
-			  font-family: PingFang SC;
-			  font-weight: 400;
-			  color: #B5B5B5;
-			  line-height: 41rpx;
-			}
-		  }
 		}
-
 		.toPage {
-		  height: 400rpx;
-		  width: 100%;
-		  background: #fff;
-		  margin-top: 40rpx;
-		  margin-bottom: 30rpx;
-
-		  .items {
-			height: 120rpx;
-			line-height: 120rpx;
-			display: flex;
-		  }
-		}
-
-		.logout {
-		  height: 100rpx;
-		  background: #FFFFFF;
-		  width: 100%;
-		  text-align: center;
-		  font-size: 34rpx;
-		  font-family: PingFang SC;
-		  font-weight: 400;
-		  color: #0B0B0C;
-		  line-height: 100rpx;
-		  margin-top: 60rpx;
+			height: auto;
+			background: #fff;
+			margin: 40rpx 30rpx 30rpx;
+			border-radius: 16rpx;
+			.toPage-items {
+				height: 120rpx;
+				line-height: 120rpx;
+				display: flex;
+				padding: 0 30rpx;
+				position: relative;
+				.toPage-title {
+					font-size: 30rpx;
+					font-family: PingFang SC-Regular, PingFang SC;
+					font-weight: 400;
+					color: #1D2129;
+					line-height: 120rpx;
+					margin-left: 10rpx;
+				}
+				.toPage-next {
+					line-height: 120rpx;
+					font-size: 30rpx;
+					font-family: PingFang SC-Regular, PingFang SC;
+					font-weight: 400;
+					color: #1D2129;
+					position: absolute;
+					right: 30rpx;
+				}
+			}
 		}
 	}
 </style>

pages/ucenter/mineNotes.vue

@@ -0,0 +1,231 @@
+<template>
+	<view class="page-content">
+		<view class="page-search-container">
+			<u-input type="select" class="page-search-text" :select-open="show" placeholder="请选择换电站" v-model="formData.name" @click="show = true"/>
+			<u-tabs-swiper ref="tabs" :list="tabsList" :current="current" :is-scroll="false" bar-height="6" bar-width="40" active-color="#2979ff" @change="tabsChange" ></u-tabs-swiper>
+		</view>
+		<swiper class="swiper-group" :style="{height:swiperContentHeight}" :current="swiperCurrent" @transition="transition" @animationfinish="animationfinish">
+			<swiper-item class="swiper-item" v-for="(item, index) in tabs" :key="index">
+				<scroll-view  class="scroll-content-container" :style="{height:scrollerHeight}"  scroll-y @scrolltolower="onreachBottom" @click="gotoDetail(item)">
+					<view class="order-container" v-for="(order,i) in item.dataSet" :key="i">
+						<view class="order-title-container">
+							<view class="order-title-text">
+								充电机故障充电机故障充电机故障充电机故障
+							</view>
+							<view class="order-status">
+								待处理
+							</view>
+						</view>
+						<view class="order-time">
+							{{'2023-10-21 15:22:55'}}
+						</view>
+						<view class="order-site">
+							{{'三江换电站'}}
+						</view>
+						<view class="order-reason">
+							{{'三江换电站三江换电站三江换电站三江换电站三江换电站三江换电站三江换电站三江换电站三江换电站三江换电站三江换电站三江换电站三江换电站'}}
+						</view>
+					</view>
+					<view v-if="no_more" class="no-more">亲, 没有更多了
+					</view>
+					<!-- 无数据提供的页面 -->
+					<view v-if="!item.dataSet.length">
+						<view class="yoshop-notcont">
+							<text class="cont">亲，暂无订单哦</text>
+						</view>
+					</view>
+				</scroll-view>
+			</swiper-item>
+		</swiper>
+		<u-select :list="siteList" v-model="show" @confirm="siteSelectCallback"> </u-select>
+	</view>
+</template>
+
+<script>
+	export default {
+	  data() {
+	    return {
+			//表头列表
+			tabsList: [{
+				name: '工单上报'
+			}, {
+				name: '处理记录'
+			}],
+			current: 0,
+			swiperCurrent: 0,
+			scrollerHeight: 0,
+			swiperContentHeight: 0,
+			tabs:[
+				  {name:'工单上报',index:0,dataSet:[]},
+				  {name:'处理记录2',index:1,dataSet:[]},
+			],
+			formData: {
+				name: '全部站点',
+			},
+			show: false,
+			siteList: [
+				{label: '全部站点', value: ''},
+				{label: '兰州皋兰站', value: '1'},
+				{label: '河北沧州站', value: '2'}
+			]
+	    }
+	  },
+		//第一次加载
+		onLoad(e) {
+			  console.log('打印参数:',this.current)
+			  this.swiperCurrent = e.type
+			  this.current = e.type
+			  this.tabsChange(0);
+		},
+       onReady() {
+            let that = this
+            uni.getSystemInfo({
+                success: function (res) {
+                    let windowHeight= res.windowHeight;
+                    that.swiperContentHeight = (windowHeight-158) + 'px';
+                    that.scrollerHeight = (windowHeight-5) + 'px'; // 给5px的底部间距
+                }
+            });
+        },
+		//页面显示
+		onShow() {
+	
+		},
+		methods: {
+			// tabs通知swiper切换
+			tabsChange(index) {
+				this.swiperCurrent = index;
+				let list = [
+					{name: '苹果', price: 3000, sb: '一类-化工', sl: 8},
+					{name: '苹果', price: 3000, sb: '一类-化工', sl: 8},
+					{name: '苹果', price: 3000, sb: '一类-化工', sl: 8},
+					{name: '苹果', price: 3000, sb: '一类-化工', sl: 8},
+					{name: '苹果', price: 3000, sb: '一类-化工', sl: 8},
+					{name: '苹果', price: 3000, sb: '一类-化工', sl: 8},
+					{name: '苹果', price: 3000, sb: '一类-化工', sl: 8},
+					{name: '苹果', price: 3000, sb: '一类-化工', sl: 8},
+					{name: '苹果', price: 3000, sb: '一类-化工', sl: 8},
+					{name: '苹果', price: 3000, sb: '一类-化工', sl: 8},
+					{name: '苹果', price: 3000, sb: '一类-化工', sl: 8},
+					{name: '苹果', price: 3000, sb: '一类-化工', sl: 8},
+				]
+				this.tabs[index].dataSet = this.tabs[index].dataSet.concat(list);
+			},
+			// swiper-item左右移动，通知tabs的滑块跟随移动
+			transition(e) {
+				let dx = e.detail.dx;
+				this.$refs.tabs.setDx(dx);
+			},
+			// 由于swiper的内部机制问题，快速切换swiper不会触发dx的连续变化，需要在结束时重置状态
+			// swiper滑动结束，分别设置tabs和swiper的状态
+			animationfinish(e) {
+				let current = e.detail.current;
+				this.$refs.tabs.setFinishCurrent(current);
+				this.swiperCurrent = current;
+				this.current = current;
+			},
+			// scroll-view到底部加载更多
+			onreachBottom() {
+				this.tabsChange(this.swiperCurrent);
+			},
+			//站点选择
+			siteSelectCallback(data) {
+				uni.hideKeyboard();
+				this.formData.name = data[0].label;
+			},
+			//跳转详情页面
+			gotoDetail(item) {
+				uni.navigateTo({
+					url: '/pages/index/orderDetail?id=' + item.id
+				})
+			},
+			
+		}	
+	}
+</script>
+
+<style lang="scss" scoped>
+	.page-content {
+		height: 100vh;
+		position: relative;
+		box-sizing: border-box;
+		background: $uni-bg-color;
+		padding-bottom: env(safe-area-inset-bottom);
+		.page-search-container {
+			display: flex;
+			background: #FFFFFF;
+			.page-search-text {
+				margin-left: 30rpx;
+				width: 30%;
+			}
+		}
+		.swiper-group {
+			padding: 0 32rpx;
+			height: 100% !important;
+			.order-container {
+				height: 270rpx;
+				background: #FFFFFF;
+				border-radius: 16rpx;
+				margin-top: 10rpx;
+				padding: 32rpx;
+				.order-title-container {
+					display: flex;
+					.order-title-text {
+						height: 44rpx;
+						font-size: 32rpx;
+						font-family: PingFang SC-Medium, PingFang SC;
+						font-weight: 500;
+						color: #1D2129;
+						line-height: 44rpx;
+						width: calc(100% - 154rpx);
+						overflow: hidden;
+						white-space: nowrap;
+						text-overflow: ellipsis;
+					}
+					.order-status {
+						height: 44rpx;
+						font-size: 22rpx;
+						font-family: PingFang SC-Regular, PingFang SC;
+						font-weight: 400;
+						color: #3F8CFF;
+						line-height: 44rpx;
+						width: 80rpx;
+						text-align: center;
+						background: #e8F1FF;
+						border-radius: 16rpx;
+						margin-left: 10rpx;
+					}
+				}
+				.order-time {
+					font-size: 22rpx;
+					font-family: PingFang SC-Regular, PingFang SC;
+					font-weight: 400;
+					color: #86909C;
+					line-height: 40rpx;
+					margin-top: 16rpx;
+				}
+				.order-site {
+					font-size: 28rpx;
+					font-family: PingFang SC-Regular, PingFang SC;
+					font-weight: 400;
+					color: #4E5969;
+					line-height: 40rpx;
+					margin-top: 16rpx;
+				}
+				.order-reason {
+					font-size: 28rpx;
+					font-family: PingFang SC-Regular, PingFang SC;
+					font-weight: 400;
+					color: #4E5969;
+					line-height: 40rpx;
+					overflow: hidden;
+					white-space: nowrap;
+					text-overflow: ellipsis;
+					margin-top: 16rpx;
+				}
+			}
+		}
+		
+	}
+    
+</style>

uni.scss

@@ -28,7 +28,7 @@ $uni-text-color-placeholder: #808080;
 $uni-text-color-disable:#c0c0c0;
 
 /* 背景颜色 */
-$uni-bg-color:#F2F3F5;
+$uni-bg-color:#F7F8FA;
 $uni-bg-color-grey:#f8f8f8;
 $uni-bg-color-hover:#f1f1f1;//点击状态颜色
 $uni-bg-color-mask:rgba(0, 0, 0, 0.4);//遮罩颜色