jufubao-base 1.0.176 → 1.0.177-beta3

package/src/components/JfbBaseCardDelay/JfbBaseCardDelay.vue

@@ -2,110 +2,285 @@
   <view
     class="jfb-base-card-delay"
     @click="handleEditxSelect"
-    :class="{ editx : isEditx && active }"
+    :class="{ editx: isEditx && active }"
   >
     <!--#ifdef H5-->
     <view
       class="jfb-base-card-delay__edit"
-      :class="{ editx : isEditx && active }"
+      :class="{ editx: isEditx && active }"
       v-if="isEditx && active"
     >
       <view class="jfb-base-card-delay__edit-icon" @click="delEdit">删除</view>
     </view>
     <!-- #endif -->
     <view class="jfb-base-card-delay__body">
-      <view>测试插件( {{containerId}} )</view>
+      <view>
+        <view class="wrap">
+          <input placeholder="输入券号" v-model="card_number" type="text" />
+        </view>
+        <view v-if="packageList && packageList.length > 0" class="package">
+          <view
+            v-for="(item, index) in packageList"
+            :key="index"
+            @click="activeIndex = index"
+            :style="{
+              background: activeIndex === index ? backgroundColor : '#fff',
+              color: activeIndex === index ? mainColor : '#333',
+              marginRight: (index + 1) % 3 == 0 ? '0' : '36rpx',
+            }"
+            class="package-item"
+          >
+            <view>{{ item.package_name }}</view>
+            <view>
+              <text>{{ item.pay_amount }}</text
+              >元宝</view
+            >
+          </view>
+        </view>
+        <view class="wrap" style="margin-top: 28rpx" v-if="notice">
+          <view
+            style="
+              text-align: center;
+              padding-bottom: 36rpx;
+              color: #333;
+              font-weight: 500;
+              font-size: 28rpx;
+            "
+            >延期规则</view
+          >
+          <xd-content-xss :html="notice"></xd-content-xss>
+        </view>
+        <view
+          v-if="!package_id"
+          class="jfb-base-card-delay__body-footer"
+          :style="prod_bottom"
+        >
+          <xd-button
+            width="560rpx"
+            v-if="card_number"
+            type="primary"
+            @click="getList"
+            >下一步</xd-button
+          >
+          <xd-button
+            width="560rpx"
+            v-else
+            disabled="true"
+            type="primary"
+            @click="getList"
+            >下一步</xd-button
+          >
+        </view>
+        <view
+          v-else
+          class="jfb-base-card-delay__body-footer"
+          :style="prod_bottom"
+        >
+          <xd-button
+            width="560rpx"
+            type="primary"
+            @click="handleBuy"
+            >{{pay_amount}}元延期</xd-button
+          >
+        </view>
+      </view>
     </view>
   </view>
 </template>
 
 <script>
