merdan
/
sarga
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Conflict cleared

This commit is contained in:
Jaseel P V 2020-10-06 22:44:42 +05:30
parent 4816030bb9
commit e3fb1561f3
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/Webkul/Shop/publishable/assets/js/shop.js vendored
View File

File diff suppressed because one or more lines are too long

2
packages/Webkul/Shop/publishable/assets/mix-manifest.json
View File

@ -1,4 +1,4 @@
{
"/js/shop.js": "/js/shop.js?id=89d1f873e06bef5887c3",
"/js/shop.js": "/js/shop.js?id=13a4d80b6b4c45da1ee0",
"/css/shop.css": "/css/shop.css?id=4d6a80790b697b2dc931"
}

10
packages/Webkul/Shop/src/Resources/assets/js/components/image-slider.vue
View File

@ -4,8 +4,10 @@
<ul class="slider-images">
<li v-for="(image, index) in images" :key="index" v-bind:class="{'show': index==currentIndex}">
<img class="slider-item" :alt="image.title" :src="image.path"/>
<div class="show-content" v-bind:class="{'show': index==currentIndex}" :key="index" v-html="content[index]"></div>
<a :href="image.slider_path">
<img class="slider-item" :alt="image.title" :src="image.path" />
<div class="show-content" v-bind:class="{'show': index==currentIndex}" :key="index" v-html="content[index]"></div>
</a>
</li>
</ul>
@ -13,7 +15,6 @@
<span class="icon dark-left-icon slider-left" @click="changeIndexLeft"></span>
<span class="icon light-right-icon slider-right" @click="changeIndexRight"></span>
</div>
</div>
</transition>
</template>
@ -65,7 +66,8 @@ export default {
this.slides.forEach(function(slider) {
self.images.push({
'path': self.public_path + '/storage/' + slider.path,
'title' : slider.title
'title' : slider.title,
'slider_path': slider.slider_path ? self.public_path+'/'+slider.slider_path : null
});
self.content.push(slider.content);