3
0

2 Commits 29820d638e ... 767cf7ce1e

Autor SHA1 Mensaje Fecha
  tdj 767cf7ce1e Merge branch 'dev' of http://gogs.gisvg.com/YDM/caiping into dev hace 5 meses
  tdj a22b68883f 新新新 hace 5 meses

+ 12 - 2
app/admin/view/project/cost_company/edit.html

@@ -104,8 +104,12 @@
 
         <li data-load="" data-id="8">预约看现场</li>
 
+        <li data-load="" data-id="5">
+            共享项目
+        </li>
+
         {if $project_five.project_log == 1}
-        <li data-load="" data-id="5">项目动态</li>
+        <li data-load="" data-id="9">项目动态</li>
         {/if}
 
 
@@ -151,6 +155,10 @@
             {include file="/project/cost_company/edit_appointment" /}
         </div>
 
+        <div class="layui-tab-item">
+            {include file="/project/cost_company/project_qrcode" /}
+        </div>
+
         {if $project_five.project_log == 1}
         <div class="layui-tab-item">
             {include file="/project/projectlog/index" /}
@@ -206,7 +214,9 @@
                 contact()
             } else if (index == 8) {
                 appointment();
-            } 
+            } else if (index == 9) {
+               
+			}
             
         });
 

+ 44 - 39
app/mobile/view/index/detail.html

@@ -71,7 +71,7 @@
 
         <li data-id="8">预约看现场</li>
 
-        <li data-id="9">项目分享</li>
+        <li data-id="9">共享项目</li>
 
     </ul>
 
@@ -1105,38 +1105,38 @@
     $('#filesBox2').on('click', '.file-del', function () {
         layer.msg("不可删除")
     })
-    const WECHAT_APPID = 'wx60064e1cac4296e6';
-    const WECHAT_SECRET = 'bce94d361402cc535559a9bbdb908de8';
-    let access_token;
-    $(document).ready(function() {
-        var urlParams = new URLSearchParams(window.location.search);
-        var code = urlParams.get('code');
-
-        if (!code) {
-            // 没有code,重定向到微信授权页面获取code
-            var WECHAT_APPID = 'your_appid'; // 替换为你的APPID
-            var REDIRECT_URI = encodeURIComponent(window.location.href);
-            var authUrl = 'https://open.weixin.qq.com/connect/oauth2/authorize?appid=' + WECHAT_APPID +
-                '&redirect_uri=' + REDIRECT_URI +
-                '&response_type=code&scope=snsapi_base&state=STATE#wechat_redirect';
-            window.location.href = authUrl;
-        } else {
-            // 使用code换取access_token和openid
-            $.ajax({
-                url: '/wechat/callback',
-                method: 'GET',
-                data: { code: code },
-                success: function(response) {
-                    alert(response);
-                    // 这里可以根据返回的响应进一步处理页面显示
-                },
-                error: function(xhr, status, error) {
-                    console.error('Error: ', error);
-                    alert('An error occurred while processing your request.');
-                }
-            });
-        }
-    });
+    // const WECHAT_APPID = 'wx60064e1cac4296e6';
+    // const WECHAT_SECRET = 'bce94d361402cc535559a9bbdb908de8';
+    // let access_token;
+    // $(document).ready(function() {
+    //     var urlParams = new URLSearchParams(window.location.search);
+    //     var code = urlParams.get('code');
+
+    //     if (!code) {
+    //         // 没有code,重定向到微信授权页面获取code
+    //         var WECHAT_APPID = 'your_appid'; // 替换为你的APPID
+    //         var REDIRECT_URI = encodeURIComponent(window.location.href);
+    //         var authUrl = 'https://open.weixin.qq.com/connect/oauth2/authorize?appid=' + WECHAT_APPID +
+    //             '&redirect_uri=' + REDIRECT_URI +
+    //             '&response_type=code&scope=snsapi_base&state=STATE#wechat_redirect';
+    //         window.location.href = authUrl;
+    //     } else {
+    //         // 使用code换取access_token和openid
+    //         $.ajax({
+    //             url: '/wechat/callback',
+    //             method: 'GET',
+    //             data: { code: code },
+    //             success: function(response) {
+    //                 alert(response);
+    //                 // 这里可以根据返回的响应进一步处理页面显示
+    //             },
+    //             error: function(xhr, status, error) {
+    //                 console.error('Error: ', error);
+    //                 alert('An error occurred while processing your request.');
+    //             }
+    //         });
+    //     }
+    // });
 
 </script>
 
