jufubao-base 1.0.18 → 1.0.20

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jufubao-base",
-  "version": "1.0.18",
+  "version": "1.0.20",
   "private": false,
   "description": "聚福宝业务组件基础插件包",
   "main": "index.js",
@@ -12,6 +12,7 @@
     "init.entry": "node ./build/commands/entry.init.js",
     "update": "node ./commands/update.pack.js",
     "create": "node ./commands/create.pack.js",
+    "change": "node ./commands/change.pack",
     "release": "node ./commands/npmignore && npm publish",
     "init": "cross-env isLocal=false node ./commands.js",
     "init.local": "cross-env isLocal=true node ./commands.js",
@@ -47,7 +48,7 @@
     "core-js": "^2.6.5",
     "flyio": "^0.6.2",
     "gxd-commands-bussiness": "^1.0.6",
-    "gxd-uni-library": "1.0.40",
+    "gxd-uni-library": "1.1.3",
     "jweixin-module": "^1.6.0",
     "md5": "^2.3.0",
     "path-to-regexp": "^6.2.1",

package/src/components/JfbBaseBlock/JfbBaseBlockMixin.js

@@ -169,7 +169,7 @@ export default {
       XdBus.send('onSelectPackage', {
         containerId: this.containerId,
         Attr: AttrObj,
-        container: this.container
+        container: this.$xdUniHelper.cloneDeep(this.container)
       });
 
       //绑定选中插件事件

package/src/components/JfbBaseCard/JfbBaseCard.vue

@@ -41,7 +41,7 @@
         *目前仅支持电影票兑换券进行转换
       </view>
       <view class="jfb-base-card__body-card">
-        <view v-for="(item,index) in cardList" :key="index" @click="handleBindLogin(item)"
+        <view v-for="(item,index) in showList" :key="index" @click="handleBindLogin(item)"
               class="jfb-base-card__body-card-item">
           <view class="jfb-base-card__body-card-item-left">
             <xd-font-icon size="55" icon="iconyouhuiquan"></xd-font-icon>
@@ -49,14 +49,10 @@
           </view>
           <view class="jfb-base-card__body-card-item-right">
             <view class="jfb-base-card__body-card-item-right-top">
-              <view v-if="1">
+              <view>
                 <xd-font-icon icon="iconkaquan" size="30" style="margin-right: 10rpx"></xd-font-icon>
                 <view>{{item.card_type_name}}</view>
               </view>
-              <view v-else>
-                <view style="font-size: 48rpx">{{item.card_point}}</view>
-                <view style="font-size: 18rpx;position: relative;top: 30rpx;margin-left: 5rpx">{{item.unit}}</view>
-              </view>
               <view>
                 <view>ID:{{item.card_number}}</view>
                 <view>有效期至:{{item.end_time}}</view>
@@ -64,7 +60,7 @@
             </view>
             <view class="jfb-base-card__body-card-item-right-bottom">
               <view class="jfb-base-card__body-card-item-right-bottom-info">
-                <view v-if="1" class="jfb-base-card__body-card-item-right-bottom-info-residue">
+                <view class="jfb-base-card__body-card-item-right-bottom-info-residue">
                   剩余点数：{{item.card_point}}
                 </view>
                 <view class="jfb-base-card__body-card-item-right-bottom-info-deduction">
@@ -87,14 +83,10 @@
           </view>
           <view class="jfb-base-card__body-card-item-right">
             <view class="jfb-base-card__body-card-item-right-top">
-              <view v-if="item.unit==='点'">
+              <view>
                 <xd-font-icon color="#B8B7BE" icon="iconkaquan" size="30" style="margin-right: 10rpx"></xd-font-icon>
                 <view>{{item.card_type_name}}</view>
               </view>
-              <view v-else>
-                <view style="font-size: 48rpx">{{item.card_point}}</view>
-                <view style="font-size: 18rpx;position: relative;top: 30rpx;margin-left: 5rpx">{{item.unit}}</view>
-              </view>
               <view>
                 <view>ID:{{item.card_number}}</view>
                 <view>有效期至:{{item.end_time}}</view>
@@ -102,7 +94,7 @@
             </view>
             <view class="jfb-base-card__body-card-item-right-bottom">
               <view class="jfb-base-card__body-card-item-right-bottom-info">
-                <view v-if="item.unit==='点'" class="jfb-base-card__body-card-item-right-bottom-info-residue">
+                <view class="jfb-base-card__body-card-item-right-bottom-info-residue">
                   剩余点数：{{item.card_point}}
                 </view>
                 <view class="jfb-base-card__body-card-item-right-bottom-info-deduction">
@@ -139,21 +131,30 @@
         jwxSDK: state => state.jwxSDK
       })
     },
