jufubao-base 1.0.18 → 1.0.19

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jufubao-base",
-  "version": "1.0.18",
+  "version": "1.0.19",
   "private": false,
   "description": "聚福宝业务组件基础插件包",
   "main": "index.js",
@@ -47,7 +47,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/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/JfbBaseCardBind/JfbBaseCardBind.vue

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

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/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/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/JfbBaseFooter/JfbBaseFooter.vue

@@ -0,0 +1,102 @@
+<template>
+  <view
+    class="jfb-base-footer"
+    @click="handleSelect"
+    :class="{ editx : isEditx && active }"
+  >
+    <!--#ifdef H5-->
+    <view
+      class="jfb-base-footer__edit"
+      :class="{ editx : isEditx && active }"
+      v-if="isEditx && active"
+    >
+      <view class="jfb-base-footer__edit-icon" @click="delEdit">删除</view>
+    </view>
+    <!-- #endif -->
+    <view class="jfb-base-footer__body">
+      <view>测试插件( {{containerId}} )</view>
+    </view>
+  </view>
+</template>
+
+<script>
+  import XdFontIcon from "@/components/XdFontIcon/XdFontIcon";
+  import { jfbRootExec } from "@/utils/xd.event";
+  import JfbBaseFooterMixin from "./JfbBaseFooterMixin";
+  import { getContainerPropsValue } from "@/utils/xd.base";
+  export default {
+    name: "JfbBaseFooter",
+    components: {
+      XdFontIcon
+    },
+    mixins: [
+      JfbBaseFooterMixin
+    ],
+    data() {
+      return {
+
+        //todo
+      }
+    },
+    watch: {
+      container(value) {
+        this.init(value)
+      }
+    },
+    created() {
+      this.init(this.container);
+
+      //todo
+    },
+    methods: {
+      onJfbLoad(options) {
+
+        // jfbRootExec('baiduUserLogin', {
+
+        //   vm: this,//   data: {
+
+        //     account: 'gaoshiyong',//     password: '123456789',//     type: 3,//     ...options
+
+        //   }
+
+        // }).then().catch()
+      },
+      /**
+       * @description 监听事件变化
+       * @param container {object} 业务组件对象自己
+       */
+      init(value) {
+
+        //this.bgcolor = getContainerPropsValue(value, 'content.bgcolor', '#fff');
+
+        //this.height = getContainerPropsValue(value, 'content.height', 10);
+      },
+      onJfbScroll(options) {
+        console.log('event.onJfbScroll', options)
+      },
+      onJfbReachBottom(options) {
+        console.log('event.onJfbReachBottom', options)
+      },
+      onJfbShow(options) {
+        console.log('event.onJfbShow', options)
+      },
+      onJfbHide(options) {
+        console.log('event.onJfbHide', options)
+      },
+      onJfbBack(options) {
+        console.log('event.onJfbBack', options)
+      },
+    }
+  }
+
+</script>
+
+<style scoped lang="less">
+  @import "./JfbBaseFooterLess.less";
+
+  .jfb-base-footer {
+    &__body{
+
+    }
+  }
+</style>

package/src/components/{JfbBaseVerificationPay/JfbBaseVerificationPayLess.less → JfbBaseFooter/JfbBaseFooterLess.less}

@@ -12,7 +12,7 @@
 }
 
 //start
-.jfb-base-verification-pay {
+.jfb-base-footer {
   border: 1px dashed rgba(0, 0, 0, 0);
   box-sizing: border-box;
 

package/src/components/{JfbBaseVerificationBefore/JfbBaseVerificationBeforeMixin.js → JfbBaseFooter/JfbBaseFooterMixin.js}

@@ -1,9 +1,5 @@
 'use strict';
 
-//@AttrImport
-import Attr from "./Attr";
-//@EndAttrImport
-
 import {getContainerPropsValue} from "@/utils/xd.base";
 export default {
   props: {
@@ -92,10 +88,6 @@ export default {
       containerId: null, //容器ID
       //#ifdef H5
       
-      //@AttrData
-      Attr, //对外开发编辑属性
-      //@EndAttrData
-      
       active: false, //是否选择当前状态
       isEditx: true, //当前为Editx模式
       edit: false, //是否开启编辑模式

package/src/components/JfbBaseLogin/JfbBaseLogin.vue

@@ -311,7 +311,8 @@
               verification_code
             },
           }).then(res => {
-            location.href = this.phoneLogin.redirect_url;
+            // location.href = this.phoneLogin.redirect_url;
+            this.toHomeAfterLogin();
           })
         }else if(accountLoginType == "pwd"){
           jfbRootExec("accountLogin", {
@@ -322,11 +323,21 @@
               password: password
             }
           }).then(res => {
-            location.href = this.pwdLogin.redirect_url;
+            // location.href = this.pwdLogin.redirect_url;
+            this.toHomeAfterLogin();
           })
         }
 
       },
+      toHomeAfterLogin(){
+        let {redirect_url} = this.$route.query;
+        if(redirect_url) redirect_url = decodeURIComponent(redirect_url);
+        redirect_url = redirect_url || this.settings.index;
+        this.$xdUniHelper.redirectTo({
+          url: redirect_url
+        })
+      },
+      
       //暂不登录， 去逛逛
       toNotLoginHome(){
         //location.href = not_login_home_url;

package/src/components/JfbBaseVerificationBefore/Api.js

@@ -1,16 +0,0 @@
-'use strict';
-
-module.exports = [
-  {
-    mapFnName: 'getSettleMainInfo',
-    title: '门店核销 - 展示主界面数据',
-    // path: '/store/v1/cash/settle/main-info',
-    path: "/store/v1/cash/user-settle/main-info",
-    isRule: false,
-    params: {
-      shop_id: ['门店id', 'Number', '必选'],
-    },
-    isConsole: true,
-    disabled: true,
-  },
-];