@conecli/cone-render 0.10.1-shop-beta.46 → 0.10.1-shop-beta.48

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 (2) hide show
  1. package/dist/open/api/shopMember.ts +1 -1
  2. package/package.json +36 -34
package/dist/open/api/shopMember.ts CHANGED
@@ -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 forceMemberCardPopup = options?.forceMemberCardPopup;
39
38
  const toastOpt = {
40
39
  duration: 3000,
41
40
  image:
42
41
  'https://img13.360buyimg.com/img/jfs/t1/196933/39/19850/1479/61b059aaEe969b8db/acb37a47b9034333.png',
43
42
  };
44
43
  if (isAppHomeForMarketPage) {
45
44
  JumpEventReport.jdJumpToBottomTabBrandMember({
46
45
  shopId: currentShopId,
47
46
  venderId: currentVenderId,
48
47
  });
49
48
  return;
50
49
  }
51
50
  const params = {
52
51
  venderId: currentVenderId,
53
52
  channel,
54
53
  queryVersion: isH5AndJdShopView && jdAppVersionStr !== '' ? jdAppVersionStr : '9.2.0',
55
54
  };
56
55
  const centerDispatchResult = await getCenterDispatchResult(params);
57
56
  console.log('oneKeyJoinMember getcustomerCenterDispatch 接口返回值', centerDispatchResult);
58
57
  const { jumpPage } = centerDispatchResult;
59
58
  if (typeof jumpPage !== 'number') {
60
59
  console.log('oneKeyJoinMember getcustomerCenterDispatch 接口返回 jumpPage 值类型异常，非数字');
61
60
  showFailToast({
62
61
  title: '网络繁忙，稍后再试吧～',
63
62
  ...toastOpt,
64
63
  });
65
64
  return;
66
65
  }
67
66
  const centerDispatchJumpPageValue = Number(jumpPage);
68
67
  if (
69
68
  centerDispatchJumpPageValue === CENTERDISPATCH_JUMPPAGE_VALUE.NETWORK_ERROR ||
70
69
  centerDispatchJumpPageValue === CENTERDISPATCH_JUMPPAGE_VALUE.SYSTEM_ERROR
71
70
  ) {
72
71
  console.log('oneKeyJoinMember getcustomerCenterDispatch 接口网络异常或接口异常', jumpPage);
73
72
  showFailToast({
74
73
  title: '网络繁忙，稍后再试吧～',
75
74
  ...toastOpt,
76
75
  });
77
76
  return;
78
77
  }
79
78
  if (centerDispatchJumpPageValue === CENTERDISPATCH_JUMPPAGE_VALUE.NOT_LOGGED_IN) {
80
79
  console.log('oneKeyJoinMember getcustomerCenterDispatch 接口返回未登录，跳登录页');
81
80
  global
82
81
  .doLogin()
83
82
  .then((res) => {
84
83
  console.log('登录成功', res);
85
84
  })
86
85
  .catch((err) => {
87
86
  console.log('登录失败', err);
88
87
  });
89
88
  return;
90
89
  }
91
90
  const memberRoleJumpPageValueArr = [
92
91
  CENTERDISPATCH_JUMPPAGE_VALUE.MEMBER_CENTER,
93
92
  CENTERDISPATCH_JUMPPAGE_VALUE.ISV_MEMBER,
94
93
  CENTERDISPATCH_JUMPPAGE_VALUE.JSHOP_ISV_PAGE,
95
94
  ];
96
95
  const isMemberRole = memberRoleJumpPageValueArr.includes(centerDispatchJumpPageValue);
97
96
  if (isMemberRole) {
98
97
  showFailToast({
99
98
  title: '您已是本店会员，无需再次入会',
100
99
  ...toastOpt,
101
100
  });
102
101
  return;
103
102
  }
104
103
  if (!isH5AndJdShopView && !forceMemberCardPopup) {
105
104
  JumpEventReport.jdJumpToNewH5MemberCard();
106
105
  return;
107
106
  }
108
107
  const { isDegrade = true, isLowVersion = true } = centerDispatchResult;
109
108
  console.log('一键入会，是否已降级', isDegrade);
110
109
  console.log('一键入会，是否低版本', isLowVersion);
111
110
  if (isDegrade) {
112
111
  console.log('一键入会，已降级');
113
112
  showFailToast({
114
113
  title: '网络繁忙，稍后再试吧～',
115
114
  ...toastOpt,
116
115
  });
117
116
  return;
118
117
  }
