页面修改

src/components/group/travel-list.vue

@@ -102,7 +102,6 @@
                 </q-item>
                 <q-item>
                   <q-item-section>
-
                     <q-btn type="a" @click="getUrl(props.row.LinkUrl)" target="_blank"
                       :label="props.row.Seat>0||props.row.Substitute?'我有興趣':'無法預訂'"
                       :color="props.row.Seat>0||props.row.Substitute?'indigo':'grey'" rounded unelevated

src/components/trip/style2.vue

@@ -104,7 +104,7 @@
         <ul class="tour-detail-list">
           <li>行程編號：
             <template v-if="dataList.currentPriceInfo&&dataList.currentPriceInfo.tcnum">
-              {{dataList.currentPriceInfo.tcnum}}
+              {{dataList.currentPriceInfo.tcnum.toUpperCase()}}
             </template></li>
           <li>旅遊地點：{{dataList.countryName}}</li>
           <li>旅遊天數：{{dataList.dayNum}}天</li>
@@ -114,7 +114,7 @@
             </template>
           </li>
           <li style="margin-top:30px;">
-            <q-btn style="width:115px;" type="a" label="立即预定" color="primary" @click="buyNow()" />
+            <q-btn v-if="dataList.currentPriceInfo&&dataList.currentPriceInfo.tcnum" style="width:115px;" type="a" label="立即预定" color="primary" @click="buyNow()" />
           </li>
         </ul>
       </div>

src/pages/Index.vue

@@ -24,7 +24,8 @@
         <paragraph v-if="item.Id=='white_label_other'&&item.plugData.Type==4" :plugData="item.plugData"></paragraph>
         <photo v-if="item.Id=='white_label_other'&&item.plugData.Type==5" :plugData="item.plugData"></photo>
         <!--待完善-->
-        <diyForm v-if="item.Id=='white_label_other'&&item.plugData.Type==6" :plugData="item.plugData" :TCID="0"> </diyForm>
+        <diyForm v-if="item.Id=='white_label_other'&&item.plugData.Type==6" :plugData="item.plugData" :TCID="0">
+        </diyForm>
 
         <!--自訂版型(背景圖)white_label_background_article-->
         <bgArticleLeft v-if="item.Id=='white_label_background_article'&&item.plugData.Type==1"
@@ -244,21 +245,23 @@
     },
     methods: {
       getHomeData() {
-        if (this.RB_Group_Id > 0) {
-          this.apipost(
-            "ws_get_GetHomePage", {
-              RB_Group_Id: this.RB_Group_Id
-            },
-            res => {
-              if (res.data.resultCode == 1) {
-                if (res.data.data) {
-                  this.HomeData = res.data.data;
-                }
+        let locationName = window.location.hostname;
+        var msg = {
+          RB_Group_Id: this.RB_Group_Id,
+          B2BDomain: locationName
+        };
+        this.apipost(
+          "ws_get_GetHomePage", msg,
+          res => {
+            if (res.data.resultCode == 1) {
+              if (res.data.data) {
+                this.HomeData = res.data.data;
               }
-            },
-            err => {}
-          );
-        }
+            }
+          },
+          err => {}
+        );
+
       }
     },
   };

src/router/index.js

@@ -5,6 +5,11 @@ import routes from './routes'
 
 Vue.use(VueRouter)
 
+const routerPush = VueRouter.prototype.push
+VueRouter.prototype.push = function push(location) {
+  return routerPush.call(this, location).catch(error=> error)
+}
+ 
 /*
  * If not building with SSR mode, you can
  * directly export the Router instantiation;