jufubao-base 1.0.76 → 1.0.77-beta10

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/JfbBaseRechargeOrder/JfbBaseRechargeOrder.vue

@@ -16,12 +16,8 @@
     </view>
     <!-- #endif -->
     <view class="jfb-base-recharge-order__body">
-      <view v-if="orderList&&orderList.length>0" :style="{ padding: outMargin }">
-        <view
-          v-for="(item, index) in orderList"
-          :key="index"
-          class="jfb-base-recharge-order__body-order"
-          @click="handleToDetail(item)"
+      <view v-if="loadingList" :style="{ padding: outMargin }" class="skeleton-wrap">
+        <view v-for="i in 3" :key="i" class="jfb-base-recharge-order__body-order"
           :style="{
             background: backgroundColor,
             border: borderBox,
@@ -31,40 +27,72 @@
           }"
         >
           <view class="jfb-base-recharge-order__body-order-header">
-            充值订单
+            <view></view>
           </view>
           <view class="jfb-base-recharge-order__body-order-middle">
-            <view
-              >订单编号：
-              {{ item.order_id }}
-            </view>
-            <view :style="{ color: item.textColor }">
-              {{ item.pay_status_name }}
-            </view>
+            <view></view>
+            <view></view>
           </view>
           <view class="jfb-base-recharge-order__body-order-bottom">
-            <view>交易日期：{{ item.created_time }} </view>
+            <view></view>
           </view>
+          <view class="jfb-base-recharge-order__body-order-bbb">
+            <view></view>
+          </view>
+        </view>
+      </view>
+      <template v-else>
+        <view v-if="orderList&&orderList.length>0" :style="{ padding: outMargin }">
           <view
-            style="margin-top: 32rpx; display: flex; justify-content: space-between"
+            v-for="(item, index) in orderList"
+            :key="index"
+            class="jfb-base-recharge-order__body-order"
+            @click="handleToDetail(item)"
+            :style="{
+              background: backgroundColor,
+              border: borderBox,
+              borderRadius: radius + 'rpx',
+              boxShadow: shadowBox,
+              marginBottom: padding + 'rpx',
+            }"
           >
-          <view style="display: flex; align-items: center;font-size: 24rpx;"
-              >合计：<xd-unit :fontSize="24" iconSize="0.24" :price="item.total_amount"></xd-unit
-            ></view>
-            <xd-button
-            v-if="item.pay_status !== '3000'"
-              width="200rpx"
-              style="margin: 0"
-              size="mini"
-              type="primary"
-              :bgColor="mainColor"
-              @click="handleToPay(item)"
+            <view class="jfb-base-recharge-order__body-order-header">
+              充值订单
+            </view>
+            <view class="jfb-base-recharge-order__body-order-middle">
+              <view
+                >订单编号：
+                {{ item.order_id }}
+              </view>
+              <view :style="{ color: item.textColor }">
+                {{ item.pay_status_name }}
+              </view>
+            </view>
+            <view class="jfb-base-recharge-order__body-order-bottom">
+              <view>交易日期：{{ item.created_time }} </view>
+            </view>
+            <view
+              style="margin-top: 32rpx; display: flex; justify-content: space-between"
             >
-              {{ item.pay_status === "3007" ? "去支付" : "重新支付" }}
-            </xd-button>
+            <view style="display: flex; align-items: center;font-size: 24rpx;"
+                >合计：<xd-unit :fontSize="24" iconSize="0.24" :price="item.total_amount"></xd-unit
+              ></view>
+              <xd-button
+              v-if="item.pay_status !== '3000'"
+                width="200rpx"
+                style="margin: 0"
+                size="mini"
+                type="primary"
+                :bgColor="mainColor"
+                @click="handleToPay(item)"
+              >
+                {{ item.pay_status === "3007" ? "去支付" : "重新支付" }}
+              </xd-button>
+            </view>
           </view>
         </view>
-      </view>
+      </template>
+      
     </view>
   </view>
 </template>
@@ -95,6 +123,7 @@ export default {
       orderList: [],
       detailPath: "",
       payPath: "",
+      loadingList: false,
 
       //基础
       radius: 0,
@@ -211,6 +240,7 @@ export default {
       }).value;
     },
     getList() {
+      this.loadingList = true;
       jfbRootExec("getRechargeOrderList", {
         vm: this,
         data: {
@@ -219,6 +249,7 @@ export default {
         },
       })
         .then((res) => {
+          this.loadingList = false;
           this.orderList = res.list.map((item) => {
             item.total_amount = item.total_amount / 100;
             item["created_time"] = this.$xdUniHelper.getDate(
@@ -280,11 +311,45 @@ export default {
         color: #333;
         border-bottom: unit(2, rpx) solid #f2f2f2;
         padding-bottom: unit(24, rpx);
+
+        & > view {
+          .skeleton-wrap &{
+            .skeleton-item(200rpx, 32rpx);
+          }
+        }
+      }
+
+      &-middle {
+        & > view:first-child {
+          .skeleton-wrap &{
+            .skeleton-item(400rpx, 32rpx);
+          }
+        }
+        & > view:last-child {
+          .skeleton-wrap &{
+            .skeleton-item(100rpx, 32rpx);
+          }
+        }
       }
 
       &-bottom {
         border-bottom: unit(2, rpx) solid #f2f2f2;
         padding-bottom: unit(32,rpx);
+
+        & > view:first-child {
+          .skeleton-wrap &{
+            .skeleton-item(400rpx, 32rpx);
+          }
+        }
+      }
+      &-bbb {
+        padding: unit(32,rpx) 0 0;
+
+        & > view:first-child {
+          .skeleton-wrap &{
+            .skeleton-item(100%, 32rpx);
+          }
+        }
       }
 
       &-middle,

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: {}
@@ -194,16 +217,16 @@
         this.address_url = getContainerPropsValue(container, 'content.address_url', {value: ''});
         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.textType = "N";//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>