Merge branch 'master' into dev

# Conflicts:
#	src/api/market/orders.js
#	src/views/market/apitest/index.vue
pull/7/head^2
Aaaaaaaa 2024-09-08 18:54:47 +08:00
commit 48d5b57397
13 changed files with 581 additions and 379 deletions

View File

@ -35,6 +35,21 @@ export function findcount(data){
})
}
export function getHeader(data){
return request({
url:"/market/producttest/productheader",
method: "POST",
data: data
})
}
export function getRequest(data){
return request({
url:"/market/producttest/productrequest",
method: "POST",
data: data
})
}
export function sendrequest(options){
@ -65,6 +80,21 @@ export function sendrequest1(options){
})
}
export function sendrequest2(options){
// 确保options是一个对象并且包含必要的属性
if (!options || typeof options !== 'object' || !options.apiRouter ) {
throw new Error('Invalid options: must be an object with apiRouter ');
}
// 构建完整的URL
const fullUrl = `/background/api/${options.apiRouter}`;
return request({
url:fullUrl,
method: "post"
})
}

View File

@ -88,4 +88,3 @@ export function listreclaim(data){

View File

@ -33,13 +33,6 @@ export function ifbuy(data){
}
export function ifbuy(data){
return request({
url:"/market/product/ifbuy",
method: "POST",
data: data
})
}
export function showByproductId(productId){
return request({

View File

@ -2,7 +2,7 @@ import request from '@/utils/request'
export function getExtractDataTableNameList() {
return request({
url: '/property/dataRunName/extractDataTableNameShow',
url: '/property/dataRunName/extractDataTableName',
method: 'post',
})
}

View File

@ -40,33 +40,3 @@ export function delUserAssetAuthorization(data) {
data:data
})
}
// --------------------------------------------------------
/**
* 查询资产赋权用户信息
* @param data 参数信息
* @returns {*} 响应结果
*/
export function findUserIdList(data) {
return request({
url: '/property/dataRunName/findUserIdList',
method: 'POST',
data
})
}
/**
* 查询资产赋权部门信息
* @param data 参数信息
* @returns {*} 响应结果
*/
export function findDeptIdList(data) {
return request({
url: '/property/dataRunName/findDeptIdList',
method: 'POST',
data
})
}

View File

@ -37,11 +37,6 @@
</el-form-item>
<el-form-item label="请求方式" prop="requestMethod" style="width: 70%">
{{api.requestMethod}}
</el-form-item>
<el-form-item>
<el-button type="primary" @click="submitForm('ruleForm')"></el-button>
</el-form-item>
</el-form>

View File

@ -19,8 +19,15 @@
<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>
@ -43,9 +50,84 @@
<el-form-item label="请求方式:">
{{myapi.requestMethod}}
</el-form-item>
<el-form-item label="请求Header:">
<el-table
:data="heanderData"
style="width: 100%">
<el-table-column
label="名称"
width="180">
<template slot-scope="scope">
<el-popover trigger="hover" placement="top">
<div slot="reference" class="name-wrapper">
{{scope.row.headerName}}
</div>
</el-popover>
</template>
</el-table-column>
<el-table-column
label="值"
width="250">
<template slot-scope="scope">
<el-popover trigger="hover" placement="top">
<div slot="reference" class="name-wrapper">
{{scope.row.headerValue}}
</div>
</el-popover>
</template>
</el-table-column>
</el-table>
</el-form-item>
<el-form-item label="请求参数说明:">
<el-table
:data="requestData"
style="width: 100%">
<el-table-column
label="参数名称"
width="180">
<template slot-scope="scope">
<el-popover trigger="hover" placement="top">
<div slot="reference" class="name-wrapper">
{{scope.row.requestName}}
</div>
</el-popover>
</template>
</el-table-column>
<el-table-column
label="参数类型"
width="250">
<template slot-scope="scope">
<el-popover trigger="hover" placement="top">
<div slot="reference" class="name-wrapper">
{{scope.row.requestType}}
</div>
</el-popover>
</template>
</el-table-column>
<el-table-column
label="是否必填"
width="250">
<template slot-scope="scope">
<el-popover trigger="hover" placement="top">
<div slot="reference" class="name-wrapper">
{{scope.row.requestIfmust}}
</div>
</el-popover>
</template>
</el-table-column>
<el-table-column
label="说明"
width="250">
<template slot-scope="scope">
<el-popover trigger="hover" placement="top">
<div slot="reference" class="name-wrapper">
{{scope.row.requestContent}}
</div>
</el-popover>
</template>
</el-table-column>
</el-table>
</el-form-item>
@ -83,7 +165,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!==''" >
<el-form-item label="请求参数" prop="pass" v-if="ruleForm.productName=='' && ruleForm.productName==''" >
<el-input type="text" v-model="ruleForm.parameter" autocomplete="off"></el-input>
</el-form-item>
<div v-if="ruleForm.productName=='新闻头条'">
@ -104,12 +186,30 @@
<span>说明是否只返回有内容详情的新闻, 1:, 默认0</span>
</el-form-item>
</div>
<el-form-item v-if="ruleForm.productName!=='新闻头条'">
<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-button type="primary" @click="submitForm(ruleForm)"></el-button>
</el-form-item>
<el-form-item v-if="ruleForm.productName=='新闻头条'">
<!--多个参数-->
<el-form-item v-if="ruleForm.productName=='' ||ruleForm.productName=='' " >npm
<el-button type="primary" @click="newsForm(ruleForm)"></el-button>
</el-form-item>
<!--无参数-->
<el-form-item v-if="ruleForm.productName==''" >
<el-button type="primary" @click="noForm(ruleForm)"></el-button>
</el-form-item>
</el-form>
<pre id="json-display">
@ -129,21 +229,8 @@
: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"
@ -178,6 +265,24 @@
</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="confirmSelection(row)"> </el-button>
@ -190,10 +295,19 @@
<script>
//jsjsjson,
//import from ',
import {sendrequest, sendrequest1} from "@/api/apitest/apitest";
import {
findcount,
getHeader, getRequest,
iftest,
reducetestcount,
sendrequest,
sendrequest1,
sendrequest2
} from "@/api/apitest/apitest";
import api from "js-cookie";
import {companyauthentication, ifcompanyauthentication} from "@/api/authentication/authentication";
import {selectproductspecification} from "@/api/market/product";
import myapi from "@/views/market/myapi/index.vue";
export default {
name: "Apitest",
@ -213,7 +327,12 @@ export default {
dialogVisible: false,
dialogVisible1: false,
ruleForm:{},
tableData:[]
tableData:[],
newapi:{},
//
heanderData:[],
//
requestData:[]
};
},
// data",
@ -222,13 +341,31 @@ export default {
watch: {},
//",
methods: {
api,
//
getHeader(myapi){
getHeader(myapi).then(response=>{
this.heanderData=response.data
})
},
//
getRequest(myapi){
getRequest(myapi).then(response=>{
this.requestData=response.data
})
},
//
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,
@ -236,6 +373,9 @@ export default {
requestMethod: myapi.requestMethod,
apiRouter: myapi.apiRouter
}
}
})
},
//
apply(myapi){
@ -268,23 +408,54 @@ export default {
.catch(_ => {});
},
//
getproductspecification(specification){
getproduct(specification){
selectproductspecification(specification).then(response=>{
this.tableData=response.data
})
},
//
submitForm(ruleForm){
sendrequest(ruleForm).then(response=>{
const jsonData = response.data;
// 使JSON.stringify()JSON2
const formattedJson = JSON.stringify(jsonData, null, 2);
// <pre>innerHTMLJSON
document.getElementById('json-display').innerHTML = formattedJson;
//
noForm(ruleForm){
sendrequest2(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>Content: ' + jsonData.result.content + '</p>';
resultDiv.innerHTML += '<p>Source: ' + jsonData.result.source + '</p>';
// JSONrealname, idcard, orderid, res
} else {
resultDiv.innerHTML += '<p>Result information is not available.</p>';
}
// div
container.appendChild(resultDiv);
})
},
//-1
reducetestcount(this.myapi).then(response=>{
}) },
//
newsForm(ruleForm) {
if (ruleForm.productName=='新闻头条'){
sendrequest1(ruleForm).then(response => {
console.log(response)
const jsonData1 = response.data; // response.dataJSON
@ -307,7 +478,6 @@ export default {
} else {
resultDiv.innerHTML += '<h2>Reason: Not available</h2>';
}
// jsonData.result
if (jsonData.result !== undefined) {
//
@ -328,8 +498,6 @@ export default {
<p>Author: ${item.author_name}</p>
<p>URL: <a href="${item.url.replace(/\\/g, '')}">${item.url}</a></p>
</div>
`;
});
} else {
@ -343,9 +511,19 @@ export default {
container.appendChild(resultDiv);
});
},
}
if (ruleForm.productName=='身份证实名认证'){
sendrequest1(ruleForm).then(response => {
console.log(response)
const jsonData1 = response.data; // response.dataJSON
// JSONJavaScript
const jsonData = JSON.parse(jsonData1);
});
}},
handleEdit(row) {
this.selectedRow = row;
console.log(row)
},
confirmSelection(row) {
this.dialogVisible1=false
@ -353,16 +531,45 @@ export default {
//
startPayment(this.selectedRow);
console.log(row)
window.open("http://21.12.0.10:8080/alipay/pay?middlePrice="+row.middlePrice)
window.open("http://localhost:9701 " +
"/alipay/pay?middlePrice="+row.middlePrice)
this.$message.success('付款成功')
this.dialogVisible1 = false;
//
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 {
//
this.$message.warning('请先选择一项进行支付');
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,14 +30,11 @@
</div>
</el-card>
<br>
<button style="float: right; padding: 3px 10px" type="text" @click="reclaim"></button>
<br>
<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">
@ -93,7 +90,7 @@
<el-button
size="mini"
type="danger"
@click="updateByeExist(scope.row)">删除</el-button>
@click="ordersDelete(scope.row)">删除</el-button>
<el-button
type="primary"
size="small"
@ -108,7 +105,7 @@
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
:current-page="orders.pageNum"
:page-sizes="[5, 10, 50, 100]"
:page-sizes="[2, 4, 6, 8]"
:page-size="orders.pageSize"
layout="total, sizes, prev, pager, next, jumper"
:total="orders.total">
@ -153,17 +150,8 @@
<script>
import {
selectList,
updateOrders,
addordersup,
ordersDelete,
pay,
getOut,
updateByeExist
} from '@/api/market/orders'
import { selectList, updateOrders, addordersup, ordersDelete ,pay} from '@/api/market/orders'
import { diGui } from "@/api/market/orders";
import axios from 'axios'
//jsjsjson,
@ -237,24 +225,13 @@ export default {
)
},
//
updateByeExist(row){
const result = window.confirm(`你确定要执行此操作吗?`);
if (result) {
updateByeExist(row.ordersId).then(
ordersDelete(row){
ordersDelete(row.ordersId).then(
res => {
this.$message.success(res.msg)
this.selectList()
}
)
location.reload();
// 使 id
console.log(`用户点击了确定ID 为 ${row.ordersId}`);
} else {
//
console.log('用户点击了取消');
}
},
//
handleSizeChange(val) {
@ -307,34 +284,12 @@ export default {
},
pay(row){
console.log(row)
window.open("http://21.12.0.10:80/alipay/pay?productName="+row.productName +"&ordersNum="+row.ordersNum+"&ordersPrice="+row.ordersPrice)
window.open("http://localhost:9701/alipay/pay?subject=" + row.name
+ "&amp; traceNo=" + row.no + "&amp; totalAmount=" + row.ordersPrice)
this.$message.success('付款成功')
},
getOut(){
this.download('system/operlog/export', {
...this.queryParams
}, `operlog_${new Date().getTime()}.xlsx`)
},
reclaim(){
this.$router.push({path:"/reclaim/index"})
this.load();
}
// 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

@ -8,13 +8,7 @@
<el-step title="选择商品关联"></el-step>
</el-steps>
<el-calendar
placeholder="请选择"
v-model="orders.ordersProduct"
:options="productName"
:props= Cascader
@change="Product(orders.productId)">
</el-calendar>
<el-card class="box-card" style="width: 94%;transform: translateX(3%);margin-top: 30px">

View File

@ -9,7 +9,8 @@
<div class="text item">
<el-form ref="form" :model="orders" label-width="100px">
<el-form-item>
订单编号<el-input v-model="orders.ordersNum" placeholder="编号" style="width: 130px;margin-right: 50px"></el-input>
订单编号<el-input v-model="orders.ordersNum" placeholder="编号" style="width: 180px;margin-right: 50px"></el-input>
订单款项状态
<el-select v-model="orders.ordersState" placeholder="请选择状态" style="margin-right: 30px" clearable>
<el-option v-for="item in options"
@ -18,21 +19,24 @@
:value="item.value">
</el-option>
</el-select>
<br/> <br/>
选择时间:
<el-date-picker v-model="orders.startDate" type="date" placeholder="开始时间" style="width: 130px;"/>
<el-date-picker v-model="orders.startDate" type="date" placeholder="开始时间" />
-----
<el-date-picker v-model="orders.endDate" type="date" placeholder="结束时间" style="width: 130px;"/>
<el-date-picker v-model="orders.endDate" type="date" placeholder="结束时间"/>
</el-form-item>
</el-form>
</div>
</el-card>
<br>
<button style="float: right; padding: 3px 10px" type="text" @click="orderslist"></button>
<br>
<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>
</div>
<el-table :data="arr" style="width: 100%" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55"></el-table-column>
<el-table-column label="日期" width="150" align="center">
@ -41,7 +45,7 @@
</template>
</el-table-column>
<el-table-column label="购买信息">
<el-table-column label="订单编号" width="150" align="center">
<el-table-column label="订单编号" width="120" align="center">
<template slot-scope="scope">
<span style="margin-left: 10px"> {{ scope.row.ordersNum }}</span>
</template>
@ -53,7 +57,7 @@
</el-table-column>
<el-table-column label="购买详情">
<el-table-column prop="province" label="购买接口" width="200" align="center">
<el-table-column prop="province" label="购买接口" width="150" align="center">
<template slot-scope="scope">
<span style="margin-left: 10px">{{ scope.row.productName }}</span>
</template>
@ -69,7 +73,7 @@
<span style="margin-left: 10px">{{ scope.row.ordersSpecification }}</span>
</template>
</el-table-column>
<el-table-column label="订单款项状态" width="130" align="center">
<el-table-column label="订单款项状态" width="110" align="center">
<template slot-scope="scope">
<span style="margin-left: 10px" v-if="scope.row.ordersState==0"></span>
<span style="margin-left: 10px" v-if="scope.row.ordersState==1"></span>
@ -82,11 +86,16 @@
<template slot-scope="scope">
<el-button
size="mini"
@click="handleEdit(scope.row)">恢复</el-button>
@click="handleEdit(scope.row)">编辑</el-button>
<el-button
size="mini"
type="danger"
@click="ordersDelete(scope.row)">彻底删除</el-button>
@click="ordersDelete(scope.row)">删除</el-button>
<el-button
type="primary"
size="small"
@click="pay(scope.row)" >支付</el-button>
<!-- v-if="scope.row.status === '待支付'"-->
</template>
</el-table-column>
</el-table-column>
@ -96,25 +105,59 @@
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
:current-page="orders.pageNum"
:page-sizes="[5, 10, 50, 100]"
:page-sizes="[2, 4, 6, 8]"
:page-size="orders.pageSize"
layout="total, sizes, prev, pager, next, jumper"
:total="orders.total">
</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>
<script>
import { ordersDelete, listreclaim, updateByExist} from '@/api/market/orders'
import { selectList, update, addordersup, ordersDelete ,pay} from '@/api/market/orders'
import { diGui } from "@/api/market/orders";
//jsjsjson,
//import from ',
export default {
dicts:['product_name','orders_num','orders_state','orders_launchdate'],
//import使"
components: {},
props: {},
@ -129,9 +172,15 @@ export default {
},
arr:[],
type:[],
Cascader:{ expandTrigger:'hover',value:'id',label:'typeName',children:'parentPOS' },
typeId:[],
startDate: null,
endDate: null,
index:'',
addtitle:'',
addordersoff:false,
ordersForm:{},
options: [{
@ -161,83 +210,110 @@ export default {
watch: {},
//",
methods: {
//
ordersDelete(row){
ordersDelete(row.ordersId).then(
res => {
this.$message.success(res.msg)
this.selectList()
}
)
},
//
chong(){
this.orders={}
this.selectList()
},
//
handleSizeChange(val) {
this.orders.pageSize=val
this.selectList()
},
handleCurrentChange(val) {
this.orders.pageNum=val
this.selectList()
},
handleClose(done) {
this.$confirm('确认关闭?')
.then(_ => {
done();
})
.catch(_ => {});
},
pay(row){
window.open("http://localhost:9701/alipay/pay?subject=" + row.name
+ "&amp; traceNo=" + row.no + "&amp; totalAmount=" + row.ordersPrice)
this.$message.success('付款成功')
this.load();
}
,
//
updateShop(orders){
update(orders).then(
res => {
this.$message.success(res.msg)
this.selectList()
}
)
},
//
handleEdit(orders){
if (this.orders.serviceIds && typeof this.orders.serviceIds === 'string') {
orders.serviceid = this.orders.serviceIds.split(',');
// ...
}
console.log(JSON.stringify(orders))
orders.serviceid=orders.serviceIds.split(',').map(id => parseInt(id, 10));
console.log(JSON.stringify(orders))
this.$router.push({path:'/product/info/update',query:{orders:orders}})
},
addorders(ordersForm){
addordersup(ordersForm).then(response=>{
alert(response.msg)
if (response.code==200){}
this.addordersoff=false
})
location.reload();
},
//
findShop(){
this.selectList()
},
//
add(index){
this.index=index
if (this.index === 1) {
this.addtitle= '添加订单';
}
// else if (this.index === 2) {
// this.dialogtitle= '';
// }
this.addordersoff=true
},
//
handleSelectionChange(val) {
this.multipleSelection = val;
},
//
listreclaim() {
listreclaim(this.orders).then(
selectList() {
selectList(this.orders).then(
res => {
console.log(res)
this.arr = res.data.list
this.orders.total = res.data.total
}
)
},
//
handleEdit(row){
const result = window.confirm(`你确定要执行此操作吗?`);
if (result) {
updateByExist(row.ordersId).then(
res =>{
this.$message.success(res.msg)
this.listreclaim()
}
)
location.reload();
// 使 id
console.log(`用户点击了确定ID 为 ${id}`);
} else {
//
console.log('用户点击了取消');
}
},
//
ordersDelete(row){
const result = window.confirm(`你确定要执行此操作吗?`);
if (result) {
ordersDelete(row.ordersId).then(
res => {
this.$message.success(res.msg)
this.listreclaim()
}
)
location.reload();
// 使 id
console.log(`用户点击了确定ID 为 ${id}`);
} else {
//
console.log('用户点击了取消');
}
},
//
chong(){
this.orders={}
this.listreclaim()
},
//
handleSelectionChange(val) {
this.multipleSelection = val;
},
//
handleSizeChange(val) {
this.orders.pageSize=val
this.listreclaim()
},
handleCurrentChange(val) {
this.orders.pageNum=val
this.listreclaim()
},
orderslist(){
this.$router.push({path:"/market/orders"})
},
//
findShop(){
this.listreclaim()
}
},
// - 访this",
created() {
this.listreclaim()
// this.diGui()
this.selectList()
},
// - 访DOM",
mounted() {

View File

@ -1,43 +1,44 @@
<template>
<div>
{{orders}}
<br><br><br>
<center>
<el-form :model="orders" status-icon :rules="rules" ref="ruleForm" label-width="100px" class="demo-ruleForm">
<el-form-item label="订单编号" prop="ordersNum" style="width: 70% " >
{{orders.ordersNum}}
</el-form-item>
<el-form-item label="订单产品" prop="productName" style="width: 70%">
<el-select v-model="orders.productName" placeholder="请选择产品">
<el-option v-model="orders.productName" :value="orders.productId"></el-option>
<el-option v-for="item in product" :label="item.productName" :key="item.productId" :value="item.productId" ></el-option>
</el-select>
</el-form-item>
<el-form-item label="订单所属人" prop="userName" style="width: 70%">
{{orders.userName}}
</el-form-item>
<el-form-item label="订单金额" prop="ordersPrice" style="width: 70%">
<el-input type="text" v-model="orders.ordersPrice" autocomplete="off" style="width: 100px"></el-input>
</el-form-item>
<el-form-item label="订单规格" prop="ordersSpecification" style="width: 70%">
<el-input type="text" v-model="orders.ordersSpecification" autocomplete="off" style="width: 250px"></el-input>
</el-form-item>
<el-form-item label="订单款项状态" prop="ordersState" style="width: 70%">
<el-select v-model="orders.ordersState" placeholder="订单款项状态" >
<el-option label="待支付-0" value="0"></el-option>
<el-option label="已支付-1" value="1"></el-option>
<el-option label="未支付-2" value="2"></el-option>
<el-option label="售后(审核退款)-3" value="3"></el-option>
<el-option label="退款成功-4" value="4"></el-option>
</el-select>
<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>
<el-form-item label="订单日期" prop="ordersLaunchdate" style="width: 70%">
{{orders.ordersLaunchdate}}
<el-form-item label="接口名称" prop="productName" style="width: 70%">
{{orders.productName}}
</el-form-item>
<el-form-item label="接口类型" prop="productType" style="width: 70%">
{{orders.productType}}
</el-form-item>
<el-form-item label="接口描述" prop="productContent" style="width: 70%">
{{orders.productContent}}
</el-form-item>
<el-form-item label="接口销量" prop="productSales" style="width: 70%">
{{orders.productSales}}
</el-form-item>
<el-form-item label="接口价格" prop="productPrice" style="width: 70%">
{{orders.productPrice}}
</el-form-item>
<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-button type="primary" @click="update(row)"></el-button>
</el-form-item>
</el-form>
</center>
@ -47,18 +48,15 @@
<script>
//jsjsjson,
//import from ',
import { updateOrders } from '@/api/market/orders'
export default {
name: "Apidetailmessage",
//import使"
components: {},
props: {},
data() {
//"
return {
orders:{},
product:[]
orders:{}
};
},
// data",
@ -68,15 +66,7 @@ export default {
//",
methods: {
submitForm(){
this.$router.push("/market/orders")
},
update(row){
updateOrders(this.orders).then(
res =>{
this.$message.success(res.msg)
}
)
this.$router.push("/apimanage/index")
}
},
// - 访this",
@ -84,7 +74,7 @@ export default {
},
// - 访DOM",
mounted() {
this.orders = this.$route.query.orders
this.api = this.$route.query.api
},
beforeCreate() {
}, // - ",

View File

@ -52,56 +52,56 @@
</el-row>
<!--提示需要验证--->
<el-dialog
title="提示"
:visible.sync="dialogVisible"
width="30%"
:before-close="handleClose"
:close-on-click-modal="false">
<span>需要认证才能使用哦</span>
<span slot="footer" class="dialog-footer">
<el-button @click="dialogVisible = false"> </el-button>
<el-button type="primary" @click="validationYes()"></el-button>
</span>
</el-dialog>
<!-- &lt;!&ndash;提示需要验证-&ndash;&gt;-->
<!-- <el-dialog-->
<!-- title="提示"-->
<!-- :visible.sync="dialogVisible"-->
<!-- width="30%"-->
<!-- :before-close="handleClose"-->
<!-- :close-on-click-modal="false">-->
<!-- <span>需要认证才能使用哦</span>-->
<!-- <span slot="footer" class="dialog-footer">-->
<!-- <el-button @click="dialogVisible = false"> </el-button>-->
<!-- <el-button type="primary" @click="validationYes()"></el-button>-->
<!-- </span>-->
<!-- </el-dialog>-->
<!---企业验证页面-->
<el-dialog
title="提示"
:visible.sync="dialogVisible1"
width="30%"
:before-close="handleClose1"
:close-on-click-modal="false">
<span>企业信息</span>
<el-divider></el-divider>
<el-form :model="ruleForm" status-icon :rules="rules" ref="ruleForm" label-width="100px" class="demo-ruleForm">
<el-form-item label="企业名称" prop="pass">
<el-input type="text" v-model="ruleForm.pass" autocomplete="off"></el-input>
</el-form-item>
<el-form-item label="用户姓名" prop="pass">
<el-input type="text" v-model="ruleForm.pass" autocomplete="off"></el-input>
</el-form-item>
<el-form-item label="用户职位" prop="pass">
<el-input type="text" v-model="ruleForm.pass" autocomplete="off"></el-input>
</el-form-item>
<el-form-item label="公司所在省市区" prop="pass">
<el-input type="text" v-model="ruleForm.pass" autocomplete="off"></el-input>
</el-form-item>
<el-form-item label="公司详细地址" prop="pass">
<el-input type="text" v-model="ruleForm.pass" autocomplete="off"></el-input>
</el-form-item>
<el-form-item label="统一社会信用代码" prop="pass">
<el-input type="text" v-model="ruleForm.pass" autocomplete="off"></el-input>
</el-form-item>
<el-form-item label="营业执照" prop="pass">
<el-input type="text" v-model="ruleForm.pass" autocomplete="off"></el-input>
</el-form-item>
</el-form>
<span slot="footer" class="dialog-footer">
<el-button type="primary" @click="push()"></el-button>
</span>
</el-dialog>
<!-- &lt;!&ndash;-企业验证页面&ndash;&gt;-->
<!-- <el-dialog-->
<!-- title="提示"-->
<!-- :visible.sync="dialogVisible1"-->
<!-- width="30%"-->
<!-- :before-close="handleClose1"-->
<!-- :close-on-click-modal="false">-->
<!-- <span>企业信息</span>-->
<!-- <el-divider></el-divider>-->
<!-- <el-form :model="ruleForm" status-icon :rules="rules" ref="ruleForm" label-width="100px" class="demo-ruleForm">-->
<!-- <el-form-item label="企业名称" prop="pass">-->
<!-- <el-input type="text" v-model="ruleForm.pass" autocomplete="off"></el-input>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="用户姓名" prop="pass">-->
<!-- <el-input type="text" v-model="ruleForm.pass" autocomplete="off"></el-input>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="用户职位" prop="pass">-->
<!-- <el-input type="text" v-model="ruleForm.pass" autocomplete="off"></el-input>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="公司所在省市区" prop="pass">-->
<!-- <el-input type="text" v-model="ruleForm.pass" autocomplete="off"></el-input>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="公司详细地址" prop="pass">-->
<!-- <el-input type="text" v-model="ruleForm.pass" autocomplete="off"></el-input>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="统一社会信用代码" prop="pass">-->
<!-- <el-input type="text" v-model="ruleForm.pass" autocomplete="off"></el-input>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="营业执照" prop="pass">-->
<!-- <el-input type="text" v-model="ruleForm.pass" autocomplete="off"></el-input>-->
<!-- </el-form-item>-->
<!-- </el-form>-->
<!-- <span slot="footer" class="dialog-footer">-->
<!-- <el-button type="primary" @click="push()"></el-button>-->
<!-- </span>-->
<!-- </el-dialog>-->
<!--充值页面-->
<el-dialog
@ -135,8 +135,8 @@
</el-form-item>
</el-form>
<span slot="footer" class="dialog-footer">
<el-button type="primary" @click="insertmoney(moneyForm)"></el-button>
</span>
<el-button type="primary" @click="insertmoney(moneyForm)"></el-button>
</span>
</el-dialog>
</div>
@ -185,24 +185,20 @@ export default {
//
addmoney(){
this.dialogVisible2=true
},
//
//
insertmoney(moneyForm){
if (moneyForm.pay==1){
if (moneyForm.resource!=''){
window.open("http://21.12.0.10:8080/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:8080/alipay/pay?ordersPrice="+moneyForm.resource1)
window.open("http://localhost:9701/alipay/pay?ordersPrice="+moneyForm.resource)
this.$message.success('付款成功')
}
}
// this.dialogVisible2=false
// this.dialogVisible2=false
},
//

View File

@ -189,14 +189,12 @@ export default {
parseTime,
//switch
handleDeptAccreditChange(deptId, value) {
if (this.tableBasic.children != null) {
this.AssetImPowerListReq.basicId = this.tableBasic.basicId
this.AssetImPowerListReq.deptId = deptId
this.AssetImPowerListReq.tableId = null;
} else {
this.AssetImPowerListReq.tableId = this.tableBasic.id
this.AssetImPowerListReq.deptId = deptId
if (this.tableBasic.children != null) {
this.AssetImPowerListReq.tableId = null;
} else {
this.AssetImPowerListReq.basicId = null;
}
@ -229,13 +227,12 @@ export default {
handleAccreditChange(userId, value) {
console.log("userId的值:" + userId);
console.log("value的值" + value)
if (this.tableBasic.children != null) {
this.AssetImPowerListReq.basicId = this.tableBasic.basicId
this.AssetImPowerListReq.userId = userId
this.AssetImPowerListReq.tableId = null;
} else {
this.AssetImPowerListReq.tableId = this.tableBasic.id
this.AssetImPowerListReq.userId = userId
if (this.tableBasic.children != null) {
this.AssetImPowerListReq.tableId = null;
} else {
this.AssetImPowerListReq.basicId = null;
}
@ -337,12 +334,12 @@ export default {
*/
handleNodeClick(data) {
this.tableBasic = data
if (this.tableBasic.children != null) {
this.AssetImPowerListReq.tableId = this.tableBasic.id
this.AssetImPowerListReq.basicId = this.tableBasic.basicId
this.AssetImPowerListReq.deptId = this.tableBasic.deptId
if (this.tableBasic.children != null) {
this.AssetImPowerListReq.tableId = null;
} else {
this.AssetImPowerListReq.tableId = this.tableBasic.id
this.AssetImPowerListReq.basicId = null;
}
/**