From 944d6945f6210d832885036ab1f41ae9c6651345 Mon Sep 17 00:00:00 2001
From: weipengfei <2187978347@qq.com>
Date: Tue, 25 Jul 2023 09:47:43 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=88=91=E7=9A=84=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2,=E6=96=B0=E5=A2=9E=E9=A1=B5=E9=9D=A2=E8=B7=B3?=
 =?UTF-8?q?=E8=BD=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages.json                    |   2 +-
 pages/oaMy/oaMy.vue           |  18 ++++++++++++++----
 static/icons/backstage.png    | Bin 0 -> 1073 bytes
 static/icons/manager.png      | Bin 0 -> 1776 bytes
 static/icons/runningWater.png | Bin 0 -> 723 bytes
 static/server/server.js       |  10 +++++-----
 6 files changed, 20 insertions(+), 10 deletions(-)
 create mode 100644 static/icons/backstage.png
 create mode 100644 static/icons/manager.png
 create mode 100644 static/icons/runningWater.png

diff --git a/pages.json b/pages.json
index d56b993..14577aa 100644
--- a/pages.json
+++ b/pages.json
@@ -231,7 +231,7 @@
     }, {
       "path": "orderDetail/orderDetail",
       "style": {
-        "navigationBarTitleText": "账单详情",
+        "navigationBarTitleText": "流水详情",
         "enablePullDownRefresh": false,
         "navigationBarBackgroundColor": "#3175f9",
         "navigationBarTextStyle": "white"
diff --git a/pages/oaMy/oaMy.vue b/pages/oaMy/oaMy.vue
index 413431b..d86182f 100644
--- a/pages/oaMy/oaMy.vue
+++ b/pages/oaMy/oaMy.vue
@@ -70,11 +70,12 @@
     <view class="other_guide">
       <block v-for="(item,i) in myOaData" :key="i">
         <view class="other_item flex_a_c_j_sb" @click="naviTo(item.url)">
-          <view class="flex_a_c">
-            <view class="iconfont2" :class="item.icon"></view>
+          <view class="flex_a_c left">
+            <!-- <view class="iconfont2" :class="item.icon"></view> -->
+            <image :src="item.icon"></image>
             <view class="text">{{ item.name }}</view>
           </view>
-          <view class="iconfont icon-you"></view>
+          <uni-icons type="forward"></uni-icons>
         </view>
       </block>
     </view>
@@ -290,7 +291,16 @@
 
       .text {
         font-size: 28.07rpx;
-        margin-left: 24.56rpx;
+        margin-left: 20.56rpx;
+      }
+      
+      .left{
+        align-items: center;
+      }
+      
+      image{
+        width: 42rpx;
+        height: 42rpx;
       }
 
       .iconfont2 {
diff --git a/static/icons/backstage.png b/static/icons/backstage.png
new file mode 100644
index 0000000000000000000000000000000000000000..ef6917eebfa1d861662f316946708a90cc3fe8b6
GIT binary patch
literal 1073
zcmV-11kU@3P)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00001b5ch_0Itp)
z=>Px&>q$gGRA@u(SwV;#MHGF%XLi_w2U!F?L{QAG5hJ+hAwh&)$iW<f26k{k#o3vz
zT0tcd6?5=zf`UT4Y*qC-VnUQv+(W<|0-0b01w}={unKyJkV9Z{*hA>vt}i7$Ff7wO
z)9m)F8>cUQ=vV*$_usFYUw;U@{GnYQKSl(0TEUS5|9J&!wc4GPO66r{o&&Ith{lTy
znwf6^_z6H$Ykjt#ugnsv*Xs|K%jF9I?(1i$pzjyj?RIr#Wo13hekuVe<y`=N0dNn1
z4Q5^?qRY&jYHXWG+znu!h#qzJnEAZc`bcg9LWp;X=#3=!qgw0p+Z5nHW~7v-0lebC
z*4kNPOsm(zECqgZHP6hh78eHcx{aWjnVIs`)YP8<_Av8@TI*Ny65vF_1+8^+8)F;T
zl$7#I0MBHVQI-NbPCy9p5fRmxxuvz9-E|6#2<-G8C|rT$q<Bmz^<CD^6hb^4MbY2Q
zX7gqTSFKj>n3$M&U}<UT=d`tj5^%v!PEMX9qB(2rL1WCfy#i@88v9G7(vJWxDy0s0
zFjC5Q0Gt3&Q%Zf@Yi*$fI>rI~+HSWGrv2P^9fj{{t>5efTCdk1FPF=g0E{#9yw>`Q
z%_IsVAf<dCz;OUq!!Vp}Hk;Q|vj0S>RJy{<H=`)Jzq^DSUI=lBh`vhp+99p=<!(EL
z5LjGXe3qF%1#rV!J8g`)mQll(h-ikHPiU=A^}_kSKj(Sg3V`)64DanGSqK5&_YZiU
z_jOv<Izjrr|Fq|Ms{pQtVd%1ds~3SyYEF0K3L)TvNV0Ygz^yorp9+HDo9^I})5&ez
z{mh)&iU=XzBBGOyWE{s&20`#g;U(0S;fCjV#z}9jeW<&Xgb>dW(HXZ#*4EY@X|-A#
zo3k&ae9>K6T<`#9l~PxSwuw8Agb>F7oFt;@?f?>nK4In~TI-7`rSm#7zs<~t(~jW6
zN@(DAa*Mzbf!n?p+G2(DT|O$I+oFW5wZ1VX=&N@DfKDR_U{xt~w3my%QwacPlu|Dg
z5MQRrTCFxdHa7M<5$yr+fl}(VyaYP^`i8akd1K6H!y=K~HBJ-JOU`H3eIr$YWG3qR
zna)_zjTqgf<*x#XxVyn#H%cKQ_jZ%H%(+zNY*b3Q4}hD^xcAT>*S1Gdw2;=xx`6ur
zKj3PyQmHhO>Ga;DCW|8Dn!any{JpjIY!C#l9nXCF66j}Or@#OI2uLXxnfX8wnRi26
zW6TeEZ0A-$N*Mtt=W#M9mYF}-T2}|f544Fl8%q?J&*Nl3?0Ou>r<RwOuMCL)7nWOr
rJjREC9T6Btma}|}6c{P6#SHudPs-F!Uj~_A00000NkvXXu0mjfhW-OI

literal 0
HcmV?d00001

diff --git a/static/icons/manager.png b/static/icons/manager.png
new file mode 100644
index 0000000000000000000000000000000000000000..9dc28f658c20501026c83f290ca3c8111d7776cf
GIT binary patch
literal 1776
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
Sf2O+t0000<MNUMnLSTYg&Q8bx

literal 0
HcmV?d00001

diff --git a/static/icons/runningWater.png b/static/icons/runningWater.png
new file mode 100644
index 0000000000000000000000000000000000000000..738c99ac8f87e0078b6ee64e70ed59257a02ff68
GIT binary patch
literal 723
zcmV;^0xbQBP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00001b5ch_0Itp)
z=>Px%jY&j7RA@u(STTzeK@@&(=U8%Jk;1|vg;ylnDR_mA5V2A4K#O!1Yc{jd?wa6F
zP|!kAP-a5hK83;wDk!9|u((37OJl&sLNLXFVYB4Pgk6Y`c$3|WlY^Od-+S}E?|bv!
z&LAA~g~vR9umDUeXce#u<Yd5>P)-7KyU$giR;!&T7K;x7z(d4B?p-njAfgcfgu~&m
z)$Mi<7KNA#fOGyF0PY}~tuP`|dB2cS-dz^JZvZH)34oE5a#I^XwOZY%R4U`dVIYLq
z%1{BhU4kI^1^}m3AR)xUQkeT82!g400AK-RmBK1uOK7Hc>h<~=#@H=H+$JL3xpFa`
zLB<ZT>S*P1`931<0>DPr^I!}>qtTF#<1_%^fQTLw(Z@KB2RcAp*HvwFx{Ltueg6t$
z?1M@^j^oRnPG?^y@ziFfm74*;Ip0IX>qN9GrF^0iYc`wbh^W->_uuz=z4%{%)&amT
zL@Y*8v=xToU`7!jqDNB7)>;Ed8H}Q6GYrEK=lmWbK1h;&Cxp1R)&Mx?-x09{0GEUi
zpMoGb2>`DEpfs6GZnxX*-ns*LiHIHmycR;-T;>2PTjOWI^SraJ>wZ=JpNO7~$K#eN
zC0!uK0VFIo)rBNU`X>>owyFgpQP12QNSXG1|Ayl@Pm}YYE5KiNMh4kz2A<~?7-Ln&
z*ah8R3N=4e8#XqHGf_R`WbXs^K9IA9YzZZgN~&jn&Pirg_gpu!w*YW8>&{2%M?`O=
zlsk)J&V3j1Jnxk2x_bbyeU!;$h_xR@(M}kKKb8WJ8gtIi6VY^-{O^T`Ln-B#!}c}%
zdV5%Q8s9Ad4U$%BVii~^y&A!-0vaT()Wj;VQhGIl{{al%en8w#D%$`6002ovPDHLk
FV1o7pM2r9c

literal 0
HcmV?d00001

diff --git a/static/server/server.js b/static/server/server.js
index e5b1507..0bc0b23 100644
--- a/static/server/server.js
+++ b/static/server/server.js
@@ -356,18 +356,18 @@ export const appDataList = [{
 export const myOaData = [
   {
     name: '流水详情',
-    icon: 'custom-icongongzi',
-    // url: '/pages/views/personal_center_two'
+    icon: '../../static/icons/runningWater.png',
+    url: '/subpkg/orderDetail/orderDetail'
   },
   {
     name: '管理后台',
-    icon: 'custom-icongongzi',
+    icon: '../../static/icons/backstage.png',
     // url: '/pages/views/personal_center_two'
   },
   {
     name: '片区经理',
-    icon: 'custom-icongongzi',
-    // url: '/pages/views/personal_center_two'
+    icon: '../../static/icons/manager.png',
+    url: '/subpkg/manager/manager'
   },
   // {
   //   name: '工资详情',