jufubao-base 1.0.77-beta1 → 1.0.77-beta11

package/package.json

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

package/src/components/JfbBaseEntry/JfbBaseEntry.vue

@@ -14,7 +14,17 @@
     </view>
     <!-- #endif -->
     <view class="jfb-base-entry__body" :style="bodyStyle">
-      <view class="entry_list" :style="entryStyle">
+      <view v-if="loadingList" class="entry_list skeleton-wrap" :style="entryStyle">
+        <view v-for="i in 5" :key="i"
+          :class="'row_num_'+rowNum"
+          class="entry_item"
+        >
+          <image v-if="rowNum == 1" style="height: 260rpx;"/>
+          <image v-if="rowNum == 2" style="height: 200rpx;"/>
+          <image v-if="rowNum == 3" style="height: 150rpx;"/>
+        </view>
+      </view>
+      <view v-else class="entry_list" :style="entryStyle">
         <view v-for="(item,i) in entryList" :key="i"
           class="entry_item"
           :class="'row_num_'+rowNum"
@@ -52,6 +62,7 @@
         bgcolor: "",
         rowNum: 1,
         paddingInput: 20,
+        loadingList: true,
       }
     },
     computed: {
@@ -96,6 +107,7 @@
           vm: this,
           data: {}
         }).then(res => {
+          this.loadingList = false;
           this.$xdHideLoading();
           this.entryList = res.list.map(item => {
             const {dir, path, host} = item['redirect_data'];
@@ -160,9 +172,15 @@
     &__body{
       .entry_list{
         display: grid;
+        &.skeleton-wrap{
+          .entry_item{
+            .skeleton-item(100%, auto);
+          }
+        }
         .entry_item{
           width: 100%;
           box-sizing: border-box;
+
           image{
             width: 100%;
             display: block;

package/src/components/JfbBaseFastLink/JfbBaseFastLink.vue

@@ -196,7 +196,7 @@
             if(dir) jumpUrl = `//${window.location.host}/${dir}${path}`;
             else jumpUrl = path;
             //#endif
-            jumpUrl = `${jumpUrl}${bus}`;
+            jumpUrl = `${jumpUrl}${bus}}`;
             return { name: item.name, path: jumpUrl, icon: item.icon, size: item.size }
           }
         })

package/src/components/JfbBaseLogin/Api.js

@@ -131,4 +131,13 @@ module.exports = [
       provider_id: ['登陆提供者id', 'String', '必选']
     }
   },
+  {
+    mapFnName: 'loginExperience',
+    title: '体验码登录',
+    path: '/passport-pb/v1/user/login-experience',
+    isRule: false,
+    params: {
+      experience_code: ['体验码code', 'String', '必选'],
+    }
+  },
 ];

package/src/components/JfbBaseLogin/Attr.js

@@ -4,6 +4,32 @@ export default {
   style: [],
   advanced: [],
   content: [
+    {
+      label: 'LOGO文字颜色:',
+      ele: 'xd-color',
+      valueKey: 'logoTextColor',
+      value: '',
+      placeholder: '请输入LOGO文字颜色',
+      classNmae: 'input80',
+    },
+    {
+      label: '是否使用体验码功能:',
+      ele: 'xd-radio',
+      valueKey: 'isPreview',
+      value: 'N',
+      placeholder: '请选择是否使用体验码功能',
+      multiple: false,
+      className: 'input80',
+      list: [
+        {label: '是', value: 'Y'},
+        {label: '否', value: 'N'},
+      ]
+    },
+    {
+      ele: 'title',
+      label: '页面连接设置',
+      size: 'small',
+    },
     {
       label: '快速授权失败访问地址:', //label
       ele: 'xd-select-pages-path', //package 名称
@@ -60,12 +86,9 @@ export default {
       inline: false,
     },
     {
-      label: 'logo文字颜色:',
-      ele: 'xd-color',
-      valueKey: 'logoTextColor',
-      value: '',
-      placeholder: '请输入logo文字颜色',
-      classNmae: 'input80',
+      ele: 'title',
+      label: '服务设置',
+      size: 'small',
     },
     {
       label: '隐私政策:',

package/src/components/JfbBaseLogin/JfbBaseLogin.vue

@@ -170,6 +170,25 @@
           >忘记密码</view
         >
       </view>
+      <view  class="bottom_btn" :style="prod_bottom" v-if="isPreview === 'Y'">
+        <view @click="dialogPreview = true" :style="{
+          color: mainColor,
+          border: `1px solid ${mainColor}`
+        }">进入体验 ></view>
+      </view>
+      <xd-dailog
+        v-if="dialogPreview"
+        title="体验码"
+        :show.sync="dialogPreview"
+        :cancel="false"
+        confirm-text="进入体验模式"
+        @onBtn="handlePreview"
+        @close="previewAccout=''"
+      >
+        <view class="preview-login">
+          <input v-model="previewAccout" type="text" class="preview-login-input" placeholder="请输入体验码">
+        </view>
+      </xd-dailog>
     </view>
   </view>
 </template>
@@ -187,6 +206,7 @@ import XdFormCheckbox from "@/components/XdFormCheckbox/XdFormCheckbox";
 import XdFormInput from "@/components/XdFormInput/XdFormInput";
 import XdForm from "@/components/XdForm/XdForm";
 import XdFormItem from "@/components/XdFormItem/XdFormItem";
+import XdDailog from "@/components/XdDailog/XdDailog.vue";
 import { Base64 } from "js-base64";
 import { mapState } from "vuex";
 import getServiceUrl from "@/common/getServiceUrl";
@@ -208,15 +228,19 @@ export default {
     XdFormInput,
     XdForm,
     XdFormItem,
+    XdDailog
   },
   mixins: [componentsMixins, extsMixins, JfbBaseLoginMixin, privacyMixins],
   data() {
     return {
+      //体验模式
+      dialogPreview: false,
+      previewAccout: '',
+
       showStep: 1,
       panel_1_checked: "",
       panel_2_checked: "",
       password: "",
-      //todo
       accountLoginType: "phone", //phone: 验证码登录   pwd: 密码登录
       accountForm: {
         phone_number: "", //15801505541
@@ -255,6 +279,7 @@ export default {
       logo: "",
       partnerName: "",
       logoTextColor: "",
+      isPreview:'N', //是否启用体验码模式
     };
   },
   computed: {
@@ -265,6 +290,9 @@ export default {
     panelTwoIsChecked() {
       return this.panel_2_checked.includes(1);
     },
+    prod_bottom() {
+      return this.fixedStyle({ height: 0, zIndex: 111 });
+    },
   },
   watch: {
     container(value) {
@@ -296,16 +324,46 @@ export default {
         url: `/pages/content/content?${params}`
       })
     },
-    
-    
+
+    loginPreview(experience_code){
+      return new Promise((resolve,reject)=>{
+        jfbRootExec("loginExperience", {
+          vm: this,
+          data: {experience_code},
+        }).then(res=>{
+          resolve(res)
+        }).catch(err=>{
+          reject(err)
+        })
+      })
+    },
+
+    async handlePreview(){
+      if(!this.previewAccout) {
+        this.$xdAlert({
+          content: '请输入体验码',
+          type:'error'
+        });
+        return;
+      }
+      this.$xdShowLoading({});
+      try{
+        const res = await this.loginPreview(this.previewAccout);
+        if(res) this.jfbAuthorize.setAllToken(res);
+        this.toHomeAfterLogin();
+        this.$xdHideLoading();
+      }catch (e){
+        this.$xdHideLoading();
+      }
+    },
+
+
     onJfbLoad(options) {
       this.redirect_url = options.redirect_url ? Base64.decode(options.redirect_url): '';
       // #ifdef MP-WEIXIN
       this.authWxMpListProviders();
       // #endif
-      
       this.$xdLog.setProject('JfbBaseLogin', 'JfbBaseLogin.onJfbLoad.start')
-      
       // #ifdef H5
       try{
         this.authH5ListProviders();
@@ -313,7 +371,6 @@ export default {
         this.$xdLog.setProject('JfbBaseLogin', 'JfbBaseLogin.onJfbLoad.error');
         this.$xdLog.setARMSError(error);
       }
-      
       //#endif
 
       // if (options.isDebug === "1") {
@@ -354,7 +411,7 @@ export default {
       this.phone_number_collect_url = getContainerPropsValue(value, "content.phone_number_collect_url", {value: ''}).value;
       this.forget_pwd_url = getContainerPropsValue(value, "content.forget_pwd_url", {value: ''}).value;
       this.error_callback_url = getContainerPropsValue(value, "content.error_url", {value: ''}).value;
-      
+      this.isPreview = getContainerPropsValue(value, "content.isPreview", 'N');
     },
 
     /**
@@ -464,22 +521,22 @@ export default {
         "62fde99f2583a19c58fd937b",
         "62fde9432583a19c58fd937a",
       ];
-      
+
       let { redirect_url, callback_url } = this;
-      
+
       //不同项目直接域名替换
       if (/^(@site_domain@).+$/.test(redirect_url)) {
         redirect_url = redirect_url.replace(/@site_domain@/, location.origin)
       }
-      
+
       try {
         let redirectURL = new URL(redirect_url);
         redirect_url = redirectURL.href;
       } catch (e) {
         redirect_url = location.origin + this.base + redirect_url;
       }
-      
-      
+
+
       let params = {
         providers: providers.join(","),
         callback_url: redirect_url,
@@ -487,9 +544,9 @@ export default {
         phone_number_collect_url: location.origin + this.base + this.phone_number_collect_url,
         error_callback_url: location.origin + this.base + this.error_callback_url,
       };
-  
+
       this.$xdLog.setProject('JfbBaseLogin', 'JfbBaseLogin.onJfbLoad.loading..');
-      
+
       jfbRootExec("listSiteProvider", {
         vm: this,
         data: params,
@@ -701,7 +758,7 @@ export default {
         margin-left: unit(20,rpx) !important;
       }
     }
-    
+
     .form-group {
       padding: 40rpx 70rpx;
     }
@@ -851,4 +908,45 @@ export default {
 .login-pub {
   margin-top: unit(40, rpx);
 }
+.bottom_btn {
+  position: fixed;
+  width: 100%;
+  display:flex;
+  justify-content: center;
+  align-items: center;
+  height: unit(100, rpx);
+  background: #ffffff;
+
+  & > view {
+    height: unit(44, rpx);
+    line-height: unit(44, rpx);
+    width: unit(150, rpx);
+    text-align: center;
+    cursor: pointer;
+    font-size: unit(24, rpx);
+    border-radius: unit(12, rpx);
+  }
+}
+
+.preview-login {
+  padding: unit(40, rpx) 0;
+
+  &-input {
+    height: unit(70, rpx);
+    border-radius: unit(12, rpx);
+    padding: 0 unit(20, rpx);
+    text-align: left;
+    border: 1px solid #eee;
+    background: #F7F7F7;
+    color: #666;
+    transition: box-shadow 0.5s;
+    box-shadow: 0 0 0 rgba(0,0,0,0);
+
+    &:hover {
+      box-shadow: 0 0 unit(10, rpx) rgba(0,0,0,.1);
+    }
+  }
+}
+
+
 </style>

package/src/components/JfbBaseOrderDetail/JfbBaseOrderDetail.vue

@@ -294,6 +294,9 @@
             <view class="jfb-base-order-detail__body-cashier-text">
               {{ info.codes[0].can_read_code }}
             </view>
+            <view v-if="info.codes[0].refund_tip_text" style="color:red;font-size:24rpx;text-align:center;margin-top:10rpx">
+              {{info.codes[0].refund_tip_text}}
+            </view>
             <view
               v-if="info.codes[0].code_end_time"
               class="jfb-base-order-detail__body-cashier-code"

package/src/components/JfbBaseOrderList/JfbBaseOrderList.vue

@@ -19,13 +19,16 @@
     <view
       class="jfb-base-order-list__body"
     >
-      <xd-tab
-        v-if="initStatus"
-        :tabIndex="tabIndex"
-        :list="tabList"
-        show-footer-line
-        @onTab="handleChange"
-      ></xd-tab>
+      <view class="fixed_top" :style="{top: (layoutInfo.top-2)+'rpx'}">
+        <xd-tab
+          v-if="initStatus"
+          :tabIndex="tabIndex"
+          :list="tabList"
+          show-footer-line
+          @onTab="handleChange"
+        ></xd-tab>
+      </view>
+      <view style="height: 100rpx;"></view>
       <view v-if="loadingList" class="jfb-base-order-list__body-order skeleton-wrap">
         <view class="jfb-base-order-list__body-order-item"
           v-for="i in 5" :key="i"
@@ -516,6 +519,14 @@ export default {
 
 .jfb-base-order-list {
   &__body {
+    .fixed_top{
+      position: fixed;
+      top: 0;
+      left: 0;
+      width: 100%;
+      background: #FFFFFF;
+      z-index: 999;
+    }
     &-no {
       display: flex;
       justify-content: center;

package/src/components/JfbBasePoster/Attr.js

@@ -8,6 +8,7 @@ import console from "@dcloudio/uni-h5/src/core/helpers/console";
 export default {
   style:[],
   content:(params)=>{
+    console.log(params,'anananananana');
     if(!params['isCarousel']) params['isCarousel'] = 1;
     return [
       {
@@ -220,7 +221,26 @@ export default {
           {required: true, message: '请选择广告位置', trigger: 'change'},
         ],
       },
-      params.poster && params.poster['type'] !== '1' && {
+      params.poster && params.poster['type']&& params.poster['type'] !== '1' && {
+        label: '广告背景图:',
+        ele: 'xd-upload',
+        valueKey: 'background',
+        value: params.background || {},
+        defaultValue: params.background || null,
+        slot: true,
+        oneWidth: 100,
+        oneHeight: 100,
+        elinputClassName: 'input40',
+        tipsformet: '上传文件格式：@imageType@，不超过@size@MB.',
+        type: ['jpg', 'png', 'jpeg'],
+        styleType: 'one',
+        uploadType: 'aliyun',
+        size: 5,
+        action: 'action',
+        sort: true,
+        maxlen: 100,
+      },
+      params.poster &&  params.poster['type']&& params.poster['type'] !== '1' && {
         label: '广告位内容间距设置:',
         ele: 'el-input',
         type: 'number',

package/src/components/JfbBasePoster/JfbBasePoster.vue

@@ -17,7 +17,10 @@
 			class="jfb-base-poster__body"
 			v-if="noData"
 			:style="{
-				margin: margin
+				margin: margin,
+        background: `url(${background})`,
+        backgroundSize: '100% 100%',
+        backgroundRepeat: 'no-repeat',
 			}
 		">
 			<!--一分屏-->
@@ -73,7 +76,6 @@
 							</template>
 						</xd-swiper>
 					</xd-swiper-dot>
-
 					<view v-if="isPreview" class="carousel-mask"></view>
 				</view>
 			</template>
@@ -84,9 +86,11 @@
 				:content="info"
 			></more-screen>
     </view>
+    <!--解决图片缓冲预加载问题-->
     <view v-for="(item,index) in info" :key="index" style="position: absolute; top: -19999px; left: -100000px">
-        <image :src="item.image_background_url" ></image>
-      </view>
+      <image :src="item.image_background_url" ></image>
+    </view>
+    <!--解决图片缓冲预加载问题-->
   </view>
 </template>
 
@@ -116,7 +120,8 @@
     mixins: [componentsMixins,extsMixins,JfbBasePosterMixin],
     data() {
       return {
-        selfMask: true,
+        selfMask: false,
+        pageShow:false,
         params: {},
 
 				//Swiper 配置
@@ -146,6 +151,7 @@
 				},
 				isPreview: false,
 				noData:false,
+        background: '',
 
 				test: {
           "content_id": "KpBbUKdj4aBejwe7Fh1ki",
@@ -315,10 +321,15 @@
         return temp
 			},
       handleAnimationfinish(e) {
+        //当前组件已被隐藏或者轮播图记录为0条处理
+        if(this.$root.$isShow === false  || this.info.length === 0 ) {
+          this.$xdRoot.$emit("setLayoutPageBg", null);
+          return
+        }
         this.currentImage = this.info[e.detail.current]['image_background_url']
-        if(this.isSupport==='Y' && this.rows===1 && this.isCarousel===2 && this.$root.$isShow === true) {
+        if(this.isSupport==='Y' && this.rows===1 && this.isCarousel===2) {
           let bg = null;
-          if(this.info[e.detail.current]['image_background_url']) bg = this.info[e.detail.current]['image_background_url'];
+          if(this.info[e.detail.current] && this.info[e.detail.current]['image_background_url']) bg = this.info[e.detail.current]['image_background_url'];
           this.$xdRoot.$emit("setLayoutPageBg", bg);
         }
         this.current = e.detail.current;
@@ -383,6 +394,9 @@
 			},
       handleOne(list){
         this.info = this.handleImage(list);
+
+        //轮播图记录为0条处理
+        if( this.info.length === 0)  return
         let current = this.current || 0;
         this.currentImage = this.info[current]['image_background_url']
         if(this.isSupport==='Y' && this.rows===1 && this.isCarousel===2) {
@@ -412,6 +426,7 @@
         this.rows = getContainerPropsValue(container, 'content.rows', 1);
         this.isSupport = getContainerPropsValue(container, 'content.isSupport', 'Y');
         this.mS = getContainerPropsValue(container, 'content.margin', this.getDefualtValue('margin'));
+        this.background = getContainerPropsValue(container, "content.background", {path: "",}).path;
 
         //content
 

package/src/components/JfbBasePosterBigSmall/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/JfbBasePosterBigSmall/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',
+    },
+  ],
+};

package/src/components/JfbBasePosterBigSmall/JfbBasePosterBigSmall.vue

@@ -0,0 +1,110 @@
+<template>
+  <view
+    class="jfb-base-poster-big-small"
+    @click="handleEditxSelect"
+    :class="{ editx : isEditx && active }"
+  >
+    <!--#ifdef H5-->
+    <view
+      class="jfb-base-poster-big-small__edit"
+      :class="{ editx : isEditx && active }"
+      v-if="isEditx && active"
+    >
+      <view class="jfb-base-poster-big-small__edit-icon" @click="delEdit">删除</view>
+    </view>
+    <!-- #endif -->
+    <view class="jfb-base-poster-big-small__body">
+      <view>测试插件( {{containerId}} )</view>
+    </view>
+  </view>
+</template>
+
+<script>
+  import XdFontIcon from "@/components/XdFontIcon/XdFontIcon";
+  import { jfbRootExec } from "@/utils/xd.event";
+  import JfbBasePosterBigSmallMixin from "./JfbBasePosterBigSmallMixin";
+  import { getContainerPropsValue } from "@/utils/xd.base";
+  import componentsMixins from "@/mixins/componentsMixins";
+  import extsMixins from "@/mixins/extsMixins";
+  export default {
+    name: "JfbBasePosterBigSmall",
+    components: {
+      XdFontIcon
+    },
+    mixins: [
+      componentsMixins, extsMixins, JfbBasePosterBigSmallMixin
+    ],
+    data() {
+      return {
+
+        //todo
+      }
+    },
+    watch: {
+      container(value) {
+        this.init(value)
+      }
+    },
+    created() {
+      this.init(this.container);
+
+      //todo
+    },
+    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)
+      },
+    }
+  }
+
+</script>
+
+<style scoped lang="less">
+  @import "./JfbBasePosterBigSmallLess.less";
+
+  .jfb-base-poster-big-small {
+    &__body{
+
+    }
+  }
+</style>

package/src/components/JfbBasePosterBigSmall/JfbBasePosterBigSmallLess.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-poster-big-small {
+  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-poster-big-small {
+  &:before {
+    content: " ";
+    display: table;
+  }
+}
+/**endNotPreview**/

package/src/components/JfbBasePosterBigSmall/JfbBasePosterBigSmallMixin.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-poster-big-small'
+    }
+  },
+  created() {
+    
+    //@AttrDataCreated
+    this.Attr = this.$xdUniHelper.customClone(Attr);
+    //@EndAttrDataCreated
+    
+
+  },
+}

package/src/components/JfbBasePosterBigSmall/Mock.js

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

package/src/components/JfbBaseSuccess/JfbBaseSuccess.vue

@@ -98,6 +98,9 @@
             <view class="jfb-base-success__body-cashier-text">
               {{ info.codes[0].can_read_code }}
             </view>
+            <view v-if="info.codes[0].refund_tip_text" style="color:red;font-size:24rpx;text-align:center;margin-top:10rpx">
+              {{info.codes[0].refund_tip_text}}
+            </view>
             <view
               v-if="info.codes[0].code_end_time"
               class="jfb-base-success__body-cashier-code"

package/src/components/JfbBaseUserInfo/JfbBaseUserInfo.vue

@@ -37,25 +37,28 @@
               <xd-font-icon :color="color" icon="iconwode_mian" size="100"></xd-font-icon>
             </view>
           </template>
-          <view class="no-image" :style="{borderColor: color}" v-else>
+          <view v-else class="no-image" :style="{borderColor: color}">
             <xd-font-icon :color="color" icon="iconwode_mian" size="90"></xd-font-icon>
           </view>
+
           <view v-if="logined && textType ==='N'" :style="{color:color}">{{userInfo|getName}}</view>
           <view class="vertical-user" v-if="logined && textType ==='Y'" :style="{color:color}">
             <view>{{userInfo|getName}}</view>
-            <view @click="handleToLink()" v-if="0">
+            <view @click="handleToLink()">
               <xd-font-icon :color="color" size="40" icon="iconshezhi_mian"></xd-font-icon>
             </view>
           </view>
         </view>
-        <view @click="handleToLink()" v-if="logined && textType ==='N' && 0 ">
-          <xd-font-icon :color="color" size="40" icon="iconshezhi_mian"></xd-font-icon>
+
+        <view @click="handleLogout()" v-if="logined" class="logout">
+          <view v-if="textType ==='N'">[退出登录]</view>
         </view>
       </view>
     </view>
   </view>
 </template>
 
+
 <script>
   import XdFontIcon from "@/components/XdFontIcon/XdFontIcon";
   import { jfbRootExec } from "@/utils/xd.event";
@@ -64,6 +67,7 @@
   import extsMixins from "@/mixins/extsMixins"
   import { getContainerPropsValue } from "@/utils/xd.base";
   import {mapState} from 'vuex';
+  import store from "@/store";
   export default {
     name: "JfbBaseUserInfo",
     components: {
@@ -72,7 +76,7 @@
     mixins: [componentsMixins,extsMixins,JfbBaseUserInfoMixin],
     computed: {
       ...mapState(['jfbAuthorize']),
-      
+
       outMargin() {
         let margin = `${this.margin.top !== null ? this.margin.top : 20}rpx`;
         margin = `${margin} ${this.margin.right !== null ? this.margin.right : 20}rpx`;
@@ -106,24 +110,24 @@
         logined: false,
         userInfo: null,
         address_url: '',
-        
+
         //基础
         color: '#333',
         backgroundColor: 'rgba(0,0,0,0)',
         textType: 'N', //默认水平
         radius: 0,
-        
+
         //投影
         is_shadow: 'Y',
         is_shadow_bg: 0,
         is_shadow_w: 0,
-        
-        
+
+
         //边框
         is_border: 'Y',
         is_border_w: 0,
         is_border_c: '',
-        
+
         //其他
         margin: {
           top: 0,
@@ -137,7 +141,7 @@
           right: 0,
           bottom: 0
         },
-        
+
       }
     },
     watch: {
@@ -154,8 +158,27 @@
           url: '/pages/settings/settings'
         })
       },
+
+      async handleLogout(){
+        debugger
+        // #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);
+          })
+        }
+      },
+
       async onJfbLoad(options) {
-        
+
         //预览模式
         if(this.$configProject.isPreview) {
           jfbRootExec('getBaseUserInfo', {
@@ -170,10 +193,10 @@
           });
           return;
         }
-        
+
         this.logined = await this.jfbAuthorize.checkUserLogin(true, this, false);
         if(!this.logined) return;
-        
+
         jfbRootExec('getBaseUserInfo', {
           vm: this,
           data: {}
@@ -195,15 +218,15 @@
         this.color = getContainerPropsValue(container, 'content.textColor', '#333');
         this.backgroundColor = getContainerPropsValue(container, 'content.backgroundColor', 'rgba(0,0,0,0)');
         this.textType = getContainerPropsValue(container, 'content.text_type', 'N');
-        
+
         this.is_shadow = getContainerPropsValue(container, 'content.is_shadow', 'N');
         this.is_shadow_bg = getContainerPropsValue(container, 'content.is_shadow_bg', '#fff');
         this.is_shadow_w = getContainerPropsValue(container, 'content.is_shadow_w', '10');
-  
+
         this.is_border = getContainerPropsValue(container, 'content.is_border', 'N');
         this.is_border_c = getContainerPropsValue(container, 'content.is_border_c', '#fff');
         this.is_border_w = getContainerPropsValue(container, 'content.is_border_w', '10');
-        
+
         this.radius = getContainerPropsValue(container, 'content.radius', '0');
       },
     }
@@ -213,7 +236,7 @@
 
 <style scoped lang="less">
   @import "./JfbBaseUserInfoLess.less";
-  
+
   .vertical-user {
     display: flex;
     justify-content: center;
@@ -229,29 +252,29 @@
         display: flex;
         align-items: center;
         justify-content: flex-start;
-        
-    
+
+
         &-left {
           display: flex;
           align-items: center;
           flex: 1;
-  
+
           &.vertical {
             width: 100%;
             flex-direction: column;
-            
+
             & > view:last-child {
               width: 100%;
               text-align: center;
               flex-shrink: 0;
               padding-top: unit(20, rpx);
             }
-  
+
             & > image, .no-image {
               margin-right: unit(0, rpx);
             }
           }
-      
+
           & > image, .no-image {
             width: unit(140, rpx);
             height: unit(140, rpx);
@@ -263,21 +286,28 @@
             flex-shrink: 0;
             overflow: hidden;
           }
-          
+
           .no-image {
             border: unit(4, rpx) solid #e5e5e5;
           }
-      
+
           & > view {
             color: #383838;
             font-size: unit(32, rpx);
           }
         }
-        
+
         & > view:nth-child(2) {
           flex-shrink: 0;
         }
       }
     }
+
+    .logout {
+      font-size: unit(26, rpx);
+      & > view {
+        color: #333;
+      }
+    }
   }
 </style>