From 99f54f306a0dd73986a95a4fb07ec75e6f8c9ff1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B0=A2=E6=AC=A3=E6=82=A6?= <2289014031@qq.com>
Date: Wed, 4 Sep 2024 20:05:17 +0800
Subject: [PATCH] ok

---
 src/views/market/apitest/index.vue |  3 ++-
 src/views/market/orders/index.vue  | 15 ++++++-----
 src/views/market/reclaim/index.vue | 43 +++++-------------------------
 3 files changed, 17 insertions(+), 44 deletions(-)

diff --git a/src/views/market/apitest/index.vue b/src/views/market/apitest/index.vue
index 1d868e2..d09c8c4 100644
--- a/src/views/market/apitest/index.vue
+++ b/src/views/market/apitest/index.vue
@@ -176,7 +176,7 @@
       </el-table>
       <span slot="footer" class="dialog-footer">
     <el-button @click="dialogVisible1 = false">取 消</el-button>
-    <el-button type="primary" @click="dialogVisible1 = false">确 定</el-button>
+    <el-button type="primary" @click="confirmSelection()">确 定</el-button>
   </span>
     </el-dialog>
 
@@ -344,6 +344,7 @@ export default {
         this.selectedRow = row;
       },
       confirmSelection() {
+        this.dialogVisible1=false
         if (this.selectedRow) {
           // 这里假设你有一个发起支付的方法，传入所选行的数据
           startPayment(this.selectedRow);
diff --git a/src/views/market/orders/index.vue b/src/views/market/orders/index.vue
index 0f24179..9f5dc35 100644
--- a/src/views/market/orders/index.vue
+++ b/src/views/market/orders/index.vue
@@ -30,12 +30,13 @@
       </div>
     </el-card>
 
-<br>
+    <br>
+    <button style="float: right; padding: 3px 10px" type="text" @click="reclaim">回收站</button>
+    <br>
     <el-card class="box-card" style="width: 94%;transform: translateX(3%);margin-top: 10px">
       <div slot="header" class="clearfix">
         <span>数据列表</span>
         <button @click="add(1)" style="float: right; padding: 3px 10px" type="text">添加</button>
-
         <button style="float: right; padding: 3px 10px" type="text" @click="getOut">导出</button>
       </div>
 
@@ -287,10 +288,9 @@ export default {
     },
 
     pay(row){
-        window.open("http://localhost:9701/alipay/pay?ordersNum=" +row.ordersNum +
-        "& orderSubject= "+row.productName + "& orderPrice="+row.ordersPrice)
+      console.log(row)
+      window.open("http://localhost:9701/alipay/pay?productName="+row.productName +"&ordersNum="+row.ordersNum+"&ordersPrice="+row.ordersPrice)
       this.$message.success('付款成功')
-      this.load();
         },
 
     getOut(){
@@ -298,8 +298,11 @@ export default {
         ...this.queryParams
       }, `operlog_${new Date().getTime()}.xlsx`)
 
-    }
+    },
 
+    reclaim(){
+      this.$router.push({path:"/reclaim/index"})
+    }
 
     // getOut(){
     //   axios.get('/market/orders/getOutAll').
diff --git a/src/views/market/reclaim/index.vue b/src/views/market/reclaim/index.vue
index 1ac94e6..2e775aa 100644
--- a/src/views/market/reclaim/index.vue
+++ b/src/views/market/reclaim/index.vue
@@ -112,39 +112,6 @@
     </el-pagination>
     </el-card>
 
-    <el-dialog
-      :title="addtitle"
-      :visible.sync="addordersoff"
-      width="50%"
-      :before-close="handleClose">
-      <div v-if="this.index==1">
-        <h2>管理员慎重填写</h2><br>
-        <el-form :model="ordersForm" status-icon :rules="rules" ref="ruleForm" label-width="100px" class="demo-ruleForm">
-          <el-form-item label="订单编号：" prop="ordersNum">
-            <el-input type="text" v-model="ordersForm.ordersNum" autocomplete="off"></el-input>
-          </el-form-item>
-          <el-form-item label="订单产品：" prop="ordersProduct">
-            <el-input type="text" v-model="ordersForm.ordersProduct" autocomplete="off"></el-input>
-          </el-form-item>
-          <el-form-item label="订单所属人：" prop="ordersUser">
-            <el-input type="text" v-model="ordersForm.ordersUser" autocomplete="off"></el-input>
-          </el-form-item>
-          <el-form-item label="订单金额：" prop="ordersPrice">
-            <el-input type="text" v-model="ordersForm.ordersPrice" autocomplete="off"></el-input>
-          </el-form-item>
-          <el-form-item label="订单规格：" prop="ordersSpecification">
-            <el-input type="text" v-model="ordersForm.ordersSpecification" autocomplete="off"></el-input>
-          </el-form-item>
-        </el-form>
-        <center>
-          <el-button @click="addordersoff = false">取 消</el-button>
-          <el-button type="primary" @click="addorders(ordersForm)">提交</el-button>
-        </center>
-      </div>
-      <span slot="footer" class="dialog-footer">
-  </span>
-    </el-dialog>
-
 </div>
 </template>
 
@@ -242,14 +209,16 @@ export default {
         .catch(_ => {});
     },
 
-
       pay(row){
-        window.open("http://localhost:9701/alipay/pay?subject=" + row.name
-          + "&amp; traceNo=" + row.no + "&amp; totalAmount=" + row.ordersPrice)
+        this.$confirm(row.ordersNum,row.productName,row.ordersrice)
+
+      window.open("http://localhost:9701/alipay/pay?traceNo="+ row.ordersNum +"&subject="+row.productName +"&totalAmount="+row.ordersrice)
       this.$message.success('付款成功')
       this.load();
-
       }
+
+
+
       ,
     // 上架，新品，推荐修改
     updateShop(orders){