@conecli/cone-render 0.10.1-shop-beta.21 → 0.10.1-shop-beta.23
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/dist/common/const.ts +1 -1
- package/dist/common/index.h5.ts +1 -1
- package/dist/components/base/CustomVideo/index.tsx +1 -1
- package/dist/components/base/LazyLoadImage/index.dynamic.module.scss +1 -0
- package/dist/components/base/NetworkDataError/const.ts +1 -1
- package/dist/components/base/NetworkDataError/index.module.scss +6 -6
- package/dist/components/base/NetworkDataError/index.tsx +1 -1
- package/dist/components/base/Price/Double/index.module.scss +18 -0
- package/dist/components/base/Price/Double/index.tsx +1 -1
- package/dist/interface/component.ts +1 -1
- package/dist/jumpEventReport/base.ts +1 -1
- package/dist/jumpEventReport/createReportFloorData.ts +1 -1
- package/dist/jumpEventReport/index.jd.ts +1 -1
- package/dist/jumpEventReport/index.weapp.ts +1 -1
- package/dist/jumpEventReport/jdJumpJdApp.ts +1 -1
- package/dist/jumpEventReport/logEventConfig.ts +1 -1
- package/dist/jumpEventReport/web.base.ts +1 -1
- package/dist/jumpEventReport/web.pc.ts +1 -1
- package/dist/jumpEventReport/web.tjm.ts +1 -1
- package/dist/jumpEventReport/web.wxapp.ts +1 -1
- package/dist/language/en_US.json +2 -0
- package/dist/language/zh_CN.json +2 -0
- package/dist/language/zh_HK.json +2 -0
- package/dist/modules/ContainerFloorList/index.h5.tsx +1 -1
- package/dist/open/api/shopMember.ts +1 -1
- package/dist/utils/connectNativeJsBridge.ts +1 -1
- package/dist/utils/utils.ts +1 -1
- package/package.json +29 -28
|
@@ -1 +1 @@
|
|
|
1
|
-
import Taro from '@tarojs/taro';
|
|
2
1
|
TaroEventType,
|
|
3
2
|
JUMP_MEMBER_CHANNEL,
|
|
4
3
|
CENTERDISPATCH_JUMPPAGE_VALUE,
|
|
5
4
|
|
|
6
5
|
CARD_BANNER = 'shopMemberCardVenderCardBanner',
|
|
7
6
|
|
|
8
7
|
CARD_NAME = 'shopMemberCardVenderCardName',
|
|
9
8
|
|
|
10
9
|
MEMBERSHIP_LEVEL = 'shopMemberCardMembershipLevel',
|
|
11
10
|
|
|
12
11
|
MEMBERSHIP_RULE_ENTRANCE = 'shopMemberCardMembershipRuleEntrance',
|
|
13
12
|
|
|
14
13
|
MEMBERSHIP_POINT = 'shopMemberCardMembershipPoint',
|
|
15
14
|
return new Promise((resolve) => {
|
|
16
15
|
requestServer
|
|
17
16
|
.getCustomerCenterDispatch(params)
|
|
18
17
|
.then((response) => {
|
|
19
18
|
if (response.result && response.code === '0') {
|
|
20
19
|
resolve(response.result);
|
|
21
20
|
} else {
|
|
22
21
|
resolve({
|
|
23
22
|
jumpPage:
|
|
24
23
|
response.code === '1'
|
|
25
24
|
? CENTERDISPATCH_JUMPPAGE_VALUE.NOT_LOGGED_IN
|
|
26
25
|
: CENTERDISPATCH_JUMPPAGE_VALUE.SYSTEM_ERROR,
|
|
27
26
|
});
|
|
28
27
|
}
|
|
29
28
|
})
|
|
30
29
|
.catch((err) => {
|
|
31
30
|
resolve({ jumpPage: CENTERDISPATCH_JUMPPAGE_VALUE.NETWORK_ERROR });
|
|
32
31
|
console.log('oneKeyJoinMember getcustomerCenterDispatch err', err);
|
|
33
32
|
});
|
|
34
33
|
});
|
|
35
34
|
const currentVenderId = global.info.queryInfo.venderId;
|
|
36
35
|
const currentShopId = global.info.queryInfo.shopId;
|
|
37
36
|
const channel = JUMP_MEMBER_CHANNEL.POP_WEBVIEW;
|
|
38
37
|
const toastOpt = {
|
|
39
38
|
duration: 3000,
|
|
40
39
|
image:
|
|
41
40
|
'https://img13.360buyimg.com/img/jfs/t1/196933/39/19850/1479/61b059aaEe969b8db/acb37a47b9034333.png',
|
|
42
41
|
};
|
|
43
42
|
if (isAppHomeForMarketPage) {
|
|
44
43
|
JumpEventReport.jdJumpToBottomTabBrandMember({
|
|
45
44
|
shopId: currentShopId,
|
|
46
45
|
venderId: currentVenderId,
|
|
47
46
|
});
|
|
48
47
|
return;
|
|
49
48
|
}
|
|
50
49
|
const params = {
|
|
51
50
|
venderId: currentVenderId,
|
|
52
51
|
channel,
|
|
53
52
|
queryVersion: isH5AndJdShopView && jdAppVersionStr !== '' ? jdAppVersionStr : '9.2.0',
|
|
54
53
|
};
|
|
55
54
|
const centerDispatchResult = await getCenterDispatchResult(params);
|
|
56
55
|
console.log('oneKeyJoinMember getcustomerCenterDispatch 接口返回值', centerDispatchResult);
|
|
57
56
|
const { jumpPage } = centerDispatchResult;
|
|
58
57
|
if (typeof jumpPage !== 'number') {
|
|
59
58
|
console.log('oneKeyJoinMember getcustomerCenterDispatch 接口返回 jumpPage 值类型异常,非数字');
|
|
60
59
|
showFailToast({
|
|
61
60
|
title: '网络繁忙,稍后再试吧~',
|
|
62
61
|
...toastOpt,
|
|
63
62
|
});
|
|
64
63
|
return;
|
|
65
64
|
}
|
|
66
65
|
const centerDispatchJumpPageValue = Number(jumpPage);
|
|
67
66
|
if (
|
|
68
67
|
centerDispatchJumpPageValue === CENTERDISPATCH_JUMPPAGE_VALUE.NETWORK_ERROR ||
|
|
69
68
|
centerDispatchJumpPageValue === CENTERDISPATCH_JUMPPAGE_VALUE.SYSTEM_ERROR
|
|
70
69
|
) {
|
|
71
70
|
console.log('oneKeyJoinMember getcustomerCenterDispatch 接口网络异常或接口异常', jumpPage);
|
|
72
71
|
showFailToast({
|
|
73
72
|
title: '网络繁忙,稍后再试吧~',
|
|
74
73
|
...toastOpt,
|
|
75
74
|
});
|
|
76
75
|
return;
|
|
77
76
|
}
|
|
78
77
|
if (centerDispatchJumpPageValue === CENTERDISPATCH_JUMPPAGE_VALUE.NOT_LOGGED_IN) {
|
|
79
78
|
console.log('oneKeyJoinMember getcustomerCenterDispatch 接口返回未登录,跳登录页');
|
|
80
79
|
global
|
|
81
80
|
.doLogin()
|
|
82
81
|
.then((res) => {
|
|
83
82
|
console.log('登录成功', res);
|
|
84
83
|
})
|
|
85
84
|
.catch((err) => {
|
|
86
85
|
console.log('登录失败', err);
|
|
87
86
|
});
|
|
88
87
|
return;
|
|
89
88
|
}
|
|
90
89
|
const memberRoleJumpPageValueArr = [
|
|
91
90
|
CENTERDISPATCH_JUMPPAGE_VALUE.MEMBER_CENTER,
|
|
92
91
|
CENTERDISPATCH_JUMPPAGE_VALUE.ISV_MEMBER,
|
|
93
92
|
CENTERDISPATCH_JUMPPAGE_VALUE.JSHOP_ISV_PAGE,
|
|
94
93
|
];
|
|
95
94
|
const isMemberRole = memberRoleJumpPageValueArr.includes(centerDispatchJumpPageValue);
|
|
96
95
|
if (isMemberRole) {
|
|
97
96
|
showFailToast({
|
|
98
97
|
title: '您已是本店会员,无需再次入会',
|
|
99
98
|
...toastOpt,
|
|
100
99
|
});
|
|
101
100
|
return;
|
|
102
101
|
}
|
|
103
102
|
if (!isH5AndJdShopView) {
|
|
104
103
|
JumpEventReport.jdJumpToNewH5MemberCard();
|
|
105
104
|
return;
|
|
106
105
|
}
|
|
107
106
|
const { isDegrade = true, isLowVersion = true } = centerDispatchResult;
|
|
108
107
|
console.log('一键入会,是否已降级', isDegrade);
|
|
109
108
|
console.log('一键入会,是否低版本', isLowVersion);
|
|
110
109
|
if (isDegrade) {
|
|
111
110
|
console.log('一键入会,已降级');
|
|
112
111
|
showFailToast({
|
|
113
112
|
title: '网络繁忙,稍后再试吧~',
|
|
114
113
|
...toastOpt,
|
|
115
114
|
});
|
|
116
115
|
return;
|
|
117
116
|
}
|
|
118
117
|
if (isLowVersion) {
|
|
119
118
|
console.log('一键入会,低版本');
|
|
120
119
|
JumpEventReport.jdJumpToMemberTab();
|
|
121
120
|
return;
|
|
122
121
|
}
|
|
123
122
|
return new Promise((resolve) => {
|
|
124
123
|
const getOpenCardUrlParams = {
|
|
125
124
|
venderId: currentVenderId,
|
|
126
125
|
shopId: currentShopId,
|
|
127
126
|
channel: JUMP_MEMBER_CHANNEL.POP_WEBVIEW,
|
|
128
127
|
device: global.info.sysInfo?.isJdTabletDevice ? 'tablet' : 'all',
|
|
129
128
|
memberSceneType: 'view',
|
|
130
129
|
...options,
|
|
131
130
|
};
|
|
132
131
|
const memberCardurl =
|
|
133
132
|
window?.shopGlobalSwitch?.openNewMemberEntry === 'true'
|
|
134
133
|
? `${JumpWebUrl.memberCard}?${objectToUrlEncode(getOpenCardUrlParams)}`
|
|
135
134
|
: `${JumpWebUrl.shopH5MemberCardAPP}?${objectToUrlEncode(getOpenCardUrlParams)}`;
|
|
136
135
|
const sourceUrl = encodeURIComponent(window.location.href || '');
|
|
137
136
|
const url =
|
|
138
137
|
sourceUrl && sourceUrl !== '' ? `${memberCardurl}&sourceUrl=${sourceUrl}` : memberCardurl;
|
|
139
138
|
console.log('openPopWebview url', url);
|
|
140
139
|
nativeOpenPopWebView({
|
|
141
140
|
url,
|
|
142
141
|
});
|
|
143
142
|
Taro.eventCenter.off(TaroEventType.JOIN_MEMBER_SUCCESS);
|
|
144
143
|
Taro.eventCenter.on(TaroEventType.JOIN_MEMBER_SUCCESS, (res) => {
|
|
145
144
|
console.log('TaroEventType.JOIN_MEMBER_SUCCESS res', res);
|
|
146
145
|
const { shopId, venderId } = res;
|
|
147
146
|
if (shopId === currentShopId && venderId === currentVenderId) {
|
|
148
147
|
resolve(true);
|
|
149
148
|
} else {
|
|
150
149
|
console.log(
|
|
151
150
|
'TaroEventType.JOIN_MEMBER_SUCCESS shopId venderId 不匹配,currentShopId, currentVenderId',
|
|
152
151
|
currentShopId,
|
|
153
152
|
currentVenderId,
|
|
154
153
|
);
|
|
155
154
|
resolve(false);
|
|
156
155
|
}
|
|
157
156
|
});
|
|
158
157
|
});
|
|
158
|
+
import Taro from '@tarojs/taro';
|
|
159
159
|
TaroEventType,
|
|
160
160
|
JUMP_MEMBER_CHANNEL,
|
|
161
161
|
CENTERDISPATCH_JUMPPAGE_VALUE,
|
|
162
162
|
|
|
163
163
|
CARD_BANNER = 'shopMemberCardVenderCardBanner',
|
|
164
164
|
|
|
165
165
|
CARD_NAME = 'shopMemberCardVenderCardName',
|
|
166
166
|
|
|
167
167
|
MEMBERSHIP_LEVEL = 'shopMemberCardMembershipLevel',
|
|
168
168
|
|
|
169
169
|
MEMBERSHIP_RULE_ENTRANCE = 'shopMemberCardMembershipRuleEntrance',
|
|
170
170
|
|
|
171
171
|
MEMBERSHIP_POINT = 'shopMemberCardMembershipPoint',
|
|
172
172
|
return new Promise((resolve) => {
|
|
173
173
|
requestServer
|
|
174
174
|
.getCustomerCenterDispatch(params)
|
|
175
175
|
.then((response) => {
|
|
176
176
|
if (response.result && response.code === '0') {
|
|
177
177
|
resolve(response.result);
|
|
178
178
|
} else {
|
|
179
179
|
resolve({
|
|
180
180
|
jumpPage:
|
|
181
181
|
response.code === '1'
|
|
182
182
|
? CENTERDISPATCH_JUMPPAGE_VALUE.NOT_LOGGED_IN
|
|
183
183
|
: CENTERDISPATCH_JUMPPAGE_VALUE.SYSTEM_ERROR,
|
|
184
184
|
});
|
|
185
185
|
}
|
|
186
186
|
})
|
|
187
187
|
.catch((err) => {
|
|
188
188
|
resolve({ jumpPage: CENTERDISPATCH_JUMPPAGE_VALUE.NETWORK_ERROR });
|
|
189
189
|
console.log('oneKeyJoinMember getcustomerCenterDispatch err', err);
|
|
190
190
|
});
|
|
191
191
|
});
|
|
192
192
|
const currentVenderId = global.info.queryInfo.venderId;
|
|
193
193
|
const currentShopId = global.info.queryInfo.shopId;
|
|
194
194
|
const channel = JUMP_MEMBER_CHANNEL.POP_WEBVIEW;
|
|
195
195
|
const toastOpt = {
|
|
196
196
|
duration: 3000,
|
|
197
197
|
image:
|
|
198
198
|
'https://img13.360buyimg.com/img/jfs/t1/196933/39/19850/1479/61b059aaEe969b8db/acb37a47b9034333.png',
|
|
199
199
|
};
|
|
200
200
|
if (isAppHomeForMarketPage) {
|
|
201
201
|
JumpEventReport.jdJumpToBottomTabBrandMember({
|
|
202
202
|
shopId: currentShopId,
|
|
203
203
|
venderId: currentVenderId,
|
|
204
204
|
});
|
|
205
205
|
return;
|
|
206
206
|
}
|
|
207
207
|
const params = {
|
|
208
208
|
venderId: currentVenderId,
|
|
209
209
|
channel,
|
|
210
210
|
queryVersion: isH5AndJdShopView && jdAppVersionStr !== '' ? jdAppVersionStr : '9.2.0',
|
|
211
211
|
};
|
|
212
212
|
const centerDispatchResult = await getCenterDispatchResult(params);
|
|
213
213
|
console.log('oneKeyJoinMember getcustomerCenterDispatch 接口返回值', centerDispatchResult);
|
|
214
214
|
const { jumpPage } = centerDispatchResult;
|
|
215
215
|
if (typeof jumpPage !== 'number') {
|
|
216
216
|
console.log('oneKeyJoinMember getcustomerCenterDispatch 接口返回 jumpPage 值类型异常,非数字');
|
|
217
217
|
showFailToast({
|
|
218
218
|
title: '网络繁忙,稍后再试吧~',
|
|
219
219
|
...toastOpt,
|
|
220
220
|
});
|
|
221
221
|
return;
|
|
222
222
|
}
|
|
223
223
|
const centerDispatchJumpPageValue = Number(jumpPage);
|
|
224
224
|
if (
|
|
225
225
|
centerDispatchJumpPageValue === CENTERDISPATCH_JUMPPAGE_VALUE.NETWORK_ERROR ||
|
|
226
226
|
centerDispatchJumpPageValue === CENTERDISPATCH_JUMPPAGE_VALUE.SYSTEM_ERROR
|
|
227
227
|
) {
|
|
228
228
|
console.log('oneKeyJoinMember getcustomerCenterDispatch 接口网络异常或接口异常', jumpPage);
|
|
229
229
|
showFailToast({
|
|
230
230
|
title: '网络繁忙,稍后再试吧~',
|
|
231
231
|
...toastOpt,
|
|
232
232
|
});
|
|
233
233
|
return;
|
|
234
234
|
}
|
|
235
235
|
if (centerDispatchJumpPageValue === CENTERDISPATCH_JUMPPAGE_VALUE.NOT_LOGGED_IN) {
|
|
236
236
|
console.log('oneKeyJoinMember getcustomerCenterDispatch 接口返回未登录,跳登录页');
|
|
237
237
|
global
|
|
238
238
|
.doLogin()
|
|
239
239
|
.then((res) => {
|
|
240
240
|
console.log('登录成功', res);
|
|
241
241
|
})
|
|
242
242
|
.catch((err) => {
|
|
243
243
|
console.log('登录失败', err);
|
|
244
244
|
});
|
|
245
245
|
return;
|
|
246
246
|
}
|
|
247
247
|
const memberRoleJumpPageValueArr = [
|
|
248
248
|
CENTERDISPATCH_JUMPPAGE_VALUE.MEMBER_CENTER,
|
|
249
249
|
CENTERDISPATCH_JUMPPAGE_VALUE.ISV_MEMBER,
|
|
250
250
|
CENTERDISPATCH_JUMPPAGE_VALUE.JSHOP_ISV_PAGE,
|
|
251
251
|
];
|
|
252
252
|
const isMemberRole = memberRoleJumpPageValueArr.includes(centerDispatchJumpPageValue);
|
|
253
253
|
if (isMemberRole) {
|
|
254
254
|
showFailToast({
|
|
255
255
|
title: '您已是本店会员,无需再次入会',
|
|
256
256
|
...toastOpt,
|
|
257
257
|
});
|
|
258
258
|
return;
|
|
259
259
|
}
|
|
260
260
|
if (!isH5AndJdShopView) {
|
|
261
261
|
JumpEventReport.jdJumpToNewH5MemberCard();
|
|
262
262
|
return;
|
|
263
263
|
}
|
|
264
264
|
const { isDegrade = true, isLowVersion = true } = centerDispatchResult;
|
|
265
265
|
console.log('一键入会,是否已降级', isDegrade);
|
|
266
266
|
console.log('一键入会,是否低版本', isLowVersion);
|
|
267
267
|
if (isDegrade) {
|
|
268
268
|
console.log('一键入会,已降级');
|
|
269
269
|
showFailToast({
|
|
270
270
|
title: '网络繁忙,稍后再试吧~',
|
|
271
271
|
...toastOpt,
|
|
272
272
|
});
|
|
273
273
|
return;
|
|
274
274
|
}
|
|
275
275
|
if (isLowVersion) {
|
|
276
276
|
console.log('一键入会,低版本');
|
|
277
277
|
JumpEventReport.jdJumpToMemberTab();
|
|
278
278
|
return;
|
|
279
279
|
}
|
|
280
280
|
return new Promise((resolve) => {
|
|
281
281
|
const getOpenCardUrlParams = {
|
|
282
282
|
venderId: currentVenderId,
|
|
283
283
|
shopId: currentShopId,
|
|
284
284
|
channel: JUMP_MEMBER_CHANNEL.POP_WEBVIEW,
|
|
285
285
|
device: global.info.sysInfo?.isJdTabletDevice ? 'tablet' : 'all',
|
|
286
286
|
memberSceneType: 'view',
|
|
287
287
|
...options,
|
|
288
288
|
};
|
|
289
289
|
const memberCardurl =
|
|
290
290
|
window?.shopGlobalSwitch?.openNewMemberEntry === 'true'
|
|
291
291
|
? `${JumpWebUrl.memberCard}?${objectToUrlEncode(getOpenCardUrlParams)}`
|
|
292
292
|
: `${JumpWebUrl.shopH5MemberCardAPP}?${objectToUrlEncode(getOpenCardUrlParams)}`;
|
|
293
293
|
const sourceUrl = encodeURIComponent(window.location.href || '');
|
|
294
294
|
let url =
|
|
295
295
|
sourceUrl && sourceUrl !== '' ? `${memberCardurl}&sourceUrl=${sourceUrl}` : memberCardurl;
|
|
296
296
|
if(!url.includes('http')){
|
|
297
297
|
url = 'https:' + url;
|
|
298
298
|
}
|
|
299
299
|
console.log('openPopWebview url', url);
|
|
300
300
|
nativeOpenPopWebView({
|
|
301
301
|
url,
|
|
302
302
|
});
|
|
303
303
|
Taro.eventCenter.off(TaroEventType.JOIN_MEMBER_SUCCESS);
|
|
304
304
|
Taro.eventCenter.on(TaroEventType.JOIN_MEMBER_SUCCESS, (res) => {
|
|
305
305
|
console.log('TaroEventType.JOIN_MEMBER_SUCCESS res', res);
|
|
306
306
|
const { shopId, venderId } = res;
|
|
307
307
|
if (shopId === currentShopId && venderId === currentVenderId) {
|
|
308
308
|
resolve(true);
|
|
309
309
|
} else {
|
|
310
310
|
console.log(
|
|
311
311
|
'TaroEventType.JOIN_MEMBER_SUCCESS shopId venderId 不匹配,currentShopId, currentVenderId',
|
|
312
312
|
currentShopId,
|
|
313
313
|
currentVenderId,
|
|
314
314
|
);
|
|
315
315
|
resolve(false);
|
|
316
316
|
}
|
|
317
317
|
});
|
|
318
318
|
});
|