119
118
  if (isLowVersion && !forceMemberCardPopup) {
120
119
  console.log('一键入会，低版本');
121
120
  JumpEventReport.jdJumpToMemberTab();
122
121
  return;
123
122
  }
124
123
  return new Promise((resolve) => {
125
124
  const getOpenCardUrlParams = {
126
125
  venderId: currentVenderId,
127
126
  shopId: currentShopId,
128
127
  channel: JUMP_MEMBER_CHANNEL.POP_WEBVIEW,
129
128
  device: global.info.sysInfo?.isJdTabletDevice ? 'tablet' : 'all',
130
129
  memberSceneType: 'view',
131
130
  ...options,
132
131
  };
133
132
  const memberCardurl =
134
133
  window?.shopGlobalSwitch?.openNewMemberEntry === 'true'
135
134
  ? `${JumpWebUrl.memberCard}?${objectToUrlEncode(getOpenCardUrlParams)}`
136
135
  : `${JumpWebUrl.shopH5MemberCardAPP}?${objectToUrlEncode(getOpenCardUrlParams)}`;
137
136
  const sourceUrl = encodeURIComponent(window.location.href || '');
138
137
  let url =
139
138
  sourceUrl && sourceUrl !== '' ? `${memberCardurl}&sourceUrl=${sourceUrl}` : memberCardurl;
140
139
  if (!url.includes('http')) {
141
140
  url = 'https:' + url;
142
141
  }
143
142
  console.log('openPopWebview url', url);
144
143
  nativeOpenPopWebView({
145
144
  url,
146
145
  });
147
146
  Taro.eventCenter.off(TaroEventType.JOIN_MEMBER_SUCCESS);
148
147
  Taro.eventCenter.on(TaroEventType.JOIN_MEMBER_SUCCESS, (res) => {
149
148
  console.log('TaroEventType.JOIN_MEMBER_SUCCESS res', res);
150
149
  const { shopId, venderId } = res;
151
150
  if (shopId === currentShopId && venderId === currentVenderId) {
152
151
  resolve(true);
153
152
  } else {
154
153
  console.log(
155
154
  'TaroEventType.JOIN_MEMBER_SUCCESS shopId venderId 不匹配，currentShopId, currentVenderId',
156
155
  currentShopId,
157
156
  currentVenderId,
158
157
  );
159
158
  resolve(false);
160
159
  }
161
160
  });
162
161
  });
162
+ import Taro from '@tarojs/taro';
163
163
  TaroEventType,
164
164
  JUMP_MEMBER_CHANNEL,
165
165
  CENTERDISPATCH_JUMPPAGE_VALUE,
166
166
 
167
167
  CARD_BANNER = 'shopMemberCardVenderCardBanner',
168
168
 
169
169
  CARD_NAME = 'shopMemberCardVenderCardName',
170
170
 
171
171
  MEMBERSHIP_LEVEL = 'shopMemberCardMembershipLevel',
172
172
 
173
173
  MEMBERSHIP_RULE_ENTRANCE = 'shopMemberCardMembershipRuleEntrance',
174
174
 
175
175
  MEMBERSHIP_POINT = 'shopMemberCardMembershipPoint',
176
176
  return new Promise((resolve) => {
177
177
  requestServer
178
178
  .getCustomerCenterDispatch(params)
179
179
  .then((response) => {
180
180
  if (response.result && response.code === '0') {
181
181
  resolve(response.result);
182
182
  } else {
183
183
  resolve({
184
184
  jumpPage:
185
185
  response.code === '1'
186
186
  ? CENTERDISPATCH_JUMPPAGE_VALUE.NOT_LOGGED_IN
187
187
  : CENTERDISPATCH_JUMPPAGE_VALUE.SYSTEM_ERROR,
188
188
  });
189
189
  }
190
190
  })
191
191
  .catch((err) => {
192
192
  resolve({ jumpPage: CENTERDISPATCH_JUMPPAGE_VALUE.NETWORK_ERROR });
193
193
  console.log('oneKeyJoinMember getcustomerCenterDispatch err', err);
194
194
  });
195
195
  });
196
196
  console.log('一键入会', options);
197
197
  const currentVenderId = global.info.queryInfo.venderId;
198
198
  const currentShopId = global.info.queryInfo.shopId;
199
199
  const channel = JUMP_MEMBER_CHANNEL.POP_WEBVIEW;
200
200
  const forceMemberCardPopup = options?.forceMemberCardPopup;
