调整整体样式

components/discountCoupon/index.js

@@ -0,0 +1,24 @@
+// components/discountCoupon/index.js
+Component({
+
+  /**
+   * 组件的属性列表
+   */
+  properties: {
+
+  },
+
+  /**
+   * 组件的初始数据
+   */
+  data: {
+
+  },
+
+  /**
+   * 组件的方法列表
+   */
+  methods: {
+
+  }
+})

components/discountCoupon/index.json

@@ -0,0 +1,4 @@
+{
+  "component": true,
+  "usingComponents": {}
+}

components/discountCoupon/index.wxml

@@ -0,0 +1,2 @@
+<!--components/discountCoupon/index.wxml-->
+<text>components/discountCoupon/index.wxml</text>

components/discountCoupon/index.wxss

@@ -0,0 +1 @@
+/* components/discountCoupon/index.wxss */

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-left: 24rpx;
-  margin-right: 46rpx;
+  margin-right: 24rpx;
-  border-radius: 30rpx;
+  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-left: 24rpx;
-  margin-right: 46rpx;
+  margin-right: 24rpx;
   margin-bottom: 30rpx;
-  border-radius: 30rpx;
+  border-radius: 16rpx;
 }
 
 .operate {
@@ -159,8 +159,10 @@
 }
 
 .others {
-  margin-left: 46rpx;
+  margin-left: 24rpx;
-  margin-right: 46rpx;
+  margin-right: 24rpx;
   margin-top: 10rpx;
   margin-bottom: 40rpx;
+  border-radius: 16rpx;
+  overflow: hidden;
 }

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" />
+  <view style="border-radius: 16rpx; overflow: hidden;">
-  <van-cell icon="qr" wx:if="{{!!user.isAdmin}}" title="二维码" value="" is-link bind:click="jumpToQrCode" />
+    <van-cell title="联系客服" value="" is-link bind:tap="connect" icon="service-o" />
-  <van-cell icon="friends-o" wx:if="{{!!user.isAdmin}}" is-link bind:click="jumpToMember">
+    <van-cell icon="qr" wx:if="{{!!user.isAdmin}}" title="二维码" value="" is-link bind:click="jumpToQrCode" />
-    <view slot="title">
+    <van-cell icon="friends-o" wx:if="{{!!user.isAdmin}}" is-link bind:click="jumpToMember">
-      <view  class="cellWrapper">        
+      <view slot="title">
-        <view class="text"> 成员管理 </view>
+        <view  class="cellWrapper">        
-        <dot wx:if="{{dot > 0}}" number="{{dot}}" />
+          <view class="text"> 成员管理 </view>
+          <dot wx:if="{{dot > 0}}" number="{{dot}}" />
+        </view>
       </view>
-    </view>
+    </van-cell>
-  </van-cell>
+    <van-cell title="发票抬头" icon="discount-o" value="" is-link bind:tap="jumpToUpdateInvoice">
-  <van-cell title="发票抬头" icon="discount-o" value="" is-link bind:tap="jumpToUpdateInvoice" icon="search">
+    </van-cell>
-  </van-cell>
+    <van-cell title="绑定企业" icon="exchange" value="" is-link bind:tap="bindTenement" />
-  <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="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="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 title="退出登录" icon="revoke" value="" is-link bind:tap="logout" />
+  </view>
 
   <van-dialog id="van-dialog" />
 </view>

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 {