jufubao-base 1.0.116-beta3 → 1.0.116-beta5

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)

package/src/components/JfbBaseSaasBlessDialog/Api.js

@@ -12,47 +12,12 @@
  */
 module.exports = [
   {
-    mapFnName: 'getByIdFilmSquate', //自定义方法名字（必选）
-    title: '获取电影广场列表',
-    path: '/api/account/film/list-film-square',
+    mapFnName: 'getBlessList',
+    title: '祝福 - 列表:代签收',
+    path: '/saas/v1/bless/items-unsigned',
     isRule: false,
-    params: {
+    data: {
       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/JfbBaseSaasBlessDialog/Attr.js

@@ -10,9 +10,9 @@ export default {
       {
         label: '选取节日祝福详情路径:', //label
         ele: 'xd-select-pages-path', //package 名称
-        valueKey: 'list_url', //form[valueKey]
+        valueKey: 'blessDetailUrl', //form[valueKey]
         placeholder: '请选择优惠券列表路径',
-        value: data['list_url'] ||null,
+        value: data['blessDetailUrl'] ||null,
         setting: {
           router: XdBus.getParentApi('getPagesTree'),
         },

package/src/components/JfbBaseSaasBlessDialog/JfbBaseSaasBlessDialog.vue

@@ -31,7 +31,7 @@
                 <view class="bless_name">亲爱的张珊珊：</view>
                 <view class="bless_cont">您收到了一份为您定制的专属祝福，快去查看并使用吧！</view>
               </view>
-              <xd-button class="btn_image" type="primary" @click="handleToList">去看看</xd-button>
+              <xd-button class="btn_image" type="primary" @click="handleToDetail">去看看</xd-button>
             </view>
             <view class="_right" @click="handleChange('right')">
               <xd-font-icon icon="iconxiangyou_xian"></xd-font-icon>
@@ -81,7 +81,7 @@
         currentIndex: 0,
         list: [],
 
-        list_url: "",
+        blessDetailUrl: "", //祝福详情url
         type: "",
         isHide: false,
       }
@@ -97,7 +97,15 @@
     },
     methods: {
       onJfbLoad(options) {
-
+        jfbRootExec("getBlessList", {
+          vm: this,
+          data: {
+            page_size: 10,
+            page_token: '1'
+          }
+        }).then(res => {
+          this.list = res.list;
+        })
       },
       /**
        * @description 监听事件变化
@@ -110,9 +118,9 @@
           this.isShow = !this.isHide;
         }
       },
-      handleToList(){
+      handleToDetail(){
         this.$xdUniHelper.navigateTo({
-          url: `${this.list_url}`,
+          url: `${this.blessDetailUrl}?bless_id=${1}`,
         });
       },
       handleClose(){
@@ -121,6 +129,7 @@
           return;
         }
         this.currentIndex = this.currentIndex + 1;
+        this.isShow = false;
       },
       handleChange(type){
         this.currentIndex = type === "left" ? this.currentIndex - 1 : this.currentIndex + 1;

package/src/components/JfbBaseSaasBlessReceive/Api.js

@@ -12,47 +12,12 @@
  */
 module.exports = [
   {
-    mapFnName: 'getByIdFilmSquate', //自定义方法名字（必选）
-    title: '获取电影广场列表',
-    path: '/api/account/film/list-film-square',
+    mapFnName: 'getBlessAll',
+    title: '祝福 - 列表:所有',
+    path: '/saas/v1/bless/items-all',
     isRule: false,
-    params: {
+    data: {
       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/JfbBaseSaasBlessReceive/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: 'blessSignUrl', //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/JfbBaseSaasBlessReceive/JfbBaseSaasBlessReceive.vue

@@ -15,17 +15,18 @@
     <!-- #endif -->
     <view class="jfb-base-saas-bless-receive__body">
       <view class="receive_list">
-        <view class="receive_item">
-          <view class="head">节日祝福</view>
+        <view class="receive_item" v-for="(item, i) in blessData" :key="i">
+          <view class="head">{{item.bless_type_name}}</view>
           <view class="card"></view>
           <view class="receive_cont">
-            <view class="card_name">节日祝福福卡</view>
+            <view class="card_name">{{ item.bless_name }}</view>
             <view class="card_num">× 1张</view>
           </view>
           <view class="receive_time">
             <view class="_time">2022.10.01    23:45</view>
             <view>
-              <xd-button size="small" type="primary">立即签收</xd-button>
+              <xd-button v-if="item.receive_status === 'N'" size="small" type="primary" @click="toSignUrl(item)">立即签收</xd-button>
+              <xd-button v-else size="small" type="default" @click="toSignUrl(item)">再次查看</xd-button>
             </view>
           </view>
         </view>
@@ -53,8 +54,10 @@
     ],
     data() {
       return {
+        blessData: [],
 
-        //todo
+        //面板
+        blessSignUrl: "", //签收跳转地址
       }
     },
     watch: {
@@ -70,28 +73,34 @@
     methods: {
       onJfbLoad(options) {
 
-        // jfbRootExec('baiduUserLogin', {
-
-        //   vm: this,//   data: {
-
-        //     account: 'gaoshiyong',//     password: '123456789',//     type: 3,//     ...options
-
-        //   }
-
-        // }).then().catch()
+        this.p_getBlessAll();
       },
       /**
        * @description 监听事件变化
        * @param container {object} 业务组件对象自己
        */
       init(container) {
+        this.blessSignUrl = getContainerPropsValue(container, 'content.blessSignUrl', {value: ""}).value;
+      },
+      toSignUrl(item){
+        this.$xdUniHelper.navigateTo({
+          url: `${this.blessSignUrl}?bless_id=${item.bless_id}`,
+        });
+      },
+      p_getBlessAll(){
+        this.$xdShowLoading({});
+        jfbRootExec("getBlessAll", {
+          vm: this,
+          data: {
 
-        //this.bgcolor = getContainerPropsValue(container, 'content.bgcolor', '#fff');
-
-        //this.height = getContainerPropsValue(container, 'content.height', 10);
+          }
+        }).then(res => {
+          this.$xdHideLoading();
+          this.blessData = res.list;
+        })
       },
       onJfbScroll(options) {
-        console.log('event.onJfbScroll', options)
+        
       },
       onJfbReachBottom(options) {
         console.log('event.onJfbReachBottom', options)
@@ -104,6 +113,7 @@
       },
       onJfbBack(options) {
         console.log('event.onJfbBack', options)
+        this.$xdUniHelper.navigateBack();
       },
       onJfbUpdate(...data) {
         console.log('event.onJfbUpdate', data)
@@ -121,6 +131,7 @@
 
   .jfb-base-saas-bless-receive {
     &__body{
+      background: #F5F9FA;
       .receive_list{
         padding: 20rpx;
         .receive_item{

package/src/components/JfbBaseSaasHome/Api.js

@@ -12,47 +12,35 @@
  */
 module.exports = [
   {
-    mapFnName: 'getByIdFilmSquate', //自定义方法名字（必选）
-    title: '获取电影广场列表',
-    path: '/api/account/film/list-film-square',
+    mapFnName: 'getCompanyList',
+    title: '获取公司列表',
+    path: '/saas/v1/company/items',
     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', '必选'],
+    data: {
+      phone_number: ['手机号', 'String', '必选'],
     },
     isConsole: true,
     disabled: true,
   },
   {
-    mapFnName: 'removeFilmAddress', //自定义方法名字（必选）
-    title: '删除我的配送地址',
-    path: '/api/account/film/paiqi-date',
+    mapFnName: 'getHomeConfig',
+    title: '获取首页配置',
+    path: '/saas/v1/company_config/item',
     isRule: false,
     params: {
-      film_id: ['电影id', 'Number', '必选'],
+      phone_number: ['手机号', 'String', '必选'],
     },
     isConsole: true,
     disabled: true,
   },
   {
-    mapFnName: 'addFilmcart',  //自定义方法名字（必选）
-    title: '添加购物车',
-    path: '/api/account/film/paiqi-date',
+    mapFnName: 'getNewsList',
+    title: '获取新闻列表',
+    path: '/saas/v1/content_ad_news/items',
     isRule: false,
     params: {
-      film_id: ['电影id', 'Number', '必选'],
+      position_id: ['位置ID', 'String', '必选'],
+      scene: ['场景ad,news', 'String', '必选']
     },
     isConsole: true,
     disabled: true,