m?MoF*QT6dIn}MqIwC{OK7g8_#EFaND2L2TZ^-7
zk0)buH?iC6p+&UmkT$H|z#W0DaR!H2&r2D^A!n^0Pw8v^wjc(_GiQRfD<@?zc6;6L
zNP$bUt6N*sfyLy(vy|bvY2dZ-{)oj?v}=V-d5funp<`?thzoH+Y*qs!qP)f7eW}elnIc~(FxuPx&yh%hsRA@u(TF*~YK@k3CUtd!K;;%rw7%}nILjx3xTu5&k&b_NA{{TI4;V&l}fSPOC%EB2*4YO$i8pbuPp)4@ah#03drf{
zX~%w41(FW~R}(_Zsn(_5A$&{7t3QxG|;^z-J=*24IVb(#)I!@LegDVdgz%
z&J_xUy^)cTd_CY|M=cO1VxR(4nR>gx)YMd{ySw`hGYF`>rB#_j?L0}xte
zF`+L9AZv`tD5Y`|4gyRmwY|Q+zL`iQj8L3RCa)P|rUCQ;kVIBBjQuTnZ4#G8FX1aL
zJI6cMbw?wS$WA4QKL9K(EnO%Ui}#rMV#$Nv`b4Cd*^yB|F|$nUF=32Z$>;Mggqacm
zVc=RF0LLJp?1T-ibvzb}eQX54U1q*aM3o^>E_agI7L-t9j8TC=;OW4?z{c$CY@h48
z!a&mjD5XYajk*9978cGk^L=K%R0BXg&pjU+8d~)&0AtLvSS1wdCDz){`TU+x3G4q>VoIHZnO>HM8ApuawDs^Pqss-q2tFk1BVAuJA~RHbW|&T#QoC=AppKOTJ(C9
zGkv)0`{VV)1P%cEL}UeytjIrF>+~rK9IM4*addcic)RBDdMPwKA#G-6rZ*T24vWMD
z;Hzj>BFYsCg={bw%tWKngX+XufHU+l$BJKkGTMsWR(v*lP6I
wrV8DSE_&E=|K(o|PU^IV`ka$aej4BV1s(a|e37?XNdN!<07*qoM6N<$f`Eb6yZ`_I
literal 0
HcmV?d00001
From caa650d8a7618d304ff277ddca82d25cc3e4b88b Mon Sep 17 00:00:00 2001
From: aixianling
Date: Fri, 17 Mar 2023 10:15:03 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E5=88=87=E5=85=A5=E6=9B=B2=E9=9D=96?=
=?UTF-8?q?=E9=AA=8C=E8=AF=81=E5=92=8C=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/components/common.scss | 42 +++++++++++++++++++++++++++++----
src/components/utils/modules.js | 8 +++++--
src/pages/home.vue | 13 +++++-----
3 files changed, 51 insertions(+), 12 deletions(-)
diff --git a/src/components/common.scss b/src/components/common.scss
index 23b1714..a344d4e 100644
--- a/src/components/common.scss
+++ b/src/components/common.scss
@@ -4,18 +4,51 @@
/**
常用内外边距样式
*/
-@each $padMar, $pm in (mar:margin, pad:padding) {
- @each $pos, $p in (l:left, r:right, t:top, b:bottom) {
- @each $v in (8, 10, 16, 20, 32, 48, 64) {
+@each $v in (8, 10, 12, 14, 16, 20, 24, 32, 48, 56, 64, 80) {
+ //gap
+ .gap-#{$v} {
+ gap: #{$v}px
+ }
+ .font-#{$v} {
+ font-size: #{$v}px;
+ }
+ @each $padMar, $pm in (mar:margin, pad:padding) {
+ .#{$padMar}-#{$v} {
+ #{$pm}: #{$v}px
+ }
+ //纵向
+ .#{$padMar}-v#{$v} {
+ #{$pm}-top: #{$v}px;
+ #{$pm}-bottom: #{$v}px;
+ }
+ //横向
+ .#{$padMar}-h#{$v} {
+ #{$pm}-left: #{$v}px;
+ #{$pm}-right: #{$v}px;
+ }
+ @each $pos, $p in (l:left, r:right, t:top, b:bottom) {
.#{$padMar}-#{$pos+$v} {
#{$pm}-#{$p}: #{$v}px
}
}
}
}
-.bg-fff{
+
+@each $where in (sticky, fixed) {
+ @each $pos, $p in (l:left, r:right, t:top, b:bottom) {
+ .#{$where}-#{$pos} {
+ position: fixed;
+ #{$p}: 0;
+ z-index: 202301031019;
+ width: 100%;
+ }
+ }
+}
+
+.bg-fff {
background-color: #fff;
}
+
@font-face {
font-family: 'iconfont';
/* project id 1862352 */
@@ -63,6 +96,7 @@ page {
.bg-hover {
background: #eee !important;
}
+
.flex {
display: flex;
align-items: center;
diff --git a/src/components/utils/modules.js b/src/components/utils/modules.js
index 5c002ca..43af3b8 100644
--- a/src/components/utils/modules.js
+++ b/src/components/utils/modules.js
@@ -14,10 +14,14 @@ export const user = {
},
},
actions: {
- getUserInfo({commit}) {
+ getUserInfo({commit}, way = "std") {
//获取企业微信后台账号信息
//党员认证状态 partyStatusForWX:0、未认证 1、认证中 2、已认证
- return http.post("/app/appwechatuser/check").then(res => {
+ const actions = {
+ std: "/app/appwechatuser/check",
+ qujing: "/app/appwechatuserqujing/check",
+ }
+ return http.post(actions[way]).then(res => {
if (res?.data) {
commit('setUser', res.data)
return Promise.all([])
diff --git a/src/pages/home.vue b/src/pages/home.vue
index 7f07d57..707f7a3 100644
--- a/src/pages/home.vue
+++ b/src/pages/home.vue
@@ -67,16 +67,17 @@ export default {
uni.navigateTo({url: `${app.path}`})
},
getApps() {
- this.apps = config.apps.map(e => ({...e, path: e.libPath}))
+ this.apps = config.apps.map(e => {
+ if (/\/project\//.test(e.libPath)) {
+ e.project = e.libPath.replace(/.*project\/([^\/]+)\/.+/, '$1')
+ }
+ return {...e, path: e.libPath}
+ })
},
},
onShow() {
- if (this.token) {
- this.getUserInfo();
- } else {
- this.autoLogin().then(() => this.getUserInfo())
- }
this.getApps()
+ Promise.all([this.token ? 0 : this.autoLogin()]).then(() => this.getUserInfo())
},
}
From ccbaf345dfcd61bfa69c4904c1b33b1c7b3b0180 Mon Sep 17 00:00:00 2001
From: aixianling
Date: Fri, 17 Mar 2023 10:21:06 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E7=A4=BE=E7=BE=A4=E7=A0=81=E6=95=B4?=
=?UTF-8?q?=E5=90=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../AppWxworkQrcode/AppWxworkQrcode.vue | 143 ++++++++++
.../fengdu/AppVillageInfo/AppVillageInfo.vue | 244 ------------------
2 files changed, 143 insertions(+), 244 deletions(-)
create mode 100644 src/mods/wxwork/AppWxworkQrcode/AppWxworkQrcode.vue
delete mode 100644 src/project/fengdu/AppVillageInfo/AppVillageInfo.vue
diff --git a/src/mods/wxwork/AppWxworkQrcode/AppWxworkQrcode.vue b/src/mods/wxwork/AppWxworkQrcode/AppWxworkQrcode.vue
new file mode 100644
index 0000000..7ebe0f5
--- /dev/null
+++ b/src/mods/wxwork/AppWxworkQrcode/AppWxworkQrcode.vue
@@ -0,0 +1,143 @@
+
+
+
+
+
+
+
diff --git a/src/project/fengdu/AppVillageInfo/AppVillageInfo.vue b/src/project/fengdu/AppVillageInfo/AppVillageInfo.vue
deleted file mode 100644
index 71a4643..0000000
--- a/src/project/fengdu/AppVillageInfo/AppVillageInfo.vue
+++ /dev/null
@@ -1,244 +0,0 @@
-
-
-
-
-