Browse Source

fix: 数据导出报错

yangfeng 4 years ago
parent
commit
9ea2873df7

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

@@ -1248,8 +1248,9 @@
         return query.substring(iStart, iEnd);
     }
 
-
+    isFollow();
     function isFollow(){
+        isOpening()
         $.post("/bigmember/follow/project/check",{sid:{{.T.obj._id}}},function(fd){
             if(fd&&fd.data&&fd.data.showFollow){
                 $(".keyword.project").removeClass("hideLine")
@@ -1270,7 +1271,7 @@
                 initShowForecast()
 
             } else {
-              if (hasServiceArr.indexOf(6) > -1) {
+              if (hasServiceArr && hasServiceArr.length > 0 && hasServiceArr.indexOf(6) > -1) {
                 $('.bid-dec-in').hide()
               }
             }
@@ -2065,9 +2066,6 @@
       $(".original_name").attr("adv_name","app_article_getoriginaltext");
       {{end}}
     })
-    $(function() {
-      isFollow();
-    })
     var vKeepComponent = new Vue({
         delimiters: ['${', '}'],
         el: '#jyKeepComponent',

+ 22 - 2
src/web/templates/weixin/dataExport/dataExport_setCate.html

@@ -34,7 +34,27 @@
         <div id="set-cate" class="j-main" v-cloak>
             <div class="j-container">
                 <div class="j-header"></div>
-                <div class="j-main">
+                <div class="j-main"  ref="box">
+                  <div class="add_alert" v-show="popupShow">
+                    <div class="add_alert_main">
+                        <div class="triangle"></div>
+                        <div class="add_option">${add_option}</div>
+                        <div class="add_button">
+                            <button class="btn_cancel btn_group" @click="setCancel()">取消</button>
+                            <button class="btn_confirm btn_group" @click="setConfirm()">添加</button>
+                        </div>
+                    </div>
+                </div>
+                <div class="add_toast">
+                    <div class="add_toast_main">
+                        <div class="icon_add">
+                            <span class="icon_add_img"></span>
+                        </div>
+                        <div class="add_text">
+                            添加成功
+                        </div>
+                    </div>
+                </div>
                     <ul class="cate-list">
                         <li v-for="(item, key) in cateListMap" :key="key" class="cate-item-container">
                             <div class="index-anchor" :id="key" :data-index="key" v-if="key !== '#'">${ key }</div>
@@ -42,7 +62,7 @@
                                 <button v-for="(cate, i) in item" :key="999-i"
                                     class="j-button-item"
                                     :class="cate.selected ? 'active': ''"
-                                    @click="changeCateState(cate)">${cate.name}</button>
+                                    @click="changeCateState($event,cate)">${cate.name}</button>
                                 <span class="j-icon base-icon icon-helps" v-if="key == 'G'" @click="showGDialog"></span>
                             </div>
                         </li>