Merge branch 'dev'

# Conflicts:
#	src/views/market/apitest/index.vue
pull/7/head^2
Aaaaaaaa 2024-09-04 20:06:56 +08:00
commit 1656f3b71d
5 changed files with 124 additions and 222 deletions

View File

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

View File

@ -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 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-form-item v-if="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>
//jsjsjson,
//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:[],
newapi:{}
tableData:[]
};
},
// data",
@ -243,18 +225,13 @@ export default {
watch: {},
//",
methods: {
api,
//
handleClick(tab, event) {
console.log(tab, event);
},
//
test(myapi){
//<=0
findcount(myapi).then(response=>{
alert(response.data.testCount)
if (response.data.testCount<=0){
alert("使用次数已到期,若像继续使用请先充值!")
}else{
this.dialogVisible=true
this.ruleForm={
productName: myapi.productName,
@ -262,9 +239,6 @@ export default {
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,15 +285,9 @@ export default {
// <pre>innerHTMLJSON
document.getElementById('json-display').innerHTML = formattedJson;
})
//-1
reducetestcount(this.myapi).then(response=>{
})
},
//
newsForm(ruleForm) {
if (ruleForm.productName=='新闻头条'){
sendrequest1(ruleForm).then(response => {
console.log(response)
const jsonData1 = response.data; // response.dataJSON
@ -355,6 +310,7 @@ export default {
} else {
resultDiv.innerHTML += '<h2>Reason: Not available</h2>';
}
// jsonData.result
if (jsonData.result !== undefined) {
//
@ -389,50 +345,6 @@ export default {
});
}
if (ruleForm.productName=='身份证实名认证'){
sendrequest1(ruleForm).then(response => {
console.log(response)
const jsonData1 = response.data; // response.dataJSON
// JSONJavaScript
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",
created() {

View File

@ -30,11 +30,14 @@
</div>
</el-card>
<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'
//jsjsjson,
@ -284,12 +288,34 @@ export default {
},
pay(row){
window.open("http://localhost:9701/alipay/pay?subject=" + row.name
+ "&amp; traceNo=" + row.no + "&amp; totalAmount=" + row.ordersPrice)
console.log(row)
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() {

View File

@ -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
+ "&amp; traceNo=" + row.no + "&amp; totalAmount=" + row.ordersPrice)
this.$confirm(row.ordersNum,row.productName,row.ordersrice)
window.open("http://localhost:9701/alipay/pay?traceNo="+ row.ordersNum +"&subject="+row.productName +"&totalAmount="+row.ordersrice)
this.$message.success('付款成功')
this.load();
}
,
//
updateShop(orders){

View File

@ -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%">
{{orders.productId}}
<el-form-item label="订单编号" prop="ordersNum" style="width: 70% " >
{{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>