jufubao-base 1.0.116-beta3 → 1.0.116-beta4

package/package.json

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

package/src/components/JfbBaseConDialog/XdCouCardBind.vue

@@ -20,7 +20,8 @@
               type="primary"
               :disabled="item.remain_card_count == 0"
               :style="{
-                backgroundImage: item.btnImage
+                backgroundImage: item.btnImage,
+                backgroundSize: '100% 100%',
               }"
               @click="getCoupont(item)"
             >{{item.btn_txt}}</xd-button>

package/src/components/JfbBaseConList/JfbBaseConList.vue

@@ -211,7 +211,7 @@ export default {
                       backgroundImage: `url(${getServiceUrl(
                         item.can_take_num === "Y" ? res.app_coupon_button_see_url : res.app_coupon_button_bg_url
                       )})`,
-                      backgroundSize: "100%",
+                      backgroundSize: "100% 100%",
                       backgroundRepeat: "no-repeat",
                       backgroundColor: '',
                       margin: "0",

package/src/components/JfbBaseConPhone/Api.js

@@ -0,0 +1,60 @@
+'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/JfbBaseConPhone/JfbBaseConPhone.vue

@@ -0,0 +1,110 @@
+<template>
+  <view
+    class="jfb-base-con-phone"
+    @click="handleEditxSelect"
+    :class="{ editx : isEditx && active }"
+  >
+    <!--#ifdef H5-->
+    <view
+      class="jfb-base-con-phone__edit"
+      :class="{ editx : isEditx && active }"
+      v-if="isEditx && active"
+    >
+      <view class="jfb-base-con-phone__edit-icon" @click="delEdit">删除</view>
+    </view>
+    <!-- #endif -->
+    <view class="jfb-base-con-phone__body">
+      <view>测试插件( {{containerId}} )</view>
+    </view>
+  </view>
+</template>
+
+<script>
+  import XdFontIcon from "@/components/XdFontIcon/XdFontIcon";
+  import { jfbRootExec } from "@/utils/xd.event";
+  import JfbBaseConPhoneMixin from "./JfbBaseConPhoneMixin";
+  import { getContainerPropsValue } from "@/utils/xd.base";
+  import componentsMixins from "@/mixins/componentsMixins";
+  import extsMixins from "@/mixins/extsMixins";
+  export default {
+    name: "JfbBaseConPhone",
+    components: {
+      XdFontIcon
+    },
+    mixins: [
+      componentsMixins, extsMixins, JfbBaseConPhoneMixin
+    ],
+    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(container) {
+
+        //this.bgcolor = getContainerPropsValue(container, 'content.bgcolor', '#fff');
+
+        //this.height = getContainerPropsValue(container, '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)
+      },
+      onJfbUpdate(...data) {
+        console.log('event.onJfbUpdate', data)
+      },
+      onJfbCustomEvent(options) {
+        console.log('event.onJfbReachBottom', options)
+      },
+    }
+  }
+
+</script>
+
+<style scoped lang="less">
+  @import "./JfbBaseConPhoneLess.less";
+
+  .jfb-base-con-phone {
+    &__body{
+
+    }
+  }
+</style>

