jufubao-base 1.0.109 → 1.0.110-beta1

package/src/components/JfbBaseConDialog/XdCouCardBind.vue

@@ -0,0 +1,197 @@
+<template>
+  <view class="xd-cou-card-bind">
+    <view class="ticket_box" :style="{
+      backgroundImage: dialogBackground
+    }">
+      <view class="ticket_list">
+        <view class="ticket_item" :class="item.can_take_num"
+          v-for="(item,i) in uiList" :key="i"
+          :style="{backgroundImage: item.backgroundImage}"
+        >
+          <view class="ticket_names">
+            <view class="name_main">{{item.prize_type}}</view>
+            <view class="name_sub">{{item.prize_name}}</view>
+          </view>
+          <view class="name_tit">{{item.prize_name}}</view>
+          <xd-font-icon class="ticket_icon" :icon="item.icon"></xd-font-icon>
+          <view class="btn">
+            <xd-button
+              size="small"
+              type="primary"
+              :disabled="item.remain_card_count == 0"
+              :style="{
+                backgroundImage: item.btnImage
+              }"
+              @click="getCoupont(item)"
+            >{{item.btn_txt}}</xd-button>
+          </view>
+        </view>
+      </view>
+    </view>
+    
+    <xd-font-icon
+      @click="handleClose"
+      class="dialog_close"
+      icon="iconguanbi_xian"
+      color="#fff"
+      size="64"
+    ></xd-font-icon>
+  </view>
+</template>
+<script>
+import XdButton from "@/components/XdButton/XdButton";
+import XdFontIcon from "@/components/XdFontIcon/XdFontIcon";
+import getServiceUrl from "@/common/getServiceUrl";
+export default{
+  name: "XdCouCardBind",
+  components: {
+    XdButton,
+    XdFontIcon
+  },
+  props: {
+    list: {
+      type: Array,
+      default(){
+        return []
+      }
+    },
+    setting: {}
+  },
+  computed: {
+    uiList(){
+      return this.list.map(item => {
+        let mapArr = {"Y": "去查看", "P": "领取", "N": "已发完"}
+        item.btn_txt = mapArr[item.can_take_num];
+        if(item.can_take_num === "Y" || item.can_take_num === "P"){
+          item.backgroundImage = `url(${getServiceUrl(this.setting.app_coupon_url)})`;
+          item.btnImage = `url(${getServiceUrl(this.setting.app_coupon_button_bg_url)})`;
+          item.icon = item.can_take_num === "Y" ? "iconyilingqu" : "icondailingqu";
+        }else if(item.can_take_num === "N"){
+          item.backgroundImage = `url(${getServiceUrl(this.setting.app_coupon_invalid_url)})`;
+          item.btnImage = "";
+          item.icon = "iconyifawan";
+        }
+        return item;
+      })
+    },
+    dialogBackground(){
+      return `url(${getServiceUrl(this.setting.background)})`;
+    }
+  },
+  data(){
+    return {
+
+    }
+  },
+  methods: {
+    //领取优惠券
+    getCoupont(item){
+      if(item.can_take_num === "P"){
+        this.$emit("getCoupont", item);
+      }
+    },
+    handleClose(){
+      this.$emit("closeDialog");
+    }
+  }
+}
+</script>
+
+<style lang="less" scoped>
+@ticketHeight: 180rpx;
+@bgHeight: @ticketHeight - 40rpx;
+  .xd-cou-card-bind{
+    width: 600rpx;
+    max-height: 900rpx;
+    padding-bottom: 80rpx;
+    .ticket_box{
+      background-color: #fff;
+      background-size: 100% auto;
+      background-repeat: no-repeat;
+      padding-top: 200rpx;
+      border-radius: 20rpx;
+      box-sizing: border-box;
+      padding-bottom: 20rpx;
+    }
+    
+    .ticket_item{
+      display: flex;
+      position: relative;
+      width: 540rpx;
+      height: @ticketHeight;
+      margin: 20rpx auto;
+      border-radius: 20rpx;
+      padding: 30rpx;
+      box-sizing: border-box;
+      background: #EEEEEE url("//sandbox-img.jufubao.cn/uploads/20231205/fee9b644b83495c9ba8a4db277600b54.jpg") no-repeat;
+      background-size: auto @bgHeight;
+      background-position: 30rpx center;
+
+      &.P,
+      &.Y{
+
+      }
+      &.N{
+        .ticket_names{
+          .name_main{
+            color: #BBBBBB;
+          }
+        }
+        .ticket_icon{
+          color: #D6D6D6;
+          
+        }
+        .btn{
+          .xd-button{
+            background-color: #DDDDDD !important;
+            color: #999999 !important;
+          }
+        }
+      }
+      .name_tit{
+        font-size: 28rpx;
+        margin-left: 20rpx;
+      }
+      .ticket_names{
+        width: 168rpx;
+        height: 120rpx;
+        text-align: center;
+        font-size: 28rpx;
+        .name_main{
+          margin-bottom: 26rpx;
+          margin-top: 20rpx;
+          color: #fb5b3f;
+        }
+        .name_sub{
+          font-size: 24rpx;
+          color: #FFFFFF;
+        }
+      }
+      .ticket_icon{
+        font-size: 80rpx !important;
+        position: absolute;
+        top: 0;
+        right: 0;
+      }
+      .btn{
+        position: absolute;
+        right: 20rpx;
+        bottom: 20rpx;
+        .xd-button{
+          height: 30rpx;
+          width: 100rpx;
+          font-size: 28rpx;
+          background-size: cover !important;
+          background-color: #fb5b3f;
+        }
+      }
+
+    }
+    .dialog_close{
+      position: absolute;
+      bottom: 0rpx;
+      left: 50%;
+      transform: translateX(-50%);
+    }
+  }
+</style>