-  import XdFontIcon from "@/components/XdFontIcon/XdFontIcon";
-  import { jfbRootExec } from "@/utils/xd.event";
-  import JfbBaseCardDelayMixin from "./JfbBaseCardDelayMixin";
-  import { getContainerPropsValue } from "@/utils/xd.base";
-  import componentsMixins from "@/mixins/componentsMixins";
-  import extsMixins from "@/mixins/extsMixins";
-  export default {
-    name: "JfbBaseCardDelay",
-    components: {
-      XdFontIcon
-    },
-    mixins: [
-      componentsMixins, extsMixins, JfbBaseCardDelayMixin
-    ],
-    data() {
-      return {
+import XdFontIcon from "@/components/XdFontIcon/XdFontIcon";
+import XdButton from "@/components/XdButton/XdButton";
+import { jfbRootExec } from "@/utils/xd.event";
+import JfbBaseCardDelayMixin from "./JfbBaseCardDelayMixin";
+import { getContainerPropsValue } from "@/utils/xd.base";
+import componentsMixins from "@/mixins/componentsMixins";
+import XdContentXss from "@/components/XdContentXss/XdContentXss";
+import extsMixins from "@/mixins/extsMixins";
+import colorCardMixins from "@/mixins/colorCardMixins";
+const Color = require("color");
 
-        //todo
-      }
-    },
-    watch: {
-      container(value, oldValue) {
-        if (JSON.stringify(value) === JSON.stringify(oldValue)) return;
-        if (this.$configProject['isPreview']) this.init(value)
-      },
+export default {
+  name: "JfbBaseCardDelay",
+  components: {
+    XdFontIcon,
+    XdContentXss,
+    XdButton,
+  },
+  mixins: [
+    componentsMixins,
+    extsMixins,
+    JfbBaseCardDelayMixin,
+    colorCardMixins,
+  ],
+  data() {
+    return {
+      notice: "",
+      card_number: "",
+      backgroundColor: "",
+      packageList: [],
+      activeIndex: 0,
+      package_id: null,
+      payPath: "",
+      pay_amount: 0
+    };
+  },
+  computed: {
+    prod_bottom() {
+      return this.fixedStyle({ height: 0, zIndex: 111 });
     },
-    created() {
-      this.init(this.container);
-
-      //todo
+  },
+  watch: {
+    container(value, oldValue) {
+      if (JSON.stringify(value) === JSON.stringify(oldValue)) return;
+      if (this.$configProject["isPreview"]) this.init(value);
     },
-    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)
-      },
+    activeIndex(n,o) {
+      if(n!==o) {
+        this.package_id = this.packageList[n].id;
+        this.pay_amount = this.packageList[n].pay_amount;
+      }
     }
-  }
+  },
+  created() {
+    this.backgroundColor = Color(this.mainColor).alpha(0.2).toString();
+    this.init(this.container);
 
+    //todo
+  },
+  methods: {
+    onJfbLoad(options) {
+      this.getContent();
+      this.getList();
+    },
+    getContent() {
+      jfbRootExec("getListGiftNewsContentEntry", {
+        vm: this,
+        data: {
+          page_id: this.pageAttr["page_id"], //页面ID
+          container_id: this.containerId, //组件ID
+          limit: 1,
+        },
+      })
+        .then((res) => {
+          if (res.list && res.list.length > 0) {
+            this.notice = res.list[0].content;
+          }
+          this.statusNotice = true;
+        })
+        .catch((error) => {
+          console.error(error);
+        });
+    },
+    getList() {
+      jfbRootExec("getCardDelayPackageList", {
+        vm: this,
+        data: {
+          card_number: this.card_number,
+        },
+      })
+        .then((res) => {
+          if (res.list && res.list.length > 0) {
+            res.list = res.list.map((item) => {
+              return {
+                ...item,
+                pay_amount: this.$xdUniHelper.divisionFloatNumber(
+                  item.pay_amount,
+                  100
+                ),
+              };
+            });
+            this.packageList = res.list;
+            this.package_id = this.packageList[0].id;
+            this.pay_amount = this.packageList[0].pay_amount;
+          }
+        })
+        .catch((error) => {
+          console.error(error);
+        });
+    },
+    handleBuy() {
+      jfbRootExec("confirmDelayOrder", {
+        vm: this,
+        data: {
+          card_number: this.card_number, //页面ID
+          total_amount: this.pay_amount * 100, //组件ID
+          package_id: this.package_id,
+        },
+      })
+        .then((res) => {
+          this.$xdHideLoading();
+          this.$xdUniHelper.navigateTo({
+            url: `${this.payPath}?order_id=${res.pay_order_id}&main_order_id=${res.order_id}&type=delay`,
+          });
+        })
+        .catch((err) => {
+          this.$xdHideLoading();
+          console.log(err, "err");
+        });
+    },
+    /**
+     * @description 监听事件变化
+     * @param container {object} 业务组件对象自己
+     */
+    init(container) {
+      this.payPath = getContainerPropsValue(container, "content.payPath", {
+        value: "",
+      }).value;
+    },
+  },
+};
 </script>
 
 <style scoped lang="less">
-  @import "./JfbBaseCardDelayLess.less";
+@import "./JfbBaseCardDelayLess.less";
 
-  .jfb-base-card-delay {
-    &__body{
+.jfb-base-card-delay {
+  &__body {
+    padding: 26rpx;
+    .wrap {
+      border-radius: 20rpx;
+      border: 1rpx solid #eeeeee;
+      padding: 36rpx;
+      input {
+        height: 30rpx;
+        border-radius: 16rpx;
+        background: #fafafa;
+        border: 1px solid #eeeeee;
+        padding: 30rpx 40rpx;
+      }
+    }
+    &-footer {
+      position: fixed;
+      left: 0;
+      right: 0;
+      height: unit(100, rpx);
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      background: #fff;
+    }
+    .package {
+      display: flex;
+      align-items: center;
+      flex-wrap: wrap;
+      margin-top: 30rpx;
+      &-item {
+        padding: 40rpx 20rpx;
+        font-size: 28rpx;
+        text-align: center;
+        border-radius: 16rpx;
+        margin-right: 36rpx;
+        margin-bottom: 36rpx;
+        width: 24%;
 
+        & > view:nth-child(2) {
+          & > text {
+            font-size: 48rpx;
+          }
+        }
+      }
     }
   }
+}
 </style>

package/src/components/JfbBaseCardDetailEntry/Attr.js

@@ -50,5 +50,17 @@ export default {
       },
       inline: false,
     },
+    {
+      label: '票券转赠地址:',
+      ele: 'xd-select-pages-path',
+      valueKey: 'give_url',
+      groupKey:'advanced',
+      placeholder: '请选择票券转赠地址',
+      value: null,
+      setting: {
+        router: XdBus.getParentApi('getPagesTree'),
+      },
+      inline: false,
+    },
   ],
 };

