From 2e3ab7fbbb336cf11ed37b8b0a7871976d597564 Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期三, 22 四月 2026 20:06:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 small-program/unpackage/dist/dev/mp-weixin/shop/pages/wallet/wallet.wxss |  387 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 382 insertions(+), 5 deletions(-)

diff --git a/small-program/unpackage/dist/dev/mp-weixin/shop/pages/wallet/wallet.wxss b/small-program/unpackage/dist/dev/mp-weixin/shop/pages/wallet/wallet.wxss
index 098426d..57d12c8 100644
--- a/small-program/unpackage/dist/dev/mp-weixin/shop/pages/wallet/wallet.wxss
+++ b/small-program/unpackage/dist/dev/mp-weixin/shop/pages/wallet/wallet.wxss
@@ -1,3 +1,35 @@
+
+.picker-view {
+	width: 750rpx;
+	height: 600rpx;
+	margin-top: 20rpx;
+}
+.picker-item {
+	line-height: 72rpx;
+	text-align: center;
+}
+.picker2{
+	line-height: 72rpx;
+	text-align: center;
+	background: rgba(0,64,150,0.1) !important;
+	border-radius: 8rpx;
+	font-weight: 400;
+	font-size: 28rpx;
+	color: #004096 !important;
+}
+.picker2-empty{
+	background: #F7F7F7 !important;
+	color: #999999 !important;
+}
+.picker3{
+	line-height: 72rpx;
+	text-align: center;
+	border-radius: 8rpx;
+	font-weight: 400;
+	font-size: 28rpx;
+	color: #333333;
+}
+
 @charset "UTF-8";
 /**
  * 杩欓噷鏄痷ni-app鍐呯疆鐨勫父鐢ㄦ牱寮忓彉閲�
@@ -26,10 +58,11 @@
 /* 閫忔槑搴� */
 /* 鏂囩珷鍦烘櫙鐩稿叧 */
 .wallet-page.data-v-44c5d18e {
+  width: 100%;
   min-height: 100vh;
   background: #f8f8f8;
 }
