|
@@ -387,7 +387,13 @@
|
|
|
</template>
|
|
</template>
|
|
|
</el-table-column>
|
|
</el-table-column>
|
|
|
</el-table>
|
|
</el-table>
|
|
|
|
|
+
|
|
|
</div>
|
|
</div>
|
|
|
|
|
+ <el-col :span="12" style="margin-top: 10px">
|
|
|
|
|
+ <el-form-item label="游客人数" prop="touristCount">
|
|
|
|
|
+ <el-input-number v-model="formData.touristCount" :min="0"></el-input-number>
|
|
|
|
|
+ </el-form-item>
|
|
|
|
|
+ </el-col>
|
|
|
</el-collapse-item>
|
|
</el-collapse-item>
|
|
|
|
|
|
|
|
<el-collapse-item v-if="false" title="费用信息" name="fee">
|
|
<el-collapse-item v-if="false" title="费用信息" name="fee">
|
|
@@ -861,8 +867,8 @@
|
|
|
<el-form-item label="付款方式" prop="method">
|
|
<el-form-item label="付款方式" prop="method">
|
|
|
<el-radio-group v-model="paymentForm.method">
|
|
<el-radio-group v-model="paymentForm.method">
|
|
|
<el-radio-button label="Online">在线支付</el-radio-button>
|
|
<el-radio-button label="Online">在线支付</el-radio-button>
|
|
|
- <!-- <el-radio-button label="Balance">余额扣款</el-radio-button>
|
|
|
|
|
- <el-radio-button label="Offline">线下支付</el-radio-button> -->
|
|
|
|
|
|
|
+ <!-- <el-radio-button label="Balance">余额扣款</el-radio-button> -->
|
|
|
|
|
+ <el-radio-button label="Offline">线下支付</el-radio-button>
|
|
|
</el-radio-group>
|
|
</el-radio-group>
|
|
|
</el-form-item>
|
|
</el-form-item>
|
|
|
<el-form-item label="支付方式" prop="paymentMethod" v-if="paymentForm.method === 'Online'">
|
|
<el-form-item label="支付方式" prop="paymentMethod" v-if="paymentForm.method === 'Online'">
|
|
@@ -936,6 +942,7 @@ import {
|
|
|
addTouristInfo,
|
|
addTouristInfo,
|
|
|
updateTouristInfo,
|
|
updateTouristInfo,
|
|
|
deleteTouristInfo,
|
|
deleteTouristInfo,
|
|
|
|
|
+ offlinePayOrder,
|
|
|
} from '@/api/order';
|
|
} from '@/api/order';
|
|
|
import { getPayParams } from '@/api/pay';
|
|
import { getPayParams } from '@/api/pay';
|
|
|
import { delFile, fetchFileList } from '@/api/basic';
|
|
import { delFile, fetchFileList } from '@/api/basic';
|
|
@@ -1054,6 +1061,9 @@ export default {
|
|
|
dayNumber: [
|
|
dayNumber: [
|
|
|
{ required: true, message: '请输入天数', trigger: 'blur' }
|
|
{ required: true, message: '请输入天数', trigger: 'blur' }
|
|
|
],
|
|
],
|
|
|
|
|
+ touristCount: [
|
|
|
|
|
+ { required: true, message: '请输入人数', trigger: 'blur' }
|
|
|
|
|
+ ],
|
|
|
scheduleDate: [
|
|
scheduleDate: [
|
|
|
{ required: true, message: '请选择日期', trigger: 'change' }
|
|
{ required: true, message: '请选择日期', trigger: 'change' }
|
|
|
],
|
|
],
|
|
@@ -1316,7 +1326,7 @@ export default {
|
|
|
this.$message.error('请至少添加一个领队');
|
|
this.$message.error('请至少添加一个领队');
|
|
|
return;
|
|
return;
|
|
|
}
|
|
}
|
|
|
- this.formData.touristCount = this.formData.tourists.length;
|
|
|
|
|
|
|
+ // this.formData.touristCount = this.formData.tourists.length;
|
|
|
const opt = this.isAdd ? createOrder : updateOrder;
|
|
const opt = this.isAdd ? createOrder : updateOrder;
|
|
|
if (this.currentOrderNo) {
|
|
if (this.currentOrderNo) {
|
|
|
this.formData.orderNo = this.currentOrderNo;
|
|
this.formData.orderNo = this.currentOrderNo;
|
|
@@ -1341,8 +1351,6 @@ export default {
|
|
|
});
|
|
});
|
|
|
},
|
|
},
|
|
|
async payment(row) {
|
|
async payment(row) {
|
|
|
- const res = await getPayParams(row.id);
|
|
|
|
|
- console.log('---pay params---', res);
|
|
|
|
|
this.paymentForm.id = row.id;
|
|
this.paymentForm.id = row.id;
|
|
|
this.paymentForm.orderNo = row.orderNo;
|
|
this.paymentForm.orderNo = row.orderNo;
|
|
|
this.paymentForm.amount = row.totalAmount;
|
|
this.paymentForm.amount = row.totalAmount;
|
|
@@ -1358,7 +1366,15 @@ export default {
|
|
|
orderNo: '',
|
|
orderNo: '',
|
|
|
};
|
|
};
|
|
|
},
|
|
},
|
|
|
- submitPayment() {
|
|
|
|
|
|
|
+ async submitPayment() {
|
|
|
|
|
+ const { id, method } = this.paymentForm;
|
|
|
|
|
+ const res = await getPayParams(id, method);
|
|
|
|
|
+
|
|
|
|
|
+ if (res.code !== 200 || !res.data?.canPay) {
|
|
|
|
|
+ this.$message.error(res.content || '获取支付参数失败');
|
|
|
|
|
+ return;
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
if (this.paymentForm.method === 'Online') {
|
|
if (this.paymentForm.method === 'Online') {
|
|
|
// 在线支付,生成二维码
|
|
// 在线支付,生成二维码
|
|
|
this.onlinePaymentDialogVisible = true;
|
|
this.onlinePaymentDialogVisible = true;
|
|
@@ -1366,7 +1382,7 @@ export default {
|
|
|
this.generateWeChatQRCode();
|
|
this.generateWeChatQRCode();
|
|
|
});
|
|
});
|
|
|
} else {
|
|
} else {
|
|
|
- // TODO
|
|
|
|
|
|
|
+ await offlinePayOrder(id);
|
|
|
this.$message.success('付款成功');
|
|
this.$message.success('付款成功');
|
|
|
this.paymentDialogVisible = false;
|
|
this.paymentDialogVisible = false;
|
|
|
this.getOrderList();
|
|
this.getOrderList();
|