+    watch: {
+      tabIndex(newVal, oldVal) {
+        if (newVal === 1) {
+          this.showList = this.cardList
+        } else {
+          this.showList = this.changeList
+        }
+      }
+    },
     data() {
       return {
         cutIndex: 1,
         tabIndex: 1,
         isBack: null, //是否使用返回键
         cardList: [],
-        disableList: [],
+        showList: [],
+        changeList: [],        disableList: [],
         inCallback: null, //内部跳转地址
-
-        //todo
       }
     },
     created() {
-
-      //todo
+      let {inCallback} = this.$route.query;
+      if (inCallback) inCallback = decodeURIComponent(inCallback);
+      this.inCallback = inCallback || this.settings.index;
     },
     methods: {
       handleToLink(path) {
@@ -183,19 +184,7 @@
        */
       handleBindLogin(item) {
         if (this.tabIndex === 1) {
-          if (this.isBack === 1) {
-            this.$xdUniHelper.navigateBack();
-            return;
-          }
-
-          console.log('$storage.get', this.$storage.get('xd_callback'), this.callback, this.inCallback)
-          //已经设置了xd_callback，但是callback没有被初始化
-          if (this.$storage.get('xd_callback') && !this.callback) {
-            this.$xdLog.push({
-              '$storage.get': this.$storage.get('xd_callback'),
-              callbackInit: false
-            }, 'alert', 'info')
-          }
+          console.log('bindCardLogin', this.inCallback)
 
           //无效卡
           if (item['is_valid'] !== 'Y') {
@@ -208,14 +197,9 @@
             data: {card_number: item['card_number']}
           }).then(res => {
             this.$xdHideLoading();
-            console.log('bindCardLogin', this.callback, this.inCallback, this.$storage.get('xd_callback'))
-            if (!this.callback && !this.inCallback && !this.$storage.get('xd_callback')) {
-              this.$xdUniHelper.navigateTo({
-                url: `/pages/chose/chose`
-              });
-              return
-            }
-            console.log('bindCardLogin', this.callback, this.inCallback, this.$storage.get('xd_callback'))
+            this.$xdUniHelper.redirectTo({
+              url: this.inCallback
+            });
           })
             .catch(res => {
               this.$xdHideLoading();
@@ -234,30 +218,30 @@
       },
       onJfbLoad(options) {
         console.log(this.jwxSDK, '000000')
-        this.$nextTick(() => {
-          let {inCallback, isBack} = this.$xdUniHelper.parseURL()['params'];
-          if (inCallback) this.inCallback = decodeURIComponent(inCallback);
-          if (isBack) this.isBack = Number(isBack);
-        });
-
         jfbRootExec('getListCardBind', {
-
           vm: this,
           data: {}
-
         }).then((res) => {
-          this.cardList = res.filter((item) => {
+          this.cardList = res.list.filter((item) => {
             if (item['is_valide'] !== 'N' && item['card_point'] !== 0) {
               return true
             }
             return false
           });
-          this.disableList = res.filter((item) => {
+          this.disableList = res.list.filter((item) => {
             if (item['is_valide'] === 'N' || item['card_point'] === 0) {
               return true
             }
             return false
           });
+          this.changeList = this.cardList.filter(item => {
+            if (item['is_exchange'] === 'Y') {
+              return true
+            }
+            return false
+          })
+
+          this.showList = this.cardList
         }).catch()
       },
       onJfbScroll(options) {

package/src/components/JfbBaseCard/JfbBaseCardMixin.js

@@ -169,7 +169,7 @@ export default {
       XdBus.send('onSelectPackage', {
         containerId: this.containerId,
         Attr: AttrObj,
-        container: this.container
+        container: this.$xdUniHelper.cloneDeep(this.container)
       });
 
       //绑定选中插件事件

package/src/components/JfbBaseCardBind/JfbBaseCardBind.vue

@@ -94,6 +94,7 @@
       },
       onJfbBack(options) {
         console.log('event.onJfbBack', options)
+        this.$xdUniHelper.navigateBack()
       },
     }
   }

package/src/components/JfbBaseCardBind/JfbBaseCardBindMixin.js

@@ -169,7 +169,7 @@ export default {
       XdBus.send('onSelectPackage', {
         containerId: this.containerId,
         Attr: AttrObj,
-        container: this.container
+        container: this.$xdUniHelper.cloneDeep(this.container)
       });
 
       //绑定选中插件事件

package/src/components/JfbBaseCardDetail/JfbBaseCardDetail.vue

@@ -124,7 +124,7 @@
         show: false,
         textList: [],
         password: '',
-        card_number: '101001000005479',
+        card_number: '',
 
         userInfo: null, //用户信息
         brandInfo: null, //brand
@@ -146,9 +146,11 @@
           this.brandInfo = getApp().globalData.$xd['brandInfo']
           // this.download = getBusinessImageUrl('base_download.png')
           // this.qrcode = getBusinessImageUrl('base_qr.png')
-          this.init();
           // this.editPhone = this.userInfo.mobile
-          // let {card_number} = this.$xdUniHelper.parseURL()['params'];
+          let card_number = options.card_number;
+          this.card_number = card_number
+          this.init();
+          console.log(this.card_number,'options')
           // if (card_number) {
           //   this.card_number = card_number;
           //   if (this.brandInfo['is_enable_pay_password'] === 'N') {
@@ -220,6 +222,7 @@
       },
       onJfbBack(options) {
         console.log('event.onJfbBack', options)
+        this.$xdUniHelper.navigateBack()
       },
       setInval(time) {
         if (time === 0) {

package/src/components/JfbBaseCardDetail/JfbBaseCardDetailMixin.js

@@ -169,7 +169,7 @@ export default {
       XdBus.send('onSelectPackage', {
         containerId: this.containerId,
         Attr: AttrObj,
-        container: this.container
+        container: this.$xdUniHelper.cloneDeep(this.container)
       });
 
       //绑定选中插件事件

package/src/components/JfbBaseCardInfo/JfbBaseCardInfo.vue

@@ -42,6 +42,7 @@
 <script>
   import XdFontIcon from "@/components/XdFontIcon/XdFontIcon";
   import {jfbRootExec} from "@/utils/xd.event";
+  import {Base64} from 'js-base64'
   import JfbBaseCardInfoMixin from "./JfbBaseCardInfoMixin";
   import XdButton from "@/components/XdButton/XdButton";
 
@@ -100,15 +101,17 @@
             {
               vm: this,
               data: {
-                card_password: "59009501",
-                card_number: "101001000005478"
+                card_password: this.card_password,
+                card_number: this.card_number
               }
 
             }).then((res) => {
             this.$xdAlert({
               content: '绑定成功',
               close: () => {
-                this.$xdUniHelper.navigateBack()
+                this.$xdUniHelper.redirectTo({
+                  url: '/pages/card/card'
+                })
               }
             })
           }).catch()
@@ -117,41 +120,43 @@
             {
               vm: this,
               data: {
-                card_qrcode: "http://sandbox-c.jufubao.cn/web/wx/card/scan/bind?pa=101001000005479|8178cff8-fe34-11ea-b580-00163e047a75"
+                card_qrcode: this.qrcode
               }
             }).then((res) => {
             this.$xdAlert({
               content: '绑定成功',
               close: () => {
-                this.$xdUniHelper.navigateBack()
+                this.$xdUniHelper.redirectTo({
+                  url: '/pages/card/card'
+                })
               }
             })
           }).catch()
         }
       },
       onJfbLoad(options) {
-        this.qrcode = options.qrcode || ''
-        this.card_number = options.card_number || '101001000005478'
-        this.card_password = options.pwd || '59009501'
+        this.qrcode = options.qrcode
+        this.card_number = Base64.decode(options.card_number)
+        this.card_password = Base64.decode(options.pwd)
         if (this.card_password) {
           jfbRootExec('getByPwdCardDetail',
             {
               vm: this,
               data: {
-                card_password: "59009501",
-                card_number: "101001000005478"
+                card_password: this.card_password,
+                card_number: this.card_number
               }
 
-            }).then((res)=>{
-              res.is_exchange_name = res.is_exchange==='Y'?'可转换':'不可转换'
-              this.info = res
+            }).then((res) => {
+            res.is_exchange_name = res.is_exchange === 'Y' ? '可转换' : '不可转换'
+            this.info = res
           }).catch()
-        } else if(this.qrcode) {
+        } else if (this.qrcode) {
           jfbRootExec('getByQrCardDetail',
             {
               vm: this,
               data: {
-                card_qrcode: "http://sandbox-c.jufubao.cn/web/wx/card/scan/bind?pa=101001000005479|8178cff8-fe34-11ea-b580-00163e047a75"
+                card_qrcode: this.qrcode
               }
             }).then((res) => {
             res.is_exchange_name = res.is_exchange === 'Y' ? '可转换' : '不可转换'
@@ -174,6 +179,7 @@
       },
       onJfbBack(options) {
         console.log('event.onJfbBack', options)
+        this.$xdUniHelper.navigateBack()
       },
     }
   }

package/src/components/JfbBaseCardInfo/JfbBaseCardInfoMixin.js

@@ -169,7 +169,7 @@ export default {
       XdBus.send('onSelectPackage', {
         containerId: this.containerId,
         Attr: AttrObj,
-        container: this.container
+        container: this.$xdUniHelper.cloneDeep(this.container)
       });
 
       //绑定选中插件事件

package/src/components/JfbBaseCardMy/JfbBaseCardMyMixin.js

@@ -169,7 +169,7 @@ export default {
       XdBus.send('onSelectPackage', {
         containerId: this.containerId,
         Attr: AttrObj,
-        container: this.container
+        container: this.$xdUniHelper.cloneDeep(this.container)
       });
 
       //绑定选中插件事件

package/src/components/JfbBaseCardShift/Api.js

@@ -22,4 +22,15 @@ module.exports = [
     },
     disabled: true,
   },
+  {
+    mapFnName: 'getByIdCardDetail', //自定义方法名字（必选）
+    isRule: false,
+    title: '获得绑定的卡详情',
+    prefix: 'detal',
+    path: '/card/v1/card-bind/get-bind-card',
+    params: {
+      card_number: ['卡号', 'String', '必选'],
+    },
+    disabled: true,
+  },
 ];

package/src/components/JfbBaseCardShift/JfbBaseCardShift.vue

@@ -119,7 +119,7 @@
           {
           vm: this,
           data: {
-            card_number: '171004000000012',
+            card_number: this.card_number,
           }
         }).then((res)=>{
           this.success=true
@@ -133,7 +133,7 @@
       },
       onJfbLoad(options) {
         console.log(this.layoutInfo, options, 8888)
-        this.card_number = options.card_number || '171004000000012'
+        this.card_number = options.card_number
         jfbRootExec('getByIdCardDetail', {
           vm: this,
           data: {
@@ -158,6 +158,7 @@
       },
       onJfbBack(options) {
         console.log('event.onJfbBack', options)
+        this.$xdUniHelper.navigateBack()
       },
     }
   }

package/src/components/JfbBaseCardShift/JfbBaseCardShiftMixin.js

@@ -169,7 +169,7 @@ export default {
       XdBus.send('onSelectPackage', {
         containerId: this.containerId,
         Attr: AttrObj,
-        container: this.container
+        container: this.$xdUniHelper.cloneDeep(this.container)
       });
 
       //绑定选中插件事件

package/src/components/JfbBaseFooter/Attr.js

@@ -0,0 +1,82 @@
+'use strict';
+export default {
+  style: [],
+  advanced: [],
+  content: [
+    {
+      label: '', //label
+      ele: 'slot', //package 名称
+      slot: 'is_reference_title',
+    },
+    {
+      label: '背景颜色:', //label
+      ele: 'xd-color', //package 名称
+      valueKey: 'bgColor', //form[valueKey]
+      value: '#f9f9f9', //v-model
+      placeholder: '请选择背景颜色',
+      setting: {
+        isAlpha: false
+      },
+      classNmae: 'input80', //样式名称 //input100,input80,input70,input60,input50,input40,input30,input20,
+      rules: [
+        {
+          required: true,
+          message: '请选择背景颜色',
+          trigger: 'change'
+        },
+      ]
+    },
+    {
+      label: '菜单文字颜色:', //label
+      ele: 'xd-color', //package 名称
+      valueKey: 'color', //form[valueKey]
+      value: '#333', //v-model
+      setting: {
+        isAlpha: false
+      },
+      placeholder: '请选择菜单文字颜色',
+      classNmae: 'input80', //样式名称 //input100,input80,input70,input60,input50,input40,input30,input20,
+    },
+    {
+      label: '菜单文字选中颜色:', //label
+      ele: 'xd-color', //package 名称
+      valueKey: 'selectedColor', //form[valueKey]
+      setting: {
+        isAlpha: false
+      },
+      value: '#c00', //v-model
+      placeholder: '请选择菜单文字选中颜色',
+      classNmae: 'input80', //样式名称 //input100,input80,input70,input60,input50,input40,input30,input20,
+    },
+    {
+      label: '菜单配置:', //label
+      ele: 'xd-footer-setting', //package 名称
+      valueKey: 'footer-setting', //form[valueKey]
+      value: [],
+      setting: {
+        router: XdBus.getParentData('getPagesTree'),
+      },
+      handleCustom({action,data}){
+        console.log(`handleCustom.${action}`, data);
+        if(action === 'number') {
+          XdBus.getParentApi('getOptionsNoticeNumber')()
+            .then(res => {
+              data.cb(res.list)
+            })
+            .catch();
+        }
+      },
+      inline: false,
+      notice: '设置底部菜单的链接地址、标题(最多<sapn style="color: red">五个汉字</sapn>)、ICON图标（<a href="https://www.iconfont.cn/manage/index?spm=a313x.7781069.1998910419.db775f1f3&manage_type=myprojects&projectId=3378319&keyword=&project_type=&page=" style="color: blue" target="_blank">ICONFONT库</a>）、ICON大小（单位：<sapn style="color: red">像素</sapn>）和是否有消息数量显示（无数量显示可以不填写）',
+      rules: [
+        {required: true, message: '请添加内容', trigger: 'change'},
+      ],
+    },
+    {
+      label: '', //label
+      ele: 'slot', //package 名称
+      slot: 'is_reference',
+    },
+  ],
+};
+