jufubao-base 1.0.174-beta2 → 1.0.174-beta4
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/JfbBaseLogin/Attr.js +1 -0
- package/src/components/JfbBaseLogin/JfbBaseLogin.vue +22 -23
- package/src/components/JfbBaseTfkCardBind/JfbBaseTfkCardBind.vue +1 -1
- package/src/components/JfbBaseTfkSearch/AllList.vue +95 -87
- package/src/components/JfbBaseTfkSearch/ContentCinema.vue +2 -0
- package/src/components/JfbBaseTfkSearch/ContentFilm.vue +13 -1
- package/src/components/JfbBaseTfkSearch/ContentProduct.vue +16 -4
- package/src/components/JfbBaseTfkSearch/ContentShop.vue +2 -0
- package/src/components/JfbBaseTfkSearch/CustomList.vue +25 -5
- package/src/components/JfbBaseTfkSearch/JfbBaseTfkSearch.vue +2 -1
- package/src/components/JfbBaseTfkSearch/Mock.js +28 -47
package/package.json
CHANGED
|
@@ -174,7 +174,7 @@
|
|
|
174
174
|
</xd-form-item>
|
|
175
175
|
<xd-form-item
|
|
176
176
|
v-if="accountLoginType === 'pwd'"
|
|
177
|
-
class="form-item"
|
|
177
|
+
class="form-item password-form-item"
|
|
178
178
|
:class="[inputStyle]"
|
|
179
179
|
label="密码"
|
|
180
180
|
:leftIcon="passwordIcon"
|
|
@@ -190,6 +190,23 @@
|
|
|
190
190
|
</xd-form>
|
|
191
191
|
</view>
|
|
192
192
|
|
|
193
|
+
<view class="form-group" :style="btnWrapStyle">
|
|
194
|
+
<xd-button
|
|
195
|
+
style="flex: 1"
|
|
196
|
+
type="primary"
|
|
197
|
+
:radius="btnRadius + 'rpx'"
|
|
198
|
+
:bg-color="btnColor"
|
|
199
|
+
:disabled="!panelTwoIsChecked"
|
|
200
|
+
@click="doLoginForm"
|
|
201
|
+
>
|
|
202
|
+
<xd-font-icon v-if="phoneLoginBtnIcon"
|
|
203
|
+
style="display: inline-flex;margin-right: 12rpx;"
|
|
204
|
+
:icon="phoneLoginBtnIcon"
|
|
205
|
+
></xd-font-icon>
|
|
206
|
+
{{ phoneLoginBtnText }}
|
|
207
|
+
</xd-button
|
|
208
|
+
>
|
|
209
|
+
</view>
|
|
193
210
|
<view class="form-group" :style="agreementBoxStyle">
|
|
194
211
|
<xd-form-checkbox
|
|
195
212
|
class="xd-form-checkbox"
|
|
@@ -213,23 +230,6 @@
|
|
|
213
230
|
</template>
|
|
214
231
|
</xd-form-checkbox>
|
|
215
232
|
</view>
|
|
216
|
-
<view class="form-group" :style="btnWrapStyle">
|
|
217
|
-
<xd-button
|
|
218
|
-
style="flex: 1"
|
|
219
|
-
type="primary"
|
|
220
|
-
:radius="btnRadius + 'rpx'"
|
|
221
|
-
:bg-color="btnColor"
|
|
222
|
-
:disabled="!panelTwoIsChecked"
|
|
223
|
-
@click="doLoginForm"
|
|
224
|
-
>
|
|
225
|
-
<xd-font-icon v-if="phoneLoginBtnIcon"
|
|
226
|
-
style="display: inline-flex;margin-right: 12rpx;"
|
|
227
|
-
:icon="phoneLoginBtnIcon"
|
|
228
|
-
></xd-font-icon>
|
|
229
|
-
{{ phoneLoginBtnText }}
|
|
230
|
-
</xd-button
|
|
231
|
-
>
|
|
232
|
-
</view>
|
|
233
233
|
<view
|
|
234
234
|
v-if="accountLoginType === 'pwd'"
|
|
235
235
|
class="forget_password"
|
|
@@ -1098,6 +1098,7 @@ export default {
|
|
|
1098
1098
|
box-sizing: border-box;
|
|
1099
1099
|
|
|
1100
1100
|
&__body {
|
|
1101
|
+
padding-bottom: 160rpx;
|
|
1101
1102
|
.xd-form-checkbox {
|
|
1102
1103
|
::v-deep .checklist-content .checklist-text {
|
|
1103
1104
|
font-size: 26rpx !important;
|
|
@@ -1183,8 +1184,8 @@ export default {
|
|
|
1183
1184
|
}
|
|
1184
1185
|
.linear{
|
|
1185
1186
|
::v-deep .uni-forms-item--border{
|
|
1186
|
-
border-
|
|
1187
|
-
border-
|
|
1187
|
+
border-top: none !important;
|
|
1188
|
+
border-bottom: var(--form-border-width) solid var(--form-border-color) !important;
|
|
1188
1189
|
}
|
|
1189
1190
|
}
|
|
1190
1191
|
.face{
|
|
@@ -1198,8 +1199,6 @@ export default {
|
|
|
1198
1199
|
}
|
|
1199
1200
|
// #endif
|
|
1200
1201
|
|
|
1201
|
-
|
|
1202
|
-
|
|
1203
1202
|
.get_code {
|
|
1204
1203
|
color: @xd-base-color;
|
|
1205
1204
|
font-size: 24rpx;
|
|
@@ -1217,11 +1216,11 @@ export default {
|
|
|
1217
1216
|
image {
|
|
1218
1217
|
width: 180rpx;
|
|
1219
1218
|
height: 180rpx;
|
|
1220
|
-
margin-bottom: unit(12,rpx);
|
|
1221
1219
|
}
|
|
1222
1220
|
& > view {
|
|
1223
1221
|
font-size: unit(36,rpx);
|
|
1224
1222
|
font-weight: 600;
|
|
1223
|
+
margin-top: 12rpx;
|
|
1225
1224
|
}
|
|
1226
1225
|
}
|
|
1227
1226
|
.panel-login-auth {
|
|
@@ -69,7 +69,7 @@
|
|
|
69
69
|
placeholder="请输入票券号"
|
|
70
70
|
style="width: 100%;"
|
|
71
71
|
/>
|
|
72
|
-
<view @click="doScanCode">
|
|
72
|
+
<view @click.stop="doScanCode" style="margin-left: 20rpx;">
|
|
73
73
|
<xd-font-icon :icon="scanIcon.icon || 'iconsaoma'"
|
|
74
74
|
:color="scanIcon.color"
|
|
75
75
|
:style="{fontSize: scanIcon.fontSize}"
|
|
@@ -1,78 +1,81 @@
|
|
|
1
1
|
<template>
|
|
2
2
|
<view class="search_all_list" >
|
|
3
|
-
<
|
|
4
|
-
:
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
<view v-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
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
|
-
|
|
3
|
+
<template v-if="!loadingList">
|
|
4
|
+
<view class="module_item" v-for="parent in list" :key="parent.setting_id"
|
|
5
|
+
:style="moduleItemStyle"
|
|
6
|
+
>
|
|
7
|
+
<view class="module_title" :style="moduleItemTitleStyle">{{ parent.name }}</view>
|
|
8
|
+
<view v-if="parent.type !== 'product'" class="module_cont">
|
|
9
|
+
<view v-for="(item, i) in parent.items" :key="item.key"
|
|
10
|
+
class="module_cont_inner"
|
|
11
|
+
:style="[moduleItemContStyle]"
|
|
12
|
+
>
|
|
13
|
+
<content-cinema v-if="parent.type === 'cinema'"
|
|
14
|
+
style="width: 100%; height: 100%"
|
|
15
|
+
:keyword="keyword"
|
|
16
|
+
:item="item"
|
|
17
|
+
:out-spacing="listItemStyle.outSpacing"
|
|
18
|
+
:color="{SEAT:listItemStyle.mainColor,CODE:listItemStyle.subMainColor,SELL:listItemStyle.successColor}"
|
|
19
|
+
:border-radius="listItemStyle.imgRradius"
|
|
20
|
+
:brand-color="listItemStyle.brandColor"
|
|
21
|
+
@on-schedule="data => handleFilmDetail(data, parent)"
|
|
22
|
+
@on-cashier-detail="data => handleCashierDetail(data, parent)"
|
|
23
|
+
@on-code-detail="data => handleCodeDetail(data, parent)"
|
|
24
|
+
></content-cinema>
|
|
25
|
+
<content-film v-if="parent.type === 'film'"
|
|
26
|
+
type="hot"
|
|
27
|
+
style="width: 100%; height: 100%"
|
|
28
|
+
:keyword="keyword"
|
|
29
|
+
:item="item"
|
|
30
|
+
:out-spacing="listItemStyle.outSpacing"
|
|
31
|
+
:color="listItemStyle.mainColor"
|
|
32
|
+
:border-radius="listItemStyle.imgRradius"
|
|
33
|
+
:brand-color="listItemStyle.brandColor"
|
|
34
|
+
@on-film-detail="data => handleFilmDetail(data, parent)"
|
|
35
|
+
@on-buy="data => handleBuy(data, parent)"
|
|
36
|
+
></content-film>
|
|
37
|
+
<content-shop v-if="parent.type === 'shop'"
|
|
38
|
+
style="width: 100%; height: 100%"
|
|
39
|
+
:keyword="keyword"
|
|
40
|
+
:item="item"
|
|
41
|
+
:out-spacing="listItemStyle.outSpacing"
|
|
42
|
+
:color="listItemStyle.mainColor"
|
|
43
|
+
:border-radius="listItemStyle.imgRradius"
|
|
44
|
+
:brand-color="listItemStyle.brandColor"
|
|
45
|
+
:is-echange="listItemStyle.isShowExchange"
|
|
46
|
+
@on-shop-jhd="data => handleShopJhd(data, parent)"
|
|
47
|
+
@on-shop-detail="data => handleShopDetail(data, parent)"
|
|
48
|
+
></content-shop>
|
|
49
|
+
</view>
|
|
48
50
|
</view>
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
51
|
+
<view v-else class="module_cont product_wrap">
|
|
52
|
+
<view v-for="(item, i) in parent.items" :key="item.key"
|
|
53
|
+
class="module_cont_inner"
|
|
54
|
+
:style="[moduleItemContStyle, {
|
|
55
|
+
width: getProductCell(parent.tab) == 2 ? `calc(50% - ${listItemStyle.outSpacing/2}rpx)`: '100%',
|
|
56
|
+
}]"
|
|
57
|
+
>
|
|
58
|
+
<content-product v-if="parent.type === 'product'"
|
|
59
|
+
style="width: 100%; height: 100%"
|
|
60
|
+
:keyword="keyword"
|
|
61
|
+
:item="item"
|
|
62
|
+
:height="outItemProduct"
|
|
63
|
+
:product-config="productConfig"
|
|
64
|
+
:out-spacing="listItemStyle.outSpacing"
|
|
65
|
+
:color="listItemStyle.mainColor"
|
|
66
|
+
:brand-color="listItemStyle.brandColor"
|
|
67
|
+
:border-radius="listItemStyle.imgRradius"
|
|
68
|
+
:cell="getProductCell(parent.tab)"
|
|
69
|
+
@on-product-detail="data => handleProductDetail(data, parent)"
|
|
70
|
+
></content-product>
|
|
71
|
+
</view>
|
|
72
|
+
</view>
|
|
73
|
+
<view class="module_more">
|
|
74
|
+
<view class="more_inner" :style="moduleMoreStyle" @click="switchMenu(parent)">查看全部</view>
|
|
70
75
|
</view>
|
|
71
76
|
</view>
|
|
72
|
-
<
|
|
73
|
-
|
|
74
|
-
</view>
|
|
75
|
-
</view>
|
|
77
|
+
<xd-no-data v-if="list && list.length ===0" height="60vh" icon-type="search">商品正在上架中</xd-no-data>
|
|
78
|
+
</template>
|
|
76
79
|
</view>
|
|
77
80
|
</template>
|
|
78
81
|
|
|
@@ -82,13 +85,15 @@
|
|
|
82
85
|
import ContentShop from "./ContentShop.vue"
|
|
83
86
|
import ContentProduct from "./ContentProduct.vue"
|
|
84
87
|
import {mapState} from "vuex";
|
|
88
|
+
import XdNoData from "@/components/XdNoData/XdNoData"
|
|
85
89
|
export default{
|
|
86
90
|
name: "SearchAllList",
|
|
87
91
|
components: {
|
|
88
92
|
ContentCinema,
|
|
89
93
|
ContentFilm,
|
|
90
94
|
ContentShop,
|
|
91
|
-
ContentProduct
|
|
95
|
+
ContentProduct,
|
|
96
|
+
XdNoData,
|
|
92
97
|
},
|
|
93
98
|
props: {
|
|
94
99
|
keyword:{
|
|
@@ -202,11 +207,13 @@
|
|
|
202
207
|
getParent:null,
|
|
203
208
|
$parentVm:null,
|
|
204
209
|
parentStatus: false,
|
|
210
|
+
loadingList: true,
|
|
205
211
|
|
|
206
212
|
list: [],
|
|
207
213
|
}
|
|
208
214
|
},
|
|
209
215
|
created(){
|
|
216
|
+
this.loadingList = true;
|
|
210
217
|
this.getParentMV();
|
|
211
218
|
this.getList();
|
|
212
219
|
},
|
|
@@ -243,6 +250,7 @@
|
|
|
243
250
|
this.$emit('on-list', {
|
|
244
251
|
params: params,
|
|
245
252
|
cb:(list)=>{
|
|
253
|
+
this.loadingList = false;
|
|
246
254
|
this.list = (list || []).map(parent => {
|
|
247
255
|
parent.items = parent.items.map(item => {
|
|
248
256
|
item['key'] = item.product_id || item.resource_shop_id || item.cinema_id || item.film_id;
|
|
@@ -260,35 +268,35 @@
|
|
|
260
268
|
|
|
261
269
|
|
|
262
270
|
//影片
|
|
263
|
-
handleFilmDetail(film){
|
|
264
|
-
this.getParent().handleFilmDetail(film,
|
|
271
|
+
handleFilmDetail(film, dataConfig){
|
|
272
|
+
this.getParent().handleFilmDetail(film, dataConfig)
|
|
265
273
|
},
|
|
266
|
-
handleBuy(film){
|
|
267
|
-
this.getParent().handleBuy(film,
|
|
274
|
+
handleBuy(film, dataConfig){
|
|
275
|
+
this.getParent().handleBuy(film, dataConfig)
|
|
268
276
|
},
|
|
269
277
|
|
|
270
278
|
//影院
|
|
271
|
-
handleSchedule(cinema){
|
|
272
|
-
this.getParent().handleSchedule(cinema,
|
|
279
|
+
handleSchedule(cinema, dataConfig){
|
|
280
|
+
this.getParent().handleSchedule(cinema, dataConfig)
|
|
273
281
|
},
|
|
274
|
-
handleCashierDetail(cinema){
|
|
275
|
-
this.getParent().handleCashierDetail(cinema,
|
|
282
|
+
handleCashierDetail(cinema, dataConfig){
|
|
283
|
+
this.getParent().handleCashierDetail(cinema, dataConfig)
|
|
276
284
|
},
|
|
277
|
-
handleCodeDetail(cinema){
|
|
278
|
-
this.getParent().handleCodeDetail(cinema,
|
|
285
|
+
handleCodeDetail(cinema, dataConfig){
|
|
286
|
+
this.getParent().handleCodeDetail(cinema, dataConfig)
|
|
279
287
|
},
|
|
280
288
|
|
|
281
289
|
//门店
|
|
282
|
-
handleShopJhd(shop){
|
|
283
|
-
this.getParent().handleShopJhd(shop,
|
|
290
|
+
handleShopJhd(shop, dataConfig){
|
|
291
|
+
this.getParent().handleShopJhd(shop, dataConfig)
|
|
284
292
|
},
|
|
285
|
-
handleShopDetail(shop){
|
|
286
|
-
this.getParent().handleShopDetail(shop,
|
|
293
|
+
handleShopDetail(shop, dataConfig){
|
|
294
|
+
this.getParent().handleShopDetail(shop, dataConfig)
|
|
287
295
|
},
|
|
288
296
|
|
|
289
297
|
//商品
|
|
290
|
-
handleProductDetail(product){
|
|
291
|
-
this.getParent().handleProductDetail(product,
|
|
298
|
+
handleProductDetail(product, dataConfig){
|
|
299
|
+
this.getParent().handleProductDetail(product, dataConfig)
|
|
292
300
|
},
|
|
293
301
|
}
|
|
294
302
|
}
|
|
@@ -9,7 +9,7 @@
|
|
|
9
9
|
</view>
|
|
10
10
|
<view class="middle">
|
|
11
11
|
<view class="top">
|
|
12
|
-
<view class="name"
|
|
12
|
+
<view class="name" v-html="cusName"></view>
|
|
13
13
|
<view class="score">
|
|
14
14
|
<template v-if="item['remark']">
|
|
15
15
|
<text>评分:</text><text :style="{color:color}">{{item['remark']}}</text>
|
|
@@ -61,12 +61,17 @@
|
|
|
61
61
|
|
|
62
62
|
<script>
|
|
63
63
|
import XdButton from "@/components/XdButton/XdButton.vue";
|
|
64
|
+
import handleKeyword from "./handleKeyword";
|
|
64
65
|
export default {
|
|
65
66
|
name:'ContentItem',
|
|
66
67
|
components:{
|
|
67
68
|
XdButton
|
|
68
69
|
},
|
|
69
70
|
props:{
|
|
71
|
+
keyword:{
|
|
72
|
+
type:String,
|
|
73
|
+
default:''
|
|
74
|
+
},
|
|
70
75
|
item:Object,
|
|
71
76
|
outSpacing: {
|
|
72
77
|
type: Number|String,
|
|
@@ -86,6 +91,11 @@
|
|
|
86
91
|
}
|
|
87
92
|
|
|
88
93
|
},
|
|
94
|
+
computed:{
|
|
95
|
+
cusName(){
|
|
96
|
+
return handleKeyword(this, this.item['show_name'], this.keyword)
|
|
97
|
+
},
|
|
98
|
+
},
|
|
89
99
|
data(){
|
|
90
100
|
return {
|
|
91
101
|
errorImage: 'https://img.jufubao.cn/common/error_movie.png?v20',
|
|
@@ -143,6 +153,8 @@
|
|
|
143
153
|
font-weight: 600;
|
|
144
154
|
.uni-max-cut(2, 90);
|
|
145
155
|
line-height: 45rpx;
|
|
156
|
+
word-wrap: break-word;
|
|
157
|
+
word-break: break-all;
|
|
146
158
|
}
|
|
147
159
|
& >view:nth-child(2) {
|
|
148
160
|
flex-shrink: 0;
|
|
@@ -16,7 +16,7 @@
|
|
|
16
16
|
<view class="prodcut-content-info">
|
|
17
17
|
<view class="name" v-html="cusName" :class="{showOne: isOne}"></view>
|
|
18
18
|
<view class="brand" v-if="productConfig.is_show_brand==='Y'" :style="{color:brandColor}">{{item['brand_name']}}</view>
|
|
19
|
-
<view class="tags" v-if="productConfig.isShowTag === 'Y'">
|
|
19
|
+
<view class="tags" :class="{showTwo:!isOne}" v-if="productConfig.isShowTag === 'Y'">
|
|
20
20
|
<view
|
|
21
21
|
v-for="tag in tagsList"
|
|
22
22
|
:key="tag"
|
|
@@ -217,6 +217,7 @@ export default {
|
|
|
217
217
|
}
|
|
218
218
|
|
|
219
219
|
&-content {
|
|
220
|
+
overflow: hidden;
|
|
220
221
|
&-info {
|
|
221
222
|
|
|
222
223
|
}
|
|
@@ -274,6 +275,13 @@ export default {
|
|
|
274
275
|
margin-bottom: 10rpx;
|
|
275
276
|
line-height: 40rpx;
|
|
276
277
|
.uni-max-cut(2,80);
|
|
278
|
+
word-wrap: break-word;
|
|
279
|
+
word-break: break-all;
|
|
280
|
+
|
|
281
|
+
& > text {
|
|
282
|
+
display: inline-block;
|
|
283
|
+
|
|
284
|
+
}
|
|
277
285
|
|
|
278
286
|
&.showOne {
|
|
279
287
|
.uni-max-cut(1,40);
|
|
@@ -295,6 +303,11 @@ export default {
|
|
|
295
303
|
margin-bottom: 10rpx;
|
|
296
304
|
flex-flow: wrap;
|
|
297
305
|
|
|
306
|
+
&.showTwo {
|
|
307
|
+
&:nth-child(4),&:nth-child(5),&:nth-child(6){
|
|
308
|
+
margin-top: 8rpx;
|
|
309
|
+
}
|
|
310
|
+
}
|
|
298
311
|
& > view {
|
|
299
312
|
padding: 0 14rpx;
|
|
300
313
|
height: 32rpx;
|
|
@@ -307,11 +320,10 @@ export default {
|
|
|
307
320
|
&:last-child {
|
|
308
321
|
margin-right: 0;
|
|
309
322
|
}
|
|
310
|
-
|
|
311
|
-
margin-top: 8rpx;
|
|
312
|
-
}
|
|
323
|
+
|
|
313
324
|
}
|
|
314
325
|
}
|
|
326
|
+
|
|
315
327
|
}
|
|
316
328
|
}
|
|
317
329
|
</style>
|
|
@@ -70,14 +70,14 @@
|
|
|
70
70
|
@on-code-detail="handleCodeDetail"
|
|
71
71
|
></content-cinema>
|
|
72
72
|
<content-shop
|
|
73
|
-
v-if="type_code === 'shop'"
|
|
73
|
+
v-if="productConfig !== null && type_code === 'shop'"
|
|
74
74
|
style="width: 100%; height: 100%"
|
|
75
75
|
:keyword="keyword"
|
|
76
76
|
:out-spacing="listItemStyle.outSpacing"
|
|
77
77
|
:item="item"
|
|
78
78
|
:color="listItemStyle.mainColor"
|
|
79
79
|
:border-radius="listItemStyle.imgRradius"
|
|
80
|
-
:is-echange="
|
|
80
|
+
:is-echange="productConfig.isShowExchange"
|
|
81
81
|
@on-shop-jhd="handleShopJhd"
|
|
82
82
|
@on-shop-detail="handleShopDetail"
|
|
83
83
|
></content-shop>
|
|
@@ -94,7 +94,9 @@
|
|
|
94
94
|
:cell="type_other"
|
|
95
95
|
@on-product-detail="handleProductDetail"
|
|
96
96
|
></content-product>
|
|
97
|
+
|
|
97
98
|
</view>
|
|
99
|
+
<view class="hasNoData" v-if="dataList && dataList.length > 0 && page_token === ''">已经到底没有更多数据了</view>
|
|
98
100
|
</template>
|
|
99
101
|
<view v-else class="productBox2">
|
|
100
102
|
<view v-for="(value, listKey) in productTowList" :key="listKey">
|
|
@@ -226,7 +228,7 @@ export default {
|
|
|
226
228
|
let h = 'auto'
|
|
227
229
|
if(this.type_code === 'film') h = '240rpx'
|
|
228
230
|
if(this.type_code === 'cinema') h = 'auto';
|
|
229
|
-
if(this.type_code === 'shop') h = '
|
|
231
|
+
if(this.type_code === 'shop') h = '220rpx';
|
|
230
232
|
return h;
|
|
231
233
|
}
|
|
232
234
|
},
|
|
@@ -239,7 +241,7 @@ export default {
|
|
|
239
241
|
hasNoData: false,
|
|
240
242
|
|
|
241
243
|
page_token:'1',
|
|
242
|
-
page_size:
|
|
244
|
+
page_size: 10,
|
|
243
245
|
|
|
244
246
|
//参数
|
|
245
247
|
type_code:'',
|
|
@@ -360,8 +362,16 @@ export default {
|
|
|
360
362
|
return
|
|
361
363
|
}
|
|
362
364
|
|
|
365
|
+
// res.items = res.items.map(item=>{
|
|
366
|
+
// if(item.market_tags) {
|
|
367
|
+
// item.market_tags = ['flashsale','hot','new', 'rec']
|
|
368
|
+
// }
|
|
369
|
+
// return item
|
|
370
|
+
// });
|
|
371
|
+
|
|
363
372
|
//正常数据处理
|
|
364
|
-
this.dataConfig = res
|
|
373
|
+
this.dataConfig = res
|
|
374
|
+
|
|
365
375
|
|
|
366
376
|
//整理为统一ID
|
|
367
377
|
res.items = res.items.map((item,index)=>{
|
|
@@ -450,4 +460,14 @@ export default {
|
|
|
450
460
|
flex-flow: wrap;
|
|
451
461
|
}
|
|
452
462
|
|
|
463
|
+
.hasNoData {
|
|
464
|
+
height: 80rpx;
|
|
465
|
+
line-height: 80rpx;
|
|
466
|
+
font-size: 24rpx;
|
|
467
|
+
text-align: center;
|
|
468
|
+
color: #ccc;
|
|
469
|
+
background-color: rgba(255, 255, 255, .05);
|
|
470
|
+
margin: 20rpx 0
|
|
471
|
+
}
|
|
472
|
+
|
|
453
473
|
</style>
|
|
@@ -47,6 +47,7 @@
|
|
|
47
47
|
@on-switch="handleSwitchMenu"
|
|
48
48
|
></all-list>
|
|
49
49
|
<custom-list
|
|
50
|
+
v-else
|
|
50
51
|
:tab-id="tabId"
|
|
51
52
|
:keyword="keyword"
|
|
52
53
|
:list-item-style="listItemStyle"
|
|
@@ -92,7 +93,6 @@
|
|
|
92
93
|
],
|
|
93
94
|
data() {
|
|
94
95
|
return {
|
|
95
|
-
hideMask: true,
|
|
96
96
|
tabId: 'all', //cinema/film/shop/product
|
|
97
97
|
keyword: '',
|
|
98
98
|
options:{},
|
|
@@ -223,6 +223,7 @@
|
|
|
223
223
|
},
|
|
224
224
|
},
|
|
225
225
|
created() {
|
|
226
|
+
if(this.$configProject['isPreview']) this.keyword = '商品'
|
|
226
227
|
this.emitParent = new EmitParent({
|
|
227
228
|
getParent: ()=>{
|
|
228
229
|
return this;
|
|
@@ -7,8 +7,7 @@ module.exports = {
|
|
|
7
7
|
tab: "1@product@Y@2",
|
|
8
8
|
type: "product",
|
|
9
9
|
name: "蛋糕",
|
|
10
|
-
detail_redirect_data:
|
|
11
|
-
'{"dir":"market","host":"sandbox-website-05.jufubao.cn","path":"\\/main\\/mall\\/detail","appType":"h5","site_id":"17928cc37788be02","site_url":"https:\\/\\/sandbox-website-05.jufubao.cn\\/market\\/main\\/mall\\/detail","frontPath":"\\/market\\/main\\/mall\\/detail","fixed_business_code":""}',
|
|
10
|
+
detail_redirect_data: '{"dir":"market","host":"sandbox-website-05.jufubao.cn","path":"\\/main\\/mall\\/detail","appType":"h5","site_id":"17928cc37788be02","site_url":"https:\\/\\/sandbox-website-05.jufubao.cn\\/market\\/main\\/mall\\/detail","frontPath":"\\/market\\/main\\/mall\\/detail","fixed_business_code":""}',
|
|
12
11
|
detail1_redirect_data: "",
|
|
13
12
|
more_redirect_data: "",
|
|
14
13
|
sort: 3,
|
|
@@ -37,7 +36,7 @@ module.exports = {
|
|
|
37
36
|
market_price: 2600,
|
|
38
37
|
market_tags: ['flashsale','hot','new', 'rec'],
|
|
39
38
|
product_id: 60029756,
|
|
40
|
-
product_name: "
|
|
39
|
+
product_name: "清代戏剧文化史论/北京大学明清研究丛书商品",
|
|
41
40
|
product_type: "good",
|
|
42
41
|
promo_price: 0,
|
|
43
42
|
sale_num: 0,
|
|
@@ -49,11 +48,11 @@ module.exports = {
|
|
|
49
48
|
{
|
|
50
49
|
brand_id: 30000,
|
|
51
50
|
brand_name: "其他",
|
|
52
|
-
list_title: "亚洲的崛起(傅骊元文集)
|
|
51
|
+
list_title: "亚洲的崛起(傅骊元文集)/北京大学经济学院教授文库商品",
|
|
53
52
|
market_price: 5000,
|
|
54
53
|
market_tags: [],
|
|
55
54
|
product_id: 60030080,
|
|
56
|
-
product_name: "亚洲的崛起(傅骊元文集)
|
|
55
|
+
product_name: "亚洲的崛起(傅骊元文集)/北京大学经济学院教授文库商品",
|
|
57
56
|
product_type: "good",
|
|
58
57
|
promo_price: 0,
|
|
59
58
|
sale_num: 0,
|
|
@@ -65,13 +64,11 @@ module.exports = {
|
|
|
65
64
|
{
|
|
66
65
|
brand_id: 30000,
|
|
67
66
|
brand_name: "其他",
|
|
68
|
-
list_title:
|
|
69
|
-
"保险.社会保障与经济改革(孙祁祥文集)/北京大学经济学院教授文库",
|
|
67
|
+
list_title: "保险.社会保障与经济改革(孙祁祥文集)/北京大商品学经济学院教授文库",
|
|
70
68
|
market_price: 5200,
|
|
71
69
|
market_tags: [],
|
|
72
70
|
product_id: 60030078,
|
|
73
|
-
product_name:
|
|
74
|
-
"保险.社会保障与经济改革(孙祁祥文集)/北京大学经济学院教授文库",
|
|
71
|
+
product_name: "保险.社会保障与经济改革(孙祁祥文集)/北京大商品学经济学院教授文库",
|
|
75
72
|
product_type: "good",
|
|
76
73
|
promo_price: 0,
|
|
77
74
|
sale_num: 0,
|
|
@@ -86,10 +83,8 @@ module.exports = {
|
|
|
86
83
|
tab: "5@shop@N@1",
|
|
87
84
|
type: "shop",
|
|
88
85
|
name: "门店",
|
|
89
|
-
detail_redirect_data:
|
|
90
|
-
|
|
91
|
-
detail1_redirect_data:
|
|
92
|
-
'{"dir":"market","host":"sandbox-website-05.jufubao.cn","path":"\\/main\\/cashier\\/index","appType":"h5","site_id":"17928cc37788be02","site_url":"https:\\/\\/sandbox-website-05.jufubao.cn\\/market\\/main\\/cashier\\/index","frontPath":"\\/market\\/main\\/cashier\\/index","fixed_business_code":""}',
|
|
86
|
+
detail_redirect_data: '{"dir":"market","host":"sandbox-website-05.jufubao.cn","path":"\\/main\\/cake\\/storedetail","appType":"h5","site_id":"17928cc37788be02","site_url":"https:\\/\\/sandbox-website-05.jufubao.cn\\/market\\/main\\/cake\\/storedetail","frontPath":"\\/market\\/main\\/cake\\/storedetail","fixed_business_code":""}',
|
|
87
|
+
detail1_redirect_data: '{"dir":"market","host":"sandbox-website-05.jufubao.cn","path":"\\/main\\/cashier\\/index","appType":"h5","site_id":"17928cc37788be02","site_url":"https:\\/\\/sandbox-website-05.jufubao.cn\\/market\\/main\\/cashier\\/index","frontPath":"\\/market\\/main\\/cashier\\/index","fixed_business_code":""}',
|
|
93
88
|
more_redirect_data: "",
|
|
94
89
|
sort: 4,
|
|
95
90
|
setting_id: 5,
|
|
@@ -97,7 +92,7 @@ module.exports = {
|
|
|
97
92
|
items: [
|
|
98
93
|
{
|
|
99
94
|
brand_id: 20003,
|
|
100
|
-
brand_name: "
|
|
95
|
+
brand_name: "幸福西饼商品",
|
|
101
96
|
brand_type: "MA",
|
|
102
97
|
business_status: "1",
|
|
103
98
|
consume_mode: ["STOD", "CODE", "SELL", "SELF"],
|
|
@@ -110,11 +105,9 @@ module.exports = {
|
|
|
110
105
|
area_name: "",
|
|
111
106
|
street_name: "",
|
|
112
107
|
phone: "18843854566",
|
|
113
|
-
resource_shop_id:
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
shop_icon:
|
|
117
|
-
"https://jfbcake.oss-cn-beijing.aliyuncs.com/uploads/20220629/dda58a5983eeae3cfdea8bccc7cea714.jpg",
|
|
108
|
+
resource_shop_id: "eyJyZXNvdXJjZV9zaG9wX2lkIjozMTg1NDY4LCJzaG9wX2lkIjo1MjY0OH0",
|
|
109
|
+
resource_shop_name: "福司商品令渠道门店",
|
|
110
|
+
shop_icon: "https://jfbcake.oss-cn-beijing.aliyuncs.com/uploads/20220629/dda58a5983eeae3cfdea8bccc7cea714.jpg",
|
|
118
111
|
shop_id: 52648,
|
|
119
112
|
shop_tags: [],
|
|
120
113
|
stars: 0,
|
|
@@ -138,11 +131,9 @@ module.exports = {
|
|
|
138
131
|
area_name: "",
|
|
139
132
|
street_name: "",
|
|
140
133
|
phone: "18843854566",
|
|
141
|
-
resource_shop_id:
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
shop_icon:
|
|
145
|
-
"https://jfbcake.oss-cn-beijing.aliyuncs.com/uploads/20220629/dda58a5983eeae3cfdea8bccc7cea714.jpg",
|
|
134
|
+
resource_shop_id: "eyJyZXNvdXJjZV9zaG9wX2lkIjozMTg1NDY4LCJzaG9wX2lkqewqweH0",
|
|
135
|
+
resource_shop_name: "福司令商品渠道门店",
|
|
136
|
+
shop_icon: "https://jfbcake.oss-cn-beijing.aliyuncs.com/uploads/20220629/dda58a5983eeae3cfdea8bccc7cea714.jpg",
|
|
146
137
|
shop_id: 526428,
|
|
147
138
|
shop_tags: [],
|
|
148
139
|
stars: 0,
|
|
@@ -157,10 +148,8 @@ module.exports = {
|
|
|
157
148
|
tab: "10@cinema@Y@1",
|
|
158
149
|
type: "cinema",
|
|
159
150
|
name: "影院",
|
|
160
|
-
detail_redirect_data:
|
|
161
|
-
|
|
162
|
-
detail1_redirect_data:
|
|
163
|
-
'{"dir":"apply06","host":"sandbox-website-05.jufubao.cn","path":"\\/main\\/movie\\/cdetailnew","appType":"h5","site_id":"17928cc37788be02","site_url":"https:\\/\\/sandbox-website-05.jufubao.cn\\/apply06\\/main\\/movie\\/cdetailnew","frontPath":"\\/apply06\\/main\\/movie\\/cdetailnew","fixed_business_code":""}',
|
|
151
|
+
detail_redirect_data: '{"dir":"apply06","host":"sandbox-website-05.jufubao.cn","path":"\\/main\\/movie\\/suhedule","appType":"h5","site_id":"17928cc37788be02","site_url":"https:\\/\\/sandbox-website-05.jufubao.cn\\/apply06\\/main\\/movie\\/suhedule","frontPath":"\\/apply06\\/main\\/movie\\/suhedule","fixed_business_code":""}',
|
|
152
|
+
detail1_redirect_data: '{"dir":"apply06","host":"sandbox-website-05.jufubao.cn","path":"\\/main\\/movie\\/cdetailnew","appType":"h5","site_id":"17928cc37788be02","site_url":"https:\\/\\/sandbox-website-05.jufubao.cn\\/apply06\\/main\\/movie\\/cdetailnew","frontPath":"\\/apply06\\/main\\/movie\\/cdetailnew","fixed_business_code":""}',
|
|
164
153
|
more_redirect_data: "",
|
|
165
154
|
sort: 1,
|
|
166
155
|
setting_id: 10,
|
|
@@ -171,7 +160,7 @@ module.exports = {
|
|
|
171
160
|
brand_id: 16,
|
|
172
161
|
brand_name: "万达院线jls",
|
|
173
162
|
cinema_id: 8000121,
|
|
174
|
-
cinema_name: "电影门店jls-20231204
|
|
163
|
+
cinema_name: "电影门店jls-20231204(新建)商品北京",
|
|
175
164
|
cinema_type: ["SELL", "CODE"],
|
|
176
165
|
cinema_type_name: ["线下核销", "电子码"],
|
|
177
166
|
distance: "21.9km",
|
|
@@ -184,14 +173,12 @@ module.exports = {
|
|
|
184
173
|
brand_id: 16,
|
|
185
174
|
brand_name: "万达院线jls",
|
|
186
175
|
cinema_id: 7,
|
|
187
|
-
cinema_name:
|
|
188
|
-
"聚福宝测试影院聚福宝测试影院聚福宝测试影院聚福宝测试影院",
|
|
176
|
+
cinema_name: "聚福宝影院商品",
|
|
189
177
|
cinema_type: ["SEAT", "SELL"],
|
|
190
178
|
cinema_type_name: ["在线选座", "线下核销"],
|
|
191
179
|
distance: "20.8km",
|
|
192
180
|
is_open: "Y",
|
|
193
|
-
shop_icon:
|
|
194
|
-
"https://jfbcake.oss-cn-beijing.aliyuncs.com/uploads/20221018/5c1f49a47055a452ac6c5a3efd9d5174.jpg"
|
|
181
|
+
shop_icon: "https://jfbcake.oss-cn-beijing.aliyuncs.com/uploads/20221018/5c1f49a47055a452ac6c5a3efd9d5174.jpg"
|
|
195
182
|
}
|
|
196
183
|
]
|
|
197
184
|
},
|
|
@@ -199,10 +186,8 @@ module.exports = {
|
|
|
199
186
|
tab: "11@film@Y@1",
|
|
200
187
|
type: "film",
|
|
201
188
|
name: "影片",
|
|
202
|
-
detail_redirect_data:
|
|
203
|
-
|
|
204
|
-
detail1_redirect_data:
|
|
205
|
-
'{"dir":"market","host":"sandbox-website-05.jufubao.cn","path":"\\/main\\/movie\\/detail","appType":"h5","site_id":"17928cc37788be02","site_url":"https:\\/\\/sandbox-website-05.jufubao.cn\\/market\\/main\\/movie\\/detail","frontPath":"\\/market\\/main\\/movie\\/detail","fixed_business_code":""}',
|
|
189
|
+
detail_redirect_data: '{"dir":"market","host":"sandbox-website-05.jufubao.cn","path":"\\/main\\/movie\\/choose","appType":"h5","site_id":"17928cc37788be02","site_url":"https:\\/\\/sandbox-website-05.jufubao.cn\\/market\\/main\\/movie\\/choose","frontPath":"\\/market\\/main\\/movie\\/choose","fixed_business_code":""}',
|
|
190
|
+
detail1_redirect_data: '{"dir":"market","host":"sandbox-website-05.jufubao.cn","path":"\\/main\\/movie\\/detail","appType":"h5","site_id":"17928cc37788be02","site_url":"https:\\/\\/sandbox-website-05.jufubao.cn\\/market\\/main\\/movie\\/detail","frontPath":"\\/market\\/main\\/movie\\/detail","fixed_business_code":""}',
|
|
206
191
|
more_redirect_data: "",
|
|
207
192
|
sort: 2,
|
|
208
193
|
setting_id: 11,
|
|
@@ -213,13 +198,11 @@ module.exports = {
|
|
|
213
198
|
director: "",
|
|
214
199
|
is_can_buy: false,
|
|
215
200
|
language: "汉语普通话",
|
|
216
|
-
leading_role:
|
|
217
|
-
"费翔,李雪健,黄渤,于适,陈牧驰,娜然,此沙,武亚凡,夏雨,袁泉,王洛勇,侯雯元,黄曦彦,李昀锐,杨玏,陈坤",
|
|
201
|
+
leading_role: "费翔,李雪健,黄渤,于适,陈牧驰,娜然,此沙,武亚凡,夏雨,袁泉,王洛勇,侯雯元,黄曦彦,李昀锐,杨玏,陈坤",
|
|
218
202
|
open_time: 1689782400,
|
|
219
|
-
poster:
|
|
220
|
-
"https://gw.alicdn.com/tfscom/i1/O1CN01w8TjZl1xzSq3CothJ_!!6000000006514-0-alipicbeacon.jpg_320x320.jpg",
|
|
203
|
+
poster: "https://gw.alicdn.com/tfscom/i1/O1CN01w8TjZl1xzSq3CothJ_!!6000000006514-0-alipicbeacon.jpg_320x320.jpg",
|
|
221
204
|
remark: "9.1分",
|
|
222
|
-
show_name: "
|
|
205
|
+
show_name: "封神商品第一部",
|
|
223
206
|
type: "剧情,奇幻"
|
|
224
207
|
},
|
|
225
208
|
{
|
|
@@ -227,13 +210,11 @@ module.exports = {
|
|
|
227
210
|
director: "",
|
|
228
211
|
is_can_buy: false,
|
|
229
212
|
language: "汉语普通话",
|
|
230
|
-
leading_role:
|
|
231
|
-
"费翔,李雪健,黄渤,于适,陈牧驰,娜然,此沙,武亚凡,夏雨,袁泉,王洛勇,侯雯元,黄曦彦,李昀锐,杨玏,陈坤",
|
|
213
|
+
leading_role: "费翔,李雪健,黄渤,于适,陈牧驰,娜然,此沙,武亚凡,夏雨,袁泉,王洛勇,侯雯元,黄曦彦,李昀锐,杨玏,陈坤",
|
|
232
214
|
open_time: 1689782400,
|
|
233
|
-
poster:
|
|
234
|
-
"https://gw.alicdn.com/tfscom/i1/O1CN01w8TjZl1xzSq3CothJ_!!6000000006514-0-alipicbeacon.jpg_320x320.jpg",
|
|
215
|
+
poster: "https://gw.alicdn.com/tfscom/i1/O1CN01w8TjZl1xzSq3CothJ_!!6000000006514-0-alipicbeacon.jpg_320x320.jpg",
|
|
235
216
|
remark: "9.1分",
|
|
236
|
-
show_name: "
|
|
217
|
+
show_name: "封神商品第二部",
|
|
237
218
|
type: "剧情,奇幻"
|
|
238
219
|
}
|
|
239
220
|
]
|