jufubao-base 1.0.357 → 1.0.358-beta2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jufubao-base",
-  "version": "1.0.357",
+  "version": "1.0.358-beta2",
   "private": false,
   "description": "聚福宝业务组件基础插件包",
   "main": "index.js",

package/src/components/JfbBaseSweep/Api.js

@@ -10,4 +10,16 @@
  * 更新列表记录(updateFfffXxxxx)
  * @type {*[]}
  */
-module.exports = [];
+module.exports = [
+  {
+    mapFnName: 'getSpShopId', //自定义方法名字（必选）
+    title: '特殊扫水牌地址兼容获取shopid',
+    path: '/mall/v1/shop/old-to-new',
+    isRule: false,
+    params: {
+      shop_id: ['门店ID', 'Number', '必选'],
+    },
+    isConsole: true,
+    disabled: true,
+  },
+];

package/src/components/JfbBaseSweep/JfbBaseSweep.vue

@@ -125,7 +125,29 @@ export default {
       const matches = hostname.match(/[^.]+\.[^.]+$/);
       return matches ? matches[0] : hostname;
     },
+
     //#ifdef H5
+    spLink(params){
+      jfbRootExec("getSpShopId", {
+        vm: this,
+        data: params,
+      })
+        .then(res => {
+          if(res["x-params"]) {
+            //x-params=base64(a:1,b:3);
+            this.$xdUniHelper.navigateTo({
+              url: `${this.change_url}?x-params=${res["x-params"]}&referrer=official`,
+            });
+          }
+        })
+        .catch(error=>{
+          console.error(error);
+          this.other = true;
+          this.show = false;
+          this.flag = false;
+        })
+    },
+
     handleH5() {
       // 判断jwxSDK是否为空
       if (this.jwxSDK !== null) {
@@ -137,7 +159,21 @@ export default {
           scanType: ["qrCode"],
           // 扫描成功后的回调函数
           success: (res) => {
-            console.log(res.resultStr,'res.resultStr');
+
+            //特殊地址
+            if(res['resultStr'].includes('/main/goods/index')) {
+              let params = this.$xdUniHelper.parseURL(res['resultStr'])['params'];
+
+              if(params.shop_id){
+                this.spLink(params);
+              }
+              else {
+                this.other = true;
+                this.show = false;
+                this.flag = false;
+              }
+              return
+            }
             // 判断res.resultStr是否包含'wx/cake/index/'
             if(res.resultStr.includes('wx/cake/index/')){
               // 将res.resultStr以'wx/cake/index/'分割，取分割后的第一个元素
@@ -152,7 +188,7 @@ export default {
               // 拼接change_url和x-params参数
               let path = `${this.change_url}?x-params=${xParams}&referrer=official`;
               // 打印xParams和path
-              console.log(xParams,'pathpath');      
+              console.log(xParams,'pathpath');
               // 跳转到指定路径
               this.$xdUniHelper.navigateTo({
                 url: path,
@@ -261,7 +297,7 @@ export default {
             // 拼接change_url和x-params参数
             let path = `${this.change_url}?x-params=${xParams}&referrer=official`;
             // 打印xParams和path
-            console.log(xParams,'pathpath');      
+            console.log(xParams,'pathpath');
             // 跳转到指定路径
             this.$xdUniHelper.navigateTo({
               url: path,