3
0

2 Commits 05121b3e8f ... e64a86b0a3

Autor SHA1 Mensaje Fecha
  tdj e64a86b0a3 Merge branch 'dev' of http://gogs.gisvg.com/YDM/caiping into dev hace 5 meses
  tdj d297bc5f27 临时人员2 hace 5 meses

+ 52 - 4
app/mobile/view/index/detail.html

@@ -36,7 +36,7 @@
         </div>
     </div>
 </div>
-<div class="layui-tab layui-tab-brief" style="margin-top: 13vw;"  lay-filter="test-hash">
+<div class="layui-tab layui-tab-brief" style="margin-top: 11.5vw;"  lay-filter="test-hash">
 
     <ul class="layui-tab-title" style="background-color: #fff;" id="ullist">
         
@@ -69,7 +69,10 @@
         <li data-id="7">项目动态</li>
         {/if}
 
-        <li data-id="8" style="padding-right: 30px;">预约看现场</li>
+        <li data-id="8">预约看现场</li>
+
+        <li data-id="9">二维码</li>
+
     </ul>
 
     <div class="layui-tab-content">
@@ -776,12 +779,23 @@
             </div>
         </div>
 
+        <!-- 二维码 -->
+        <div class="layui-tab-item">
+            <div class="box-btn">
+                <button id="generateBtn" class="code">生成二维码</button>
+                <button id="saveBtn" style="display: none;">保存二维码</button>
+                <div class="code-img">
+                    <div id="qrcode"></div>
+                </div>
+            </div>
+        </div>
 
     </div>
 </div>
 
 <script src="{__MOBILE__}/layui-v2.8.18-rc.1/layui-v2.8.18-rc.1/layui/layui.js"></script>
 <script src="{__MOBILE__}/js/jquery-3.4.1.min.js"></script>
+<script type="text/javascript" src="https://lf9-cdn-tos.bytecdntp.com/cdn/expire-1-M/qrcodejs/1.0.0/qrcode.min.js"></script>
 <script>
     let form = layui.form;
     let tool = {
@@ -1075,8 +1089,6 @@
     })
 </script>
 
-
-
 </body>
 
 
@@ -1097,4 +1109,40 @@
     })
 </script>
 
+<!-- 生成二维码 -->
+<script>
+    document.getElementById('generateBtn').addEventListener('click', function() {
+    // 清除之前生成的二维码(如果有的话)
+    document.getElementById('qrcode').innerHTML = "";
+
+    // 获取当前网址
+    var currentUrl = window.location.href;
+
+    // 生成二维码并显示在页面上
+    var qrcode = new QRCode(document.getElementById('qrcode'), {
+        text: currentUrl,
+        width: 250, // 设置二维码的宽度
+        height: 250 // 设置二维码的高度
+    });
+
+    // 显示保存按钮
+    document.getElementById('saveBtn').style.display = 'inline';
+});
+
+    document.getElementById('saveBtn').addEventListener('click', function() {
+        // 获取生成的二维码的canvas元素
+        var canvas = document.querySelector('#qrcode canvas');
+
+        if (canvas) {
+            // 创建一个临时的下载链接
+            var link = document.createElement('a');
+            link.href = canvas.toDataURL('image/png');  // 将canvas内容转换为图片URL
+            link.download = 'qrcode.png';  // 设置下载的文件名
+            link.click();  // 自动触发下载
+        } else {
+            alert('请先生成二维码');
+        }
+    });
+</script>
+
 </html>

+ 2 - 86
app/mobile/view/temporary/detail.html

@@ -15,29 +15,8 @@
 </head>
 
 <body>
-<div class="top">
-    <a href="{:url('mobile/temporary/kan_list')}">
-        <div><img src="{__MOBILE__}/img/left.png" alt="" style="width: 5vw;"></div>
-    </a>
-    <div style="margin-left: 36vw;">看板</div>
 
-
-    <div class="dropdown">
-        <!-- <button onclick="dropdown()" class="dropbtn" style="margin-left: 28vw;background: url({__MOBILE__}/img/list.png) no-repeat;width: 5vw;"> -->
-        <button onclick="dropdown()" class="dropbtn" style="margin-left: 33vw;">
-
-
-            <img src="{__MOBILE__}/img/list.png" alt="" style="width: 5vw;pointer-events: none;">
-        </button>
-        <div id="myDropdown" class="dropdown-content" style="width: 24vw;">
-            <a href="{:url('mobile/index/main')}">首页</a>
-            <a href="{:url('mobile/index/kan_list')}">看板</a>
-            <a href="{:url('mobile/index/pending')}">待处理</a>
-            <a href="{:url('mobile/index/person')}">我的</a>
-        </div>
-    </div>
-</div>
-<div class="layui-tab layui-tab-brief" style="margin-top: 13vw;"  lay-filter="test-hash">
+<div class="layui-tab layui-tab-brief" style="margin: 0 !important;"  lay-filter="test-hash">
 
     <ul class="layui-tab-title" style="background-color: #fff;" id="ullist">
         
@@ -70,9 +49,8 @@
         <li data-id="7">项目动态</li>
         {/if}
 
