From 677f4aa1ef53a6eb065d0f066019966c436e6e05 Mon Sep 17 00:00:00 2001 From: From-wh Date: Mon, 20 Feb 2023 18:21:47 +0800 Subject: [PATCH 1/6] =?UTF-8?q?fix:=20=E6=8B=BC=E5=9B=A2=E6=B5=B7=E6=8A=A5?= =?UTF-8?q?=E7=94=9F=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- template/uni-app/pages/activity/poster-poster/index.vue | 1 - 1 file changed, 1 deletion(-) diff --git a/template/uni-app/pages/activity/poster-poster/index.vue b/template/uni-app/pages/activity/poster-poster/index.vue index 4c03fbe76..16a30d9b4 100644 --- a/template/uni-app/pages/activity/poster-poster/index.vue +++ b/template/uni-app/pages/activity/poster-poster/index.vue @@ -219,7 +219,6 @@ }, //图片转符合安全域名路径 downloadFilestoreImage(url) { - url = this.setDomain(url) return new Promise((resolve, reject) => { let that = this; uni.downloadFile({ From 02e66850c72bdfc53d523a4edc5c8f08b0ba7b61 Mon Sep 17 00:00:00 2001 From: From-wh Date: Mon, 20 Feb 2023 18:22:16 +0800 Subject: [PATCH 2/6] =?UTF-8?q?improve:=20=E9=82=80=E8=AF=B7=E4=BA=8C?= =?UTF-8?q?=E7=BB=B4=E7=A0=81=E7=94=9F=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- template/uni-app/pages/users/user_spread_code/index.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/template/uni-app/pages/users/user_spread_code/index.vue b/template/uni-app/pages/users/user_spread_code/index.vue index b7011e3b8..81c9f9e38 100644 --- a/template/uni-app/pages/users/user_spread_code/index.vue +++ b/template/uni-app/pages/users/user_spread_code/index.vue @@ -220,7 +220,7 @@ // #endif // #ifdef APP-PLUS img = await this.imgToBase(res.data.spread[i].pic, res.data.qrcode) - arr2 = [img.code || this.codeSrc, img.image] + arr2 = [this.codeSrc, img.image] // #endif that.$util.userPosterCanvas(arr2, res.data.nickname, res.data.site_name, i, this.wd, this.hg, ( tempFilePath) => { @@ -247,6 +247,7 @@ this.mpUrl = res.data.url }, async imgToBase(url, code) { + console.log(url, code); let res = await imgToBase({ image: url, code: code From 7963030b9c0d6315bb73861f6b83a09a1860e6ce Mon Sep 17 00:00:00 2001 From: From-wh Date: Mon, 20 Feb 2023 18:22:45 +0800 Subject: [PATCH 3/6] =?UTF-8?q?style:=20=E5=88=86=E9=94=80=E5=8D=A1?= =?UTF-8?q?=E7=89=87=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/shareRedPackets/index.vue | 302 +++++++++--------- 1 file changed, 154 insertions(+), 148 deletions(-) diff --git a/template/uni-app/components/shareRedPackets/index.vue b/template/uni-app/components/shareRedPackets/index.vue index 986f60bc6..1431e8e36 100644 --- a/template/uni-app/components/shareRedPackets/index.vue +++ b/template/uni-app/components/shareRedPackets/index.vue @@ -1,152 +1,158 @@ - - - - - From 668729b094f534d27a5d1ade811bc44bfb3f00a9 Mon Sep 17 00:00:00 2001 From: liaofei <136327134@qq.com> Date: Mon, 20 Feb 2023 18:23:39 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/src/pages/setting/systemMenus/components/menusFrom.vue | 1 - 1 file changed, 1 deletion(-) diff --git a/template/admin/src/pages/setting/systemMenus/components/menusFrom.vue b/template/admin/src/pages/setting/systemMenus/components/menusFrom.vue index f4cc5771e..bc45957ec 100644 --- a/template/admin/src/pages/setting/systemMenus/components/menusFrom.vue +++ b/template/admin/src/pages/setting/systemMenus/components/menusFrom.vue @@ -403,7 +403,6 @@ export default { } } this.valids = true; - data.datas.menu_path = this.$routeProStr + this.formValidate.menu_path addMenusApi(data) .then(async (res) => { this.$Message.success(res.msg); From 6b8c2e44f50031355560ec8a578b6aaa53647011 Mon Sep 17 00:00:00 2001 From: From-wh Date: Mon, 20 Feb 2023 18:23:40 +0800 Subject: [PATCH 5/6] =?UTF-8?q?improve:=20=E5=95=86=E5=93=81=E7=BC=96?= =?UTF-8?q?=E8=BE=91=E7=B1=BB=E5=9E=8B=E5=88=87=E6=8D=A2=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- template/admin/src/pages/product/productAdd/index.vue | 3 +++ 1 file changed, 3 insertions(+) diff --git a/template/admin/src/pages/product/productAdd/index.vue b/template/admin/src/pages/product/productAdd/index.vue index 1721ff892..5c1ffea44 100644 --- a/template/admin/src/pages/product/productAdd/index.vue +++ b/template/admin/src/pages/product/productAdd/index.vue @@ -1944,6 +1944,9 @@ export default { this.formValidate.spec_type = this.spec_type; this.$Message.error(res.msg); }); + if (this.formValidate.spec_type == 1) { + this.generate(1); + } } } switch (index) { From 3933bd3611534af085d225099ea25ef2d6384289 Mon Sep 17 00:00:00 2001 From: From-wh Date: Mon, 20 Feb 2023 18:24:22 +0800 Subject: [PATCH 6/6] improve: appid --- template/uni-app/manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/template/uni-app/manifest.json b/template/uni-app/manifest.json index b63d890cf..06a36e774 100644 --- a/template/uni-app/manifest.json +++ b/template/uni-app/manifest.json @@ -173,7 +173,7 @@ "quickapp" : {}, /* 小程序特有相关 */ "mp-weixin" : { - "appid" : "wx1234567890", + "appid" : "wx3b82801238ca1b57", "setting" : { "urlCheck" : false, "minified" : true,