jufubao-base 1.0.42 → 1.0.43

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jufubao-base",
-  "version": "1.0.42",
+  "version": "1.0.43",
   "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-beta60",
+    "gxd-uni-library-editx": "1.0.8",
     "jweixin-module": "^1.6.0",
     "md5": "^2.3.0",
     "path-to-regexp": "^6.2.1",

package/src/components/JfbBaseBack/Attr.js

@@ -0,0 +1,14 @@
+'use strict';
+
+/**
+ * @description 当表单组件中有联动操作时候，使用方法进行返回
+ */
+export default {
+  style: [],
+  content: (data) => {
+    return []
+  },
+  advanced: [
+    
+  ],
+};

package/src/components/JfbBaseBack/JfbBaseBack.vue

@@ -0,0 +1,148 @@
+<template>
+  <view
+    class="jfb-base-back"
+    @click="handleEditxSelect"
+    :class="{ editx : isEditx && active }"
+  >
+    <!--#ifdef H5-->
+    <view
+      class="jfb-base-back__edit"
+      :class="{ editx : isEditx && active }"
+      v-if="isEditx && active"
+    >
+      <view class="jfb-base-back__edit-icon" @click="delEdit">删除</view>
+    </view>
+    <!-- #endif -->
+    <view class="jfb-base-back__body">
+      <view class="jfb-base-back__body-content">
+        <view class="jfb-base-back__body-content-bg" :style="{opacity:opacity}"></view>
+        <view class="jfb-base-back__body-content-icon" @click.stop="onJfbBack" :style="{boxShadow:boxShadow}">
+          <xd-font-icon icon="iconxiangzuo_xian" size="32" color="#666"></xd-font-icon>
+        </view>
+        <view class="jfb-base-back__body-content-text" v-if="title && opacity !== minOpacity" :style="{opacity:opacity}">
+          <view >{{title}}</view>
+        </view>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script>
+  import XdFontIcon from "@/components/XdFontIcon/XdFontIcon";
+  import JfbBaseBackMixin from "./JfbBaseBackMixin";
+  import componentsMixins from "@/mixins/componentsMixins";
+  import extsMixins from "@/mixins/extsMixins";
+  export default {
+    name: "JfbBaseBack",
+    components: {
+      XdFontIcon
+    },
+    mixins: [
+      componentsMixins, extsMixins, JfbBaseBackMixin
+    ],
+    data() {
+      return {
+        opacity: 1,
+        height: 90,
+        minOpacity: 0,
+        shadow: 0,
+        title: '',
+      }
+    },
+    computed:{
+      boxShadow(){
+        return `0 0 ${this.shadow * 20}rpx rgba(0,0,0,.4)`
+      }
+    },
+    watch: {
+      container(value) {
+        this.init(value)
+      }
+    },
+    created() {
+      this.$xdRoot.$on('setTitle', (title)=>{
+        this.title = title;
+      });
+      this.init(this.container);
+    },
+    methods: {
+      
+      /**
+       * @description 监听事件变化
+       * @param container {object} 业务组件对象自己
+       */
+      init(container) {
+        //this.bgcolor = getContainerPropsValue(container, 'content.bgcolor', '#fff');
+        //this.height = getContainerPropsValue(container, 'content.height', 10);
+      },
+      onJfbScroll({e,options}) {
+        let opacity = (this.height - (e.scrollTop > this.height ? this.height : e.scrollTop)) / 100;
+        this.shadow = (e.scrollTop > this.height ? this.height : e.scrollTop)/100;
+        this.opacity = opacity < this.minOpacity ? this.minOpacity : opacity;
+      },
+      
+      onJfbBack() {
+        this.$xdUniHelper.navigateBack();
+      }
+    }
+  }
+
+</script>
+
+<style scoped lang="less">
+  @import "./JfbBaseBackLess.less";
+
+  .jfb-base-back {
+    &__body{
+      &-content {
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+        align-content: center;
+        height: unit(90, rpx);
+        padding: 0 unit(10, rpx);
+        position: relative;
+        
+        &-icon {
+          width: 1em;
+          height: 1em;
+          font-size: unit(54, rpx);
+          border-radius: 50%;
+          overflow: hidden;
+          display: flex;
+          justify-content: center;
+          align-content: center;
+          flex-shrink: 0;
+          position: relative;
+          z-index: 2;
+          background: #fff;
+        }
+  
+        &-text {
+          font-size: unit(54, rpx);
+          padding-right: 1em;
+          flex: 1;
+          position: relative;
+          z-index: 2;
+          color: #666;
+          
+          & > view {
+            width: 100%;
+            text-align: center;
+            line-height: unit(90, rpx);
+            font-size: unit(32, rpx);
+          }
+        }
+        
+        &-bg {
+          background: #fff;
+          position: absolute;
+          top: 0;
+          right:0;
+          bottom: 0;
+          left: 0;
+        }
+      }
+    }
+  }
+</style>

