From f6d44a6d33f477cfd2638df8346363aa297ad93f Mon Sep 17 00:00:00 2001
From: qiaomu <3520484422@qq.com>
Date: Mon, 2 Dec 2024 16:02:39 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=95=B4=E4=BD=93=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/discountCoupon/index.js   | 24 ++++++++++++++++++++
 components/discountCoupon/index.json |  4 ++++
 components/discountCoupon/index.wxml |  2 ++
 components/discountCoupon/index.wxss |  1 +
 pages/home/index.wxss                | 22 ++++++++++--------
 pages/my/index.wxml                  | 34 +++++++++++++++-------------
 pages/my/index.wxss                  |  3 ++-
 7 files changed, 63 insertions(+), 27 deletions(-)
 create mode 100644 components/discountCoupon/index.js
 create mode 100644 components/discountCoupon/index.json
 create mode 100644 components/discountCoupon/index.wxml
 create mode 100644 components/discountCoupon/index.wxss

diff --git a/components/discountCoupon/index.js b/components/discountCoupon/index.js
new file mode 100644
index 0000000..dfbe50d
--- /dev/null
+++ b/components/discountCoupon/index.js
@@ -0,0 +1,24 @@
+// components/discountCoupon/index.js
+Component({
+
+  /**
+   * 组件的属性列表
+   */
+  properties: {
+
+  },
+
+  /**
+   * 组件的初始数据
+   */
+  data: {
+
+  },
+
+  /**
+   * 组件的方法列表
+   */
+  methods: {
+
+  }
+})
\ No newline at end of file
diff --git a/components/discountCoupon/index.json b/components/discountCoupon/index.json
new file mode 100644
index 0000000..e8cfaaf
--- /dev/null
+++ b/components/discountCoupon/index.json
@@ -0,0 +1,4 @@
+{
+  "component": true,
+  "usingComponents": {}
+}
\ No newline at end of file
diff --git a/components/discountCoupon/index.wxml b/components/discountCoupon/index.wxml
new file mode 100644
index 0000000..f7a650d
--- /dev/null
+++ b/components/discountCoupon/index.wxml
@@ -0,0 +1,2 @@
+<!--components/discountCoupon/index.wxml-->
+<text>components/discountCoupon/index.wxml</text>
\ No newline at end of file
diff --git a/components/discountCoupon/index.wxss b/components/discountCoupon/index.wxss
new file mode 100644
index 0000000..96d216b
--- /dev/null
+++ b/components/discountCoupon/index.wxss
@@ -0,0 +1 @@
+/* components/discountCoupon/index.wxss */
\ No newline at end of file
diff --git a/pages/home/index.wxss b/pages/home/index.wxss
index 6113c94..d5803fc 100644
--- a/pages/home/index.wxss
+++ b/pages/home/index.wxss
@@ -14,7 +14,7 @@
   height: 46px;
   display: flex;
   align-items: center;
-  padding: 0 32rpx;
+  padding: 0 24rpx;
   color: #fff;
   font-size: 34rpx;
 }
