jufubao-base 1.0.116 → 1.0.118

package/package.json

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

package/src/components/JfbBaseCardDetailEntry/JfbBaseCardDetailEntry.vue

@@ -16,7 +16,7 @@
     </view>
     <!-- #endif -->
     <view class="jfb-base-card-detail-entry__body" v-if="info!==null">
-      <view class="card-list" :style="{
+      <!-- <view class="card-list" :style="{
             background: headerBg['color'],
             backgroundSize: '100%'
           }">
@@ -40,23 +40,44 @@
               <view><text>购买其他物品可抵：</text><text>{{info.other_card_point}} {{ info.unit }}</text></view>
             </view>
           </view>
-        </view>
-      <view class="jfb-base-card-detail-entry__body-qrcode">
-        <view>
-          <view>
-            <image mode="aspectFit" :src="info.barcode"></image>
+        </view> -->
+      <view class="qrcode_card">
+        <view class="jfb-base-card-detail-entry__body-qrcode">
+          <view class="qrcode_card-title">
+            <xd-font-icon style="margin-right: 24rpx;" icon="iconsaoma-02" size="32"></xd-font-icon>
+            向商家付款
+          </view>
+          <view class="barcode_wrap">
+            <view>
+              <image mode="aspectFit" :src="info.barcode"></image>
+            </view>
+          </view>
+          <view class="qrcode_wrap" style="position: relative">
+            <image
+              :style="{width: '300rpx', height: '300rpx'}"
+              :src="info.card_qrcode"
+            ></image>
+            <image v-if="isBrandLogo" class="logo-icon" :src="brandLogo"></image>
+          </view>
+          <!-- <view :style="{marginTop: '20rpx'}" v-if="timeStr">消费二维码，有效期为{{ info["card_qrcode_expire"] / 60 }}分钟</view> -->
+          <view v-if="timeStr">{{ timeStr }}后自动刷新</view>
+          <view class="refresh_wrap" @click="handleRefresh">
+            <xd-font-icon icon="iconshuaxin"
+              style="margin-right: 24rpx;"
+              size="28"></xd-font-icon> 刷新二维码
           </view>
         </view>
-        <view style="position: relative">
-          <image
-            :style="{width: '300rpx', height: '300rpx'}"
-            :src="info.card_qrcode"
-          ></image>
-          <image v-if="isBrandLogo" class="logo-icon" :src="brandLogo"></image>
+        <view class="card_info">
+          <view class="card_type">{{ info['card_type_name'] }}</view>
+          <view class="card_sec">券号：{{ info.card_number }}</view>
+          <view class="card_sec">有效期：{{ info.end_time }}</view>
+          <view class="card_sec">余额：{{ info.card_point }}{{ info.unit }}</view>
+          <view class="card_other" v-if="info.other_card_point && info.card_point_type === 2">
+            <text>购买其他物品可抵：</text><text>{{info.other_card_point}} {{ info.unit }}</text>
+          </view>
         </view>
-        <view :style="{marginTop: '20rpx'}" v-if="timeStr">消费二维码，有效期为{{ info["card_qrcode_expire"] / 60 }}分钟</view>
-        <view v-if="timeStr">距离刷新还有{{ timeStr }}</view>
       </view>
+      
       <view
       v-if="info.site_entry_settings&&info.site_entry_settings.length>0"
       class="jfb-base-card-detail-entry__body-business"
@@ -287,6 +308,11 @@ export default {
           // this.$refs["pwPay"].clearPwd();
         });
     },