-.nav-bar.data-v-44c5d18e {
+.wallet-page .nav-bar.data-v-44c5d18e {
   position: fixed;
   top: 0;
   left: 0;
@@ -37,18 +70,362 @@
   background: #ffffff;
   z-index: 100;
 }
-.nav-content.data-v-44c5d18e {
+.wallet-page .nav-bar .nav-content.data-v-44c5d18e {
   height: 44px;
   display: flex;
   align-items: center;
   justify-content: center;
 }
-.nav-title.data-v-44c5d18e {
+.wallet-page .nav-bar .nav-content .nav-title.data-v-44c5d18e {
   font-size: 34rpx;
   font-weight: 600;
   color: #333333;
 }
-.page-content.data-v-44c5d18e {
-  padding-top: calc(44px + 44px);
+.wallet-page .sear.data-v-44c5d18e {
+  width: 100%;
+  padding: 30rpx;
+  box-sizing: border-box;
+}
+.wallet-page .sear .sear-title.data-v-44c5d18e {
+  width: 100%;
+  text-align: center;
+  font-weight: 500;
+  font-size: 32rpx;
+  color: #111111;
+}
+.wallet-page .sear .sear-item.data-v-44c5d18e {
+  width: 100%;
+  display: flex;
+  flex-direction: column;
+  margin-top: 48rpx;
+}
+.wallet-page .sear .sear-item .sear-item-label.data-v-44c5d18e {
+  font-weight: 500;
+  font-size: 32rpx;
+  color: #111111;
+}
+.wallet-page .sear .sear-item .sear-item-list.data-v-44c5d18e {
+  margin-top: 30rpx;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  flex-wrap: wrap;
+}
+.wallet-page .sear .sear-item .sear-item-list .active.data-v-44c5d18e {
+  background: rgba(0, 64, 150, 0.1) !important;
+  color: #004096 !important;
+}
+.wallet-page .sear .sear-item .sear-item-list .active1.data-v-44c5d18e {
+  border-bottom: 2rpx solid #004096 !important;
+  color: #004096 !important;
+}
+.wallet-page .sear .sear-item .sear-item-list .sear-item-list-item.data-v-44c5d18e {
+  width: 216rpx;
+  height: 72rpx;
+  line-height: 72rpx;
+  text-align: center;
+  background: #F7F7F7;
+  border-radius: 8rpx;
+  font-weight: 400;
+  font-size: 28rpx;
+  color: #333333;
+  margin-bottom: 20rpx;
+}
+.wallet-page .sear .sear-item .sear-item-list .sear-item-list-item1.data-v-44c5d18e {
+  width: 216rpx;
+  height: 72rpx;
+  line-height: 72rpx;
+  text-align: center;
+  font-weight: 400;
+  font-size: 28rpx;
+  color: #333333;
+  margin-bottom: 20rpx;
+}
+.wallet-page .sear .sear-footer.data-v-44c5d18e {
+  width: 100%;
+  height: 88rpx;
+  margin-top: 80rpx;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+}
+.wallet-page .sear .sear-footer .sear-footer-btn1.data-v-44c5d18e {
+  width: 334rpx;
+  height: 88rpx;
+  line-height: 88rpx;
+  text-align: center;
+  background: #E5E5E5;
+  border-radius: 44rpx;
+  font-weight: 500;
+  font-size: 32rpx;
+  color: #333333;
+}
+.wallet-page .sear .sear-footer .sear-footer-btn2.data-v-44c5d18e {
+  width: 334rpx;
+  height: 88rpx;
+  line-height: 88rpx;
+  text-align: center;
+  background: #004096;
+  border-radius: 44rpx;
+  font-weight: 500;
+  font-size: 32rpx;
+  color: #FFFFFF;
+}
+.wallet-page .box-list.data-v-44c5d18e {
+  width: 100%;
+  display: flex;
+  padding-bottom: 30rpx;
+  flex-direction: column;
+}
+.wallet-page .box-list .item.data-v-44c5d18e {
+  width: 100%;
+}
+.wallet-page .box-list .item .item-date.data-v-44c5d18e {
+  width: 100%;
+  display: flex;
+  flex-direction: column;
+  padding: 0 30rpx 30rpx 30rpx;
+  box-sizing: border-box;
+}
+.wallet-page .box-list .item .item-date .item-date-top.data-v-44c5d18e {
+  width: 100%;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+}
+.wallet-page .box-list .item .item-date .item-date-top .item-date-top-left.data-v-44c5d18e {
+  display: flex;
+  align-items: center;
+}
+.wallet-page .box-list .item .item-date .item-date-top .item-date-top-left image.data-v-44c5d18e {
+  width: 26rpx;
+  height: 26rpx;
+  margin-left: 12rpx;
+}
+.wallet-page .box-list .item .item-date .item-date-top .item-date-top-left text.data-v-44c5d18e {
+  font-weight: 600;
+  font-size: 28rpx;
+  color: #222222;
+  margin-right: 8rpx;
+}
+.wallet-page .box-list .item .item-date .item-date-top .sele.data-v-44c5d18e {
+  width: 200rpx;
+  height: 64rpx;
+  padding: 0 24rpx;
+  box-sizing: border-box;
+  background: #FFFFFF;
+  border-radius: 32rpx;
+  border: 1rpx solid #EEEEEE;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  margin-left: 30rpx;
+}
+.wallet-page .box-list .item .item-date .item-date-top .sele text.data-v-44c5d18e {
+  width: auto;
+  font-weight: 400;
+  font-size: 26rpx;
+  color: #333333;
+}
+.wallet-page .box-list .item .item-date .item-date-bottom.data-v-44c5d18e {
+  width: 100%;
+  display: flex;
+  align-items: center;
+  margin-top: 20rpx;
+}
+.wallet-page .box-list .item .item-date .item-date-bottom text.data-v-44c5d18e {
+  font-weight: 400;
+  font-size: 26rpx;
+  color: #777777;
+}
+.wallet-page .box-list .item .item-date .item-date-bottom text.data-v-44c5d18e:nth-child(2) {
+  margin-left: 62rpx;
+}
+.wallet-page .box-list .item .item-list.data-v-44c5d18e {
+  width: 100%;
+  display: flex;
+  flex-direction: column;
+  padding: 0 30rpx;
+  box-sizing: border-box;
+  background-color: #ffffff;
+}
+.wallet-page .box-list .item .item-list .nomore.data-v-44c5d18e {
+  text-align: center;
+  color: #999999;
+  font-size: 30rpx;
+  font-weight: 400;
+  margin-top: 30rpx;
+}
+.wallet-page .box-list .item .item-list .item-list-item.data-v-44c5d18e {
+  width: 100%;
+  padding: 30rpx 0;
+  box-sizing: border-box;
+  border-bottom: 1rpx solid #E5E5E5;
+  display: flex;
+  align-items: flex-start;
+  justify-content: center;
+}
+.wallet-page .box-list .item .item-list .item-list-item .image.data-v-44c5d18e {
+  flex-shrink: 0;
+  width: 72rpx;
+  height: 72rpx;
+  border-radius: 50%;
+  overflow: hidden;
+  margin-right: 20rpx;
+}
+.wallet-page .box-list .item .item-list .item-list-item .image image.data-v-44c5d18e {
+  width: 100%;
+}
+.wallet-page .box-list .item .item-list .item-list-item .info.data-v-44c5d18e {
+  flex: 1;
+  display: flex;
+  flex-direction: column;
+}
+.wallet-page .box-list .item .item-list .item-list-item .info .info-a.data-v-44c5d18e {
+  width: 100%;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+}
+.wallet-page .box-list .item .item-list .item-list-item .info .info-a .info-a-label.data-v-44c5d18e {
+  font-weight: 500;
+  font-size: 30rpx;
+  color: #222222;
+  display: flex;
+}
+.wallet-page .box-list .item .item-list .item-list-item .info .info-a .info-a-label text.data-v-44c5d18e {
+  font-weight: 400;
+  font-size: 24rpx;
+  color: #999999;
+  margin-left: 20rpx;
+}
+.wallet-page .box-list .item .item-list .item-list-item .info .info-a .info-a-price.data-v-44c5d18e {
+  display: flex;
+  align-items: baseline;
+}
+.wallet-page .box-list .item .item-list .item-list-item .info .info-a .info-a-price text.data-v-44c5d18e {
+  font-weight: 600;
+  font-size: 32rpx;
+  color: #222222;
+}
+.wallet-page .box-list .item .item-list .item-list-item .info .info-b.data-v-44c5d18e {
+  width: 100%;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  margin-top: 12rpx;
+}
+.wallet-page .box-list .item .item-list .item-list-item .info .info-b text.data-v-44c5d18e {
+  font-weight: 400;
+  font-size: 24rpx;
+  color: #999999;
+}
+.wallet-page .data.data-v-44c5d18e {
+  width: 100%;
+  padding: calc(44px + 44px) 30rpx 0 30rpx;
+  box-sizing: border-box;
+}
+.wallet-page .data .hezi.data-v-44c5d18e {
+  width: 100%;
+  height: 304rpx;
+  padding: 30rpx;
+  box-sizing: border-box;
+  background: #004096;
+  border-radius: 16rpx;
+}
+.wallet-page .data .hezi .hezi-a.data-v-44c5d18e {
+  width: 100%;
+  display: flex;
+  align-items: center;
+}
+.wallet-page .data .hezi .hezi-a text.data-v-44c5d18e {
+  font-weight: 400;
+  font-size: 24rpx;
+  color: rgba(255, 255, 255, 0.7);
+  margin-right: 20rpx;
+}
+.wallet-page .data .hezi .hezi-b.data-v-44c5d18e {
+  width: 100%;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  margin-top: 14rpx;
+}
+.wallet-page .data .hezi .hezi-b .hezi-b-price.data-v-44c5d18e {
+  display: flex;
+  align-items: baseline;
+}
+.wallet-page .data .hezi .hezi-b .hezi-b-price text.data-v-44c5d18e:nth-child(1) {
+  font-weight: 600;
+  font-size: 44rpx;
+  color: #FFFFFF;
+}
+.wallet-page .data .hezi .hezi-b .hezi-b-price text.data-v-44c5d18e:nth-child(2) {
+  font-weight: 600;
+  font-size: 26rpx;
+  color: #FFFFFF;
+}
+.wallet-page .data .hezi .hezi-b .hezi-b-btn.data-v-44c5d18e {
+  width: 100rpx;
+  height: 52rpx;
+  line-height: 52rpx;
+  text-align: center;
+  background: #FFFFFF;
+  border-radius: 26rpx;
+  font-weight: 500;
+  font-size: 26rpx;
+  color: #004096;
+}
+.wallet-page .data .hezi .hezi-c.data-v-44c5d18e {
+  width: 100%;
+  height: 138rpx;
+  margin-top: 24rpx;
+  display: flex;
+  align-items: center;
+  border-top: 1rpx solid rgba(255, 255, 255, 0.09);
+}
+.wallet-page .data .hezi .hezi-c .hezi-c-item.data-v-44c5d18e {
+  flex: 1;
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+}
+.wallet-page .data .hezi .hezi-c .hezi-c-item.data-v-44c5d18e:first-child {
+  border-right: 1rpx solid rgba(255, 255, 255, 0.09);
+}
+.wallet-page .data .hezi .hezi-c .hezi-c-item .hezi-c-item-title.data-v-44c5d18e {
+  font-weight: 400;
+  font-size: 24rpx;
+  color: rgba(255, 255, 255, 0.7);
+}
+.wallet-page .data .hezi .hezi-c .hezi-c-item .hezi-c-item-price.data-v-44c5d18e {
+  display: flex;
+  align-items: baseline;
+  margin-top: 8rpx;
+}
+.wallet-page .data .hezi .hezi-c .hezi-c-item .hezi-c-item-price text.data-v-44c5d18e:nth-child(1) {
+  font-weight: 600;
+  font-size: 30rpx;
+  color: #FFFFFF;
+}
+.wallet-page .data .hezi .hezi-c .hezi-c-item .hezi-c-item-price text.data-v-44c5d18e:nth-child(2) {
+  font-weight: 600;
+  font-size: 26rpx;
+  color: #FFFFFF;
+}
+.wallet-page .data .tx.data-v-44c5d18e {
+  width: 100%;
+  height: 104rpx;
+  background: rgba(0, 64, 150, 0.12);
+  border-radius: 16rpx;
+  position: relative;
+  top: -20rpx;
+  font-weight: 400;
+  font-size: 26rpx;
+  color: #004096;
+  padding: 40rpx 30rpx 0 30rpx;
+  box-sizing: border-box;
 }
 

--
Gitblit v1.9.3