From 9729d67fda0b859e29eaea18b0839848100ed218 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B0=A2=E6=AC=A3=E6=82=A6?= <2289014031@qq.com>
Date: Thu, 5 Sep 2024 09:15:14 +0800
Subject: [PATCH] ok

---
 src/views/market/reclaim/index.vue   |  4 +--
 src/views/market/workbench/index.vue | 43 ++++++++++++++++++----------
 2 files changed, 30 insertions(+), 17 deletions(-)

diff --git a/src/views/market/reclaim/index.vue b/src/views/market/reclaim/index.vue
index 2e775aa..d175875 100644
--- a/src/views/market/reclaim/index.vue
+++ b/src/views/market/reclaim/index.vue
@@ -86,11 +86,11 @@
           <template slot-scope="scope">
             <el-button
               size="mini"
-              @click="handleEdit(scope.row)">编辑</el-button>
+              @click="handleEdit(scope.row)">恢复</el-button>
             <el-button
               size="mini"
               type="danger"
-              @click="ordersDelete(scope.row)">删除</el-button>
+              @click="ordersDelete(scope.row)">彻底删除</el-button>
             <el-button
               type="primary"
               size="small"
diff --git a/src/views/market/workbench/index.vue b/src/views/market/workbench/index.vue
index e0935f9..4abb4fa 100644
--- a/src/views/market/workbench/index.vue
+++ b/src/views/market/workbench/index.vue
@@ -115,18 +115,19 @@
       <el-form :model="moneyForm" status-icon :rules="rules" ref="ruleForm" label-width="100px" class="demo-ruleForm">
         <el-form-item label="请选择">
           <el-radio-group v-model="moneyForm.resource">
-            <el-radio label="5"></el-radio>
-            <el-radio label="20"></el-radio>
-            <el-radio label="50"></el-radio>
-            <el-radio label="100"></el-radio>
+            <el-radio label="5">5元</el-radio>
+            <el-radio label="20">20元</el-radio>
+            <el-radio label="50">50元</el-radio>
+            <el-radio label="100">100元</el-radio>
+            <el-radio label="">自定义</el-radio>
           </el-radio-group>
         </el-form-item>
-        <el-form-item label="自定义充值" prop="pass" style="width: 50%">
-          <el-input type="text" v-model="moneyForm.pass" autocomplete="off"></el-input>
+        <el-form-item v-if="moneyForm.resource === ''" label="自定义充值" prop="pass" style="width: 50%">
+          <el-input type="text" v-model="moneyForm.resource1" autocomplete="off"></el-input>
         </el-form-item>
         <el-divider></el-divider>
         <el-form-item label="选择支付方式">
-          <el-radio-group v-model="moneyForm.resource">
+          <el-radio-group v-model="moneyForm.pay">
             <el-radio label="1">支付宝</el-radio>
             <el-radio label="2">微信</el-radio>
             <el-radio label="3">银行卡</el-radio>
@@ -134,8 +135,8 @@
         </el-form-item>
       </el-form>
       <span slot="footer" class="dialog-footer">
-    <el-button type="primary" @click="insertmoney()">充值</el-button>
-  </span>
+<el-button type="primary" @click="insertmoney(moneyForm)">充值</el-button>
+</span>
     </el-dialog>
 
   </div>
@@ -184,13 +185,25 @@ export default {
       //打开充值页面
       addmoney(){
         this.dialogVisible2=true
+
+
+
+
       },
-      //确认充值
-      insertmoney(){
-        this.dialogVisible2=false
-        // addmoney(this.companymessage).then(response=>{
-        //
-        // })
+//确认充值
+      insertmoney(moneyForm){
+        if (moneyForm.pay==1){
+          if (moneyForm.resource!=''){
+            window.open("http://localhost:9701/alipay/pay?ordersPrice="+moneyForm.resource)
+            this.$message.success('付款成功')
+          }else {
+            window.open("http://localhost:9701/alipay/pay?ordersPrice="+moneyForm.resource1)
+            this.$message.success('付款成功')
+          }
+
+        }
+// this.dialogVisible2=false
+
       },
       //申请其他接口
       otherapi(){