Merge branch '1xinfeng-fix' of www.gitinn.com:proginn/proginn-frontend into dev

components/header.vue

@@ -349,7 +349,7 @@ export default {
       location.href = this.baseUrl + url;
     },
     clickInputEnter() {
-      window.location.href = this.kaifainUrl + "/?keyword=" + this.keywork;
+      window.location.href = this.baseUrl + "/kaifain/?keyword=" + this.keywork;
     },
     async getMessageCount() {
       let res = await this.$axios.$get(

components/kaifain/dealSeoFooter.js

@@ -70,10 +70,10 @@ export default class DealSeoData {
       footer.link[ 0 ].name = "热门城市技术解决方案"
       footer.link[ 1 ].name = `${cityName}技术解决方案`
       footer.link[ 0 ].data = typeList.city.map((item) => {
-        return { name: `${item.name}技术解决方案`, url: `${kaifainUrl}/${item.slug}/` }
+        return { name: `${item.name}技术解决方案`, url: `/kaifain/${item.slug}/` }
       })
       footer.link[ 1 ].data = typeList.industry.map((item) => {
-        return { name: `${cityName}${item.name}技术解决方案`, url: `${kaifainUrl}/${city}/${item.slug}/` }
+        return { name: `${cityName}${item.name}技术解决方案`, url: `/kaifain/${city}/${item.slug}/` }
       })
     } else if (!city && industry && !techType) {
       //只有行业的
@@ -81,60 +81,60 @@ export default class DealSeoData {
       
       footer.link[ 1 ].name = `热门城市${industryName}技术解决方案`
       footer.link[ 0 ].data = typeList.industry.map((item) => {
-        return { name: `${item.name}技术解决方案`, url: `${kaifainUrl}/${item.slug}/` }
+        return { name: `${item.name}技术解决方案`, url: `/kaifain/${item.slug}/` }
       })
       footer.link[ 1 ].data = typeList.city.map((item) => {
-        return { name: `${item.name}${industryName}技术解决方案`, url: `${kaifainUrl}/${item.slug}/${industry}/` }
+        return { name: `${item.name}${industryName}技术解决方案`, url: `/kaifain/${item.slug}/${industry}/` }
       })
     } else if (!city && !industry && techType) {
       //只有技术分类
       footer.link[ 0 ].name = `其他行业领域${techTypeName}技术解决方案`
       footer.link[ 1 ].name = `热门城市${techTypeName}技术解决方案`
       footer.link[ 0 ].data = typeList.industry.map((item) => {
-        return { name: `${item.name}${techTypeName}技术解决方案`, url: `${kaifainUrl}/${item.slug}/${techType}/` }
+        return { name: `${item.name}${techTypeName}技术解决方案`, url: `/kaifain/${item.slug}/${techType}/` }
       })
       footer.link[ 1 ].data = typeList.city.map((item) => {
-        return { name: `${item.name}${techTypeName}技术解决方案`, url: `${kaifainUrl}/${techType}/${item.slug}/` }
+        return { name: `${item.name}${techTypeName}技术解决方案`, url: `/kaifain/${techType}/${item.slug}/` }
       })
     } else if (city && industry && !techType) {
       //${cityName}${industryName}
       footer.link[ 0 ].name = `热门城市技术解决方案`
       footer.link[ 1 ].name = `其他行业领域技术解决方案`
       footer.link[ 0 ].data = typeList.city.map((item) => {
-        return { name: `${item.name}技术解决方案`, url: `${kaifainUrl}/${item.slug}/` }
+        return { name: `${item.name}技术解决方案`, url: `/kaifain/${item.slug}/` }
       })
       footer.link[ 1 ].data = typeList.industry.map((item) => {
-        return { name: `${item.name}技术解决方案`, url: `${kaifainUrl}/${item.slug}/` }
+        return { name: `${item.name}技术解决方案`, url: `/kaifain/${item.slug}/` }
       })
     } else if (city && !industry && techType) {
       //${cityName}${techTypeName}
       footer.link[ 0 ].name = `热门城市技术解决方案`
       footer.link[ 1 ].name = `其他行业领域技术解决方案`
       footer.link[ 0 ].data = typeList.city.map((item) => {
-        return { name: `${item.name}技术解决方案`, url: `${kaifainUrl}/${item.slug}/` }
+        return { name: `${item.name}技术解决方案`, url: `/kaifain/${item.slug}/` }
       })
       footer.link[ 1 ].data = typeList.industry.map((item) => {
-        return { name: `${item.name}技术解决方案`, url: `${kaifainUrl}/${item.slug}/` }
+        return { name: `${item.name}技术解决方案`, url: `/kaifain/${item.slug}/` }
       })
     } else if (!city && industry && techType) {
       //${industryName}${techTypeName}
       footer.link[ 0 ].name = `其他行业领域技术解决方案`
       footer.link[ 1 ].name = `其他行业技术分类${industryName}技术解决方案`
       footer.link[ 0 ].data = typeList.industry.map((item) => {
-        return { name: `${item.name}技术解决方案`, url: `${kaifainUrl}/${item.slug}/` }
+        return { name: `${item.name}技术解决方案`, url: `/kaifain/${item.slug}/` }
       })
       footer.link[ 1 ].data = typeList.techType.map((item) => {
-        return { name: `${industryName}${item.name}技术解决方案`, url: `${kaifainUrl}/${industry}/${item.slug}/` }
+        return { name: `${industryName}${item.name}技术解决方案`, url: `/kaifain/${industry}/${item.slug}/` }
       })
     } else {
       //非特定的url
       footer.link[ 0 ].name = "热门城市技术解决方案"
       footer.link[ 1 ].name = "行业领域技术解决方案"
       footer.link[ 0 ].data = typeList.city.map((item) => {
-        return { name: `${item.name}技术解决方案`, url: `${kaifainUrl}/${item.slug}/` }
+        return { name: `${item.name}技术解决方案`, url: `/kaifain/${item.slug}/` }
       })
       footer.link[ 1 ].data = typeList.industry.map((item) => {
-        return { name: `${item.name}技术解决方案`, url: `${kaifainUrl}/${item.slug}/` }
+        return { name: `${item.name}技术解决方案`, url: `/kaifain/${item.slug}/` }
       })
     }
     return footer

pages/kaifain/add/index.vue

@@ -257,7 +257,6 @@
           file: '', //https://www.baidu.com，用户上传的PDF，格式必须为PDF，URL
         },
         fileList: [],
-        kaifainUrl: ""
       }
     },
     async asyncData({ ...params}) {
@@ -290,10 +289,6 @@
         return status === 1
       }
     },
