Merge branch 'dev' of https://git.1000my.com/project-shenyangk11/sy_k11_H_base_daoshi_vue_ts into dev

public/static/offline/JSON/getBackTime.json

@@ -1 +1,5 @@
-{"code":200,"msg":"操作成功","data":[60,60]}
+{
+  "code": 200,
+  "msg": "操作成功",
+  "data": [600, 600]
+}

src/assets/images/nav/go_icon.svg

@@ -0,0 +1,10 @@
+<svg width="40" height="40" viewBox="0 0 40 40" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_514_14640)">
+<path d="M3.24333 15.5252C2.37333 15.2352 2.36499 14.7669 3.25999 14.4686L35.0717 3.86523C35.9533 3.5719 36.4583 4.06523 36.2117 4.92856L27.1217 36.7386C26.8717 37.6202 26.3633 37.6502 25.99 36.8136L20 23.3336L30 10.0002L16.6667 20.0002L3.24333 15.5252Z" fill="white"/>
+</g>
+<defs>
+<clipPath id="clip0_514_14640">
+<rect width="40" height="40" fill="white"/>
+</clipPath>
+</defs>
+</svg>

src/components/ShopDetail/ShopDetail.vue

@@ -74,7 +74,7 @@
           </scroll-view>
           <!-- 导航按钮 -->
           <div v-if="shop.yaxis" class="go" @click="handleGo">
-            <img src="@/assets/images/shopDetail/bg_go.png" alt="" />
+            <img src="@/assets/images/nav/go_icon.svg" alt="" />
             <h5>{{ $t('shop.goBtn') }}</h5>
           </div>
           <!-- 关闭按钮 -->
@@ -195,11 +195,11 @@ useStatistics({ tag: 'shop', shopCode: shop.value.shopCode })
   }
   .logo-wrapper {
     position: absolute;
-    top: -32px;
-    left: 300px;
+    top: 32px;
+    left: 852px;
     z-index: 1;
-    width: 152px;
-    height: 152px;
+    width: 150px;
+    height: 150px;
     padding: 12px;
     background: #fff;
     border-radius: 0;
@@ -211,12 +211,12 @@ useStatistics({ tag: 'shop', shopCode: shop.value.shopCode })
   }
   .name-wrapper {
     position: absolute;
-    top: 40px;
-    left: 852px;
+    top: 65px;
+    left: 1058px;
     z-index: 1;
     .marquee-wrapper {
       overflow: hidden;
-      width: 700px;
+      width: 546px;
       margin-bottom: 12px;
       white-space: nowrap;
 
@@ -253,6 +253,8 @@ useStatistics({ tag: 'shop', shopCode: shop.value.shopCode })
 
     .shop-attr-group {
       width: 500px;
+      margin-top: 70px;
+      margin-left: -209px;
       .ul {
         display: flex;
         margin-bottom: 17px;
@@ -281,9 +283,9 @@ useStatistics({ tag: 'shop', shopCode: shop.value.shopCode })
     left: 852px;
     z-index: 1;
     overflow: hidden;
-    width: 722px;
-    height: 165px;
-    padding-right: 14px;
+    width: 578px;
+    height: 172px;
+    padding-right: 16px;
     .intro {
       font-size: 14px;
       font-family: 'font_regular';
@@ -298,20 +300,24 @@ useStatistics({ tag: 'shop', shopCode: shop.value.shopCode })
   }
   .go {
     position: absolute;
-    top: 38px;
-    right: -75px;
+    right: 8px;
+    bottom: 8px;
     z-index: 1;
-    width: 150px;
+    width: 118px;
+    height: 218px;
+    background-color: #a6976f;
     img {
       position: absolute;
-      width: 150px;
+      top: 69px;
+      left: 39px;
+      width: 40px;
     }
     h5 {
       position: absolute;
       right: 0;
       left: 0;
       display: block;
-      margin: 85px auto 0;
+      margin: 125px auto 0;
       font-size: 22px;
       font-family: 'font_bold';
       text-align: center;

src/views/Art/ArtMapItem.vue

@@ -16,7 +16,7 @@
       </div>
     </div>
     <!-- 编号 -->
-    <p class="art-number">{{ artInfo.artNum }}</p>
+    <p class="art-number">{{ artInfo.tag }}</p>
     <!-- 导航按钮 -->
     <div class="go-container" @click="clickGo">GO</div>
   </div>