Merge branch 'dev'

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

src/api/market/orders.js

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

src/views/market/apitest/index.vue

@@ -86,7 +86,7 @@
         <el-form-item label="请求方式" prop="pass">
           <el-input type="text" v-model="ruleForm.requestMethod" autocomplete="off"></el-input>
         </el-form-item>
-        <el-form-item label="请求参数" prop="pass" v-if="ruleForm.productName!=='新闻头条' && ruleForm.productName!=='身份证实名认证'" >
+        <el-form-item label="请求参数" prop="pass" v-if="ruleForm.productName!=='新闻头条'" >
           <el-input type="text" v-model="ruleForm.parameter" autocomplete="off"></el-input>
         </el-form-item>
         <div v-if="ruleForm.productName=='新闻头条'">
@@ -107,22 +107,10 @@
             <span>说明：是否只返回有内容详情的新闻, 1:是, 默认0</span>
           </el-form-item>
         </div>
-        <div v-if="ruleForm.productName=='身份证实名认证'">
+        <el-form-item v-if="ruleForm.productName!=='新闻头条'">
-          <el-form-item label="身份证号码" prop="pass"  >
-            <el-input type="text" v-model="ruleForm.idcard" autocomplete="off"></el-input>
-          </el-form-item>
-          <el-form-item label="姓名" prop="pass">
-            <el-input type="text" v-model="ruleForm.realname" autocomplete="off"></el-input>
-          </el-form-item>
-          <el-form-item label="是否返回单号" prop="pass" >
-            <el-input type="text" v-model="ruleForm.orderid" autocomplete="off"></el-input>
-            <span>传1时返回单号，默认不返回单号(建议传入)</span>
-          </el-form-item>
-        </div>
-        <el-form-item v-if="ruleForm.productName!=='新闻头条' && ruleForm.productName!=='身份证实名认证'">
           <el-button type="primary" @click="submitForm(ruleForm)">发送请求</el-button>
         </el-form-item>
-        <el-form-item  v-if="ruleForm.productName=='新闻头条' ||ruleForm.productName=='身份证实名认证' " >
+        <el-form-item  v-if="ruleForm.productName=='新闻头条'">
           <el-button type="primary" @click="newsForm(ruleForm)">发送请求</el-button>
         </el-form-item>
       </el-form>
@@ -144,8 +132,21 @@
       :visible.sync="dialogVisible1"
       width="50%"
       :before-close="handleClose1">
-
+      <el-form  ref="form" :model="myapi" label-width="120px" :rules="rules">
-
+        <el-form-item label="产品名称:" >
+          {{myapi.productName}}
+        </el-form-item>
+        <el-form-item label="产品价格:">
+          {{myapi.productPrice}}元/次
+        </el-form-item>
+        <el-form-item label="产品介绍:">
+          {{myapi.productContent}}
+        </el-form-item>
+        <el-form-item label="重要路由:">
+          {{myapi.apiRouter}}
+        </el-form-item>
+      </el-form>
+      <el-divider></el-divider>
       <span style="color: #1ab394">请选择申请规格</span>
       <el-table
         :data="tableData"
@@ -180,24 +181,6 @@
           </template>
         </el-table-column>
       </el-table>
-      <el-divider></el-divider>
-      <el-form  ref="form" :model="newapi" label-width="120px" :rules="rules">
-        <el-form-item label="产品名称:" >
-          {{newapi.productName}}
-        </el-form-item>
-        <el-form-item label="产品规格:" >
-          {{newapi.productSpecification}}
-        </el-form-item>
-        <el-form-item label="产品价格:" v-if="newapi.productSpecification=='按次查询'">
-          {{newapi.productPrice}}元/次
-        </el-form-item>
-        <el-form-item label="支付价格:" v-if="newapi.productSpecification!='按次查询'">
-          {{newapi.productPrice}}元
-        </el-form-item>
-        <el-form-item label="产品介绍:">
-          {{newapi.productContent}}
-        </el-form-item>
-      </el-form>
       <span slot="footer" class="dialog-footer">
     <el-button @click="dialogVisible1 = false">取 消</el-button>
     <el-button type="primary" @click="dialogVisible1 = false">确 定</el-button>
