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/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/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())
},
}
diff --git a/src/project/fengdu/AppCircle/circle-selected.png b/src/project/fengdu/AppCircle/circle-selected.png
new file mode 100644
index 0000000..706bb49
Binary files /dev/null and b/src/project/fengdu/AppCircle/circle-selected.png differ
diff --git a/src/project/fengdu/AppCircle/circle.png b/src/project/fengdu/AppCircle/circle.png
new file mode 100644
index 0000000..fe9d537
Binary files /dev/null and b/src/project/fengdu/AppCircle/circle.png differ
diff --git a/src/project/fengdu/AppConvenientService/service-selected.png b/src/project/fengdu/AppConvenientService/service-selected.png
new file mode 100644
index 0000000..1f5c971
Binary files /dev/null and b/src/project/fengdu/AppConvenientService/service-selected.png differ
diff --git a/src/project/fengdu/AppConvenientService/service.png b/src/project/fengdu/AppConvenientService/service.png
new file mode 100644
index 0000000..2bd0f3f
Binary files /dev/null and b/src/project/fengdu/AppConvenientService/service.png differ
diff --git a/src/project/fengdu/AppMine/AppMine.vue b/src/project/fengdu/AppMine/AppMine.vue
index e3c5713..cec0228 100644
--- a/src/project/fengdu/AppMine/AppMine.vue
+++ b/src/project/fengdu/AppMine/AppMine.vue
@@ -69,12 +69,6 @@ export default {
listGroup() {
return [
[
- // {
- // icon: "https://cdn.cunwuyun.cn/wxmp/mine/wodejiating.png",
- // label: "我的家庭",
- // path: "./myFamily",
- // type: 'idNumber'
- // },
{
icon: "https://cdn.cunwuyun.cn/wxmp/mine/wodejiaxiang.png",
label: "我的家乡",
diff --git a/src/project/fengdu/AppMine/myHarvestQR.vue b/src/project/fengdu/AppMine/myHarvestQR.vue
index 18a6cf7..724883e 100644
--- a/src/project/fengdu/AppMine/myHarvestQR.vue
+++ b/src/project/fengdu/AppMine/myHarvestQR.vue
@@ -1,6 +1,25 @@
-
+
+
+
+

+
+
+
+

+
+
+
我的丰收码
+
+
+

+
+
@@ -8,20 +27,90 @@
export default {
name: "AppHarvestQR",
appName: '丰收码',
+ customNavigation: true,
data() {
return {
-
+ backgroundNavbar: {
+ background: '#FFF'
+ }
}
},
methods: {
},
- onShow() {},
+ onShow() {
+ },
}
\ No newline at end of file