From 37f7f83d215ea3e65634d43e270c57a2bd7e0d84 Mon Sep 17 00:00:00 2001
From: jiannibang <271381693@qq.com>
Date: Fri, 6 Jan 2023 10:19:34 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E8=B7=B3=E8=BD=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Popup/Popup.js            |  29 +++++++++++++++++++++--
 src/components/Popup/Popup.scss          |  14 +++++++++++
 src/components/Popup/toDetail.png        | Bin 0 -> 2049 bytes
 src/pages/Coupons/ScanModal/ScanModal.js |   4 ++--
 4 files changed, 43 insertions(+), 4 deletions(-)
 create mode 100644 src/components/Popup/toDetail.png

diff --git a/src/components/Popup/Popup.js b/src/components/Popup/Popup.js
index 7b7ab17..f2c9841 100644
--- a/src/components/Popup/Popup.js
+++ b/src/components/Popup/Popup.js
@@ -5,6 +5,7 @@ import "./Popup.scss";
 import navpng from "./nav.png";
 import arpng from "./ar.png";
 import couponTop from "./couponTop.png";
+import toDetail from "./toDetail.png";
 const Popup = ({
   showPopup,
   defaultPopup,
@@ -46,8 +47,32 @@ const Popup = ({
           <div style={{ flex: 1 }}>
             <div className="popupname">{shop.name}</div>
             <div className="popupdesc">
-              <span> {shop.shopFormat ? shop.shopFormat : " "}</span>
-              <span> {shop.floorName}</span>
+              <span className={`popupformat ${shop.webUrl ? "hasDetail" : ""}`}>
+                {shop.shopFormat ? shop.shopFormat : " "}
+              </span>
+              <span style={{ display: "flex" }}>
+                {shop.floorName}
+                {shop.webUrl && (
+                  <img
+                    className="toDetail"
+                    src={toDetail}
+                    onClick={() => {
+                      if (window.my) {
+                        window.my.navigateTo({
+                          url: `../detail/detail?url=${encodeURIComponent(
+                            shop.webUrl
+                          )}`,
+                        });
+                      } else
+                        window.wx.miniProgram.navigateTo({
+                          url: `/pages/detail/index?url=${encodeURIComponent(
+                            shop.webUrl
+                          )}`,
+                        });
+                    }}
+                  />
+                )}
+              </span>
             </div>
           </div>
         </div>
diff --git a/src/components/Popup/Popup.scss b/src/components/Popup/Popup.scss
index 3253f05..b5bdd32 100644
--- a/src/components/Popup/Popup.scss
+++ b/src/components/Popup/Popup.scss
@@ -76,6 +76,20 @@
         font-size: 14px;
         line-height: 20px;
         color: #a1a5b3;
+        .popupformat {
+          white-space: nowrap;
+          overflow: hidden;
+          text-overflow: ellipsis;
+          width: calc(100vw - 245px + 70px + 16px);
+          &.hasDetail {
+            width: calc(100vw - 245px);
+          }
+        }
+        .toDetail {
+          width: 70px;
+          height: 21px;
+          margin-left: 16px;
+        }
       }
     }
 
diff --git a/src/components/Popup/toDetail.png b/src/components/Popup/toDetail.png
new file mode 100644
index 0000000000000000000000000000000000000000..389aaa8da229b3fa008068362ae1176183174084
GIT binary patch
literal 2049
zcmV+c2>$npP)<h;3K|Lk000e1NJLTq004{t001fo1^@s6VTH5J00009a7bBm000&x
z000&x0ZCFM@Bjb+0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH2bM`hK~#7F?VLSq
z6h|0_XU;faA&A{LRA3iCLkJDH0tE{?ERd2&mY{P)5hO<_6%i6aLZOO4NJ)W0svucP
z3QJB$1PP=88VhJ3g&}FkHRjJTVDMz084upuo!#5rn=?erBUyLe-P@g=dB30eX78j(
z@c8lUhq9w%@BIAyJ}E?>2)u>JNh!r-M{WLiS6A2FhCTL;QmXsOlV@K=TRs<ozygs#
zPS4FPKi<<LA1wTD#4_{m^Gng|77+-fkdrUw-r0$0YW$0531SIkqqcN*K0C%cIXgSs
z_u{3T5`jQ7l-gN)IbS;_0)YZ3*|E2#ln9|HP>^Wm{P@XJB?5th)I=aqf*_bcDcUNS
zvCB%FyRh^TZ|12Gx9%x1aZQQ(gZ$(2;2alkWVfGtoBBuOLK`mL5QR815w-dHo1Gyn
z6K&+yUqaL$3Nf-<RHFXCbl%Lf#=+&Bdizte4^imXhl}rDwc&3ij(j9j=jO9V&nx|U
zV!sr<-Rb>jelh3Tv{t0{BczGz>{nuRj}%#OOmDXmgPUc;xn~@y<Hego^w)(LSfAdv
za)pfk#A~OrV6dF{z_?%lIcDrizSYnXLtE3GPG|Gi3<h)M^62&5XmHm>ud9s!`rk9#
zvaUI>LF%?4oTO;jkI)YP5P8X8Bhh`_*goquhPO*m7S5ODb?{gRze{f)-P0(#*F|-~
zTwk>GW{h3Q-_M{9ZB1_<+9t)o#>Q<3!&=(WAC(?t2D=Kw+qt%kJc(O0{cB9SxYt|v
zj2MAXh4&oXoGr*a7<hZGID{lb&V47r%as97i!c#1=k!Ho!JIhY9wglD$)C+Y&de^l
z^s9dwi%q)rJZwlxp5NpsMz8}L%mC)mzeZ}IxnR&)QbRPf5rM=*#^C!Vv=Vx3K7;`v
zTK3sCHVYZFkz*LVtieAsv3TBAxq2tMpF4Og<qWx1@mhzWk>@U$5P=In`IFLvdiIdi
z)<ef*)kRz@pF8-ipQdsBW}bjhU@Z~x6irkuqk9(bi~NRuIRAyz_h3V&&X*Pp4ev;Q
z6oEb~8~SvP7F}biZoJ^BPqU4t3|^96tOu*318}D!yVA#u4oQ8C84RU6Vbi+oPT=OU
zyx7&-CgG$LU9LSzk+2bW+XL$nSX!*KpK}?nl>B^STa)=6IT~RPL*N|4J7g-PXN9Ex
zUQrsIgMA{kXt)lqr$$=Ofhr3I1(Wz{w^ujuodM2^wTOg7laO`vywHQ9g|oKNW!jL?
zyV`wSu4!C%F%Lv2iH8hV2#bd;@}_}}>CPoVrk%~K-HIX({loe3!idM!Pd-Bu&<4ij
z@b_l=k03GJR;VNxF3c1V=m@5jE~_KIs6T4lh6NEKaQO@XQ`cx&OCM`zB6O<Ro{wub
zk;U+K^=hCIYm&2vgcp|$h}xAiAVfk{UTuopY~R=J{o`MjA8bTJzvA5(Gi{_hs*9$Q
zV2IWAM++Hvujv48Gz$dg0`+5!geW|ZrN39|0ZxL*IKIm41TSWZTN&5RYkL*2=9OLP
z?IXM8LK3~S#W`!#qyuAr&^F~PV-%s1V08Fd$UpRe-&~mPb`|@)ojnbHU}g;Q!33tW
zgorp)jky*cDz8vhgt*Jk5(~+yt8C!%0J=Z+Hx}kxxfOlHc5=6@;+>1$?$&b;jI939
z)Sd8hc=ReI0dJMwp>4%8c^ciUHq&tYWn&pYK2m1(gcqyQF@%rg(g7aM76;={%ZY>G
zB$MDIdBwXVCk~Xa!#Gi`d$zVN4fr4~7Q73VQ3O0e(P^uTkzMHlCw!5cH1lv}3W<41
zs9DPrUSNV^`w_#gVnpCgFca5A?m}IhW{ZCI7;+zqY22I*M}@tZP%Q~&smPrXDd9yh
zQ}^*`<~{w#%(N=r1Y_53ia=7Bx5|rUF-x+QT&!^aH<5U5N8#w6KT*C3<b_us_dp0|
zh6L1iS`iC)6AS}eCWpxr4EYUWNm>J<Y<EbqOB-3xZi-+ovI>oPxXKZ)u65rmsZ_;^
zg$V}6>?)|1#hYNbxuPM7WAnhHAedyL*Y1!+zO<=NrfNqGD3QOvBzgBke^wQYeSE_f
z5tFO!Rq-YmZmbn+h{FxKk}~3XQBjr!u}~g35>4sPe&+66rqfLMtFDf_Xje$$K`bkl
zsxw6wEej@Z&8Hb<m))7p7JVj!^(K}Oih@`;chQjNi*|)1*27q-rda4pEYP}OR(Prr
z6hJTh6<lW_eispp4UdS073Za<T_Fii=qn7xsU#RXi}4AMamJSiT=))2xO}tJ@Os3O
zg<TwFR`{k-NiZvyOZ}XxPdH~Ye1{~wBjMEN6KOuMkBWe<EH9A<FT(%ki)?14wRq?0
zT2I|f!+otn+cmQ?c@6{5XOg0{56HVhENy2hte;cv_Sb$Ngl|3uN)f)u7AQq6axZs9
zAW)3S$ivjeMIcZB#c$v7BZxxEOCk_x!izc8Ut6`R>o+B8r$r!;0~+b+>AI_n8q?FN
zds*l6OZ=9Z2n13jeiV^6YzUqvkOWOwvG9MYY&tzX+t<-qI~MKO5<Je^iJ3Xq#$|^b
fU)9z5dwk!28?kl8-<dox00000NkvXXu0mjfP?FOG

literal 0
HcmV?d00001

diff --git a/src/pages/Coupons/ScanModal/ScanModal.js b/src/pages/Coupons/ScanModal/ScanModal.js
index 489fe46..39b5b45 100644
--- a/src/pages/Coupons/ScanModal/ScanModal.js
+++ b/src/pages/Coupons/ScanModal/ScanModal.js
@@ -24,8 +24,8 @@ const ScanModal = ({ onBack, onCode }) => {
             onCode && onCode(code);
           }
         )
-        .catch(() => {
-          toast("启动二维码扫描失败");
+        .catch((error) => {
+          toast("启动二维码扫描失败:" + JSON.stringify(error));
           onBack && onBack();
         });
       return () => {