Merge branch 'master' of http://highdatas.com:9000/r/promotion/promotion_html

tom

2024-08-03 2278ff7c0401f7f97e168a0943192357c1999cbf

 module/system/page/main.html

@@ -7,27 +7,27 @@
   <meta http-equiv="Cache-control" content="no-cache">
   <meta http-equiv="Cache" content="no-cache">
   <title>终端推广平台</title>
   <link href="../css/main.css?v=2024071401" rel="stylesheet">
   <link href="../../../css/control.css?v=2024071401" rel="stylesheet">
   <link href="../../../css/page.css?v=2024071401" rel="stylesheet">
   <link href="../../../css/icon/iconfont.css?v=2024071401" rel="stylesheet">
   <link href="../css/main.css?v=2024080201" rel="stylesheet">
   <link href="../../../css/control.css?v=2024080201" rel="stylesheet">
   <link href="../../../css/page.css?v=2024080201" rel="stylesheet">
   <link href="../../../css/icon/iconfont.css?v=2024080201" rel="stylesheet">
   <link href="../../../js/vue/element-ui/lib/theme-chalk/index.css" rel="stylesheet">
   <link href="../../../img/org/head.png" rel="shortcut icon" type="image/x-icon">
   <link href="../../../css/myelement.css?v=2024071401" rel="stylesheet">
   <link href="../../../css/myelement.css?v=2024080201" rel="stylesheet">
   
   <script src="../../../js/jquery-3.5.1.min.js"></script>
   <script src="../../../js/vue/vue.js"></script>
   
   <script src="../../../js/config.js?v=2024071401"></script>
   <script src="../../../js/config.js?v=2024080201"></script>
   <script src="../../../data/data.js"></script>
   <script src="../../../js/vue/elementDefault.js"></script>
   <script src="../../../js/vue/element-ui/lib/index.js"></script>
   <script src="../../../js/Sortable.js"></script>
   <script src="../../../js/vue/page.js?v=2024071401"></script>
   <script src="../../../js/foundation.js?v=2024071401"></script>
   <script src="../../../js/control.js?v=2024071401"></script>
   <script src="../../../js/vue/page.js?v=2024080201"></script>
   <script src="../../../js/foundation.js?v=2024080201"></script>
   <script src="../../../js/control.js?v=2024080201"></script>
   <script src="../../../js/loadJsCss.js"></script>
   <script src="../../../js/myelement.js?v=2024071401"></script>
   <script src="../../../js/myelement.js?v=2024080201"></script>
   
</head>
   
@@ -50,7 +50,7 @@
         <div id="pnl_header" class="header">
            <!-- 顶部菜单的收起展开 -->
            <div v-show="cardtablist.length > 1" id="btn_toggle" class="but_toggle">
               <el-popover v-model="showTopMenu" placement="bottom-start"  trigger="hover" popper-class="h_top_menu ">
               <el-popover v-model="showTopMenu" placement="bottom-start"  trigger="click" popper-class="h_top_menu " @show="top_popup_background = true" @hide="onContentClick">
                 <template v-for="pageno in cardlist_pagesize">
                    <div v-if="cardtablist[(cardlist_pagesize * (pagenum - 1)) + (pageno - 1)]" 
                    :class="['h_card', selectCard.id == cardtablist[(cardlist_pagesize * (pagenum - 1)) + (pageno - 1)].id ? 'active_card' : '']" 
@@ -190,7 +190,7 @@
               <div class="logoText" style="overflow: hidden; line-height: 52px;" align="center">
                  <span class="close_logo">{{simplify_title}}</span>
                  <div style="height: 52px; display: flex; justify-content: center; align-items: center;background-color: #fff;">
                        <img src="../../../img/org/logo.png" style="width: 85%">
                        <img src="../../../img/org/logo.png" style="width: 75%">
                     <!-- style="height: 34px" -->
                  </div>
               </div>
@@ -847,6 +847,8 @@
               this.isshowmessage = false;
               // 主题设置
               this.isshowthemeconfig = false;
               // 桌面弹出
               this.showTopMenu = false;
               
               this.message_show = false;
               this.div_message_show = false;