Browse Source

Merge branch 'Dev' of http://www.origtek.com:2999/nelson.kai/ShowEasyFrontEnd into Dev

# Conflicts:
#	FrontEnd/pages/service/_id.vue
Dev
parent
commit
2ceb06cc48
  1. 27
      FrontEnd/pages/service/_id.vue

27
FrontEnd/pages/service/_id.vue

@ -32,13 +32,15 @@
</div>
<div class="tw-w-full tw-bg-neutrals-100 tw-px-[20px] tw-py-[30px] md:tw-p-[30px] tw-rounded-[20px]">
<div class="">
<div class="group tw-mb-[40px] tw-px-[20px] tw-py-[30px] tw-rounded-[20px] tw-bg-white">
<!-- 輸入攤位數量 -->
<div v-if="serviceID" class="group tw-mb-[40px] tw-px-[20px] tw-py-[30px] tw-rounded-[20px] tw-bg-white">
<h3 class="t14 tw-font-bold tw-mb-[30px] md:t16 tw-block">
輸入攤位數量
</h3>
<selectExhibitionBooth @booth-select="getBoothSelect"></selectExhibitionBooth>
</div>
<div class="group tw-mb-[40px] tw-px-[20px] tw-py-[30px] tw-rounded-[20px] tw-bg-white">
<!-- 選擇展覽 -->
<div v-else class="group tw-mb-[40px] tw-px-[20px] tw-py-[30px] tw-rounded-[20px] tw-bg-white">
<h3 class="t14 tw-font-bold tw-mb-[30px] md:t16 tw-block">
{{ $t("Select Exhibition") }}
</h3>
@ -440,9 +442,15 @@ export default {
countdown: 15,
rulesShow: false,
boothSelect: 0,
serviceID: false,
};
},
async created() {
if(this.$route.params.id == "1c6e0001-e2dd-46b5-a617-4dac2f34894f"){
this.serviceID = true;
}else{
this.serviceID = false;
}
this.isLoading = true;
let arr = [];
for(let i=1;i<11;i++){
@ -811,7 +819,6 @@ export default {
//
getBoothSelect(value){
this.boothSelect = value;
console.log("攤位數:" + this.boothSelect);
},
//
async getInfoItem() {
@ -959,10 +966,6 @@ export default {
},
//()
ChangeCosts(data){
console.log("展館服務數量:" + data.value.quantity);
console.log(data)
let totalPrice = 0;
this.totalPrice = 0;
this.rulesShow = false;
@ -1018,16 +1021,6 @@ export default {
//
console.log('expenseRules', this.expenseRules);
console.log('data1', data1);
console.log('data2', data2);
// if(this.expenseRules.ItemType == "01"){
// }
let price = 0;
let tmpWeight = 0;//Number(data1.weight)/1000;
// xx/6000

Loading…
Cancel
Save