Merge remote-tracking branch 'origin/main'

yudao-mall-uniapp-master/pages/commission/components/account-type-select.vue

@@ -62,9 +62,9 @@
     //   value: '1',
     // },
     {
-      icon: '/static/img/shop/pay/wechat.png',
+      icon: '/static/img/shop/pay/alipay.png',
-      title: '微信零钱',
+      title: '支付宝',
-      value: '3',
+      value: '4',
     },
     // {
     //   icon: '/static/img/shop/pay/alipay.png',

yudao-mall-uniapp-master/pages/commission/withdraw.vue

@@ -2,15 +2,12 @@
 <template>
   <s-layout title="申请提现" class="withdraw-wrap" navbar="inner">
     <view class="page-bg"></view>
-    <view
+    <view class="wallet-num-box ss-flex ss-col-center ss-row-between" :style="[
-      class="wallet-num-box ss-flex ss-col-center ss-row-between"
-      :style="[
         {
           marginTop: '-' + Number(statusBarHeight + 88) + 'rpx',
           paddingTop: Number(statusBarHeight + 108) + 'rpx',
         },
-      ]"
+      ]">
-    >
       <view class="">
         <view class="num-title">可提现金额（元）</view>
         <view class="wallet-num">{{ fen2yuan(state.brokerageInfo.brokeragePrice) }}</view>
@@ -29,6 +26,7 @@
           <view v-if="state.accountInfo.type === '3'" class="empty-text">微信零钱</view>
           <!-- <view v-if="state.accountInfo.type === '3'" class="empty-text">支付宝账户</view> -->
           <!-- <view v-if="state.accountInfo.type === '4'" class="empty-text">银行卡转账</view> -->
+          <view v-if="state.accountInfo.type === '4'" class="empty-text">支付宝</view>
           <text class="cicon-forward" />
         </view>
       </view>
@@ -36,90 +34,59 @@
       <view class="card-title">提现金额</view>
       <view class="input-box ss-flex ss-col-center border-bottom">
         <view class="unit">￥</view>
-        <uni-easyinput
+        <uni-easyinput :inputBorder="false" class="ss-flex-1 ss-p-l-10" v-model="state.accountInfo.price" type="number"
-          :inputBorder="false"
+          placeholder="请输入提现金额" />
-          class="ss-flex-1 ss-p-l-10"
-          v-model="state.accountInfo.price"
-          type="number"
-          placeholder="请输入提现金额"
-        />
       </view>
       <view style="font-size: 22rpx;color: #ccc;">提现抽成百分之10</view>
       <!-- 提现账号 -->
       <view class="card-title" v-show="['2', '3', '4'].includes(state.accountInfo.type)">
         提现账号
       </view>
-      <view
+      <view class="input-box ss-flex ss-col-center border-bottom"
-        class="input-box ss-flex ss-col-center border-bottom"
+        v-show="['2', '3', '4'].includes(state.accountInfo.type)">
-        v-show="['2', '3', '4'].includes(state.accountInfo.type)"
-      >
         <view class="unit" />
-        <uni-easyinput
+        <uni-easyinput :inputBorder="false" class="ss-flex-1 ss-p-l-10" v-model="state.accountInfo.accountNo"
-          :inputBorder="false"
+          placeholder="请输入提现账号" />
-          class="ss-flex-1 ss-p-l-10"
+      </view>
-          v-model="state.accountInfo.accountNo"
+      <!-- 提现 真实姓名 -->
-          placeholder="请输入提现账号"
+      <view class="card-title" v-show="['2', '3', '4'].includes(state.accountInfo.type)">
-        />
+        真实姓名
+      </view>
+      <view class="input-box ss-flex ss-col-center border-bottom" v-show="['4'].includes(state.accountInfo.type)">
+        <view class="unit" />
+        <uni-easyinput :inputBorder="false" class="ss-flex-1 ss-p-l-10" v-model="state.accountInfo.name"
+          placeholder="请输入真实姓名" />
       </view>
       <!-- 收款码 -->
       <view class="card-title" v-show="['2', '3'].includes(state.accountInfo.type)">收款码</view>
