Merge branch 'dev' of licailing/zhirongip into master

src/main/vue/src/plugins/http.js

@@ -5,8 +5,8 @@ import qs from 'qs';
 let baseUrl = 'http://localhost:8080';
 switch (process.env.NODE_ENV) {
     case 'development':
-        baseUrl = 'http://localhost:8080';
-        // baseUrl = 'http://zhirongip.izouma.com';
+        // baseUrl = 'http://localhost:8080';
+        baseUrl = 'http://zhirongip.izouma.com';
         // baseUrl = 'http://192.168.50.127:8080';
         break;
     case 'test':

src/main/zhi-rong-web/src/components/MapContainer.vue

@@ -18,8 +18,8 @@ export default {
     data() {
         return {
             center: {
-                lng: 118.880955,
-                lat: 32.022434
+                lng: 118.884188,
+                lat: 32.01995
             }
         };
     }

src/main/zhi-rong-web/src/components/popup/TechProductDemandAdd.vue

@@ -62,7 +62,7 @@
             <el-form-item prop="patentType" label="专利类型" v-if="formData.isPatented">
                 <el-select v-model="formData.patentType" clearable filterable placeholder="请选择" style="width: 200px">
                     <el-option
-                        v-for="item in patentTypeOptions"
+                        v-for="item in patentTypeOptionss"
                         :key="item.value"
                         :label="item.label"
                         :value="item.value"
@@ -131,7 +131,6 @@ import {
 } from '../../utils/variables';
 import { mapState } from 'vuex';
 export default {
-    // components: { RichText },
     name: 'TechProductDemandEdit',
     data() {
         return {
@@ -141,10 +140,13 @@ export default {
             formData: {
                 isPatented: false
             },
-
             industryOptions: [],
             stageOptions,
-            patentTypeOptions,
+            patentTypeOptionss: [
+                { label: '发明', value: 'INVENTION' },
+                { label: '实用新型', value: 'UTILITY_MODEL' },
+                { label: '外观设计', value: 'APPEARANCE_DESIGN' }
+            ],
             tradingMethodOptionsDemands,
             tradingMethodOptionsDemand
         };

src/main/zhi-rong-web/src/plugins/http.js

@@ -4,9 +4,9 @@ import qs from 'qs';
 let baseUrl = 'http://localhost:8080';
 switch (process.env.NODE_ENV) {
     case 'development':
-        // baseUrl = 'http://zhirongip.izouma.com';
+        baseUrl = 'http://zhirongip.izouma.com';
         // baseUrl = 'http://192.168.50.190:8080';
-        baseUrl = 'http://localhost:8080';
+        // baseUrl = 'http://localhost:8080';
         // baseUrl = 'http://192.168.50.190:8080';
         break;
     case 'test':

src/main/zhi-rong-web/src/views/Home.vue

@@ -187,7 +187,7 @@
                         <swiper-slide v-for="item in partners" :key="item.id">
                             <a
                                 class="link-img"
-                                :href="item.path || 'http://zhirongip.izouma.com/web'"
+                                :href="item.url || 'http://zhirongip.izouma.com/web'"
                                 target="_blank"
                                 rel="noopener noreferrer"
                             >

src/main/zhi-rong-web/src/views/detail/TechnologyProductDemand.vue

@@ -17,7 +17,7 @@
                     <div class="info-item">
                         <span class="text1">{{ `是否专利${info.tpType === 'TECHNOLOGY' ? '技术' : '产品'}` }}：</span>
                         <span class="text2" v-if="info.isPatented">{{
-                            getLabelName(info.patentType, patentTypeOptions)
+                            getLabelName(info.patentType, patentTypeOptionss)
                         }}</span>
                         <span class="text2" v-else>否</span>
                     </div>
@@ -84,7 +84,7 @@
 import BreadPage from '../../components/page/BreadPage.vue';
 import comEvent from '../../mixins/comEvent';
 import {
-    patentTypeOptions,
+    // patentTypeOptions,
     tradingMethodOptionsDemand,
     tradingMethodOptionsDemands,
     stageOptions,
@@ -94,7 +94,11 @@ export default {
     data() {
         return {
             info: {},
-            patentTypeOptions,
+            patentTypeOptionss: [
+                { label: '发明', value: 'INVENTION' },
+                { label: '实用新型', value: 'UTILITY_MODEL' },
+                { label: '外观设计', value: 'APPEARANCE_DESIGN' }
+            ],
             stageOptions,
             tradingMethodOptionsDemand,
             tradingMethodOptionsDemands,

src/main/zhi-rong-web/src/views/user/publish/TechProductDemandEdit.vue

@@ -71,7 +71,7 @@
                         style="width: 200px"
                     >
                         <el-option
-                            v-for="item in patentTypeOptions"
+                            v-for="item in patentTypeOptionss"
                             :key="item.value"
                             :label="item.label"
                             :value="item.value"
@@ -136,7 +136,6 @@
 <script>
 import {
     stageOptions,
-    patentTypeOptions,
     tradingMethodOptionsDemand,
     tradingMethodOptionsDemands,
     phonePattern
@@ -144,7 +143,6 @@ import {
 import { mapState } from 'vuex';
 export default {
     created() {
-        // console.log(this.userInfo);
         if (this.$route.query.id) {
             this.$http
                 .get('techProductDemand/get/' + this.$route.query.id)
@@ -190,7 +188,11 @@ export default {
             },
             industryOptions: [],
             stageOptions,
-            patentTypeOptions,
+            patentTypeOptionss: [
+                { label: '发明', value: 'INVENTION' },
+                { label: '实用新型', value: 'UTILITY_MODEL' },
+                { label: '外观设计', value: 'APPEARANCE_DESIGN' }
+            ],
             tradingMethodOptionsDemand,
             tradingMethodOptionsDemands
         };