czg_team
/
management
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dev' of e.coding.net:g-cphe0354/yinshoukeguanliduan/management into gyq

This commit is contained in:
gyq 2024-10-25 16:04:08 +08:00
parent c384188256 6f63576428
commit 435008fbd3
3 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/views/order_manage/components/orderDetail.vue
View File

@ -130,12 +130,14 @@
￥{{ scope.row.priceAmount }} ￥{{ scope.row.priceAmount }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作"> <!-- <el-table-column label="操作">
<template v-slot="scope"> <template v-slot="scope">
<el-button v-if="detail.status=='closed'" type="text" size="mini" @click="tuikuan(scope.row)"><span >退款</span></el-button> <template v-if="scope.row.status!='refund'">
<el-button v-if="detail.status=='closed'||detail.status=='refund'" type="text" size="mini" @click="tuikuan(scope.row)"><span >退款</span></el-button>
</template>
<el-button v-if="detail.status=='unpaid'" type="text" size="mini" @click="tuiCai(scope.row)"><span >退菜</span></el-button> <el-button v-if="detail.status=='unpaid'" type="text" size="mini" @click="tuiCai(scope.row)"><span >退菜</span></el-button>
</template> </template>
</el-table-column> </el-table-column> -->
</el-table> </el-table>
</div> </div>
<!-- </el-tab-pane> --> <!-- </el-tab-pane> -->

7
src/views/tool/Instead/components/scan-pay.vue
View File

@ -141,7 +141,8 @@ export default {
this.$nextTick(() => { this.$nextTick(() => {
QRCode.toCanvas( QRCode.toCanvas(
this.$refs.canvas, this.$refs.canvas,
this.paymentQrcode, this.paymentQrcode,{width: 160,
height: 160,},
function (error) { function (error) {
console.log(error); console.log(error);
} }
@ -192,11 +193,11 @@ export default {
this.close(); this.close();
this.$emit("confirm", this.form.code); this.$emit("confirm", this.form.code);
}, },
open() { open(data) {
this.show = true; this.show = true;
this.form.money = Number(this.price).toFixed(2); this.form.money = Number(this.price).toFixed(2);
if (this.openSwitch) { if (this.openSwitch) {
$getOrderPayUrl({ orderId: this.order.id,payAmount:this.price.toFixed(2) }).then((res) => { $getOrderPayUrl({ orderId: this.order.id||data.id,payAmount:this.form.money||data.settlementAmount }).then((res) => {
console.log(res); console.log(res);
this.paymentQrcode = res; this.paymentQrcode = res;
}); });

9
src/views/tool/Instead/index.vue
View File

@ -1166,7 +1166,7 @@
<return-cart <return-cart
ref="refReturnCart" ref="refReturnCart"
:max="order.selGoods.number" :max="order.selGoods?order.selGoods.number:1"
@confirm="refReturnCartConfirm" @confirm="refReturnCartConfirm"
></return-cart> ></return-cart>
</div> </div>
@ -1856,9 +1856,10 @@ export default {
return; return;
} }
await this.returnCreateOrderData(); await this.returnCreateOrderData();
this.payBeforeClear(); console.log( this.createOrder.data )
this.order.payType = "scanCode"; this.order.payType = "scanCode";
this.payTypeItemClick({ payType: "scanCode" }); this.payTypeItemClick({ payType: "scanCode" });
this.payBeforeClear();
}, },
async changeOrderUseType(useType) { async changeOrderUseType(useType) {
if (useType && this.order.list.length) { if (useType && this.order.list.length) {
@ -2047,7 +2048,7 @@ export default {
} }
if (item.payType == "scanCode") { if (item.payType == "scanCode") {
//扫码支付 //扫码支付
return this.refToggle("refWxScanCode", true); return this.refToggle("refWxScanCode", true,this.createOrder.data);
} }
}, },
ChangeDiscount(discount) { ChangeDiscount(discount) {
@ -2181,7 +2182,7 @@ export default {
return this.refChooseUserOpen(); return this.refChooseUserOpen();
} }
if (this.order.payType == "scanCode") { if (this.order.payType == "scanCode") {
return this.refToggle("refWxScanCode", true); return this.refToggle("refWxScanCode", true,this.createOrder.data);
} }
if (this.order.payType == "deposit") { if (this.order.payType == "deposit") {
return this.refToggle("refScanCode", true); return this.refToggle("refScanCode", true);