Merge branch 'dev'

# Conflicts:
#	src/views/market/orders/index.vue
master
Aaaaaaaa 2024-09-10 10:11:17 +08:00
commit 5b6492c571
3 changed files with 36 additions and 13 deletions

View File

@ -71,9 +71,6 @@ export function getOut(){
export function updateByordersState1(data){ export function updateByordersState1(data){
return request({ return request({
url:"/market/orders/updateByordersState1", url:"/market/orders/updateByordersState1",
method: "POST", method: "POST",
data: data data: data

View File

@ -286,7 +286,7 @@
</el-form> </el-form>
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">
<el-button @click="dialogVisible1 = false"> </el-button> <el-button @click="dialogVisible1 = false"> </el-button>
<el-button type="primary" @click=" confirmSelection(row)"> </el-button> <el-button type="primary" @click="confirmSelection"> </el-button>
</span> </span>
</el-dialog> </el-dialog>
@ -307,8 +307,9 @@ import {
} from "@/api/apitest/apitest"; } from "@/api/apitest/apitest";
import api from "js-cookie"; import api from "js-cookie";
import {companyauthentication, ifcompanyauthentication} from "@/api/authentication/authentication"; import {companyauthentication, ifcompanyauthentication} from "@/api/authentication/authentication";
import {selectproductspecification} from "@/api/market/product"; import { selectproductspecification, showByproductId } from '@/api/market/product'
import myapi from "@/views/market/myapi/index.vue"; import myapi from "@/views/market/myapi/index.vue";
import { addordersup, updateOrders } from '@/api/market/orders'
export default { export default {
name: "Apitest", name: "Apitest",
@ -327,9 +328,12 @@ export default {
activeName: 'first', activeName: 'first',
dialogVisible: false, dialogVisible: false,
dialogVisible1: false, dialogVisible1: false,
productInfo: null,
ruleForm:{}, ruleForm:{},
tableData:[], tableData:[],
newapi:{}, newapi:{},
products: [],
orders: [],
// //
heanderData:[], heanderData:[],
// //
@ -550,15 +554,36 @@ export default {
}); });
}}, }},
confirmSelection(row) { confirmSelection(row) {
if (this.selectedRow) {
if (this.selectedRow) {
// //
// startPayment(this.selectedRow); // startPayment(this.selectedRow);
console.log(row) console.log(row)
window.open("http://21.12.0.10:80/prod-api/market/alipay/pay?ordersPrice=" + row.middlePrice) window.open("http://21.12.0.10:80/prod-api/market/alipay/pay?ordersPrice=" + row.middlePrice)
this.$message.success('付款成功') this.$message.success('付款成功')
}
showByproductId(row).then(
res =>{
this.$message.success(res.msg)
}
),
showByproductId().then(
response => {
this.productInfo = response.data;
const orderData = {
ordersProduct:this.productInfo.productId,
productName: this.productInfo.productName,
ordersPrice: this.productInfo.productPrice,
ordersSpecification : this.productInfo.productSpecification
};
return addordersup(orderData);
if (response.code==200){}
this.addordersoff=false
}).then(() => {
this.$message.success('订单添加成功');
})
location.reload();
}
}, },
show(){ show(){

View File

@ -78,6 +78,7 @@
</el-table-column> </el-table-column>
<el-table-column label="订单款项状态" width="110" align="center"> <el-table-column label="订单款项状态" width="110" align="center">
<template slot-scope="scope"> <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==0"></span>
<span style="margin-left: 10px" v-if="scope.row.ordersState==1"></span> <span style="margin-left: 10px" v-if="scope.row.ordersState==1"></span>
<span style="margin-left: 10px" v-if="scope.row.ordersState==2"></span> <span style="margin-left: 10px" v-if="scope.row.ordersState==2"></span>
@ -166,6 +167,7 @@ import {
import { diGui } from "@/api/market/orders"; import { diGui } from "@/api/market/orders";
import axios from 'axios' import axios from 'axios'
import item from '@/layout/components/Sidebar/Item.vue' import item from '@/layout/components/Sidebar/Item.vue'
import { showByproductId } from '@/api/market/product'
//jsjsjson, //jsjsjson,
@ -196,6 +198,7 @@ export default {
addtitle:'', addtitle:'',
addordersoff:false, addordersoff:false,
ordersForm:{}, ordersForm:{},
productInfo: null,
options: [{ options: [{
value: ' ', value: ' ',
@ -314,14 +317,12 @@ export default {
pay(row){ pay(row){
console.log(row) console.log(row)
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=>{ updateByordersState1(ordersForm).then(response=>{
alert(response.msg)
if (response.code==200){} if (response.code==200){}
}) })
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('付款成功')
}, },