jufubao-base 1.0.119-beta7 → 1.0.119-beta9

package/package.json

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

package/src/components/JfbBaseConPhone/JfbBaseConPhone.vue

@@ -26,6 +26,7 @@
         <view v-if="showCode" class="jfb-base-con-phone__body-wrap-input">
           <view>
             <input
+              @input="filterSpaces"
               v-model="phoneNumber"
               placeholder="请输入手机号"
               type="text"
@@ -204,6 +205,14 @@ export default {
         : "phone";
       await this.getList();
     },
+    filterSpaces(event) {
+      // 使用replace方法去除用户输入的空格
+      let value = event.target.value.replace(/\s+/g, '');
+      // 更新数据以移除空格
+      this.phoneNumber = value;
+      // 将处理后的值反映到视图
+      event.target.value = value;
+    },
     getList() {
       jfbRootExec("getCouponPhoneList", {
         vm: this,

package/src/components/JfbBaseSaasBlessDetail/Api.js

@@ -25,10 +25,23 @@ module.exports = [
   {
     mapFnName: 'doSignBless',
     title: '祝福 - 签收',
-    path: '/saas/v1/bless/sign/:bless_id',
+    path: '/saas/v1/bless/confirm-sign/:bless_id',
     isRule: false,
     data: {
       bless_id: ['bless_id', 'Number', '必选'],
+      sign_image_url: ['签名图片url', 'String', '必选']
+    },
+    isConsole: true,
+    disabled: true,
+  },
+  {
+    mapFnName: "noSignBless",
+    title: "祝福 - 签收 - 免签名",
+    path: "/saas/v1/bless/sign/:bless_id",
+    isRule: false,
+    data: {
+      bless_id: ['bless_id', 'Number', '必选'],
+      sign_image_url: ['签名图片url', 'String', '必选']
     },
     isConsole: true,
     disabled: true,

package/src/components/JfbBaseSaasBlessDetail/JfbBaseSaasBlessDetail.vue

@@ -134,7 +134,18 @@
       },
 
       showSign(){
-        this.dialogShow = true;
+        if(this.blessData.signature_method === 'N'){
+          jfbRootExec("noSignBless", {
+            vm: this,
+            data: {
+              bless_id: this.bless_id,
+            }
+          }).then(res => {
+            this.dialogSuccess = true;
+          })
+        }else{
+          this.dialogShow = true;
+        }
       },
       clearSign(){
         this.$refs.signatureRef.clear()

package/src/components/JfbBaseSaasBlessDetail/Mock.js

@@ -1,5 +1,27 @@
 'use strict';
 
 module.exports = {
-  aaaa: {}
+  getBlessDetail: {
+    bless_id: "1",
+    bless_type_name: "聚福宝节日祝福券",
+    bless_name: "",
+    bless_detail_config: `{
+      "material_nickname": "亲爱的张珊珊:",
+      "material_content": "同事好比亲兄弟，一个单位共努力，加班加点在一起，齐心协力拼业绩，新年春节悄然到身旁，祝福送你好兄弟，合家欢乐福相伴，年年有余好运随，新年春节快乐哟！",
+      "material_end": "聚福宝",
+      "material_image": {
+        "path": "https://img.js.design/assets/img/63ef1aad9d2376d02eb759e6.png"
+      },
+      "material_margin": {
+        "top": 480,
+        "left": 100,
+        "right": 100,
+        "bottom": 0
+      },
+      "material_color": "#333333"
+    }`,
+    release_time: "",
+    bless_card_number: "1",
+    receive_status: "N"
+  }
 }

package/src/components/JfbBaseSaasBlessDialog/JfbBaseSaasBlessDialog.vue

@@ -186,7 +186,7 @@
         if(action === '@showBaseBlessDialog'){
           this.getList();
         }
-        console.log('event.onJfbReachBottom', options)
+        console.log('event.onJfbReachBottom', action, data)
       },
     }
   }

package/src/components/JfbBaseSaasBlessDialog/Mock.js

@@ -1,5 +1,26 @@
 'use strict';
 
 module.exports = {
-  aaaa: {}
+  getBlessList: {
+    list: [
+      {
+        bless_id: "1",
+        bless_type_name: "聚福宝节日祝福券",
+        bless_name: "节日祝福",
+        bless_card_number: "1",
+        bless_cover_config: `{
+          "material_nickname": "亲爱的张珊珊:",
+          "material_content": "您收到了一份为您定制的专属祝福，快去查看并使用吧！",
+          "material_end": "聚福宝",
+          "material_image": {
+            "path": "https://sandbox-img.jufubao.cn/uploads/20240318/a2d8586cf735c2154e1cac8d5e597741.png?ver=1710753818636"
+          }
+        }`,
+        release_time: "",
+        receive_status: "",
+      }
+    ],
+    total_size: 2,
+    next_page_token: "",
+  }
 }

package/src/components/JfbBaseSaasBlessReceive/Mock.js

@@ -1,5 +1,40 @@
 'use strict';
 
 module.exports = {
-  aaaa: {}
+  getBlessAll: {
+    list: [
+      {
+        bless_id: "1",
+        bless_cover_config: `{
+          "material_nickname": "亲爱的张珊珊:",
+          "material_content": "您收到了一份为您定制的专属祝福，快去查看并使用吧！",
+          "material_end": "聚福宝",
+          "material_image": {
+            "path": "https://sandbox-img.jufubao.cn/uploads/20240318/a2d8586cf735c2154e1cac8d5e597741.png?ver=1710753818636",
+            "url": "https://sandbox-img.jufubao.cn/uploads/20240318/a2d8586cf735c2154e1cac8d5e597741.png?ver=1710753818636",
+          }
+        }`,
+        bless_type_name: "聚福宝节日祝福券",
+        bless_name: "节日祝福",
+        bless_card_number: "1",
+        release_time: "312456786",
+      },
+      {
+        bless_id: "2",
+        bless_cover_config: `{
+          "material_nickname": "亲爱的张珊珊:",
+          "material_content": "您收到了一份为您定制的专属祝福，快去查看并使用吧！",
+          "material_end": "聚福宝",
+          "material_image": {
+            "path": "https://sandbox-img.jufubao.cn/uploads/20240318/a2d8586cf735c2154e1cac8d5e597741.png?ver=1710753818636",
+            "url": "https://sandbox-img.jufubao.cn/uploads/20240318/a2d8586cf735c2154e1cac8d5e597741.png?ver=1710753818636",
+          }
+        }`,
+        bless_type_name: "聚福宝节日祝福券",
+        bless_name: "节日祝福",
+        bless_card_number: "1",
+        release_time: "312456786",
+      }
+    ]
+  }
 }

package/src/components/JfbBaseSaasHome/JfbBaseSaasHome.vue

@@ -41,7 +41,7 @@
         <view class="notice" v-if="comp.container_key === 'notice' && noticeList.length" :key="i">
           <!-- 公告：薄如蝉翼的金华火腿，每一口都是时间的味道 -->
           <swiper vertical style="height: 40rpx;" autoplay>
-            <swiper-item v-for="(item,i) in noticeList" :key="i">
+            <swiper-item v-for="(item,i) in noticeList" :key="i" @click="toNewsDetail(item.id, 'notice')">
               <view style="height: 40rpx;line-height: 40rpx;">{{ item.title }}</view>
             </swiper-item>
           </swiper>
@@ -58,7 +58,7 @@
               </view>
             </view>
             <view class="group_body">
-              <view class="news_item" v-for="(news, i) in newsList" :key="i" @click="toNewsDetail(news.id)">
+              <view class="news_item" v-for="(news, i) in newsList" :key="i" @click="toNewsDetail(news.id, 'news')">
                 <view class="news_cont">
                   <view class="news_tit">{{ news.title }}</view>
                   <view class="news_date">{{ news.created_time }}</view>
@@ -81,7 +81,7 @@
               </view>
             </view>
             <view class="group_body">
-              <view class="news_item" v-for="(news, i) in studyList" :key="i" @click="toNewsDetail(news.id)">
+              <view class="news_item" v-for="(news, i) in studyList" :key="i" @click="toNewsDetail(news.id, 'study')">
                 <view class="news_cont">
                   <view class="news_tit">{{ news.title }}</view>
                   <view class="news_date">{{ news.created_time }}</view>
@@ -218,9 +218,9 @@
           url: `${this.newsListUrl}?position_id=${position_id}`,
         });
       },
