Merge remote-tracking branch 'origin/developerA' into developerA

src/main/resources/config/dev/application-dev.yml

@@ -4,14 +4,14 @@ spring:
   #数据源连接--start
   datasource:
     #本地连接数据库
-    url: jdbc:mysql://192.168.2.100:3306/caimei?characterEncoding=UTF8&serverTimezone=Asia/Shanghai
-    username: developer
-    password: 05bZ/OxTB:X+yd%1
-    #测试连接数据库
-    #url: jdbc:mysql://120.79.25.27:3306/caimei?characterEncoding=UTF8&serverTimezone=Asia/Shanghai
+    #url: jdbc:mysql://192.168.2.100:3306/caimei?characterEncoding=UTF8&serverTimezone=Asia/Shanghai
     #username: developer
-    #password: J5p3tgOVazNl4ydf
-    #type: com.zaxxer.hikari.HikariDataSource
+    #password: 05bZ/OxTB:X+yd%1
+    #测试连接数据库
+    url: jdbc:mysql://120.79.25.27:3306/caimei?characterEncoding=UTF8&serverTimezone=Asia/Shanghai
+    username: developer
+    password: J5p3tgOVazNl4ydf
+    type: com.zaxxer.hikari.HikariDataSource
     hikari:
       minimum-idle: 5
       maximum-pool-size: 15
@@ -54,8 +54,8 @@ logging:
 caimei:
   siteEnv: 0 #网站环境，（2：正式环境，1：测试环境，0：开发环境）
   #spiServer: http://192.168.2.68:8008
-  #coreServer: https://core-b.caimei365.com
-  coreServer: http://192.168.2.68:18002
+  coreServer: https://core-b.caimei365.com
+  #coreServer: http://192.168.2.68:18002
   #coreServer: http://192.168.2.75:18002
   imageDomain: https://img-b.caimei365.com
   wwwDomain: http://localhost:8009

src/main/resources/static/css/base/base.pc.css

@@ -7,7 +7,7 @@ header{box-shadow: 0 2px 10px #ebecef;}
 .h5Only{display:none!important;}
 /*微信二维码样式*/
 iframe{width:320px !important;height: 280px !important}
-#globalHead.fiexd{width: 100%;height: auto;position: fixed;top: 0;left: 0;z-index: 999;}
+#globalHead.fiexd{width: 100%;height: auto;position: fixed;top: 0;left: 0;z-index: 99999;}
 .impowerBox{width:320px !important;}
 .impowerBox .qrcode {width: 200px !important;}
 .impowerBox .title {display: none;}

src/main/resources/static/js/supplier-center/encyclopedia/instrument-edit.js

@@ -198,7 +198,7 @@ const app = new Vue({
                     return;
                 }
                 this.emptyNum = this.validateEmptyParams(this.formData)
-                if( this.emptyNum> 0){
+                if( this.emptyNum> 0 && this.formData.status === 1){
                     this.$confirm('您还剩余' + this.emptyNum + '项未完善，将会导致用户对您产品/仪器的认识度不够，确认是否提交？', '提示', {
                         confirmButtonText: '是',
                         cancelButtonText: '否'

src/main/resources/static/js/supplier-center/encyclopedia/product-edit.js

@@ -194,7 +194,7 @@ const app = new Vue({
                     return
                 }
                 this.emptyNum = this.validateEmptyParams(this.formData)
-                if( this.emptyNum> 0){
+                if( this.emptyNum> 0 && this.formData.status === 1){
                     this.$confirm('您还剩余' + this.emptyNum + '项未完善，将会导致用户对您产品/仪器的认识度不够，确认是否提交？', '提示', {
                         confirmButtonText: '是',
                         cancelButtonText: '否'