jufubao-base 1.0.183 → 1.0.184-beta1

package/src/components/JfbBaseCardReceiveCover/Attr.js

@@ -8,49 +8,138 @@ export default {
   content: (data) => {
     return [
       {
-        label: '背景颜色:',
+        label: '可领取背景图:', //label
+        ele: 'xd-upload', //package 名称
+        valueKey: 'canReceiveBg', //form[valueKey]
+        value: data.canReceiveBg || null, //v-model
+        defaultValue: data.canReceiveBg || null, //默认图片对象
+        groupKey: "style",
+        slot: true, //按钮是否使用slot
+        oneWidth: 375, //单个图片显示宽度
+        oneHeight: 672, //单个图片显示高度
+        elinputClassName: 'input40',
+        tipsformet: '上传文件格式：@imageType@，不超过@size@MB.',
+        type: ['jpg', 'png', 'jpeg'],
+        styleType: 'one', //其值：one=>单文件上传 auth=>证件正反面上传 list=>多文件上传
+        uploadType: 'aliyun', //''=>API服务上传  qiniu=>七牛云OSS上传  aliyun=> 阿里云OSS上传
+        size: 5, //5M
+        action: 'aliyun',
+        sort: true, //当上传图片列表时候，是否启用排序
+        maxlen: 100, //当上传图片列表时候，最大数量数量
+        rules: [
+          { required: true, message: '请上传图片', trigger: ['blur', 'change'] },
+        ]
+      },
+      {
+        label: '可领取背景颜色:',
         ele: 'xd-color',
-        valueKey: 'bgcolor',
-        value: data.bgcolor || '',
-        placeholder: '请输入占位框背景颜色',
+        valueKey: 'canReceiveBgColor',
+        value: data['canReceiveBgColor'] || '',
+        groupKey: "style",
+        placeholder: '请输入可领取背景颜色',
         classNmae: 'input80',
+      },
+      {
+        label: '不可领取背景图:', //label
+        ele: 'xd-upload', //package 名称
+        valueKey: 'cannotReceiveBg', //form[valueKey]
+        value: data.cannotReceiveBg || null, //v-model
+        defaultValue: data.cannotReceiveBg || null, //默认图片对象
+        groupKey: "style",
+        slot: true, //按钮是否使用slot
+        oneWidth: 375, //单个图片显示宽度
+        oneHeight: 672, //单个图片显示高度
+        elinputClassName: 'input40',
+        tipsformet: '上传文件格式：@imageType@，不超过@size@MB.',
+        type: ['jpg', 'png', 'jpeg'],
+        styleType: 'one', //其值：one=>单文件上传 auth=>证件正反面上传 list=>多文件上传
+        uploadType: 'aliyun', //''=>API服务上传  qiniu=>七牛云OSS上传  aliyun=> 阿里云OSS上传
+        size: 5, //5M
+        action: 'aliyun',
+        sort: true, //当上传图片列表时候，是否启用排序
+        maxlen: 100, //当上传图片列表时候，最大数量数量
         rules: [
-          {
-            required: true,
-            message: '请输入占位框背景颜色',
-            trigger: 'blur'
-          },
+          { required: true, message: '请上传图片', trigger: ['blur', 'change'] },
         ]
       },
       {
-        label: '选中路径:',
+        label: '不可领取背景颜色:',
+        ele: 'xd-color',
+        valueKey: 'cannotReceiveBgColor',
+        value: data['cannotReceiveBgColor'] || '',
+        groupKey: "style",
+        placeholder: '请输入不可领取背景颜色',
+        classNmae: 'input80',
+      },
+      {
+        label: '按钮背景图:', //label
+        ele: 'xd-upload', //package 名称
+        valueKey: 'btnBg', //form[valueKey]
+        value: data.btnBg || null, //v-model
+        defaultValue: data.btnBg || null, //默认图片对象
+        groupKey: "style",
+        slot: true, //按钮是否使用slot
+        oneWidth: 163, //单个图片显示宽度
+        oneHeight: 45, //单个图片显示高度
+        elinputClassName: 'input40',
+        tipsformet: '上传文件格式：@imageType@，不超过@size@MB.',
+        type: ['jpg', 'png', 'jpeg'],
+        styleType: 'one', //其值：one=>单文件上传 auth=>证件正反面上传 list=>多文件上传
+        uploadType: 'aliyun', //''=>API服务上传  qiniu=>七牛云OSS上传  aliyun=> 阿里云OSS上传
+        size: 5, //5M
+        action: 'aliyun',
+        sort: true, //当上传图片列表时候，是否启用排序
+        maxlen: 100, //当上传图片列表时候，最大数量数量
+        rules: [
+          { required: true, message: '请上传图片', trigger: ['blur', 'change'] },
+        ]
+      },
+      {
+        label: '内容背景图:', //label
+        ele: 'xd-upload', //package 名称
+        valueKey: 'contentBg', //form[valueKey]
+        value: data.contentBg || null, //v-model
+        defaultValue: data.contentBg || null, //默认图片对象
+        groupKey: "style",
+        slot: true, //按钮是否使用slot
+        oneWidth: 300, //单个图片显示宽度
+        oneHeight: 200, //单个图片显示高度
+        elinputClassName: 'input40',
+        tipsformet: '上传文件格式：@imageType@，不超过@size@MB.',
+        type: ['jpg', 'png', 'jpeg'],
+        styleType: 'one', //其值：one=>单文件上传 auth=>证件正反面上传 list=>多文件上传
+        uploadType: 'aliyun', //''=>API服务上传  qiniu=>七牛云OSS上传  aliyun=> 阿里云OSS上传
+        size: 5, //5M
+        action: 'aliyun',
+        sort: true, //当上传图片列表时候，是否启用排序
+        maxlen: 100, //当上传图片列表时候，最大数量数量
+        rules: [
+          { required: true, message: '请上传图片', trigger: ['blur', 'change'] },
+        ]
+      },
+      {
+        label: '领取跳转地址:',
         ele: 'xd-select-pages-path',
-        valueKey: 'select-pages-path',
-        value: data['select-pages-path'] || null,
+        valueKey: 'receive_get_url',
+        groupKey:'advanced',
+        placeholder: '请选择领取跳转地址',
+        value: data['receive_get_url']||null,
         setting: {
-          router: XdBus.getParentApi('getPagesTree')
+          router: XdBus.getParentApi('getPagesTree'),
         },
-      },
-      data.bgcolor && {
-        label: '高度:',
-        ele: 'el-input',
-        type: 'number',
-        valueKey: 'height',
-        value: data.height || 100,
-        placeholder: '请输入占位框高度，单位像素，默认：10px',
-        className: 'input80',
+        inline: false,
         rules: [
-          {
-            required: true,
-            message: '请输入占位框高度',
-            trigger: 'blur'
-          },
+          { required: true, message: '请选择领取地址', trigger: ['blur', 'change'] },
         ]
       },
       {
-        label: '', //label
-        ele: 'slot', //package 名称
-        slot: 'is_reference',
+        label: '按钮文字颜色:',
+        ele: 'xd-color',
+        valueKey: 'btnColor',
+        value: data['btnColor'] || '',
+        groupKey: "style",
+        placeholder: '请输入按钮文字颜色',
+        classNmae: 'input80',
       },
     ].filter(i=>i)
   },

package/src/components/JfbBaseCardReceiveCover/JfbBaseCardReceiveCover.vue

@@ -2,110 +2,217 @@
   <view
     class="jfb-base-card-receive-cover"
     @click="handleEditxSelect"
-    :class="{ editx : isEditx && active }"
+    :class="{ editx: isEditx && active }"
   >
     <!--#ifdef H5-->
     <view
       class="jfb-base-card-receive-cover__edit"
-      :class="{ editx : isEditx && active }"
+      :class="{ editx: isEditx && active }"
       v-if="isEditx && active"
     >
-      <view class="jfb-base-card-receive-cover__edit-icon" @click="delEdit">删除</view>
+      <view class="jfb-base-card-receive-cover__edit-icon" @click="delEdit"
+        >删除</view
+      >
     </view>
     <!-- #endif -->
-    <view class="jfb-base-card-receive-cover__body">
-      <view>测试插件( {{containerId}} )</view>
+    <view
+      :style="{
+        height: layoutInfo.bodyMinHeightRpx + 'rpx',
+        background: status === 'N' ? canReceiveBgColor : cannotReceiveBgColor,
+      }"
+    >
+      <view class="jfb-base-card-receive-cover__body" :style="[bgStyle]">
+        <view v-if="status === 'N'" class="content" :style="contentBgStyle">
+          <view class="content-info">{{ greeting }}</view>
+        </view>
+        <view
+          v-if="status === 'N'"
+          class="btn"
+          @click="handleToReceive"
+          :style="btnBgStyle"
+          >{{ status === "T" ? "链接已失效" : "立即领取" }}</view
+        >
+      </view>
     </view>
   </view>
 </template>
 
 <script>
