From 117bd4ac0684b5d006b41bbca44f9639ae14465e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BA=9E=E4=B8=9C=E6=97=AD?= <850374051@qq.com> Date: Mon, 7 Nov 2022 17:31:18 +0800 Subject: [PATCH 01/17] =?UTF-8?q?=E5=86=9C=E4=B8=9A=E6=89=A7=E6=B3=95?= =?UTF-8?q?=E6=89=AB=E7=A0=81=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../retrospect/retrospectDetail.vue | 89 ++++++++++++++----- 1 file changed, 65 insertions(+), 24 deletions(-) diff --git a/src/views/lawEnforcement/retrospect/retrospectDetail.vue b/src/views/lawEnforcement/retrospect/retrospectDetail.vue index c17ccda3..a4da09ab 100644 --- a/src/views/lawEnforcement/retrospect/retrospectDetail.vue +++ b/src/views/lawEnforcement/retrospect/retrospectDetail.vue @@ -23,33 +23,37 @@
- www.kasdhefivnskdfkhhwkn5664nn.5164888874.com + http://y.acexe.cn?q=10946481001086181062569234199632
-
- -

该产品单元识别代码合规

-

1534565635645126353535335656

+
+
-
- - - - - - - - - -
+ + + + + -
- - -
+ + + + + + + + + + + + + + + + + +
@@ -104,6 +108,42 @@ } .app-container { + height: 100vh; + + overflow: hidden; + + } + .iframe-wrap{ + + position: relative; + + overflow: hidden; + + width: 100%; + + height: calc(100vh - 269PX); + + background: #eee; + + } + .iframe{ + + width: calc(100% + 20PX); + + border: none; + + position: absolute; + + right: -20PX; + + top: 0; + + bottom: 0; + + overflow-x: hidden; overflow-y: scroll; + + height: 100%; + } .retrospect_icon{ position: absolute; @@ -198,7 +238,7 @@ } } .header_main{ - /*height: 116px;*/ + height: 225PX; background: url('../../../../static/images/lawEnforcement/new/header_bg.png') no-repeat; background-size: 100% 100%; /*position: fixed;*/ @@ -257,7 +297,8 @@ } .main_box{ width: 96%; - margin: 0 auto; + height: 58PX; + margin: 0 auto 15PX; border-radius: 10PX; box-shadow: 0px 3px 6px 0px rgba(0,0,0,0.16); overflow: hidden; From 78024603f2d145afd77ac1b6a63d46aeffe8436c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BA=9E=E4=B8=9C=E6=97=AD?= <850374051@qq.com> Date: Tue, 8 Nov 2022 11:49:35 +0800 Subject: [PATCH 02/17] =?UTF-8?q?=E6=89=AB=E7=A0=81=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/qrcode/Scaner.vue | 2 +- .../retrospect/retrospectDetail.vue | 23 +++++++++--- src/views/lawEnforcement/retrospect/scan.vue | 34 +++++++++++------- static/images/lawEnforcement/icon/close.png | Bin 0 -> 413 bytes 4 files changed, 41 insertions(+), 18 deletions(-) create mode 100644 static/images/lawEnforcement/icon/close.png diff --git a/src/components/qrcode/Scaner.vue b/src/components/qrcode/Scaner.vue index 131d6a4f..a67444a7 100644 --- a/src/components/qrcode/Scaner.vue +++ b/src/components/qrcode/Scaner.vue @@ -254,7 +254,7 @@ export default { display: inline-block; height: 24PX; width: 24PX; - /*background: url('../assets/close.png') no-repeat center;*/ + background: url('../../../static/images/lawEnforcement/icon/close.png') no-repeat center; background-size: auto 100%; position: absolute; right: 8PX; diff --git a/src/views/lawEnforcement/retrospect/retrospectDetail.vue b/src/views/lawEnforcement/retrospect/retrospectDetail.vue index a4da09ab..747cd408 100644 --- a/src/views/lawEnforcement/retrospect/retrospectDetail.vue +++ b/src/views/lawEnforcement/retrospect/retrospectDetail.vue @@ -23,11 +23,11 @@
- http://y.acexe.cn?q=10946481001086181062569234199632 + {{scanLink}}
-
- +
+
@@ -60,7 +60,8 @@ diff --git a/src/views/lawEnforcement/retrospect/scan.vue b/src/views/lawEnforcement/retrospect/scan.vue index 6e7e380c..bef5bdb0 100644 --- a/src/views/lawEnforcement/retrospect/scan.vue +++ b/src/views/lawEnforcement/retrospect/scan.vue @@ -2,7 +2,7 @@
-

Scan QRcode

+

扫一扫

import Scaner from '@/components/qrcode//Scaner'; +import Cookies from "js-cookie"; export default { name: 'Scan', @@ -35,7 +36,10 @@ export default { codeScanned(code) { this.scanned = code; setTimeout(() => { - alert(`扫码解析成功: ${code}`); + // alert(`扫码解析成功: ${code}`); + Cookies.remove('scanLink') + Cookies.set("scanLink", code); + history.back(-1); }, 200) }, errorCaptured(error) { @@ -80,29 +84,33 @@ export default { width: 100%; } .scan .nav { - width: 100%; - height: 48PX; - line-height: 48PX; + height: 116px; + background: url('../../../../static/images/lawEnforcement/new/list_head.png') no-repeat; + background-size: 100% 100%; position: fixed; top: 0; left: 0; + width: 100%; + font-size: 36px; + line-height: 116px; + text-align: center; + color: #fff; + z-index: 999; } .scan .nav .title { padding: 0; margin: 0; font-size: 16PX; color: #FFFFFF; - background: rebeccapurple; text-align: center; } .scan .nav .close { - display: inline-block; - height: 22PX; - width: 22PX; - background: url('../../../assets/images/sunVillage_info/list_icon_5.png') no-repeat center; - background-size: auto 100%; + width: 24px; + height: 43.2px; + background: url('../../../assets/images/sunVillage_info/list_icon_5.png') center center no-repeat; + background-size: 20px 36px; position: absolute; - left: 16PX; - top: 14PX; + left: 38px; + top: 36px; } diff --git a/static/images/lawEnforcement/icon/close.png b/static/images/lawEnforcement/icon/close.png new file mode 100644 index 0000000000000000000000000000000000000000..7da3c513e8902487fbccde8910e36d6eba30a719 GIT binary patch literal 413 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA3?vioaBc-s#sNMdu0Z@Qd-@#z{uDAlxr*KVdt18>Fu)i*UHx3vIVCg!07u5mIsgCw literal 0 HcmV?d00001 From d1f104cd7dc235eae401961c3197f058384186ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BA=9E=E4=B8=9C=E6=97=AD?= <850374051@qq.com> Date: Tue, 8 Nov 2022 13:58:00 +0800 Subject: [PATCH 03/17] =?UTF-8?q?=E6=89=AB=E7=A0=81=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/permission.js | 1 - src/router/index.js | 1 + src/views/lawEnforcement/retrospect/retrospectDetail.vue | 7 +++++-- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/permission.js b/src/permission.js index 768bf1e3..c426059b 100644 --- a/src/permission.js +++ b/src/permission.js @@ -143,7 +143,6 @@ const whiteList = [ router.beforeEach((to, from, next) => { NProgress.start() if (getToken()) { - console.info(to) /* has token*/ if (to.path === '/login') { next({ path: '/' }) diff --git a/src/router/index.js b/src/router/index.js index 9de6497c..4bb67977 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -3690,6 +3690,7 @@ export const constantRoutes = [ meta: { title: '种子扫描', hidden: true, + keepAlive: true }, component: (resolve) => require(['@/views/lawEnforcement/retrospect/retrospectDetail'], resolve) }, diff --git a/src/views/lawEnforcement/retrospect/retrospectDetail.vue b/src/views/lawEnforcement/retrospect/retrospectDetail.vue index 747cd408..4d79803d 100644 --- a/src/views/lawEnforcement/retrospect/retrospectDetail.vue +++ b/src/views/lawEnforcement/retrospect/retrospectDetail.vue @@ -91,6 +91,7 @@ }, created() { // this.getDictionaries() + console.log("aaaaaaaaaa") }, methods: { getDictionaries(){ @@ -106,10 +107,12 @@ $route (to, from ) { // 监听路由变化, 实现类似 小程序的 onShow 事件 if (to.path === '/lawEnforcement/retrospectDetail') { + console.log(this.scanLink) // do anything you want if (Cookies.get('scanLink')){ - this.scanLink = Cookies.get('scanLink'); - Cookies.remove('scanLink') + this.scanLink = Cookies.get('scanLink'); + console.log(this.scanLink) + Cookies.remove('scanLink') } } } From 1e542a2693b49633fc5882d59d4ff69b0a00946a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BA=9E=E4=B8=9C=E6=97=AD?= <850374051@qq.com> Date: Tue, 8 Nov 2022 16:49:39 +0800 Subject: [PATCH 04/17] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=94=B9=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../images/sunVillage_info/index_title.png | Bin 5130 -> 4599 bytes src/router/index.js | 18 ++ src/views/sunVillage_info/index.vue | 101 ++++++++++- src/views/yinnong/doneCompleted/completed.vue | 157 ++++++++++++++++++ src/views/yinnong/doneCompleted/done.vue | 157 ++++++++++++++++++ src/views/yinnong/my.vue | 40 ++--- src/views/yinnong/workbench.vue | 26 +-- src/views/yinnongIndex.vue | 4 +- src/views/yinnongLogin.vue | 114 ++++++------- static/images/onlineHome/yinnongLogo.jpg | Bin 10901 -> 11964 bytes 10 files changed, 524 insertions(+), 93 deletions(-) create mode 100644 src/views/yinnong/doneCompleted/completed.vue create mode 100644 src/views/yinnong/doneCompleted/done.vue diff --git a/src/assets/images/sunVillage_info/index_title.png b/src/assets/images/sunVillage_info/index_title.png index fcb711e6954bc97621fe3f00696c497ae11f2023..27e7580e398ec1771486d1033c0222e46242bcbe 100644 GIT binary patch delta 4071 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 LCfIsir?~$BC+<(F delta 4596 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 R^1pu^fFaRLuZrLl{Xg`HGVA~V diff --git a/src/router/index.js b/src/router/index.js index 4bb67977..408f1b82 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -1852,6 +1852,24 @@ export const constantRoutes = [ }, component: (resolve) => require(['@/views/yinnong/done'], resolve) }, + { + path: '/yinnong/doneCompleted/done', + name: 'yinnongDoneCompletedDone', + meta: { + title: '我的已办', + hidden: true, + }, + component: (resolve) => require(['@/views/yinnong/doneCompleted/done'], resolve) + }, + { + path: '/yinnong/doneCompleted/completed', + name: 'yinnongDoneCompletedCompleted', + meta: { + title: '我的待办', + hidden: true, + }, + component: (resolve) => require(['@/views/yinnong/doneCompleted/completed'], resolve) + }, { path: '/yinnong/advice', name: 'yinnongAdvice', diff --git a/src/views/sunVillage_info/index.vue b/src/views/sunVillage_info/index.vue index f1a67cac..1b4a5abe 100644 --- a/src/views/sunVillage_info/index.vue +++ b/src/views/sunVillage_info/index.vue @@ -47,6 +47,11 @@
+ + + 财务公开榜 零工公开榜 重大事项 @@ -57,6 +62,71 @@ 零工登记
+
+
+ + + + + +
+ +
+

银行卡转账

+ + + + + + + + +
+ +
+

信用卡还款

+ + + + + + + + +
+ +
+

备付金支出

+ + +
+ +
+

汇票支出

+ + +
+ +
+

收款账户

+ + +
+ +
+

付款账户

+ + +
+ +
+

开户行

+ + +
+
技术支持：北京农燊高科信息技术有限公司 @@ -260,15 +330,31 @@ .nav_list{ margin-top: 6vh; padding:0 38px; + &:nth-child(3){ + margin-top: 3vh; + } + .van-cell{ + background: transparent; + } .nav_list_box{ display: flex; flex-flow: wrap; + box-shadow: 0px 0px 18px rgba(63,68,75,0.2); + padding: 0 0 20PX; + border-radius: 15PX; + overflow: hidden; + } + .nav_box{ box-shadow: 0px 0px 18px rgba(63,68,75,0.2); margin-bottom: 40PX; - padding: 20PX 0; border-radius: 15PX; + overflow: hidden; + /deep/ .van-grid-item__content{ + background: transparent; + padding-top: 0; + } } - .nav_item{ + .nav_item{ width: 25%; /*height: 180px;*/ border-radius: 30px; @@ -316,6 +402,17 @@ background-size: 50%; } } + .icon{ + padding: 15px; + border-radius: 10px; + box-sizing: border-box; + width: 80px; + height: 80px; + text-align:center; + } + .icon img{ + width:50px; + } } } .footer{ diff --git a/src/views/yinnong/doneCompleted/completed.vue b/src/views/yinnong/doneCompleted/completed.vue new file mode 100644 index 00000000..e384fc01 --- /dev/null +++ b/src/views/yinnong/doneCompleted/completed.vue @@ -0,0 +1,157 @@ + + + + + diff --git a/src/views/yinnong/doneCompleted/done.vue b/src/views/yinnong/doneCompleted/done.vue new file mode 100644 index 00000000..f963c095 --- /dev/null +++ b/src/views/yinnong/doneCompleted/done.vue @@ -0,0 +1,157 @@ + + + + + diff --git a/src/views/yinnong/my.vue b/src/views/yinnong/my.vue index 0742c6c9..38e8c06b 100644 --- a/src/views/yinnong/my.vue +++ b/src/views/yinnong/my.vue @@ -19,16 +19,16 @@ - - - + + + + + + + + + + - - - + + + + + + + + + +