tremble 3 years ago
parent
commit
99671cb689
3 changed files with 8 additions and 7 deletions
  1. 2 2
      public/index.html
  2. 1 1
      src/components/Tags/goods-list.vue
  3. 5 4
      src/components/Tags/waterfall.vue

+ 2 - 2
public/index.html

@@ -27,8 +27,8 @@
 
         <script src="<%= BASE_URL %><%= VUE_APP_STATIC_DIR %>/static/lib/jweixin-1.6.0.js"></script>
         
-        <script src="<%= VUE_APP_SDK_DIR %>/kankan-sdk-deps.js?v=4.0.0-alpha.46"></script>
-        <script src="<%= VUE_APP_SDK_DIR %>/kankan-sdk.js?v=4.0.0-alpha.46"></script>
+        <script src="<%= VUE_APP_SDK_DIR %>/kankan-sdk-deps.js?v=4.0.0-alpha.47"></script>
+        <script src="<%= VUE_APP_SDK_DIR %>/kankan-sdk.js?v=4.0.0-alpha.47"></script>
 
         <!-- <script src="https://4dkk.4dage.com/v4/www/sdk/kankan-sdk-deps.js?v=4.0.0-alpha.44"></script>
         <script src="https://4dkk.4dage.com/v4/www/sdk/kankan-sdk.js?v=4.0.0-alpha.44"></script> -->

+ 1 - 1
src/components/Tags/goods-list.vue

@@ -15,7 +15,7 @@
             <div class="info">
               <p>{{ i.name }}</p>
               <div v-if="i.skus">
-                <span>¥</span><span>{{ i.currentSku.price }}</span>
+                <span>{{i.price[0].symbol}}</span><span>{{ i.currentSku.price }}</span>
               </div>
               <ul>
                 <li>

+ 5 - 4
src/components/Tags/waterfall.vue

@@ -7,13 +7,13 @@
           <ui-icon @click="emit('close')" type="close"></ui-icon>
         </div>
         <ul class="wfcon">
-          <li v-for="(item,i) in 5" :key="i">
+          <li v-for="(item,i) in tagclick.data.products" :key="i">
             <img v-if="i<=2" :src="require(`@/assets/images/icon/${i+1}.svg`)" alt="">
             <span v-else>{{i+1}}</span>
-            <div class="wfavatar" :style="{backgroundImage:`url(${require(`@/assets/images/icon/gifts_on.png`)})`}"></div>
+            <div class="wfavatar" :style="{backgroundImage:`url(${item.pic})`}"></div>
             <div class="wfinfo">
-              <p>這裏是商品標題</p>
-              <p>¥ 198 | 查看 ></p>
+              <p>{{item.name}}</p>
+              <p>{{item.symbol}} {{item.price}} | 查看 ></p>
             </div>
           </li>
         </ul>
@@ -89,6 +89,7 @@ const emit = defineEmits(["close"]);
           margin: 0 10px;
           background-color: #fff;
           border-radius: 4px;
+          flex-shrink: 0;
         }
         .wfinfo{
           text-align: left;