w-front-end / select_good · Commits

Commit 0b12ecb6a1424291afa263119c50374ec45b05ce

Authored by 王强
1 parent 7b6876fc

组件重名冲突，已修改组件名称~

Inline Side-by-side
Showing 3 changed files with 8 additions and 8 deletions
src/components/goodsItem_4/goodsItem_4.less renamed to src/components/goodsItem_6/goodsItem_6.less
  View file @0b12ecb
1 @charset "UTF-8"; 1 @charset "UTF-8";
2 2
3 -.goods-item-4-box { 3 +.goods-item-6-box {
4 background-color: transparent; 4 background-color: transparent;
5 width: 100%; 5 width: 100%;
6 height: auto; 6 height: auto;
src/components/goodsItem_4/goodsItem_4.vue renamed to src/components/goodsItem_6/goodsItem_6.vue
  View file @0b12ecb
1 <template> 1 <template>
2 - <div class="goods-item-4-box" v-if="item" @click="jump(item)"> 2 + <div class="goods-item-6-box" v-if="item" @click="jump(item)">
3 <div class="main-box"> 3 <div class="main-box">
4 <div class="img-box"> 4 <div class="img-box">
5 <img v-lazy="item.simg + SIGN.SMALL" class="simg" /> 5 <img v-lazy="item.simg + SIGN.SMALL" class="simg" />
@@ -89,5 +89,5 @@ @@ -89,5 +89,5 @@
89 89
90 <!-- Add "scoped" attribute to limit CSS to this component only --> 90 <!-- Add "scoped" attribute to limit CSS to this component only -->
91 <style rel="stylesheet/less" lang="less" scoped> 91 <style rel="stylesheet/less" lang="less" scoped>
92 - @import './goodsItem_4'; 92 + @import './goodsItem_6';
93 </style> 93 </style>
src/components/listCom/listCom.vue
  View file @0b12ecb
@@ -8,10 +8,10 @@ @@ -8,10 +8,10 @@
8 <!-- 循环输出数据 --> 8 <!-- 循环输出数据 -->
9 <div class="item-box" v-for="(item, index) in lists.list" :key="index"> 9 <div class="item-box" v-for="(item, index) in lists.list" :key="index">
10 10
11 - <!-- 商品列表(goodsItem_4) -->  
12 - <goods-item-4 v-if="lists.style == '4'" @jump="jump" @primary="primary" 11 + <!-- 商品列表(goodsItem_6) -->
  12 + <goods-item-6 v-if="lists.style == '4'" @jump="jump" @primary="primary"
13 :item="item"> 13 :item="item">
14 - </goods-item-4> 14 + </goods-item-6>
15 15
16 <!-- 美食列表 --> 16 <!-- 美食列表 -->
17 <goods-item-5 v-if="lists.style == '5'" @jump="jump" 17 <goods-item-5 v-if="lists.style == '5'" @jump="jump"
@@ -31,7 +31,7 @@ @@ -31,7 +31,7 @@
31 <script> 31 <script>
32 32
33 // 引入组件 33 // 引入组件
34 - import goodsItem4 from "@/components/goodsItem_4/goodsItem_4"; 34 + import goodsItem6 from "@/components/goodsItem_6/goodsItem_6";
35 import goodsItem5 from "@/components/goodsItem_5/goodsItem_5"; 35 import goodsItem5 from "@/components/goodsItem_5/goodsItem_5";
36 import darenList from "@/components/darenList/darenList"; 36 import darenList from "@/components/darenList/darenList";
37 37
@@ -43,7 +43,7 @@ @@ -43,7 +43,7 @@
43 }, 43 },
44 props: ["lists"], 44 props: ["lists"],
45 components: { 45 components: {
46 - goodsItem4, 46 + goodsItem6,
47 goodsItem5, 47 goodsItem5,
48 darenList 48 darenList
49 }, 49 },