From 7f4887028f5e01da212fe2b8fedd6f578f9e7f04 Mon Sep 17 00:00:00 2001 From: devil Date: Thu, 17 Sep 2020 14:10:41 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/admin/form/Goodsbrowse.php | 2 +- application/admin/form/Goodsfavor.php | 2 +- .../default/apphomenav/module/images.html | 2 +- .../view/default/quicknav/module/images.html | 2 +- application/index/form/Usergoodsbrowse.php | 2 +- application/index/form/Usergoodsfavor.php | 2 +- application/service/GoodsBrowseService.php | 28 +++++---------- application/service/GoodsFavorService.php | 28 +++++---------- application/service/GoodsService.php | 34 ++++++++++-------- application/tags.php | 2 ++ .../quick_nav/2020/09/11/1599806993140373.png | Bin 1624 -> 0 bytes .../quick_nav/2020/09/11/1599808022935867.png | Bin 1485 -> 0 bytes .../quick_nav/2020/09/14/1600076479218479.png | Bin 1352 -> 0 bytes .../quick_nav/2020/09/14/1600076479297878.png | Bin 1475 -> 0 bytes .../quick_nav/2020/09/17/1600321639662998.png | Bin 0 -> 2442 bytes .../quick_nav/2020/09/17/1600322667732829.png | Bin 0 -> 2515 bytes sourcecode/alipay/pages/buy/buy.acss | 8 +++-- sourcecode/alipay/pages/buy/buy.axml | 5 +-- sourcecode/alipay/pages/buy/buy.js | 11 ++++++ sourcecode/baidu/pages/buy/buy.css | 8 +++-- sourcecode/baidu/pages/buy/buy.js | 10 ++---- sourcecode/baidu/pages/buy/buy.swan | 4 +++ sourcecode/qq/pages/buy/buy.js | 12 +++---- sourcecode/qq/pages/buy/buy.qml | 5 +-- sourcecode/qq/pages/buy/buy.qss | 8 +++-- sourcecode/toutiao/pages/buy/buy.js | 14 +++----- sourcecode/toutiao/pages/buy/buy.ttml | 5 +-- sourcecode/toutiao/pages/buy/buy.ttss | 8 +++-- sourcecode/weixin/pages/buy/buy.js | 10 ++---- sourcecode/weixin/pages/buy/buy.wxml | 5 +-- sourcecode/weixin/pages/buy/buy.wxss | 8 +++-- 31 files changed, 109 insertions(+), 116 deletions(-) delete mode 100644 public/static/upload/images/quick_nav/2020/09/11/1599806993140373.png delete mode 100644 public/static/upload/images/quick_nav/2020/09/11/1599808022935867.png delete mode 100644 public/static/upload/images/quick_nav/2020/09/14/1600076479218479.png delete mode 100644 public/static/upload/images/quick_nav/2020/09/14/1600076479297878.png create mode 100644 public/static/upload/images/quick_nav/2020/09/17/1600321639662998.png create mode 100644 public/static/upload/images/quick_nav/2020/09/17/1600322667732829.png diff --git a/application/admin/form/Goodsbrowse.php b/application/admin/form/Goodsbrowse.php index 39001b005..af60526df 100644 --- a/application/admin/form/Goodsbrowse.php +++ b/application/admin/form/Goodsbrowse.php @@ -105,7 +105,7 @@ class Goodsbrowse [ 'label' => '创建时间', 'view_type' => 'field', - 'view_key' => 'add_time_time', + 'view_key' => 'add_time', 'search_config' => [ 'form_type' => 'datetime', 'form_name' => 'b.add_time', diff --git a/application/admin/form/Goodsfavor.php b/application/admin/form/Goodsfavor.php index 4bbf37f30..d95b6dd9b 100644 --- a/application/admin/form/Goodsfavor.php +++ b/application/admin/form/Goodsfavor.php @@ -105,7 +105,7 @@ class Goodsfavor [ 'label' => '创建时间', 'view_type' => 'field', - 'view_key' => 'add_time_time', + 'view_key' => 'add_time', 'search_config' => [ 'form_type' => 'datetime', 'form_name' => 'f.add_time', diff --git a/application/admin/view/default/apphomenav/module/images.html b/application/admin/view/default/apphomenav/module/images.html index b75b0300d..8845c44b5 100644 --- a/application/admin/view/default/apphomenav/module/images.html +++ b/application/admin/view/default/apphomenav/module/images.html @@ -1,6 +1,6 @@ {{if !empty($module_data) and !empty($module_data['images_url'])}} -
+
diff --git a/application/admin/view/default/quicknav/module/images.html b/application/admin/view/default/quicknav/module/images.html index b75b0300d..8845c44b5 100644 --- a/application/admin/view/default/quicknav/module/images.html +++ b/application/admin/view/default/quicknav/module/images.html @@ -1,6 +1,6 @@ {{if !empty($module_data) and !empty($module_data['images_url'])}} -
+
diff --git a/application/index/form/Usergoodsbrowse.php b/application/index/form/Usergoodsbrowse.php index 18cf70402..639773a59 100644 --- a/application/index/form/Usergoodsbrowse.php +++ b/application/index/form/Usergoodsbrowse.php @@ -108,7 +108,7 @@ class UserGoodsBrowse [ 'label' => '创建时间', 'view_type' => 'field', - 'view_key' => 'add_time_time', + 'view_key' => 'add_time', 'search_config' => [ 'form_type' => 'datetime', 'form_name' => 'b.add_time', diff --git a/application/index/form/Usergoodsfavor.php b/application/index/form/Usergoodsfavor.php index eadd738c0..a5e0c6044 100644 --- a/application/index/form/Usergoodsfavor.php +++ b/application/index/form/Usergoodsfavor.php @@ -108,7 +108,7 @@ class UserGoodsFavor [ 'label' => '创建时间', 'view_type' => 'field', - 'view_key' => 'add_time_time', + 'view_key' => 'add_time', 'search_config' => [ 'form_type' => 'datetime', 'form_name' => 'f.add_time', diff --git a/application/service/GoodsBrowseService.php b/application/service/GoodsBrowseService.php index 9e702fb9b..1dadea8db 100644 --- a/application/service/GoodsBrowseService.php +++ b/application/service/GoodsBrowseService.php @@ -141,31 +141,19 @@ class GoodsBrowseService $data = Db::name('GoodsBrowse')->alias('b')->join(['__GOODS__'=>'g'], 'g.id=b.goods_id')->field($field)->where($where)->limit($m, $n)->order($order_by)->select(); if(!empty($data)) { + // 商品数据处理 + $ret = GoodsService::GoodsDataHandle($data, ['data_key_field'=>'goods_id']); + $data = $ret['data']; + + // 是否公共读取 + $is_public = (isset($params['is_public']) && $params['is_public'] == 0) ? 0 : 1; foreach($data as &$v) { // 用户信息 - if(isset($v['user_id'])) + if(isset($v['user_id']) && $is_public == 0) { - if(isset($params['is_public']) && $params['is_public'] == 0) - { - $v['user'] = UserService::GetUserViewInfo($v['user_id']); - } + $v['user'] = UserService::GetUserViewInfo($v['user_id']); } - - // 无封面图片 - if(empty($v['images'])) - { - $v['images'] = ResourcesService::AttachmentPathHandle(GoodsService::GoodsImagesCoverHandle($v['goods_id'])); - } - - // 商品信息 - $v['images_old'] = $v['images']; - $v['images'] = ResourcesService::AttachmentPathViewHandle($v['images']); - $v['goods_url'] = MyUrl('index/goods/index', ['id'=>$v['goods_id']]); - - // 时间 - $v['add_time_time'] = date('Y-m-d H:i:s', $v['add_time']); - $v['add_time_date'] = date('Y-m-d', $v['add_time']); } } return DataReturn('处理成功', 0, $data); diff --git a/application/service/GoodsFavorService.php b/application/service/GoodsFavorService.php index 0b85acf75..634048e17 100644 --- a/application/service/GoodsFavorService.php +++ b/application/service/GoodsFavorService.php @@ -204,31 +204,19 @@ class GoodsFavorService $data = Db::name('GoodsFavor')->alias('f')->join(['__GOODS__'=>'g'], 'g.id=f.goods_id')->field($field)->where($where)->limit($m, $n)->order($order_by)->select(); if(!empty($data)) { + // 商品数据处理 + $ret = GoodsService::GoodsDataHandle($data, ['data_key_field'=>'goods_id']); + $data = $ret['data']; + + // 是否公共读取 + $is_public = (isset($params['is_public']) && $params['is_public'] == 0) ? 0 : 1; foreach($data as &$v) { // 用户信息 - if(isset($v['user_id'])) + if(isset($v['user_id']) && $is_public == 0) { - if(isset($params['is_public']) && $params['is_public'] == 0) - { - $v['user'] = UserService::GetUserViewInfo($v['user_id']); - } + $v['user'] = UserService::GetUserViewInfo($v['user_id']); } - - // 无封面图片 - if(empty($v['images'])) - { - $v['images'] = ResourcesService::AttachmentPathHandle(GoodsService::GoodsImagesCoverHandle($v['goods_id'])); - } - - // 商品信息 - $v['images_old'] = $v['images']; - $v['images'] = ResourcesService::AttachmentPathViewHandle($v['images']); - $v['goods_url'] = MyUrl('index/goods/index', ['id'=>$v['goods_id']]); - - // 时间 - $v['add_time_time'] = date('Y-m-d H:i:s', $v['add_time']); - $v['add_time_date'] = date('Y-m-d', $v['add_time']); } } return DataReturn('处理成功', 0, $data); diff --git a/application/service/GoodsService.php b/application/service/GoodsService.php index 5e7a7a104..cd5afbfcc 100755 --- a/application/service/GoodsService.php +++ b/application/service/GoodsService.php @@ -357,10 +357,14 @@ class GoodsService $is_content_app = (isset($params['is_content_app']) && $params['is_content_app'] == true) ? true : false; $is_category = (isset($params['is_category']) && $params['is_category'] == true) ? true : false; $is_params = (isset($params['is_params']) && $params['is_params'] == true) ? true : false; + $data_key_field = empty($params['data_key_field']) ? 'id' : $params['data_key_field']; // 开始处理数据 foreach($data as &$v) { + // 数据主键id + $data_id = isset($v[$data_key_field]) ? $v[$data_key_field] : 0; + // 商品处理前钩子 $hook_name = 'plugins_service_goods_handle_begin'; $ret = HookReturnHandle(Hook::listen($hook_name, [ @@ -368,7 +372,7 @@ class GoodsService 'is_backend' => true, 'params' => &$params, 'goods' => &$v, - 'goods_id' => isset($v['id']) ? $v['id'] : 0, + 'goods_id' => $data_id, ])); if(isset($ret['code']) && $ret['code'] != 0) { @@ -386,15 +390,15 @@ class GoodsService ]; // 商品url地址 - if(!empty($v['id'])) + if(!empty($data_id)) { - $v['goods_url'] = MyUrl('index/goods/index', ['id'=>$v['id']]); + $v['goods_url'] = MyUrl('index/goods/index', ['id'=>$data_id]); } // 获取相册 - if($is_photo && !empty($v['id'])) + if($is_photo && !empty($data_id)) { - $v['photo'] = self::GoodsPhotoData($v['id']); + $v['photo'] = self::GoodsPhotoData($data_id); if(!empty($v['photo'])) { foreach($v['photo'] as &$vs) @@ -412,7 +416,7 @@ class GoodsService if(empty($v['images'])) { // 获取商品封面图片 - $v['images'] = ResourcesService::AttachmentPathHandle(self::GoodsImagesCoverHandle($v['id'], isset($v['photo']) ? $v['photo'] : [])); + $v['images'] = ResourcesService::AttachmentPathHandle(self::GoodsImagesCoverHandle($data_id, isset($v['photo']) ? $v['photo'] : [])); } $v['images_old'] = $v['images']; $v['images'] = ResourcesService::AttachmentPathViewHandle($v['images']); @@ -460,9 +464,9 @@ class GoodsService } // 是否需要分类名称 - if($is_category && !empty($v['id'])) + if($is_category && !empty($data_id)) { - $v['category_ids'] = Db::name('GoodsCategoryJoin')->where(['goods_id'=>$v['id']])->column('category_id'); + $v['category_ids'] = Db::name('GoodsCategoryJoin')->where(['goods_id'=>$data_id])->column('category_id'); $category_name = Db::name('GoodsCategory')->where(['id'=>$v['category_ids']])->column('name'); $v['category_text'] = implode('，', $category_name); } @@ -474,21 +478,21 @@ class GoodsService } // 获取规格 - if($is_spec && !empty($v['id'])) + if($is_spec && !empty($data_id)) { - $v['specifications'] = self::GoodsSpecificationsData($v['id']); + $v['specifications'] = self::GoodsSpecificationsData($data_id); } // 获取商品参数 - if($is_params && !empty($v['id'])) + if($is_params && !empty($data_id)) { - $v['parameters'] = self::GoodsParametersData($v['id']); + $v['parameters'] = self::GoodsParametersData($data_id); } // 获取app内容 - if($is_content_app && !empty($v['id'])) + if($is_content_app && !empty($data_id)) { - $v['content_app'] = self::GoodsContentAppData(['goods_id'=>$v['id']]); + $v['content_app'] = self::GoodsContentAppData(['goods_id'=>$data_id]); } // 展示字段 @@ -502,7 +506,7 @@ class GoodsService 'is_backend' => true, 'params' => &$params, 'goods' => &$v, - 'goods_id' => isset($v['id']) ? $v['id'] : 0, + 'goods_id' => isset($data_id) ? $data_id : 0, ])); if(isset($ret['code']) && $ret['code'] != 0) { diff --git a/application/tags.php b/application/tags.php index bf63f60f3..afc5f3878 100755 --- a/application/tags.php +++ b/application/tags.php @@ -134,10 +134,12 @@ return array ( 'plugins_service_goods_handle_end' => array ( 0 => 'app\\plugins\\exchangerate\\Hook', + 1 => 'app\\plugins\\usernotloginhidegoodsprice\\Hook', ), 'plugins_service_goods_spec_base' => array ( 0 => 'app\\plugins\\exchangerate\\Hook', + 1 => 'app\\plugins\\usernotloginhidegoodsprice\\Hook', ), 'plugins_service_order_pay_launch_handle' => array ( diff --git a/public/static/upload/images/quick_nav/2020/09/11/1599806993140373.png b/public/static/upload/images/quick_nav/2020/09/11/1599806993140373.png deleted file mode 100644 index e493b07d47e987a80fa4774e5c0c97bbc6bcbc34..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1624 zcmV-e2B-OnP){+W@%DV7Uyub_U)I>=aA}_S*>j>C8;695+u<0OkS05|Xv_78_K zlEoJh$w}S-_zB>==6Raatb6W=x*++iIK)3)Uss=TcHnuh%CQN_QL7CcD(Izgd~}Eg z4i)qpLP%G}=nxIap(n;9rEDs4gdgFQkpsv8%ta(C4mJ_=BY-=H3riVKB61HLZaM(n zA&%I@9m#8;nV>C)IARk&fd-}n07!lSn7Uj}+PMGHaDXM+6LgNiq3j~6egpU#U-ucq zI?p<%>iY#I0B)7JW=#dX0C24we~OIDAkqhuzOaTdVbcWt(p1o9C?_HwL=~_@ zqx&M{2#o{E0L+^>!(xz3IeuuRX6X1^IhKjYvXP*pHfe&MlAJUdd!W!Lh$YZ0yxSP4 zgp(@-M8(obwO7DL&0jcvI zRzZ4$RPz+Hl_93iduaK?vdk)a3fgKxNS61A3Z&iJR<`UW=n5teNSF7RLJt78@(S-b z+9LZeo#*KbEdSGEN^htzy3=6C@ z#!ijC+Tc1Ye)@Y0b9D*J!K;eahM=u@I<*i_OH_{6KD)x6|=*(EkRpYP?Iy24JUvT{qa&z0KTX3a3km0M9!Y9}fM+7z@k@z5Qjr6`s0bDM&;CLX%!&@$Xy zBa)5=l79@RIN0SFMxs(_Hh}i~I;?nlkXlW<$F6fhTLJt~3jr1bxzlWPrO`vBOf?0m zD&ZXuhMgW{;$kE!wfYXdI+d!BVcV`v7?wD{Vzd1f*lvmK)3I6=Zw)SOyBcC(|BUn( zeBRXQ#A-#*3~f?7J#ixVtIiTUcW1b!$)|w(y6YU>HJbJ^i`1~%BBBmlogv9vR0}zW zvD|ndSl{%-Yi02MAo*eO(2V<5jA#gkJx(nlryhCigr_sKOve5C-a;c9g5+G$=F0NU zDZx{twcfh!97fOJDQGR4ICCBND*YvJk6GN1xRmKbW zCu=0{l!p_{?>jdUtg1m{(zV+U3az3q)rrVJfPDj2dzYb)Tc zpv|rAnY0e;S&sgNkLVPv;_Q~N8ETA{6X`6*rd|7dW-0QB_xxylf8##9-qu8b0&+Ktsk^5=(oCbZ+T7UG~ zg-#GcxJ!I)F_|HRJ}*OPu3_*SGlcsn3o=6>nkxJ8S{HOmhyuUCXXpP5fJL2#$NvF# W_`SvLu2V7q0000fq(a;=~&edmp;RV)y7b)&;(dSa0I(Y*>?e@a0(e2t_#Ho( z4S)arZ~p9&2_3rTnXk9?z57gHl84ARe3T3({y6dg0pO7OzKQ~CUkuNkrY0C?3fXO{ z@rncVMemH@E2kW%)9e<*=45?jBbWq@WK)~Tq(36Q@SZHk&kBTvOlsD}nq)(9N$BpJ>r~~3FHKq9wi;oR(8r~OX{yKt zOSyisx^NE<;^)_Bu{zKfqfssAehtclhZmlEuA2PsR{i(yTuR--k@=~@!Z zWb+`}OlwNUy_*hclg-u-Yoav|!+lrSgY=53H65CU6p^#z&6G4_X2C9NqQBEE*+mdd z*W#Q$%zS)PqIvfvr=!{KYbLY@ZWbQMu^37%DMh1y6+gcZb&laR~R`yp^Eeby$hi34GWPvP2UO6EJv)(q6l-g7|<*JJ7n=f24pCrx-}X2Mzv<4 zEE^c;CaguKP(U_6nzI+bC?DmrjoJhK%`&Uv3f#sR+BJ{c!DDAAk9gQwPhY;ioH^@0 zY9eAQO?_DC%|Z3Mb7N4ZF|1a8=#4>H&4wGG_xhOx-l6YI>uz?(XyY86A zTtr9!f<0YqMi5R*&^9Rdqs<*6(;8Ulg+NcC0X63Zmw*Y;Oh^i%Z!+&GX39t5T8Pd? zkbh%-y5@@iq5?&0Cc30HyHyii6n+q$2_+C+lr6PF2}DaQwyhEG!u5fcK(yB2 znW7C%UgPHk*Q^)Hh9yZXLc8wWZdefF&{hF?d7Uj0{gvq2b%3|Xu@ZzN*_OyQ96W9* zondxBIOH!@dhnchEG_O09zW?=MF7)IJU2;aA%sg~II~=JyO;>I90!b_cy3x6HbQo% z;Rn=~M?{#iF&iv3Dpvu`9@9=>Ke7B}YB{EBZ>K@Y&WoNYXDsugDM2|}&YChsd;0{t zuKEaT#`8p_0NAg(U>Q?y1PFyaFPNs~cJFyX zu)$MI#0dpz?^NLGicY=PbY>94n+))0M^vJ{Q-Q0NkKOxnbAotDKsU&TU*}N^aP_E$ z2>n{1%M?lHGf`y@7Zy`8=`_Hy3rch$Y4%o)CY9#`>aN34nMU zCB8r+9>e`X@&F=a$Gg2EQ{g@f17`yI0Wh~F1bPK#{V#&a1nBRZd4GFSKWF%d@_pCB zz?#53$+-H4WZNCq*6r^EMXOIltkJl>61tCnatpZbs5g2I-s%QW!I00000NkvXXu0mjf{c^a= diff --git a/public/static/upload/images/quick_nav/2020/09/14/1600076479218479.png b/public/static/upload/images/quick_nav/2020/09/14/1600076479218479.png deleted file mode 100644 index 33983889019d68007186de6e68cb806f6fba9c92..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1352 zcmV-O1-JT%P)8Uw$&fC*FbNY83n48E%u`7zL1ZZz zX%vZQkrG6ZmU1YC{>TziE9eJ_NVC(Op!t(VznntDLaEG)2rtT_x{&bgV)iEM%{nZ9SK>zWKgyzk4y?nzhy}h(schNF)-8L?V$$Boc{4BK1V=7~Ad(lt<-A+EZz~ zJOkScfO)`7;GEzYRmbnZc3_93mqG_?DYWe^z}(PD)PO-rmxm0HDYWf_z~qp@YsPj- zvqL#QEA67~75u+M2AE}gaVY1hJ=*pcz?4uyYs^=YE)C&$h|spr2YyMh{SMe1B8e_B ziS+t2O45no(QWrRom+wjuaFkMv#$f66K!v>{jKfqZTC0ZMzrB4{J-3z*d7fm2bKXN zPitCb8%e8Ei(#ZVwwD2)0FUx-k((@n_Ih;WG#W2*4**x>n2v!cblcdTMe>-K)y{oU z=z`duN+R%r;oKjE&cXIL{wZ|Bu4z%|3~ZlEBJOhF!UDIP0KNqJ(i-EaBL&+_fX{$6 z6chOoNuydB#2!7A=Yh)#+HRDzw1{Es(L*UB@&IsAQIVmGLfam1dt$fZ50hQMbV+k0 z9c$;tt_a;&P&fj7ZTlnJw{|0sHW&o%lytqM{iS#eG1>AT|4TCbZ?ZkMj2H#;Sd@{+ z=^SaiVi)zfJIx7nr$^tOaeXnc*Y=`{^7y$$+i~DANtZ}^p^RX4D~98Mmu+vcU9|EK zmn@;*2Bt}RqRe1*6S~PQG|N~1PHOFAIwHsF5XryTPo zB*n64c2U(v=q8e01ZDtl<(OU!Y_WYq_^djoc0vP4IxOi9;9ekas5PO2lscxCLbu7O zZYNNLTFyt?o&fX%^K(oO0egZcR06f@(YEgc_L491HejBlL*cXPoZ9s0#@xngAaBa_ z7_g>_&EsWK8=-;Szy&!ruaJm*G<-VcQYWEXiF^QfT+-I6k|~=y37y3=BqIOT?L<1E z&O(1cBJj>`CsGEr8+8DG0xKoW2rP0|Cwnf$8fG_yKH8#f0GJ_ZZ3TH`)r2X)JGS4m zeO+0>x*>Fb%C#SXrHy6$&nwDfbWZ!t!27mew>`eoV3iBq7@FM!>?9F*9m!sajTNU- z^hM_`;E3(@w$Cmtdg$#2b)m)YY{jp(SGDk2tL+B8%t)Z$_7Ar2Zs*1*^ic9vc>u-& zui8FXv|vV|hq4~Hl49RfP9`asJMs!<6gmY-pGsN?%qBSjA&;3PdkHg%LbpIt^F#cF zK#^f*UsgjDx&V?klRQoyr1c9|CQ;~uNIE5H9f{y;Ne)&iOcc6JBpsKu5|{=Qe#weL z4--k>G(N4E4z!vlAA~4$$4J^QX&x|#^o8PQA$_VaYl3}hhNE6(QpWYRp1n;Z4FCg; zjr2DHe*uRjy$R_Dql^Il0MaH<_6#S9nlhQ8Gk7O~^CX=tJ6P6HKOX{DmmRDJ_*l|a zAslBtqc?>J)&r~z$%_H~kS0T1#30000< KMNUMnLSTXysB*jj diff --git a/public/static/upload/images/quick_nav/2020/09/14/1600076479297878.png b/public/static/upload/images/quick_nav/2020/09/14/1600076479297878.png deleted file mode 100644 index b34e5e88239d070ad5df5af1db0dedb58315237e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1475 zcmV;!1w8tRP)-RQ$_WFO{`p=qK*V$4ckw_#Gi9{liNF)-8L?RK0`P>A|mNYDBp``0; z&1i7=Q_?X>$Ia}IZZ~%|8hBCCmI@M^%Dic2FO}U;Xf!Y+X{)4lRcAFt`NGWZD|+*q zl7h+PFjfHTi{5m$Xkdk;&udF*YIDDteU`s?ZNbgAJFa~q>42n@Rc1B73`u%e(j&R+ zizIaz?F86OCyOdhbl?HjIDFb0B5*KYy2gA58i&ybUH6rBhKUMEMmIzuNGZYxOSskaW-7#wBvsxD#^?5VL* zWh0UzY8hFy^7+U!htW{s=Yd~6gxA(nwZg5UBG%NH$6Am07l5~71577dj~KJMQWH@x5b~|s-ue?EpHYB)2j?x)XV#CNM5bC4mek0VpW_2qRyz0 zb$l+C$LNIwo?Q?)=&K71)!}Fth5~bR4c{PQ*ciO1WM;oh+TeI=X`s}Dp|L9Sf0zA%)HC zGH|b?O_Jt$78}XE{>ro5xTG;NyX<-Y1o?^CvB2`Z1HA2MHMN~)0!AG1Mrw?g-KFb3^{bxc&YIbWzIo*_vvJ^QN$)HB zV`~|Y$#(`x_pPj*z>L_$W1!)gVL=WvfNfp8>G??5X-UsYy2H$#FtbaQWIsTd*(Ec3 zM$$c!-c`U%*n1ppW;aLVHYG8$Ly`_j+5moMUefvKhDb&?L^8S|2Fd7ely%4xoNiqk z2zuFJX_VHE%ob%mz9fAev18I-xW>_wom0P3$2dCC1Ig%yNJckAGP)s>(G8J|ZiphI zJ65GgkNW8V_rXr*k&B`U%Mo=xift26^zf>2GaL6vY?j;)#u`M1Bt7J~e$-n5SkYy1 z+r_Rfn%jVXB6J6huyY^4_J|;N6==E6u}wu@F7mUiGu*83)00Jiv8e5@5B-Fhy&hGN zY>(^>-;cA4){)xU(d4te>xbZJc(=zIpEI)$JaksceTse%33{w?B9TZW5{X12kw_#G di9{k1%zw*z18J*K*oFWA002ovPDHLkV1gCIz)b)E diff --git a/public/static/upload/images/quick_nav/2020/09/17/1600321639662998.png b/public/static/upload/images/quick_nav/2020/09/17/1600321639662998.png new file mode 100644 index 0000000000000000000000000000000000000000..ccfaf7aa1873ba19dfe9b0f871b415b6f7b328ef GIT binary patch literal 2442 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 IM6N<$f*Ws~$p8QV literal 0 HcmV?d00001 diff --git a/public/static/upload/images/quick_nav/2020/09/17/1600322667732829.png b/public/static/upload/images/quick_nav/2020/09/17/1600322667732829.png new file mode 100644 index 0000000000000000000000000000000000000000..f6d04789fa5494fa7828b7308d1b1957d90c6f0a GIT binary patch literal 2515 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 - -