jufubao-base 1.0.28-beta21 → 1.0.28-beta23

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jufubao-base",
-  "version": "1.0.28-beta21",
+  "version": "1.0.28-beta23",
   "private": false,
   "description": "聚福宝业务组件基础插件包",
   "main": "index.js",
@@ -50,7 +50,7 @@
     "core-js": "^2.6.5",
     "flyio": "^0.6.2",
     "gxd-commands-bussiness": "^1.0.12",
-    "gxd-uni-library-editx": "1.0.8-beta12",
+    "gxd-uni-library-editx": "1.0.8-beta16",
     "jweixin-module": "^1.6.0",
     "md5": "^2.3.0",
     "path-to-regexp": "^6.2.1",

package/src/components/JfbBaseCardDetail/Attr.js

@@ -4,6 +4,16 @@ export default {
   style: [],
   advanced: [],
   content: [
-
+    {
+      label: '卡解绑成功回跳地址:', //label
+      ele: 'xd-select-pages-path', //package 名称
+      valueKey: 'back_url', //form[valueKey]
+      placeholder: '请选择卡解绑成功回跳地址',
+      value: null,
+      setting: {
+        router: XdBus.getParentData('getPagesTree'),
+      },
+      inline: false,
+    },
   ],
 };

package/src/components/JfbBaseCardDetail/JfbBaseCardDetail.vue

@@ -135,13 +135,10 @@
 
         download: '',
         qrcode: '',
-
-        //todo
+        backUrl: ''
       }
     },
-    created() {
-      //todo
-    },
+    created() {},
     methods: {
 
       onJfbLoad(options) {
@@ -247,9 +244,9 @@
                 }
 
               }).then(res => {
-                this.$xdUniHelper.navigateTo({
-                  url: `/pages/card/card`
-                }, false)
+                this.$xdUniHelper.redirectTo({
+                  url: this.backUrl
+                })
               }).catch()
             }
           }
@@ -290,7 +287,8 @@
       },
       init() {
         this.detail();
-        this.refrush()
+        this.refrush();
+        this.backUrl = getContainerPropsValue(this.container, 'content.back_url', {value: '/pages/card/card'}).value;
       },
       /**
        * @description 获取卡详情

package/src/components/JfbBaseCardInfo/JfbBaseCardInfo.vue

@@ -106,9 +106,7 @@
         backUrl: '',
       }
     },
-    created() {
-      this.backUrl = getContainerPropsValue(this.container, 'content.back_url', {value: '/pages/card/card'}).value;
-    },
+    created() {},
     methods: {
       handleToLink(path) {
         if (this.card_password) {
@@ -150,7 +148,11 @@
           }).catch()
         }
       },
+      init() {
+        this.backUrl = getContainerPropsValue(this.container, 'content.back_url', {value: '/pages/card/card'}).value;
+      },
       onJfbLoad(options) {
+        this.init();
         this.qrcode = options.qrcode;
         this.card_number = options.card_number ? Base64.decode(options.card_number) : '';
         this.card_password = options.card_number ? Base64.decode(options.pwd) : '';

package/src/components/JfbBaseCity/JfbBaseCity.vue

@@ -14,27 +14,36 @@
     </view>
     <!-- #endif -->
     <view class="jfb-base-city__body">
-      <view>测试插件( {{containerId}} )</view>
+      <xd-city
+        :top="top"
+        city-location-type="baidu"
+        @getWeixinAppInfo="handleGetWeixinAppInfo"
+        @getCityList="handleGetCityList"
+        @getCityName="handleGetCityName"
+      ></xd-city>
     </view>
   </view>
 </template>
 
 <script>
   import XdFontIcon from "@/components/XdFontIcon/XdFontIcon";
+  import XdCity from "@/components/XdCity/XdCity";
+  import cityData from "./cityData.js";
   import { jfbRootExec } from "@/utils/xd.event";
   import JfbBaseCityMixin from "./JfbBaseCityMixin";
   import { getContainerPropsValue } from "@/utils/xd.base";
   export default {
     name: "JfbBaseCity",
     components: {
-      XdFontIcon
+      XdFontIcon,
+      XdCity
     },
     mixins: [
       JfbBaseCityMixin
     ],
     data() {
       return {
-
+        top: null,
         //todo
       }
     },
@@ -66,10 +75,78 @@
        * @param container {object} 业务组件对象自己
        */
       init(container) {
+        //this.height = getContainerPropsValue(container, 'content.height', 10);
+      },
+      handleGetCityName(e){
 
-        //this.bgcolor = getContainerPropsValue(container, 'content.bgcolor', '#fff');
+      },
+      /**
+       * @description 微信SDK获取appInfo 完成之后可以直接使用getApp().globalData.weixinSDK调用相关接口
+       * @param resolve
+       */
+      handleGetWeixinAppInfo(resolve){
+        setTimeout(()=>{
+          resolve({
+            appId: "wxb208eaa219459f14",
+            nonceStr: "61558dffb381f",
+            signature: "c9255180cbdfb8b493a9260223f191922724251c",
+            timestamp: 1632996863,
+          }, ['chooseWXPay', 'openLocation', 'getLocation']);
+        }, 2000);
 
-        //this.height = getContainerPropsValue(container, 'content.height', 10);
+      },
+      /**
+       * @description 获取城市列表接口
+       * @param location
+       * @param resolve
+       */
+      handleGetCityList({location}, resolve){
+        console.log('handleGetCityList', location, cityData.result);
+        resolve(this.toCityFormat(cityData.result));
+        console.log(getApp().globalData.weixinSDK)
+      },
+      /**
+       * @description 数据格式转换
+       */
+      toCityFormat(cityInfo){
+        let classifyList = [];
+        cityInfo.letters.map((item)=>{
+          classifyList.push({idx: item});
+        });
+
+        let hotData = [];
+        Object.keys(cityInfo.hot_city_data).map((key)=>{
+          hotData.push({
+            "city_name": cityInfo.hot_city_data[key],
+            "city_id": Number(key),
+          },)
+        });
+
+        let list = [];
+        Object.keys(cityInfo.city_data).map((key)=>{
+          let item = {idx: key, cities: []};
+          cityInfo.city_data[key].map(itm=>{
+            let city_id = itm[0]['value'];
+            let city_name = itm[1]['value'];
+            let province_name = itm[2]['value'];
+            item.cities.push({
+              city_id,
+              city_name,
+              province_name,
+              city_pinyin: '',
+              py: '',
+              letter: key,
+            })
+          });
+          list.push(item);
+        });
+
+        console.log(classifyList, hotData, list)
+        return {
+          city_nav: list,
+          classify_nav: classifyList,
+          hot_city: hotData
+        }
       },
       onJfbScroll(options) {
         console.log('event.onJfbScroll', options)