ross旧链接地址重定向，机构详情地址拼接修改

middleware/auth.js

@@ -2,7 +2,7 @@ import modeMap from '~/configs/mode-map'
 import axios from 'axios'
 const whiteList = ['/auth']
 
-export default function ({ route, error }) {
+export default function ({ route, error, redirect }) {
   if (whiteList.indexOf(route.path) > -1) return
 
   const authUserId = parseInt(route.params.template)
@@ -10,17 +10,26 @@ export default function ({ route, error }) {
   let routePrefix = !auth ? `/${authUserId}/app` : `/${authUserId}/${auth.mode}`
 
   const baseURL = process.env.BASE_URL + '/wx/auth/shop/info'
-  console.log(authUserId)
+  console.log(auth && auth.mode, authUserId)
+
   return axios
     .get(baseURL, {
       params: { authUserId: authUserId },
     })
     .then(({ data }) => {
-      if (data.code === -1 || route.path.indexOf(routePrefix) !== 0) {
+      if (data.code === -1) {
         error({
           statusCode: 404,
           message: '页面不存在',
         })
+      } else if (authUserId === 12 && auth.mode === 'ross' && route.path.indexOf(`${authUserId}/app`) > -1) {
+        // console.log(route.fullPath.replace(`${authUserId}/app`, `${authUserId}/ross`))
+        redirect(route.fullPath.replace(`${authUserId}/app`, `${authUserId}/ross`))
+      } else if (route.path.indexOf(routePrefix) !== 0) {
+        error({
+          statusCode: 404,
+          message: '页面不存在',
+        }) 
       }
     })
     .catch(() => {

pages/_template/app/approve/club/detail.vue

@@ -61,7 +61,7 @@ export default {
   layout: 'app',
   filters: {
     formatEmpty(val) {
-      return val || '未知'
+      return val || '暂无'
     },
     formatSnCode(code) {
       if (!code) return ''
@@ -77,12 +77,10 @@ export default {
   computed: {
     ...mapGetters(['routePrefix']),
     address() {
-      return (
-        (this.clubInfo.area &&
-          this.clubInfo.area + this.clubInfo.address &&
-          this.clubInfo.address) ||
-        '未知'
-      )
+      let resultAddress = this.clubInfo.area
+        ? this.clubInfo.area + this.clubInfo.address
+        : this.clubInfo.address
+      return resultAddress || '暂无'
     },
     isEmpty() {
       return this.clubInfo.productList

pages/_template/app/approve/club/index.vue

@@ -49,7 +49,7 @@
               <img class="cover" :src="item.logo || drawLogo(item.clubName)" />
               <div class="info">
                 <div class="name" v-text="item.clubName"></div>
-                <div class="mobile">{{ item.mobile || '未知' }}</div>
+                <div class="mobile">{{ item.mobile || '暂无' }}</div>
                 <div class="address">
                   {{ formatAddress(item.area, item.address) }}
                 </div>
@@ -231,7 +231,7 @@ export default {
       if (typeof a2 === 'string') {
         resutl += a2
       }
-      return resutl || '未知'
+      return resutl || '暂无'
     },
     // 加载更多
     onLoadMore() {

pages/_template/ldm/approve/club/detail.vue

@@ -50,7 +50,7 @@ export default {
   layout: 'app-ldm',
   filters: {
     formatEmpty(val) {
-      return val || '未知'
+      return val || '暂无'
     },
   },
   data() {
@@ -62,7 +62,7 @@ export default {
   computed: {
     ...mapGetters(['routePrefix']),
     address() {
-      return this.clubInfo.area + this.clubInfo.address || '未知'
+      return this.clubInfo.area + this.clubInfo.address || '暂无'
     },
     isEmpty() {
       return this.clubInfo.productList

pages/_template/ldm/approve/club/index.vue

@@ -42,7 +42,7 @@
             <div class="info">
               <div class="name" v-text="item.clubName"></div>
               <div class="line"></div>
-              <div class="mobile">{{ item.mobile || '未知' }}</div>
+              <div class="mobile">{{ item.mobile || '暂无' }}</div>
               <div class="address">
                 {{ formatAddress(item.area, item.address) }}
               </div>
@@ -220,7 +220,7 @@ export default {
       if (typeof a2 === 'string') {
         resutl += a2
       }
-      return resutl || '未知'
+      return resutl || '暂无'
     },
     // 加载更多
     onLoadMore() {

pages/_template/ross/approve/club/detail.vue

@@ -61,7 +61,7 @@ export default {
   layout: 'app-ross',
   filters: {
     formatEmpty(val) {
-      return val || '未知'
+      return val || '暂无'
     },
     formatSnCode(code) {
       if (!code) return ''
@@ -77,12 +77,8 @@ export default {
   computed: {
     ...mapGetters(['routePrefix']),
     address() {
-      return (
-        (this.clubInfo.area &&
-          this.clubInfo.area + this.clubInfo.address &&
-          this.clubInfo.address) ||
-        '未知'
-      )
+      let resultAddress = this.clubInfo.area ? this.clubInfo.area + this.clubInfo.address : this.clubInfo.address
+      return resultAddress || '暂无'
     },
     isEmpty() {
       return this.clubInfo.productList

pages/_template/ross/index.vue

@@ -60,7 +60,7 @@
               <img class="cover" :src="item.logo || drawLogo(item.clubName)" />
               <div class="info">
                 <div class="name" v-text="item.clubName"></div>
-                <div class="mobile">{{ item.mobile || '未知' }}</div>
+                <div class="mobile">{{ item.mobile || '暂无' }}</div>
                 <div class="address">
                   {{ formatAddress(item.area, item.address) }}
                 </div>
@@ -233,7 +233,7 @@ export default {
       if (typeof a2 === 'string') {
         resutl += a2
       }
-      return resutl || '未知'
+      return resutl || '暂无'
     },
     // 加载更多
     onLoadMore() {