From 050afe93a0d084c89d39ce999d4b3616a8166c64 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B0=A2=E6=AC=A3=E6=82=A6?= <2289014031@qq.com>
Date: Mon, 9 Sep 2024 08:40:13 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/market/orders.js           |  3 ++
 src/views/market/apitest/index.vue | 68 ++++++++++++++++--------------
 src/views/market/orders/index.vue  |  9 +++-
 3 files changed, 46 insertions(+), 34 deletions(-)

diff --git a/src/api/market/orders.js b/src/api/market/orders.js
index 97669c5..bcd8bbb 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/market/apitest/index.vue b/src/views/market/apitest/index.vue
index 3b83378..e119490 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=" confirmSelection">确 定</el-button>
+    <el-button type="primary" @click=" confirmSelection(row)">确 定</el-button>
   </span>
     </el-dialog>
 
@@ -551,42 +552,45 @@ export default {
       confirmSelection(row) {
         if (this.selectedRow) {
 
-            // 创建一个容器来展示数据
-            var container = document.getElementById('news-list');
-            // 清空容器内容
-            container.innerHTML = '';
+          // 这里假设你有一个发起支付的方法，传入所选行的数据
+          // startPayment(this.selectedRow);
+          console.log(row)
+          window.open("http://localhost:9701/alipay/pay?ordersPrice=" + row.middlePrice)
+          this.$message.success('付款成功')
+        }
 
-            // 创建一个div来存放结果
-            var resultDiv = document.createElement('div');
+      },
 
-            // 检查jsonData.reason
-            if (jsonData.reason !== undefined) {
-              // 移除reason中的感叹号（如果存在）
-              resultDiv.innerHTML += '<h2>Reason: ' + jsonData.reason.replace(/!/g, '') + '</h2>';
-            } else {
-              resultDiv.innerHTML += '<h2>Reason: Not available</h2>';
-            }
-            // 检查jsonData.result
-            if (jsonData.result !== undefined) {
-              // 添加result中的信息
-              resultDiv.innerHTML += '<p>Real Name: ' + jsonData.result.realname + '</p>';
-              resultDiv.innerHTML += '<p>ID Card: ' + jsonData.result.idcard + '</p>';
-              resultDiv.innerHTML += '<p>Order ID: ' + jsonData.result.orderid + '</p>';
-              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('付款成功')
+show(){
+        // 创建一个容器来展示数据
+        var container = document.getElementById('news-list');
+        // 清空容器内容
+        container.innerHTML = '';
 
-            }
+        // 创建一个div来存放结果
+        var resultDiv = document.createElement('div');
 
-            // 将结果div添加到容器中
-            container.appendChild(resultDiv);
+        // 检查jsonData.reason
+        if (jsonData.reason !== undefined) {
+          // 移除reason中的感叹号（如果存在）
+          resultDiv.innerHTML += '<h2>Reason: ' + jsonData.reason.replace(/!/g, '') + '</h2>';
+        } else {
+          resultDiv.innerHTML += '<h2>Reason: Not available</h2>';
+        }
+        // 检查jsonData.result
+        if (jsonData.result !== undefined) {
+          // 添加result中的信息
+          resultDiv.innerHTML += '<p>Real Name: ' + jsonData.result.realname + '</p>';
+          resultDiv.innerHTML += '<p>ID Card: ' + jsonData.result.idcard + '</p>';
+          resultDiv.innerHTML += '<p>Order ID: ' + jsonData.result.orderid + '</p>';
+          resultDiv.innerHTML += '<p>Result: ' + jsonData.result.res + '</p>';
+        } else {
+          resultDiv.innerHTML += '<p>Result information is not available.</p>';
+        }
+
+        // 将结果div添加到容器中
+        container.appendChild(resultDiv);
 
-          }
         //测试次数-1
         reducetestcount(this.myapi).then(response=>{})
       }
diff --git a/src/views/market/orders/index.vue b/src/views/market/orders/index.vue
index 968cabc..1b49bcf 100644
--- a/src/views/market/orders/index.vue
+++ b/src/views/market/orders/index.vue
@@ -97,6 +97,7 @@
                 <el-button
                   type="primary"
                   size="small"
+                  v-if="scope.row.ordersState !== 1"
                   @click="pay(scope.row)" >支付</el-button>
                 <!--              v-if="scope.row.status === '待支付'"-->
               </template>
@@ -160,7 +161,7 @@ import {
   ordersDelete,
   pay,
   getOut,
-  updateByeExist
+  updateByeExist, updateByordersState1
 } from '@/api/market/orders'
 import { diGui } from "@/api/market/orders";
 import axios from 'axios'
