diff --git a/src/api/market/orders.js b/src/api/market/orders.js
index 364bcb7..98664cc 100644
--- a/src/api/market/orders.js
+++ b/src/api/market/orders.js
@@ -71,6 +71,9 @@ export function getOut(){
 
 export function updateByordersState1(data){
   return request({
+
+
+
     url:"/market/orders/updateByordersState1",
     method: "POST",
     data: data
diff --git a/src/views/login.vue b/src/views/login.vue
index 676abf7..2e8313b 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -152,6 +152,7 @@ export default {
         }
       });
     }
+
   }
 };
 </script>
diff --git a/src/views/market/apitest/index.vue b/src/views/market/apitest/index.vue
index 4a16bc1..50c4837 100644
--- a/src/views/market/apitest/index.vue
+++ b/src/views/market/apitest/index.vue
@@ -241,6 +241,7 @@
           <template slot-scope="scope">
             <el-popover trigger="hover" placement="top">
               <div slot="reference" class="name-wrapper">
+                <el-button >包年</el-button>
                 <el-tag size="medium">{{ scope.row.productSpecificationName }}</el-tag>
               </div>
             </el-popover>
@@ -285,7 +286,7 @@
       </el-form>
       <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>
 
@@ -549,14 +550,7 @@ export default {
         });
       }},
       confirmSelection(row) {
-        this.dialogVisible1=false
         if (this.selectedRow) {
-          // 这里假设你有一个发起支付的方法，传入所选行的数据
-          startPayment(this.selectedRow);
-          console.log(row)
-          window.open("http://localhost:9701 " +
-            "/alipay/pay?middlePrice="+row.middlePrice)
-          this.$message.success('付款成功')
 
             // 创建一个容器来展示数据
             var container = document.getElementById('news-list');
@@ -582,14 +576,22 @@ export default {
               resultDiv.innerHTML += '<p>Result: ' + jsonData.result.res + '</p>';
               } else {
               resultDiv.innerHTML += '<p>Result information is not available.</p>';
+              // 这里假设你有一个发起支付的方法，传入所选行的数据
+              // startPayment(this.selectedRow);
+              console.log(row)
+              window.open("http://localhost:9701/alipay/pay?middlePrice="+row.middlePrice)
+              this.$message.success('付款成功')
+
             }
 
             // 将结果div添加到容器中
             container.appendChild(resultDiv);
+
           }
         //测试次数-1
         reducetestcount(this.myapi).then(response=>{})
       }