package/src/components/JfbBaseConPhone/JfbBaseConPhoneLess.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-con-phone {
+  border: 1px dashed rgba(0, 0, 0, 0);
+  box-sizing: border-box;
+  min-height: unit(50, 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-con-phone {
+  &:before {
+    content: " ";
+    display: table;
+  }
+}
+/**endNotPreview**/

package/src/components/JfbBaseConPhone/JfbBaseConPhoneMixin.js

@@ -0,0 +1,18 @@
+'use strict';
+
+
+
+export default {
+  data() {
+    return {
+      //#ifdef H5
+      
+      // #endif
+      cssRoot: 'jfb-base-con-phone'
+    }
+  },
+  created() {
+    
+
+  },
+}

package/src/components/JfbBaseConPhone/Mock.js

@@ -0,0 +1,5 @@
+'use strict';
+
+module.exports = {
+  aaaa: {}
+}

package/src/components/JfbBasePhoneCollect/JfbBasePhoneCollect.vue

@@ -93,7 +93,6 @@
 <script>
 import XdFontIcon from "@/components/XdFontIcon/XdFontIcon";
 import { jfbRootExec } from "@/utils/xd.event";
-import JfbBasePhoneCollectMixin from "./JfbBasePhoneCollectMixin";
 import componentsMixins from "@/mixins/componentsMixins";
 import extsMixins from "@/mixins/extsMixins";
 import { getContainerPropsValue } from "@/utils/xd.base";
@@ -102,6 +101,7 @@ import XdForm from "@/components/XdForm/XdForm";
 import XdFormInput from "@/components/XdFormInput/XdFormInput";
 import XdButton from "@/components/XdButton/XdButton";
 import XdFormCheckbox from "@/components/XdFormCheckbox/XdFormCheckbox";
+import JfbBasePhoneCollectMixin from "./JfbBasePhoneCollectMixin";
 
 export default {
   name: "JfbBasePhoneCollect",

package/src/components/JfbBaseSaasBlessDetail/Api.js

@@ -12,49 +12,48 @@
  */
 module.exports = [
   {
-    mapFnName: 'getByIdFilmSquate', //自定义方法名字（必选）
-    title: '获取电影广场列表',
-    path: '/api/account/film/list-film-square',
+    mapFnName: 'getBlessDetail',
+    title: '祝福 - 详情',
+    path: '/saas/v1/bless/item/:bless_id',
     isRule: false,
     params: {
-      last_key: ['当前页', 'Number', '必选'],
-      page_size: ['每页数量', 'Number', '必选'],
+      bless_id: ['bless_id', 'Number', '必选'],
     },
     isConsole: true,
     disabled: true,
   },
   {
-    mapFnName: 'updateFilmPaiqiDate', //自定义方法名字（必选）
-    title: '更新排期',
-    path: '/api/account/film/paiqi-date',
+    mapFnName: 'doSignBless',
+    title: '祝福 - 签收',
+    path: '/saas/v1/bless/sign/:bless_id',
     isRule: false,
-    params: {
-      film_id: ['电影id', 'Number', '必选'],
-      cinema_id: ['影院id', 'Number', '必选'],
+    data: {
+      bless_id: ['bless_id', 'Number', '必选'],
     },
     isConsole: true,
     disabled: true,
   },
   {
-    mapFnName: 'removeFilmAddress', //自定义方法名字（必选）
-    title: '删除我的配送地址',
-    path: '/api/account/film/paiqi-date',
+    mapFnName: "getOssSign",
+    title: "获取上传参数",
+    path: "/common-user/v1/h5-oss/sign",
     isRule: false,
-    params: {
-      film_id: ['电影id', 'Number', '必选'],
+    data: {
+
     },
     isConsole: true,
     disabled: true,
   },
   {
-    mapFnName: 'addFilmcart',  //自定义方法名字（必选）
-    title: '添加购物车',
-    path: '/api/account/film/paiqi-date',
+    mapFnName: "doOssUpload",
+    title: "开启oss上传",
+    path: "/common-user/v1/h5-oss/upload",
     isRule: false,
-    params: {
-      film_id: ['电影id', 'Number', '必选'],
+    data: {
+      file_name: ['file_name', 'String', true],
+      file: ['file', 'file', true]
     },
     isConsole: true,
     disabled: true,
-  },
+  }
 ];

package/src/components/JfbBaseSaasBlessDetail/Attr.js

@@ -8,99 +8,17 @@ export default {
   content: (data) => {
     return [
       {
-        label: '背景颜色:', //label
-        ele: 'xd-color', //package 名称
-        valueKey: 'bgcolor', //form[valueKey]
-        value: data.bgcolor || '', //v-model
-        placeholder: '请输入占位框背景颜色',
-        classNmae: 'input80', //样式名称 //input100,input80,input70,input60,input50,input40,input30,input20,
-        rules: [
-          {
-            required: true,
-            message: '请输入占位框背景颜色',
-            trigger: 'blur'
-          },
-        ]
-      },
-      {
-        label: '选中路径:', //label
+        label: '使用祝福券跳转地址:', //label
         ele: 'xd-select-pages-path', //package 名称
-        valueKey: 'select-pages-path', //form[valueKey]
-        value: data['select-pages-path'] || {},
+        valueKey: 'useTicketUrl', //form[valueKey]
+        placeholder: '请选择使用祝福券跳转地址',
+        value: null,
         setting: {
-          router: XdBus.getParentApi('getPagesTree')
+          router: XdBus.getParentApi('getPagesTree'),
         },
         inline: false,
       },
-      data.bgcolor && {
-        label: '高度:', //label
-        ele: 'el-input', //package 名称
-        type: 'number',
-        valueKey: 'height', //form[valueKey]
-        value: data.height || 100, //v-model
-        placeholder: '请输入占位框高度，单位像素，默认：10px',
-        className: 'input80', //样式名称 //input100,input80,input70,input60,input50,input40,input30,input20,
-        rules: [
-          {
-            required: true,
-            message: '请输入占位框高度',
-            trigger: 'blur'
-          },
-        ]
-      },
-      {
-        label: '', //label
-        ele: 'slot', //package 名称
-        slot: 'is_reference',
-      },
     ].filter(i=>i)
   },
-  advanced: [
-    {
-      label: '背景颜色:', //label
-      ele: 'xd-color', //package 名称
-      valueKey: 'bgcolor', //form[valueKey]
-      value: '', //v-model
-      placeholder: '请输入占位框背景颜色',
-      classNmae: 'input80', //样式名称 //input100,input80,input70,input60,input50,input40,input30,input20,
-      rules: [
-        {
-          required: true,
-          message: '请输入占位框背景颜色',
-          trigger: 'blur'
-        },
-      ]
-    },
-    {
-      label: '选中路径:', //label
-      ele: 'xd-select-pages-path', //package 名称
-      valueKey: 'select-pages-path', //form[valueKey]
-      value: null,
-      setting: {
-        router: XdBus.getParentApi('getPagesTree')
-      },
-      inline: false,
-    },
-    {
-      label: '高度:', //label
-      ele: 'el-input', //package 名称
-      type: 'number',
-      valueKey: 'height', //form[valueKey]
-      value: null, //v-model
-      placeholder: '请输入占位框高度，单位像素，默认：10px',
-      classNmae: 'input80', //样式名称 //input100,input80,input70,input60,input50,input40,input30,input20,
-      rules: [
-        {
-          required: true,
-          message: '请输入占位框高度',
-          trigger: 'blur'
-        },
-      ]
-    },
-    {
-      label: '', //label
-      ele: 'slot', //package 名称
-      slot: 'is_reference',
-    },
-  ],
+  advanced: [],
 };

package/src/components/JfbBaseSaasBlessDetail/JfbBaseSaasBlessDetail.vue

@@ -19,7 +19,10 @@
           <view class="dear">亲爱的张珊珊：</view>
           <view class="desc">同事好比亲兄弟，一个单位共努力，加班加点在一起，齐心协力拼业绩，新年春节悄然到身旁，祝福送你好兄弟，合家欢乐福相伴，年年有余好运随，新年春节快乐哟！</view>
           <view class="salute">某某公司致上</view>
-          <xd-button class="sign_btn" style="width: 250rpx;" type="primary">去签收</xd-button>
+          <xd-button class="sign_btn"
+            style="width: 250rpx;" type="primary"
+            @click="showSign"
+          >去签收</xd-button>
         </view>
       </view>
       <xd-dailog :show.sync="dialogShow" title="" class="my_dialog">
@@ -43,7 +46,7 @@
           <view class="sign_ticket">祝福券 X1张</view>
         </view>
         <view slot="btn">
-          <xd-button style="width: 280rpx;" type="primary">去使用</xd-button>
+          <xd-button style="width: 280rpx;" type="primary" @click="toUseTicket">去使用</xd-button>
         </view>
       </xd-dailog>
     </view>
@@ -55,6 +58,7 @@
   import XdButton from "@/components/XdButton/XdButton";
   import XdDailog from "@/components/XdDailog/XdDailog"
   import XdSignature from "@/components/XdSignature/XdSignature"
+  import XdUpload from "@/components/XdUpload/XdUpload"
   import { jfbRootExec } from "@/utils/xd.event";
   import JfbBaseSaasBlessDetailMixin from "./JfbBaseSaasBlessDetailMixin";
   import { getContainerPropsValue } from "@/utils/xd.base";
@@ -66,15 +70,21 @@
       XdFontIcon,
       XdButton,
       XdDailog,
-      XdSignature
+      XdSignature,
+      XdUpload
     },
     mixins: [
       componentsMixins, extsMixins, JfbBaseSaasBlessDetailMixin
     ],
     data() {
       return {
-        dialogShow: true,
+        dialogShow: false,
         dialogSuccess: false,
+        sign_image_url: "",
+        bless_id: "",
+
+        //面板
+        useTicketUrl: "",   //使用券跳转地址
       }
     },
     watch: {
@@ -89,7 +99,7 @@
     },
     methods: {
       onJfbLoad(options) {
-
+        this.bless_id = options.bless_id;
       },
       /**
        * @description 监听事件变化
@@ -97,24 +107,101 @@
        */
       init(container) {
 
+      },
+      showSign(){
+        this.dialogShow = true;
       },
       clearSign(){
         this.$refs.signatureRef.clear()
       },
+      toUseTicket(){
+        this.$xdUniHelper.navigateTo({
+          url: `${this.useTicketUrl}`,
+        });
+      },
       submitSign(){
         this.$refs.signatureRef.canvasToTempFilePath({
-            success: (res) => {
+            success: async (res) => {
               console.log(res);
-              // 是否为空画板 无签名
-              console.log(res.isEmpty)
-              // 生成图片的临时路径
-              // H5 生成的是base64
-              this.url = res.tempFilePath
+              let url = res.tempFilePath
+              if(!res.isEmpty){
+                //上传签名图片
+                await this.doSubmitSign(url);
+                //提交签名
+                await this.p_doSignBless();
+                this.dialogShow = false;
+                this.dialogSuccess = true;
+              }
+            }
+        })
+      },
+      p_doSignBless(){
+        return new Promise((resolve, reject) => {
+          jfbRootExec("doSignBless", {
+            vm: this,
+            data: {
+              bless_id: this.bless_id,
+              sign_image_url: this.sign_image_url
             }
+          }).then(res => {
+            resolve(res);
+          }).catch(err => {
+            reject(err);
+          })
         })
+        
+      },
+      doSubmitSign(url){
+        let fileName = "sign.png";
+        let file = this.base64ToFile(url,fileName);
+
+        return new Promise((resolve,reject) => {
+          jfbRootExec("getOssSign", {
+            vm: this,
+            data: { name: fileName }
+          }).then(res => {
+            console.log(res);
+            let OSSAccessKeyId = res['id']
+            let cdnUrl = res['cdn_url']
+            delete res['id']
+            delete res['cdn_url']
+
+            uni.uploadFile({
+              url: res.action,
+              file: file,
+              name: 'file',
+              formData: {
+                ...res,
+                OSSAccessKeyId: OSSAccessKeyId,
+                name: fileName,
+                cdnUrl: cdnUrl,
+                success_action_status: 200
+              },
+              success: (res) => {
+                this.sign_image_url = cdnUrl;
+                resolve(cdnUrl);
+              }
+            })
+          }).catch(err => {
+            reject();
+          })
+        })
+
+        // this.dialogSuccess = true;
+      },
+      base64ToFile(base64String, filename){
+        var arr = base64String.split(',');
+        var mime = arr[0].match(/:(.*?);/)[1];
+        var bstr = atob(arr[1]);
+        var n = bstr.length;
+        var u8arr = new Uint8Array(n);
+        while(n--) {
+          u8arr[n] = bstr.charCodeAt(n);
+        }
+        return new File([u8arr], filename, {type:mime});
       },
       onJfbScroll(options) {
-        console.log('event.onJfbScroll', options)
+        
       },
       onJfbReachBottom(options) {
         console.log('event.onJfbReachBottom', options)
@@ -127,6 +214,7 @@
       },
       onJfbBack(options) {
         console.log('event.onJfbBack', options)
+        this.$xdUniHelper.navigateBack();
       },
       onJfbUpdate(...data) {
         console.log('event.onJfbUpdate', data)