@conecli/cone-render 0.10.1-shop3.4 → 0.10.1-shop3.6

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