-  import XdFontIcon from "@/components/XdFontIcon/XdFontIcon";
-  import { jfbRootExec } from "@/utils/xd.event";
-  import JfbBaseCardReceiveCoverMixin from "./JfbBaseCardReceiveCoverMixin";
-  import { getContainerPropsValue } from "@/utils/xd.base";
-  import componentsMixins from "@/mixins/componentsMixins";
-  import extsMixins from "@/mixins/extsMixins";
-  export default {
-    name: "JfbBaseCardReceiveCover",
-    components: {
-      XdFontIcon
-    },
-    mixins: [
-      componentsMixins, extsMixins, JfbBaseCardReceiveCoverMixin
-    ],
-    data() {
+import XdFontIcon from "@/components/XdFontIcon/XdFontIcon";
+import XdButton from "@/components/XdButton/XdButton";
+import { jfbRootExec } from "@/utils/xd.event";
+import JfbBaseCardReceiveCoverMixin from "./JfbBaseCardReceiveCoverMixin";
+import { getContainerPropsValue } from "@/utils/xd.base";
+import componentsMixins from "@/mixins/componentsMixins";
+import extsMixins from "@/mixins/extsMixins";
+export default {
+  name: "JfbBaseCardReceiveCover",
+  components: {
+    XdFontIcon,
+    XdButton,
+  },
+  mixins: [componentsMixins, extsMixins, JfbBaseCardReceiveCoverMixin],
+  data() {
+    return {
+      btnBg: "",
+      contentBg: "",
+      greeting: "",
+      receive_get_url: "",
+      btnColor: "",
+      transfer_auth_code: null,
+      status: "N",
+      cannotReceiveBg: "",
+      canReceiveBg: "",
+      cannotReceiveBgColor: "",
+      canReceiveBgColor: "",
+    };
+  },
+  computed: {
+    bgStyle() {
+      let status = this.status;
       return {
-
-        //todo
-      }
+        height: this.layoutInfo.bodyMinHeightRpx + "rpx",
+        backgroundImage:
+          status === "N"
+            ? `url(${this.canReceiveBg})`
+            : `url(${this.cannotReceiveBg})`,
+        backgroundSize: "100% 100%",
+      };
     },
-    watch: {
-      container(value, oldValue) {
-        if (JSON.stringify(value) === JSON.stringify(oldValue)) return;
-        if (this.$configProject['isPreview']) this.init(value)
-      },
+    btnBgStyle() {
+      return this.styleObjectToString({
+        backgroundImage: "url(" + this.btnBg + ")",
+        backgroundRepeat: "no-repeat",
+        backgroundSize: "cover",
+        width: "326rpx",
+        height: "90rpx",
+        display: "flex",
+        justifyContent: "center",
+        alignItems: "center",
+        color: this.btnColor,
+        border: "none",
+      });
     },
-    created() {
-      this.init(this.container);
-
-      //todo
+    contentBgStyle() {      
+      return [this.styleObjectToString({
+        backgroundImage: "url(" + this.contentBg + ")",
+        backgroundRepeat: "no-repeat",
+        backgroundSize: "100% 100%",
+        color: this.mainColor,
+      })];
     },
-    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)
-      },
-    }
-  }
+  },
+  watch: {
+    container(value, oldValue) {
+      if (JSON.stringify(value) === JSON.stringify(oldValue)) return;
+      if (this.$configProject["isPreview"]) this.init(value);
+    },
+  },
+  created() {
+    this.init(this.container);
 
+    //todo
+  },
+  methods: {
+    onJfbLoad(options) {
+      this.transfer_auth_code = options.transfer_auth_code;
+      jfbRootExec("getReceiveGreetingCard", {
+        vm: this,
+        data: {
+          transfer_auth_code: this.transfer_auth_code,
+        },
+      })
+        .then((res) => {
+          this.greeting = res.transfer_record.greeting;
+          this.status = res.transfer_record.status;
+        })
+        .catch((err) => {
+          console.log(err, "err");
+        });
+    },
+    init(container) {
+      this.btnBg = getContainerPropsValue(container, "content.btnBg", {
+        path: "",
+      }).path;
+      this.contentBg = getContainerPropsValue(container, "content.contentBg", {
+        path: "",
+      }).path;
+      this.canReceiveBg = getContainerPropsValue(
+        container,
+        "content.canReceiveBg",
+        {
+          path: "",
+        }
+      ).path;
+      this.canReceiveBgColor = getContainerPropsValue(
+        container,
+        "content.canReceiveBgColor",
+        "#000"
+      );
+      this.cannotReceiveBg = getContainerPropsValue(
+        container,
+        "content.cannotReceiveBg",
+        {
+          path: "",
+        }
+      ).path;
+      this.cannotReceiveBgColor = getContainerPropsValue(
+        container,
+        "content.cannotReceiveBgColor",
+        "#000"
+      );
+      this.receive_get_url = getContainerPropsValue(
+        container,
+        "content.receive_get_url",
+        {
+          value: "",
+        }
+      ).value;
+      this.btnColor = getContainerPropsValue(
+        container,
+        "content.btnColor",
+        "#000"
+      );
+    },
+    handleToReceive() {
+      if (this.status === "T") return;
+      this.$xdUniHelper.navigateTo({
+        url: `${this.receive_get_url}?transfer_auth_code=${this.transfer_auth_code}`,
+      });
+    },
+  },
+};
 </script>
 
 <style scoped lang="less">
