Merge branch 'master' 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/views/market/apitest/index.vue

@@ -286,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>
 
@@ -552,6 +552,16 @@ export default {
       confirmSelection(row) {
         if (this.selectedRow) {
 
+          // 这里假设你有一个发起支付的方法，传入所选行的数据
+          // startPayment(this.selectedRow);
+          console.log(row)
+          window.open("http://localhost:9701/alipay/pay?ordersPrice=" + row.middlePrice)
+          this.$message.success('付款成功')
+        }
+
+      },
+
+show(){
         // 创建一个容器来展示数据
         var container = document.getElementById('news-list');
         // 清空容器内容
@@ -576,18 +586,11 @@ 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=>{})
       }

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,10 +161,11 @@ import {
   ordersDelete,
   pay,
   getOut,
-  updateByeExist
+  updateByeExist, updateByordersState1
 } 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文件，图片文件等等）,
@@ -217,7 +219,11 @@ export default {
     };
   },
   //计算属性 类似于data概念",
-  computed: {},
+  computed: {
+    item() {
+      return item
+    }
+  },
   //监控data中的数据变化",
   watch: {},
   //方法集合",
@@ -308,9 +314,13 @@ 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: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)
+        if (response.code==200){}
+        this.addordersoff=false
+      })
 
 
     },
@@ -326,6 +336,7 @@ export default {
       this.$router.push({path:"/reclaim/index"})
     }
 
+
     // getOut(){
     //   axios.get('/market/orders/getOutAll').
     //   then(response =>{

src/views/market/workbench/index.vue

@@ -190,10 +190,10 @@ export default {
       insertmoney(moneyForm){
         if (moneyForm.pay==1){
           if (moneyForm.resource!=''){
-            window.open("http://localhost:9701/alipay/pay?ordersPrice="+moneyForm.resource)
+            window.open("http://21.12.0.10:80/prod-api/market/alipay/pay?ordersPrice="+moneyForm.resource)
             this.$message.success('付款成功')
           }else {
-            window.open("http://localhost:9701/alipay/pay?ordersPrice="+moneyForm.resource)
+            window.open("http://21.12.0.10:80/prod-api/market/alipay/pay?ordersPrice="+moneyForm.resource)
             this.$message.success('付款成功')
           }