201
201
  const toastOpt = {
202
202
  duration: 3000,
203
203
  image:
204
204
  'https://img13.360buyimg.com/img/jfs/t1/196933/39/19850/1479/61b059aaEe969b8db/acb37a47b9034333.png',
205
205
  };
206
206
  if (isAppHomeForMarketPage) {
207
207
  JumpEventReport.jdJumpToBottomTabBrandMember({
208
208
  shopId: currentShopId,
209
209
  venderId: currentVenderId,
210
210
  });
211
211
  return;
212
212
  }
213
213
  const params = {
214
214
  venderId: currentVenderId,
215
215
  channel,
216
216
  queryVersion: isH5AndJdShopView && jdAppVersionStr !== '' ? jdAppVersionStr : '9.2.0',
217
217
  };
218
218
  const centerDispatchResult = await getCenterDispatchResult(params);
219
219
  console.log('oneKeyJoinMember getcustomerCenterDispatch 接口返回值', centerDispatchResult);
220
220
  const { jumpPage } = centerDispatchResult;
221
221
  if (typeof jumpPage !== 'number') {
222
222
  console.log('oneKeyJoinMember getcustomerCenterDispatch 接口返回 jumpPage 值类型异常，非数字');
223
223
  showFailToast({
224
224
  title: '网络繁忙，稍后再试吧～',
225
225
  ...toastOpt,
226
226
  });
227
227
  return;
228
228
  }
229
229
  const centerDispatchJumpPageValue = Number(jumpPage);
230
230
  if (
231
231
  centerDispatchJumpPageValue === CENTERDISPATCH_JUMPPAGE_VALUE.NETWORK_ERROR ||
232
232
  centerDispatchJumpPageValue === CENTERDISPATCH_JUMPPAGE_VALUE.SYSTEM_ERROR
233
233
  ) {
234
234
  console.log('oneKeyJoinMember getcustomerCenterDispatch 接口网络异常或接口异常', jumpPage);
235
235
  showFailToast({
236
236
  title: '网络繁忙，稍后再试吧～',
237
237
  ...toastOpt,
238
238
  });
239
239
  return;
240
240
  }
241
241
  if (centerDispatchJumpPageValue === CENTERDISPATCH_JUMPPAGE_VALUE.NOT_LOGGED_IN) {
242
242
  console.log('oneKeyJoinMember getcustomerCenterDispatch 接口返回未登录，跳登录页');
243
243
  global
244
244
  .doLogin()
245
245
  .then((res) => {
246
246
  console.log('登录成功', res);
247
247
  })
248
248
  .catch((err) => {
249
249
  console.log('登录失败', err);
250
250
  });
251
251
  return;
252
252
  }
253
253
  const memberRoleJumpPageValueArr = [
254
254
  CENTERDISPATCH_JUMPPAGE_VALUE.MEMBER_CENTER,
255
255
  CENTERDISPATCH_JUMPPAGE_VALUE.ISV_MEMBER,
256
256
  CENTERDISPATCH_JUMPPAGE_VALUE.JSHOP_ISV_PAGE,
257
257
  ];
258
258
  const isMemberRole = memberRoleJumpPageValueArr.includes(centerDispatchJumpPageValue);
259
259
  if (isMemberRole) {
260
260
  showFailToast({
261
261
  title: '您已是本店会员，无需再次入会',
262
262
  ...toastOpt,
263
263
  });
264
264
  return;
265
265
  }
266
266
  if (!isH5AndJdShopView && !forceMemberCardPopup) {
267
267
  JumpEventReport.jdJumpToNewH5MemberCard();
268
268
  return;
269
269
  }
270
270
  const { isDegrade = true, isLowVersion = true } = centerDispatchResult;
271
271
  console.log('一键入会，是否已降级', isDegrade);
272
272
  console.log('一键入会，是否低版本', isLowVersion);
273
273
  if (isDegrade) {
274
274
  console.log('一键入会，已降级');
275
275
  showFailToast({
276
276
  title: '网络繁忙，稍后再试吧～',
277
277
  ...toastOpt,
278
278
  });
279
279
  return;
280
280
  }
281
281
  if (isLowVersion && !forceMemberCardPopup) {
282
282
  console.log('一键入会，低版本');
283
283
  JumpEventReport.jdJumpToMemberTab();
284
284
  return;
285
285
  }