-        <li data-id="8">预约看现场</li>
+        <li data-id="8" style="padding-right: 30px;">预约看现场</li>
 
-        <li data-id="9">二维码</li>
     </ul>
 
     <div class="layui-tab-content">
@@ -792,28 +770,12 @@
             </div>
         </div>
 
-        <!-- 二维码 -->
-        <div class="layui-tab-item">
-            <div class="box-btn">
-                <button id="generateBtn" class="code">生 成 二 维 码</button>
-                <div class="code-img">
-                    <div id="qrcode"></div>
-                </div>
-                
-
-                <button id="saveBtn" style="display: none;">保存二维码</button>
-                <button id="clearBtn" style="display: none;">清除二维码</button>
-            </div>
-            
-        </div>
-
 
     </div>
 </div>
 
 <script src="{__MOBILE__}/layui-v2.8.18-rc.1/layui-v2.8.18-rc.1/layui/layui.js"></script>
 <script src="{__MOBILE__}/js/jquery-3.4.1.min.js"></script>
-<script type="text/javascript" src="https://lf9-cdn-tos.bytecdntp.com/cdn/expire-1-M/qrcodejs/1.0.0/qrcode.min.js"></script>
 <script>
     let form = layui.form;
     let tool = {
@@ -1129,52 +1091,6 @@
     })
 </script>
 
-<!-- 生成二维码 -->
-<script>
-    document.getElementById('generateBtn').addEventListener('click', function() {
-    // 清除之前生成的二维码(如果有的话)
-    document.getElementById('qrcode').innerHTML = "";
-
-    // 获取当前网址
-    var currentUrl = window.location.href;
-
-    // 生成二维码并显示在页面上
-    var qrcode = new QRCode(document.getElementById('qrcode'), {
-        text: currentUrl,
-        width: 250, // 设置二维码的宽度
-        height: 250 // 设置二维码的高度
-    });
-
-    // 显示保存和清除按钮
-    document.getElementById('saveBtn').style.display = 'inline';
-    document.getElementById('clearBtn').style.display = 'inline';
-});
-
-    document.getElementById('saveBtn').addEventListener('click', function() {
-        // 获取生成的二维码的canvas元素
-        var canvas = document.querySelector('#qrcode canvas');
-
-        if (canvas) {
-            // 创建一个临时的下载链接
-            var link = document.createElement('a');
-            link.href = canvas.toDataURL('image/png');  // 将canvas内容转换为图片URL
-            link.download = 'qrcode.png';  // 设置下载的文件名
-            link.click();  // 自动触发下载
-        } else {
-            alert('请先生成二维码');
-        }
-    });
-
-    document.getElementById('clearBtn').addEventListener('click', function() {
-        // 清除二维码
-        document.getElementById('qrcode').innerHTML = "";
-
-        // 隐藏保存和清除按钮
-        document.getElementById('saveBtn').style.display = 'none';
-        document.getElementById('clearBtn').style.display = 'none';
-    });
-</script>
-
 <!-- 关注按钮 -->
 <script>
     const followBtn = document.getElementById('followBtn');

+ 38 - 1
public/static/mobile/css/detail.css

@@ -635,4 +635,41 @@ body {
 
 .annex-title{
     margin-left: 3vw;
-}
+}
+
+/* 生成二维码 */
+.box-btn{
+    width: 100%;
+    /* text-align: center; */
+    padding: 15px 0;
+  }
+  
+  .code{
+    width: 45vw;
+    height: 10vw;
+    background-color: #409eff;
+    border-radius: 5px;
+    border: #409eff;
+    color: #fff;
+    margin-left: 4.5vw;
+  }
+  
+  .code-img{
+    width: 100%;
+    text-align: center;
+    padding: 15px 0;
+  }
+  
+  #qrcode img{
+    margin: 0 auto;
+  }
+  
+  #saveBtn{
+    width: 45vw;
+    height: 10vw;
+    text-align: center;
+    background-color: #67c23a;
+    border-radius: 5px;
+    border: #67c23a;
+    color: #fff;
+  }

+ 0 - 45
public/static/mobile/css/temporary_detail.css

@@ -1,48 +1,3 @@
-.box-btn{
-  width: 100%;
-  text-align: center;
-  padding: 15px 0;
-}
-
-.code{
-  width: 90vw;
-  height: 10vw;
-  text-align: center;
-  background-color: #409eff;
-  border-radius: 5px;
-  border: #409eff;
-  color: #fff;
-}
-
-.code-img{
-  width: 100%;
-  text-align: center;
-  padding: 15px 0;
-}
-
-#qrcode img{
-  margin: 0 auto;
-}
-
-#saveBtn{
-  width: 45vw;
-  height: 10vw;
-  text-align: center;
-  background-color: #67c23a;
-  border-radius: 5px;
-  border: #67c23a;
-  color: #fff;
-}
-
-#clearBtn{
-  width: 45vw;
-  height: 10vw;
-  text-align: center;
-  background-color: #e6a23c;
-  border-radius: 5px;
-  border: #e6a23c;
-  color: #fff;
-}
 
 #followBtn {
   padding: 10px 16px;