Merge branch 'dev'

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

src/api/market/orders.js

@@ -63,6 +63,20 @@ export function orderssd(ordersId) {
       data: data
     })}
 
+export function getOut(){
+  return request({
+    url:"/market/orders/getOutAll",
+    method: "GET"
+  })}
+
+export function updateByordersState1(data){
+  return request({
+    url:"/market/orders/updateByordersState1",
+    method: "POST",
+    data: data
+  })}
+
+
 
 
 

src/api/market/product.js

@@ -34,3 +34,9 @@ export function ifbuy(data){
 
 
 
+export function showByproductId(productId){
+  return request({
+    url:"/market/product/showByproductId="+productId,
+    method: "GET"
+  })
+}

src/views/market/apitest/index.vue

@@ -128,6 +128,9 @@
                   </el-table-column>
                 </el-table>
               </el-form-item>
+
+
+
               <el-form-item label="返回参数说明:">
 
               </el-form-item>
@@ -541,6 +544,20 @@ export default {
 
             // 解析JSON字符串为JavaScript对象
             const jsonData = JSON.parse(jsonData1);
+        });
+      },
+      handleEdit(row) {
+        this.selectedRow = row;
+      },
+      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');