Authored by 沈志敏

Merge branch 'develop' of git.yoho.cn:fe/yohoblk-wap into develop

@@ -45,7 +45,7 @@ module.exports = { @@ -45,7 +45,7 @@ module.exports = {
45 order: req.query.order || 's_t_desc', 45 order: req.query.order || 's_t_desc',
46 limit: req.query.limit || '60', 46 limit: req.query.limit || '60',
47 color: req.query.color, 47 color: req.query.color,
48 - price: req.query.priceRange, 48 + price: req.query.price,
49 size: req.query.size, 49 size: req.query.size,
50 pd: req.query.pd, 50 pd: req.query.pd,
51 tagsFilter: req.query.tagsFilter 51 tagsFilter: req.query.tagsFilter
1 <template> 1 <template>
2 - <tab v-bind:page="'cate'"></tab>  
3 - <brand-cate v-bind:category="category" v-bind:jump="true" v-bind:gender="gender"></brand-cate> 2 + <tab :page="'cate'"></tab>
  3 + <brand-cate :category="category" :jump="true" :gender="gender"></brand-cate>
4 </template> 4 </template>
5 <script> 5 <script>
6 const tip = require('common/tip'); 6 const tip = require('common/tip');
@@ -3,7 +3,7 @@ @@ -3,7 +3,7 @@
3 <div class="cate-container clearfix"> 3 <div class="cate-container clearfix">
4 <div class="content" style="height: 522px;"> 4 <div class="content" style="height: 522px;">
5 <ul class="primary-level"> 5 <ul class="primary-level">
6 - <li v-for="(index, ca) in cateNavLeftData" class="ellipsis" v-bind:class="{focus: index === leftcurrent}" class="p-level-item" v-on:click='cateNavLeftFun(index, ca.relationParameter.sort, ca.categoryName)'> 6 + <li v-for="(index, ca) in cateNavLeftData" class="ellipsis" :class="{focus: index === leftcurrent}" class="p-level-item" @click='cateNavLeftFun(index, ca.relationParameter.sort, ca.categoryName)'>
7 {{ca.categoryName}} 7 {{ca.categoryName}}
8 </li> 8 </li>
9 </ul> 9 </ul>
1 <template> 1 <template>
2 - <tab v-bind:page="page"></tab> 2 + <tab :page="page"></tab>
3 <brand-search></brand-search> 3 <brand-search></brand-search>
4 - <resources v-bind:content-code.sync="contentCode"></resources>  
5 - <brand-list v-bind:channel="channel"></brand-list> 4 + <resources :content-code.sync="contentCode"></resources>
  5 + <brand-list :channel="channel"></brand-list>
6 </template> 6 </template>
7 <script> 7 <script>
8 const contentCode = require('content-code'); 8 const contentCode = require('content-code');
@@ -14,7 +14,7 @@ @@ -14,7 +14,7 @@
14 </div> 14 </div>
15 </div> 15 </div>
16 </div> 16 </div>
17 - <index-list class="index-list" v-bind:index-list="indexList"></index-list> 17 + <index-list class="index-list" :index-list="indexList"></index-list>
18 </template> 18 </template>
19 <style> 19 <style>
20 .brand-list-box { 20 .brand-list-box {
1 <template> 1 <template>
2 <div class="tab-top-fixed"> 2 <div class="tab-top-fixed">
3 - <tab v-bind:page="page"></tab> 3 + <tab :page="page"></tab>
4 </div> 4 </div>
5 <div class="resources"> 5 <div class="resources">
6 - <resources v-bind:content-code.sync="contentCode"></resources> 6 + <resources :content-code.sync="contentCode"></resources>
7 </div> 7 </div>
8 </template> 8 </template>
9 <style> 9 <style>
1 <template> 1 <template>
2 - <tab v-bind:page="page"></tab>  
3 - <resources v-bind:content-code="contentCode"></resources> 2 + <tab :page="page"></tab>
  3 + <resources :content-code="contentCode"></resources>
4 </template> 4 </template>
5 5
6 <script> 6 <script>
1 <template> 1 <template>
2 <div v-if="channel.length" class="channel-tab"> 2 <div v-if="channel.length" class="channel-tab">
3 - <div class="channel ellipsis" v-for="(index, item) in channel" v-bind:class="{focus: index === current}" v-on:click="changeChannel(index)" v-bind:style="{width: (1 / channel.length) * 100 + '%'}"> 3 + <div class="channel ellipsis" v-for="(index, item) in channel" :class="{focus: index === current}" @click="changeChannel(index)" :style="{width: (1 / channel.length) * 100 + '%'}">
4 <span class="name">{{item.name | uppercase}}</span> 4 <span class="name">{{item.name | uppercase}}</span>
5 </div> 5 </div>
6 </div> 6 </div>
1 <template> 1 <template>
2 <div class="focus-floor"> 2 <div class="focus-floor">
3 <swipe class="swipe swipe-{{floor.length}}"> 3 <swipe class="swipe swipe-{{floor.length}}">
4 - <swipe-item v-for="item in floor" v-bind:style="{backgroundColor: item.bgColor}"> 4 + <swipe-item v-for="item in floor" :style="{backgroundColor: item.bgColor}">
5 <a href="{{item.url}}" title="{{item.title}}"> 5 <a href="{{item.url}}" title="{{item.title}}">
6 - <img v-bind:src="item.src | resize 750 365"> 6 + <img :src="item.src | resize 750 365">
7 </a> 7 </a>
8 </swipe-item> 8 </swipe-item>
9 </swipe> 9 </swipe>
1 <template> 1 <template>
2 <div class="goods"> 2 <div class="goods">
3 - <product-list v-bind:data="productList"></product-list> 3 + <product-list :data="productList"></product-list>
4 </div> 4 </div>
5 </template> 5 </template>
6 6
1 <template> 1 <template>
2 <div class="resources"> 2 <div class="resources">
3 <template v-for="floor in resources"> 3 <template v-for="floor in resources">
4 - <focus v-if="floor.focus && floor.focusType === '1'" v-bind:floor="floor.data" v-bind:style="{height: '9.1rem'}"> 4 + <focus v-if="floor.focus && floor.focusType === '1'" :floor="floor.data" :style="{height: '9.1rem'}">
5 <!-- 轮播图,通栏 --> 5 <!-- 轮播图,通栏 -->
6 </focus> 6 </focus>
7 - <focus-left-right v-if="floor.focus && floor.focusType === '2'" v-bind:floor="floor.data"> 7 + <focus-left-right v-if="floor.focus && floor.focusType === '2'" :floor="floor.data">
8 <!-- 轮播图,左右滑动 --> 8 <!-- 轮播图,左右滑动 -->
9 </focus-left-right> 9 </focus-left-right>
10 - <title-image v-if="floor.titleImage" v-bind:floor="floor.data"> 10 + <title-image v-if="floor.titleImage" :floor="floor.data">
11 <!-- 标题图片 --> 11 <!-- 标题图片 -->
12 </title-image> 12 </title-image>
13 - <title-floor v-if="floor.titleFloor" v-bind:title="floor.data.title"> 13 + <title-floor v-if="floor.titleFloor" :title="floor.data.title">
14 <!-- 楼层标题 --> 14 <!-- 楼层标题 -->
15 </title-floor> 15 </title-floor>
16 - <recommend-content-five v-if="floor.recommendContentFive" v-bind:floor="floor.data.list"> 16 + <recommend-content-five v-if="floor.recommendContentFive" :floor="floor.data.list">
17 <!-- 带标题的12个小图推荐 --> 17 <!-- 带标题的12个小图推荐 -->
18 </recommend-content-five> 18 </recommend-content-five>
19 - <goods v-if="floor.goods" v-bind:floor="floor.data"> 19 + <goods v-if="floor.goods" :floor="floor.data">
20 <!-- 商品 --> 20 <!-- 商品 -->
21 </goods> 21 </goods>
22 </template> 22 </template>
1 <template> 1 <template>
2 <div class="title-image"> 2 <div class="title-image">
3 - <title-floor v-bind:title="{name: floor.title, moreName: floor.moreName, moreUrl: floor.moreUrl}"></title-floor>  
4 - <a class="image" v-bind:href="floor.image.url"> 3 + <title-floor :title="{name: floor.title, moreName: floor.moreName, moreUrl: floor.moreUrl}"></title-floor>
  4 + <a class="image" :href="floor.image.url">
5 <img v-lazy="floor.image.src | resize 750 364"> 5 <img v-lazy="floor.image.src | resize 750 364">
6 </a> 6 </a>
7 </div> 7 </div>
1 <template> 1 <template>
2 - <div class="share-bottom clearfix" v-bind:class="{ 'hidden': close }"> 2 + <div class="share-bottom clearfix" :class="{ 'hidden': close }">
3 <span class="icon close" @click="closeBottom()">&#xe610;</span> 3 <span class="icon close" @click="closeBottom()">&#xe610;</span>
4 <span class="icon blk-icon">&#xe60f;</span> 4 <span class="icon blk-icon">&#xe60f;</span>
5 <a href="javascript:;" class="new-user">新用户送千元礼包</a> 5 <a href="javascript:;" class="new-user">新用户送千元礼包</a>
1 <template> 1 <template>
2 <div class="upload"> 2 <div class="upload">
3 - <form v-el:form v-on:change="upload"> 3 + <form v-el:form @change="upload">
4 <input id="{{inputId}}" type="file" name="filename" accept="image/*"> 4 <input id="{{inputId}}" type="file" name="filename" accept="image/*">
5 </form> 5 </form>
6 </div> 6 </div>
1 <template> 1 <template>
2 - <resources v-bind:content-code.sync="contentCode"></resources> 2 + <resources :content-code.sync="contentCode"></resources>
3 <div v-infinite-scroll="getNewsList()"> 3 <div v-infinite-scroll="getNewsList()">
4 <div v-for="editorial in editorialList" class="editorial-box"> 4 <div v-for="editorial in editorialList" class="editorial-box">
5 <div class="img"> 5 <div class="img">
@@ -3,7 +3,7 @@ @@ -3,7 +3,7 @@
3 <div class="order-status"> 3 <div class="order-status">
4 <p v-if="order.isCancel === 'Y'">交易已取消</p> 4 <p v-if="order.isCancel === 'Y'">交易已取消</p>
5 <p v-else>{{order.status | convertOrderState}}</p> 5 <p v-else>{{order.status | convertOrderState}}</p>
6 - <p v-if="order.isCancel !== 'Y' && order.status == 0 && order.payLefttime != 0">剩余: <span v-count-down v-bind:left-time="order.payLefttime"></span>,订单将被取消</p> 6 + <p v-if="order.isCancel !== 'Y' && order.status == 0 && order.payLefttime != 0">剩余: <span v-count-down :left-time="order.payLefttime"></span>,订单将被取消</p>
7 </div> 7 </div>
8 <div class="order-address"> 8 <div class="order-address">
9 <p><span>{{order.userName}}</span><span>{{order.mobile}}</span></p> 9 <p><span>{{order.userName}}</span><span>{{order.mobile}}</span></p>
@@ -18,7 +18,7 @@ @@ -18,7 +18,7 @@
18 <li class="goods-info" v-for="product in order.orderGoods"> 18 <li class="goods-info" v-for="product in order.orderGoods">
19 <a :href="product | goodsUrl 'collection'"> 19 <a :href="product | goodsUrl 'collection'">
20 <div class="img-box"> 20 <div class="img-box">
21 - <img v-bind:src="product.goodsImage | resize 49 65"> 21 + <img :src="product.goodsImage | resize 49 65">
22 <label v-if="product.goodsType === 'gift'">赠品</label> 22 <label v-if="product.goodsType === 'gift'">赠品</label>
23 <label class="price-gift" v-if="product.goodsType === 'price_gift'">加价购</label> 23 <label class="price-gift" v-if="product.goodsType === 'price_gift'">加价购</label>
24 </div> 24 </div>
@@ -50,14 +50,14 @@ @@ -50,14 +50,14 @@
50 <button v-if="order.isCancel === 'Y'" @click="deleteOrder(order.orderCode)" class="normal">删除订单</button> 50 <button v-if="order.isCancel === 'Y'" @click="deleteOrder(order.orderCode)" class="normal">删除订单</button>
51 <template v-else> 51 <template v-else>
52 <button v-if="order.status == 0" @click="cancelOrder(order.orderCode)">取消订单</button> 52 <button v-if="order.status == 0" @click="cancelOrder(order.orderCode)">取消订单</button>
53 - <button v-if="order.status == 0 " class="countdown" @click="goBuy(order)">去支付 <span v-count-down v-bind:left-time="order.payLefttime" v-bind:callback="autoCancel(order.orderCode)"></span></button> 53 + <button v-if="order.status == 0 " class="countdown" @click="goBuy(order)">去支付 <span v-count-down :left-time="order.payLefttime" :callback="autoCancel(order.orderCode)"></span></button>
54 <a v-if="order.status == 4 || order.status == 5 || order.status == 6" href="/me/logistic?order_code={{order.orderCode}}">查看物流</a> 54 <a v-if="order.status == 4 || order.status == 5 || order.status == 6" href="/me/logistic?order_code={{order.orderCode}}">查看物流</a>
55 <button v-if="order.status == 4 || order.status == 5 " class="black" @click="confirmGoods(order.orderCode)">确认收货</button> 55 <button v-if="order.status == 4 || order.status == 5 " class="black" @click="confirmGoods(order.orderCode)">确认收货</button>
56 <button v-if="order.isSupportRefund == 'Y' || order.isSupportExchange == 'Y'" class="normal" @click="applyRefund()">申请售后</button> 56 <button v-if="order.isSupportRefund == 'Y' || order.isSupportExchange == 'Y'" class="normal" @click="applyRefund()">申请售后</button>
57 </template> 57 </template>
58 </div> 58 </div>
59 - <select id="cancel-reason" class="cancel-reason" v-on:blur="reasonChange" v-on:change="reasonChange" v-model="selected">  
60 - <option v-for="option in options" v-bind:value="{id:option.id,reason:option.reason}">{{option.reason}}</option> 59 + <select id="cancel-reason" class="cancel-reason" @blur="reasonChange" @change="reasonChange" v-model="selected">
  60 + <option v-for="option in options" :value="{id:option.id,reason:option.reason}">{{option.reason}}</option>
61 </select> 61 </select>
62 </template> 62 </template>
63 </template> 63 </template>
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
2 <div class="logistic-page yoho-page"> 2 <div class="logistic-page yoho-page">
3 <div class="overview"> 3 <div class="overview">
4 <div class="left" > 4 <div class="left" >
5 - <img class="logoicon" v-bind:src="logo | resize 90 90" /> 5 + <img class="logoicon" :src="logo | resize 90 90" />
6 </div> 6 </div>
7 <div class="right"> 7 <div class="right">
8 <div> 8 <div>
@@ -11,7 +11,7 @@ @@ -11,7 +11,7 @@
11 <div class="order-goods" > 11 <div class="order-goods" >
12 <div class="goods-info" v-for="goods in order.orderGoods"> 12 <div class="goods-info" v-for="goods in order.orderGoods">
13 <div class="img-box"> 13 <div class="img-box">
14 - <img v-bind:src="goods.goodsImage | resize 49 65"> 14 + <img :src="goods.goodsImage | resize 49 65">
15 <label v-if="goods.goodsType === 'gift'">赠品</label> 15 <label v-if="goods.goodsType === 'gift'">赠品</label>
16 <label class="price-gift" v-if="goods.goodsType === 'price_gift'">加价购</label> 16 <label class="price-gift" v-if="goods.goodsType === 'price_gift'">加价购</label>
17 </div> 17 </div>
@@ -36,7 +36,7 @@ @@ -36,7 +36,7 @@
36 <template v-else> 36 <template v-else>
37 <button v-if="order.status == 0" @click="cancelOrder(order.orderCode)" class="leftpad">取消订单</button> 37 <button v-if="order.status == 0" @click="cancelOrder(order.orderCode)" class="leftpad">取消订单</button>
38 <button v-if="order.status == 0 " class="countdown" @click="goBuy(order)">去支付 38 <button v-if="order.status == 0 " class="countdown" @click="goBuy(order)">去支付
39 - <span v-count-down v-bind:left-time="order.payLefttime" v-bind:callback="autoCancel(order.orderCode)"></span> 39 + <span v-count-down :left-time="order.payLefttime" :callback="autoCancel(order.orderCode)"></span>
40 </button> 40 </button>
41 <a v-if="order.status == 4 || order.status == 5 " class="leftpad" 41 <a v-if="order.status == 4 || order.status == 5 " class="leftpad"
42 href="/me/logistic?order_code={{order.orderCode}}">查看物流</a> 42 href="/me/logistic?order_code={{order.orderCode}}">查看物流</a>
@@ -54,8 +54,8 @@ @@ -54,8 +54,8 @@
54 <p>Your do not have an order <br>for the time being</p> 54 <p>Your do not have an order <br>for the time being</p>
55 <a href="/product/new">随便逛逛</a> 55 <a href="/product/new">随便逛逛</a>
56 </div> 56 </div>
57 - <select id="cancel-reason" class="cancel-reason" v-on:blur="reasonChange" v-on:change="reasonChange" v-model="selected">  
58 - <option v-for="option in options" v-bind:value="{id:option.id,reason:option.reason}">{{option.reason}}</option> 57 + <select id="cancel-reason" class="cancel-reason" @blur="reasonChange" @change="reasonChange" v-model="selected">
  58 + <option v-for="option in options" :value="{id:option.id,reason:option.reason}">{{option.reason}}</option>
59 </select> 59 </select>
60 </template> 60 </template>
61 61
@@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@
13 <div class="order-goods"> 13 <div class="order-goods">
14 <div class="goods-info" v-for="product in order.goods"> 14 <div class="goods-info" v-for="product in order.goods">
15 <div class="img-box"> 15 <div class="img-box">
16 - <img v-bind:src="product.goodsImage | resize 49 65"> 16 + <img :src="product.goodsImage | resize 49 65">
17 <label v-if="product.goodsType === 'gift'">赠品</label> 17 <label v-if="product.goodsType === 'gift'">赠品</label>
18 <label class="price-gift" v-if="product.goodsType === 'price_gift'">加价购</label> 18 <label class="price-gift" v-if="product.goodsType === 'price_gift'">加价购</label>
19 </div> 19 </div>
@@ -4,7 +4,7 @@ @@ -4,7 +4,7 @@
4 <input type="checkbox" v-model="product.checked" id="checkbox-{{product.goodsId}}"> 4 <input type="checkbox" v-model="product.checked" id="checkbox-{{product.goodsId}}">
5 <label for="checkbox-{{product.goodsId}}"></label> 5 <label for="checkbox-{{product.goodsId}}"></label>
6 </div> 6 </div>
7 - <img class="image" v-bind:src="product.goodsImage | resize 100 130"> 7 + <img class="image" :src="product.goodsImage | resize 100 130">
8 <div class="info"> 8 <div class="info">
9 <div class="p-title"> 9 <div class="p-title">
10 {{product.productName}} 10 {{product.productName}}
1 <template> 1 <template>
2 <div v-if="product.checked" class="reason"> 2 <div v-if="product.checked" class="reason">
3 - <div v-if="product.isLimitSkn === 'Y'" v-on:click="showTip" class="tip"> 3 + <div v-if="product.isLimitSkn === 'Y'" @click="showTip" class="tip">
4 <span class="icon icon-love"></span> 4 <span class="icon icon-love"></span>
5 {{specialNotice.title}} 5 {{specialNotice.title}}
6 </div> 6 </div>
@@ -9,7 +9,7 @@ @@ -9,7 +9,7 @@
9 9
10 <span class="icon icon-right"></span> 10 <span class="icon icon-right"></span>
11 <select class="reason" v-model="product.reason.id" name="reason"> 11 <select class="reason" v-model="product.reason.id" name="reason">
12 - <option v-for="reason in reasons" v-bind:value="reason.id" selected="{{reason.id === product.reason.id}}">{{reason.name}}</option> 12 + <option v-for="reason in reasons" :value="reason.id" selected="{{reason.id === product.reason.id}}">{{reason.name}}</option>
13 </select> 13 </select>
14 </div> 14 </div>
15 <template v-if="specialReasons.indexOf(product.reason.id) !== -1"> 15 <template v-if="specialReasons.indexOf(product.reason.id) !== -1">
@@ -18,10 +18,10 @@ @@ -18,10 +18,10 @@
18 </div> 18 </div>
19 <div class="image-list clearfix"> 19 <div class="image-list clearfix">
20 <div class="image-item" v-for="image in imageListForShow"> 20 <div class="image-item" v-for="image in imageListForShow">
21 - <span v-on:click="deleteImage(image.index)" class="icon icon-close"></span>  
22 - <img v-bind:src="image.path"> 21 + <span @click="deleteImage(image.index)" class="icon icon-close"></span>
  22 + <img :src="image.path">
23 </div> 23 </div>
24 - <upload v-show="imageListForShow.length < 4" class="image-item" v-bind:image-list="product.imageList" v-bind:bucket="bucket"></upload> 24 + <upload v-show="imageListForShow.length < 4" class="image-item" :image-list="product.imageList" :bucket="bucket"></upload>
25 </div> 25 </div>
26 </template> 26 </template>
27 </div> 27 </div>
1 <template> 1 <template>
2 <div class="brand-share"> 2 <div class="brand-share">
3 - <img class="brand-top-box" v-bind:src="shopInfo.shopBg | resize 750 478">  
4 - <div v-if="shopInfo.shopLogo" class="brand-logo"><img v-bind:src="shopInfo.shopLogo | resize 120 80"></div> 3 + <img class="brand-top-box" :src="shopInfo.shopBg | resize 750 478">
  4 + <div v-if="shopInfo.shopLogo" class="brand-logo"><img :src="shopInfo.shopLogo | resize 120 80"></div>
5 <div v-else class="brand-title">{{ shopInfo.shopName }}</div> 5 <div v-else class="brand-title">{{ shopInfo.shopName }}</div>
6 <div class="brand-intro">{{ shopInfo.shopIntro }}</div> 6 <div class="brand-intro">{{ shopInfo.shopIntro }}</div>
7 <div class="tip">进入 BLK 选购潮品</div> 7 <div class="tip">进入 BLK 选购潮品</div>
8 <div class="icon arrow">&#xe602;</div> 8 <div class="icon arrow">&#xe602;</div>
9 - <a href="//m.yohoblk.com"><img v-bind:src="shopInfo.shopBg | resize 752 365"></a> 9 + <a href="//m.yohoblk.com"><img :src="shopInfo.shopBg | resize 752 365"></a>
10 </div> 10 </div>
11 <share-bottom></share-bottom> 11 <share-bottom></share-bottom>
12 </template> 12 </template>
1 <template> 1 <template>
2 - <top-bar v-bind:share-data="shareData"></top-bar>  
3 - <shop-top v-bind:shop-info="shopInfo"></shop-top>  
4 - <div v-bind:class='{"shop-goods-top": !shopInfo.isBlkShop}'>  
5 - <goods-list v-bind:data="productList" :empty="empty"></goods-list> 2 + <top-bar :share-data="shareData"></top-bar>
  3 + <shop-top :shop-info="shopInfo"></shop-top>
  4 + <div :class='{"shop-goods-top": !shopInfo.isBlkShop}'>
  5 + <goods-list :data="productList" :empty="empty"></goods-list>
6 </div> 6 </div>
7 <filter :config="filterConfig" v-ref:filter></filter> 7 <filter :config="filterConfig" v-ref:filter></filter>
8 </template> 8 </template>
@@ -4,7 +4,7 @@ @@ -4,7 +4,7 @@
4 <img v-if="shopInfo.shopLogo" v-lazy="shopInfo.shopLogo.split('?')[0] + '?imageMogr2/thumbnail/{width}x{height}' | resize 120 80" alt="{{ shopInfo.shopName }}"> 4 <img v-if="shopInfo.shopLogo" v-lazy="shopInfo.shopLogo.split('?')[0] + '?imageMogr2/thumbnail/{width}x{height}' | resize 120 80" alt="{{ shopInfo.shopName }}">
5 <div v-else class="brand-title">{{ shopInfo.shopName }}</div> 5 <div v-else class="brand-title">{{ shopInfo.shopName }}</div>
6 <hr> 6 <hr>
7 - <div v-show="showMore" transition="brand-intro" v-bind:class="{ 'brand-short': !showMore }">{{ shopInfo.shopIntro }}</div> 7 + <div v-show="showMore" transition="brand-intro" :class="{ 'brand-short': !showMore }">{{ shopInfo.shopIntro }}</div>
8 </div> 8 </div>
9 <div v-if="!showMore" class="showmore expand" @click="introTrans()"><span class="icon">&#xe602;</span></div> 9 <div v-if="!showMore" class="showmore expand" @click="introTrans()"><span class="icon">&#xe602;</span></div>
10 <div v-else class="showmore collapse" @click="introTrans()"><span class="icon">&#xe617;</span></div> 10 <div v-else class="showmore collapse" @click="introTrans()"><span class="icon">&#xe617;</span></div>