286
286
  return new Promise((resolve) => {
287
287
  const getOpenCardUrlParams = {
288
288
  venderId: currentVenderId,
289
289
  shopId: currentShopId,
290
290
  channel: JUMP_MEMBER_CHANNEL.POP_WEBVIEW,
291
291
  device: global.info.sysInfo?.isJdTabletDevice ? 'tablet' : 'all',
292
292
  memberSceneType: 'view',
293
293
  ...options,
294
294
  };
295
295
  const memberCardurl =
296
296
  window?.shopGlobalSwitch?.openNewMemberEntry === 'true'
297
297
  ? `${JumpWebUrl.memberCard}?${objectToUrlEncode(getOpenCardUrlParams)}`
298
298
  : `${JumpWebUrl.shopH5MemberCardAPP}?${objectToUrlEncode(getOpenCardUrlParams)}`;
299
299
  const sourceUrl = encodeURIComponent(window.location.href || '');
300
300
  let url =
301
301
  sourceUrl && sourceUrl !== '' ? `${memberCardurl}&sourceUrl=${sourceUrl}` : memberCardurl;
302
302
  if (!url.includes('http')) {
303
303
  url = 'https:' + url;
304
304
  }
305
305
  console.log('openPopWebview url', url);
306
306
  nativeOpenPopWebView({
307
307
  url,
308
308
  });
309
309
  Taro.eventCenter.off(TaroEventType.JOIN_MEMBER_SUCCESS);
310
310
  Taro.eventCenter.on(TaroEventType.JOIN_MEMBER_SUCCESS, (res) => {
311
311
  console.log('TaroEventType.JOIN_MEMBER_SUCCESS res', res);
312
312
  const { shopId, venderId } = res;
313
313
  if (shopId === currentShopId && venderId === currentVenderId) {
314
314
  resolve(true);
315
315
  } else {
316
316
  console.log(
317
317
  'TaroEventType.JOIN_MEMBER_SUCCESS shopId venderId 不匹配，currentShopId, currentVenderId',
318
318
  currentShopId,
319
319
  currentVenderId,
320
320
  );
321
321
  resolve(false);
322
322
  }
323
323
  });
324
324
  });
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@conecli/cone-render",
3
- "version": "0.10.1-shop-beta.46",
3
+ "version": "0.10.1-shop-beta.48",
4
4
  "private": false,
5
5
  "files": [
6
6
  "dist/"
@@ -46,8 +46,9 @@
46
46
  "dev:qq": "npm run build:qq -- --watch",
47
47
  "dev:jd": "npm run build:jd -- --watch",
48
48
  "dev:harmony-hybrid": "npm run build:harmony-hybrid -- --watch",
49
- "compressWatch": "gulp compressWatch --gulpfile ./publish/gulpfile.js",
49
+ "compressWatch": "gulp compressWatch --gulpfile ./publish/gulpfile.js --replaceType=compressWatch",
50
50
  "compress": "gulp compress --gulpfile ./publish/gulpfile.js",
51
+ "compressToXingyunDev": "gulp compress --gulpfile ./publish/gulpfile.js --replaceType=xingyunDev",
51
52
  "build": "npm run compress",
52
53
  "check": "gulp check --gulpfile ./publish/gulpfile.js",
53
54
  "build:openShopBridge": "node publish/build-openShopBridge.js"
@@ -89,60 +90,52 @@
89
90
  "@babel/runtime": "7.24.4",
90
91
  "@tarojs/components": "4.1.2",
91
92
  "@tarojs/helper": "4.1.2",
92
- "@tarojs/plugin-platform-weapp": "4.1.2",
93
+ "@tarojs/plugin-framework-react": "4.1.2",
93
94
  "@tarojs/plugin-platform-alipay": "4.1.2",
94
- "@tarojs/plugin-platform-tt": "4.1.2",
95
- "@tarojs/plugin-platform-swan": "4.1.2",
96
- "@tarojs/plugin-platform-jd": "4.1.2",
97
- "@tarojs/plugin-platform-qq": "4.1.2",
98
95
  "@tarojs/plugin-platform-h5": "4.1.2",
99
96
  "@tarojs/plugin-platform-harmony-hybrid": "4.1.2",
97
+ "@tarojs/plugin-platform-jd": "4.1.2",
98
+ "@tarojs/plugin-platform-qq": "4.1.2",
99
+ "@tarojs/plugin-platform-swan": "4.1.2",
100
+ "@tarojs/plugin-platform-tt": "4.1.2",
101
+ "@tarojs/plugin-platform-weapp": "4.1.2",
102
+ "@tarojs/react": "4.1.2",
100
103
  "@tarojs/runtime": "4.1.2",
104
+ "@tarojs/service": "4.1.2",
101
105
  "@tarojs/shared": "4.1.2",
102
106
  "@tarojs/taro": "4.1.2",
103
- "@tarojs/plugin-framework-react": "4.1.2",
104
- "@tarojs/react": "4.1.2",
105
- "@tarojs/service": "4.1.2",
106
- "react-dom": "^18.2.0",
107
- "react": "^18.2.0",
108
107
  "art-template": "^4.13.2",
109
108
  "gulp-filter": "^7.0.0",
110
109
  "normalize.css": "^8.0.1",
110
+ "react": "^18.2.0",
111
111
  "react-content-loader": "^6.2.0",
112
+ "react-dom": "^18.2.0",
112
113
  "react-intersection-observer": "8.33.1",
113
114
  "react-refresh": "^0.14.0",
114
115
  "sha256": "^0.2.0"
115
116
  },
