Merge branch 'dev' of https://gitea.qinmian.online/a_bazu/cloud-web into wr

# Conflicts:
#	src/views/market/apitest/index.vue
#	src/views/market/orders/index.vue

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

src/views/login.vue

@@ -152,6 +152,7 @@ export default {
         }
       });
     }
+
   }
 };
 </script>

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() {

src/views/market/orders/index.vue

@@ -30,11 +30,14 @@
       </div>
     </el-card>
 
+    <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">
@@ -90,7 +93,7 @@
                 <el-button
                   size="mini"
                   type="danger"
-              @click="ordersDelete(scope.row)">删除</el-button>
+                  @click="updateByeExist(scope.row)">删除</el-button>
                 <el-button
                   type="primary"
                   size="small"
@@ -105,7 +108,7 @@
                      @size-change="handleSizeChange"
                      @current-change="handleCurrentChange"
                      :current-page="orders.pageNum"
-                   :page-sizes="[2, 4, 6, 8]"
+                     :page-sizes="[5, 10, 50, 100]"
                      :page-size="orders.pageSize"
                      layout="total, sizes, prev, pager, next, jumper"
                      :total="orders.total">
@@ -150,8 +153,17 @@
 
 
 <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(
+    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
+      console.log(row)
-          + "&amp; traceNo=" + row.no + "&amp; totalAmount=" + row.ordersPrice)
+      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() {