From 742d8a4459dca04ad395046612885f46e0cf4643 Mon Sep 17 00:00:00 2001
From: 13410271814 <chenjian8541@126.com>
Date: Sat, 7 Dec 2024 14:07:33 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 yunbainian/etms_wechat_mini/app.js                   | 10 +++++++++-
 yunbainian/etms_wechat_mini/pages/acdetail1/index.js |  4 ++--
 yunbainian/etms_wechat_mini/pages/acdetail2/index.js |  2 +-
 yunbainian/etms_wechat_mini/pages/acdetail3/index.js |  2 +-
 yunbainian/etms_wechat_mini/pages/acdetail4/index.js |  2 +-
 5 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/yunbainian/etms_wechat_mini/app.js b/yunbainian/etms_wechat_mini/app.js
index 080d3e6..30ff8dd 100644
--- a/yunbainian/etms_wechat_mini/app.js
+++ b/yunbainian/etms_wechat_mini/app.js
@@ -4,6 +4,11 @@ const {
 
 App({
   onLaunch(opts, data) {
+    if (opts && opts.scene === 1154) {
+      this.globalData.singlePage = true;
+    } else {
+      this.globalData.singlePage = false;
+    }
     this.etmsLogin("onLaunch");
   },
   onShow() {
@@ -23,6 +28,9 @@ App({
 
   },
   async login() {
+    if (this.globalData.singlePage) {
+      return;
+    }
     return new Promise((resolve, reject) => {
       wx.login({
         success: (res) => {
@@ -65,6 +73,6 @@ App({
     microWebHomeUrl: "https://baidu.com",
     currentActivityBag: {},
     currentActivityBag2: {},
-
+    singlePage: false
   },
 });
\ No newline at end of file
diff --git a/yunbainian/etms_wechat_mini/pages/acdetail1/index.js b/yunbainian/etms_wechat_mini/pages/acdetail1/index.js
index d135e91..4cce224 100644
--- a/yunbainian/etms_wechat_mini/pages/acdetail1/index.js
+++ b/yunbainian/etms_wechat_mini/pages/acdetail1/index.js
@@ -195,7 +195,7 @@ Page({
 
     wx.showShareMenu({
       withShareTicket: true,
-      menus: ['shareAppMessage']
+      menus: ['shareAppMessage', 'shareTimeline']
     })
   },
 
@@ -207,7 +207,7 @@ Page({
     this.setData({
       isLoadFinish: true
     })
-    if (!app.globalData.s) {
+    if (!app.globalData.s && !app.globalData.singlePage) {
       setTimeout(() => {
         this.setData({
           isLoadFinish: false
diff --git a/yunbainian/etms_wechat_mini/pages/acdetail2/index.js b/yunbainian/etms_wechat_mini/pages/acdetail2/index.js
index a9d1731..0efdead 100644
--- a/yunbainian/etms_wechat_mini/pages/acdetail2/index.js
+++ b/yunbainian/etms_wechat_mini/pages/acdetail2/index.js
@@ -227,7 +227,7 @@ Page({
     this.setData({
       isLoadFinish: true
     })
-    if (!app.globalData.s) {
+    if (!app.globalData.s&& !app.globalData.singlePage) {
       setTimeout(() => {
         this.setData({
           isLoadFinish: false
diff --git a/yunbainian/etms_wechat_mini/pages/acdetail3/index.js b/yunbainian/etms_wechat_mini/pages/acdetail3/index.js
index 061e78d..cf6f2e0 100644
--- a/yunbainian/etms_wechat_mini/pages/acdetail3/index.js
+++ b/yunbainian/etms_wechat_mini/pages/acdetail3/index.js
@@ -136,7 +136,7 @@ Page({
     this.setData({
       isLoadFinish: true
     })
-    if (!app.globalData.s) {
+    if (!app.globalData.s&& !app.globalData.singlePage) {
       setTimeout(() => {
         this.setData({
           isLoadFinish: false
diff --git a/yunbainian/etms_wechat_mini/pages/acdetail4/index.js b/yunbainian/etms_wechat_mini/pages/acdetail4/index.js
index 7270277..4b997a0 100644
--- a/yunbainian/etms_wechat_mini/pages/acdetail4/index.js
+++ b/yunbainian/etms_wechat_mini/pages/acdetail4/index.js
@@ -228,7 +228,7 @@ Page({
     this.setData({
       isLoadFinish: true
     })
-    if (!app.globalData.s) {
+    if (!app.globalData.s&& !app.globalData.singlePage) {
       setTimeout(() => {
         this.setData({
           isLoadFinish: false