package/src/components/JfbBaseCardDetailEntry/JfbBaseCardDetailEntry.vue

@@ -71,6 +71,13 @@
         <view v-if="0">
           <xd-button size="small" type="primary" width="100%">消费记录</xd-button>
         </view>
+        <view v-if="info.is_can_transfer==='Y'">
+          <xd-button
+            width="100%"
+            @click="handleGive()"
+            size="small"
+            type="primary">转赠</xd-button>
+        </view>
         <view v-if="info.is_exchange==='Y'">
           <xd-button
             width="100%"
@@ -155,6 +162,7 @@ export default {
       isBrandLogo: false,
       isShowUnbind: false, //是否启动绑定按钮
       headerBg: {},
+      give_url: ""
     };
   },
   watch: {
@@ -204,6 +212,7 @@ export default {
     init(container) {
       this.backUrl = getContainerPropsValue(container,  "content.back_url", { value: "" }).value;
       this.shift_url = getContainerPropsValue(container,  "content.shift_url", { value: "" }).value;
+      this.give_url = getContainerPropsValue(container,  "content.give_url", { value: "" }).value;
       //'wechat_mini_program|default'
       this.entryGroupId = getContainerPropsValue(container,"content.entryGroupId","default");
     },
@@ -305,6 +314,11 @@ export default {
           .catch();
       }, time);
     },
