shish 1 месяц назад
Родитель
Сommit
55d3965ad3

+ 27 - 42
hdApp/src/admin/home/me.vue

@@ -44,24 +44,22 @@
       </view>
 
       <view class="content-wrap">
-      <view class="finance-card">
-        <view class="finance-col" v-if="lookMoney == 1">
+      <view class="finance-stack">
+        <view class="finance-card" v-if="lookMoney == 1">
           <view class="finance-label">账户余额(元)</view>
           <view class="finance-amount">¥{{ moneyFormat(myInfo.balance) }}</view>
           <view class="finance-actions">
-            <view class="pill-btn" @click="pageTo({ url: '/pagesStore/me/shopYeChange' })">明细</view>
+            <view class="pill-btn" @click="pageTo({ url: '/pagesStore/me/shopYeChange' })">变动明细</view>
             <view class="pill-btn" @click="pageTo({ url: '/pagesStore/me/withdraw' })">提现记录</view>
             <view class="pill-btn" @click="checkToApplyCash">提现</view>
           </view>
         </view>
 
-        <view class="finance-divider" v-if="lookMoney == 1"></view>
-
-        <view class="finance-col cash-col" :class="{ full: lookMoney != 1 }">
+        <view class="finance-card">
           <view class="finance-label">现金(元)</view>
           <view class="finance-amount">¥{{ moneyFormat(myInfo.money) }}</view>
           <view class="finance-actions">
-            <view class="pill-btn" @click="pageTo({ url: '/admin/home/moneyChangeList' })">明细</view>
+            <view class="pill-btn" @click="pageTo({ url: '/admin/home/moneyChangeList' })">变动明细</view>
             <view class="pill-btn" @click="outAmountFn">取出</view>
             <view class="pill-btn" @click="inAmountFn">存入</view>
           </view>
@@ -810,29 +808,19 @@ export default {
   padding: 4upx 24upx 28upx;
 }
 
