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

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

src/api/market/orders.js

@@ -69,6 +69,13 @@ export function getOut(){
     method: "GET"
   })}
 
+export function updateByordersState1(data){
+  return request({
+    url:"/market/orders/updateByordersState1",
+    method: "POST",
+    data: data
+  })}
+
 export function listreclaim(data){
   return request({
     url:"/market/orders/listreclaim",

src/api/market/product.js

@@ -33,4 +33,17 @@ export function ifbuy(data){
 }
 
 
+export function ifbuy(data){
+  return request({
+    url:"/market/product/ifbuy",
+    method: "POST",
+    data: data
+  })
+}
 
+export function showByproductId(productId){
+  return request({
+    url:"/market/product/showByproductId="+productId,
+    method: "GET"
+  })
+}

src/views/market/apitest/index.vue

@@ -45,7 +45,11 @@
               </el-form-item>
               <el-form-item label="请求参数说明:">
 
+
               </el-form-item>
+
+
+
               <el-form-item label="返回参数说明:">
 
               </el-form-item>
@@ -342,13 +346,12 @@ export default {
       },
       handleEdit(row) {
         this.selectedRow = row;
-        console.log(row)
       },
       confirmSelection(row) {
         this.dialogVisible1=false
         if (this.selectedRow) {
           // 这里假设你有一个发起支付的方法，传入所选行的数据
-          startPayment(this.selectedOption);
+          startPayment(this.selectedRow);
           console.log(row)
           window.open("http://21.12.0.10:8080/alipay/pay?middlePrice="+row.middlePrice)
           this.$message.success('付款成功')