Merge branch 'master' into production

src/components/FactoryDetailPage.vue

@@ -48,22 +48,20 @@
       </v-card-text>
 
       <v-slide-group :show-arrows="images > 0 ? 'desktop' : false" ref="slideGroup">
-        <v-slide-item v-for="(image, index) in images" class="mr-4" :key="image.id" :class="{ 'ml-4': index === 0 }">
-          <img :src="image.url" class="factory-slide-image" />
-        </v-slide-item>
         <v-slide-item>
           <div class='update-image-button d-flex flex-column justify-center align-items-center' @click="pageTransition.startUpdateFactoryImages">
             <v-icon color="white" class='mb-1'>mdi-camera-plus</v-icon>
             補充照片
           </div>
         </v-slide-item>
+        <v-slide-item v-for="(image, index) in images" class="mr-4" :key="image.id" :class="{ 'ml-4': index === 0 }">
+          <img :src="image.url" class="factory-slide-image" />
+        </v-slide-item>
       </v-slide-group>
 
       <div class="mt-4 mx-3 mb-2">
-        <!--
         <h3 class="mb-1">地段 / 地址</h3>
-        <p class="mb-5">台中市大雅區自強段（701）7 地號</p>
-        -->
+        <p class="mb-5" style="line-height: 1.3;">{{ factoryAddressAndLandcode }}</p>
 
         <div v-if="full || $vuetify.breakpoint.mdAndUp" class="mb-5">
           <h3 class="mb-1">經緯度</h3>
@@ -174,11 +172,23 @@ export default createComponent({
     const factoryType = computed(() => {
       if (appState.factoryData) {
         return getFactoryTypeText(appState.factoryData)
+      } else {
+        return null
       }
     })
 
     const factoryName = computed(() => {
-      return appState.factoryData?.name
+      return appState.factoryData?.name || ''
+    })
+
+    const factoryAddressAndLandcode = computed(() => {
+      if (appState.factoryData) {
+        const { townname, sectname, sectcode, landcode } = appState.factoryData
+        // 白鷺段（1005）817地號
+        return `${townname} ${sectname} (${sectcode}) ${landcode}地號`
+      } else {
+        return ''
+      }
     })
 
     const full = computed(() => appState.factoryDetailsExpanded)
@@ -273,6 +283,7 @@ export default createComponent({
       factoryId,
       factoryType,
       factoryName,
+      factoryAddressAndLandcode,
       pastDescriptions,
       longitude,
       latitude,

src/types.ts

@@ -104,6 +104,9 @@ export type FactoryData = {
   lng: number,
   name: string,
   landcode: string,
+  townname: string,
+  sectname: string,
+  sectcode: string,
   type: FactoryType,
   images: FactoryImage[],
   // TODO: can be one of https://docs.djangoproject.com/en/2.2/ref/settings/#datetime-input-formats