jufubao-base 1.0.169-beta16 → 1.0.169-beta18
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/package.json +1 -1
- package/src/components/JfbBaseNotice/JfbBaseNotice.vue +2 -2
- package/src/components/JfbBaseTfkSearch/AllList.vue +73 -56
- package/src/components/JfbBaseTfkSearch/ContentFilm.vue +131 -90
- package/src/components/JfbBaseTfkSearch/JfbBaseTfkSearch.vue +38 -10
- package/src/components/JfbBaseTfkSearch/Mock.js +1 -1
package/package.json
CHANGED
|
@@ -14,7 +14,7 @@
|
|
|
14
14
|
</view>
|
|
15
15
|
<!-- #endif -->
|
|
16
16
|
<view class="jfb-base-notice__body">
|
|
17
|
-
<view class="jfb-base-notice__body-line"></view>
|
|
17
|
+
<view class="jfb-base-notice__body-line" v-if="contentList.length > 0"></view>
|
|
18
18
|
<view>
|
|
19
19
|
<template v-if="style === '3' && isPreview">
|
|
20
20
|
<view class="jfb-base-notice__body-pop" :style="{backgroundColor:backgroundColor, color:warningColor}">弹窗模式方便编辑(占位),在线上此模块不显</view>
|
|
@@ -23,7 +23,7 @@
|
|
|
23
23
|
<template v-if="contentList.length === 0 && isPreview">
|
|
24
24
|
<view class="jfb-base-notice__body-pop" :style="{backgroundColor:backgroundColor, color:warningColor}">接口无数返回,请检查是否配置成功!</view>
|
|
25
25
|
</template>
|
|
26
|
-
<view v-
|
|
26
|
+
<view v-if="contentList.length > 0" class="jfb-base-notice__body-scroll">
|
|
27
27
|
<view
|
|
28
28
|
class="upAndDown"
|
|
29
29
|
:style="{
|
|
@@ -13,10 +13,10 @@
|
|
|
13
13
|
style="width: 100%; height: 100%"
|
|
14
14
|
:keyword="keyword"
|
|
15
15
|
:item="item"
|
|
16
|
-
:out-spacing="
|
|
17
|
-
:color="{SEAT
|
|
18
|
-
:border-radius="
|
|
19
|
-
:brand-color="
|
|
16
|
+
:out-spacing="listItemStyle.outSpacing"
|
|
17
|
+
:color="{SEAT:listItemStyle.mainColor,CODE:listItemStyle.subMainColor,SELL:listItemStyle.successColor}"
|
|
18
|
+
:border-radius="listItemStyle.imgRradius"
|
|
19
|
+
:brand-color="listItemStyle.brandColor"
|
|
20
20
|
@on-schedule="handleFilmDetail"
|
|
21
21
|
@on-cashier-detail="handleCashierDetail"
|
|
22
22
|
@on-code-detail="handleCodeDetail"
|
|
@@ -26,10 +26,10 @@
|
|
|
26
26
|
style="width: 100%; height: 100%"
|
|
27
27
|
:keyword="keyword"
|
|
28
28
|
:item="item"
|
|
29
|
-
:out-spacing="
|
|
30
|
-
:color="
|
|
31
|
-
:border-radius="
|
|
32
|
-
:brand-color="
|
|
29
|
+
:out-spacing="listItemStyle.outSpacing"
|
|
30
|
+
:color="listItemStyle.mainColor"
|
|
31
|
+
:border-radius="listItemStyle.imgRradius"
|
|
32
|
+
:brand-color="listItemStyle.brandColor"
|
|
33
33
|
@on-film-detail="handleFilmDetail"
|
|
34
34
|
@on-buy="handleBuy"
|
|
35
35
|
></content-film>
|
|
@@ -37,11 +37,11 @@
|
|
|
37
37
|
style="width: 100%; height: 100%"
|
|
38
38
|
:keyword="keyword"
|
|
39
39
|
:item="item"
|
|
40
|
-
:out-spacing="
|
|
41
|
-
:color="
|
|
42
|
-
:border-radius="
|
|
43
|
-
:brand-color="
|
|
44
|
-
:is-echange="'Y' ||
|
|
40
|
+
:out-spacing="listItemStyle.outSpacing"
|
|
41
|
+
:color="listItemStyle.mainColor"
|
|
42
|
+
:border-radius="listItemStyle.imgRradius"
|
|
43
|
+
:brand-color="listItemStyle.brandColor"
|
|
44
|
+
:is-echange="'Y' || listItemStyle.isShowExchange"
|
|
45
45
|
@on-shop-jhd="handleShopJhd"
|
|
46
46
|
@on-shop-detail="handleShopDetail"
|
|
47
47
|
></content-shop>
|
|
@@ -51,7 +51,7 @@
|
|
|
51
51
|
<view v-for="(item, i) in parent.items" :key="item.key"
|
|
52
52
|
class="module_cont_inner"
|
|
53
53
|
:style="[moduleItemContStyle, {
|
|
54
|
-
width: getProductCell(parent.tab) == 2 ? `calc(50% - ${
|
|
54
|
+
width: getProductCell(parent.tab) == 2 ? `calc(50% - ${allStyle.allModuleItemContMargin/2}rpx)`: '100%',
|
|
55
55
|
}]"
|
|
56
56
|
>
|
|
57
57
|
<content-product v-if="parent.type === 'product'"
|
|
@@ -59,11 +59,11 @@
|
|
|
59
59
|
:keyword="keyword"
|
|
60
60
|
:item="item"
|
|
61
61
|
:height="outItemProduct"
|
|
62
|
-
:product-config="
|
|
63
|
-
:out-spacing="
|
|
64
|
-
:color="
|
|
65
|
-
:brand-color="
|
|
66
|
-
:border-radius="
|
|
62
|
+
:product-config="productConfig"
|
|
63
|
+
:out-spacing="listItemStyle.outSpacing"
|
|
64
|
+
:color="listItemStyle.mainColor"
|
|
65
|
+
:brand-color="listItemStyle.brandColor"
|
|
66
|
+
:border-radius="listItemStyle.imgRradius"
|
|
67
67
|
:cell="getProductCell(parent.tab)"
|
|
68
68
|
@on-product-detail="handleProductDetail"
|
|
69
69
|
></content-product>
|
|
@@ -95,6 +95,17 @@
|
|
|
95
95
|
type:String,
|
|
96
96
|
default:'',
|
|
97
97
|
},
|
|
98
|
+
allStyle: {
|
|
99
|
+
type:Object,
|
|
100
|
+
},
|
|
101
|
+
listItemStyle:{
|
|
102
|
+
type:Object|null,
|
|
103
|
+
default:null,
|
|
104
|
+
},
|
|
105
|
+
productConfig:{
|
|
106
|
+
type:Object|null,
|
|
107
|
+
default:null,
|
|
108
|
+
},
|
|
98
109
|
},
|
|
99
110
|
computed: {
|
|
100
111
|
...mapState({
|
|
@@ -102,38 +113,39 @@
|
|
|
102
113
|
stateLocation: (state) => state.cityLocation.location || {},
|
|
103
114
|
}),
|
|
104
115
|
contMarginComp(){
|
|
105
|
-
|
|
106
|
-
str = `${
|
|
107
|
-
str = `${str} ${this
|
|
108
|
-
str = `${str} ${this
|
|
116
|
+
if(this.getParent === null) return 0
|
|
117
|
+
let str = `${this.getParent().checkValue(this.listItemStyle.contMargin.top, 20)}rpx`;
|
|
118
|
+
str = `${str} ${this.getParent().checkValue(this.listItemStyle.contMargin.right, 20)}rpx`;
|
|
119
|
+
str = `${str} ${this.getParent().checkValue(this.listItemStyle.contMargin.bottom, 20)}rpx`;
|
|
120
|
+
str = `${str} ${this.getParent().checkValue(this.listItemStyle.contMargin.left, 20)}rpx`;
|
|
109
121
|
return str
|
|
110
122
|
},
|
|
111
123
|
moduleItemStyle(){
|
|
112
|
-
const { allModuleRadius } = this
|
|
113
|
-
let padding = `${this
|
|
114
|
-
padding = `${padding} ${this
|
|
115
|
-
padding = `${padding} ${this
|
|
116
|
-
padding = `${padding} ${this
|
|
124
|
+
const { allModuleRadius, allModulePadding, allListBgColor, allModuleMargin } = this.allStyle;
|
|
125
|
+
let padding = `${this.checkValue(allModulePadding.top, 20)}rpx`;
|
|
126
|
+
padding = `${padding} ${this.checkValue(allModulePadding.right, 20)}rpx`;
|
|
127
|
+
padding = `${padding} ${this.checkValue(allModulePadding.bottom, 20)}rpx`;
|
|
128
|
+
padding = `${padding} ${this.checkValue(allModulePadding.left, 20)}rpx`;
|
|
117
129
|
|
|
118
130
|
return this.styleObjectToString({
|
|
119
|
-
background:
|
|
131
|
+
background: allListBgColor,
|
|
120
132
|
padding: padding,
|
|
121
|
-
marginBottom:
|
|
133
|
+
marginBottom: allModuleMargin + 'rpx',
|
|
122
134
|
borderRadius: allModuleRadius + 'rpx',
|
|
123
135
|
})
|
|
124
136
|
},
|
|
125
137
|
moduleItemTitleStyle(){
|
|
126
|
-
|
|
127
|
-
padding = `${
|
|
128
|
-
padding = `${padding} ${this
|
|
129
|
-
padding = `${padding} ${this
|
|
138
|
+
const { allModuleTitlePadding, allModuleTitleStyle, allModuleTitleBgColor } = this.allStyle;
|
|
139
|
+
let padding = `${this.checkValue(allModuleTitlePadding.top, 20)}rpx`;
|
|
140
|
+
padding = `${padding} ${this.checkValue(allModuleTitlePadding.right, 20)}rpx`;
|
|
141
|
+
padding = `${padding} ${this.checkValue(allModuleTitlePadding.bottom, 20)}rpx`;
|
|
142
|
+
padding = `${padding} ${this.checkValue(allModuleTitlePadding.left, 20)}rpx`;
|
|
130
143
|
|
|
131
|
-
let allModuleTitleStyle = this.$parentVm.allModuleTitleStyle;
|
|
132
144
|
let style = {padding: padding};
|
|
133
145
|
if(allModuleTitleStyle === 'underline'){
|
|
134
146
|
style['borderBottom'] = '1px solid #EEEEEE';
|
|
135
147
|
}else{
|
|
136
|
-
style['background'] =
|
|
148
|
+
style['background'] = allModuleTitleBgColor;
|
|
137
149
|
}
|
|
138
150
|
|
|
139
151
|
return this.styleObjectToString(style);
|
|
@@ -142,7 +154,7 @@
|
|
|
142
154
|
let {
|
|
143
155
|
allModuleItemContBorder, allModuleItemContShadow, allModuleItemContPadding, allModuleItemContMargin,
|
|
144
156
|
allModuleItemContRadius, allModuleItemContBgColor
|
|
145
|
-
} = this
|
|
157
|
+
} = this.allStyle;
|
|
146
158
|
let border = "none";
|
|
147
159
|
let boxShadow = "none";
|
|
148
160
|
if(allModuleItemContBorder && allModuleItemContBorder.type === 'Y'){
|
|
@@ -153,10 +165,10 @@
|
|
|
153
165
|
let { width, color } = allModuleItemContShadow.value;
|
|
154
166
|
boxShadow = `0 0 ${width}rpx ${color}`;
|
|
155
167
|
}
|
|
156
|
-
let padding = `${this
|
|
157
|
-
padding = `${padding} ${this
|
|
158
|
-
padding = `${padding} ${this
|
|
159
|
-
padding = `${padding} ${this
|
|
168
|
+
let padding = `${this.checkValue(allModuleItemContPadding.top, 20)}rpx`;
|
|
169
|
+
padding = `${padding} ${this.checkValue(allModuleItemContPadding.right, 20)}rpx`;
|
|
170
|
+
padding = `${padding} ${this.checkValue(allModuleItemContPadding.bottom, 20)}rpx`;
|
|
171
|
+
padding = `${padding} ${this.checkValue(allModuleItemContPadding.left, 20)}rpx`;
|
|
160
172
|
console.log("allModuleItemContShadow", allModuleItemContShadow)
|
|
161
173
|
return this.styleObjectToString({
|
|
162
174
|
padding: padding,
|
|
@@ -168,7 +180,7 @@
|
|
|
168
180
|
})
|
|
169
181
|
},
|
|
170
182
|
moduleMoreStyle(){
|
|
171
|
-
|
|
183
|
+
const { allModuleMoreStyle } = this.allStyle;
|
|
172
184
|
let style = {};
|
|
173
185
|
if(allModuleMoreStyle === 'text'){
|
|
174
186
|
|
|
@@ -180,11 +192,11 @@
|
|
|
180
192
|
return this.styleObjectToString(style);
|
|
181
193
|
},
|
|
182
194
|
outItemProduct(){
|
|
195
|
+
if(this.getParent === null) return 0
|
|
183
196
|
//获取每列元素最大宽度
|
|
184
|
-
|
|
185
|
-
|
|
186
|
-
|
|
187
|
-
return num - this.$parentVm.contBorderWidth * 2
|
|
197
|
+
let num = (750 - 3 * Number(this.listItemStyle.outSpacing))/2;
|
|
198
|
+
num = num - this.getParent().checkValue(this.listItemStyle.contMargin.right, 20) - this.getParent().checkValue(this.listItemStyle.contMargin.left, 20);
|
|
199
|
+
return num - this.listItemStyle.contBorderWidth * 2
|
|
188
200
|
},
|
|
189
201
|
},
|
|
190
202
|
watch: {
|
|
@@ -199,6 +211,8 @@
|
|
|
199
211
|
},
|
|
200
212
|
data(){
|
|
201
213
|
return {
|
|
214
|
+
/**@type Function|null**/
|
|
215
|
+
getParent:null,
|
|
202
216
|
$parentVm:null,
|
|
203
217
|
parentStatus: false,
|
|
204
218
|
|
|
@@ -210,13 +224,16 @@
|
|
|
210
224
|
this.getList();
|
|
211
225
|
},
|
|
212
226
|
methods: {
|
|
227
|
+
checkValue(value, defaultValue){
|
|
228
|
+
return this.getParent().checkValue(value, defaultValue);
|
|
229
|
+
},
|
|
213
230
|
getProductCell(str = ''){
|
|
214
231
|
let cellNum = str.split("@")[3] || 1;
|
|
215
232
|
return Number(cellNum);
|
|
216
233
|
},
|
|
217
234
|
getParentMV(){
|
|
218
|
-
this.$emit('on-parent-vm', (
|
|
219
|
-
this
|
|
235
|
+
this.$emit('on-parent-vm', (getParent)=>{
|
|
236
|
+
this.getParent = getParent;
|
|
220
237
|
this.parentStatus = true;
|
|
221
238
|
})
|
|
222
239
|
},
|
|
@@ -257,34 +274,34 @@
|
|
|
257
274
|
|
|
258
275
|
//影片
|
|
259
276
|
handleFilmDetail(film){
|
|
260
|
-
this
|
|
277
|
+
this.getParent().handleFilmDetail(film, this.dataConfig)
|
|
261
278
|
},
|
|
262
279
|
handleBuy(film){
|
|
263
|
-
this
|
|
280
|
+
this.getParent().handleBuy(film, this.dataConfig)
|
|
264
281
|
},
|
|
265
282
|
|
|
266
283
|
//影院
|
|
267
284
|
handleSchedule(cinema){
|
|
268
|
-
this
|
|
285
|
+
this.getParent().handleSchedule(cinema, this.dataConfig)
|
|
269
286
|
},
|
|
270
287
|
handleCashierDetail(cinema){
|
|
271
|
-
this
|
|
288
|
+
this.getParent().handleCashierDetail(cinema, this.dataConfig)
|
|
272
289
|
},
|
|
273
290
|
handleCodeDetail(cinema){
|
|
274
|
-
this
|
|
291
|
+
this.getParent().handleCodeDetail(cinema, this.dataConfig)
|
|
275
292
|
},
|
|
276
293
|
|
|
277
294
|
//门店
|
|
278
295
|
handleShopJhd(shop){
|
|
279
|
-
this
|
|
296
|
+
this.getParent().handleShopJhd(shop, this.dataConfig)
|
|
280
297
|
},
|
|
281
298
|
handleShopDetail(shop){
|
|
282
|
-
this
|
|
299
|
+
this.getParent().handleShopDetail(shop, this.dataConfig)
|
|
283
300
|
},
|
|
284
301
|
|
|
285
302
|
//商品
|
|
286
303
|
handleProductDetail(product){
|
|
287
|
-
this
|
|
304
|
+
this.getParent().handleProductDetail(product, this.dataConfig)
|
|
288
305
|
},
|
|
289
306
|
}
|
|
290
307
|
}
|
|
@@ -4,70 +4,69 @@
|
|
|
4
4
|
class="image"
|
|
5
5
|
:style="{marginRight: outSpacing + 'rpx',borderRadius:borderRadius+'rpx'}"
|
|
6
6
|
>
|
|
7
|
-
<image :src="
|
|
7
|
+
<image v-if="errorStatus" :src="errorImage" :alt="item['show_name']" ></image>
|
|
8
|
+
<image v-if="!errorStatus" :src="item['poster']" :alt="item['show_name']" @error="handleError()" ></image>
|
|
8
9
|
</view>
|
|
9
10
|
<view class="middle">
|
|
10
|
-
<view class="
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
<template v-if="item['remark']">
|
|
18
|
-
<text>评分:</text><text :style="{color:color}">{{item['remark']}}</text>
|
|
19
|
-
</template>
|
|
11
|
+
<view class="top">
|
|
12
|
+
<view class="name">{{item['show_name']}}</view>
|
|
13
|
+
<view class="score">
|
|
14
|
+
<template v-if="item['remark']">
|
|
15
|
+
<text>评分:</text><text :style="{color:color}">{{item['remark']}}</text>
|
|
16
|
+
</template>
|
|
17
|
+
</view>
|
|
20
18
|
</view>
|
|
21
|
-
<view class="
|
|
22
|
-
<
|
|
23
|
-
<
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
19
|
+
<view class="bottom">
|
|
20
|
+
<view>
|
|
21
|
+
<view class="other">类型:{{item['type']}}</view>
|
|
22
|
+
<view class="other">导演:{{item['director']}}</view>
|
|
23
|
+
<view class="other">主演:{{item['leading_role']}}</view>
|
|
24
|
+
</view>
|
|
25
|
+
<view class="btn">
|
|
26
|
+
<template v-if="type === 'hot'">
|
|
27
|
+
<xd-button
|
|
28
|
+
v-if="item['show_button'] === '1'"
|
|
29
|
+
type="primary"
|
|
30
|
+
style="display:block;"
|
|
31
|
+
size="small"
|
|
32
|
+
@click.stop="handleBuy(item)">购票</xd-button>
|
|
33
|
+
<xd-button
|
|
34
|
+
v-else-if="item['show_button'] === '2'"
|
|
35
|
+
type="subPrimary"
|
|
36
|
+
style="display:block;"
|
|
37
|
+
size="small"
|
|
38
|
+
@click="handleBuy(item)">预售</xd-button>
|
|
39
|
+
</template>
|
|
40
|
+
<template v-if="type === 'rightnow'">
|
|
41
|
+
<xd-button
|
|
42
|
+
v-if="item['show_button'] === '3'"
|
|
43
|
+
type="success"
|
|
44
|
+
style="display:block;"
|
|
45
|
+
size="small"
|
|
46
|
+
@click.stop="handleDetail(item)"
|
|
47
|
+
>想看</xd-button>
|
|
48
|
+
<xd-button
|
|
49
|
+
v-else-if="item['show_button'] === '2'"
|
|
50
|
+
type="subPrimary"
|
|
51
|
+
style="display:block;"
|
|
52
|
+
size="small"
|
|
53
|
+
@click.stop="handleBuy(item)">预售</xd-button>
|
|
54
|
+
</template>
|
|
55
|
+
</view>
|
|
51
56
|
</view>
|
|
57
|
+
|
|
52
58
|
</view>
|
|
53
59
|
</view>
|
|
54
60
|
</template>
|
|
55
61
|
|
|
56
62
|
<script>
|
|
57
63
|
import XdButton from "@/components/XdButton/XdButton.vue";
|
|
58
|
-
import getServiceUrl from "@/common/getServiceUrl";
|
|
59
|
-
import handleKeyword from "./handleKeyword";
|
|
60
|
-
|
|
61
64
|
export default {
|
|
62
65
|
name:'ContentItem',
|
|
63
66
|
components:{
|
|
64
67
|
XdButton
|
|
65
68
|
},
|
|
66
69
|
props:{
|
|
67
|
-
keyword:{
|
|
68
|
-
type:String,
|
|
69
|
-
default:''
|
|
70
|
-
},
|
|
71
70
|
item:Object,
|
|
72
71
|
outSpacing: {
|
|
73
72
|
type: Number|String,
|
|
@@ -87,23 +86,26 @@
|
|
|
87
86
|
}
|
|
88
87
|
|
|
89
88
|
},
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
name(){
|
|
95
|
-
return handleKeyword(this, this.item.show_name, this.keyword);
|
|
89
|
+
data(){
|
|
90
|
+
return {
|
|
91
|
+
errorImage: 'https://img.jufubao.cn/common/error_movie.png?v20',
|
|
92
|
+
errorStatus: false,
|
|
96
93
|
}
|
|
97
94
|
},
|
|
98
95
|
created() {
|
|
99
96
|
|
|
100
97
|
},
|
|
101
98
|
methods:{
|
|
99
|
+
handleError(){
|
|
100
|
+
this.errorStatus = true;
|
|
101
|
+
},
|
|
102
102
|
handleDetail(item){
|
|
103
|
-
|
|
103
|
+
console.log('handleDetail.item',item,item.id);
|
|
104
|
+
this.$emit('on-film-detail',item.id);
|
|
104
105
|
},
|
|
105
106
|
handleBuy(item){
|
|
106
|
-
|
|
107
|
+
console.log('handleDetail.item',item,item.id);
|
|
108
|
+
this.$emit('on-buy',item.id);
|
|
107
109
|
}
|
|
108
110
|
}
|
|
109
111
|
}
|
|
@@ -128,50 +130,89 @@
|
|
|
128
130
|
}
|
|
129
131
|
.middle {
|
|
130
132
|
flex: 1;
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
133
|
+
|
|
134
|
+
& .top {
|
|
135
|
+
display: flex;
|
|
136
|
+
justify-content: space-between;
|
|
137
|
+
align-items: flex-end;
|
|
134
138
|
margin-bottom: 20rpx;
|
|
135
|
-
.uni-max-cut(2, 90);
|
|
136
|
-
line-height: 45rpx;
|
|
137
|
-
}
|
|
138
139
|
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
140
|
+
& > view:first-child{
|
|
141
|
+
flex: 1;
|
|
142
|
+
font-size: 36rpx;
|
|
143
|
+
font-weight: 600;
|
|
144
|
+
.uni-max-cut(2, 90);
|
|
145
|
+
line-height: 45rpx;
|
|
146
|
+
}
|
|
147
|
+
& >view:nth-child(2) {
|
|
148
|
+
flex-shrink: 0;
|
|
149
|
+
height: 45rpx;
|
|
150
|
+
line-height: 45rpx;
|
|
151
|
+
margin-left: 20rpx;
|
|
152
|
+
text-align: right;
|
|
153
|
+
& > text:nth-child(1) {
|
|
154
|
+
font-size: 20rpx;
|
|
155
|
+
}
|
|
156
|
+
& > text:nth-child(2) {
|
|
157
|
+
font-size: 28rpx;
|
|
158
|
+
}
|
|
147
159
|
}
|
|
148
160
|
}
|
|
149
|
-
}
|
|
150
161
|
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
align-items: flex-end;
|
|
156
|
-
justify-content: flex-end;
|
|
157
|
-
flex-flow: wrap;
|
|
158
|
-
box-sizing: border-box;
|
|
159
|
-
width: 160rpx;
|
|
160
|
-
height: 190rpx;
|
|
162
|
+
& .bottom {
|
|
163
|
+
display: flex;
|
|
164
|
+
justify-content: space-between;
|
|
165
|
+
align-items: center;
|
|
161
166
|
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
|
|
170
|
-
|
|
167
|
+
& > view:first-child {
|
|
168
|
+
flex: 1;
|
|
169
|
+
& > view {
|
|
170
|
+
font-size: 25rpx;
|
|
171
|
+
color: #999;
|
|
172
|
+
.uni-max-cut(1,36);
|
|
173
|
+
line-height: 36rpx;
|
|
174
|
+
margin-bottom: 10rpx;
|
|
175
|
+
&:last-child {
|
|
176
|
+
margin-bottom: 0!important;
|
|
177
|
+
}
|
|
178
|
+
}
|
|
171
179
|
}
|
|
172
180
|
|
|
181
|
+
& .btn {
|
|
182
|
+
width: 140rpx;
|
|
183
|
+
flex-shrink: 0;
|
|
184
|
+
margin-left: 20rpx;
|
|
185
|
+
}
|
|
173
186
|
}
|
|
187
|
+
//& .name {
|
|
188
|
+
// font-size: 36rpx;
|
|
189
|
+
// font-weight: 600;
|
|
190
|
+
// margin-bottom: 20rpx;
|
|
191
|
+
// .uni-max-cut(2, 90);
|
|
192
|
+
// line-height: 45rpx;
|
|
193
|
+
//}
|
|
194
|
+
//
|
|
195
|
+
//& .other {
|
|
174
196
|
|
|
197
|
+
//}
|
|
175
198
|
}
|
|
199
|
+
|
|
200
|
+
//.right {
|
|
201
|
+
// flex-shrink: 0;
|
|
202
|
+
// display: flex;
|
|
203
|
+
// align-content: space-between;
|
|
204
|
+
// align-items: flex-end;
|
|
205
|
+
// justify-content: flex-end;
|
|
206
|
+
// flex-flow: wrap;
|
|
207
|
+
// box-sizing: border-box;
|
|
208
|
+
// width: 160rpx;
|
|
209
|
+
// height: 200rpx;
|
|
210
|
+
//
|
|
211
|
+
// & .score {
|
|
212
|
+
|
|
213
|
+
//
|
|
214
|
+
// }
|
|
215
|
+
//
|
|
216
|
+
//}
|
|
176
217
|
}
|
|
177
218
|
</style>
|
|
@@ -40,14 +40,17 @@
|
|
|
40
40
|
</view>
|
|
41
41
|
</view>
|
|
42
42
|
</view>
|
|
43
|
-
<view v-if="!isPreview" style="height:
|
|
43
|
+
<view v-if="!isPreview" :style="{height: menuHeight}"></view>
|
|
44
44
|
<view class="tfk-search" :style="{padding: outSpacing + 'rpx'}">
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
45
|
+
<all-list v-if="tabId === 'all'"
|
|
46
|
+
:keyword="keyword"
|
|
47
|
+
:list-item-style="listItemStyle"
|
|
48
|
+
:product-config="productConfig"
|
|
49
|
+
:all-style="allStyle"
|
|
50
|
+
@on-parent-vm="handleParentVm"
|
|
51
|
+
@on-list="handleList"
|
|
52
|
+
@on-switch="handleSwitchMenu"
|
|
53
|
+
></all-list>
|
|
51
54
|
<custom-list
|
|
52
55
|
:tab-id="tabId"
|
|
53
56
|
:keyword="keyword"
|
|
@@ -73,7 +76,7 @@
|
|
|
73
76
|
import extsMixins from "@/mixins/extsMixins";
|
|
74
77
|
import listMixins from "./listMixins";
|
|
75
78
|
import CustomList from "./CustomList.vue";
|
|
76
|
-
|
|
79
|
+
import AllList from "./AllList.vue";
|
|
77
80
|
|
|
78
81
|
class EmitParent {
|
|
79
82
|
constructor(options) {
|
|
@@ -86,7 +89,7 @@
|
|
|
86
89
|
components: {
|
|
87
90
|
CustomList,
|
|
88
91
|
XdFontIcon,
|
|
89
|
-
|
|
92
|
+
AllList,
|
|
90
93
|
XdSearchHistory
|
|
91
94
|
},
|
|
92
95
|
mixins: [
|
|
@@ -96,7 +99,7 @@
|
|
|
96
99
|
return {
|
|
97
100
|
hideMask: true,
|
|
98
101
|
tabId: 'all', //cinema/film/shop/product
|
|
99
|
-
keyword: '
|
|
102
|
+
keyword: '',
|
|
100
103
|
options:{},
|
|
101
104
|
menuList: [],
|
|
102
105
|
//公共样式
|
|
@@ -176,6 +179,13 @@
|
|
|
176
179
|
|
|
177
180
|
return this.styleObjectToString(styleObj)
|
|
178
181
|
},
|
|
182
|
+
menuHeight(){
|
|
183
|
+
const { menuItemPadding, menuPadding, menuMargin } = this;
|
|
184
|
+
let height = this.checkValue(menuMargin.top, 20) + this.checkValue(menuMargin.bottom, 20) +
|
|
185
|
+
this.checkValue(menuPadding.top, 20) + this.checkValue(menuPadding.bottom, 20) +
|
|
186
|
+
this.checkValue(menuItemPadding.top, 20) + this.checkValue(menuItemPadding.bottom, 20);
|
|
187
|
+
return (height + 40) + 'rpx';
|
|
188
|
+
},
|
|
179
189
|
menuItemActiveStyle(){
|
|
180
190
|
let defaultTextColor = this.mainColor;
|
|
181
191
|
let styleActiveObj = {
|
|
@@ -187,6 +197,24 @@
|
|
|
187
197
|
}
|
|
188
198
|
return this.styleObjectToString(styleActiveObj)
|
|
189
199
|
},
|
|
200
|
+
allStyle(){
|
|
201
|
+
return {
|
|
202
|
+
allListBgColor: this.allListBgColor,
|
|
203
|
+
allModulePadding: this.allModulePadding,
|
|
204
|
+
allModuleRadius: this.allModuleRadius,
|
|
205
|
+
allModuleTitleBgColor: this.allModuleTitleBgColor,
|
|
206
|
+
allModuleTitlePadding: this.allModuleTitlePadding,
|
|
207
|
+
allModuleMoreStyle: this.allModuleMoreStyle,
|
|
208
|
+
allModuleMargin: this.allModuleMargin,
|
|
209
|
+
allModuleTitleStyle: this.allModuleTitleStyle,
|
|
210
|
+
allModuleItemContBorder: this.allModuleItemContBorder,
|
|
211
|
+
allModuleItemContMargin: this.allModuleItemContMargin,
|
|
212
|
+
allModuleItemContShadow: this.allModuleItemContShadow,
|
|
213
|
+
allModuleItemContPadding: this.allModuleItemContPadding,
|
|
214
|
+
allModuleItemContRadius: this.allModuleItemContRadius,
|
|
215
|
+
allModuleItemContBgColor: this.allModuleItemContBgColor
|
|
216
|
+
}
|
|
217
|
+
}
|
|
190
218
|
},
|
|
191
219
|
watch: {
|
|
192
220
|
container(value, oldValue) {
|