@@ -310,7 +311,11 @@ export default {
       console.log(row)
       window.open("http://localhost:9701/alipay/pay?productName="+row.productName +"&ordersNum="+row.ordersNum+"&ordersPrice="+row.ordersPrice)
       this.$message.success('付款成功')
-
+      updateByordersState1(ordersForm).then(response=>{
+        alert(response.msg)
+        if (response.code==200){}
+        this.addordersoff=false
+      })
 
 
     },

From 3d6f27c171be5e68e0119a687384d79a5bb93fc4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B0=A2=E6=AC=A3=E6=82=A6?= <2289014031@qq.com>
Date: Mon, 9 Sep 2024 15:19:18 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E6=8E=A8=E7=BA=BF=E4=B8=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/login.vue                  |  1 +
 src/views/market/orders/index.vue    | 12 +++++++++---
 src/views/market/workbench/index.vue |  4 ++--
 3 files changed, 12 insertions(+), 5 deletions(-)

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/orders/index.vue b/src/views/market/orders/index.vue
index 1b49bcf..4d16431 100644
--- a/src/views/market/orders/index.vue
+++ b/src/views/market/orders/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div >
     <el-card class="box-card" style="width: 94%;transform: translateX(3%);margin-top: 30px">
       <div slot="header" class="clearfix">
         <span>筛选搜索</span>
@@ -165,6 +165,7 @@ import {
 } from '@/api/market/orders'
 import { diGui } from "@/api/market/orders";
 import axios from 'axios'
+import item from '@/layout/components/Sidebar/Item.vue'
 
 
 //这里可以导入其他文件（比如：组件，工具js，第三方插件js，json文件，图片文件等等）,
@@ -218,7 +219,11 @@ export default {
     };
   },
   //计算属性 类似于data概念",
-  computed: {},
+  computed: {
+    item() {
+      return item
+    }
+  },
   //监控data中的数据变化",
   watch: {},
   //方法集合",
@@ -309,7 +314,7 @@ export default {
 
     pay(row){
       console.log(row)
-      window.open("http://localhost:9701/alipay/pay?productName="+row.productName +"&ordersNum="+row.ordersNum+"&ordersPrice="+row.ordersPrice)
+      window.open("http://21.12.0.10/prod-api/market/alipay/pay?productName="+row.productName +"&ordersNum="+row.ordersNum+"&ordersPrice="+row.ordersPrice)
       this.$message.success('付款成功')
       updateByordersState1(ordersForm).then(response=>{
         alert(response.msg)
@@ -331,6 +336,7 @@ export default {
       this.$router.push({path:"/reclaim/index"})
     }
 
+
     // getOut(){
     //   axios.get('/market/orders/getOutAll').
     //   then(response =>{
diff --git a/src/views/market/workbench/index.vue b/src/views/market/workbench/index.vue
index bccece8..48ccd8a 100644
--- a/src/views/market/workbench/index.vue
+++ b/src/views/market/workbench/index.vue
@@ -190,10 +190,10 @@ export default {
       insertmoney(moneyForm){
         if (moneyForm.pay==1){
           if (moneyForm.resource!=''){
-            window.open("http://21.12.0.10:80/alipay/pay?ordersPrice="+moneyForm.resource)
+            window.open("http://localhost:9701/alipay/pay?ordersPrice="+moneyForm.resource)
             this.$message.success('付款成功')
           }else {
-            window.open("http://21.12.0.10:80/alipay/pay?ordersPrice="+moneyForm.resource)
+            window.open("http://localhost:9701/alipay/pay?ordersPrice="+moneyForm.resource)
             this.$message.success('付款成功')
           }
 

From a1bc4af0d49e77b366da84de617b25285a53b653 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B0=A2=E6=AC=A3=E6=82=A6?= <2289014031@qq.com>
Date: Mon, 9 Sep 2024 15:58:43 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E6=8E=A8=E7=BA=BF=E4=B8=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/market/orders/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/market/orders/index.vue b/src/views/market/orders/index.vue
index 4d16431..ebb691b 100644
--- a/src/views/market/orders/index.vue
+++ b/src/views/market/orders/index.vue
@@ -314,7 +314,7 @@ export default {
 
     pay(row){
       console.log(row)
-      window.open("http://21.12.0.10/prod-api/market/alipay/pay?productName="+row.productName +"&ordersNum="+row.ordersNum+"&ordersPrice="+row.ordersPrice)
+      window.open("http://21.12.0.10:80/prod-api/market/alipay/pay?productName="+row.productName +"&ordersNum="+row.ordersNum+"&ordersPrice="+row.ordersPrice)
       this.$message.success('付款成功')
       updateByordersState1(ordersForm).then(response=>{
         alert(response.msg)