feat: 增加详情跳转

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>

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;
+        }
       }
     }
 

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 () => {