diff --git a/src/components/ec_api/MapiLockBuySelector.vue b/src/components/ec_api/MapiLockBuySelector.vue
index ac3f550..0ba5925 100644
--- a/src/components/ec_api/MapiLockBuySelector.vue
+++ b/src/components/ec_api/MapiLockBuySelector.vue
@@ -19,6 +19,8 @@ const ticketQuanValue = ref('0.00')
const goodsQuanCheck = ref(false)
const goodsQuanNum = ref('0')
const goodsQuanValue = ref('0.00')
+const goodsQuanType = ref('兑换券')
+const goodsQuanTypeOptions = ref([{value: '兑换券', label: '兑换券'},{value: '抵值兑换券', label: '抵值兑换券'}, {value: '代金券', label: '代金券'}])
const containTicket = ["ticket", "all"]
const containGoods = ["goods", "all"]
@@ -58,22 +60,23 @@ watch(() => goodsQuanCheck.value, () => {
})
// 检查检查定价方式的变化
-watch(() => [selectPriceType.value, ticketPrice.value, ticketPrice.value, ticketQuanCheck.value, ticketQuanNum.value, ticketQuanValue.value, goodsQuanCheck.value, goodsQuanNum.value, goodsQuanValue.value], () => {
+watch(() => [selectPriceType.value, haveServiceFee.value, ticketPrice.value, ticketQuanCheck.value, ticketQuanNum.value, ticketQuanValue.value, goodsQuanCheck.value, goodsQuanNum.value, goodsQuanValue.value, goodsQuanType.value], () => {
emits("getPriceType", {
select_price_type: selectPriceType.value,
ticket_info: {
ticket_price: ticketPrice.value,
have_service_fee: haveServiceFee.value,
},
- ticketQuanCheck: ticketQuanCheck.value,
+ ticket_quan_check: ticketQuanCheck.value,
ticket_quan: {
ticket_quan_num: ticketQuanNum.value,
ticket_quan_value: ticketQuanValue.value,
},
- goodsQuanCheck: goodsQuanCheck.value,
+ goods_quan_check: goodsQuanCheck.value,
goods_quan: {
goods_quan_num: goodsQuanNum.value,
goods_quan_value: goodsQuanValue.value,
+ goods_quan_type: goodsQuanType.value,
}
})
})
@@ -103,7 +106,7 @@ watch(() => [selectPriceType.value, ticketPrice.value, ticketPrice.value, ticket
三方定价
-
+
单张影票结算价：
@@ -125,14 +128,28 @@ watch(() => [selectPriceType.value, ticketPrice.value, ticketPrice.value, ticket
-
+
卖品券：
- 张，抵值
+ 张，价值
元
+ 券类型
+
+
+
使用卖品券
diff --git a/src/components/ec_api/TabArea.vue b/src/components/ec_api/TabArea.vue
index fabeb39..2209a99 100644
--- a/src/components/ec_api/TabArea.vue
+++ b/src/components/ec_api/TabArea.vue
@@ -57,6 +57,26 @@ const saleType = ref('ticket')
// 售卖接口中的支付类型
const payType = ref('cash')
+// 会员售卖接口中的价格类型
+const priceType = ref({
+ select_price_type: "cinema_price",
+ ticket_info: {
+ ticket_price: "20",
+ have_service_fee: true,
+ },
+ ticket_quan_check: false,
+ ticket_quan: {
+ ticket_quan_num: 0,
+ ticket_quan_value: "0.00",
+ },
+ goods_quan_check: false,
+ goods_quan: {
+ goods_quan_num: 0,
+ goods_quan_value: "0.00",
+ goods_quan_type: "兑换券",
+ }
+})
+
// 表格逻辑
// 多选改变后处理逻辑
function handleParamsChange(newCheckedResult) {
@@ -271,6 +291,11 @@ async function get_suggest(options = {sale_type: saleType.value, pay_type: payTy
const env = UserApiData.value.base_info['env']
const cid = UserApiData.value.base_info['cinema']
const pid = UserApiData.value.base_info['channel']
+ if (api_type === 'member') {
+ options['pay_type'] = JSON.stringify(priceType.value)
+ console.log('options.pay_type', options.pay_type)
+ console.log('priceType.value', priceType.value)
+ }
await ec_api_get_suggest(api_type, api, env, cid, pid, options).then(
(res) => {
@@ -334,8 +359,11 @@ function check_params(checked, unchecked) {
// 获取售卖类型并自动勾选字段
function get_sale_type(sale_type) {
- console.log('sale_type', sale_type)
saleType.value = sale_type
+ if (UserApiData.value.api[activeTab.value].path === "order/buy-goods")
+ saleType.value = 'goods'
+ console.log('sale_type', sale_type)
+
if (UserApiData.value.api[activeTab.value].path === "seat/check-coupon") {
switch (saleType.value) {
case 'ticket':
@@ -362,6 +390,13 @@ function get_sale_type(sale_type) {
break;
}
}
+ if (UserApiData.value.api[activeTab.value].path === "order/buy-goods") {
+ switch (saleType.value) {
+ case 'goods':
+ check_params(["goods"], ["play_id", "play_update_time", "seat", "lock_flag"]);
+ break;
+ }
+ }
get_timestamp()
get_suggest()
markIsChecked()
@@ -423,9 +458,18 @@ function get_pay_type(pay_type) {
markIsChecked()
}
+function setup_sale_type() {
+ console.log('UserApiData.value.api[activeTab.value].path', UserApiData.value.api[activeTab.value].path)
+ console.log('saleType.value', saleType.value)
+ if (UserApiData.value.api[activeTab.value].path === "order/buy-goods")
+ console.log('UserApiData.value.api[activeTab.value].path === "order/buy-goods"')
+ saleType.value = 'goods'
+}
+
function get_sale_type_member(sale_type) {
- console.log('sale_type', sale_type)
saleType.value = sale_type
+ console.log('sale_type', sale_type)
+
if (UserApiData.value.api[activeTab.value].path === "seat/lock-buy") {
switch (saleType.value) {
case 'ticket':
@@ -439,6 +483,13 @@ function get_sale_type_member(sale_type) {
break;
}
}
+ if (UserApiData.value.api[activeTab.value].path === "order/buy-goods") {
+ switch (saleType.value) {
+ case 'goods':
+ check_params(["goods", "goods_card_balance_pay", "goods_cash"], ["play_id", "play_update_time", "seat", "lock_flag"]);
+ break;
+ }
+ }
get_timestamp()
get_suggest()
markIsChecked()
@@ -446,7 +497,19 @@ function get_sale_type_member(sale_type) {
function get_price_type_member(price_type) {
console.log('price_type', price_type)
- payType.value = price_type
+ priceType.value = price_type
+ console.log('get_price_type_member', price_type.value)
+ if (payType.value["select_price_type"] === "cinema_price") {
+ check_params(["is_cinema_price", "t3d_pay_amount"], ["is_split_service_fee", "seat_coupons"]);
+ } else {
+ check_params(["is_cinema_price", "t3d_pay_amount", "is_split_service_fee"], []);
+ }
+ if (payType.value["ticket_quan_check"] === true) {
+ check_params(["seat_coupons"], []);
+ } else {
+ check_params([], ["seat_coupons"]);
+ }
+
get_timestamp()
get_suggest()
markIsChecked()
@@ -584,6 +647,7 @@ watch(() => store.state.ecApiModule.ec_api_data.api, (oldValue, newValue) => {
// 监测activeTab， 如果切换标签页，则执行自动勾选的函数
watch(activeTab, () => {
console.log('watch.activeTab')
+ setup_sale_type()
markIsChecked()
get_timestamp()
get_suggest()
@@ -667,6 +731,9 @@ const ace_options = {
+