+    handleRefresh(){
+      clearInterval(this.timeer);
+      this.detail();
+      // this.refrush();
+    },
     refrush() {
       if (this.stopTimer) return;
       if (this.time >= this.maxTime) {
@@ -558,6 +584,37 @@ export default {
 .jfb-base-card-detail-entry {
   &__body {
     color: #333;
+
+    .qrcode_card{
+      background-color: #FF2121;
+      border-radius: 24rpx;
+      padding: 24rpx;
+      &-title{
+        display: flex;
+        font-size: 32rpx;
+      }
+      .card_info{
+        color: #FFFFFF;
+        font-size: 28rpx;
+        padding-left: 40rpx;
+        .card_type{
+          font-size: 40rpx;
+          font-weight: 600;
+          margin-top: 70rpx;
+        }
+        .card_sec{
+          margin: 12rpx 0;
+        }
+        .card_other{
+          background-color: rgba(255,255,255, 0.2);
+          border-radius: 8rpx;
+          padding: 8rpx 20rpx;
+          display: inline-block;
+        }
+      }
+    }
+
+    
     .logo-icon {
       width: unit(100, rpx) !important;
       height: unit(100, rpx) !important;
@@ -784,9 +841,20 @@ export default {
       line-height: unit(36, rpx);
       background: #fff;
       border-radius: unit(16,rpx);
-      margin-top: unit(24, rpx);
-      padding: unit(20,rpx) unit(70,rpx) unit(70,rpx) unit(70,rpx);
+      padding: unit(20,rpx) unit(70,rpx) 0 unit(70,rpx);
       color: #000;
+      position: relative;
+      &::after{
+        content: " ";
+        position: absolute;
+        left: 0;
+        bottom: -40rpx;
+        width: 100%;
+        height: 100rpx;
+        background: #FFFFFF;
+        border-radius: 100%;
+        z-index: 1;
+      }
 
       & > view {
         // margin-bottom: unit(20, rpx);
@@ -795,8 +863,21 @@ export default {
           margin-bottom: 0;
         }
       }
+      .refresh_wrap{
+        width: 300rpx;
+        height: 80rpx;
+        display: flex;
+        align-items: center;
+        border: 1px solid #999999;
+        color: #999999;
+        border-radius: 40rpx;
+        justify-content: center;
+        margin: 36rpx auto 0;
+        position: relative;
+        z-index: 10;
+      }
 
-      & > view:nth-child(1) {
+      .barcode_wrap {
         display: flex;
         justify-content: center;
         align-items: center;
@@ -819,7 +900,7 @@ export default {
         }
       }
 
-      & > view:nth-child(2) {
+      .qrcode_wrap {
         display: flex;
         justify-content: center;
         align-items: center;

package/src/components/JfbBaseCardEntry/JfbBaseCardEntry.vue

@@ -177,7 +177,7 @@
                     <text>券号：</text>
                     <text>{{item.card_number}}</text>
                   </view>
-                  <view @click.stop="toDetail(item)" v-if="0">
+                  <view @click.stop="toDetail(item)">
                     <view>
                       <xd-font-icon icon="iconerweima" width="56" height="56" size="50" color="#fff"></xd-font-icon>
                     </view>

package/src/components/JfbBaseCardInfo/Attr.js

@@ -15,6 +15,17 @@ export default {
       },
       inline: false,
     },
+    {
+      label: '我的票券跳转地址:', //label
+      ele: 'xd-select-pages-path', //package 名称
+      valueKey: 'my_card_url', //form[valueKey]
+      placeholder: '请选择我的票券跳转地址',
+      value: null,
+      setting: {
+        router: XdBus.getParentApi('getPagesTree'),
+      },
+      inline: false,
+    },
     {
       label: '券号框自定义文案:',
       ele: 'el-input',
@@ -33,5 +44,15 @@ export default {
       placeholder: '请输入密码框自定义文案',
       className: 'input80'
     },
+    {
+      label: "票券过期是否展示余额",
+      ele: "xd-radio",
+      valueKey: "is_show_balance",
+      value: "N",
+      list: [
+        {label: "是", value: "Y"},
+        {label: "否", value: "N"},
+      ]
+    }
   ],
 };

package/src/components/JfbBaseCardInfo/JfbBaseCardInfo.vue

@@ -63,7 +63,7 @@
               info[item.key]
             }}</view>
           </view>
-          <view class="jfb-base-card-info__body-residue">
+          <view v-if="isShowBalance" class="jfb-base-card-info__body-residue">
             <view class="jfb-base-card-info__body-residue-wrap">
               <view class="jfb-base-card-info__body-residue-label">
                 <view :style="{ color: '#242424', fontSize: '28rpx' }"
@@ -166,12 +166,20 @@ export default {
 
       //页面跳转地址
       backUrl: "",
+      is_show_balance: "N", //是否显示余额
+      my_card_url: "", //我的票券跳转地址
     };
   },
   computed: {
     prod_bottom() {
       return this.fixedStyle({ height: 0, zIndex: 111 });
     },
+    isShowBalance(){
+      if(this.info.is_expired === "Y"){
+        return this.is_show_balance === "Y";
+      }
+      return true;
+    }
   },
   created() {},
   methods: {
@@ -187,10 +195,11 @@ export default {
           vm: this,
           data: {
             card_qrcode: this.qrcode,
+            is_show_pop: "Y"
           },
         })
           .then((res) => {
-            this.handlerAfterBindCard();
+            this.handlerAfterBindCard(res);
           })
           .catch();
       } else {
@@ -199,15 +208,21 @@ export default {
           data: {
             card_password: this.card_password,
             card_number: this.card_number + "",
+            is_show_pop: "Y"
           },
         })
           .then((res) => {
-            this.handlerAfterBindCard();
+            this.handlerAfterBindCard(res);
           })
           .catch();
       }
     },
-    handlerAfterBindCard(){
+    handlerAfterBindCard(res){
+      if(res.pop_info && res.pop_info.pop_code === '1001'){
+        this.handleBindConfirm();
+        return;
+      }
+
       if(this.hasCon){
         this.toShowCouponDialog();
         this.$bus.$on("onCloseConDialog",(container_id) => {
@@ -228,6 +243,25 @@ export default {
         });
       }
     },
+    //卡券已被自己绑定时的弹框
+    handleBindConfirm(){
+      this.$xdConfirm({
+        $vm: this,
+        width: '90%',
+        content: '您已绑定该票券，无需再次绑定',
+        confirmText: '我的票券',
+        cancelText: '返回',
+        showClose: false,
+        success: (res) => {
+          if (res.confirm) {
+            this.$xdUniHelper.redirectTo({
+              url: this.my_card_url || this.backUrl,
+            });
+          }else{
+          }
+        }
+      })
+    },
     init() {
       this.backUrl = getContainerPropsValue(
         this.container,
@@ -244,6 +278,8 @@ export default {
         "content.card_pwd_placeholder",
         "请输入密码"
       );
+      this.is_show_balance = getContainerPropsValue(this.container, 'content.is_show_balance', "N");
+      this.my_card_url = getContainerPropsValue(this.container, 'content.my_card_url', { value: "" }).value;
     },
     onJfbLoad(options) {
       this.init();

package/src/components/JfbBaseCardInfoEntry/Attr.js

@@ -15,6 +15,17 @@ export default {
       },
       inline: false,
     },
+    {
+      label: '我的票券跳转地址:', //label
+      ele: 'xd-select-pages-path', //package 名称
+      valueKey: 'my_card_url', //form[valueKey]
+      placeholder: '请选择我的票券跳转地址',
+      value: null,
+      setting: {
+        router: XdBus.getParentApi('getPagesTree'),
+      },
+      inline: false,
+    },
     {
       label: '券号框自定义文案:',
       ele: 'el-input',

package/src/components/JfbBaseCardInfoEntry/JfbBaseCardInfoEntry.vue

@@ -162,6 +162,7 @@ export default {
       //页面跳转地址
       backUrl: "",
       headerBg: {},
+      my_card_url: "",  //我的票券跳转地址
     };
   },
   watch: {
@@ -204,10 +205,11 @@ export default {
           vm: this,
           data: {
             card_qrcode: this.qrcode,
+            is_show_pop: "Y",
           },
         })
           .then((res) => {
-            this.handlerAfterBindCard();
+            this.handlerAfterBindCard(res);
           })
           .catch();
       } else {
@@ -216,17 +218,24 @@ export default {
           data: {
             card_password: this.card_password,
             card_number: this.card_number + "",
-            is_show_entry_settings: "Y"
+            is_show_entry_settings: "Y",
+            is_show_pop: "Y",
           },
         })
           .then((res) => {
             console.log(this.$xdAlert, "this.$xdAlertfsdfs");
-            this.handlerAfterBindCard();
+            this.handlerAfterBindCard(res);
           })
           .catch();
       }
     },
-    handlerAfterBindCard(){
+    handlerAfterBindCard(res){
+
+      if(res.pop_info && res.pop_info.pop_code === '1001'){
+        this.handleBindConfirm();
+        return;
+      }
+
       if(this.hasCon){
         this.toShowCouponDialog();
         this.$bus.$on("onCloseConDialog",(container_id) => {
@@ -247,6 +256,25 @@ export default {
         });
       }
     },
+    //卡券已被自己绑定时的弹框
+    handleBindConfirm(){
+      this.$xdConfirm({
+        $vm: this,
+        width: '90%',
+        content: '您已绑定该票券，无需再次绑定',
+        confirmText: '我的票券',
+        cancelText: '返回',
+        showClose: false,
+        success: (res) => {
+          if (res.confirm) {
+            this.$xdUniHelper.redirectTo({
+              url: this.my_card_url || this.backUrl,
+            });
+          }else{
+          }
+        }
+      })
+    },
     init() {
       this.backUrl = getContainerPropsValue(
         this.container,
@@ -263,6 +291,7 @@ export default {
         "content.card_pwd_placeholder",
         "请输入密码"
       );
+      this.my_card_url = getContainerPropsValue(this.container, 'content.my_card_url', { value: "" }).value;
     },
     onJfbLoad(options) {
       this.init();

package/src/components/JfbBaseCardMerge/JfbBaseCardMerge.vue

@@ -45,6 +45,7 @@
           content-align="left"
           labelPosition="left"
           labelAlign="left"
+          v-if="0"
         >
           <view class="flex align-center">
             <xd-form-input
@@ -207,13 +208,13 @@ export default {
       this.$set(this.mergeForm, "valid_token", valid_token);
     },
     handleToSubmit() {
-      if (!this.mergeForm.valid_code) {
-        uni.showToast({
-          title: "验证码不能为空！",
-          icon: "none",
-        });
-        return;
-      }
+      // if (!this.mergeForm.valid_code) {
+      //   uni.showToast({
+      //     title: "验证码不能为空！",
+      //     icon: "none",
+      //   });
+      //   return;
+      // }
       this.$xdConfirm({
         title: "是否确认合并卡",
         isHtml: true,
@@ -237,8 +238,8 @@ export default {
               data: {
                 from_card_number: this.mergeForm.from_card_number,
                 to_card_number: this.mergeForm.to_card_number,
-                valid_code: this.mergeForm.valid_code,
-                valid_token: this.mergeForm.valid_token
+                // valid_code: this.mergeForm.valid_code,
+                // valid_token: this.mergeForm.valid_token
               },
             })
               .then((res) => {

package/src/components/JfbBaseCardMergeEntry/JfbBaseCardMergeEntry.vue

@@ -62,7 +62,7 @@
           </view>
         </view>
       </view>
-      <view class="code">
+      <view class="code" v-if="0">
         <view>验证码：</view>
         <view>
           <input v-model="valid_code" class="uni-input" placeholder="请输入验证码"/>
@@ -248,13 +248,13 @@ export default {
     },
     
     handleToSubmit() {
-      if (!this.valid_code) {
-        uni.showToast({
-          title: "验证码不能为空！",
-          icon: "none",
-        });
-        return;
-      }
+      // if (!this.valid_code) {
+      //   uni.showToast({
+      //     title: "验证码不能为空！",
+      //     icon: "none",
+      //   });
+      //   return;
+      // }
       
       let outPrice = this.$xdUniHelper.divisionFloatNumber(this.fromSelect.card_point, 100);
       let outHtml = `${this.fromSelect.value}（剩余：${outPrice}）`;
@@ -269,8 +269,8 @@ export default {
           let params = {
             from_card_number: this.fromSelect.value,
             to_card_number: this.toSelect.value,
-            valid_code: this.valid_code,
-            valid_token: this.valid_token
+            // valid_code: this.valid_code,
+            // valid_token: this.valid_token
           };
           
           if (action.confirm) {

package/src/components/JfbBaseConDialog/XdCouCardBind.vue

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

package/src/components/JfbBaseConList/JfbBaseConList.vue

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

package/src/components/JfbBaseMySetting/Api.js

@@ -0,0 +1,43 @@
+'use strict';
+
+/**
+ * @description API模型
+ * 建议：Ffff=>模块  Xxxx=>自定义名字
+ * 获取单记录(getByIdFfffXxxx)
+ * 获取列表记录(getByListFfffXxxx)
+ * 添加列表记录(addFfffXxxxx)
+ * 删除列表记录(removeFfffXxxxx|deleteFfffXxxx)
+ * 更新列表记录(updateFfffXxxxx)
+ * @type {*[]}
+ */
+module.exports = [
+  {
+    mapFnName: 'getUserInfo',
+    title: '获取用户信息',
+    path: '/passport/v1/user/get',
+    params: {},
+    isRule: false,
+    isConsole: true,
+    disabled: true,
+  },
+  {
+    mapFnName: 'getCardUserSetting',
+    title: '获取用户卡券配置',
+    path: '/card/v1/card-bind/get-card-user-setting',
+    params: {},
+    isRule: false,
+    isConsole: true,
+    disabled: true,
+  },
+  {
+    mapFnName: 'setCardUserSetting',
+    title: '设置用户卡券配置',
+    path: '/card/v1/card-bind/set-card-user-setting',
+    data: {
+      is_entity_card_invalid: ['已绑卡实体卡是否失效', 'String Y N', '必选']
+    },
+    isRule: false,
+    isConsole: true,
+    disabled: true,
+  }
+];

package/src/components/JfbBaseMySetting/Attr.js

@@ -0,0 +1,23 @@
+'use strict';
+
+/**
+ * @description 当表单组件中有联动操作时候，使用方法进行返回
+ */
+export default {
+  style: [],
+  content: (data) => {
+    return [
+      {
+        label: '绑定手机号地址:', //label
+        ele: 'xd-select-pages-path', //package 名称
+        valueKey: 'bind_phone_url', //form[valueKey]
+        value: data['bind_phone_url'] || {},
+        setting: {
+          router: XdBus.getParentApi('getPagesTree')
+        },
+        inline: false,
+      },
+    ].filter(i=>i)
+  },
+  advanced: [],
+};

package/src/components/JfbBaseMySetting/JfbBaseMySetting.vue

@@ -0,0 +1,236 @@
+<template>
+  <view
+    class="jfb-base-my-setting"
+    @click="handleEditxSelect"
+    :class="{ editx : isEditx && active }"
+  >
+    <!--#ifdef H5-->
+    <view
+      class="jfb-base-my-setting__edit"
+      :class="{ editx : isEditx && active }"
+      v-if="isEditx && active"
+    >
+      <view class="jfb-base-my-setting__edit-icon" @click="delEdit">删除</view>
+    </view>
+    <!-- #endif -->
+    <view class="jfb-base-my-setting__body" :style="{
+      minHeight: layoutInfo.bodyMinHeightRpx + 'rpx'
+    }">
+      <view class="setting_list">
+        <xd-list-item label="已绑实体卡是否失效" :showRight="!showSwitch"
+          paddingLR="50rpx" paddingTB="32rpx"
+          style="margin-bottom: 8rpx;"
+          @click="handleToShowSwitch"
+        >
+          <view v-if="!showSwitch">去配置</view>
+          <view v-else class="switch_wrap">
+            <view :style="{
+              color: cardChecked ? mainColor : '#666666'
+            }">{{ cardChecked ? "开启" : "关闭" }}</view>
+            <xd-switch :checked="cardChecked" size="small" @change="handleCardChecked"></xd-switch>
+          </view>
+        </xd-list-item>
+        <view class="switch_tip">
+          <xd-font-icon size="24" icon="iconmingchengtubiao" style="margin-right: 8rpx;"></xd-font-icon>
+          <view>当卡被绑定后，实体卡的卡密与二维码都失效</view>
+        </view>
+        <xd-list-item :showRight="!phone_number" label="绑定手机号"
+          paddingLR="50rpx" paddingTB="32rpx"
+          @click="handleToBind"
+        >
+          {{phone_number ? phone_number : "去绑定"}}
+        </xd-list-item>
+      </view>
+      <view class="fixed_bottom">
+        <xd-button type="primary" @click="handleLogout">退出登录</xd-button>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script>
+  import XdFontIcon from "@/components/XdFontIcon/XdFontIcon";
+  import XdListItem from "./XdListItem.vue";
+  import XdButton from "@/components/XdButton/XdButton";
+  import XdSwitch from "@/components/XdSwitch/XdSwitch"
+  import { jfbRootExec } from "@/utils/xd.event";
+  import JfbBaseMySettingMixin from "./JfbBaseMySettingMixin";
+  import { getContainerPropsValue } from "@/utils/xd.base";
+  import componentsMixins from "@/mixins/componentsMixins";
+  import extsMixins from "@/mixins/extsMixins";
+  import {mapState} from 'vuex';
+  import store from "@/store";
+  export default {
+    name: "JfbBaseMySetting",
+    components: {
+      XdFontIcon,
+      XdButton,
+      XdListItem,
+      XdSwitch
+    },
+    mixins: [
+      componentsMixins, extsMixins, JfbBaseMySettingMixin
+    ],
+    computed: {
+      ...mapState(['jfbAuthorize']),
+    },
+    data() {
+      return {
+        cardChecked: false,
+        phone_number: "",
+        showSwitch: true,
+
+        //面板
+        bind_phone_url: "", //绑定手机号跳转地址
+      }
+    },
+    watch: {
+      container(value) {
+        this.init(value)
+      }
+    },
+    created() {
+      this.init(this.container);
+
+      //todo
+    },
+    methods: {
+      onJfbLoad(options) {
+        this.p_getUserInfo();
+        this.getCardConfig();
+      },
+      /**
+       * @description 监听事件变化
+       * @param container {object} 业务组件对象自己
+       */
+      init(container) {
+        this.bind_phone_url = getContainerPropsValue(container, 'content.bind_phone_url', {value: ""}).value;
+      },
+      handleToBind(){
+        if(!this.phone_number){
+          this.$xdUniHelper.navigateTo({
+            url: this.bind_phone_url  + `?callback_url=${encodeURIComponent(location.href)}`,
+          });
+        }
+      },
+      handleToShowSwitch(){
+        if(!this.showSwitch){
+          this.showSwitch = true;
+        }
+      },
+      handleCardChecked(flag){
+        jfbRootExec("setCardUserSetting", {
+          vm: this,
+          data: {
+            is_entity_card_invalid: flag ? "Y" : "N"
+          }
+        }).then(res => {
+          this.cardChecked = flag;
+        }).catch(err => {
+          this.cardChecked = !flag;
+        })
+      },
+      p_getUserInfo(){
+        jfbRootExec("getUserInfo", {
+          vm: this,
+          data: {
+
+          }
+        }).then(res => {
+          let phone_number = res.phone_number;
+          //手机号脱敏
+          if(phone_number){
+            phone_number = phone_number.substr(0, 3) + "****" + phone_number.substr(7, 11);
+          }
+          this.phone_number = phone_number;
+        })
+      },
+      getCardConfig(){
+        jfbRootExec("getCardUserSetting", {
+          vm: this,
+          data: {}
+        }).then(res => {
+          let is_entity_card_invalid = res.is_entity_card_invalid;  //Y失效  N: 有效
+          if(is_entity_card_invalid === ""){
+            this.showSwitch = false;
+          }
+          this.cardChecked = is_entity_card_invalid === "Y";
+        })
+      },
+      async handleLogout(){
+        // #ifdef H5
+        if (this.$configProject.isPreview) return;
+        // #endif
+
+        if (this.jfbAuthorize !== null) {
+          this.$xdShowLoading({});
+          store.dispatch('logout').then(res=>{
+            this.$xdHideLoading();
+            this.jfbAuthorize.removeToken('card');
+            this.jfbAuthorize.jumpToUserLogin(this, false);
+          }).catch(err=>{
+            console.error(err);
+          })
+        }
+      },
+      onJfbScroll(options) {
+        console.log('event.onJfbScroll', options)
+      },
+      onJfbReachBottom(options) {
+        console.log('event.onJfbReachBottom', options)
+      },
+      onJfbShow(options) {
+        console.log('event.onJfbShow', options)
+      },
+      onJfbHide(options) {
+        console.log('event.onJfbHide', options)
+      },
+      onJfbBack(options) {
+        console.log('event.onJfbBack', options)
+      },
+      onJfbUpdate(...data) {
+        console.log('event.onJfbUpdate', data)
+      },
+      onJfbCustomEvent(options) {
+        console.log('event.onJfbReachBottom', options)
+      },
+    }
+  }
+
+</script>
+
+<style scoped lang="less">
+  @import "./JfbBaseMySettingLess.less";
+
+  .jfb-base-my-setting {
+    &__body{
+      background: #FAFAFA;
+      .setting_list{
+        padding: 20rpx 0;
+        /deep/ .xd-my-list-item{
+          background: #FFFFFF;
+          margin: 24rpx 20rpx;
+          border-radius: 20rpx;
+        }
+      }
+      .switch_wrap{
+        display: flex;
+        align-items: center;
+      }
+      .switch_tip{
+        display: flex;
+        font-size: 24rpx;
+        color: #BBBBBB;
+        align-items: center;
+        padding-left: 80rpx;
+      }
+      .fixed_bottom{
+        position: absolute;
+        width: 600rpx;
+        bottom: 100rpx;
+        left: 50%;
+        transform: translateX(-50%);
+      }
+    }
+  }
+</style>

package/src/components/JfbBaseMySetting/JfbBaseMySettingLess.less

@@ -0,0 +1,80 @@
+/**
+* @desc 获取绝对路径完整地址
+* @param @path
+**/
+//例如：https://image.jufubao.cn/20220501010108/image/bg/default_gonghui_bg.png
+@basePath: 'business/';
+@doMain: '//sandbox-img.jufubao.cn/';
+
+.getBusinessImageUrl(@path, @size: 'size8') {
+  @url: "@{doMain}@{basePath}@{path}?x-oss-process=style/@{size}";
+  background-image: url(@url);
+}
+
+//start
+.jfb-base-my-setting {
+  border: 1px dashed rgba(0, 0, 0, 0);
+  box-sizing: border-box;
+  min-height: unit(50, rpx);
+
+  &__body{
+      position: relative;
+      overflow: hidden;
+      z-index: 2
+  }
+
+  &.editx {
+    position: relative;
+    border: 1px dashed blue;
+    box-sizing: border-box;
+    z-index: 3
+
+  }
+
+  &:hover {
+    border: 1px dashed blue;
+  }
+
+  &.noBorder {
+    border-color: rgba(0,0,0,0);
+    border-width: 0;
+  }
+
+
+  &__edit {
+    cursor: pointer;
+    position: absolute;
+    right: unit(0, rpx);
+    top: unit(-52, rpx);
+    height: unit(50, rpx);
+    line-height: unit(50, rpx);
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    background: rgba(0, 0, 0, .6);
+    border-radius: unit(10, rpx);
+    box-shadow: 0 0 10px rbga(0, 0, 0, 0.3);
+    color: #fff;
+    font-size: unit(22, rpx);
+
+    &-icon{
+      padding: 0 unit(20, rpx);
+    }
+
+    &.editx {
+      box-sizing: border-box;
+
+    }
+  }
+}
+//end
+
+
+/**notPreview**/
+.jfb-base-my-setting {
+  &:before {
+    content: " ";
+    display: table;
+  }
+}
+/**endNotPreview**/

package/src/components/JfbBaseMySetting/JfbBaseMySettingMixin.js

@@ -0,0 +1,30 @@
+'use strict';
+
+
+//@AttrImport
+import Attr from "./Attr";
+//@EndAttrImport
+
+
+export default {
+  data() {
+    return {
+      //#ifdef H5
+      
+      //@AttrData
+      Attr:{}, //对外开发编辑属性
+      //@EndAttrData
+      
+      // #endif
+      cssRoot: 'jfb-base-my-setting'
+    }
+  },
+  created() {
+    
+    //@AttrDataCreated
+    this.Attr = this.$xdUniHelper.customClone(Attr);
+    //@EndAttrDataCreated
+    
+
+  },
+}

package/src/components/JfbBaseMySetting/Mock.js

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

package/src/components/JfbBaseMySetting/XdListItem.vue

@@ -0,0 +1,135 @@
+<template>
+  <view class="xd-my-list-item"
+    :class="'size_'+size"
+    :style="{
+      borderTop: showBottom ? '1px solid #eee':'none',
+      paddingLeft: paddingLR,
+      paddingRight: paddingLR,
+      paddingTop: paddingTB,
+      paddingBottom: paddingTB,
+    }"
+    @click="$emit('click')">
+    <view v-if="listIcon" class="my-list_icon">
+      <!-- <image mode="widthFix" :src="listIcon" /> -->
+      <xd-font-icon :icon="listIcon"></xd-font-icon>
+    </view>
+    <view class="my-list_label" v-html="label"></view>
+    <view class="my-list_value">
+      <slot></slot>
+      <xd-font-icon
+        v-if="showRight"
+        :style="{
+          marginLeft: '10rpx',
+          color: '#B1B1B1'
+        }"
+        size="24"
+        icon="iconxiangyou_xian"
+      ></xd-font-icon>
+    </view>
+
+  </view>
+</template>
+
+<script>
+import XdFontIcon from "@/components/XdFontIcon/XdFontIcon";
+export default {
+  components: {
+    XdFontIcon
+  },
+  data(){
+    return {
+    
+    }
+  },
+  props: {
+    size: {
+      type: String,
+      default: "default"
+    },
+    paddingTB:{
+      type: String,
+      default: "24rpx"
+    },
+    paddingLR: {
+      type: String,
+      default: "0rpx"
+    },
+    //是否显示border-bottom
+    showBottom: {
+      type: Boolean,
+      default: false
+    },
+    //是否显示右箭头
+    showRight: {
+      type: Boolean,
+      default: false
+    },
+    //是否显示图标
+    listIcon: {
+      type: String,
+      default: ''
+    },
+    //label
+    label: {
+      type: String,
+      default: ''
+    }
+  }
+
+}
+</script>
+
+<style lang="less" scoped>
+.xd-my-list-item{
+  display: flex;
+  align-items: center;
+  padding: 30rpx 0;
+  font-size: 28rpx;
+  background: #FFFFFF;
+  color: #666666;
+
+  &.size_large{
+    .my-list_value,
+    .my-list_label{
+      font-size: 28rpx;
+      font-weight: 400;
+    }
+  }
+  &.size_default{
+    .my-list_value,
+    .my-list_label{
+      font-size: 28rpx;
+      font-weight: 400;
+    }
+  }
+  &.size_small{
+    .my-list_value,
+    .my-list_label{
+      font-size: 24rpx;
+      font-weight: 400;
+    }
+  }
+
+  .my-list_icon{
+    width: 32rpx;
+    margin-right: 24rpx;
+
+    image{
+      width: 32rpx;
+    }
+  }
+
+  .my-list_label{
+    // flex: 1;
+  }
+  .my-list_value{
+    flex: 1;
+    display: flex;
+    align-items: center;
+    justify-content: flex-end;
+  }
+  .arrow_right{
+    width: 44rpx;
+  }
+}
+</style>

package/src/components/JfbBaseOrderDetail/JfbBaseOrderDetail.vue

@@ -284,13 +284,16 @@
             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>
-            <image
-              :style="{
-                height: info.codes[0].show_type === 'qrcode' ? '50vw' : '25vw',
-                width: info.codes[0].show_type === 'qrcode' ? '50vw' : '85vw',
-              }"
-              :src="info.codes[0].code_url"
-            ></image>
+            <view style="position: relative">
+              <image
+                :style="{
+                  height: info.codes[0].show_type === 'qrcode' ? '50vw' : '25vw',
+                  width: info.codes[0].show_type === 'qrcode' ? '50vw' : '85vw',
+                }"
+                :src="info.codes[0].code_url"
+              ></image>
+              <image v-if="info.codes[0].logo&&info.codes[0].show_type === 'qrcode'" class="logo-icon" :src="info.codes[0].logo"></image>
+            </view>
             <view class="jfb-base-order-detail__body-cashier-text">
               {{ info.codes[0].can_read_code }}
             </view>
@@ -751,7 +754,17 @@
           height: showType === 'qrcode' ? '70vw' : '35vw',
         }"
       >
-        <image mode="aspectFit" :src="codeSrc"></image>
+         <view style="position: relative">
+          <image :src="codeSrc" mode="aspectFit"></image>
+          <image v-if="logo&&showType === 'qrcode'" :src="logo" style="
+            width: 100rpx;
+            height: 100rpx;
+            position: absolute;
+            top: 50%;
+            left: 50%;
+            transform: translate(-50rpx, -50rpx);">
+          </image>
+        </view>
       </view>
     </xd-dailog>
   </view>
@@ -828,6 +841,7 @@ export default {
         bottom: 0,
       },
       is_hot: "Y",
+      logo: ""
     };
   },
   watch: {
@@ -980,6 +994,9 @@ export default {
           res.codes =
             res.codes &&
             res.codes.map((item) => {
+              if(item.logo) {
+                item.logo = getServiceUrl(item.logo)
+              }
               if (item.show_type === "qrcode" || item.show_type === "barcode") {
                 let reg = /^(http:\/\/|https:\/\/|\/\/)+.+$/;
                 item.code_url = reg.test(item.code_url)? item.code_url:`${this.brandInfo['api_host']}${item.code_url}`
@@ -1125,6 +1142,7 @@ export default {
     handleShowCode(item) {
       this.codeSrc = item.code_url;
       this.showType = item.show_type;
+      this.logo = item.logo;
       console.log(this.codeSrc, "this.codeSrc");
       this.showCode = true;
     },
@@ -1257,6 +1275,13 @@ export default {
 .jfb-base-order-detail {
   &__body {
     color: #333;
+    .logo-icon {
+      width: unit(100, rpx) !important;
+      height: unit(100, rpx) !important;
+      position: absolute;
+      top: 50%;
+      transform: translate(-50rpx, -50rpx);
+    }
     &-show {
       display: flex;
       justify-content: center;

package/src/components/JfbBaseSuccess/JfbBaseSuccess.vue

@@ -88,13 +88,16 @@
           >
             <view class="jfb-base-success__body-cashier-text"
               >{{info.codes[0].show_type === "qrcode" ? "二维码" : "条形码" }}</view>
-            <image
-              :style="{
-                height: info.codes[0].show_type === 'qrcode' ? '50vw' : '25vw',
-                width: info.codes[0].show_type === 'qrcode' ? '50vw' : '85vw',
-              }"
-              :src="info.codes[0].code_url"
-            ></image>
+              <view style="position: relative">
+                <image
+                  :style="{
+                    height: info.codes[0].show_type === 'qrcode' ? '50vw' : '25vw',
+                    width: info.codes[0].show_type === 'qrcode' ? '50vw' : '85vw',
+                  }"
+                  :src="info.codes[0].code_url"
+                ></image>
+                <image v-if="info.codes[0].logo&&info.codes[0].show_type === 'qrcode'" class="logo-icon" :src="info.codes[0].logo"></image>
+              </view>
             <view class="jfb-base-success__body-cashier-text">
               {{ info.codes[0].can_read_code }}
             </view>
@@ -309,7 +312,17 @@
         class="jfb-base-success__body-dialog"
         :style="{ height: showType === 'qrcode' ? '70vw' : '35vw' }"
       >
-        <image :src="codeSrc" mode="aspectFit"></image>
+        <view style="position: relative">
+          <image :src="codeSrc" mode="aspectFit"></image>
+          <image v-if="logo&&showType === 'qrcode'" :src="logo" style="
+            width: 100rpx;
+            height: 100rpx;
+            position: absolute;
+            top: 50%;
+            left: 50%;
+            transform: translate(-50rpx, -50rpx);">
+          </image>
+        </view>
       </view>
     </xd-dailog>
   </view>
@@ -329,6 +342,7 @@ import XdSuccess from "@/components/XdSuccess/XdSuccess";
 import { getContainerPropsValue } from "@/utils/xd.base";
 import XdContentXss from "@/components/XdContentXss/XdContentXss";
 import StyleForm from "@/utils/StyleForm";
+import getServiceUrl from "@/common/getServiceUrl";
 import { Base64 } from "js-base64";
 import { getNoUrl } from "@/utils/nourl";
 import { mapState } from "vuex";
@@ -386,6 +400,7 @@ export default {
 
       showCode: false,
       codeSrc: "",
+      logo: "",
       ...styleForm.getDataItem(),
     };
   },
@@ -417,6 +432,7 @@ export default {
     handleShowCode(item) {
       this.codeSrc = item.code_url;
       this.showType = item.show_type;
+      this.logo = item.logo;
       this.showCode = true;
     },
     /**
@@ -545,6 +561,9 @@ export default {
       info.codes =
         info.codes &&
         info.codes.map((item) => {
+          if(item.logo) {
+            item.logo = getServiceUrl(item.logo)
+          }
           if (item.show_type === "qrcode" || item.show_type === "barcode") {
             let reg = /^(http:\/\/|https:\/\/|\/\/)+.+$/;
             if (!reg.test(item.code_url)) item.code_url = `${this.brandInfo["api_host"]}${item.code_url}`;
@@ -672,6 +691,13 @@ export default {
 
 .jfb-base-success {
   &__body {
+    .logo-icon {
+      width: unit(100, rpx) !important;
+      height: unit(100, rpx) !important;
+      position: absolute;
+      top: 50%;
+      transform: translate(-50rpx, -50rpx);
+    }
     &-card {
       padding: unit(30, rpx);
     }