-  @import "./JfbBaseCardReceiveCoverLess.less";
-
-  .jfb-base-card-receive-cover {
-    &__body{
+@import "./JfbBaseCardReceiveCoverLess.less";
 
+.jfb-base-card-receive-cover {
+  &__body {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: flex-end;
+    .content {
+      position: relative;
+      min-height: 400rpx;
+      min-width: 600rpx;
+      display: flex;
+      justify-content: center;
+      font-size: 40rpx;
+      font-weight: 500;
+      &-info {
+        padding-top: 70rpx;
+        width: 300rpx;
+        text-align: center;
+      }
+    }
+    .btn {
+      margin-top: 50rpx;
+      margin-bottom: 100rpx;
+      font-size: 36rpx;
+      text-align: center;
     }
   }
+}
 </style>

package/src/components/JfbBaseCardReceiveCover/Mock.js

@@ -1,13 +1,5 @@
 'use strict';
 
 module.exports = {
-  
-  getCardByIdFilmSquate:{},
-  
-  updateCardFilmPaiqiDate:{},
-  
-  removeCardFilmAddress:{},
-  
-  addCardFilmcart:{},
-  
+  getReceiveGreetingCard:{"card_number":"101001000008098","card_point":99028,"card_type_name":"多余额福卡","end_time":"2025-07-31","card_status":"Y","card_status_name":"开启","unit":"点","main_business_code_name":"蛋糕(勿改)、网络视听(勿改)、体检(勿改)","other_card_point":79222,"is_exchange":"N","exchange_card_type_name":"","exchange_card_point":0,"card_point_type":2,"is_can_unbind":"","business_codes":["movie","market","cake"],"site_entry_settings":[],"transfer_record":{"transfer_auth_code":"aa6ljeQETINBUAJ-9l486","status":"N","status_name":"待领取","transfer_time":"2024-09-09 11:32:11","user_id":5000223,"user_nickname":"金L爽","user_phone_number":"188****4566","greeting":"送给你了"},"request_id":"2646fc69fab35413"},
 }

package/src/components/JfbBaseFastLink/JfbBaseFastLink.vue

@@ -157,7 +157,7 @@
       handleClick(item){
         if(item.path && item.path.value) {
           this.$xdUniHelper.navigateTo({
-            url : item.path.value
+            url : `${item.path.value}` 
           })
         }
       },

package/src/components/JfbBaseOrderDetail/Attr.js

@@ -489,6 +489,48 @@ export default {
         },
         inline: false,
       },
+      {
+        label: '是否展开票券信息:',
+        ele: 'xd-radio',
+        valueKey: 'is_open',
+        value: data['is_open'] || 'N',
+        groupKey:'content',
+        placeholder: '请选择是否展开票券信息',
+        multiple: false,
+        className: 'input80',
+        list: [
+          { label: '展开', value: 'Y' },
+          { label: '收起', value: 'N' },
+        ]
+      },
+      {
+        label: '是否展开商品详情:',
+        ele: 'xd-radio',
+        valueKey: 'is_show_all_detail',
+        value: data['is_show_all_detail'] || 'N',
+        groupKey:'content',
+        placeholder: '请选择是否展开商品详情',
+        multiple: false,
+        className: 'input80',
+        list: [
+          { label: '展开', value: 'Y' },
+          { label: '收起', value: 'N' },
+        ]
+      },
+      {
+        label: '提货码展示/隐藏:',
+        ele: 'xd-radio',
+        valueKey: 'is_show',
+        value: data['is_show'] || 'Y',
+        groupKey:'content',
+        placeholder: '请选择提货码展示/隐藏',
+        multiple: false,
+        className: 'input80',
+        list: [
+          { label: '显示', value: 1 },
+          { label: '隐藏', value: 0 },
+        ]
+      },
     ].filter(i=>i)
   },
 }

