From f2e01ae4126c52d2b78f73b0b93dc198cb0da541 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=94=90=E6=98=8E=E6=98=8E?= <970899069@qq.com> Date: Wed, 29 Jun 2022 18:08:50 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=BF=80=E5=8A=B1=E8=A7=86?= =?UTF-8?q?=E9=A2=91=E5=B9=BF=E5=91=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- App.vue | 9 +- gl-agent | 1 - manifest.json | 6 +- pages/life/life.vue | 44 +- uniCloud-aliyun/cloudfunctions/gl-ad/index.js | 8 + .../cloudfunctions/gl-ad/package.json | 7 + unpackage/dist/build/app-plus/app-service.js | 6 +- unpackage/dist/build/app-plus/app-view.js | 2 +- unpackage/dist/build/app-plus/manifest.json | 2 +- .../dist/dev/app-plus/app-config-service.js | 2 +- unpackage/dist/dev/app-plus/app-service.js | 8137 ++++---- unpackage/dist/dev/app-plus/app-view.js | 17266 ++++++++-------- unpackage/dist/dev/app-plus/manifest.json | 2 +- utils/ad.js | 253 + 14 files changed, 13022 insertions(+), 12723 deletions(-) delete mode 160000 gl-agent create mode 100644 uniCloud-aliyun/cloudfunctions/gl-ad/index.js create mode 100644 uniCloud-aliyun/cloudfunctions/gl-ad/package.json create mode 100644 utils/ad.js diff --git a/App.vue b/App.vue index 1e78cdc..d7200f6 100644 --- a/App.vue +++ b/App.vue @@ -11,10 +11,11 @@ }).then(res => { if (res.update) { uni.showModal({ - title: "更新提示", - content: res.note || '版本更新信息', - confirmText: "更新", - success: modalRes => { + title : "更新提示", + content : res.note || '版本更新信息', + confirmText : "更新", + showCancel : false, + success : modalRes => { if (modalRes.confirm) { if (plus.os.name == "Android") { uni.showToast({ diff --git a/gl-agent b/gl-agent deleted file mode 160000 index 2238936..0000000 --- a/gl-agent +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 223893686d3120cdae4114914548e8b60a14904f diff --git a/manifest.json b/manifest.json index c57270d..43b44cb 100644 --- a/manifest.json +++ b/manifest.json @@ -2,7 +2,7 @@ "name" : "共力生态", "appid" : "__UNI__DE7B0E6", "description" : "共力生态", - "versionName" : "1.0.30", + "versionName" : "1.0.31", "versionCode" : 100, "transformPx" : false, /* 5+App特有相关 */ @@ -81,7 +81,7 @@ "payment" : { "weixin" : { "__platform__" : [ "android" ], - "appid" : "wxcb85e48d044bc5ee", + "appid" : "wx466a4663da346e09", "UniversalLinks" : "" }, "alipay" : { @@ -90,7 +90,7 @@ }, "share" : { "weixin" : { - "appid" : "wxcb85e48d044bc5ee", + "appid" : "wx466a4663da346e09", "UniversalLinks" : "" } }, diff --git a/pages/life/life.vue b/pages/life/life.vue index 7997cba..e92c60f 100644 --- a/pages/life/life.vue +++ b/pages/life/life.vue @@ -104,6 +104,7 @@