Преглед изворни кода

Merge branch 'dev4.6.3' of http://192.168.3.207:8080/qmx/jy into dev4.6.3

zhangyuhan пре 3 година
родитељ
комит
b32d2aa9ea

+ 0 - 6
src/jfw/modules/app/src/web/templates/weixin/search/mainSearch.html

@@ -658,12 +658,6 @@
 
   getNewEntNiche()
 </script>
-<script src="https://cdn.bootcss.com/vConsole/3.3.4/vconsole.min.js"></script>
-<script>
-// 初始化
-var vConsole = new VConsole();
-console.log('Hello world');
-</script>
 <script>
     /*********************处理安卓3.0.3版本更新问题 start*******************************/
    if(!mySysIsIos() && (localStorage.checkUpdate==undefined || Date.parse(new Date())/1000-parseInt(localStorage.checkUpdate)>604800) && compareVersion(JyObj.getVersion(),"3.0.4")) {

+ 3 - 0
src/jfw/modules/app/src/web/templates/weixin/wxinfocontent.html

@@ -1182,6 +1182,9 @@ console.log('Hello world');
                 $('.entnicheUser').show()
                 getActionState ({{.T.obj.buyer}}, 'g')
                 getActionState ({{.T.obj.buyer}}, 'r')
+              } else {
+                $('.commonUser').show()
+                $('.entnicheUser').hide()
               }
             }
           }

+ 1 - 1
src/web/staticres/common-module/keep-tags/keep-ent-tags-template.js

@@ -516,7 +516,7 @@ Vue.component('keep-ent-component', {
     },
     addTag () {
       this.isAddLoading = true
-      this.ajaxFn('/publicapply/bidcoll/addLabel', { name: this.tagInput }, function (r) {
+      this.ajaxFn('/entnicheNew/customer/addLabel', { name: this.tagInput }, function (r) {
         if (r && r.error_msg === '' && r.data) {
           this.addTagInList(r.data)
         } else {