Merge branch 'refs/heads/milestone-20250913-现金管理' into lihui/feature-20250915101448-现金管理

.env.development

@@ -1,9 +1,9 @@
-VITE_API_BASE='https://hwjb.homilychart.com/dev/admin'
+# VITE_API_BASE='https://hwjb.homilychart.com/dev/admin'
 # 测试环境
 #  VITE_API_BASE='http://54.255.212.181:10704/'
 # 正式环境
 #  VITE_API_BASE='http://54.255.212.181:10705/'
-# VITE_UPLOAD_URL=http://39.101.133.168:8828/hljw/api/aws/upload
+VITE_UPLOAD_URL=http://39.101.133.168:8828/hljw/api/aws/upload
 #  VITE_API_BASE='http://192.168.9.28:8081/'
 # sunjiabei
 #  VITE_API_BASE='http://192.168.9.28:8081/'
@@ -11,7 +11,7 @@ VITE_API_BASE='https://hwjb.homilychart.com/dev/admin'
 # zhangyong
 #  VITE_API_BASE='http://192.168.3.83:8081/'
 # 本地
-VITE_API_BASE='http://localhost:8081/'
+# VITE_API_BASE='http://localhost:8081/'
 # sunjiabei
 # VITE_API_BASE='http://192.168.1.70:8081/'
 

src/components/dialogs/ConfirmDialog.vue

@@ -24,7 +24,7 @@
           取消
         </el-button>
         <el-button round class="custom-large-button" type="primary" @click="handleConfirm">
-          通过
+          确定
         </el-button>
       </div>
     </template>

src/views/moneyManage/receiveDetail/receiveDetail.vue

@@ -231,7 +231,7 @@
                     </el-table>
                 </div>
                 <div class="pagination">
-                    <el-pagination :page-size="pageInfo.pageSize" :page-sizes="[5, 10, 20, 50, 100]"
+                    <el-pagination background :page-size="pageInfo.pageSize" :page-sizes="[5, 10, 20, 50, 100]"
                         layout="total, sizes, prev, pager, next, jumper" :total="total"
                         @size-change="handlePagination('size', $event)"
                         @current-change="handlePagination('page', $event)"></el-pagination>
@@ -842,9 +842,10 @@ const handleAddForm = async () => {
                 submitterId: adminData.value.id,
                 permanentGold: (addFormData.value.permanentGold || 0) * 100,
                 freeGold: (addFormData.value.freeGold || 0) * 100,
-                goodNum: addFormData.value.goodNum || 0,
+                goodNum: paymentAmount || 0,
                 paymentCurrency: CurrencyForId(addFormData.value.paymentCurrency) || '',
-                receivedMarket: MarketNameForId(addFormData.value.receivedMarket) || ''
+                receivedMarket: MarketNameForId(addFormData.value.receivedMarket) || '',
+                paymentAmount:(addFormData.value.freeGold)*100
             }
         })
         if (result.code == 200) {
@@ -1064,7 +1065,7 @@ const submitEditForm = async () => {
                 orderCode: editFormData.value.orderCode,
                 handlingCharge: editFormData.value.handlingCharge * 100,
                 paymentCurrency: CurrencyForId(editFormData.value.paymentCurrency),
-                paymentAmount: editFormData.value.paymentAmount,
+                paymentAmount: (editFormData.value.paymentAmount)*100,
                 receivedCurrency: CurrencyForId(editFormData.value.receivedCurrency),
                 receivedAmount: editFormData.value.receivedAmount * 100,
                 receivedTime: editFormData.value.receivedTime,