From 763e68af200820ba30aeadb417b9124b8fa43c7f Mon Sep 17 00:00:00 2001 From: zmj <1493694146@qq.com> Date: Mon, 6 May 2024 18:19:05 +0800 Subject: [PATCH] add --- App.vue | 3 + manifest.json | 4 +- pages/gather/subnvue/concat.nvue | 2 +- pages/index/subnvue/concat.nvue | 2 +- pages/store/settled/index.vue | 1080 +++++++++++++++++++----- pages/store/settled/index1.vue | 9 +- pages/users/login/index.vue | 428 ++++++---- pages/users/login/login_copy.vue | 12 +- pages/users/retrievePassword/index.vue | 70 +- static/images/ydwd.png | Bin 1046 -> 1389 bytes 10 files changed, 1162 insertions(+), 448 deletions(-) diff --git a/App.vue b/App.vue index 715700f..d9f7407 100644 --- a/App.vue +++ b/App.vue @@ -162,6 +162,9 @@ // this.audioTeam.push(result.extras.type); // } } + + console.log("收到消息") + console.log(result) // 点击事件 if (notificationEventType == 'notificationOpened') { if (result.extras.type == 2) { diff --git a/manifest.json b/manifest.json index 5b3b237..c94f62d 100644 --- a/manifest.json +++ b/manifest.json @@ -2,8 +2,8 @@ "name": "惠农生活", "appid": "__UNI__3A527D1", "description": "", - "versionName": "2.0.45", - "versionCode": 2045, + "versionName": "2.0.48", + "versionCode": 2048, "transformPx": false, /* 5+App特有相关 */ "app-plus": { diff --git a/pages/gather/subnvue/concat.nvue b/pages/gather/subnvue/concat.nvue index 687119e..85ac458 100644 --- a/pages/gather/subnvue/concat.nvue +++ b/pages/gather/subnvue/concat.nvue @@ -180,7 +180,7 @@ .next-btn { position: absolute; - bottom: 100rpx; + bottom: 100px; left: 375rpx; transform: translateX(-50%); width: 240rpx; diff --git a/pages/index/subnvue/concat.nvue b/pages/index/subnvue/concat.nvue index 8ff2f18..f09af6a 100644 --- a/pages/index/subnvue/concat.nvue +++ b/pages/index/subnvue/concat.nvue @@ -19,7 +19,7 @@ - + 工作台 diff --git a/pages/store/settled/index.vue b/pages/store/settled/index.vue index aaee40a..4a44e27 100644 --- a/pages/store/settled/index.vue +++ b/pages/store/settled/index.vue @@ -1,270 +1,297 @@ + \ No newline at end of file diff --git a/pages/users/login/login_copy.vue b/pages/users/login/login_copy.vue index 62728fb..643dd23 100644 --- a/pages/users/login/login_copy.vue +++ b/pages/users/login/login_copy.vue @@ -148,9 +148,9 @@ 完成并登录 - + @@ -173,13 +173,13 @@ - + @@ -1693,7 +1693,7 @@ .footer-btns { position: absolute; - bottom: 160rpx; + bottom: 100rpx; left: 50%; transform: translate(-50%); display: flex; diff --git a/pages/users/retrievePassword/index.vue b/pages/users/retrievePassword/index.vue index f0d94c4..4ce61f3 100644 --- a/pages/users/retrievePassword/index.vue +++ b/pages/users/retrievePassword/index.vue @@ -5,35 +5,42 @@ --> - +
- + - + - + - -
确认 - + - + @@ -48,7 +55,9 @@ // | Author: CRMEB Team // +---------------------------------------------------------------------- const app = getApp(); - import { mapGetters} from "vuex"; + import { + mapGetters + } from "vuex"; import sendVerifyCode from "@/mixins/SendVerifyCode"; import { registerVerify, @@ -56,19 +65,25 @@ getCodeApi, getCaptcha } from "@/api/user"; - import { validatorDefaultCatch } from "@/utils/dialog"; + import { + validatorDefaultCatch + } from "@/utils/dialog"; import attrs, { required, alpha_num, chs_phone } from "@/utils/validate"; - import { configMap } from '@/utils'; - import { HTTP_REQUEST_URL } from '@/config/app'; - import Verify from '@/components/verify/verify.vue'; + import { + configMap + } from '@/utils'; + import { + HTTP_REQUEST_URL + } from '@/config/app'; + import Verify from '@/components/verify/verify.vue'; export default { name: "RetrievePassword", - components: { - Verify + components: { + Verify }, mixins: [sendVerifyCode], data: function() { @@ -85,16 +100,14 @@ }; }, computed: configMap(['login_logo'], mapGetters(['viewColor'])), - onReady() { - }, - mounted: function() { - }, + onReady() {}, + mounted: function() {}, methods: { back() { uni.navigateBack(); }, again() { - this.codeUrl = VUE_APP_API_URL + "/captcha?" + this.keyCode + Date.parse(new Date()); + this.codeUrl = VUE_APP_API_URL + "/captcha?" + this.keyCode + Date.parse(new Date()); }, async code(data) { @@ -108,7 +121,7 @@ await registerVerify({ phone: that.account, type: 'change_pwd', - captchaType: 'blockPuzzle', + captchaType: 'blockPuzzle', captchaVerification: data.captchaVerification }) .then(res => { @@ -169,7 +182,7 @@ }) }); }, - success(data) { + success(data) { this.$refs.verify.hide(); this.code(data); }, @@ -180,13 +193,15 @@ }; + \ No newline at end of file diff --git a/static/images/ydwd.png b/static/images/ydwd.png index 05198bc03e696ff0c12ba86008fe3fa95bf11591..5a4ff90032134957aaab28a111d1e6affdd13677 100644 GIT binary patch delta 1358 zcmV-U1+n^;2<-}xFn#GD{-f;Cl0#ow9} zkUc@*kCLd0Il-C}1Wpj=1Yu7Q{5y7yR&S~`B_=Z?3A^GH<@utFr0LhMyY;$P4LLY`G#c&g?CiYHvh2VZGvJ&*8h>M+dcEG=_4V~*3MoQ} z1J3ye+Ox+Pdosq{Ypowr&T(s#8In?7SmVc>bG*FinPypb9s+iHdOGBsUvSQcE$6^7 zAC*$KDZruuft7y0|AljY5PAXFGR7R=+}zwZtrbFyIOm^3=ivV~0w!APlbE$w6AefR z@wEm9o|_g$@qdJa5Pt9|W9$tXg5M9d)-&IjIv8Wjf0pgbqA1FBobv&qnsff%?Mnd_ z1xQK>LoetBa~tEsx}h$&`u+aI%ZW!DGW*UjV)?rZS7XeT)_NSnVo?-_ZH)W-gMb>0 zc-I8RKU7KyZ~sY5ooKBm_*)2Z$vOX<*4`?mMqQyKrGEt2Pjn6n#bGG)f`F`XN7lH1 zV~xN%Bz%@-U&xR<>j0d=q?F$oV+bjh=lR>oWKxD}*JDHU(dOG96xREpViN<%54U5b z)HGxS84qLMpg?G?--7Ag-Q6Dq@t%&@il!Aj>pBO+DL+b)$i&@YxXR*(at%y}VwjqiER3#>3>|7~z8543{ z45a|FN@D7&rZFa1kb;2D&dvr!Q6QOd$vrI=i~Y!CZVkCuKqQO4k^|?~nQiK%@^KIl zR{CDTWvY}q4zaWnY8hkgNiOg1XZpUK2Yb4s=Pt0wkngRD2WC{p$EN&BrPwx z$fr^S{v{c+*BJA#SS*fWm~rPN0dkvgH&|wl$eR^obt7$6x?3z3BWDm;VvIrlRKl}i z4}Zk!eNhyX80}Wy{~|y!-rdxil>kvCDn)3+Gj9{ILWov|UfQX?IOIr^p_M?9a8;;{ z5G4Px0|udMjQQNr?Yd$!v%S~U3fQZZ{K4iVhA4MFg$(l1(R`qk{X&QziF+HH#IA6T z2GrCxqY9yHbIyNi18iAF*I8D>266g;#D8xv42+|2JPYF#4H*TZJy`ju5ei8 zVx@~5ZHj9Wqa{}qAe+P(j+FgNSKI7+d=)_6^-$?S##pe!jmjbahQ~m|w$q_PP};K& zKvaOBD5^#=bR7g4strhfdHW!xOlmNb0Hq}7Iv4^QYj5!UNzEDoMdbqlN@_5Z7=Mas zfnAK-k+Gp7QstfZ+e~ZyE|d?Hi`D2W#-TBQsxg*-Np=}iyR#bAc9vzqkrXkMH2Mkx zA}>|5u@FmCnb0Jprw?Um{w!rSVp55B7f?u@=3;)0@4oFaZfnOQcg(endf;vs2f}BT+6`= zHI3yrCK}d16TYFS@Escss0maD_1~c7+S&(_QgB9VbLh@a0TZPZ>PFLts*f#Q=Nuhr zp68b#*-znz86VjA2^eyw*XxZ#v+TNkNeua$At0B_$R^fo0d2zTDev4el;W*TtlcuS39qNT^VKo*KT=p+Vz`Iu Qu>b%707*qoM6N<$g5!3M0{{R3 delta 1012 zcmVu!zZxTkYkJ;Q%XM(LJkdAQ52KGU~soC&b0t>&VSDUpi3z|E-`!x09W(* zd^8*mUsA#)1?qG<`@6fl_iupwV>-gpK8r&7vE zl_8vS47CN6%73{RDdj=coT}eb0XZGt zgx12;wqum%dH1ao=bX3k)oMz<6|R%{eBO%nRx}Xj9KGVk{3y$^UPxl=T*7s*_h51m zz151*g;79^u^US1QdI-M-OkQVHw45DtBZ?^Q-AgJxK$qipbJYBR4|ZpZ{Xg+PlmD_ z(Yb}M+yxZgYoWy=2uPpey=71`7_+7erCz^dDP_yIPy_)PA*vTo4)X?-cW1~O$kuFi zl(p|k+ZQjEbk)N<@~M1YK)S2*WXf}0MH~RNRPuxnFP-NF^J!AT?yp8SAGj2%KFuHoKZSA^m$PUWV;<(yG@0gAq?HW63BUx zdL?E`SJ@Hb(_IY$O3~SjfmLCLGH9V5sya)RKz85SCn;kLu9_3lDhmQ4gnU&+0R?2E z!&WFMJY@H-u?e5-&ncf%0f0lJ?0t$-rEQ0BQ}r0bzebkt6(2*^@r_T&dja7y`}Os8 zXqxitFt%dNnR-fee8Sxe$X3CG5bW?owR|HE;zj>!zVe^IRqF)-MHtlhlr2!>M;^H0 i)(1`0000