package/src/components/JfbBaseBack/JfbBaseBackLess.less

@@ -0,0 +1,80 @@
+/**
+* @desc 获取绝对路径完整地址
+* @param @path
+**/
+//例如：https://image.jufubao.cn/20220501010108/image/bg/default_gonghui_bg.png
+@basePath: 'business/';
+@doMain: '//sandbox-img.jufubao.cn/';
+
+.getBusinessImageUrl(@path, @size: 'size8') {
+  @url: "@{doMain}@{basePath}@{path}?x-oss-process=style/@{size}";
+  background-image: url(@url);
+}
+
+//start
+.jfb-base-back {
+  border: 1px dashed rgba(0, 0, 0, 0);
+  box-sizing: border-box;
+  min-height: unit(100, rpx);
+
+  &__body{
+      position: relative;
+      overflow: hidden;
+      z-index: 2
+  }
+
+  &.editx {
+    position: relative;
+    border: 1px dashed blue;
+    box-sizing: border-box;
+    z-index: 3
+
+  }
+
+  &:hover {
+    border: 1px dashed blue;
+  }
+
+  &.noBorder {
+    border-color: rgba(0,0,0,0);
+    border-width: 0;
+  }
+
+
+  &__edit {
+    cursor: pointer;
+    position: absolute;
+    right: unit(0, rpx);
+    top: unit(-52, rpx);
+    height: unit(50, rpx);
+    line-height: unit(50, rpx);
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    background: rgba(0, 0, 0, .6);
+    border-radius: unit(10, rpx);
+    box-shadow: 0 0 10px rbga(0, 0, 0, 0.3);
+    color: #fff;
+    font-size: unit(22, rpx);
+
+    &-icon{
+      padding: 0 unit(20, rpx);
+    }
+
+    &.editx {
+      box-sizing: border-box;
+
+    }
+  }
+}
+//end
+
+
+/**notPreview**/
+.jfb-base-back {
+  &:before {
+    content: " ";
+    display: table;
+  }
+}
+/**endNotPreview**/

package/src/components/JfbBaseBack/JfbBaseBackMixin.js

@@ -0,0 +1,30 @@
+'use strict';
+
+
+//@AttrImport
+import Attr from "./Attr";
+//@EndAttrImport
+
+
+export default {
+  data() {
+    return {
+      //#ifdef H5
+      
+      //@AttrData
+      Attr:{}, //对外开发编辑属性
+      //@EndAttrData
+      
+      // #endif
+      cssRoot: 'jfb-base-back'
+    }
+  },
+  created() {
+    
+    //@AttrDataCreated
+    this.Attr = this.$xdUniHelper.customClone(Attr);
+    //@EndAttrDataCreated
+    
+
+  },
+}

package/src/components/JfbBaseCard/JfbBaseCard.vue

@@ -508,16 +508,10 @@ export default {
             };
           });
           this.cardList = res.list.filter((item) => {
-            if (item["is_valid"] !== "N") {
-              return true;
-            }
-            return false;
+            return item["is_valid"] === "Y";
           });
           this.disableList = res.list.filter((item) => {
-            if (item["is_valid"] === "N") {
-              return true;
-            }
-            return false;
+            return item["is_valid"] === "N";
           });
           this.changeList = this.cardList.filter((item) => {
             return item["is_exchange"] === "Y";

package/src/components/JfbBaseCardDisabled/JfbBaseCardDisabled.vue

@@ -130,10 +130,7 @@ export default {
             };
           });
           this.disableList = res.list.filter((item) => {
-            if (item["is_valid"] === "N" || item["card_point"] === 0) {
-              return true;
-            }
-            return false;
+            return item["is_valid"] === "N";
           });
           this.$xdHideLoading();
         })