-.finance-card {
-  display: flex;
-  align-items: stretch;
+.finance-stack {
   margin-top: 0;
+}
+
+.finance-card {
   padding: 28upx 24upx;
   border-radius: 20upx;
   background: #fff;
   box-shadow: 0 8upx 24upx rgba(24, 37, 30, 0.05);
 }
 
-.finance-col {
-  flex: 1;
-  min-width: 0;
-}
-
-.finance-col.full {
-  width: 100%;
-}
-
-.finance-divider {
-  width: 1upx;
-  margin: 6upx 24upx 8upx;
-  background: #edf0ef;
+.finance-card + .finance-card {
+  margin-top: 20upx;
 }
 
 .finance-label {
@@ -844,39 +832,36 @@ export default {
 .finance-amount {
   margin-top: 16upx;
   color: #111416;
-  font-size: 44upx;
+  font-size: 48upx;
   line-height: 56upx;
   font-weight: 800;
 }
 
-.finance-col .finance-actions {
-  flex-wrap: nowrap;
-  justify-content: space-between;
-  margin-bottom: 0;
-}
-
-.finance-col .pill-btn {
-  min-width: 0;
-  height: 46upx;
-  padding: 0 12upx;
-  margin-right: 0;
-  margin-bottom: 0;
-  font-size: 26upx;
-  white-space: nowrap;
-}
-
 .finance-actions {
   display: flex;
   align-items: center;
-  justify-content: space-between;
+  justify-content: flex-start;
   flex-wrap: nowrap;
   margin-top: 22upx;
   margin-bottom: 0;
 }
 
 .finance-actions .pill-btn {
-  margin-right: 0;
+  flex: none;
+  min-width: 148upx;
+  height: 68upx;
+  padding: 0 32upx;
+  margin-right: 20upx;
   margin-bottom: 0;
+  color: #666666;
+  font-size: 28upx;
+  font-weight: 400;
+  white-space: nowrap;
+  box-sizing: border-box;
+}
+
+.finance-actions .pill-btn:last-child {
+  margin-right: 0;
 }
 
 .pill-btn {

+ 1 - 1
hdApp/src/static/icons/my-service.svg

@@ -1 +1 @@
-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1779540901167" class="icon" viewBox="0 0 1051 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="3437" width="32.84375" height="32" xmlns:xlink="http://www.w3.org/1999/xlink"><path d="M55.351351 553.402811v110.924108a83.027027 83.027027 0 0 0 166.054054 0v-110.924108a83.027027 83.027027 0 0 0-166.054054 0z m763.101406 211.552865A137.852541 137.852541 0 0 1 774.918919 664.326919v-110.924108A138.378378 138.378378 0 0 1 912.328649 415.135135C898.131027 214.071351 730.499459 55.351351 525.837838 55.351351 321.148541 55.351351 153.544649 214.071351 139.347027 415.135135A138.461405 138.461405 0 0 1 276.756757 553.402811v110.924108a138.378378 138.378378 0 0 1-276.756757 0v-110.924108a138.378378 138.378378 0 0 1 83.303784-126.865297C91.883243 189.523027 286.72 0 525.837838 0s433.954595 189.523027 442.534054 426.537514A138.461405 138.461405 0 0 1 1051.675676 553.402811v110.924108a138.378378 138.378378 0 0 1-184.790487 130.269405 470.763243 470.763243 0 0 1-188.858811 121.21946A96.809514 96.809514 0 0 1 580.912432 1010.162162h-82.528864c-53.690811 0-97.113946-43.174054-97.113946-96.864865 0-53.607784 43.284757-96.864865 97.141621-96.864865h82.473514c34.954378 0 65.536 18.265946 82.639567 45.803244a415.273514 415.273514 0 0 0 154.900757-97.28zM830.27027 553.402811v110.924108a83.027027 83.027027 0 0 0 166.054054 0v-110.924108a83.027027 83.027027 0 0 0-166.054054 0zM498.438919 954.810811h82.473513c23.302919 0 41.79027-18.487351 41.790271-41.513514 0-23.053838-18.570378-41.513514-41.790271-41.513513h-82.473513c-23.302919 0-41.79027 18.487351-41.79027 41.513513 0 23.053838 18.570378 41.513514 41.79027 41.513514z" fill="#09C567" p-id="3438"></path></svg>
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1781574966084" class="icon" viewBox="0 0 1051 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="3449" xmlns:xlink="http://www.w3.org/1999/xlink" width="32.84375" height="32"><path d="M55.351351 553.402811v110.924108a83.027027 83.027027 0 0 0 166.054054 0v-110.924108a83.027027 83.027027 0 0 0-166.054054 0z m763.101406 211.552865A137.852541 137.852541 0 0 1 774.918919 664.326919v-110.924108A138.378378 138.378378 0 0 1 912.328649 415.135135C898.131027 214.071351 730.499459 55.351351 525.837838 55.351351 321.148541 55.351351 153.544649 214.071351 139.347027 415.135135A138.461405 138.461405 0 0 1 276.756757 553.402811v110.924108a138.378378 138.378378 0 0 1-276.756757 0v-110.924108a138.378378 138.378378 0 0 1 83.303784-126.865297C91.883243 189.523027 286.72 0 525.837838 0s433.954595 189.523027 442.534054 426.537514A138.461405 138.461405 0 0 1 1051.675676 553.402811v110.924108a138.378378 138.378378 0 0 1-184.790487 130.269405 470.763243 470.763243 0 0 1-188.858811 121.21946A96.809514 96.809514 0 0 1 580.912432 1010.162162h-82.528864c-53.690811 0-97.113946-43.174054-97.113946-96.864865 0-53.607784 43.284757-96.864865 97.141621-96.864865h82.473514c34.954378 0 65.536 18.265946 82.639567 45.803244a415.273514 415.273514 0 0 0 154.900757-97.28zM830.27027 553.402811v110.924108a83.027027 83.027027 0 0 0 166.054054 0v-110.924108a83.027027 83.027027 0 0 0-166.054054 0zM498.438919 954.810811h82.473513c23.302919 0 41.79027-18.487351 41.790271-41.513514 0-23.053838-18.570378-41.513514-41.790271-41.513513h-82.473513c-23.302919 0-41.79027 18.487351-41.79027 41.513513 0 23.053838 18.570378 41.513514 41.79027 41.513514z" fill="#515151" p-id="3450"></path></svg>

Разница между файлами не показана из-за своего большого размера
+ 0 - 0
hdApp/src/static/icons/my-switch-shop.svg


Некоторые файлы не были показаны из-за большого количества измененных файлов