+    handleGive() {
+      this.$xdUniHelper.navigateTo({
+        url: `${this.give_url}?card_number=${this.info["card_number"]}`,
+      });
+    },
     /**
      * @description 已绑定卡登录
      * @param entry

package/src/components/JfbBaseCardDetailEntry/Mock.js

@@ -2,5 +2,5 @@
 
 module.exports = {
   getCardYueEntry: {},
-  getBaseByIdCardDetailEntry: {"card_number":"101001000008091","card_point":99875,"card_type_name":"多余额福卡","end_time":"2025-04-30","card_status":"Y","card_status_name":"开启","card_qrcode":"\/\/sandbox-apis.jufubao.cn\/common\/v1\/image\/qrcode?code_content=h.161.y7uomss6bqulqla","barcode":"\/\/sandbox-apis.jufubao.cn\/common\/v1\/image\/barcode?code_content=h.161.y7uomss6bqulqla","card_qrcode_expire":600,"unit":"点","main_business_code_name":"电影(勿改)、网络视听(勿改)、体检(勿改)","other_card_point":79900,"is_exchange":"N","exchange_card_type_name":"福券","exchange_card_point":98876,"card_point_type":2,"is_show_qrcode_logo":"Y","is_can_unbind":"Y","site_entry_settings":[{"id":57,"business_code":"movie","entry_name":"在线选座","image_url":"\/uploads\/20230927\/74fcb8bf1bf617249eee5f1416533766.png","redirect_data":"{\"path\":\"https:\\\/\\\/website-01.jufubao.cn\\\/base\\\/system\\\/zhrk\\\/zkrk\"}","redirect_type":"URL"},{"id":10,"business_code":"gift","entry_name":"礼包","image_url":"\/uploads\/20230927\/f1c8a447209eb04d77c2095a13cdadf4.png","redirect_data":"{\"dir\":\"apply\",\"host\":\"sandbox-website-05.jufubao.cn\",\"path\":\"\\\/main\\\/gift\\\/type\",\"site_id\":\"17928cc37788be02\",\"site_url\":\"https:\\\/\\\/sandbox-website-05.jufubao.cn\\\/apply\\\/main\\\/gift\\\/type\",\"frontPath\":\"\\\/apply\\\/main\\\/gift\\\/type\",\"fixed_business_code\":\"\"}","redirect_type":"INN"},{"id":7,"business_code":"movie","entry_name":"在线选座","image_url":"\/uploads\/20230927\/61b3302ec80009964e0a4b7b2336e5cf.png","redirect_data":"{\"dir\":\"apply\",\"host\":\"sandbox-website-05.jufubao.cn\",\"path\":\"\\\/main\\\/movie\\\/index\",\"site_id\":\"17928cc37788be02\",\"site_url\":\"https:\\\/\\\/sandbox-website-05.jufubao.cn\\\/apply\\\/main\\\/movie\\\/index\",\"frontPath\":\"\\\/apply\\\/main\\\/movie\\\/index\",\"fixed_business_code\":\"\"}","redirect_type":"INN"},{"id":9,"business_code":"cake","entry_name":"蛋糕","image_url":"\/uploads\/20230927\/e582dc796bdb703a10860bcbbbb378f3.png","redirect_data":"{\"dir\":\"apply\",\"host\":\"sandbox-website-05.jufubao.cn\",\"path\":\"\\\/main\\\/cake\\\/index\",\"site_id\":\"17928cc37788be02\",\"site_url\":\"https:\\\/\\\/sandbox-website-05.jufubao.cn\\\/apply\\\/main\\\/cake\\\/index\",\"frontPath\":\"\\\/apply\\\/main\\\/cake\\\/index\",\"fixed_business_code\":\"\"}","redirect_type":"INN"},{"id":18,"business_code":"book","entry_name":"图书","image_url":"\/uploads\/20230927\/9edcdc737c48cdbf9364e321e8199a93.png","redirect_data":"{\"dir\":\"apply\",\"host\":\"sandbox-website-05.jufubao.cn\",\"path\":\"\\\/main\\\/book\\\/index\",\"site_id\":\"17928cc37788be02\",\"site_url\":\"https:\\\/\\\/sandbox-website-05.jufubao.cn\\\/apply\\\/main\\\/book\\\/index\",\"frontPath\":\"\\\/apply\\\/main\\\/book\\\/index\",\"fixed_business_code\":\"\"}","redirect_type":"INN"},{"id":8,"business_code":"market","entry_name":"百货","image_url":"\/uploads\/20230927\/920c4bd80f0a995e245aedbfaf1181d5.png","redirect_data":"{\"dir\":\"apply02\",\"host\":\"sandbox-website-05.jufubao.cn\",\"path\":\"\\\/main\\\/mall\\\/index\",\"site_id\":\"17928cc37788be02\",\"site_url\":\"https:\\\/\\\/sandbox-website-05.jufubao.cn\\\/apply02\\\/main\\\/mall\\\/index\",\"frontPath\":\"\\\/apply02\\\/main\\\/mall\\\/index\",\"fixed_business_code\":\"\"}","redirect_type":"INN"},{"id":17,"business_code":"video","entry_name":"网络视听","image_url":"\/uploads\/20230927\/1ca9647b7ddd9937054792412d3c2367.png","redirect_data":"{\"dir\":\"apply\",\"host\":\"sandbox-website-05.jufubao.cn\",\"path\":\"\\\/main\\\/video\\\/index\",\"site_id\":\"17928cc37788be02\",\"site_url\":\"https:\\\/\\\/sandbox-website-05.jufubao.cn\\\/apply\\\/main\\\/video\\\/index\",\"frontPath\":\"\\\/apply\\\/main\\\/video\\\/index\",\"fixed_business_code\":\"\"}","redirect_type":"INN"},{"id":35,"business_code":"v-RcA8Mv-Gpd96_Y_mjIf","entry_name":"全福券","image_url":"\/uploads\/20230927\/53191864826b864b8b6fd4f1eb397a93.png","redirect_data":"{\"dir\":\"apply\",\"host\":\"sandbox-website-05.jufubao.cn\",\"path\":\"\\\/system\\\/card\\\/card\",\"site_id\":\"17928cc37788be02\",\"site_url\":\"https:\\\/\\\/sandbox-website-05.jufubao.cn\\\/apply\\\/system\\\/card\\\/card\",\"frontPath\":\"\\\/apply\\\/system\\\/card\\\/card\",\"fixed_business_code\":\"\"}","redirect_type":"INN"},{"id":40,"business_code":"93028be3","entry_name":"专区","image_url":"\/uploads\/20230927\/84d23a8c7af7a63842eb696c00068b3d.png","redirect_data":"{\"dir\":\"apply05\",\"host\":\"sandbox-website-05.jufubao.cn\",\"path\":\"\\\/main\\\/mall\\\/index\",\"site_id\":\"17928cc37788be02\",\"site_url\":\"https:\\\/\\\/sandbox-website-05.jufubao.cn\\\/apply05\\\/main\\\/mall\\\/index\",\"frontPath\":\"\\\/apply05\\\/main\\\/mall\\\/index\",\"fixed_business_code\":\"-y8t4cmogeFvi8fmuxFSK\"}","redirect_type":"INN"},{"id":34,"business_code":"food","entry_name":"餐饮","image_url":"\/uploads\/20230927\/97728bf3ef2a6361c0a1771549d2d435.png","redirect_data":"{\"dir\":\"apply\",\"host\":\"sandbox-website-05.jufubao.cn\",\"path\":\"\\\/main\\\/food\\\/rkym\",\"site_id\":\"17928cc37788be02\",\"site_url\":\"https:\\\/\\\/sandbox-website-05.jufubao.cn\\\/apply\\\/main\\\/food\\\/rkym\",\"frontPath\":\"\\\/apply\\\/main\\\/food\\\/rkym\",\"fixed_business_code\":\"\"}","redirect_type":"INN"},{"id":54,"business_code":"health","entry_name":"体检","image_url":"\/uploads\/20230927\/e06b058a2104025ffecee960b3b9321d.png","redirect_data":"{\"dir\":\"apply\",\"host\":\"sandbox-website-05.jufubao.cn\",\"path\":\"\\\/main\\\/health\\\/index\",\"site_id\":\"17928cc37788be02\",\"site_url\":\"https:\\\/\\\/sandbox-website-05.jufubao.cn\\\/apply\\\/main\\\/health\\\/index\",\"frontPath\":\"\\\/apply\\\/main\\\/health\\\/index\",\"fixed_business_code\":\"\"}","redirect_type":"INN"},{"id":30,"business_code":"travel","entry_name":"旅游","image_url":"\/uploads\/20230927\/09ceefe2d1776a399b567c7acdf2c9db.png","redirect_data":"{\"dir\":\"apply\",\"host\":\"sandbox-website-05.jufubao.cn\",\"path\":\"\\\/main\\\/travel\\\/index\",\"site_id\":\"17928cc37788be02\",\"site_url\":\"https:\\\/\\\/sandbox-website-05.jufubao.cn\\\/apply\\\/main\\\/travel\\\/index\",\"frontPath\":\"\\\/apply\\\/main\\\/travel\\\/index\",\"fixed_business_code\":\"\"}","redirect_type":"INN"},{"id":16,"business_code":"play","entry_name":"演出","image_url":"\/uploads\/20230927\/07e1d76f1850fbadc9a12d7ff2d7689c.png","redirect_data":"{\"dir\":\"apply\",\"host\":\"sandbox-website-05.jufubao.cn\",\"path\":\"\\\/main\\\/play\\\/index\",\"site_id\":\"17928cc37788be02\",\"site_url\":\"https:\\\/\\\/sandbox-website-05.jufubao.cn\\\/apply\\\/main\\\/play\\\/index\",\"frontPath\":\"\\\/apply\\\/main\\\/play\\\/index\",\"fixed_business_code\":\"\"}","redirect_type":"INN"}],"business_codes":["movie","market","cake","book"],"request_id":"58eec3f9f6e96cf0"}
+  getBaseByIdCardDetailEntry: {"card_number":"101001000008091","card_point":99875,"card_type_name":"多余额福卡","end_time":"2025-04-30","card_status":"Y","card_status_name":"开启","is_can_transfer":"Y","card_qrcode":"\/\/sandbox-apis.jufubao.cn\/common\/v1\/image\/qrcode?code_content=h.161.y7uomss6bqulqla","barcode":"\/\/sandbox-apis.jufubao.cn\/common\/v1\/image\/barcode?code_content=h.161.y7uomss6bqulqla","card_qrcode_expire":600,"unit":"点","main_business_code_name":"电影(勿改)、网络视听(勿改)、体检(勿改)","other_card_point":79900,"is_exchange":"N","exchange_card_type_name":"福券","exchange_card_point":98876,"card_point_type":2,"is_show_qrcode_logo":"Y","is_can_unbind":"Y","site_entry_settings":[{"id":57,"business_code":"movie","entry_name":"在线选座","image_url":"\/uploads\/20230927\/74fcb8bf1bf617249eee5f1416533766.png","redirect_data":"{\"path\":\"https:\\\/\\\/website-01.jufubao.cn\\\/base\\\/system\\\/zhrk\\\/zkrk\"}","redirect_type":"URL"},{"id":10,"business_code":"gift","entry_name":"礼包","image_url":"\/uploads\/20230927\/f1c8a447209eb04d77c2095a13cdadf4.png","redirect_data":"{\"dir\":\"apply\",\"host\":\"sandbox-website-05.jufubao.cn\",\"path\":\"\\\/main\\\/gift\\\/type\",\"site_id\":\"17928cc37788be02\",\"site_url\":\"https:\\\/\\\/sandbox-website-05.jufubao.cn\\\/apply\\\/main\\\/gift\\\/type\",\"frontPath\":\"\\\/apply\\\/main\\\/gift\\\/type\",\"fixed_business_code\":\"\"}","redirect_type":"INN"},{"id":7,"business_code":"movie","entry_name":"在线选座","image_url":"\/uploads\/20230927\/61b3302ec80009964e0a4b7b2336e5cf.png","redirect_data":"{\"dir\":\"apply\",\"host\":\"sandbox-website-05.jufubao.cn\",\"path\":\"\\\/main\\\/movie\\\/index\",\"site_id\":\"17928cc37788be02\",\"site_url\":\"https:\\\/\\\/sandbox-website-05.jufubao.cn\\\/apply\\\/main\\\/movie\\\/index\",\"frontPath\":\"\\\/apply\\\/main\\\/movie\\\/index\",\"fixed_business_code\":\"\"}","redirect_type":"INN"},{"id":9,"business_code":"cake","entry_name":"蛋糕","image_url":"\/uploads\/20230927\/e582dc796bdb703a10860bcbbbb378f3.png","redirect_data":"{\"dir\":\"apply\",\"host\":\"sandbox-website-05.jufubao.cn\",\"path\":\"\\\/main\\\/cake\\\/index\",\"site_id\":\"17928cc37788be02\",\"site_url\":\"https:\\\/\\\/sandbox-website-05.jufubao.cn\\\/apply\\\/main\\\/cake\\\/index\",\"frontPath\":\"\\\/apply\\\/main\\\/cake\\\/index\",\"fixed_business_code\":\"\"}","redirect_type":"INN"},{"id":18,"business_code":"book","entry_name":"图书","image_url":"\/uploads\/20230927\/9edcdc737c48cdbf9364e321e8199a93.png","redirect_data":"{\"dir\":\"apply\",\"host\":\"sandbox-website-05.jufubao.cn\",\"path\":\"\\\/main\\\/book\\\/index\",\"site_id\":\"17928cc37788be02\",\"site_url\":\"https:\\\/\\\/sandbox-website-05.jufubao.cn\\\/apply\\\/main\\\/book\\\/index\",\"frontPath\":\"\\\/apply\\\/main\\\/book\\\/index\",\"fixed_business_code\":\"\"}","redirect_type":"INN"},{"id":8,"business_code":"market","entry_name":"百货","image_url":"\/uploads\/20230927\/920c4bd80f0a995e245aedbfaf1181d5.png","redirect_data":"{\"dir\":\"apply02\",\"host\":\"sandbox-website-05.jufubao.cn\",\"path\":\"\\\/main\\\/mall\\\/index\",\"site_id\":\"17928cc37788be02\",\"site_url\":\"https:\\\/\\\/sandbox-website-05.jufubao.cn\\\/apply02\\\/main\\\/mall\\\/index\",\"frontPath\":\"\\\/apply02\\\/main\\\/mall\\\/index\",\"fixed_business_code\":\"\"}","redirect_type":"INN"},{"id":17,"business_code":"video","entry_name":"网络视听","image_url":"\/uploads\/20230927\/1ca9647b7ddd9937054792412d3c2367.png","redirect_data":"{\"dir\":\"apply\",\"host\":\"sandbox-website-05.jufubao.cn\",\"path\":\"\\\/main\\\/video\\\/index\",\"site_id\":\"17928cc37788be02\",\"site_url\":\"https:\\\/\\\/sandbox-website-05.jufubao.cn\\\/apply\\\/main\\\/video\\\/index\",\"frontPath\":\"\\\/apply\\\/main\\\/video\\\/index\",\"fixed_business_code\":\"\"}","redirect_type":"INN"},{"id":35,"business_code":"v-RcA8Mv-Gpd96_Y_mjIf","entry_name":"全福券","image_url":"\/uploads\/20230927\/53191864826b864b8b6fd4f1eb397a93.png","redirect_data":"{\"dir\":\"apply\",\"host\":\"sandbox-website-05.jufubao.cn\",\"path\":\"\\\/system\\\/card\\\/card\",\"site_id\":\"17928cc37788be02\",\"site_url\":\"https:\\\/\\\/sandbox-website-05.jufubao.cn\\\/apply\\\/system\\\/card\\\/card\",\"frontPath\":\"\\\/apply\\\/system\\\/card\\\/card\",\"fixed_business_code\":\"\"}","redirect_type":"INN"},{"id":40,"business_code":"93028be3","entry_name":"专区","image_url":"\/uploads\/20230927\/84d23a8c7af7a63842eb696c00068b3d.png","redirect_data":"{\"dir\":\"apply05\",\"host\":\"sandbox-website-05.jufubao.cn\",\"path\":\"\\\/main\\\/mall\\\/index\",\"site_id\":\"17928cc37788be02\",\"site_url\":\"https:\\\/\\\/sandbox-website-05.jufubao.cn\\\/apply05\\\/main\\\/mall\\\/index\",\"frontPath\":\"\\\/apply05\\\/main\\\/mall\\\/index\",\"fixed_business_code\":\"-y8t4cmogeFvi8fmuxFSK\"}","redirect_type":"INN"},{"id":34,"business_code":"food","entry_name":"餐饮","image_url":"\/uploads\/20230927\/97728bf3ef2a6361c0a1771549d2d435.png","redirect_data":"{\"dir\":\"apply\",\"host\":\"sandbox-website-05.jufubao.cn\",\"path\":\"\\\/main\\\/food\\\/rkym\",\"site_id\":\"17928cc37788be02\",\"site_url\":\"https:\\\/\\\/sandbox-website-05.jufubao.cn\\\/apply\\\/main\\\/food\\\/rkym\",\"frontPath\":\"\\\/apply\\\/main\\\/food\\\/rkym\",\"fixed_business_code\":\"\"}","redirect_type":"INN"},{"id":54,"business_code":"health","entry_name":"体检","image_url":"\/uploads\/20230927\/e06b058a2104025ffecee960b3b9321d.png","redirect_data":"{\"dir\":\"apply\",\"host\":\"sandbox-website-05.jufubao.cn\",\"path\":\"\\\/main\\\/health\\\/index\",\"site_id\":\"17928cc37788be02\",\"site_url\":\"https:\\\/\\\/sandbox-website-05.jufubao.cn\\\/apply\\\/main\\\/health\\\/index\",\"frontPath\":\"\\\/apply\\\/main\\\/health\\\/index\",\"fixed_business_code\":\"\"}","redirect_type":"INN"},{"id":30,"business_code":"travel","entry_name":"旅游","image_url":"\/uploads\/20230927\/09ceefe2d1776a399b567c7acdf2c9db.png","redirect_data":"{\"dir\":\"apply\",\"host\":\"sandbox-website-05.jufubao.cn\",\"path\":\"\\\/main\\\/travel\\\/index\",\"site_id\":\"17928cc37788be02\",\"site_url\":\"https:\\\/\\\/sandbox-website-05.jufubao.cn\\\/apply\\\/main\\\/travel\\\/index\",\"frontPath\":\"\\\/apply\\\/main\\\/travel\\\/index\",\"fixed_business_code\":\"\"}","redirect_type":"INN"},{"id":16,"business_code":"play","entry_name":"演出","image_url":"\/uploads\/20230927\/07e1d76f1850fbadc9a12d7ff2d7689c.png","redirect_data":"{\"dir\":\"apply\",\"host\":\"sandbox-website-05.jufubao.cn\",\"path\":\"\\\/main\\\/play\\\/index\",\"site_id\":\"17928cc37788be02\",\"site_url\":\"https:\\\/\\\/sandbox-website-05.jufubao.cn\\\/apply\\\/main\\\/play\\\/index\",\"frontPath\":\"\\\/apply\\\/main\\\/play\\\/index\",\"fixed_business_code\":\"\"}","redirect_type":"INN"}],"business_codes":["movie","market","cake","book"],"request_id":"58eec3f9f6e96cf0"}
 }

package/src/components/JfbBaseCardDisabled/JfbBaseCardDisabled.vue

@@ -67,7 +67,7 @@
                 </view>
                 <view>
                   <view>{{ item.card_number }}</view>
-                  <view>有效期至:--</view>
+                  <view>有效期至:{{item['is_show_baseinfo'] === 'Y'? item['end_time'] :'--'}}</view>
                 </view>
               </view>
               <view class="jfb-base-card-disabled__body-card-item-right-bottom">
@@ -75,7 +75,7 @@
                   <view
                     style="color: #b8b7be"
                     class="jfb-base-card-disabled__body-card-item-right-bottom-info-residue"
-                  >剩余{{ item.unit }}数：--{{ item.unit }}</view>
+                  >剩余{{ item.unit }}数：{{item['is_show_baseinfo'] === 'Y'? `${item['card_point']} ${item.unit}`:'--'}}</view>
                 </view>
                 <view
                   @click.stop="handleUnBindCard(item)"

package/src/components/JfbBaseCardDisabledEntry/JfbBaseCardDisabledEntry.vue

@@ -10,9 +10,7 @@
       :class="{ editx: isEditx && active }"
       v-if="isEditx && active"
     >
-      <view class="jfb-base-card-disabled-entry__edit-icon" @click="delEdit"
-      >删除</view
-      >
+      <view class="jfb-base-card-disabled-entry__edit-icon" @click="delEdit">删除</view>
     </view>
     <!-- #endif -->
     <view class="jfb-base-card-disabled-entry__body">
@@ -46,16 +44,19 @@
                 </div>
                 <view class="card-list__date">
                   <text>有效期：</text>
-                  <text>--</text>
+                  <text>{{item['is_show_baseinfo'] === 'Y'? item['end_time'] :'--'}}</text>
                 </view>
                 <view class="card-list__yue">
                   <text>余额：</text>
-                  <text>--</text>
+                  <text>{{item['is_show_baseinfo'] === 'Y'? `${item['card_point']} ${item.unit}`:'--'}}</text>
                 </view>
-                <view class="card-list__other" v-if="item.other_card_point && item.card_point_type === 2 ">
+                <view
+                  class="card-list__other"
+                  v-if="item.other_card_point && item.card_point_type === 2 "
+                >
                   <view>
                     <text>购买其他物品可抵：</text>
-                    <text>--</text>
+                    <text>{{item['is_show_baseinfo'] === 'Y' ? item['other_card_point'] :'--'}}</text>
                   </view>
                 </view>
                 <template>
@@ -200,7 +201,6 @@ export default {
       this.$xdShowLoading({});
       jfbRootExec("getDisableCardListEntry", {vm: this, data: {is_all: "Y", is_show_entry_settings: 'Y'},})
         .then((res) => {
-          //this.isShowUnbind = (res["is_can_unbind"] === 'Y' || res["is_can_unbind"] === undefined);
           res.list = res.list.map((item) => {
             return {
               ...item,

package/src/components/JfbBaseCardEntry/Attr.js

@@ -322,6 +322,18 @@ export default {
       },
       inline: false,
     },
+    {
+      label: '转赠中票券详情地址:',
+      ele: 'xd-select-pages-path',
+      valueKey: 'give_url',
+      groupKey:'advanced',
+      placeholder: '请选择转赠中票券详情地址',
+      value: null,
+      setting: {
+        router: XdBus.getParentApi('getPagesTree'),
+      },
+      inline: false,
+    },
     {
       label: '票券密码绑定地址:',
       ele: 'xd-select-pages-path',
@@ -346,5 +358,114 @@ export default {
       },
       inline: false,
     },
+    {
+      ele: "title",
+      label: "我的优惠券样式配置",
+      size: "small",
+      groupKey: "style",
+    },
+    {
+      label: "是否切换到优惠券",
+      ele: "xd-radio",
+      valueKey: "isShowCoupon",
+      groupKey:'style',
+      value:"N",
+      list: [
+        {label: "是", value: "Y"},
+        {label: "否", value: "N"},
+      ]
+    },
+    {
+      label: "优惠券左侧背景色设置:",
+      ele: "xd-gradient-color",
+      valueKey: "couponLeftBgColor",
+      value: 'linear-gradient(180deg, #FFA852 0%, #FF5733 100%)',
+      groupKey:'style',
+    },
+    {
+      label: "圆角设置",
+      ele: 'xd-site-select-list',
+      valueKey: 'couponRadius',
+      value: 16,
+      groupKey:'style',
+      placeholder: '请选择内容圆角设置',
+      multiple: false,
+      className: 'input80',
+      handleCustom({ action, data }) {
+        XdBus.getParentApi('getOptionsSettingList')({ setting_id: 'edtix_style_radius' })
+          .then(res => {
+            data.cb(res.list)
+          })
+          .catch(error => {
+            console.error(error);
+          });
+      },
+    },
+    {
+      label: "优惠券标题背景颜色设置:",
+      ele: "xd-color",
+      valueKey: "couponTitleBgColor",
+      value: null,
+      groupKey:'style',
+      setting: {
+        showAlpha: true,
+        isAlpha: true
+      },
+    },
+    {
+      label: "去使用按钮文字背景色设置: ",
+      ele: "xd-text-and-bgc",
+      groupKey:'style',
+      valueKey: "couponBtnTextStyle",
+      value: null,
+      setting: {
+        fontSize: true, //字体大小选择
+        color: true, //文字颜色选项
+        bgColor: true, //背景选项
+        weight: true, //文字粗细
+      },
+      handleCustom({action, data}) {
+        XdBus.getParentApi('getOptionsSettingList')({setting_id: 'edtix_style_font_size'})
+          .then(res => {
+            data.cb(res.list)
+          })
+          .catch(error => {
+            console.error(error);
+            data.cb([])
+          });
+      },
+    },
+    {
+      label: "按钮内边距设置:",
+      groupKey:'style',
+      ele: 'xd-margin-padding',
+      valueKey: 'couponUseBtnPadding',
+      value: null,
+      setting: {
+        type: 'padding',
+      },
+      placeholder: '请设置边距',
+      inline: false,
+      notice: '设置内边距，<span style="color: red">单位：像素</span>。默认值：<span style="color: red">20</span>像素',
+    },
+    {
+      label: "按钮圆角设置",
+      ele: 'xd-site-select-list',
+      valueKey: 'couponBtnRadius',
+      value: 16,
+      groupKey:'style',
+      placeholder: '请选择内容圆角设置',
+      multiple: false,
+      className: 'input80',
+      handleCustom({ action, data }) {
+        XdBus.getParentApi('getOptionsSettingList')({ setting_id: 'edtix_style_radius' })
+          .then(res => {
+            data.cb(res.list)
+          })
+          .catch(error => {
+            console.error(error);
+          });
+      },
+    },
   ],
 };