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

# Conflicts:
#	FrontEnd/pages/service/_id.vue

FrontEnd/pages/service/_id.vue

@@ -145,7 +145,7 @@
           <h2 class="title-icon-left t16 tw-mb-[20px] md:t20 xl:tw-font-bold">
             {{ $t("Service Description") }}
           </h2>
-          <div v-for="(item,index) in expenseRules" :key="index">
+          <div v-for="(item,index) in expenseRules" :key="index" style="border: 1px solid red;">
             <h3 class="t16 tw-mb-[20px] md:18 xl:t18 xl:tw-font-bold tw-pl-[10px]">
               {{ index+1 }}.&nbsp;{{ item.ItemName }}
             </h3>
@@ -771,6 +771,9 @@ export default {
         .then((response) => {
           if(response && response.data && response.data.DATA && response.data.DATA.rel){
             let data = response.data.DATA.rel
+
+            console.log(data)
+
             if(data){
               this.content.name = data.ServiceName;
               this.content.highlights = data.Features;
@@ -1016,7 +1019,7 @@ export default {
     stackerCostRules(data1,data2){
 
       //這邊這邊是這個
-      console.log(this.expenseRules);
+      console.log('expenseRules', this.expenseRules);
 
       let price = 0;
       let tmpWeight = 0;//Number(data1.weight)/1000;
@@ -1056,7 +1059,7 @@ export default {
         for(let i=0;i<this.expenseRules.length;i++){
           let subArr = this.expenseRules[i].StackerCostRules;
 
-          console.log(subArr)
+          console.log('subArr', subArr)
 
           if(this.expenseRules[i].Guid == data2.package_id && subArr.length>0){
             for(let j=0;j<subArr.length;j++){
@@ -1140,6 +1143,11 @@ export default {
       return price;
     },
     OtherCostRules(data1,data2){
+
+      console.log('OtherCostRules data1: ',data1)
+      console.log('OtherCostRules data2: ',data2)
+
+
       let price = 0;
       let tmpValue = 0;
       if(data1.length =="" && data1.width=="" && data1.height==""){