package/src/components/JfbBaseOrderDetail/JfbBaseOrderDetail.vue

@@ -259,7 +259,7 @@
             class="jfb-base-order-detail__body-card jfb-base-order-detail__body-cashier"
           >
             <view class="jfb-base-order-detail__body-cashier-text">{{info.codes[0].show_type === "qrcode" ? "二维码" : "条形码" }}</view>
-            <view style="position: relative">
+            <view v-if="showPreviewCode" style="position: relative">
               <image
                 :style="{
                   height: info.codes[0].show_type === 'qrcode' ? '50vw' : '25vw',
@@ -556,20 +556,18 @@
             ></view>
           </view>
           <view v-if="info.pay_info.cards && info.pay_info.cards.length > 0">
-            <view class="jfb-base-order-detail__body-show" v-if="!showPayCard">
+            <view @click="showPayCard = true" class="jfb-base-order-detail__body-show" v-if="!showPayCard">
               <text>使用 {{ info.pay_info.cards.length }} 张票券 展开</text>
               <xd-font-icon
                 style="margin-left: 8rpx"
-                @click="showPayCard = true"
                 size="28"
                 icon="iconxia_down"
               ></xd-font-icon>
             </view>
-            <view class="jfb-base-order-detail__body-show" v-else>
+            <view @click="showPayCard = false" class="jfb-base-order-detail__body-show" v-else>
               <text>使用{{ info.pay_info.cards.length }}张票券 收起</text>
               <xd-font-icon
                 style="margin-left: 8rpx"
