Compare commits

...

5 Commits
dev ... master

Author SHA1 Message Date
Aaaaaaaa a5e8a318a7 测试 2024-09-11 12:24:29 +08:00
Aaaaaaaa 4af2830df2 测试 2024-09-10 17:31:28 +08:00
Aaaaaaaa 4f93e1b315 测试 2024-09-10 16:59:09 +08:00
Aaaaaaaa 5b6492c571 Merge branch 'dev'
# Conflicts:
#	src/views/market/orders/index.vue
2024-09-10 10:11:17 +08:00
Aaaaaaaa 40015d48e8 推线上 2024-09-09 16:49:16 +08:00
5 changed files with 71 additions and 23 deletions

View File

@ -72,7 +72,7 @@ export function getOut(){
export function updateByordersState1(data){
return request({
url:"/market/orders/updateByordersState1",
method: "POST",
method: "GET",
data: data
})}

View File

@ -130,20 +130,38 @@
</el-table>
</el-form-item>
<el-form-item label="返回参数说明:">
{{myapi.productContent}}
</el-form-item>
<el-form-item label="JSON返回示例:">
<div style="width: 80px ; height: 30px; " ></div>
{{myapi}}
</el-form-item>
<el-form-item label="XML返回示例:">
</el-form-item>
</el-form>
</el-tab-pane>
<el-tab-pane label="错误码参照" name="second">错误码参照</el-tab-pane>
<el-tab-pane label="错误码参照" name="second">
错误码参照
<el-table
:data="errCode"
style="width: 100%">
<el-table-column
prop="code"
label="错误码"
width="180">
</el-table-column>
<el-table-column
prop="message"
label="错误描述"
width="180">
</el-table-column>
<el-table-column
prop="mesg"
label="解决方案">
</el-table-column>
</el-table>
</el-tab-pane>
<el-tab-pane label="数据统计" name="third">数据统计</el-tab-pane>
</el-tabs>
</div></el-col>
@ -286,7 +304,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(newapi)"> </el-button>
</span>
</el-dialog>
@ -337,8 +355,37 @@ export default {
//
heanderData:[],
//
requestData:[]
requestData:[],
errCode:[
{
code:'10000',
message:'服务调用成功',
mesg:'服务调用成功,不返回 subCode 和 subMessage'
}, {
code:'20000',
message:'服务不可用',
mesg:'错误信息详情查看错误码'
}, {
code:'40002',
message:'提示无效签名isv.invalid-signature等字样',
mesg:'可查看 自助排查签名验签问题。'
}, {
code:'40006',
message:'isv.insufficient-isv-permissions',
mesg:'1.请联系IoT开放平台技术支持并提供 IoT 开放平台上应用的 APPID。\n' +
'2.请联系IoT开放平台技术支持添加白名单。'
}, {
code:'E70201',
message:'system error',
mesg:'系统错误请联系IoT开放平台技术支持协助解决。'
}, {
code:'E70202',
message:'invalid parameter',
mesg:'\t\n' +
'系统入参检查失败请联系IoT开放平台技术支持。'
}, ]
};
},
// data",
computed: {},
@ -430,6 +477,7 @@ export default {
productPrice: row.middlePrice,
productContent:this.myapi.productContent,
}
},
//
noForm(ruleForm){
@ -559,7 +607,7 @@ export default {
//
// startPayment(this.selectedRow);
console.log(row)
window.open("http://localhost:9701/alipay/pay?ordersPrice=" + row.middlePrice)
window.open("http://21.12.0.10:80/prod-api/market/alipay/pay?ordersPrice=" + row.middlePrice)
this.$message.success('付款成功')
showByproductId(row).then(

View File

@ -162,12 +162,14 @@ import {
ordersDelete,
pay,
getOut,
updateByeExist, updateByordersState1
updateByeExist,
updateByordersState1
} from '@/api/market/orders'
import { diGui } from "@/api/market/orders";
import axios from 'axios'
import item from '@/layout/components/Sidebar/Item.vue'
import { showByproductId } from '@/api/market/product'
import product from '@/views/market/product/index.vue'
//jsjsjson,
@ -184,7 +186,8 @@ export default {
pageNum:1,
pageSize:10,
total:1,
typeId:0
ordersId:3,
productId:3
},
arr:[],
type:[],
@ -316,14 +319,15 @@ export default {
},
pay(row){
console.log(row)
updateByordersState1(ordersForm).then(response=>{
if (response.code==200){}
})
console.log(row)
updateByordersState1(this.orders).then(res =>{
this.orders.ordersId=this.orders.ordersId;
this.orders.productId=this.orders.productId;
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('付款成功')
}
)
},

View File

@ -61,10 +61,6 @@
</el-container>
</el-container>
</div>
</template>

View File

@ -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('付款成功')
}