app/admin/controller/Project.php

@@ -421,7 +421,7 @@ class Project extends BaseController
                 } else {
                     $rules_id['project_contact'] = 0;
                 }
-            }
+            } 
         }
 
         return $rules_id;
@@ -494,5 +494,7 @@ class Project extends BaseController
 
         return $rules_id;
     }
+
+ 
 }
 

app/admin/controller/project/Cost.php

@@ -1581,6 +1581,7 @@ class Cost extends BaseController
             ['name', '=', '项目动态-财政局'],
             ['name', '=', '项目附件-财政局'],
             ['name', '=', '联系函-财政局'],
+            
         ];
         //where0r满足任意一个name值都可以
         $list = Db::name('AdminRule')->whereOr($where)->field('id,name')->select()->toArray();
@@ -1647,7 +1648,6 @@ class Cost extends BaseController
         return view();
     }
 
-
 }
 
 

app/admin/controller/project/CostCompany.php

@@ -1746,7 +1746,6 @@ class CostCompany extends BaseController
         View::assign('detailId', $id);
         return view();
     }
-
 }
 
 

app/admin/view/project/cost/edit.html

@@ -441,12 +441,13 @@
         {/if}
         
         <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}
 
-
     </ul>
 
     <div class="layui-tab-content">
@@ -489,11 +490,16 @@
             {include file="/project/cost/edit_appointment" /}
         </div>
 
+        <div class="layui-tab-item">
+            {include file="/project/cost/project_qrcode" /}
+        </div>
+
         {if $project_five.project_log == 1}
         <div class="layui-tab-item">
             {include file="/project/projectlog/index" /}
         </div>
         {/if}
+        
 
     </div>
 
@@ -543,6 +549,8 @@
                 contact(index)
             } else if (index == 8) {
                 appointment();
+            } else if (index == 9) {
+                
             }
         });
         //清除小红点

app/admin/view/project/cost/read.html

@@ -423,15 +423,16 @@
             
             <li data-load="" data-id="8">预约看现场</li>
             
-            {if $project_five.project_log == 1}
+            
             <li data-load="" data-id="5">
-                项目动态
+                共享项目
             </li>
-            {/if}
-
-            <li data-load="" data-id="9">共享项目</li>
+            
 
-        </ul>
+            {if $project_five.project_log == 1}
+            <li data-load="" data-id="9">项目动态</li>
+            {/if}
+         </ul>
 
         <div class="layui-tab-content" style="padding: 16px;">
             <div class="layui-tab-item layui-show">
@@ -469,18 +470,21 @@
             {/if}
             
              <div class="layui-tab-item">
-                {include file="/project/cost/ " /}
+                {include file="/project/cost/project_appointment" /}
             </div>
             
-            {if $project_five.project_log == 1}
+            
             <div class="layui-tab-item">
-                {include file="/project/projectlog/index" /}
+                {include file="/project/cost/project_qrcode" /}
             </div>
-            {/if}
-
+            
+            
+            {if $project_five.project_log == 1}
             <div class="layui-tab-item">
                 {include file="/project/projectlog/index" /}
             </div>
+            {/if}
+            
 
         </div>
     
@@ -514,7 +518,7 @@
                 eliminate(5,$(this))
                 project_user(index)
             } else if (index == 5) {
-
+                
 
             } else if (index == 6) {
 
@@ -524,6 +528,8 @@
                 contact(index)
             } else if (index == 8) {
                 appointment();
+            } else if (index == 9) {
+               
             }
         });
         //清除小红点

app/admin/view/project/cost_company/read.html

@@ -440,9 +440,13 @@
 			{/if}
 			
 			<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 data-load="" data-id="9">
 				项目动态
 			</li>
 			{/if}
@@ -479,17 +483,21 @@
 			</div>
 			{/if}
 
-        	{if $project_five.project_record == 1}
+      {if $project_five.project_record == 1}
 			<div class="layui-tab-item">
 				{include file="/project/cost_company/project_record" /}
 			</div>
 			{/if}
 			
 			<div class="layui-tab-item">
-            {include file="/project/cost_company/project_appointment" /}
-            </div>
+				{include file="/project/cost_company/project_appointment" /}
+			</div>
+
+			<div class="layui-tab-item">
+				{include file="/project/cost/project_qrcode" /}
+			</div>
 
-        	{if $project_five.project_log == 1}
+      {if $project_five.project_log == 1}
 			<div class="layui-tab-item">
 				{include file="/project/projectlog/index" /}
 			</div>
@@ -532,8 +540,10 @@
 				eliminate(6,$(this))
 				contact(index)
 			}else if (index == 8) {
-                appointment();
-            } 
+					appointment();
+			} else if (index == 9) {
+               
+			}
 
 
 		});

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>
 
@@ -1178,60 +1178,6 @@
         }
     });
 
-    //扫描二维码后验证
-    // 使用Express等框架
-    const express = require('express');
-    const axios = require('axios');
-    const app = express();
-
-    // 公众号配置
-
-
-    // 处理微信授权回调，判断用户是否关注
-    app.get('/wechat/callback', async (req, res) => {
-        const { code } = req.query;
-
-        // 获取access_token
-        try {
-            const tokenResponse = await axios.get(`https://api.weixin.qq.com/sns/oauth2/access_token?appid=${WECHAT_APPID}&secret=${WECHAT_SECRET}&code=${code}&grant_type=authorization_code`);
-            const { access_token, openid } = tokenResponse.data;
-
-            // 获取用户信息，判断是否关注公众号
-            const userResponse = await axios.get(`https://api.weixin.qq.com/cgi-bin/user/info?access_token=${access_token}&openid=${openid}&lang=zh_CN`);
-            const { subscribe } = userResponse.data;
-
-            if (subscribe === 1) {
-                // 已关注公众号，跳转到目标链接
-                res.redirect('fullUrl');
-            } else {
-                // 未关注公众号，跳转到关注页面
-                res.redirect('https://mp.weixin.qq.com/mp/profile_ext?action=home&__biz=your_biz_id#wechat_redirect');
-            }
-        } catch (error) {
-            res.send('Error occurred: ' + error.message);
-        }
-    });
-
-    // 监听端口
-    app.listen(3000, () => {
-        console.log('Server is running on port 3000');
-    });
-
-    // 引导用户进行微信OAuth授权
-    function redirectToWeChatAuth() {
-        const appId = 'wx60064e1cac4296e6';
-        const redirectUri = encodeURIComponent('https://yourdomain.com/wechat/callback');  // 你的回调地址
-        const wechatAuthUrl = `https://open.weixin.qq.com/connect/oauth2/authorize?appid=${appId}&redirect_uri=${redirectUri}&response_type=code&scope=snsapi_userinfo&state=STATE#wechat_redirect`;
-
-        // 跳转到微信的OAuth2.0授权页面
-        window.location.href = wechatAuthUrl;
-    }
-
-    // 当用户扫描二维码时，调用这个函数
-    document.getElementById('qrcode').addEventListener('click', function() {
-        redirectToWeChatAuth();
-    });
-
 </script>
 
 </html>

app/mobile/view/temporary/detail.html

@@ -19,7 +19,8 @@
     <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>看板</div>
+    <div style="width: 5vw;"></div>
 </div>
 <div class="layui-tab layui-tab-brief" style="margin-top: 11.5vw;"  lay-filter="test-hash">