crh-jssdk 0.10.2 → 0.10.4

package/business/mall/crh-app-sdk-cxzq.js

@@ -269,9 +269,10 @@ exports.default = {
     /**
      * 通过pageId打开新的webview打开外部链接
      */
-    goWebview: function (pageId, url, callback) {
+    goWebview: function (params) {
+        var sdk = params.sdk, h5 = params.h5, _a = params.h5url, h5url = _a === void 0 ? '' : _a;
         var jsonObj = {
-            indexUrl: url,
+            indexUrl: h5,
             uploadPicUrl: "",
             cookieDomain: "",
             closeBusiness: "closeCallBack",
@@ -279,12 +280,16 @@ exports.default = {
             identifier: "zt",
         };
         var jsonStr = JSON.stringify(jsonObj);
+        if (!this.isApp()) {
+            window.location.href = h5url;
+            return;
+        }
         if (webviewType.isNewLeZhuan) {
-            actionMap.callAction(207, { pageId: pageId || "1", needLogin: "0" });
+            actionMap.callAction(207, { pageId: sdk || "1", needLogin: "0" });
         }
         else if (webviewType.isNewJuCai) {
             actionMap.callJuCaiAction("gotoClientPage", {
-                pageId: utils_1.ios ? String(pageId) : pageId,
+                pageId: utils_1.ios ? String(sdk) : sdk,
                 needLogin: "0",
             });
         }
@@ -430,7 +435,7 @@ exports.default = {
                                     isPhoneLogin = true;
                                 }
                             }
-                            resolve(__assign(__assign({}, response), { device_flag: webviewType.isNewLeZhuan
+                            resolve(__assign(__assign({}, response), { isLogin: isLogin, device_flag: webviewType.isNewLeZhuan
                                     ? "a"
                                     : webviewType.isNewJuCai || webviewType.isOldJuCai
                                         ? "f"
@@ -801,7 +806,6 @@ exports.default = {
      */
     queryCollect: function (params) {
         var _this = this;
-        console.log(params, "params===");
         var sdkParams = {
             productNo: params.productNo,
             productCode: params.productCode,
@@ -814,7 +818,6 @@ exports.default = {
                 if (((_a = params === null || params === void 0 ? void 0 : params.versionList) === null || _a === void 0 ? void 0 : _a.indexOf(this.getVersion())) == -1 &&
                     webviewType.isNewLeZhuan) {
                     window["callAfterSeachFavor".concat(params.productNo)] = function (actionId, data) {
-                        console.log(data, params, "ret");
                         resolve(__assign({ error_no: "0", error_info: "" }, data));
                     };
                     actionMap.callAction(107, sdkParams, "callAfterSeachFavor".concat(params.productNo));
@@ -868,25 +871,31 @@ exports.default = {
      * @param {string} params.message 内容
      */
     share: function (params) {
-        return __awaiter(this, void 0, void 0, function () {
-            var shareParam;
-            return __generator(this, function (_a) {
-                if (webviewType.isLeZhuan) {
-                    shareParam = {
-                        img_url: params.img_url || cx_share_png_1.default,
-                        url: params.url,
-                        title: params.title,
-                        message: params.message,
-                    };
-                    if (webviewType.isNewLeZhuan) {
-                        actionMap.callAction(900, shareParam, "");
-                    }
-                    else {
-                        this.businessAlertView("http://action:900/?target=2&param=".concat(encodeURIComponent(JSON.stringify(shareParam))));
-                    }
-                }
-                return [2 /*return*/];
-            });
-        });
+        var _this = this;
+        if (webviewType.isLeZhuan) {
+            var shareParam = {
+                img_url: params.img_url || cx_share_png_1.default,
+                url: params.url,
+                title: params.title,
+                message: params.message,
+            };
+            if (webviewType.isNewLeZhuan) {
+                actionMap.callAction(900, shareParam, "");
+            }
+            else {
+                this.businessAlertView("http://action:900/?target=2&param=".concat(encodeURIComponent(JSON.stringify(shareParam))));
+            }
+        }
+        else {
+            return new Promise(function (resolve) { return __awaiter(_this, void 0, void 0, function () {
+                return __generator(this, function (_a) {
+                    resolve({
+                        error_no: "-3",
+                        error_info: "当前APP不支持分享",
+                    });
+                    return [2 /*return*/];
+                });
+            }); });
+        }
     },
 };

package/business/mall/crh-app-sdk-cxzq.ts

@@ -396,6 +396,7 @@ export default {
         }
         resolve({
           ...response,
+          isLogin,
           device_flag: webviewType.isNewLeZhuan
             ? "a"
             : webviewType.isNewJuCai || webviewType.isOldJuCai
@@ -781,7 +782,7 @@ export default {
    * @param {string} params.title 标题
    * @param {string} params.message 内容
    */
-  async share(params: {
+  share(params: {
     img_url?: any;
     url?: string;
     title?: string;
@@ -803,6 +804,13 @@ export default {
           )}`
         );
       }
+    } else {
+      return new Promise(async (resolve) => {
+         resolve({
+          error_no: "-3",
+          error_info: "当前APP不支持分享",
+        })
+      })
     }
   },
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "crh-jssdk",
-  "version": "0.10.2",
+  "version": "0.10.4",
   "description": "crh-jssdk",
   "main": "index.js",
   "scripts": {