+
     },
     //生命周期 - 创建完成（可以访问当前this实例）",
     created() {
diff --git a/src/views/market/orders/index.vue b/src/views/market/orders/index.vue
index 95c7221..968cabc 100644
--- a/src/views/market/orders/index.vue
+++ b/src/views/market/orders/index.vue
@@ -30,11 +30,14 @@
       </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>
 
       <el-table :data="arr" style="width: 100%" @selection-change="handleSelectionChange">
@@ -44,72 +47,72 @@
             <span style="margin-left: 10px">{{ scope.row.ordersLaunchdate }}</span>
           </template>
         </el-table-column>
-       <el-table-column label="购买信息">
-        <el-table-column  label="订单编号" width="120" align="center">
-          <template slot-scope="scope">
-            <span style="margin-left: 10px"> {{ scope.row.ordersNum }}</span>
-          </template>
-        </el-table-column>
-         <el-table-column label="订单所属人" width="100" align="center">
-           <template slot-scope="scope">
-             <span style="margin-left: 10px">{{ scope.row.userName }}</span>
-           </template>
-         </el-table-column>
-
-        <el-table-column label="购买详情">
-          <el-table-column prop="province" label="购买接口" width="150" align="center">
-          <template slot-scope="scope">
-            <span style="margin-left: 10px">{{ scope.row.productName }}</span>
-          </template>
-        </el-table-column>
-
-        <el-table-column label="订单金额" width="100" align="center">
-          <template slot-scope="scope">
-            <span style="margin-left: 10px">{{ scope.row.ordersPrice }}</span>
-          </template>
-        </el-table-column>
-          <el-table-column label="订单规格" width="300" align="center">
+        <el-table-column label="购买信息">
+          <el-table-column  label="订单编号" width="120" align="center">
             <template slot-scope="scope">
-              <span style="margin-left: 10px">{{ scope.row.ordersSpecification }}</span>
+              <span style="margin-left: 10px"> {{ scope.row.ordersNum }}</span>
             </template>
           </el-table-column>
-        <el-table-column label="订单款项状态" width="110" align="center">
-          <template slot-scope="scope">
-            <span style="margin-left: 10px" v-if="scope.row.ordersState==0">待支付</span>
-            <span style="margin-left: 10px" v-if="scope.row.ordersState==1">已付款</span>
-            <span style="margin-left: 10px" v-if="scope.row.ordersState==2">未付款</span>
-            <span style="margin-left: 10px" v-if="scope.row.ordersState==4">售后(申请退款)</span>
-            <span style="margin-left: 10px" v-if="scope.row.ordersState==5">已退款</span>
-          </template>
+          <el-table-column label="订单所属人" width="100" align="center">
+            <template slot-scope="scope">
+              <span style="margin-left: 10px">{{ scope.row.userName }}</span>
+            </template>
+          </el-table-column>
+
+          <el-table-column label="购买详情">
+            <el-table-column prop="province" label="购买接口" width="150" align="center">
+              <template slot-scope="scope">
+                <span style="margin-left: 10px">{{ scope.row.productName }}</span>
+              </template>
+            </el-table-column>
+
+            <el-table-column label="订单金额" width="100" align="center">
+              <template slot-scope="scope">
+                <span style="margin-left: 10px">{{ scope.row.ordersPrice }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="订单规格" width="300" align="center">
+              <template slot-scope="scope">
+                <span style="margin-left: 10px">{{ scope.row.ordersSpecification }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="订单款项状态" width="110" align="center">
+              <template slot-scope="scope">
+                <span style="margin-left: 10px" v-if="scope.row.ordersState==0">待支付</span>
+                <span style="margin-left: 10px" v-if="scope.row.ordersState==1">已付款</span>
+                <span style="margin-left: 10px" v-if="scope.row.ordersState==2">未付款</span>
+                <span style="margin-left: 10px" v-if="scope.row.ordersState==4">售后(申请退款)</span>
+                <span style="margin-left: 10px" v-if="scope.row.ordersState==5">已退款</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="操作" align="center">
+              <template slot-scope="scope">
+                <el-button
+                  size="mini"
+                  @click="ordersUpdate(scope.row)">编辑</el-button>
+                <el-button
+                  size="mini"
+                  type="danger"
+                  @click="updateByeExist(scope.row)">删除</el-button>
+                <el-button
+                  type="primary"
+                  size="small"
+                  @click="pay(scope.row)" >支付</el-button>
+                <!--              v-if="scope.row.status === '待支付'"-->
+              </template>
+            </el-table-column>
+          </el-table-column>
         </el-table-column>
-        <el-table-column label="操作" align="center">
-          <template slot-scope="scope">
-            <el-button
-              size="mini"
-              @click="ordersUpdate(scope.row)">编辑</el-button>
-            <el-button
-              size="mini"
-              type="danger"
-              @click="ordersDelete(scope.row)">删除</el-button>
-            <el-button
-              type="primary"
-              size="small"
-              @click="pay(scope.row)" >支付</el-button>
-<!--              v-if="scope.row.status === '待支付'"-->
-          </template>
-        </el-table-column>
-        </el-table-column>
-       </el-table-column>
       </el-table>
-    <el-pagination style="float: right"
-                   @size-change="handleSizeChange"
-                   @current-change="handleCurrentChange"
-                   :current-page="orders.pageNum"
-                   :page-sizes="[2, 4, 6, 8]"
-                   :page-size="orders.pageSize"
-                   layout="total, sizes, prev, pager, next, jumper"
-                   :total="orders.total">
-    </el-pagination>
+      <el-pagination style="float: right"
+                     @size-change="handleSizeChange"
+                     @current-change="handleCurrentChange"
+                     :current-page="orders.pageNum"
+                     :page-sizes="[5, 10, 50, 100]"
+                     :page-size="orders.pageSize"
+                     layout="total, sizes, prev, pager, next, jumper"
+                     :total="orders.total">
+      </el-pagination>
     </el-card>
 
     <el-dialog
@@ -145,13 +148,22 @@
   </span>
     </el-dialog>
 
-</div>
+  </div>
 </template>
 
 
 <script>
-import { selectList, updateOrders, addordersup, ordersDelete ,pay} from '@/api/market/orders'
+import {
+  selectList,
+  updateOrders,
+  addordersup,
+  ordersDelete,
+  pay,
+  getOut,
+  updateByeExist
+} from '@/api/market/orders'
 import { diGui } from "@/api/market/orders";
+import axios from 'axios'
 
 
 //这里可以导入其他文件（比如：组件，工具js，第三方插件js，json文件，图片文件等等）,
@@ -225,13 +237,24 @@ export default {
       )
     },
     // 删除
-    ordersDelete(row){
-      ordersDelete(row.ordersId).then(
-        res => {
-          this.$message.success(res.msg)
-          this.selectList()
-        }
-      )
+
+    updateByeExist(row){
+      const result = window.confirm(`你确定要执行此操作吗？`);
+      if (result) {
+        updateByeExist(row.ordersId).then(
+          res => {
+            this.$message.success(res.msg)
+            this.selectList()
+          }
+        )
+        location.reload();
+        // 用户点击确定后的逻辑处理，这里可以使用传入的 id
+        console.log(`用户点击了确定，ID 为 ${row.ordersId}`);
+      } else {
+        // 用户点击取消后的逻辑处理
+        console.log('用户点击了取消');
+      }
+
     },
     // 分页
     handleSizeChange(val) {
@@ -284,12 +307,37 @@ export default {
     },
 
     pay(row){
-        window.open("http://localhost:9701/alipay/pay?subject=" + row.name
-          + "&amp; traceNo=" + row.no + "&amp; totalAmount=" + 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(){
+      this.download('system/operlog/export', {
+        ...this.queryParams
+      }, `operlog_${new Date().getTime()}.xlsx`)
+
+    },
+
+    reclaim(){
+      this.$router.push({path:"/reclaim/index"})
+    }
+
+    // getOut(){
+    //   axios.get('/market/orders/getOutAll').
+    //   then(response =>{
+    //     if(response.data && response.data instanceof ArrayBuffer)
+    //     {
+    //      const blob = new Blob([response.data],{type:'application/octet-stream'});
+    //      saveAs(blob ,'订单信息表');
+    //     }else{
+    //       console.error("导出失败:" ,error);
+    //     }
+    //   })
+    // }
   },
   //生命周期 - 创建完成（可以访问当前this实例）",
   created() {