jufubao-base 1.0.37 → 1.0.38

package/package.json

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

package/src/components/JfbBaseAddress/XdAddress.vue

@@ -299,7 +299,13 @@ export default {
       this.location = location;
       this.latitude = location["latitude"];
       this.longitude = location["longitude"];
-      this.receipt_address = location["sourceData"]["title"]?location["sourceData"]["title"]:'';
+      if(location["sourceData"] && location["sourceData"]["title"]) {
+        this.receipt_address = location["sourceData"]["title"];
+      }
+      else{
+        this.receipt_address = '';
+      }
+      
 
       this.handleParse(location);
       this.showTips = true;

package/src/components/JfbBaseCity/Api.js

@@ -23,6 +23,18 @@ module.exports = [
     isConsole: true,
     disabled: true
   },
+  {
+    mapFnName: "getLoadingCityBaseCityByLocationLv4",
+    title: '根据经纬度获取城市信息',
+    path: "/common/v1/region/city/get-trans-lv4-by-geo",
+    isRule: false,
+    params: {
+      latitude: ['latitude', 'Number', true],
+      longitude: ['longitude', 'Number', true]
+    },
+    isConsole: true,
+    disabled: true
+  },
   {
     mapFnName: "getAllMapCity",
     title: "热门城市列表-字母排序城市",

package/src/components/JfbBaseCity/JfbBaseCity.vue

@@ -65,11 +65,14 @@
         //this.height = getContainerPropsValue(container, 'content.height', 10);
       },
       getCityInfoByLocation(options, cb){
-        jfbRootExec("getCityInfoByLocation", {
+        jfbRootExec("getLoadingCityBaseCityByLocationLv4", {
           vm: this,
           data: options
         }).then(res => {
           cb(res)
+        }).catch(e => {
+          this.$xdLog.setARMSCustomError('get_city_info_by_location_city', this.$runtime.getErrorInfo(e));
+          cb({data: this.$settings.defaultCity})
         })
       },
     

package/src/components/JfbBaseHeader/Api.js

@@ -22,5 +22,17 @@ module.exports = [
     },
     isConsole: true,
     disabled: true
+  },
+  {
+    mapFnName: "getLoadingCityBaseHeaderByLocationLv4",
+    title: '根据经纬度获取城市信息',
+    path: "/common/v1/region/city/get-trans-lv4-by-geo",
+    isRule: false,
+    params: {
+      latitude: ['latitude', 'Number', true],
+      longitude: ['longitude', 'Number', true]
+    },
+    isConsole: true,
+    disabled: true
   }
 ];

package/src/components/JfbBaseHeader/JfbBaseHeader.vue

@@ -222,11 +222,14 @@
       },
 
       getCityInfoByLocation(options, cb){
-        jfbRootExec("getCityInfoByLocation", {
+        jfbRootExec("getLoadingCityBaseHeaderByLocationLv4", {
           vm: this,
           data: options
         }).then(res => {
           cb(res)
+        }).catch(e => {
+          this.$xdLog.setARMSCustomError('get_city_info_by_location_header', this.$runtime.getErrorInfo(e));
+          cb({data: this.$settings.defaultCity})
         })
       },
       /***

package/src/components/JfbBaseLogin/JfbBaseLogin.vue

@@ -465,22 +465,26 @@ export default {
         redirect_url = location.origin + this.base + redirect_url;
       }
       
+      let params = {
+        providers: providers.join(","),
+        callback_url: redirect_url,
+        phone_number_login_url: location.origin + this.base + this.phone_number_login_url,
+        phone_number_collect_url: location.origin + this.base + this.phone_number_collect_url,
+        error_callback_url: location.origin + this.base + this.error_callback_url,
+      }
       jfbRootExec("listSiteProvider", {
         vm: this,
-        data: {
-          providers: providers.join(","),
-          callback_url: redirect_url,
-          phone_number_login_url: location.origin + this.base + this.phone_number_login_url,
-          phone_number_collect_url: location.origin + this.base + this.phone_number_collect_url,
-          error_callback_url: location.origin + this.base + this.error_callback_url,
-        },
+        data: params,
       })
         .then((res) => {
           this.handleAuthResult(res);
         })
         .catch((error) => {
-          console.log(error);
-          this.$xdLog.setARMSError(error)
+          if (this.$xdUniHelper.checkVarType(error) === 'object') {
+            this.$xdLog.setARMSCustomError('list_site_provider_error', {...params, fn:'listSiteProvider'})
+          } else {
+            this.$xdLog.setARMSError(error)
+          }
         });
     },