-      <view
+      <view class="input-box ss-flex ss-col-center" v-show="['2', '3'].includes(state.accountInfo.type)">
-        class="input-box ss-flex ss-col-center"
-        v-show="['2', '3'].includes(state.accountInfo.type)"
-      >
         <view class="unit" />
         <view class="upload-img">
-          <s-uploader
+          <s-uploader v-model:url="state.accountInfo.accountQrCodeUrl" fileMediatype="image" limit="1" mode="grid"
-            v-model:url="state.accountInfo.accountQrCodeUrl"
+            :imageStyles="{ width: '168rpx', height: '168rpx' }" />
-            fileMediatype="image"
-            limit="1"
-            mode="grid"
-            :imageStyles="{ width: '168rpx', height: '168rpx' }"
-          />
         </view>
       </view>
       <!-- 持卡人姓名 -->
-      <view class="card-title" v-show="state.accountInfo.type === '4'">持卡人</view>
+      <!-- <view class="card-title" v-show="state.accountInfo.type === '4'">持卡人</view>
-      <view
+      <view class="input-box ss-flex ss-col-center border-bottom" v-show="state.accountInfo.type === '4'">
-        class="input-box ss-flex ss-col-center border-bottom"
-        v-show="state.accountInfo.type === '4'"
-      >
         <view class="unit" />
-        <uni-easyinput
+        <uni-easyinput :inputBorder="false" class="ss-flex-1 ss-p-l-10" v-model="state.accountInfo.name"
-          :inputBorder="false"
+          placeholder="请输入持卡人姓名" />
-          class="ss-flex-1 ss-p-l-10"
+      </view> -->
-          v-model="state.accountInfo.name"
-          placeholder="请输入持卡人姓名"
-        />
-      </view>
       <!-- 提现银行 -->
-      <view class="card-title" v-show="state.accountInfo.type === '4'">提现银行</view>
+      <!-- <view class="card-title" v-show="state.accountInfo.type === '4'">提现银行</view>
-      <view
+      <view class="input-box ss-flex ss-col-center border-bottom" v-show="state.accountInfo.type === '4'">
-        class="input-box ss-flex ss-col-center border-bottom"
-        v-show="state.accountInfo.type === '4'"
-      >
         <view class="unit" />
-        <uni-easyinput
+        <uni-easyinput :inputBorder="false" class="ss-flex-1 ss-p-l-10" v-model="state.accountInfo.bankName"
-          :inputBorder="false"
+          placeholder="请输入提现银行" />
-          class="ss-flex-1 ss-p-l-10"
+      </view> -->
-          v-model="state.accountInfo.bankName"
-          placeholder="请输入提现银行"
-        />
-      </view>
       <!-- 开户地址 -->
-      <view class="card-title" v-show="state.accountInfo.type === '4'">开户地址</view>
+      <!-- <view class="card-title" v-show="state.accountInfo.type === '4'">开户地址</view>
-      <view
+      <view class="input-box ss-flex ss-col-center border-bottom" v-show="state.accountInfo.type === '4'">
-        class="input-box ss-flex ss-col-center border-bottom"
-        v-show="state.accountInfo.type === '4'"
-      >
         <view class="unit" />
-        <uni-easyinput
+        <uni-easyinput :inputBorder="false" class="ss-flex-1 ss-p-l-10" v-model="state.accountInfo.bankAddress"
-          :inputBorder="false"
+          placeholder="请输入开户地址" />
-          class="ss-flex-1 ss-p-l-10"
+      </view> -->
-          v-model="state.accountInfo.bankAddress"
-          placeholder="请输入开户地址"
-        />
-      </view>
       <button class="ss-reset-button save-btn ui-BG-Main-Gradient ui-Shadow-Main" @tap="onConfirm">
         确认提现
       </button>
@@ -136,13 +103,8 @@
     </view>
 
     <!-- 选择提现账户 -->
-    <account-type-select
+    <account-type-select :show="state.accountSelect" @close="onAccountSelect(false)" round="10"
-      :show="state.accountSelect"
+      v-model="state.accountInfo" :methods="state.withdrawTypes" />
-      @close="onAccountSelect(false)"
-      round="10"
-      v-model="state.accountInfo"
-      :methods="state.withdrawTypes"
-    />
   </s-layout>
 </template>