购物说明，签证

src/pages/detailsNew.vue

@@ -590,7 +590,55 @@
               'q-px-md': $q.screen.width < 1220 && $q.platform.is.mobile,
             }"
           >
-            購買須知
+            購買說明
+          </div>
+          <div
+            class="q-mt-lg trip-text q-pa-md rounded-borders q-mb-xl"
+            style="border: 1px dashed var(--q-color-warning)"
+            :class="{
+              'q-mx-md': $q.screen.width < 1220 && $q.platform.is.mobile,
+            }"
+          >
+            <div v-html="
+            dataList.feature.shopRemark
+              ? dataList.feature.shopRemark
+              : '暫無購買說明'
+          "></div>
+          <div class="q-mb-lg text-weight-bold fz18">购物安排</div>
+          <q-table :data="dataList.shopList" :columns="columns"
+            bordered
+            class="my-sticky-header-table no-shadow"
+            :hide-bottom="true">
+            <template v-slot:header>
+              <q-tr class="bg-orange-1">
+                <q-th v-for="(item, i) in columns" :key="i" class="text-left">
+                  <span class="fz14 text-weight-bold">{{ item.label }}</span>
+                </q-th>
+              </q-tr>
+            </template>
+            <template v-slot:body="props">
+              <q-tr :props="props">
+                <q-td key="cityName" :props="props">
+                  <span>{{ props.row.cityName }}</span>
+                </q-td>
+                <q-td key="shopName" :props="props">
+                  <span>{{ props.row.shopName }}</span>
+                </q-td>
+                <q-td key="visitTime" :props="props">
+                  <span>{{ props.row.visitTime }}</span>
+                </q-td>
+            </q-tr>
+            </template>
+          </q-table>
+        </div>
+          <div
+            class="text-h5 text-weight-bold text-left q-mt-xl"
+            ref="order"
+            :class="{
+              'q-px-md': $q.screen.width < 1220 && $q.platform.is.mobile,
+            }"
+          >
+          訂單須知
           </div>
           <div
             class="q-mt-lg trip-text bg-orange-1 q-pa-md rounded-borders q-mb-xl"
@@ -598,12 +646,35 @@
             v-html="
               dataList.feature.importantTip
                 ? dataList.feature.importantTip
-                : '暂无购买须知'
+                : '暫無訂單須知'
             "
             :class="{
               'q-mx-md': $q.screen.width < 1220 && $q.platform.is.mobile,
             }"
           ></div>
+          <div
+            class="text-h5 text-weight-bold text-left q-mt-xl"
+            ref="visa"
+            :class="{
+              'q-px-md': $q.screen.width < 1220 && $q.platform.is.mobile,
+            }"
+          >
+          簽證
+          </div>
+          <div
+            class="q-mt-lg trip-text q-pa-md rounded-borders q-mb-xl"
+            style="border: 1px dashed var(--q-color-warning)"
+            :class="{
+              'q-mx-md': $q.screen.width < 1220 && $q.platform.is.mobile,
+            }"
+          >
+            <div class="text-weight-bold fz18 q-mb-md">簽字須知</div>
+            <div v-html="
+            dataList.feature.visaRemark
+              ? dataList.feature.visaRemark
+              : '暫無簽字須知'
+          "></div>
+        </div>
           <div
             class="text-h5 text-weight-bold text-left q-mt-xl"
             ref="tips"
@@ -624,7 +695,8 @@
             :class="{
               'q-mx-md': $q.screen.width < 1220 && $q.platform.is.mobile,
             }"
-          ></div>
+          >
+        </div>
           <!-- <div
             class="text-h5 text-weight-bold text-left q-mt-xl"
             ref="cancelTips"
@@ -723,6 +795,25 @@ export default {
   props: [],
   data() {
     return {
+      columns: [{
+            name: "cityName",
+            required: true,
+            label: "城市",
+            align: "left",
+          },
+          {
+            name: "shopName",
+            required: true,
+            label: "購物店名稱",
+            align: "left",
+          },
+          {
+            name: "visitTime",
+            required: true,
+            label: "預計停留時間",
+            align: "left",
+          },
+      ],
       tab: "",
       searchDate: "",
       clickDate: "",
@@ -801,7 +892,19 @@ export default {
           val: "warning",
           top: 0,
           isActive: false,
-          display: "購買須知",
+          display: "購買說明",
+        },
+        {
+          val: "order",
+          top: 0,
+          isActive: false,
+          display: "訂單須知",
+        },
+        {
+          val: "visa",
+          top: 0,
+          isActive: false,
+          display: "簽證",
         },
         {
           val: "tips",
@@ -1093,6 +1196,7 @@ export default {
         (r) => {
           try {
             if (r.data.resultCode == 1 && r.data.data.id>0) {
+              console.log(r.data.data,'shopRemark----------')
               this.tripImages = []
               this.detailsImageList = []
               let header = r.data.data.feature.headerImage
@@ -1119,7 +1223,6 @@ export default {
                   this.detailsImageList.push(obj)
                 })
               }
-              console.log(r.data.data.feature.detailsImageList,'=---')
               // tripImageList detailsImageList headerImage footerImage
               // this.getTripFeatureImageHandler(r.data.data.id)
               this.dataList = r.data.data;