Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop-ui
commit
e935f2a3e3
|
@ -204,7 +204,6 @@ export default {
|
||||||
.breadcrumb {
|
.breadcrumb {
|
||||||
display: flex;
|
display: flex;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
|
|
||||||
>span {
|
>span {
|
||||||
margin-right: 15px;
|
margin-right: 15px;
|
||||||
cursor: pointer;
|
cursor: pointer;
|
||||||
|
|
|
@ -4,18 +4,10 @@
|
||||||
<span @click="clickBreadcrumb(item, index)" :class="{ 'active': item.selected }" v-for="(item, index) in dateList"
|
<span @click="clickBreadcrumb(item, index)" :class="{ 'active': item.selected }" v-for="(item, index) in dateList"
|
||||||
:key="index"> {{ item.title }}</span>
|
:key="index"> {{ item.title }}</span>
|
||||||
<div class="date-picker">
|
<div class="date-picker">
|
||||||
<Select @on-change="changeSelect($event, selectedWay)" :value="month" placeholder="年月查询" clearable
|
<Select @on-change="changeSelect($event, selectedWay)" :value="month" placeholder="年月查询"
|
||||||
style="width:200px;margin-left:10px;">
|
style="width:200px;margin-left:10px;">
|
||||||
<Option v-for="(item, i) in dates" :value="item.year + '-' + item.month" :key="i" clearable>
|
<Option v-for="(item, index) in dates" :value="item.year + '-' + item.month" :key="index">{{
|
||||||
{{ item.year + '年' + item.month + '月' }}</Option>
|
item.year + '年' + item.month + '月' }}</Option>
|
||||||
</Select>
|
|
||||||
</div>
|
|
||||||
<div class="shop-list" v-if="!closeShop">
|
|
||||||
<Select clearable @on-change="changeshop(selectedWay)" v-model="storeId" placeholder="店铺查询"
|
|
||||||
style="width:200px;margin-left:10px;">
|
|
||||||
<Scroll :on-reach-bottom="handleReachBottom">
|
|
||||||
<Option v-for="(item, index) in shopsData" :value="item.id" :key="index">{{ item.storeName }}</Option>
|
|
||||||
</Scroll>
|
|
||||||
</Select>
|
</Select>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
Loading…
Reference in New Issue