package/src/components/JfbBaseConList/Attr.js

@@ -6,6 +6,17 @@
 export default {
   style: [],
   content: [
+    {
+      label: '查看已领票券路径:', //label
+      ele: 'xd-select-pages-path', //package 名称
+      valueKey: 'collectedPath', //form[valueKey]
+      placeholder: '请选择查看已领票券路径',
+      value: null,
+      setting: {
+        router: XdBus.getParentApi('getPagesTree'),
+      },
+      inline: false,
+    },
     // {
     //   label: '领券规则:',
     //   ele: 'xd-site-news',

package/src/components/JfbBaseConList/JfbBaseConList.vue

@@ -16,15 +16,14 @@
       <view class="jfb-base-con-list__edit-icon" @click="delEdit">删除</view>
     </view>
     <!-- #endif -->
-    <view class="jfb-base-con-list__body" v-if="done">
+    <view class="jfb-base-con-list__body" v-if="done" :style="{
+      backgroundImage: `url(${background})`,
+      backgroundSize: '100%',
+      backgroundRepeat: 'no-repeat',
+      minHeight: `${layoutInfo.bodyMinHeightRpx}rpx`,
+    }">
       <view
         v-if="couponList&&couponList.length > 0"
-        :style="{
-          backgroundImage: `url(${background})`,
-          backgroundSize: '100%',
-          backgroundRepeat: 'no-repeat',
-          height: `${layoutInfo.bodyMinHeightRpx}rpx`,
-        }"
       >
         <view class="jfb-base-con-list__body-content">
           <view class="jfb-base-con-list__body-content-header">
@@ -41,7 +40,7 @@
               <xd-font-icon size="20" icon="iconxiangyou_xian"></xd-font-icon>
             </view>
           </view>
-          <view class="jfb-base-con-list__body-content-list">
+          <view v-if="can_take === 'Y' && has_times === 'Y'" class="jfb-base-con-list__body-content-list">
             <view v-for="(item, index) in couponList" :key="index">
               <view
                 class="jfb-base-con-list__body-content-list-item"
@@ -106,24 +105,27 @@
                     <view></view>
 
                     <xd-button