-    created() {
-      const {kaifainUrl, jishuBaseUrl} = this.$store.state.domainConfig;
-      this.kaifainUrl = kaifainUrl
-    },
     async mounted() {
       this.needLogin();
       let query = new URLSearchParams(location.search)
@@ -608,7 +603,7 @@
       preview() {
         try {
           localStorage.setItem('kaifainPreviewData', JSON.stringify(this.data))
-          window.open(`${this.kaifainUrl}/preview`, '_black')
+          window.open(`/kaifain/preview`, '_black')
         } catch (e) {
           console.log('')
         }
@@ -617,7 +612,7 @@
       previewCase() {
         try {
           localStorage.setItem('kaifainPreviewCaseData', JSON.stringify(this.dataItem))
-          window.open(`${this.kaifainUrl}/previewCase`, '_black')
+          window.open(`/kaifain/previewCase`, '_black')
         } catch (e) {
           console.log('')
         }
@@ -626,7 +621,7 @@
         window.open(item.file, '__black')
       },
       jumpToOther() {
-        let url = "https://kaifain.proginn.com/s/10"
+        let url = "https://kaifain.proginn.com/kaifain/s/10"
         window.open(url, '__black')
       }
     },

pages/kaifain/detail/_tid/index.vue

@@ -68,7 +68,7 @@
           <nuxt-link class="cell"
             v-for="item in detail.successful_case"
             :key="item.id"
-            :to="`${kaifainUrl}/d/${item.hash_id}`"
+            :to="`/kaifain/case/${item.hash_id}`"
             target="_blank"
             :title="item.name"
           >
@@ -206,14 +206,11 @@
         tid: 0,
         isShowToast: false,
         isShowToastChange: false, //是否展示更换image
-        jishuBaseUrl: "",
-        kaifainUrl: ""
+        jishuBaseUrl: ""
       }
     },
     created() {
-      const {kaifainUrl, jishuBaseUrl} = this.$store.state.domainConfig;
-      this.kaifainUrl = kaifainUrl
-      this.jishuBaseUrl = jishuBaseUrl
+      this.jishuBaseUrl = this.$store.state.domainConfig.jishuinUrl;
     },
     mounted() {
       if (!this.detail || !this.detail.id) {

pages/kaifain/index.vue

@@ -41,7 +41,7 @@
             <nuxt-link class="cell"
               v-for="item in dataList"
               :key="item.id"
-              :to="`${kaifainUrl}/s/${item.hash_id}`"
+              :to="`/kaifain/s/${item.hash_id}`"
               target="_blank"
               :title="item.name"
             >
@@ -87,7 +87,7 @@
           <div v-else>
             <div class="list">
               <nuxt-link v-for="(item,index) in new Array(Math.ceil(page.total / page.size))"
-                :to="`${kaifainUrl}/s/?page=${index+1}`"
+                :to="`/kaifain/s/?page=${index+1}`"
                 :key="(page)+index"
               >
                 {{index+1}}
@@ -119,7 +119,7 @@
           <nuxt-link class="cell"
             v-for="item in dataList"
             :key="item.id"
-            :to="`${kaifainUrl}/s/${item.hash_id}`"
+            :to="`/kaifain/s/${item.hash_id}`"
             target="_blank"
           >
             <div class="bodyCont">
@@ -208,7 +208,6 @@
     },
     data() {
       return {
-        kaifainUrl: "",
         expansion: {
           city: 0,
           industry: 0,
@@ -223,8 +222,7 @@
       }
     },
     created() {
-      const {kaifainUrl} = this.$store.state.domainConfig;
-      this.kaifainUrl = kaifainUrl
+      // this.firstLoading = true
     },
     mounted() {
       if (this.mobile) {
@@ -246,10 +244,11 @@
       },
       changeIndexSeo(key, item) {
         console.log("key:", key, "item:", item, "selected:", this.selected)
+
         this.selected[ key ] = item.id
         this.selected[key + 'Slug'] = item.slug
         let {citySlug, industrySlug, techTypeSlug} = this.selected
-        let url =  this.kaifainUrl + "/"
+        let url = "/kaifain/"
         if (citySlug) {
           url += citySlug + '/'
         }

pages/kaifain/preview.vue

@@ -55,7 +55,7 @@
           <nuxt-link class="cell"
             v-for="item in detail.successful_case"
             :key="item.id"
-            :to="`${kaifainUrl}/d/${item.hash_id}`"
+            :to="`/kaifain/d/${item.hash_id}`"
             target="_blank"
             :title="item.name"
           >
@@ -130,15 +130,12 @@
         detail: {},
         tid: 0,
         isShowToast: false,
-        jishuBaseUrl: "",
-        kaifainUrl: ""
+        jishuBaseUrl: ""
       };
     },
 
     created() {
-      const {kaifainUrl, jishuBaseUrl} = this.$store.state.domainConfig;
-      this.kaifainUrl = kaifainUrl
-      this.jishuBaseUrl = jishuBaseUrl
+      this.jishuBaseUrl = this.$store.state.domainConfig.jishuinUrl;
     },
     created() {
       this.tid = this.$route.params.tid || 0;

pages/otherpage/companyComplete/index.vue

@@ -112,8 +112,7 @@
             })
             const {step} = this.dataInfo
             if (step === 2) {
-              const {kaifainUrl} = this.$store.state.domainConfig;
-              location.href = kaifainUrl + "/add"
+              location.href = "/kaifain/add"
             } else if (step === 1) {
 
             }
@@ -164,8 +163,7 @@
               // if (this.$deviceType.app) {
               //   history.back()
               // } else {
-              const {kaifainUrl} = this.$store.state.domainConfig;
-              location.href = kaifainUrl + '/add'
+                location.href = '/kaifain/add'
               // }
             }, 1000)
           } else {

pages/otherpage/kaifain/myKaifain.vue

@@ -276,9 +276,8 @@
         location.href = url
       },
       jumpToDetail(item) {
-        const {id, hash_id} = item
-        const {kaifainUrl} = this.$store.state.domainConfig;
-        location.href = kaifainUrl + '/s/' + hash_id
+        const {id} = item
+        location.href = '/kaifain/s/' + id + '.html'
       },
       showDetail(index) {
         const { is_vip, vip_type_id } = this.$store.state.userinfo || {}

pages/otherpage/kaifain/viewHistory.vue

@@ -167,8 +167,7 @@
       },
       jumpToKaifain(item) {
         const {provider: {id, hash_id} = {}} = item
-        const {kaifainUrl} = this.$store.state.domainConfig;
-        location.href = kaifainUrl + `/kaifain/s/${hash_id}`
+        location.href = `/kaifain/s/${hash_id}`
       }
     }
   }

pages/user/_id/_type.vue

@@ -430,7 +430,7 @@
         if (this.mobile) {
           Toast("请前往程序员客栈,添加解决方案")
         } else {
-          window.open(this.kaifainUrl + '/add')
+          window.open(this.kaifainUrl + '/kaifain/add')
         }
       },
       async addVideo() {