@@ -35,7 +35,7 @@
 
 .notLoginWrapper, .logined {
   padding: 16rpx 32rpx;
-  padding-left: 50rpx;
+  padding-left: 28rpx;
   background-color: var(--middle-green);
   display: flex;
   align-items: center;
@@ -67,9 +67,9 @@
 
 .card {
   margin-top: 0rpx;
-  margin-left: 46rpx;
-  margin-right: 46rpx;
-  border-radius: 30rpx;
+  margin-left: 24rpx;
+  margin-right: 24rpx;
+  border-radius: 16rpx;
   padding: 22rpx 30rpx;
   /* background-color: rgb(173, 217, 203); */
   background: linear-gradient(to bottom right, rgb(212, 240, 231), rgb(145, 206, 185));
@@ -116,10 +116,10 @@
   background: #fff;
   padding: 20rpx 30rpx;
   margin-top: 24rpx;
-  margin-left: 46rpx;
-  margin-right: 46rpx;
+  margin-left: 24rpx;
+  margin-right: 24rpx;
   margin-bottom: 30rpx;
-  border-radius: 30rpx;
+  border-radius: 16rpx;
 }
 
 .operate {
@@ -159,8 +159,10 @@
 }
 
 .others {
-  margin-left: 46rpx;
-  margin-right: 46rpx;
+  margin-left: 24rpx;
+  margin-right: 24rpx;
   margin-top: 10rpx;
   margin-bottom: 40rpx;
+  border-radius: 16rpx;
+  overflow: hidden;
 }
\ No newline at end of file
diff --git a/pages/my/index.wxml b/pages/my/index.wxml
index e5223d7..489f166 100644
--- a/pages/my/index.wxml
+++ b/pages/my/index.wxml
@@ -11,29 +11,31 @@
       <view class="integration"> 积分： - </view>
     </view>
   </view>
-  <view style="margin-bottom: 20rpx;">
+  <view style="margin-bottom: 20rpx;border-radius: 16rpx; overflow: hidden;">
     <van-grid column-num="3">
       <van-grid-item icon="friends-o" text="财税援助" bind:click="jumpToFinance" />
       <van-grid-item icon="envelop-o" text="法律援助" bind:click="jumpToLaw" />
       <van-grid-item icon="notes-o" text="电力百科" bind:click="jumpToEncyclopedia" />
     </van-grid>
   </view>
-  <van-cell title="联系客服" value="" is-link bind:tap="connect" icon="service-o" />
-  <van-cell icon="qr" wx:if="{{!!user.isAdmin}}" title="二维码" value="" is-link bind:click="jumpToQrCode" />
-  <van-cell icon="friends-o" wx:if="{{!!user.isAdmin}}" is-link bind:click="jumpToMember">
-    <view slot="title">
-      <view  class="cellWrapper">        
-        <view class="text"> 成员管理 </view>
-        <dot wx:if="{{dot > 0}}" number="{{dot}}" />
+  <view style="border-radius: 16rpx; overflow: hidden;">
+    <van-cell title="联系客服" value="" is-link bind:tap="connect" icon="service-o" />
+    <van-cell icon="qr" wx:if="{{!!user.isAdmin}}" title="二维码" value="" is-link bind:click="jumpToQrCode" />
+    <van-cell icon="friends-o" wx:if="{{!!user.isAdmin}}" is-link bind:click="jumpToMember">
+      <view slot="title">
+        <view  class="cellWrapper">        
+          <view class="text"> 成员管理 </view>
+          <dot wx:if="{{dot > 0}}" number="{{dot}}" />
+        </view>
       </view>
-    </view>
-  </van-cell>
-  <van-cell title="发票抬头" icon="discount-o" value="" is-link bind:tap="jumpToUpdateInvoice" icon="search">
-  </van-cell>
-  <van-cell title="绑定企业" icon="exchange" value="" is-link bind:tap="bindTenement" />
-  <van-cell title="常见问题" icon="question-o" value="" is-link bind:tap="jumpToQuestions" />
-  <van-cell title="工作台" icon="records-o" wx:if="{{user.workStatus}}" value="" is-link bind:tap="jumpToWorkBench" />
-  <van-cell title="退出登录" icon="revoke" value="" is-link bind:tap="logout" />
+    </van-cell>
+    <van-cell title="发票抬头" icon="discount-o" value="" is-link bind:tap="jumpToUpdateInvoice">
+    </van-cell>
+    <van-cell title="绑定企业" icon="exchange" value="" is-link bind:tap="bindTenement" />
+    <van-cell title="常见问题" icon="question-o" value="" is-link bind:tap="jumpToQuestions" />
+    <van-cell title="工作台" icon="records-o" wx:if="{{user.workStatus}}" value="" is-link bind:tap="jumpToWorkBench" />
+    <van-cell title="退出登录" icon="revoke" value="" is-link bind:tap="logout" />
+  </view>
 
   <van-dialog id="van-dialog" />
 </view>
\ No newline at end of file
diff --git a/pages/my/index.wxss b/pages/my/index.wxss
index 4859324..95e91f8 100644
--- a/pages/my/index.wxss
+++ b/pages/my/index.wxss
@@ -6,7 +6,7 @@
 
 .pageWrapper {
   padding: 24rpx;
-
+  min-height: 80vh;
   background: linear-gradient(to bottom, var(--middle-green), #fff );
 }
 
@@ -17,6 +17,7 @@
   background-color: #fff;
   margin-bottom: 24rpx;
   overflow: hidden;
+  border-radius: 16rpx;
 }
 
 .userInfo .info {