-      toNewsDetail(id){
+      toNewsDetail(id, position_id){
         this.$xdUniHelper.navigateTo({
-          url: `${this.newsDetailUrl}?id=${id}`,
+          url: `${this.newsDetailUrl}?id=${id}&position_id=${position_id}`,
         });
       },
       toBannerLink(item){

package/src/components/JfbBaseSaasHome/Mock.js

@@ -2,6 +2,31 @@
 
 module.exports = {
   getHomeConfig: {
-    index_config: ""
+    index_config: `[
+      {\"status\": \"Y\", \"container_key\": \"banner\"},
+      {\"config\": {
+        \"items\": [
+          {\"menu_id\": 4, \"site_id\": \"\", \"menu_icon\": \"https://img2.jufubao.cn/uploads/20231212/d7e653434aefc786ccb8a5032da0ab48.png?x-oss-process=style/size2\", \"menu_path\": \"/1/2/3\", \"menu_type\": \"PU\", \"menu_title\": \"电影\", \"partner_id\": 0, \"is_selected\": 0, \"menu_status\": \"Y\"},
+          {\"menu_id\": 2, \"site_id\": \"\", \"menu_icon\": \"https://img4.jufubao.cn/uploads/20231212/32922773dafc3a72d508445abf4d92b4.png?x-oss-process=style/size2\", \"menu_path\": \"/1/2/3\", \"menu_type\": \"PU\", \"menu_title\": \"蛋糕\", \"partner_id\": 0, \"is_selected\": 0, \"menu_status\": \"Y\"},
+          {\"menu_id\": 1, \"site_id\": \"\", \"menu_icon\": \"https://img4.jufubao.cn/uploads/20231212/f05cce33b30826e07c85f929ab485513.png?x-oss-process=style/size2\", \"menu_path\": \"/1/2/3\", \"menu_type\": \"PU\", \"menu_title\": \"商城\", \"partner_id\": 0, \"is_selected\": 0, \"menu_status\": \"Y\"},
+          {\"menu_id\": 3, \"site_id\": \"\", \"menu_icon\": \"https://img4.jufubao.cn/uploads/20231212/f0899132291cb61cd9c202a111f8a06d.png?x-oss-process=style/size2\", \"menu_path\": \"/1/2/3\", \"menu_type\": \"PU\", \"menu_title\": \"餐饮\", \"partner_id\": 0, \"is_selected\": 0, \"menu_status\": \"Y\"}
+        ]},\"status\": \"Y\", \"container_key\": \"menus\"
+      },
+      {\"status\": \"Y\", \"container_key\": \"notice\"},
+      {\"config\": {\"name\": \"新闻资讯2\"}, \"status\": \"Y\", \"container_key\": \"news\"},
+      {\"config\": {\"name\": \"学习资料2\"}, \"status\": \"Y\", \"container_key\": \"study\"},
+      {\"status\": \"Y\", \"container_key\": \"is_pop\"}
+    ]`
+  },
+  getNewsList: {
+    list: [
+      {
+        title: "企业公告的信息，如果没有则不展示该模块直接展示企业新闻",
+        content: "123123",
+        created_time: "1234561235",
+        thumb: "https://sandbox-img.jufubao.cn/uploads/20240318/a2d8586cf735c2154e1cac8d5e597741.png?ver=1710753818636",
+        status: "Y",
+      }
+    ]
   }
 }

package/src/components/JfbBaseSaasNewsDetail/JfbBaseSaasNewsDetail.vue

@@ -41,6 +41,7 @@
     data() {
       return {
         id: "",
+        position_id: "",
         info: {},
         //todo
       }
@@ -58,6 +59,7 @@
     methods: {
       onJfbLoad(options) {
         this.id = options.id;
+        this.position_id = options.position_id;
         this.p_getNewsDetail();
       },
       /**
@@ -76,7 +78,7 @@
           vm: this,
           data: {
             id: this.id,
-            position_id: "news",
+            position_id: this.position_id,
             scene: "news"
           }
         }).then(res => {
@@ -137,6 +139,9 @@
           font-size: 24rpx;
           font-weight: 400;
           margin-top: 56rpx;
+          /deep/ img{
+            max-width: 100% !important;
+          }
         }
       }
     }

package/src/components/JfbBaseSaasNewsDetail/Mock.js

@@ -1,5 +1,9 @@
 'use strict';
 
 module.exports = {
-  aaaa: {}
+  getNewsDetail: {
+    title: "企业新闻标题 如果超长的标题那么就折行处理折行处理的样式就像是这样子的",
+    content: "在难以生存的恶劣环境下，三体人决定移民其他星球，目的地就是人类所在的地球。整个计划耗时数百年之久，并且路途中充满不确定性，为什么三体人不直接摧毁一颗或两颗恒星，使剩余的恒星保持规律的运动，拥有稳定恒纪元，而是一定要大费周章的来到地球呢？要知道在三体人遭受黑暗森林打击之前，就已经拥有了高度发达的科技，能将宇宙飞船加速到近乎光速。能够摧毁恒星的光粒本质上也只是一个以光速飞行的物体，完全可以用宇宙飞船来充当光粒，摧毁恒星。那么三体人是真的没有想到吗？事实当然绝非如此，摧毁恒星获得恒纪元远非我们想的这么简单。首先用近乎光速的宇宙飞船去摧毁恒星本身就不太现实。星环号的飞船等级和三体人是一样的，它到达286光年外的DX3906恒星花费了52个小时。这并不是真正的光速飞行，假如以100%的光速前往DX3906，时间会在光速中停止，对飞船上的人来说是在瞬间就达到了目的地。",
+    created_time: "321654789",
+  }
 }

package/src/components/JfbBaseSaasNewsList/JfbBaseSaasNewsList.vue

@@ -49,6 +49,7 @@
     data() {
       return {
         newsList: [],
+        position_id: "",
 
         //面板
         newsDetailUrl: "",  //新闻详情url
@@ -67,6 +68,7 @@
     methods: {
       onJfbLoad(options) {
         let position_id = options.position_id;
+        this.position_id = position_id;
         this.p_getNewsList(position_id)
       },
       /**
@@ -74,12 +76,12 @@
        * @param container {object} 业务组件对象自己
        */
       init(container) {
-
+        this.newsDetailUrl = getContainerPropsValue(container, 'content.newsDetailUrl', {value: ""}).value;
         //this.bgcolor = getContainerPropsValue(container, 'content.bgcolor', '#fff');
       },
       toDetail(item){
         this.$xdUniHelper.navigateTo({
-          url: `${this.newsDetailUrl}?id=${item.id}`,
+          url: `${this.newsDetailUrl}?id=${item.id}&position_id=${this.position_id}`,
         });
       },
       p_getNewsList(position_id){

package/src/components/JfbBaseSaasNewsList/Mock.js

@@ -1,5 +1,24 @@
 'use strict';
 
 module.exports = {
-  aaaa: {}
+  getNewsList: {
+    list: [
+      {
+        id: "1",
+        title: "企业公告的信息，如果没有则不展示该模块直接展示企业新闻",
+        content: "123123",
+        created_time: "1234561235",
+        thumb: "https://sandbox-img.jufubao.cn/uploads/20240318/a2d8586cf735c2154e1cac8d5e597741.png?ver=1710753818636",
+        status: "Y",
+      },
+      {
+        id: "2",
+        title: "企业新闻标题如果很长就折行处理 如果再长就省略号处理...",
+        content: "123123",
+        created_time: "1234561235",
+        thumb: "https://sandbox-img.jufubao.cn/uploads/20240318/a2d8586cf735c2154e1cac8d5e597741.png?ver=1710753818636",
+        status: "Y",
+      }
+    ]
+  }
 }

package/src/components/JfbBaseConFlashHome/Api.js

@@ -1,60 +0,0 @@
-'use strict';
-
-/**
- * @description API模型
- * 建议：Ffff=>模块  Xxxx=>自定义名字
- * 获取单记录(getByIdFfffXxxx)
- * 获取列表记录(getByListFfffXxxx)
- * 添加列表记录(addFfffXxxxx)
- * 删除列表记录(removeFfffXxxxx|deleteFfffXxxx)
- * 更新列表记录(updateFfffXxxxx)
- * @type {*[]}
- */
-module.exports = [
-  {
-    mapFnName: 'getByIdFilmSquate', //自定义方法名字（必选）
-    title: '获取电影广场列表',
-    path: '/api/account/film/list-film-square',
-    isRule: false,
-    params: {
-      last_key: ['当前页', 'Number', '必选'],
-      page_size: ['每页数量', 'Number', '必选'],
-    },
-    isConsole: true,
-    disabled: true,
-  },
-  {
-    mapFnName: 'updateFilmPaiqiDate', //自定义方法名字（必选）
-    title: '更新排期',
-    path: '/api/account/film/paiqi-date',
-    isRule: false,
-    params: {
-      film_id: ['电影id', 'Number', '必选'],
-      cinema_id: ['影院id', 'Number', '必选'],
-    },
-    isConsole: true,
-    disabled: true,
-  },
-  {
-    mapFnName: 'removeFilmAddress', //自定义方法名字（必选）
-    title: '删除我的配送地址',
-    path: '/api/account/film/paiqi-date',
-    isRule: false,
-    params: {
-      film_id: ['电影id', 'Number', '必选'],
-    },
-    isConsole: true,
-    disabled: true,
-  },
-  {
-    mapFnName: 'addFilmcart',  //自定义方法名字（必选）
-    title: '添加购物车',
-    path: '/api/account/film/paiqi-date',
-    isRule: false,
-    params: {
-      film_id: ['电影id', 'Number', '必选'],
-    },
-    isConsole: true,
-    disabled: true,
-  },
-];

package/src/components/JfbBaseConFlashHome/Attr.js

@@ -1,129 +0,0 @@
-'use strict';
-
-/**
- * @description 当表单组件中有联动操作时候，使用方法进行返回
- */
-export default {
-  style: [],
-  content: (data) => {
-    return [
-      {
-        label: "选择业务线",
-        ele: "xd-choose-namespace",
-        valueKey: "xnamespace",
-        value: data.xnamespace || null,
-        handleCustom: (cb) => {
-          XdBus.getParentApi('getOptionsNamespaces')()
-            .then(res => {
-              cb(res.list)
-            })
-            .catch();
-        }
-      },
-      {
-        label: '样式:',
-        ele: 'xd-radio',
-        valueKey: 'position',
-        value: data['position'] || 1,
-        rules: [
-          {required: true, message: '请选择广告位显示方式', trigger: ['blur', 'change']}
-        ],
-        list: [
-          {"label": "商品靠左", "value": 1},
-          {"label": "商品靠右", "value": 2},
-        ]
-      },
-      {
-        label: '是否显示价格:',
-        ele: 'xd-radio',
-        valueKey: 'isPrice',
-        value: data['isPrice'] || 'Y',
-        placeholder: '请选择是否显示价格',
-        multiple: false,
-        className: 'input80',
-        list: [
-          {label: '是', value: 'Y'},
-          {label: '否', value: 'N'},
-        ]
-      },
-      {
-        label: '是否展示原价:',
-        ele: 'xd-radio',
-        valueKey: 'isShowDiscount',
-        value: data.isShowDiscount || "Y",
-        rules: [
-          {required: true, message: '请选择', trigger: ['blur', 'change']}
-        ],
-        list: [
-          {"label": "显示", "value": "Y"},
-          {"label": "隐藏", "value": "N"},
-        ]
-      },
-      data.isShowDiscount==='Y'&&{
-        label: '价差大于多少展示原价:',
-        ele: 'el-input',
-        type: 'number',
-        valueKey: 'differ',
-        value: data['differ'] || '',
-        placeholder: '价差',
-        className: 'input80',
-      },
-      {
-        label: '展示商品总数:',
-        ele: 'el-input',
-        type: 'number',
-        valueKey: 'number',
-        value: data.number || '',
-        placeholder: '请输入',
-        className: 'input80',
-      },
-      {
-        label: '商品展示方式:',
-        ele: 'xd-radio',
-        valueKey: 'productShowType',
-        value: data.productShowType,
-        rules: [
-          {required: true, message: '请选择', trigger: ['blur', 'change']}
-        ],
-        list: [
-          {"label": "固定展示", "value": "regular"},
-          {"label": "向左轮播", "value": "left"},
-          {"label": "向上轮播", "value": "top"},
-        ]
-      },
-      {
-        label: '限时秒杀背景图:', //label
-        ele: 'xd-upload', //package 名称
-        valueKey: 'secondBackground', //form[valueKey]
-        value: data.secondBackground || null, //v-model
-        defaultValue: data.secondBackground || null, //默认图片对象
-        slot: true, //按钮是否使用slot
-        tipsformet: '上传文件格式：@imageType@，不超过@size@MB.，建议尺寸：800*800像素',
-        type: ['jpg', 'png', 'jpeg'],
-        styleType: 'one', //其值：one=>单文件上传 auth=>证件正反面上传 list=>多文件上传
-        uploadType: 'aliyun', //''=>API服务上传  qiniu=>七牛云OSS上传  aliyun=> 阿里云OSS上传
-        size: 5, //5M
-        action: 'aliyun',
-      },
-      {
-        label: '场次文字颜色:',
-        ele: 'xd-color',
-        valueKey: 'textColor',
-        value: data.textColor,
-        placeholder: '请选择文字颜色',
-        classNmae: 'input80',
-      },
-      {
-        label: '场次文字背景颜色:',
-        ele: 'xd-color',
-        valueKey: 'textBgColor',
-        value: data.textBgColor,
-        placeholder: '请选择场次文字背景颜色',
-        classNmae: 'input80',
-      },
-    ].filter(i=>i)
-  },
-  advanced: [
-    
-  ],
-};