-                      v-if="item.can_take_num !== 'Y'"
                       size="small"
-                      :disabled="item.remain_card_count == 0"
+                      :disabled="item.can_take_num !=='Y' && item.remain_card_count == 0"
                       @click="getCoupont(item)"
                       type="primary"
+                      style="width: 170rpx;height: 60rpx;"
                       :style="item.btn"
                       :color="item.infoColor"
-                      >领取</xd-button
-                    >
+                      >{{ item.btn_txt }}</xd-button>
                   </view>
                 </view>
               </view>
             </view>
           </view>
-          <view class="jfb-base-con-list__body-content-foot"
-            >可在我的-我的票券进行查看</view
-          >
+          <view v-else class="jfb-base-con-list__body-content-list" style="padding-bottom: 60rpx;">
+            <image mode="widthFix" :src="used_up_url"></image>
+          </view>
         </view>
+        <view class="jfb-base-con-list__body-content-foot"
+          @click="toCoupon"
+          >查看已领票券</view
+        >
       </view>
       <view
         v-else
@@ -180,6 +182,9 @@ export default {
       activity_id: "",
       background: "",
       app_coupon_url: "",
+      used_up_url: "",
+      can_take: "",
+      has_times: "",
       method: "entry",
       maxTime: 5, //最长轮询2的N次方（秒）
       date: 2, //时间底数
@@ -188,6 +193,9 @@ export default {
       order_num: null,
       done: false,
       message: "",
+      options: {},
+
+      collectedPath: "",
     };
   },
   computed: {
@@ -213,11 +221,13 @@ export default {
     init(value) {
       this.contentBackground = '#FFF8F8';
       this.iconColor = '#FF4D4A';
+      this.collectedPath = getContainerPropsValue(value, "content.collectedPath", {value: ''}).value;
     },
     getList() {
       jfbRootExec("getCouponList", {
         vm: this,
         data: {
+          ...this.options,
           distribution_method: this.method,
           namespace: this.pageBusinessCode,
           activity_id: this.activity_id,
@@ -225,16 +235,22 @@ export default {
       })
         .then((res) => {
           this.background = getServiceUrl(res.background);
+          this.used_up_url = res.used_up_url && getServiceUrl(res.used_up_url);
+          this.can_take = res.can_take;
+          this.has_times = res.has_times;
+          
           this.couponList =
             res.list &&
             res.list.length > 0 &&
             res.list.map((item) => {
+              let mapArr = {"Y": "去查看", "P": "领取", "N": "已发完"}
+              item.btn_txt = mapArr[item.can_take_num];
               if (item.can_take_num === "Y" || item.can_take_num === "P") {
                 //按钮样式
                 item.btn = res.app_coupon_button_bg_url
                   ? {
                       backgroundImage: `url(${getServiceUrl(
-                        res.app_coupon_button_bg_url
+                        item.can_take_num === "Y" ? res.app_coupon_button_see_url : res.app_coupon_button_bg_url
                       )})`,
                       backgroundSize: "100%",
                       backgroundRepeat: "no-repeat",
@@ -288,11 +304,21 @@ export default {
           console.log(err, "err");
         });
     },
+    toCoupon(){
+      this.$xdUniHelper.navigateTo({
+        url: this.collectedPath,
+      });
+    },
     getCoupont(item) {
+      if(item.can_take_num === "Y") {
+        this.toCoupon();
+        return;
+      }
       this.$xdShowLoading({});
       jfbRootExec("getAllCoupon", {
         vm: this,
         data: {
+          ...this.options,
           distribution_method: this.method,
           namespace: this.pageBusinessCode,
           activity_id: this.activity_id,
@@ -324,11 +350,13 @@ export default {
       jfbRootExec("getCouponResult", {
         vm: this,
         data: {
+          ...this.options,
           tmp_order_number: this.order_num,
         },
       })
         .then((res) => {
           if (res.status_type === "success") {
+            this.order_num = null;
             this.$xdHideLoading();
             this.$xdAlert({
               content: "领取成功",
@@ -398,6 +426,7 @@ export default {
     // },
     onJfbLoad(options) {
       console.log(this.pageBusinessCode, "pageNamespace");
+      this.options = options;
       this.activity_id = options.activity_id;
       this.method = options.distribution_method
         ? options.distribution_method
@@ -438,6 +467,9 @@ export default {
   &__body {
     position: relative;
     overflow-y: auto;
+    padding-top: 220rpx;
+    box-sizing: border-box;
+    background-color: #FAFAFA;
     .empty_data {
       text-align: center;
       color: #999999;
@@ -455,8 +487,6 @@ export default {
       border-radius: unit(20, rpx);
       background: #fff;
       padding: unit(34, rpx);
-      position: relative;
-      top: unit(164, rpx);
       margin-right: auto;
       margin-left: auto;
       width: unit(650, rpx);
@@ -534,7 +564,7 @@ export default {
         color: #a6a6a6;
         font-size: unit(24, rpx);
         text-align: center;
-        margin-top: unit(40, rpx);
+        margin: unit(40, rpx) 0;
       }
     }
   }

package/src/components/JfbBaseConList/Mock.js

@@ -1,11 +1,25 @@
 'use strict';
 
 module.exports = {
-  getCouponList: {"list":[
-    {"prize_id":153,"prize_name":"满50减50","prize_type":"满减券","prize_num":1,"can_take":"Y","is_over":"N","can_take_num":"P","today_times":1,"today_num":0,"total_times":1,"total_num":0,"remain_card_count":55},
-    {"prize_id":153,"prize_name":"满50减50","prize_type":"满减券","prize_num":1,"can_take":"Y","is_over":"N","can_take_num":"P","today_times":1,"today_num":0,"total_times":1,"total_num":0,"remain_card_count":55},
-    {"prize_id":153,"prize_name":"满50减50","prize_type":"满减券","prize_num":1,"can_take":"Y","is_over":"N","can_take_num":"P","today_times":1,"today_num":0,"total_times":1,"total_num":0,"remain_card_count":55}
-  ],"background":"//sandbox-img.jufubao.cn/uploads/20231204/96b801e0dc27422c183dc90d905dd2ed.jpg","can_take":"Y","message":"","app_coupon_url":"//sandbox-img.jufubao.cn/uploads/20231205/fee9b644b83495c9ba8a4db277600b54.jpg","app_activity_button":"//sandbox-img.jufubao.cn/uploads/20231207/35f3065b2b2bc3fc2dda73d7b5b9eae8.jpg","app_coupon_button_bg_url":"//sandbox-img.jufubao.cn/uploads/20231212/026a3ea901f87f51b531d06c24604676.png","app_coupon_invalid_url":"//sandbox-img.jufubao.cn/uploads/20231208/8b153ce4870686a37295c16fbc992235.jpg","request_id":"a2603f2a480485f4"},
+  getCouponList: {
+    "list":[
+      {"prize_id":153,"prize_name":"满50减50","prize_type":"满减券","prize_num":1,"can_take":"Y","is_over":"N","can_take_num":"P","today_times":1,"today_num":0,"total_times":1,"total_num":0,"remain_card_count":55},
+      {"prize_id":153,"prize_name":"满50减50","prize_type":"满减券","prize_num":1,"can_take":"Y","is_over":"N","can_take_num":"P","today_times":1,"today_num":0,"total_times":1,"total_num":0,"remain_card_count":55},
+      {"prize_id":153,"prize_name":"满50减50","prize_type":"满减券","prize_num":1,"can_take":"Y","is_over":"N","can_take_num":"P","today_times":1,"today_num":0,"total_times":1,"total_num":0,"remain_card_count":55}
+    ],
+    "background":"//sandbox-img.jufubao.cn/uploads/20231204/96b801e0dc27422c183dc90d905dd2ed.jpg",
+    "used_up_url": "",
+    "has_times": "Y",
+    "can_take":"Y",
+    "message":"",
+    "app_coupon_url":"//sandbox-img.jufubao.cn/uploads/20231205/fee9b644b83495c9ba8a4db277600b54.jpg",
+    "app_activity_button":"//sandbox-img.jufubao.cn/uploads/20231207/35f3065b2b2bc3fc2dda73d7b5b9eae8.jpg",
+    "app_coupon_button_bg_url":"//sandbox-img.jufubao.cn/uploads/20231212/026a3ea901f87f51b531d06c24604676.png",
+    "app_coupon_button_see_url": "//sandbox-img.jufubao.cn/uploads/20231212/026a3ea901f87f51b531d06c24604676.png",
+    "app_coupon_invalid_url":"//sandbox-img.jufubao.cn/uploads/20231208/8b153ce4870686a37295c16fbc992235.jpg",
+    "rule":"<p>打发&middot;</p>",
+    "request_id":"a2603f2a480485f4"
+  },
   getAllCoupon: {
     "request_id": "5987aa28c709d4ef"
   }

package/src/components/JfbBasePay/Api.js

@@ -23,9 +23,10 @@ module.exports = [
     disabled: true,
   },
   {
-    mapFnName: 'getBaseOrderDetail', //自定义方法名字（必选）
+    mapFnName: 'getBaseOrderStatus', //自定义方法名字（必选）
     title: '获取订单详情',
-    path: '/order/v1/order/detail',
+    // path: '/order/v1/order/detail',
+    path: "/order/v1/order/pay-status",
     isRule: false,
     params: {
       main_order_id: ['id', 'Number', '必选'],

package/src/components/JfbBasePay/JfbBasePay.vue

@@ -297,23 +297,29 @@ export default {
       return time;
     },
     p_getBaseOrderDetail(){
-      jfbRootExec("getBaseOrderDetail", {
-        vm: this,
-        data: {
-          main_order_id: this.main_order_id,
-        }
-      }).then(res => {
-        let { is_can_pay, can_pay_message } = res.can_pay_info
-        this.is_can_pay = is_can_pay;
-        this.can_pay_message = can_pay_message;
-        if(is_can_pay !== "Y"){
-          uni.showToast({
-            title: can_pay_message,
-            icon: 'none',
-            duration: 3000
-          });
-          // this.$xdNavigateBack()
-        }
+      return new Promise((resolve, reject) => {
+        jfbRootExec("getBaseOrderStatus", {
+          vm: this,
+          data: {
+            main_order_id: this.main_order_id,
+          }
+        }).then(res => {
+          let { is_can_pay, can_pay_message } = res.can_pay_info
+          this.is_can_pay = is_can_pay;
+          this.can_pay_message = can_pay_message;
+          if(is_can_pay !== "Y"){
+            uni.showToast({
+              title: can_pay_message,
+              icon: 'none',
+              duration: 3000
+            });
+            reject();
+            // this.$xdNavigateBack()
+          }
+          resolve();
+        }).catch(err => {
+          reject();
+        })
       })
     },
     p_getPayOrderDetail() {
@@ -358,8 +364,12 @@ export default {
         });
     },
     //第三方支付
-    doThirdPay() {
+    async doThirdPay() {
       if (this.$configProject.isPreview) return;
+
+      if(this.type !== 'recharge') {
+        await this.p_getBaseOrderDetail();
+      }
       const {channel_provider_id, order_id, payInfo} = this;
       let {login_providers = []} = this.projectAttr;
       console.log(this.projectAttr)

package/src/components/JfbBaseSaasBlessDetail/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/JfbBaseSaasBlessDetail/Attr.js

@@ -0,0 +1,106 @@
+'use strict';
+
+/**
+ * @description 当表单组件中有联动操作时候，使用方法进行返回
+ */
+export default {
+  style: [],
+  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
+        ele: 'xd-select-pages-path', //package 名称
+        valueKey: 'select-pages-path', //form[valueKey]
+        value: data['select-pages-path'] || {},
+        setting: {
+          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',
+    },
+  ],
+};