package/src/components/JfbBaseEntry/JfbBaseEntry.vue

@@ -49,7 +49,6 @@
     data() {
       return {
         entryList: [],
-        //todo
         bgcolor: "",
         rowNum: 1,
         paddingInput: 20,
@@ -103,11 +102,22 @@
             item['image_url'] = getServiceUrl(item.image_url);
             item['image_url2'] = item.image_url2 ? getServiceUrl(item.image_url2) : "";
             item['image_url3'] = item.image_url3 ? getServiceUrl(item.image_url3) : "";
+            let nsp = Base64.encodeURI(JSON.stringify({business_code: item['business_code']}));
+            
+            //外站配置地址
+            if(item.redirect_type === 'URL') {
+              if(item['redirect_data']['path'].indexOf('?') === -1) {
+                item['redirect_data']['path'] = `${item['redirect_data']['path']}?x-common=${nsp}&vs=${new Date().getTime()}`
+              }
+              else item['redirect_data']['path'] = `${item['redirect_data']['path']}&x-common=${nsp}&vs=${new Date().getTime()}`;
+              return item;
+            }
+            
             let jumpUrl = item.path;
             //#ifdef H5
             jumpUrl = `//${host}/${dir}${path}`;
             //#endif
-            let nsp = Base64.encodeURI(JSON.stringify({business_code: item['business_code']}));
+            
             if(item['redirect_data']['fixed_business_code'] === '') {
               item['redirect_data']['path'] = `${jumpUrl}?x-common=${nsp}&vs=${new Date().getTime()}`
             }
@@ -118,25 +128,20 @@
           });
           if(res.list.length === 1) this.toLink(this.entryList[0]);
           if(res.list.length === 0) {
-            uni.showToast({
-              title: '当前票券暂无支持服务',
-              icon: 'none',
-              duration: 2000
-            });
+            this.$xdAlert({content: '当前票券暂无支持服务'})
           }
-          
         })
       },
       toLink(item){
         let path = "";
         try{
           path = item.redirect_data.path || item.redirect_data.app.path;
+          this.$xdUniHelper.navigateTo({
+            url: path
+          })
         }catch{
-          throw new Error("路径解析错误")
+          this.$xdAlert({content: '链接地址配置错误'})
         }
-        this.$xdUniHelper.navigateTo({
-          url: path
-        })
       },
       
       onJfbBack(options) {

package/src/components/JfbBaseMergeUserCard/Api.js

@@ -0,0 +1,32 @@
+'use strict';
+
+/**
+ * @description 合并手机号下绑定卡券到自己明显
+ * @type {*[]}
+ */
+module.exports = [
+  {
+    mapFnName: 'sendBaseMergeUserCardMsg',
+    title: '发送验证码',
+    path: '/common/v1/valid_code/sms/send',
+    isRule: false,
+    data: {
+      phone_number: ['手机号', 'String', '必选'],
+      biz_name: ['业务名称', 'String', '必选']
+    },
+    isConsole: true,
+    disabled: true,
+  },
+  {
+    mapFnName: 'mergeUserCardToMy',
+    title: "找回卡券",
+    path: "/card/v1/card-bind/find-back-card-by-phone",
+    isRule: false,
+    data: {
+      phone_number: ['手机号', 'String', '必选' ],
+      verification_code: ['手机验证码', 'String', '必选'],
+    },
+    isConsole: true,
+    disable: true,
+  },
+];

package/src/components/JfbBaseMergeUserCard/Attr.js

@@ -0,0 +1,25 @@
+'use strict';
+
+/**
+ * @description 当表单组件中有联动操作时候，使用方法进行返回
+ */
+export default {
+  style: [],
+  content: (data) => {
+    return [
+      {
+        label: '找回成功跳转:', //label
+        ele: 'xd-select-pages-path', //package 名称
+        valueKey: 'callback_url', //form[valueKey]
+        value: data['callback_url'] || {},
+        setting: {
+          router: XdBus.getParentApi('getPagesTree')
+        },
+        inline: false,
+      },
+    ].filter(i=>i)
+  },
+  advanced: [
+
+  ],
+};