更新

hdApp/src/admin/home/me.vue

@@ -48,12 +48,10 @@
         <view class="finance-col" v-if="lookMoney == 1">
           <view class="finance-label">账户余额（元）</view>
           <view class="finance-amount">￥{{ moneyFormat(myInfo.balance) }}</view>
-          <view class="finance-actions balance-actions">
-            <view class="balance-action-row">
-              <view class="pill-btn" @click="pageTo({ url: '/pagesStore/me/shopYeChange' })">变动明细</view>
-              <view class="pill-btn" @click="pageTo({ url: '/pagesStore/me/withdraw' })">提现记录</view>
-            </view>
-            <view class="pill-btn pill-btn-solid balance-withdraw-btn" v-if="Number(myInfo.txBalance) > 0" @click="checkToApplyCash">提现</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/withdraw' })">提现记录</view>
+            <view class="pill-btn" v-if="Number(myInfo.txBalance) > 0" @click="checkToApplyCash">提现</view>
           </view>
         </view>
 
@@ -63,7 +61,7 @@
           <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>
@@ -168,6 +166,11 @@
               <input type="digit" ref="input" class="amount-input" v-model="outAmount" :adjust-position="false" />
             </view>
           </view>
+          <view class="inp-list-line remark-line">
+            <view class="line-input">
+              <input type="text" class="remark-input" v-model="outAmountRemark" maxlength="50" placeholder="备注（选填）" :adjust-position="false" />
+            </view>
+          </view>
         </view>
       </template>
     </modal-module>
@@ -180,6 +183,11 @@
               <input type="digit" ref="input" class="amount-input" v-model="inAmount" :adjust-position="false" />
             </view>
           </view>
+          <view class="inp-list-line remark-line">
+            <view class="line-input">
+              <input type="text" class="remark-input" v-model="inAmountRemark" maxlength="50" placeholder="备注（选填）" :adjust-position="false" />
+            </view>
+          </view>
         </view>
       </template>
     </modal-module>
@@ -268,6 +276,8 @@ export default {
       lookMoney: 0,
       inAmount: "",
       outAmount: "",
+      inAmountRemark: "",
+      outAmountRemark: "",
       outAmountShow: false,
       inAmountShow: false,
       menuList: [
@@ -420,25 +430,36 @@ export default {
       this.$util.pageTo({ url: "/admin/shop/myShop" });
     },
     inAmountFn () {
+      this.inAmountRemark = "";
       this.inAmountShow = true;
     },
     outAmountFn () {
+      this.outAmountRemark = "";
       this.outAmountShow = true;
     },
+    resetOutAmountForm () {
+      this.outAmount = "";
+      this.outAmountRemark = "";
+    },
+    resetInAmountForm () {
+      this.inAmount = "";
+      this.inAmountRemark = "";
+    },
     outAmountConfirm (val) {
       if (val.index == 0) {
         this.outAmountShow = false;
+        this.resetOutAmountForm();
         return;
       }
       if (this.$util.isEmpty(this.outAmount) || Number(this.outAmount) <= 0) {
         this.$msg("请填写金额");
         return false;
       }
-      outMoney({ amount: this.outAmount }).then(res => {
+      outMoney({ amount: this.outAmount, remark: this.outAmountRemark }).then(res => {
         if (res.code == 1) {
           this.$msg("操作成功");
           this.outAmountShow = false;
-          this.outAmount = "";
+          this.resetOutAmountForm();
           this.getMyInfo();
         }
       });
@@ -446,17 +467,18 @@ export default {
     inAmountConfirm (val) {
       if (val.index == 0) {
         this.inAmountShow = false;
+        this.resetInAmountForm();
         return;
       }
       if (this.$util.isEmpty(this.inAmount) || Number(this.inAmount) <= 0) {
         this.$msg("请填写金额");
         return false;
       }
-      inMoney({ amount: this.inAmount }).then(res => {
+      inMoney({ amount: this.inAmount, remark: this.inAmountRemark }).then(res => {
         if (res.code == 1) {
           this.$msg("操作成功");
           this.inAmountShow = false;
-          this.inAmount = "";
+          this.resetInAmountForm();
           this.getMyInfo();
         }
       });
@@ -826,19 +848,20 @@ export default {
   font-weight: 800;
 }
 
-.cash-col .finance-actions {
+.finance-col .finance-actions {
   flex-wrap: nowrap;
   justify-content: space-between;
   margin-bottom: 0;
 }
 
-.cash-col .pill-btn {
+.finance-col .pill-btn {
   min-width: 0;
   height: 46upx;
   padding: 0 12upx;
   margin-right: 0;
   margin-bottom: 0;
-  font-size: 22upx;
+  font-size: 26upx;
+  white-space: nowrap;
 }
 
 .finance-actions {
@@ -855,29 +878,6 @@ export default {
   margin-bottom: 0;
 }
 
-.balance-actions {
-  flex-direction: column;
-  align-items: flex-start;
-  justify-content: flex-start;
-}
-
-.balance-action-row {
-  display: flex;
-  align-items: center;
-}
-
-.balance-action-row .pill-btn + .pill-btn {
-  margin-left: 12upx;
-}
-
-.balance-withdraw-btn {
-  margin-top: 14upx;
-}
-
-.finance-col:not(.cash-col) .finance-actions .pill-btn {
-  font-size: 24upx;
-}
-
 .pill-btn {
   min-width: 108upx;
   height: 50upx;
@@ -999,6 +999,21 @@ export default {
   box-sizing: border-box;
 }
 
+.remark-line {
+  margin-top: 20upx;
+}
+
+.remark-input {
+  width: 100%;
+  height: 72upx;
+  padding: 0 20upx;
+  border: 1upx solid #e5e9e7;
+  border-radius: 14upx;
+  color: #111416;
+  font-size: 28upx;
+  box-sizing: border-box;
+}
+
 .guest-page {
   min-height: 100vh;
   background: #f2f7f4;