@@ -1164,15 +1164,20 @@
 });
 
     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();  // 自动触发下载
+            var img = document.createElement('img');
+            img.src = canvas.toDataURL('image/png');
+            img.alt = '二维码';
+            
+            var downloadTip = document.createElement('div');
+            downloadTip.innerText = '长按图片保存';
+            
+            var qrContainer = document.querySelector('.code-img');
+            qrContainer.innerHTML = '';  // 清空现有内容
+            qrContainer.appendChild(img);  // 插入图片
+            qrContainer.appendChild(downloadTip);  // 添加保存提示
         } else {
             alert('请先生成二维码');
         }

+ 2 - 2
app/mobile/view/index/kan_list.html

@@ -64,7 +64,7 @@
                             </span>
 
                         <span style="display: flex;align-items: center;font-size: 3.5vw;color: #187FDD;">
-                                <span style="width:14vw;"><b>查看详情</b></span>
+                                <span style="width:16vw;"><b>查看详情</b></span>
                                 <span><img src="{__MOBILE__}/img/right.png" alt=""
                                            style="width: 4vw;height: 3.5vw;"></span>
                                 <span class="dot-img1">{if $vo.red}<img src="{__MOBILE__}/img/dot.png" alt=""
@@ -75,7 +75,7 @@
                     <div class="kan-bottom">
                         <div class="item-flex">
                                 <span
-                                        style="color: #187FDD;background-color: rgb(218, 235, 252);width:50vw;padding: 0.5vw 1vw;font-size: 3.7vw;
+                                        style="color: #187FDD;background-color: rgb(218, 235, 252);width:51vw;font-size: 3.6vw;
                                 line-height: 2.7vh;border-radius: 1.5vw;padding: 0.5vw 0;text-align: center;"><b>{$vo.project_start_time|date="Y-m-d"}&nbsp;至&nbsp;{$vo.project_end_time|date="Y-m-d"}</b></span>
                             <span style="display:flex;justify-content: space-around;">
                                     <span style="padding-right: 2vw;">

+ 2 - 2
app/mobile/view/temporary/kan_list.html

@@ -64,7 +64,7 @@
                             </span>
 
                         <span style="display: flex;align-items: center;font-size: 3.5vw;color: #187FDD;">
-                                <span style="width:14vw;"><b>查看详情</b></span>
+                                <span style="width:16vw;"><b>查看详情</b></span>
                                 <span><img src="{__MOBILE__}/img/right.png" alt=""
                                            style="width: 4vw;height: 3.5vw;"></span>
 
@@ -74,7 +74,7 @@
                     <div class="kan-bottom">
                         <div class="item-flex">
                                 <span
-                                        style="color: #187FDD;background-color: rgb(218, 235, 252);width:50vw;padding: 0.5vw 1vw;font-size: 3.7vw;
+                                        style="color: #187FDD;background-color: rgb(218, 235, 252);width:51vw;font-size: 3.6vw;
                                 line-height: 2.7vh;border-radius: 1.5vw;padding: 0.5vw 0;text-align: center;"><b>{$vo.project_start_time|date="Y-m-d"}&nbsp;至&nbsp;{$vo.project_end_time|date="Y-m-d"}</b></span>
                             <span style="display:flex;justify-content: space-around;">
                                     <span style="padding-right: 2vw;">