@@ -210,7 +193,7 @@
 <script>
 //这里可以导入其他文件（比如：组件，工具js，第三方插件js，json文件，图片文件等等）,
 //例如：import 《组件名称》 from '《组件路径》,
-import {findcount, iftest, reducetestcount, sendrequest, sendrequest1} from "@/api/apitest/apitest";
+import {sendrequest, sendrequest1} from "@/api/apitest/apitest";
 import api from "js-cookie";
 import {companyauthentication, ifcompanyauthentication} from "@/api/authentication/authentication";
 import {selectproductspecification} from "@/api/market/product";
@@ -233,8 +216,7 @@ export default {
         dialogVisible: false,
         dialogVisible1: false,
         ruleForm:{},
-        tableData:[],
+        tableData:[]
-        newapi:{}
       };
     },
     //计算属性 类似于data概念",
@@ -243,28 +225,20 @@ export default {
     watch: {},
     //方法集合",
     methods: {
+      api,
       //标签页
       handleClick(tab, event) {
         console.log(tab, event);
       },
       //测试
       test(myapi){
-        //判断测试次数是否<=0
+        this.dialogVisible=true
-        findcount(myapi).then(response=>{
+        this.ruleForm={
-          alert(response.data.testCount)
+          productName: myapi.productName,
-          if (response.data.testCount<=0){
+          apiAddress: myapi.apiAddress,
-              alert("使用次数已到期,若像继续使用请先充值！")
+          requestMethod: myapi.requestMethod,
-          }else{
+          apiRouter: myapi.apiRouter
-            this.dialogVisible=true
+        }
-            this.ruleForm={
-              productName: myapi.productName,
-              apiAddress: myapi.apiAddress,
-              requestMethod: myapi.requestMethod,
-              apiRouter: myapi.apiRouter
-            }
-          }
-        })
-
       },
       //立即申请
       apply(myapi){
@@ -273,14 +247,10 @@ export default {
           if (response.code!=200){
             alert(response.msg)
           }else {
-            this.getproduct(myapi)
+            alert(JSON.stringify(myapi))
+            this.getproductspecification(myapi)
             this.dialogVisible1=true
-            this.newapi={
+
-              productName: myapi.productName,
-              productPrice: myapi.productPrice,
-              productContent: myapi.productContent,
-              productSpecification: myapi.productSpecification
-            }
           }
         })
       },
@@ -301,20 +271,11 @@ export default {
           .catch(_ => {});
       },
       //产品规格
-      getproduct(specification){
+      getproductspecification(specification){
         selectproductspecification(specification).then(response=>{
           this.tableData=response.data
         })
       },
-      //选择申请规格
-      handleEdit(row){
-        this.newapi={
-          productName:this.myapi.productName,
-          productSpecification: row.productSpecificationName,
-          productPrice: row.middlePrice,
-          productContent:this.myapi.productContent,
-        }
-      },
       //测试发送请求 单个参数
       submitForm(ruleForm){
         sendrequest(ruleForm).then(response=>{
@@ -324,49 +285,44 @@ export default {
           // 获取<pre>元素并设置其innerHTML为格式化的JSON字符串
           document.getElementById('json-display').innerHTML = formattedJson;
         })
-
-        //测试次数-1
-          reducetestcount(this.myapi).then(response=>{
-          })
-
       },
       //测试发送请求 多个参数
       newsForm(ruleForm) {
-        if (ruleForm.productName=='新闻头条'){
+        sendrequest1(ruleForm).then(response => {
-          sendrequest1(ruleForm).then(response => {
+          console.log(response)
-            console.log(response)
+          const jsonData1 = response.data; // 假设response.data是解析后的JSON对象
-            const jsonData1 = response.data; // 假设response.data是解析后的JSON对象
 
-            // 解析JSON字符串为JavaScript对象
+          // 解析JSON字符串为JavaScript对象
-            const jsonData = JSON.parse(jsonData1);
+          const jsonData = JSON.parse(jsonData1);
 
-            // 创建一个容器来展示数据
+          // 创建一个容器来展示数据
-            var container = document.getElementById('news-list');
+          var container = document.getElementById('news-list');
-            // 清空容器内容
+          // 清空容器内容
-            container.innerHTML = '';
+          container.innerHTML = '';
 
-            // 创建一个div来存放结果
+          // 创建一个div来存放结果
-            var resultDiv = document.createElement('div');
+          var resultDiv = document.createElement('div');
 
-            // 检查jsonData.reason
+          // 检查jsonData.reason
-            if (jsonData.reason !== undefined) {
+          if (jsonData.reason !== undefined) {
-              // 移除reason中的感叹号（如果存在）
+            // 移除reason中的感叹号（如果存在）
-              resultDiv.innerHTML += '<h2>Reason: ' + jsonData.reason.replace(/!/g, '') + '</h2>';
+            resultDiv.innerHTML += '<h2>Reason: ' + jsonData.reason.replace(/!/g, '') + '</h2>';
-            } else {
+          } else {
-              resultDiv.innerHTML += '<h2>Reason: Not available</h2>';
+            resultDiv.innerHTML += '<h2>Reason: Not available</h2>';
-            }
+          }
-            // 检查jsonData.result
-            if (jsonData.result !== undefined) {
-              // 添加其他结果信息
-              resultDiv.innerHTML += '<p>Stat: ' + jsonData.result.stat + '</p>';
-              resultDiv.innerHTML += '<p>Page: ' + jsonData.result.page + '</p>';
-              resultDiv.innerHTML += '<p>Page Size: ' + jsonData.result.pageSize + '</p>';
 
-              // 检查jsonData.result.data
+          // 检查jsonData.result
-              if (Array.isArray(jsonData.result.data)) {
+          if (jsonData.result !== undefined) {
-                // 遍历数据并生成HTML
+            // 添加其他结果信息
-                jsonData.result.data.forEach(item => {
+            resultDiv.innerHTML += '<p>Stat: ' + jsonData.result.stat + '</p>';
-                  resultDiv.innerHTML += `
+            resultDiv.innerHTML += '<p>Page: ' + jsonData.result.page + '</p>';
+            resultDiv.innerHTML += '<p>Page Size: ' + jsonData.result.pageSize + '</p>';
+
+            // 检查jsonData.result.data
+            if (Array.isArray(jsonData.result.data)) {
+              // 遍历数据并生成HTML
+              jsonData.result.data.forEach(item => {
+                resultDiv.innerHTML += `
           <div>
             <h3>${item.title}</h3>
             <p>Unique Key: ${item.uniquekey}</p>
@@ -376,62 +332,18 @@ export default {
             <p>URL: <a href="${item.url.replace(/\\/g, '')}">${item.url}</a></p>
           </div>
         `;
-                });
+              });
-              } else {
-                resultDiv.innerHTML += '<p>No data available.</p>';
-              }
             } else {
-              resultDiv.innerHTML += '<p>Result information is not available.</p>';
+              resultDiv.innerHTML += '<p>No data available.</p>';
             }
+          } else {
+            resultDiv.innerHTML += '<p>Result information is not available.</p>';
+          }
 
-            // 将结果div添加到容器中
+          // 将结果div添加到容器中
-            container.appendChild(resultDiv);
+          container.appendChild(resultDiv);
-
-          });
-        }
-        if (ruleForm.productName=='身份证实名认证'){
-          sendrequest1(ruleForm).then(response => {
-            console.log(response)
-            const jsonData1 = response.data; // 假设response.data是解析后的JSON对象
-
-            // 解析JSON字符串为JavaScript对象
-            const jsonData = JSON.parse(jsonData1);
-
-            // 创建一个容器来展示数据
-            var container = document.getElementById('news-list');
-            // 清空容器内容
-            container.innerHTML = '';
-
-            // 创建一个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>';
-            }
-
-            // 将结果div添加到容器中
-            container.appendChild(resultDiv);
-          })
-        }
-        //测试次数-1
-        reducetestcount(this.myapi).then(response=>{
-        })
-
 
+        });
       }
     },
     //生命周期 - 创建完成（可以访问当前this实例）",

src/views/market/orders/index.vue

@@ -30,11 +30,14 @@
       </div>
     </el-card>
 
-<br>
+    <br>
+    <button style="float: right; padding: 3px 10px" type="text" @click="reclaim">回收站</button>
+    <br>
     <el-card class="box-card" style="width: 94%;transform: translateX(3%);margin-top: 10px">
       <div slot="header" class="clearfix">
         <span>数据列表</span>
         <button @click="add(1)" style="float: right; padding: 3px 10px" type="text">添加</button>
+        <button style="float: right; padding: 3px 10px" type="text" @click="getOut">导出</button>
       </div>
 
       <el-table :data="arr" style="width: 100%" @selection-change="handleSelectionChange">
@@ -150,8 +153,9 @@
 
 
 <script>
-import { selectList, updateOrders, addordersup, ordersDelete ,pay} from '@/api/market/orders'
+import { selectList, updateOrders, addordersup, ordersDelete, pay, getOut } from '@/api/market/orders'
 import { diGui } from "@/api/market/orders";
+import axios from 'axios'
 
 
 //这里可以导入其他文件（比如：组件，工具js，第三方插件js，json文件，图片文件等等）,
@@ -284,12 +288,34 @@ export default {
     },
 
     pay(row){
-        window.open("http://localhost:9701/alipay/pay?subject=" + row.name
+      console.log(row)
-          + "&amp; traceNo=" + row.no + "&amp; totalAmount=" + row.ordersPrice)
+      window.open("http://localhost:9701/alipay/pay?productName="+row.productName +"&ordersNum="+row.ordersNum+"&ordersPrice="+row.ordersPrice)
       this.$message.success('付款成功')
-      this.load();
+        },
-        }
 
+    getOut(){
+      this.download('system/operlog/export', {
+        ...this.queryParams
+      }, `operlog_${new Date().getTime()}.xlsx`)
+
+    },
+
+    reclaim(){
+      this.$router.push({path:"/reclaim/index"})
+    }
+
+    // getOut(){
+    //   axios.get('/market/orders/getOutAll').
+    //   then(response =>{
+    //     if(response.data && response.data instanceof ArrayBuffer)
+    //     {
+    //      const blob = new Blob([response.data],{type:'application/octet-stream'});
+    //      saveAs(blob ,'订单信息表');
+    //     }else{
+    //       console.error("导出失败:" ,error);
+    //     }
+    //   })
+    // }
   },
   //生命周期 - 创建完成（可以访问当前this实例）",
   created() {

src/views/market/reclaim/index.vue

@@ -112,39 +112,6 @@
     </el-pagination>
     </el-card>
 
-    <el-dialog
-      :title="addtitle"
-      :visible.sync="addordersoff"
-      width="50%"
-      :before-close="handleClose">
-      <div v-if="this.index==1">
-        <h2>管理员慎重填写</h2><br>
-        <el-form :model="ordersForm" status-icon :rules="rules" ref="ruleForm" label-width="100px" class="demo-ruleForm">
-          <el-form-item label="订单编号：" prop="ordersNum">
-            <el-input type="text" v-model="ordersForm.ordersNum" autocomplete="off"></el-input>
-          </el-form-item>
-          <el-form-item label="订单产品：" prop="ordersProduct">
-            <el-input type="text" v-model="ordersForm.ordersProduct" autocomplete="off"></el-input>
-          </el-form-item>
-          <el-form-item label="订单所属人：" prop="ordersUser">
-            <el-input type="text" v-model="ordersForm.ordersUser" autocomplete="off"></el-input>
-          </el-form-item>
-          <el-form-item label="订单金额：" prop="ordersPrice">
-            <el-input type="text" v-model="ordersForm.ordersPrice" autocomplete="off"></el-input>
-          </el-form-item>
-          <el-form-item label="订单规格：" prop="ordersSpecification">
-            <el-input type="text" v-model="ordersForm.ordersSpecification" autocomplete="off"></el-input>
-          </el-form-item>
-        </el-form>
-        <center>
-          <el-button @click="addordersoff = false">取 消</el-button>
-          <el-button type="primary" @click="addorders(ordersForm)">提交</el-button>
-        </center>
-      </div>
-      <span slot="footer" class="dialog-footer">
-  </span>
-    </el-dialog>
-
 </div>
 </template>
 
@@ -242,14 +209,16 @@ export default {
         .catch(_ => {});
     },
 
-
       pay(row){
-        window.open("http://localhost:9701/alipay/pay?subject=" + row.name
+        this.$confirm(row.ordersNum,row.productName,row.ordersrice)
-          + "&amp; traceNo=" + row.no + "&amp; totalAmount=" + row.ordersPrice)
+
+      window.open("http://localhost:9701/alipay/pay?traceNo="+ row.ordersNum +"&subject="+row.productName +"&totalAmount="+row.ordersrice)
       this.$message.success('付款成功')
       this.load();
-
       }
+
+
+
       ,
     // 上架，新品，推荐修改
     updateShop(orders){

src/views/market/updorders/index.vue

@@ -1,42 +1,29 @@
 <template>
   <div>
     {{orders}}
-
     <center>
       <el-form :model="api" status-icon :rules="rules" ref="ruleForm" label-width="100px" class="demo-ruleForm">
-        <el-form-item label="序号" prop="productId" style="width: 70%">
+        <el-form-item label="订单编号" prop="ordersNum" style="width: 70% " >
-          {{orders.productId}}
+          {{orders.ordersNum}}
         </el-form-item>
-        <el-form-item label="接口名称" prop="productName" style="width: 70%">
+        <el-form-item label="订单产品" prop="productName" style="width: 70%">
           {{orders.productName}}
         </el-form-item>
-        <el-form-item label="接口类型" prop="productType" style="width: 70%">
+        <el-form-item label="订单所属人" prop="productType" style="width: 70%">
           {{orders.productType}}
         </el-form-item>
-        <el-form-item label="接口描述" prop="productContent" style="width: 70%">
+        <el-form-item label="订单金额" prop="productContent" style="width: 70%">
           {{orders.productContent}}
         </el-form-item>
-        <el-form-item label="接口销量" prop="productSales" style="width: 70%">
+        <el-form-item label="订单规格" prop="productSales" style="width: 70%">
           {{orders.productSales}}
         </el-form-item>
-        <el-form-item label="接口价格" prop="productPrice" style="width: 70%">
+        <el-form-item label="订单款项状态" prop="productPrice" style="width: 70%">
           {{orders.productPrice}}
         </el-form-item>
-        <el-form-item label="接口来源" prop="productFrom" style="width: 70%">
+        <el-form-item label="订单日期" prop="productFrom" style="width: 70%">
           {{orders.productFrom}}
         </el-form-item>
-        <el-form-item label="重要路由" prop="apiRouter" style="width: 70%">
-          {{orders.apiRouter}}
-        </el-form-item>
-        <el-form-item label="接口地址" prop="apiAddress" style="width: 70%">
-          {{orders.apiAddress}}
-        </el-form-item>
-        <el-form-item label="返回格式" prop="returnFormat" style="width: 70%">
-          {{orders.returnFormat}}
-        </el-form-item>
-        <el-form-item label="请求方式" prop="requestMethod" style="width: 70%">
-          {{orders.requestMethod}}
-        </el-form-item>
         <el-form-item>
           <el-button type="primary" @click="submitForm('ruleForm')">返回</el-button>
         </el-form-item>