From a7b72985ceacf493efbfa0611bf961a3777bbac9 Mon Sep 17 00:00:00 2001 From: pangdongxu <850374051@qq.com> Date: Wed, 30 Mar 2022 17:30:57 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=94=AF=E5=87=BA=E7=94=B3=E8=AF=B7?= =?UTF-8?q?=E6=A8=A1=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- image/apply/down.png | Bin 0 -> 228 bytes image/apply/icon_add.png | Bin 0 -> 495 bytes image/apply/icon_fu.png | Bin 0 -> 431 bytes image/apply/icon_pres.png | Bin 0 -> 266 bytes image/apply/icon_shou.png | Bin 0 -> 562 bytes image/apply/icon_update.png | Bin 0 -> 645 bytes .../apply/paymentTemplate/paymentTemplate.js | 7 ++ .../paymentTemplate/paymentTemplate.json | 4 +- .../paymentTemplate/paymentTemplate.wxml | 42 +++++-- .../paymentTemplate/paymentTemplate.wxss | 108 ++++++++++++++++++ 10 files changed, 153 insertions(+), 8 deletions(-) create mode 100644 image/apply/down.png create mode 100644 image/apply/icon_add.png create mode 100644 image/apply/icon_fu.png create mode 100644 image/apply/icon_pres.png create mode 100644 image/apply/icon_shou.png create mode 100644 image/apply/icon_update.png diff --git a/image/apply/down.png b/image/apply/down.png new file mode 100644 index 0000000000000000000000000000000000000000..02f42c5df550cb1426865d9c8ba747e34f27265c GIT binary patch literal 228 zcmeAS@N?(olHy`uVBq!ia0vp^{6Ngf!3HGX_LqeNDVAa<&kznEsNqQI0P<&hx;Tbt z1h-CnDA=qZ(tMIFcA;>FdPXCsRb!d4`wNx}f+a$88Ki99Jp9@9r;+>Tq~naw@2r?I zi_vE5HSY6QUH>~AzAI7e+9u7V+#20`Cc*u@OFsAezpBT6EWA)4zh#a zDK^{_4jfrqp!-06NAuE#s|;UW_TFCcbaLI}+|4-Op!t azlwXEN#lB8-QWOpCWEJ|pUXO@geCwls9D_r literal 0 HcmV?d00001 diff --git a/image/apply/icon_add.png b/image/apply/icon_add.png new file mode 100644 index 0000000000000000000000000000000000000000..cb627e2320eccac8d8bfc795262fbf4b2802afe4 GIT binary patch literal 495 zcmV6vp2-m>6SBxPiD+AhDi6I00}2Tqxa1;R3oBin|gQ z;tAvi;t8w?7AKD#HK1(Q zusZ9EU&>*+Uj`AELBdub2b1BK@nk2=V*H2?&S!9`G*pP$H55o~hNK46Y~_(0qO3Bz zAg_eyHxWl#tHRI{I`~>m27$KzM)$^ zm%t7CAayf`yx&?goO8BRLIU~Vn1sF&6?yh>lNZ2Uq&f+Ze^h&fzw+$W&*)2_*@3zQ lIIb3h(3so-gs|5Q>OWXk%TN5>7+C-S002ovPDHLkV1lY{-39;v literal 0 HcmV?d00001 diff --git a/image/apply/icon_fu.png b/image/apply/icon_fu.png new file mode 100644 index 0000000000000000000000000000000000000000..51189fe43608b6036f27ef44d8d77e665346a490 GIT binary patch literal 431 zcmV;g0Z{&lP)GXq1TD3E3Z83xq6 zo)iOcsbykdaAbS|GL?bBo*D)MU3w7YLLiL^*xcP2_!cc*`|oQeF<{V|5|O1t5US6(qTkf8$05RtpOThVS3u27+9S>X-o8HhEL5-0ePCdC(Z3s{g(pjAKtvD%E*%yH-0{+i`_`h|1 zkG-tCh~5u|sqDc$4!-{%GPy{wY~;Ueu!-kTnnYOhmMUYR84?mA4pRRN4QzIV*(5Wb z$v$zMn*OY$ILxm^33_y!Ix8V z_~PaJD;#GW?6>df=+WazZ8mny`o2umz{r4e!fWjb`}BS6)fgCzJAq)TR}Dkv%F;et8?k`*;l`wFLVApW!17iZ4iMO}zpZ z(^b literal 0 HcmV?d00001 diff --git a/image/apply/icon_update.png b/image/apply/icon_update.png new file mode 100644 index 0000000000000000000000000000000000000000..87199f9fed163e414ca9a81a07547f06ef573d2f GIT binary patch literal 645 zcmV;00($+4P)5QeL!oglyqZV*Qbm>tduVxItK8AUkZ1eg;5C%~M5 z$X;ZLbAmWGFuPbp3P*4x8-(KNN>#^=dS34F*s~dFrn|oWtGXTtp6BuFeuZXqr~#S? zv;%;(|66ECfa3t5k0t!J`QhjNB2$?4^Rf4)9)ddK1$EzH3>ILZAiUT-`ZY*fp9-4v zsvZ7uk_Ql9L!>+9*4=6Rdjv$+m7Qs6<0h|)tb>TU?b*|NJiZ^>H4)IHTOA<6yCO;w z${1EY8Z{E2Roul9y5Jzy0P)ZTva&0NwdI>pB!SnUz86u#F*)X#e38A=-X6d4Qv??1 zx8;v_Ljx-6G9ns-qJ|i<#;4uAzN<{)B`!qC6FsBf%cvosKMHhHL(n0DS1ycIowKSl z*IrP<*Z9z_wh7@fFGwH|P+e5WEqy4x99S4?tT5yzakU9faT&L{5Nj*~lb|DV^@u)v zkRQlW*}r(;QB$aU+2a6;c^UWWBS z7$cVCx+a=p_MR(@=?MxAv)#D+=Ov=S6R*oZfY-4e|Q f$QRi64Uqo;$)!f+2kjLD00000NkvXXu0mjfHh?6V literal 0 HcmV?d00001 diff --git a/pages/apply/paymentTemplate/paymentTemplate.js b/pages/apply/paymentTemplate/paymentTemplate.js index a69de0c..cf3bb86 100644 --- a/pages/apply/paymentTemplate/paymentTemplate.js +++ b/pages/apply/paymentTemplate/paymentTemplate.js @@ -7,8 +7,15 @@ Page({ */ data: { isIPX: app.globalData.isIPX, + show: false + }, + showPopup() { + this.setData({ show: true }); }, + onClose() { + this.setData({ show: false }); + }, /** * 生命周期函数--监听页面加载 */ diff --git a/pages/apply/paymentTemplate/paymentTemplate.json b/pages/apply/paymentTemplate/paymentTemplate.json index 26f00aa..f7f42cc 100644 --- a/pages/apply/paymentTemplate/paymentTemplate.json +++ b/pages/apply/paymentTemplate/paymentTemplate.json @@ -1,6 +1,8 @@ { "usingComponents": { "van-cell": "@vant/weapp/cell/index", - "van-cell-group": "@vant/weapp/cell-group/index" + "van-cell-group": "@vant/weapp/cell-group/index", + "van-icon": "@vant/weapp/icon/index", + "van-popup": "@vant/weapp/popup/index" } } \ No newline at end of file diff --git a/pages/apply/paymentTemplate/paymentTemplate.wxml b/pages/apply/paymentTemplate/paymentTemplate.wxml index 58eea45..bb9eec7 100644 --- a/pages/apply/paymentTemplate/paymentTemplate.wxml +++ b/pages/apply/paymentTemplate/paymentTemplate.wxml @@ -20,15 +20,43 @@ 支出金额 ￥ - + - 事由 + 事由： - - + + - - + + + + + + + + - \ No newline at end of file + + + + + + 保存模板 + + + + 新增事项 + + + + + 提交复核 + 下一步 + + + + + + + \ No newline at end of file diff --git a/pages/apply/paymentTemplate/paymentTemplate.wxss b/pages/apply/paymentTemplate/paymentTemplate.wxss index d7fdf07..5d0d8fb 100644 --- a/pages/apply/paymentTemplate/paymentTemplate.wxss +++ b/pages/apply/paymentTemplate/paymentTemplate.wxss @@ -1,5 +1,26 @@ /* pages/apply/paymentTemplate/paymentTemplate.wxss */ text{display: block;} + +.pure_top { + width: 100%; + height: 100px; + position: relative; + z-index: -1; + overflow: hidden +} + +.pure_top::after { + content: ''; + width: 140%; + height: 100px; + position: absolute; + left: -20%; + top: 0; + z-index: -1; + border-radius: 0 0 50% 50%; + background: #1496f1 +} + .top{ height: 64px; width: 100%; @@ -83,4 +104,91 @@ text{display: block;} padding: 10px calc(3% + 20px); color: #2C8E68; font-size: 16px; +} + +.van-cell { + padding-left: 0!important; + padding-right: 0!important; +} + +.down{ + width: 15px; + height: 8px; + margin: 0 auto; + margin-top: 18px; +} + +.update{ + width: 26px; + height: 26px; + position: absolute; + right: 41px; +} +.delete{ + width: 26px; + height: 26px; + position: absolute; + right: 0; +} + +.btnBox{ + text-align: center; + position: relative; + height: 26px; +} +.bottomBtn{ + display: flex; + width: 94%; + margin: 0 auto; + margin-top: 25px; + justify-content:space-between; +} +.bottomBtn view{ + display: flex; + width: 48%; + background-color: #ffffff; + border-radius: 5px; + box-shadow: 0px 5px 9px #DCDCDC; + padding: 10px 0px; + text-align: center; + align-items:center; + justify-content:center; + font-size: 14px; + color: #2C8E68; +} +.bottomBtn view image{ + width: 18px; + height: 18px; + margin-right: 5px; +} + + +.bottom{ + width: 84%; + margin: 0 auto; + text-align: center; + margin-top: 50px; + margin-bottom: 50px; + display: flex; +} + +.bottom view { + width: 47%; + margin: 0 auto; + border-radius: 30px; + display: inline-block; +} + +.bottom .btn1{ + border: 1px solid #2C8E68; + padding: 8px 0px; + color: #2C8E68; +} + +.bottom .btn2{ + border: 1px solid transparent; + padding: 8px 0px; + background-image: linear-gradient(to right, #2C8E68, #5CAE77); + margin-left: 6%; + color: #fff; } \ No newline at end of file From 5fac1d7b8c98e21c63716c6b62443add216f7cad Mon Sep 17 00:00:00 2001 From: pangdongxu <850374051@qq.com> Date: Thu, 31 Mar 2022 16:16:09 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app.json | 3 +- app.wxss | 1 + image/apply/icon_down.png | Bin 0 -> 466 bytes image/apply/icon_up.png | Bin 0 -> 451 bytes pages/apply/approval/approval.js | 127 ++++++++++ pages/apply/approval/approval.json | 18 ++ pages/apply/approval/approval.wxml | 134 ++++++++++ pages/apply/approval/approval.wxss | 237 ++++++++++++++++++ .../apply/paymentTemplate/paymentTemplate.js | 6 + .../paymentTemplate/paymentTemplate.json | 3 +- .../paymentTemplate/paymentTemplate.wxml | 28 ++- .../paymentTemplate/paymentTemplate.wxss | 32 ++- project.private.config.json | 7 + 13 files changed, 575 insertions(+), 21 deletions(-) create mode 100644 image/apply/icon_down.png create mode 100644 image/apply/icon_up.png create mode 100644 pages/apply/approval/approval.js create mode 100644 pages/apply/approval/approval.json create mode 100644 pages/apply/approval/approval.wxml create mode 100644 pages/apply/approval/approval.wxss diff --git a/app.json b/app.json index dde626f..bb4e027 100644 --- a/app.json +++ b/app.json @@ -5,7 +5,8 @@ "pages/handle/liist", "pages/handle/expenditureAudit/expenditureAudit", "pages/apply/index", - "pages/apply/paymentTemplate/paymentTemplate" + "pages/apply/paymentTemplate/paymentTemplate", + "pages/apply/approval/approval" ], "window": { "backgroundTextStyle": "light", diff --git a/app.wxss b/app.wxss index 98e8c3f..53e6313 100644 --- a/app.wxss +++ b/app.wxss @@ -50,6 +50,7 @@ contact-button { .ns { width: 100%; text-align:center; + z-index: 999; background:linear-gradient(to right, #2C8E68, #B3DB62); } .ns image{ diff --git a/image/apply/icon_down.png b/image/apply/icon_down.png new file mode 100644 index 0000000000000000000000000000000000000000..4cd6a86a761ebd5efc41b822213ad63a192a2e82 GIT binary patch literal 466 zcmV;@0WJQCP)YmQtqQ%;TdU|NJ0yjKni%ymUb@E<_DqK-9(qBIMIv%E+g}#bCGZqj0pU`t zG;6nz{}oWBiKEw_M0T{7(y2^819}G61229DguSqLmzZ~Roxvy~!UG~)eFshi9~_a+ zd7fp*(r)p955HwZqt}+XA^CO?ayM@ctXU-3`kpyT{A2qk~$Mwe1r4g&0b=e#@w16tTRvOUSdMO*VaX{D-s_K)wPKS;nVfp(1Ts`^5KQ)IUg;Star^(Aw zuSn)R=nR_$MSRs3y#`xFXU>fi0vwlDQ<(vAgZLBBaO&dhC&Xgs-H8x*r~m)}07*qo IM6N<$f}c{$`2YX_ literal 0 HcmV?d00001 diff --git a/image/apply/icon_up.png b/image/apply/icon_up.png new file mode 100644 index 0000000000000000000000000000000000000000..81791282776a0c32915d0c6064be630627e396e5 GIT binary patch literal 451 zcmV;!0X+VRP)}cu5;o!q#01>6 z)EjsNxPjiFTNC3r^V&y%!lRPNhQK_&_h#mwAB2|ca(OpLpmRVPBj8w;5l{w%86m7+ zZU3$5Q>?$7rQU=HA2~2;+iVMm4@6qTRF-ZrJDn!XA|rQzb+*H zO~>ziYlX5RES#>qh-Gor0?Y*#S>ZOerZXUds0-QzY=r48yP)-yjj#itd9^7-53v*6cQi_I^-0SrQBA4JhBj(OcV^Hf zbY&KR!(#45HU|p3i_IsdPoC+~|BRlR=N?W|I(F3@bf71+fC;DBV1FR&Fbh>P9Dr*y t*mC8!&JB}Y$F(8kYP|RtPzUL6e*x9n<&@CWFPQ)U002ovPDHLkV1nVu!L9%R literal 0 HcmV?d00001 diff --git a/pages/apply/approval/approval.js b/pages/apply/approval/approval.js new file mode 100644 index 0000000..267fca5 --- /dev/null +++ b/pages/apply/approval/approval.js @@ -0,0 +1,127 @@ +// pages/apply/approval/approval.js +const app = getApp(); +Page({ + + /** + * 页面的初始数据 + */ + data: { + isIPX: app.globalData.isIPX, + steps: [ + { + assigneeName: '同意', + activityName: '测试测试', + durationInMillis: '描述信息', + endTime: '2022-01-02', + comment: '同意', + type: '1' + }, + { + assigneeName: '申请中', + activityName: '测试测试', + durationInMillis: '描述信息', + endTime: '2022-01-02', + comment: '同意', + type: '2' + }, + { + assigneeName: '驳回', + activityName: '测试测试', + durationInMillis: '描述信息', + endTime: '2022-01-02', + comment: '同意', + type: '3' + }, + { + assigneeName: '步骤四', + activityName: '测试测试', + durationInMillis: '描述信息', + endTime: '2022-01-02', + comment: '同意' + }, + ], + active:0, + result:[], + show:false, + showPopup:false, + }, + + /** + * 生命周期函数--监听页面加载 + */ + onLoad(options) { + + }, + onChange(event) { + this.setData({ + result: event.detail, + }); + }, + openBox:function(){ + var that = this ; + that.setData({ + show: true, + }) + }, + closeBox:function(){ + var that = this ; + that.setData({ + show: false, + }) + }, + showPopup() { + this.setData({ showPopup: true }); + }, + + onClose() { + this.setData({ showPopup: false }); + }, + /** + * 生命周期函数--监听页面初次渲染完成 + */ + onReady() { + + }, + + /** + * 生命周期函数--监听页面显示 + */ + onShow() { + + }, + + /** + * 生命周期函数--监听页面隐藏 + */ + onHide() { + + }, + + /** + * 生命周期函数--监听页面卸载 + */ + onUnload() { + + }, + + /** + * 页面相关事件处理函数--监听用户下拉动作 + */ + onPullDownRefresh() { + + }, + + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom() { + + }, + + /** + * 用户点击右上角分享 + */ + onShareAppMessage() { + + } +}) \ No newline at end of file diff --git a/pages/apply/approval/approval.json b/pages/apply/approval/approval.json new file mode 100644 index 0000000..bc56a53 --- /dev/null +++ b/pages/apply/approval/approval.json @@ -0,0 +1,18 @@ +{ + "usingComponents": { + "van-row": "@vant/weapp/row/index", + "van-col": "@vant/weapp/col/index", + "van-cell": "@vant/weapp/cell/index", + "van-cell-group": "@vant/weapp/cell-group/index", + "van-tag": "@vant/weapp/tag/index", + "van-icon": "@vant/weapp/icon/index", + "van-steps": "@vant/weapp/steps/index", + "van-button": "@vant/weapp/button/index", + "van-checkbox": "@vant/weapp/checkbox/index", + "van-checkbox-group": "@vant/weapp/checkbox-group/index", + "van-action-sheet": "@vant/weapp/action-sheet/index", + "van-swipe-cell": "@vant/weapp/swipe-cell/index", + "van-dialog": "@vant/weapp/dialog/index", + "van-field": "@vant/weapp/field/index" + } +} \ No newline at end of file diff --git a/pages/apply/approval/approval.wxml b/pages/apply/approval/approval.wxml new file mode 100644 index 0000000..a378531 --- /dev/null +++ b/pages/apply/approval/approval.wxml @@ -0,0 +1,134 @@ + + + + 支出申请 + + + + 审批事项 + + + {{index+1}} + + + + + + + + + + + + + + + + + + + + {{item.activityName}}村级主任审批 + + + + + + + + + + + + + 董事长：张三 + 董事长：张三 + + + 董事长：张三 + 董事长：张三 + + + + + 村长：张三 + 村书记：张三 + + + 村主任：张三 + 村党委：张三 + + + + + 镇长：张三 + 镇书记：张三 + + + 镇主任：张三 + 镇党委：张三 + + + + + + + 选择审批模板 + 保存审批模板 + + + + + 保存 + 保存并提交 + + + + + + + 日常支付水电模板默认 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/pages/apply/approval/approval.wxss b/pages/apply/approval/approval.wxss new file mode 100644 index 0000000..b7522c6 --- /dev/null +++ b/pages/apply/approval/approval.wxss @@ -0,0 +1,237 @@ +/* pages/apply/approval/approval.wxss */ +text{display: block;} + +.ns{ + position: fixed; + top: 0; + background: linear-gradient(to right, #429a68, #9ecf67); +} + +.pure_top { + width: 100%; + height: 120px; + position: absolute; + z-index: -1; + overflow: hidden +} + +.pure_top::after { + content: ''; + width: 140%; + height: 120px; + position: absolute; + left: -20%; + top: 0; + z-index: -1; + border-radius: 0 0 50% 50%; + background: linear-gradient(to right, #2C8E68, #B3DB62); +} + +.main-box{ + background: #ffffff; + padding: 20px 0; + width: 94%; + margin: 0 auto; + border-radius: 10px; + box-shadow: 0px 5px 5px rgba(0, 0, 0, 0.16); +} + +.top-box text{ + margin-bottom: 15px; +} +.top-box text:last-child{ + margin-bottom: 0px; +} +.box-title{ + color: #2C8E68; + text-align: center; + font-size: 16px; +} + +.steps-box view{ + margin-bottom: 0; +} +.steps-box .van-row{ + padding: 0 20px; +} +.steps-box van-row:nth-child(2n+1) .van-row{ + background-color: rgba(92, 174, 119, 0.1); +} + +.steps-box .van-col{ + position: relative; + height: 50px; + } + .steps-box .van-col--21{ + padding: 5PX 0; + line-height: 50px; + } + .steps-box .van-row:nth-child(2n){ + background: rgba(29,111,233,0.1); + } + .steps-box .van-cell{ + background: transparent; + padding: 0 ; + line-height: 40px; + } + .steps-box .bq{ + display: inline-block; + padding: 0PX 10PX; + line-height: 0.64rem; + border-radius: 5PX; + } + .steps-box .index{ + background: #2C8E68; + color: #ffffff; + text-align: center; + width: 20PX; + height: 20PX; + line-height: 20PX; + border-radius: 50%; + position: absolute; + left: 0; + top: 50%; + transform: translate(0,-50%); + } + .steps-box .indexCenter{ + top: 0!important; + } + .steps-box .van-row:first-child .van-col:first-child .indexBorder{ + top: calc(50% - 15px); + } + .steps-box .indexBorder{ + width: 10PX; + position: absolute; + left: 9px; + top: 0; + height: 100%; + + } + .steps-box .indexBorder .yq{ + height: 30PX; + width: 30PX; + background: transparent; + border-radius: 50%; + } + .steps-box .indexBorder .ss{ + height: calc(50% - 15PX); + width: 1PX; + background: #C9C9C9; + position: relative; + } + .steps-box .indexBorder .ssT{ + height: calc(50% - 15PX); + width: 1PX; + background: #C9C9C9; + position: relative; + } + + .steps-box .van-cell__title{ + flex: 0.8; + } + .steps-box .van-cell__value { + flex: 0.2; + } + .check_box{ + padding: 50px 0; + } + .check_box .van-row{ + background-color: rgba(92, 174, 119, 0.1); + margin-top: 10px; + padding: 15px 20px; + } + .check_box .van-col{ + height: auto; + } + .check_box van-checkbox:nth-child(2n) .van-checkbox { + margin-top: 15px; + } + .van-checkbox__icon-wrap { + border-radius: 5px; + } + .van-checkbox__icon { + border-radius: 5px; + border: 2px solid #2C8E68!important; + background-color: rgba(44, 142, 104, 0.2); + } + + .btn_box{ + display: flex; + justify-content: center; + padding-bottom: 10px; + } + .btn_box view:nth-child(1){ + display: inline-block; + padding: 8px 15px; + background-color: rgba(252, 154, 85, 0.2); + color: #FC9A55; + border-radius: 20px; + font-size: 16px; + } + .btn_box view:nth-child(2){ + display: inline-block; + padding: 8px 15px; + background-color: rgba(92, 174, 119, 0.2); + color: #5CAE77; + border-radius: 20px; + font-size: 16px; + margin-left: 30px; + } + + .bottom{ + width: 84%; + margin: 0 auto; + text-align: center; + margin-top: 50px; + margin-bottom: 50px; + display: flex; + } + + .bottom view { + width: 47%; + margin: 0 auto; + border-radius: 30px; + display: inline-block; + } + + .bottom .btn1{ + border: 1px solid #2C8E68; + padding: 8px 0px; + color: #2C8E68; + } + + .bottom .btn2{ + border: 1px solid transparent; + padding: 8px 0px; + background-image: linear-gradient(to right, #2C8E68, #5CAE77); + margin-left: 6%; + color: #fff; + } + .deleteBox{ + width: 65px; + text-align: center; + height: 100%; + background: #F6F6F6; + align-items: center; + display: flex; + } + .van-action-sheet__header { + background: #f2f2f2; + color: #2C8E68; + } + + .input_tit{ + border: 1px solid #DCDCDC; + padding: 0px 10px; + height: 32px; + line-height: 32px; + border-radius: 5px; + margin-bottom: 15px; + } + .van-dialog__header { + color: #2C8E68; + font-size: 18px; + } + .van-button--normal { + background: linear-gradient(to right, #2C8E68, #5CAE77)!important; + } \ No newline at end of file diff --git a/pages/apply/paymentTemplate/paymentTemplate.js b/pages/apply/paymentTemplate/paymentTemplate.js index cf3bb86..78060c5 100644 --- a/pages/apply/paymentTemplate/paymentTemplate.js +++ b/pages/apply/paymentTemplate/paymentTemplate.js @@ -16,6 +16,12 @@ Page({ onClose() { this.setData({ show: false }); }, + + goApproval(){ + wx.navigateTo({ + url: '../approval/approval', + }) + }, /** * 生命周期函数--监听页面加载 */ diff --git a/pages/apply/paymentTemplate/paymentTemplate.json b/pages/apply/paymentTemplate/paymentTemplate.json index f7f42cc..7c415ff 100644 --- a/pages/apply/paymentTemplate/paymentTemplate.json +++ b/pages/apply/paymentTemplate/paymentTemplate.json @@ -3,6 +3,7 @@ "van-cell": "@vant/weapp/cell/index", "van-cell-group": "@vant/weapp/cell-group/index", "van-icon": "@vant/weapp/icon/index", - "van-popup": "@vant/weapp/popup/index" + "van-dialog": "@vant/weapp/dialog/index", + "van-field": "@vant/weapp/field/index" } } \ No newline at end of file diff --git a/pages/apply/paymentTemplate/paymentTemplate.wxml b/pages/apply/paymentTemplate/paymentTemplate.wxml index bb9eec7..b0497d7 100644 --- a/pages/apply/paymentTemplate/paymentTemplate.wxml +++ b/pages/apply/paymentTemplate/paymentTemplate.wxml @@ -1,14 +1,14 @@ - - - + + 支出申请 + 审批事项 支出总金额 - ￥ + ￥ 提交单位：龙华村联合社 提交日期：2022年1月18日 提 交 人：报账员 @@ -19,7 +19,7 @@ 支出金额 - ￥ + ￥ 事由： @@ -52,11 +52,17 @@ 提交复核 - 下一步 + 下一步 - - - - - \ No newline at end of file + + + \ No newline at end of file diff --git a/pages/apply/paymentTemplate/paymentTemplate.wxss b/pages/apply/paymentTemplate/paymentTemplate.wxss index 5d0d8fb..56ed9bb 100644 --- a/pages/apply/paymentTemplate/paymentTemplate.wxss +++ b/pages/apply/paymentTemplate/paymentTemplate.wxss @@ -1,10 +1,16 @@ /* pages/apply/paymentTemplate/paymentTemplate.wxss */ text{display: block;} +.ns{ + position: fixed; + top: 0; + background: linear-gradient(to right, #429a68, #9ecf67); +} + .pure_top { width: 100%; - height: 100px; - position: relative; + height: 120px; + position: absolute; z-index: -1; overflow: hidden } @@ -12,13 +18,13 @@ text{display: block;} .pure_top::after { content: ''; width: 140%; - height: 100px; + height: 120px; position: absolute; left: -20%; top: 0; z-index: -1; border-radius: 0 0 50% 50%; - background: #1496f1 + background: linear-gradient(to right, #2C8E68, #B3DB62); } .top{ @@ -54,10 +60,7 @@ text{display: block;} border-radius: 10px; box-shadow: 0px 5px 5px rgba(0, 0, 0, 0.16); } -.top-box{ - /* margin-top: 20px; */ - /* margin-bottom: 28px; */ -} + .top-box text{ margin-bottom: 15px; } @@ -191,4 +194,17 @@ text{display: block;} background-image: linear-gradient(to right, #2C8E68, #5CAE77); margin-left: 6%; color: #fff; +} + +.window{ + background: #fff; + width: 94%; +} + +.van-dialog__header { + color: #2C8E68; + font-size: 18px; +} +.van-button--normal { + background: linear-gradient(to right, #2C8E68, #5CAE77)!important; } \ No newline at end of file diff --git a/project.private.config.json b/project.private.config.json index 5e94748..db3ca8a 100644 --- a/project.private.config.json +++ b/project.private.config.json @@ -38,6 +38,13 @@ "query": "", "launchMode": "default", "scene": null + }, + { + "name": "支出审批流程", + "pathName": "pages/apply/approval/approval", + "query": "", + "launchMode": "default", + "scene": null } ] } From 939ecffa11b888624943d4fc8762d56d6d7b162d Mon Sep 17 00:00:00 2001 From: liuminjian Date: Thu, 31 Mar 2022 16:51:22 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E8=AE=BE=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- image/index/setup.png | Bin 0 -> 467 bytes pages/index/index.wxml | 1 + pages/index/index.wxss | 9 +++++++++ project.config.json | 8 ++++---- 4 files changed, 14 insertions(+), 4 deletions(-) create mode 100644 image/index/setup.png diff --git a/image/index/setup.png b/image/index/setup.png new file mode 100644 index 0000000000000000000000000000000000000000..ee8fc5f9459fe301bf39507e5e8a8728b6a501fe GIT binary patch literal 467 zcmV;^0WAKBP)< zfKY+i=h@Q;4;lDCGdHqUr`6u-oF=2u_x+WijiOTArj%Mzj6dkJQ)~l|O79id;nkqXav?cWRN6cUn>jg3+iQ*ad*`!$Q!KF|g-ijT_~As1 zB?)u6oi*j0C@y^w7vL4x7NRg1lHrAHG6x5B#vtn;jM9|{)+(k!w9{sk01+e*XUt?A z;`P`chH}B?5OL#&0^_(b6k+B?V8$1yqI|C_&4afP;Q=>LD`q|xlEHXE4nKzqliX;g z)A6>BSIf1A3X?&C3dXEZj1nG$<{iAv4e2Lk^Un=gmj3^p?Ye0NjO1rz#&F7DbjG7m zDfQ^TRvPc~lbt{20c3-VU+G(ER)vCE!2_&D24g<$LQ|qJk1s86-{IqDqsRaN002ov JPDHLkV1oDt&fWk3 literal 0 HcmV?d00001 diff --git a/pages/index/index.wxml b/pages/index/index.wxml index 4a0a49f..9519b29 100644 --- a/pages/index/index.wxml +++ b/pages/index/index.wxml @@ -4,6 +4,7 @@ + diff --git a/pages/index/index.wxss b/pages/index/index.wxss index 131bbc0..7d6da98 100644 --- a/pages/index/index.wxss +++ b/pages/index/index.wxss @@ -8,6 +8,15 @@ /* padding: 30rpx 32rpx 54rpx; */ padding: 10rpx 32rpx 54rpx; display: flex; + position: relative; +} +.information_header .setup{ + width: 38rpx; + height: 38rpx; + position: absolute; + right: 34rpx; + top: 15rpx; + display: block; } .information_header .portrait_head{ width: 110rpx; diff --git a/project.config.json b/project.config.json index 5060023..580f760 100644 --- a/project.config.json +++ b/project.config.json @@ -52,6 +52,10 @@ "libVersion": "2.23.2", "appid": "wxaace54cc2cf8924b", "projectname": "WXMB", + "editorSetting": { + "tabIndent": "insertSpaces", + "tabSize": 2 + }, "condition": { "search": { "list": [] @@ -71,9 +75,5 @@ "miniprogram": { "list": [] } - }, - "editorSetting": { - "tabIndent": "insertSpaces", - "tabSize": 2 } } \ No newline at end of file