-                @click="showPayCard = false"
                 size="28"
                 icon="iconshang_up"
               ></xd-font-icon>
@@ -653,8 +651,25 @@
           <view class="jfb-base-order-detail__body-shop-title">
             <view :style="{ background: mainColor }"></view>
             <view>商品详情</view>
+            <view @click="showAllProductDetail=!showAllProductDetail" v-if="!showAllProductDetail" style="color:#999;display:flex;align-items:center;margin-left:10px">
+              <text> 展开</text>
+              <xd-font-icon
+                style="margin-left: 8rpx"
+                size="28"
+                icon="iconxia_down"
+              ></xd-font-icon>
+            </view>
+            <view @click="showAllProductDetail=!showAllProductDetail" v-if="showAllProductDetail" style="color:#999;display:flex;align-items:center;margin-left:10px">
+              <text> 收起</text>
+              <xd-font-icon
+                style="margin-left: 8rpx"
+                size="28"
+                icon="iconxia_down"
+              ></xd-font-icon>
+            </view>         
+          </view>
+          <view v-if="showAllProductDetail" v-html="info.product_detail">
           </view>
-          <view v-html="info.productDetail"></view>
         </view>
         <view
           v-if="info.custom_content"
@@ -835,6 +850,11 @@ export default {
       logo: "",
 
       noticeBgc:'',
+      is_open: '',
+      is_show: '',
+      showAllProductDetail: false,
+      is_show_all_detail: '',
+      showPreviewCode: true
     };
   },
   watch: {
@@ -921,6 +941,7 @@ export default {
           main_order_id: this.main_order_id,
           custom_content_page_id: this.pageAttr.page_id,
           custom_content_container_id: this.cid,
+          is_show_jhd_code: this.is_show
         },
       })
         .then((res) => {
@@ -1047,7 +1068,7 @@ export default {
           }
 
           //增加删除订单按钮
-          if(this.is_show_delete_order  === 'Y') {
+          if(this.is_show_delete_order === 'Y') {
             let pay = (res.buttons||[]).filter(item => item.action === 'pay');
             let del = [{action:'delete', text:'删除订单', type: 'info'}];
             if(pay.length === 1) del = []
@@ -1119,6 +1140,18 @@ export default {
       this.viewStatus = getContainerPropsValue(container, "content.viewStatus", "mall");
       this.is_show_support_shop = getContainerPropsValue(container, "content.is_show_support_shop", "N");
       this.is_show_delete_order = getContainerPropsValue(container, "content.is_show_delete_order", "N");
+      this.is_open = getContainerPropsValue(container, "content.is_open", "N");
+      this.is_show = getContainerPropsValue(container, "content.is_show", "Y");
+      this.showPayCard = this.is_open==='Y'
+      this.is_show_all_detail = getContainerPropsValue(container, "content.is_show_all_detail", "N");
+      this.showAllProductDetail = this.is_show_all_detail==='Y'
+      if(this.isPreview) {
+        if(this.is_show===0) {
+          this.showPreviewCode = false;
+        } else {
+          this.showPreviewCode = true;
+        }
+      }
     },
     getCountDown() {
       this.timer = setInterval(() => {

package/src/components/JfbBasePay/Attr.js

@@ -16,6 +16,18 @@ export default {
         placeholder: '请选择支付成功路径',
         value: data.pay_success_path || null,
         groupKey:'advanced',
+        setting: {
+          router: XdBus.getParentApi('getPag©esTree'),
+        },
+        inline: false,
+      },
+      {
+        label: '票券支付成功跳转路径:', //label
+        ele: 'xd-select-pages-path', //package 名称
+        valueKey: 'rechargeSuccessPath', //form[valueKey]
+        placeholder: '请选择票券支付成功跳转路径',
+        value: data.rechargeSuccessPath || null,
+        groupKey:'advanced',
         setting: {
           router: XdBus.getParentApi('getPagesTree'),
         },