jufubao-base 1.0.56-beta9 → 1.0.56

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.
Files changed (14) hide show
  1. package/package.json +1 -1
  2. package/src/components/JfbBaseCard/JfbBaseCard.vue +6 -3
  3. package/src/components/JfbBaseCardDisabledEntry/Api.js +34 -0
  4. package/src/components/JfbBaseCardDisabledEntry/Attr.js +14 -0
  5. package/src/components/JfbBaseCardDisabledEntry/JfbBaseCardDisabledEntry.vue +555 -0
  6. package/src/components/JfbBaseCardDisabledEntry/JfbBaseCardDisabledEntryLess.less +80 -0
  7. package/src/components/JfbBaseCardDisabledEntry/JfbBaseCardDisabledEntryMixin.js +30 -0
  8. package/src/components/JfbBaseCardDisabledEntry/Mock.js +226 -0
  9. package/src/components/JfbBaseCardEntry/Attr.js +11 -11
  10. package/src/components/JfbBaseCardEntry/JfbBaseCardEntry.vue +53 -106
  11. package/src/components/JfbBaseHeader/JfbBaseHeader.vue +2 -33
  12. package/src/components/JfbBaseSuccess/JfbBaseSuccess.vue +80 -51
  13. package/src/components/JfbBaseSuccess/Mock.js +5 -0
  14. package/src/mixins/colorCardMixins.js +60 -0