116
117
  "devDependencies": {
117
- "@babel/plugin-transform-strict-mode": "^7.16.7",
118
118
  "@babel/core": "7.24.4",
119
- "@tarojs/cli": "4.1.2",
120
119
  "@babel/plugin-proposal-class-properties": "7.14.5",
121
- "@types/webpack-env": "^1.13.6",
122
- "@types/react": "^18.0.17",
123
- "webpack": "5.91.0",
120
+ "@babel/plugin-transform-strict-mode": "^7.16.7",
121
+ "@babel/preset-react": "^7.24.1",
122
+ "@pmmmwh/react-refresh-webpack-plugin": "^0.5.7",
123
+ "@tarojs/cli": "4.1.2",
124
124
  "@tarojs/taro-loader": "4.1.2",
125
125
  "@tarojs/webpack5-runner": "4.1.2",
126
- "sass": "^1.75.0",
126
+ "@types/node": "^18",
127
+ "@types/react": "^18.0.17",
128
+ "@types/webpack-env": "^1.13.6",
129
+ "@typescript-eslint/eslint-plugin": "^6.2.0",
130
+ "@typescript-eslint/parser": "^6.2.0",
127
131
  "babel-preset-taro": "4.1.2",
128
- "eslint-config-taro": "4.1.2",
132
+ "del": "^6.1.1",
133
+ "escodegen": "^2.0.0",
129
134
  "eslint": "^8.57.0",
130
- "@pmmmwh/react-refresh-webpack-plugin": "^0.5.7",
131
- "react-refresh": "^0.14.0",
132
- "@babel/preset-react": "^7.24.1",
133
- "eslint-plugin-react": "^7.34.1",
135
+ "eslint-config-taro": "4.1.2",
134
136
  "eslint-plugin-import": "^2.12.0",
137
+ "eslint-plugin-react": "^7.34.1",
135
138
  "eslint-plugin-react-hooks": "^4.4.0",
136
- "stylelint": "^16.4.0",
137
- "@typescript-eslint/parser": "^6.2.0",
138
- "@typescript-eslint/eslint-plugin": "^6.2.0",
139
- "typescript": "^5.4.5",
140
- "tsconfig-paths-webpack-plugin": "^4.1.0",
141
- "postcss": "^8.4.38",
142
- "ts-node": "^10.9.1",
143
- "@types/node": "^18",
144
- "del": "^6.1.1",
145
- "escodegen": "^2.0.0",
146
139
  "espree": "^9.3.2",
147
140
  "esprima": "^4.0.1",
148
141
  "estraverse": "^5.3.0",
@@ -150,9 +143,18 @@
150
143
  "gulp-util": "^3.0.8",
151
144
  "html-webpack-plugin": "^5.5.0",
152
145
  "mini-css-extract-plugin": "^2.6.1",
146
+ "postcss": "^8.4.38",
147
+ "react-refresh": "^0.14.0",
148
+ "sass": "^1.75.0",
153
149
  "shelljs": "^0.8.5",
150
+ "stylelint": "^16.4.0",
154
151
  "terser": "^5.44.1",
155
- "terser-webpack-plugin": "^5.3.6"
152
+ "terser-webpack-plugin": "^5.3.6",
153
+ "ts-node": "^10.9.1",
154
+ "tsconfig-paths-webpack-plugin": "^4.1.0",
155
+ "typescript": "^5.4.5",
156
+ "webpack": "5.91.0",
157
+ "yargs-parser": "^21.1.1"
156
158
  },
157
159
  "resolutions": {
158
160
  "@babel/runtime": "7.24.4",