Merge branch 'dev'

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

src/views/market/apitest/index.vue

@@ -19,15 +19,8 @@
 
           <el-row>
             <el-col :span="24"><div class="grid-content bg-purple-dark">
-              <span v-if="myapi.remark=='是'">
-                <el-button type="info" @click="test(myapi)">立即使用</el-button>
-                <el-button type="primary" @click="apply(myapi)">续约</el-button>
-              </span>
-              <span v-if="myapi.remark=='否'">
               <el-button type="info" @click="test(myapi)">测试</el-button>
               <el-button type="primary" @click="apply(myapi)">立即申请</el-button>
-              </span>
-
             </div></el-col>
           </el-row>
         </el-form>
@@ -183,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(row)">确 定</el-button>
   </span>
     </el-dialog>
 
@@ -331,6 +324,8 @@ export default {
             <p>Author: ${item.author_name}</p>
             <p>URL: <a href="${item.url.replace(/\\/g, '')}">${item.url}</a></p>
           </div>
+
+
         `;
               });
             } else {
@@ -344,8 +339,27 @@ export default {
           container.appendChild(resultDiv);
 
         });
+      },
+      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('付款成功')
+
+          this.dialogVisible1 = false;
+
+        } else {
+          // 如果没有选择任何行，给出提示
+          this.$message.warning('请先选择一项进行支付');
         }
       },
+    },
     //生命周期 - 创建完成（可以访问当前this实例）",
     created() {
     },