package/src/components/JfbBaseCardDisabledEntry/JfbBaseCardDisabledEntryMixin.js ADDED
@@ -0,0 +1,30 @@
1
+ 'use strict';
2
+
3
+
4
+ //@AttrImport
5
+ import Attr from "./Attr";
6
+ //@EndAttrImport
7
+
8
+
9
+ export default {
10
+ data() {
11
+ return {
12
+ //#ifdef H5
13
+
14
+ //@AttrData
15
+ Attr:{}, //对外开发编辑属性
16
+ //@EndAttrData
17
+
18
+ // #endif
19
+ cssRoot: 'jfb-base-card-disabled-entry'
20
+ }
21
+ },
22
+ created() {
23
+
24
+ //@AttrDataCreated
25
+ this.Attr = this.$xdUniHelper.customClone(Attr);
26
+ //@EndAttrDataCreated
27
+
28
+
29
+ },
30
+ }
package/src/components/JfbBaseCardDisabledEntry/Mock.js ADDED
@@ -0,0 +1,226 @@
1
+ 'use strict';
2
+
3
+ module.exports = {
4
+ getDisableCardListEntry: {
5
+ "list": [{
6
+ "card_number": "101001000008422",
7
+ "card_point": 100000,
8
+ "card_type": "27",
9
+ "card_type_name": "聚福宝福",
10
+ "unit": "点",
11
+ "end_time": "2025-04-30",
12
+ "is_valid": "Y",
13
+ "main_business_code_name": "",
14
+ "other_card_point": 0,
15
+ "is_exchange": "N",
16
+ "card_point_type": 1,
17
+ "business_codes": ["health"]
18
+ }, {
19
+ "card_number": "121000100000028",
20
+ "card_point": 10000,
21
+ "card_type": "44",
22
+ "card_type_name": "抵扣券测试",
23
+ "unit": "点",
24
+ "end_time": "2024-10-31",
25
+ "is_valid": "N",
26
+ "main_business_code_name": "",
27
+ "other_card_point": 0,
28
+ "is_exchange": "N",
29
+ "card_point_type": 1,
30
+ "business_codes": ["health"]
31
+ }, {
32
+ "card_number": "101001000005192",
33
+ "card_point": 100000000,
34
+ "card_type": "27",
35
+ "card_type_name": "聚福宝福",
36
+ "unit": "点",
37
+ "end_time": "2024-10-31",
38
+ "is_valid": "N",
39
+ "main_business_code_name": "",
40
+ "other_card_point": 0,
41
+ "is_exchange": "N",
42
+ "card_point_type": 1,
43
+ "business_codes": ["movie", "market", "cake", "book", "video", "play", "health", "small", "travel", "supermarket", "food"]
44
+ }, {
45
+ "card_number": "101001000008421",
46
+ "card_point": 100000,
47
+ "card_type": "27",
48
+ "card_type_name": "聚福宝福",
49
+ "unit": "点",
50
+ "end_time": "2024-12-31",
51
+ "is_valid": "N",
52
+ "main_business_code_name": "",
53
+ "other_card_point": 0,
54
+ "is_exchange": "N",
55
+ "card_point_type": 1,
56
+ "business_codes": ["cake"]
57
+ }, {
58
+ "card_number": "171003500000385",
59
+ "card_point": 10000,
60
+ "card_type": "39",
61
+ "card_type_name": "一对一次卡（无限制）",
62
+ "unit": "次",
63
+ "end_time": "2024-08-31",
64
+ "is_valid": "N",
65
+ "main_business_code_name": "",
66
+ "other_card_point": 0,
67
+ "is_exchange": "Y",
68
+ "card_point_type": 1,
69
+ "business_codes": ["movie", "market", "cake"]
70
+ }, {
71
+ "card_number": "101001000007175",
72
+ "card_point": 9998700,
73
+ "card_type": "27",
74
+ "card_type_name": "聚福宝福",
75
+ "unit": "点",
76
+ "end_time": "2023-10-31",
77
+ "is_valid": "N",
78
+ "main_business_code_name": "",
79
+ "other_card_point": 0,
80
+ "is_exchange": "N",
81
+ "card_point_type": 1,
82
+ "business_codes": ["movie", "market", "cake", "video", "play", "health"]
83
+ }, {
84
+ "card_number": "261001000002666",
85
+ "card_point": 0,
86
+ "card_type": "35",
87
+ "card_type_name": "大礼包测试",
88
+ "unit": "次",
89
+ "end_time": "2025-02-28",
90
+ "is_valid": "N",
91
+ "main_business_code_name": "",
92
+ "other_card_point": 0,
93
+ "is_exchange": "N",
94
+ "card_point_type": 1,
95
+ "business_codes": ["gift"]
96
+ }, {
97
+ "card_number": "261001000002518",
98
+ "card_point": 100000,
99
+ "card_type": "31",
100
+ "card_type_name": "加盟商福卡",
101
+ "unit": "点",
102
+ "end_time": "2023-08-29",
103
+ "is_valid": "N",
104
+ "main_business_code_name": "",
105
+ "other_card_point": 0,
106
+ "is_exchange": "N",
107
+ "card_point_type": 1,
108
+ "business_codes": ["movie", "market", "cake", "book", "video", "play", "health", "small", "travel", "supermarket", "food"]
109
+ }, {
110
+ "card_number": "261001000000344",
111
+ "card_point": 100,
112
+ "card_type": "35",
113
+ "card_type_name": "大礼包测试",
114
+ "unit": "次",
115
+ "end_time": "2023-07-21",
116
+ "is_valid": "N",
117
+ "main_business_code_name": "",
118
+ "other_card_point": 0,
119
+ "is_exchange": "N",
120
+ "card_point_type": 1,
121
+ "business_codes": ["movie", "market", "cake", "book", "gift", "video", "play", "health", "small", "travel"]
122
+ }],
123
+ "is_show_invalid_card_entrance": "Y",
124
+ "is_can_unbind": "Y",
125
+ "site_entry_settings": [{
126
+ "id": 572,
127
+ "business_code": "movie",
128
+ "entry_name": "在线选座",
129
+ "image_url": "https:\/\/sandbox-img.jufubao.cn\/uploads\/20230927\/74fcb8bf1bf617249eee5f1416533766.png",
130
+ "redirect_data": "{\"path\":\"https:\\\/\\\/website-01.jufubao.cn\\\/base\\\/system\\\/zhrk\\\/zkrk\"}",
131
+ "redirect_type": "URL"
132
+ }, {
133
+ "id": 10,
134
+ "business_code": "gift",
135
+ "entry_name": "礼包",
136
+ "image_url": "https:\/\/sandbox-img.jufubao.cn\/uploads\/20230927\/f1c8a447209eb04d77c2095a13cdadf4.png",
137
+ "redirect_data": "{\"dir\":\"apply\",\"host\":\"sandbox-website-05.jufubao.cn\",\"path\":\"\\\/main\\\/gift\\\/type\",\"site_id\":\"17928cc37788be02\",\"site_url\":\"https:\\\/\\\/sandbox-website-05.jufubao.cn\\\/apply\\\/main\\\/gift\\\/type\",\"frontPath\":\"\\\/apply\\\/main\\\/gift\\\/type\",\"fixed_business_code\":\"\"}",
138
+ "redirect_type": "INN"
139
+ }, {
140
+ "id": 7,
141
+ "business_code": "movie",
142
+ "entry_name": "在线选座",
143
+ "image_url": "https:\/\/sandbox-img.jufubao.cn\/uploads\/20230927\/61b3302ec80009964e0a4b7b2336e5cf.png",
144
+ "redirect_data": "{\"dir\":\"apply\",\"host\":\"sandbox-website-05.jufubao.cn\",\"path\":\"\\\/main\\\/movie\\\/index\",\"site_id\":\"17928cc37788be02\",\"site_url\":\"https:\\\/\\\/sandbox-website-05.jufubao.cn\\\/apply\\\/main\\\/movie\\\/index\",\"frontPath\":\"\\\/apply\\\/main\\\/movie\\\/index\",\"fixed_business_code\":\"\"}",
145
+ "redirect_type": "INN"
146
+ }, {
147
+ "id": 9,
148
+ "business_code": "cake",
149
+ "entry_name": "蛋糕",
150
+ "image_url": "https:\/\/sandbox-img.jufubao.cn\/uploads\/20230927\/e582dc796bdb703a10860bcbbbb378f3.png",
151
+ "redirect_data": "{\"dir\":\"apply\",\"host\":\"sandbox-website-05.jufubao.cn\",\"path\":\"\\\/main\\\/cake\\\/index\",\"site_id\":\"17928cc37788be02\",\"site_url\":\"https:\\\/\\\/sandbox-website-05.jufubao.cn\\\/apply\\\/main\\\/cake\\\/index\",\"frontPath\":\"\\\/apply\\\/main\\\/cake\\\/index\",\"fixed_business_code\":\"\"}",
152
+ "redirect_type": "INN"
153
+ }, {
154
+ "id": 18,
155
+ "business_code": "book",
156
+ "entry_name": "图书",
157
+ "image_url": "https:\/\/sandbox-img.jufubao.cn\/uploads\/20230927\/9edcdc737c48cdbf9364e321e8199a93.png",
158
+ "redirect_data": "{\"dir\":\"apply\",\"host\":\"sandbox-website-05.jufubao.cn\",\"path\":\"\\\/main\\\/book\\\/index\",\"site_id\":\"17928cc37788be02\",\"site_url\":\"https:\\\/\\\/sandbox-website-05.jufubao.cn\\\/apply\\\/main\\\/book\\\/index\",\"frontPath\":\"\\\/apply\\\/main\\\/book\\\/index\",\"fixed_business_code\":\"\"}",
159
+ "redirect_type": "INN"
160
+ }, {
161
+ "id": 8,
162
+ "business_code": "market",
163
+ "entry_name": "百货",
164
+ "image_url": "https:\/\/sandbox-img.jufubao.cn\/uploads\/20230927\/920c4bd80f0a995e245aedbfaf1181d5.png",
165
+ "redirect_data": "{\"dir\":\"apply02\",\"host\":\"sandbox-website-05.jufubao.cn\",\"path\":\"\\\/main\\\/mall\\\/index\",\"site_id\":\"17928cc37788be02\",\"site_url\":\"https:\\\/\\\/sandbox-website-05.jufubao.cn\\\/apply02\\\/main\\\/mall\\\/index\",\"frontPath\":\"\\\/apply02\\\/main\\\/mall\\\/index\",\"fixed_business_code\":\"\"}",
166
+ "redirect_type": "INN"
167
+ }, {
168
+ "id": 17,
169
+ "business_code": "video",
170
+ "entry_name": "网络视听",
171
+ "image_url": "https:\/\/sandbox-img.jufubao.cn\/uploads\/20230927\/1ca9647b7ddd9937054792412d3c2367.png",
172
+ "redirect_data": "{\"dir\":\"apply\",\"host\":\"sandbox-website-05.jufubao.cn\",\"path\":\"\\\/main\\\/video\\\/index\",\"site_id\":\"17928cc37788be02\",\"site_url\":\"https:\\\/\\\/sandbox-website-05.jufubao.cn\\\/apply\\\/main\\\/video\\\/index\",\"frontPath\":\"\\\/apply\\\/main\\\/video\\\/index\",\"fixed_business_code\":\"\"}",
173
+ "redirect_type": "INN"
174
+ }, {
175
+ "id": 35,
176
+ "business_code": "v-RcA8Mv-Gpd96_Y_mjIf",
177
+ "entry_name": "全福券",
178
+ "image_url": "https:\/\/sandbox-img.jufubao.cn\/uploads\/20230927\/53191864826b864b8b6fd4f1eb397a93.png",
179
+ "redirect_data": "{\"dir\":\"apply\",\"host\":\"sandbox-website-05.jufubao.cn\",\"path\":\"\\\/system\\\/card\\\/card\",\"site_id\":\"17928cc37788be02\",\"site_url\":\"https:\\\/\\\/sandbox-website-05.jufubao.cn\\\/apply\\\/system\\\/card\\\/card\",\"frontPath\":\"\\\/apply\\\/system\\\/card\\\/card\",\"fixed_business_code\":\"\"}",
180
+ "redirect_type": "INN"
181
+ }, {
182
+ "id": 40,
183
+ "business_code": "93028be3",
184
+ "entry_name": "专区",
185
+ "image_url": "https:\/\/sandbox-img.jufubao.cn\/uploads\/20230927\/84d23a8c7af7a63842eb696c00068b3d.png",
186
+ "redirect_data": "{\"dir\":\"apply05\",\"host\":\"sandbox-website-05.jufubao.cn\",\"path\":\"\\\/main\\\/mall\\\/index\",\"site_id\":\"17928cc37788be02\",\"site_url\":\"https:\\\/\\\/sandbox-website-05.jufubao.cn\\\/apply05\\\/main\\\/mall\\\/index\",\"frontPath\":\"\\\/apply05\\\/main\\\/mall\\\/index\",\"fixed_business_code\":\"-y8t4cmogeFvi8fmuxFSK\"}",
187
+ "redirect_type": "INN"
188
+ }, {
189
+ "id": 34,
190
+ "business_code": "food",
191
+ "entry_name": "餐饮",
192
+ "image_url": "https:\/\/sandbox-img.jufubao.cn\/uploads\/20230927\/97728bf3ef2a6361c0a1771549d2d435.png",
193
+ "redirect_data": "{\"dir\":\"apply\",\"host\":\"sandbox-website-05.jufubao.cn\",\"path\":\"\\\/main\\\/food\\\/rkym\",\"site_id\":\"17928cc37788be02\",\"site_url\":\"https:\\\/\\\/sandbox-website-05.jufubao.cn\\\/apply\\\/main\\\/food\\\/rkym\",\"frontPath\":\"\\\/apply\\\/main\\\/food\\\/rkym\",\"fixed_business_code\":\"\"}",
194
+ "redirect_type": "INN"
195
+ }, {
196
+ "id": 55,
197
+ "business_code": "cake",
198
+ "entry_name": "蛋糕内部",
199
+ "image_url": "https:\/\/sandbox-img.jufubao.cn\/uploads\/20230927\/2e549739768758dde7968ff7cb98c6d8.png",
200
+ "redirect_data": "{\"dir\":\"apply03\",\"host\":\"sandbox-website-05.jufubao.cn\",\"path\":\"\\\/main\\\/cake\\\/index\",\"site_id\":\"17928cc37788be02\",\"site_url\":\"https:\\\/\\\/sandbox-website-05.jufubao.cn\\\/apply03\\\/main\\\/cake\\\/index\",\"frontPath\":\"\\\/apply03\\\/main\\\/cake\\\/index\",\"fixed_business_code\":\"cake\"}",
201
+ "redirect_type": "INN"
202
+ }, {
203
+ "id": 54,
204
+ "business_code": "health",
205
+ "entry_name": "体检",
206
+ "image_url": "https:\/\/sandbox-img.jufubao.cn\/uploads\/20230927\/e06b058a2104025ffecee960b3b9321d.png",
207
+ "redirect_data": "{\"dir\":\"apply\",\"host\":\"sandbox-website-05.jufubao.cn\",\"path\":\"\\\/main\\\/health\\\/index\",\"site_id\":\"17928cc37788be02\",\"site_url\":\"https:\\\/\\\/sandbox-website-05.jufubao.cn\\\/apply\\\/main\\\/health\\\/index\",\"frontPath\":\"\\\/apply\\\/main\\\/health\\\/index\",\"fixed_business_code\":\"\"}",
208
+ "redirect_type": "INN"
209
+ }, {
210
+ "id": 30,
211
+ "business_code": "travel",
212
+ "entry_name": "旅游",
213
+ "image_url": "https:\/\/sandbox-img.jufubao.cn\/uploads\/20230927\/09ceefe2d1776a399b567c7acdf2c9db.png",
214
+ "redirect_data": "{\"dir\":\"apply\",\"host\":\"sandbox-website-05.jufubao.cn\",\"path\":\"\\\/main\\\/travel\\\/index\",\"site_id\":\"17928cc37788be02\",\"site_url\":\"https:\\\/\\\/sandbox-website-05.jufubao.cn\\\/apply\\\/main\\\/travel\\\/index\",\"frontPath\":\"\\\/apply\\\/main\\\/travel\\\/index\",\"fixed_business_code\":\"\"}",
215
+ "redirect_type": "INN"
216
+ }, {
217
+ "id": 16,
218
+ "business_code": "play",
219
+ "entry_name": "演出",
220
+ "image_url": "https:\/\/sandbox-img.jufubao.cn\/uploads\/20230927\/07e1d76f1850fbadc9a12d7ff2d7689c.png",
221
+ "redirect_data": "{\"dir\":\"apply\",\"host\":\"sandbox-website-05.jufubao.cn\",\"path\":\"\\\/main\\\/play\\\/index\",\"site_id\":\"17928cc37788be02\",\"site_url\":\"https:\\\/\\\/sandbox-website-05.jufubao.cn\\\/apply\\\/main\\\/play\\\/index\",\"frontPath\":\"\\\/apply\\\/main\\\/play\\\/index\",\"fixed_business_code\":\"\"}",
222
+ "redirect_type": "INN"
223
+ }],
224
+ "request_id": "b5231dd2d0f71d95"
225
+ }
226
+ }
package/src/components/JfbBaseCardEntry/Attr.js CHANGED
@@ -4,17 +4,17 @@ export default {
4
4
  style: [],
5
5
  advanced: [],
6
6
  content: [
7
- {
8
- label: '票券登陆文案:',
9
- ele: 'el-input',
10
- type: 'text',
11
- valueKey: 'login_name',
12
- value: '',
13
- placeholder: '请输入票券登陆文案',
14
- className: 'input80',
15
- inline: false,
16
- notice: '当未设置文案时候，前台页面显示为"<span style="color:red">登录</span>"'
17
- },
7
+ // {
8
+ // label: '票券登陆文案:',
9
+ // ele: 'el-input',
10
+ // type: 'text',
11
+ // valueKey: 'login_name',
12
+ // value: '',
13
+ // placeholder: '请输入票券登陆文案',
14
+ // className: 'input80',
15
+ // inline: false,
16
+ // notice: '当未设置文案时候，前台页面显示为"<span style="color:red">登录</span>"'
17
+ // },
18
18
  {
19
19
  label: '失效卡列表地址:', //label
20
20
  ele: 'xd-select-pages-path', //package 名称
package/src/components/JfbBaseCardEntry/JfbBaseCardEntry.vue CHANGED
@@ -28,9 +28,9 @@
28
28
  color: cutIndex === 1 ? '#fff' : mainColor,
29
29
  }"
30
30
  >
31
- <view>使用扫码绑定</view>
31
+ <view>扫码绑定</view>
32
32
  <xd-font-icon
33
- :style="{marginLeft: '15rpx'}"
33
+ :style="{marginLeft: '20rpx'}"
34
34
  size="45"
35
35
  icon="iconsaoma"
36
36
  ></xd-font-icon>
@@ -45,9 +45,9 @@
45
45
  color: cutIndex === 2 ? '#fff' : mainColor,
46
46
  }"
47
47
  >
48
- <view>券号密码绑定</view>
48
+ <view>密码绑定</view>
49
49
  <xd-font-icon
50
- :style="{marginLeft: '15rpx'}"
50
+ :style="{marginLeft: '20rpx'}"
51
51
  size="45"
52
52
  icon="iconyuechi"
53
53
  ></xd-font-icon>
@@ -159,36 +159,47 @@
159
159
  <view class="card-list__other" v-if="item.other_card_point && item.card_point_type === 2">
160
160
  <view><text>购买其他物品可抵：</text><text>{{item.other_card_point}} {{ item.unit }}</text></view>
161
161
  </view>
162
- <view class="card-list__entry" v-if="item.entries.length === 1">
163
- <view @click.stop="handleBindLogin(item,item['entries'][0])" :style="{color: mainColor}">{{login_name}}</view>
164
- </view>
165
- <view class="card-list__nodata" v-if="item.entries.length === 0">暂无支持服务列表</view>
166
- <view class="card-list__entrys" v-if="item.entries.length > 1">
167
- <view class="card-list__entrys-title">
168
- <view>可兑换权益</view>
169
- <view @click="toDetail(item, false)">
170
- <text>查看详情</text>
171
- <xd-font-icon icon="iconxiangyou_xian" color="#999" size="20"></xd-font-icon>
172
- </view>
162
+ <template v-if="tabIndex === 1">
163
+ <view class="card-list__entry" v-if="item.entries.length === 1">
164
+ <view
165
+ @click.stop="handleBindLogin(item,item['entries'][0])"
166
+ :style="{color: item['theme']['color']}"
167
+ >进入{{item['entries'][0]['entry_name']}}</view>
173
168
  </view>
174
- <view class="card-list__entrys-list">
175
- <scroll-view scroll-x class="card-list__entrys-scroll">
176
- <view class="card-list__entrys-item">
177
- <view
178
- v-for="(entry,idx) in item.entries"
179
- :key="idx"
180
- @click.stop="handleBindLogin(item, entry)"
181
- >
182
- <view><image :src="entry.image_url"></image></view>
183
- <view>{{entry|cutstr}}</view>
184
- <view>
185
- <text>去兑换</text>
186
- <xd-font-icon icon="iconxiangyou_xian" color="#999" size="20"></xd-font-icon>
169
+ <view class="card-list__nodata" v-if="item.entries.length === 0">暂无支持服务列表</view>
170
+ <view class="card-list__entrys" v-if="item.entries.length > 1">
171
+ <view class="card-list__entrys-title">
172
+ <view>可兑换权益</view>
173
+ <view @click.stop="toDetail(item, false)">
174
+ <text>查看详情</text>
175
+ <xd-font-icon icon="iconxiangyou_xian" color="#999" size="20"></xd-font-icon>
176
+ </view>
177
+ </view>
178
+ <view class="card-list__entrys-list">
179
+ <scroll-view scroll-x class="card-list__entrys-scroll">
180
+ <view class="card-list__entrys-item">
181
+ <view
182
+ v-for="(entry,idx) in item.entries"
183
+ :key="idx"
184
+ @click.stop="handleBindLogin(item, entry)"
185
+ >
186
+ <view><image :src="entry.image_url"></image></view>
187
+ <view>{{entry|cutstr}}</view>
188
+ <view>
189
+ <text>去兑换</text>
190
+ <xd-font-icon icon="iconxiangyou_xian" color="#999" size="20"></xd-font-icon>
191
+ </view>
187
192
  </view>
188
193
  </view>
189
- </view>
190
- </scroll-view>
194
+ </scroll-view>
195
+ </view>
191
196
  </view>
197
+ </template>
198
+ <view class="card-list__entry" v-else>
199
+ <view
200
+ @click.stop="handleBindLogin(item,item['entries'][0])"
201
+ :style="{color: item['theme']['color']}"
202
+ >票券转换</view>
192
203
  </view>
193
204
  </view>
194
205
  </view>
@@ -228,10 +239,10 @@ import { jfbRootExec } from "@/utils/xd.event";
228
239
  import JfbBaseCardEntryMixin from "./JfbBaseCardEntryMixin";
229
240
  import componentsMixins from "@/mixins/componentsMixins";
230
241
  import extsMixins from "@/mixins/extsMixins";
242
+ import colorCardMixins from "@/mixins/colorCardMixins";
231
243
  import { mapState, mapActions } from "vuex";
232
244
  import { getContainerPropsValue, isWechat } from "@/utils/xd.base";
233
245
  import XdNoticeBar from "@/components/XdNoticeBar/XdNoticeBar";
234
- import getServiceUrl from "@/common/getServiceUrl";
235
246
  import { Base64 } from "js-base64";
236
247
  const Color = require("color");
237
248
 
@@ -243,7 +254,7 @@ export default {
243
254
  XdNoticeBar,
244
255
  XdCardV2
245
256
  },
246
- mixins: [componentsMixins, extsMixins, JfbBaseCardEntryMixin],
257
+ mixins: [componentsMixins, extsMixins, JfbBaseCardEntryMixin, colorCardMixins],
247
258
  computed: {
248
259
  ...mapState({
249
260
  jwxSDK: (state) => state.jwxSDK,
@@ -251,7 +262,7 @@ export default {
251
262
  }),
252
263
  showList(){
253
264
  return this.tabIndex === 1 ? this.cardList: this.changeList
254
- }
265
+ },
255
266
  },
256
267
  filters:{
257
268
  cutstr(val){
@@ -291,29 +302,6 @@ export default {
291
302
  disabledUrl: "",
292
303
  //cardLayout: "1", //票券布局
293
304
  showDisabled: 'Y',
294
-
295
-
296
- cardThemesColor: [
297
- 'radial-gradient(50% 50%, rgba(255, 151, 128, 1) 0%, rgba(255, 64, 61, 1) 100%)',
298
- 'radial-gradient(50% 50%, rgba(247, 198, 35, 1) 0%, rgba(255, 81, 0, 1) 99.91%)',
299
- 'radial-gradient(50% 50%, rgba(0, 207, 193, 1) 0%, rgba(0, 117, 108, 1) 99.91%)',
300
- 'radial-gradient(50% 50%, rgba(255, 148, 77, 1) 0%, rgba(240, 92, 0, 1) 100%)',
301
- 'radial-gradient(50% 50%, rgba(252, 126, 49, 1) 0%, rgba(255, 143, 67, 1) 100%)',
302
- '#FF524D', '#FFAA00', '#00C2B8', '#33AAFF', '#FF8636', '#FF744A', '#38C4EB', '#AF5EE0', '#D98643', '#17C26F'
303
- ],
304
- cardThemesImage: [
305
- //'//img.jufubao.cn/component/card/vip.png',
306
- '//img.jufubao.cn/component/card/1.png',
307
- '//img.jufubao.cn/component/card/2.png',
308
- '//img.jufubao.cn/component/card/3.png',
309
- '//img.jufubao.cn/component/card/4.png',
310
- '//img.jufubao.cn/component/card/5.png',
311
- '//img.jufubao.cn/component/card/6.png',
312
- '//img.jufubao.cn/component/card/7.png',
313
- '//img.jufubao.cn/component/card/8.png',
314
- '//img.jufubao.cn/component/card/9.png',
315
- '//img.jufubao.cn/component/card/10.png'
316
- ],
317
305
 
318
306
  //活动
319
307
  dialogEvent: false,
@@ -327,7 +315,7 @@ export default {
327
315
 
328
316
 
329
317
  //#ifdef H5
330
- this.isWx = isWechat();
318
+ this.isWx = this.isPreview || isWechat();
331
319
  if (!this.$configProject.isPreview) {
332
320
  jfbRootExec("getH5WxAuthorize", {
333
321
  vm: this,
@@ -344,49 +332,6 @@ export default {
344
332
 
345
333
  },
346
334
  methods: {
347
- stringToNumber(str) {
348
- let result = 0;
349
- let len = str.length;
350
- for (let i = 0; i < len; i++) {
351
- result = result + str.charCodeAt(i) + i;
352
- }
353
- return result;
354
- },
355
- getCardThemes(name){
356
- let colorLen = this.cardThemesColor.length;
357
- let imgLen = this.cardThemesImage.length;
358
- let colorIndex = this.stringToNumber(name)% colorLen;
359
- let imgIndex = this.stringToNumber(name) % imgLen;
360
- return {
361
- color: this.cardThemesColor[colorIndex],
362
- image: this.cardThemesImage[imgIndex],
363
- }
364
- },
365
-
366
- getEntry(codes=[] , allEntry=[]){
367
- //无支持业务线或者未配置业务入口
368
- if(codes.length ===0 || allEntry.length === 0) return [];
369
-
370
- let support = [];
371
- codes.map(bus=>{
372
- allEntry.map(it=>{
373
- it['image_url'] = getServiceUrl(it['image_url'])
374
- if(bus === it['business_code']){
375
- support.push(it);
376
- }
377
- })
378
- });
379
- return support
380
- },
381
-
382
- getCardGroupItem(list, allEntry){
383
- list.map(item=>{
384
- //设置卡片样式
385
- item['theme'] = this.getCardThemes(item['card_type_name'] + item['card_type']);
386
- item['entries'] = this.getEntry(item['business_codes'], allEntry)
387
- });
388
- return list
389
- },
390
335
 
391
336
  init(container){
392
337
  //设置
@@ -561,10 +506,12 @@ export default {
561
506
  },
562
507
 
563
508
  toDetail(item, out=true) {
564
- if(out && item.entries.length === 1) {
565
- this.$xdUniHelper.navigateTo({
566
- url: `${this.detailUrl}?card_number=${item["card_number"]}`,
567
- }, false);
509
+ if(out) {
510
+ if(item.entries.length === 1) {
511
+ this.$xdUniHelper.navigateTo({
512
+ url: `${this.detailUrl}?card_number=${item["card_number"]}`,
513
+ }, false);
514
+ }
568
515
  }
569
516
  else{
570
517
  this.$xdUniHelper.navigateTo({
@@ -710,7 +657,7 @@ export default {
710
657
  font-size: unit(36, rpx);
711
658
  color: #fe7a63ff;
712
659
  border-radius: unit(16, rpx);
713
- width: unit(320, rpx);
660
+ width: unit(330, rpx);
714
661
  height: unit(94, rpx);
715
662
  display: flex;
716
663
  align-items: center;
@@ -866,7 +813,7 @@ export default {
866
813
  line-height: unit(64, rpx);
867
814
  text-align: center;
868
815
  font-size: unit(26, rpx);
869
- border-radius: unit(8, rpx);
816
+ border-radius: unit(32, rpx);
870
817
  background: rgba(255, 255, 255, 1);
871
818
  box-shadow: 0 unit(4, rpx) unit(8, rpx) rgba(156, 62, 0, 0.11);
872
819
  font-weight: 500;
package/src/components/JfbBaseHeader/JfbBaseHeader.vue CHANGED
@@ -33,11 +33,8 @@
33
33
  </view>
34
34
  <view v-if="loaded && showLocation==='Y'" class="header_wrap-city">
35
35
  <xd-city-show-api
36
- city-location-type="baidu"
37
- :getCityInfoByLocation="getCityInfoByLocation"
38
36
  @done="handleCityDone"
39
37
  @onChange="handleCityChange"
40
- @alertChange="handleAlertChange"
41
38
  :color="textColor"
42
39
  :icon="locationIcon"
43
40
  :bgColor="locationBackgroundColor"
@@ -173,7 +170,6 @@
173
170
  this.searchPagePath = getContainerPropsValue(container, "content.searchPagePath", {value:""}).value;
174
171
  this.choseCityPath = getContainerPropsValue(container, "content.choseCityPath", {value:""}).value;
175
172
  // this.showSwitchCity = getContainerPropsValue(container, "content.showSwitchCity", "N");
176
- this.setShowSwitchCity(true);
177
173
 
178
174
 
179
175
  //基础
@@ -220,44 +216,17 @@
220
216
  })
221
217
  }
222
218
  },
223
-
224
- getCityInfoByLocation(options, cb){
225
- jfbRootExec("getLoadingCityBaseHeaderByLocationLv4", {
226
- vm: this,
227
- data: options
228
- }).then(res => {
229
- cb(res)
230
- }).catch(e => {
231
- this.$xdLog.setARMSCustomError('get_city_info_by_location_base_header', this.$runtime.getErrorInfo(e));
232
- cb({data: this.$settings.defaultCity})
233
- })
234
- },
219
+
235
220
  /***
236
221
  * @description 定位完成事件
237
222
  * @param city
238
223
  */
239
224
  handleCityDone({city}) {
240
- console.log('handleCityDone', city);
241
225
  if(JSON.stringify(this.city) === JSON.stringify(city)) return false;
242
226
  this.city = city;
243
- storage.set(this.saveKey, city);
244
227
  jfbRootFnExec(this, 'onCustomEvent')("baseHeader@city", city);
245
228
  },
246
- handleAlertChange(cityInfo){
247
- this.$xdConfirm({
248
- $vm: this,
249
- width: '90%',
250
- content: `当前显示您在${cityInfo.city_name}，是否切换到该城市？`,
251
- success: (res) => {
252
- if (res.confirm) {
253
- this.setCityInfo(cityInfo);
254
- }else{
255
-
256
- }
257
- }
258
- })
259
- },
260
-
229
+
261
230
  handleCityChange() {
262
231
  this.$xdUniHelper.navigateTo({
263
232
  url: this.choseCityPath