jufubao-base 1.0.119-beta18 → 1.0.119-beta19

package/package.json

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

package/src/components/JfbBaseConPhone/JfbBaseConPhone.vue

@@ -266,9 +266,9 @@ export default {
           let image1 = await getImageInfo(getServiceUrl(res.used_background));
           console.log({ ...image }, "imageimage");
           this.topHeight = image.imgHeight * 2;
-          this.topWidth = image.imgWidth * 2;
+          this.topWidth = '100%';
           this.bottomHeight = image1.imgHeight * 2;
-          this.bottomWidth = image1.imgWidth * 2;
+          this.bottomWidth = '100%';
           this.background = getServiceUrl(res.background);
           this.used_background = getServiceUrl(res.used_background);
           this.errmessage = res.message;

package/src/components/JfbBaseWalletDetail/JfbBaseWalletDetail.vue

@@ -20,7 +20,7 @@
         <view class="jfb-base-wallet-detail__body-price">
           <XdFontIcon size="56" :icon="operate_type === 'A'?'iconshouru':'iconzhichu'"></XdFontIcon>
           <view class="jfb-base-wallet-detail__body-price-type"
-            >消费{{ operate_type_name }}</view
+            >{{trade_type_name}}</view
           >
           <view
             >{{ operate_type === "A" ? "+" : "-"
@@ -61,7 +61,7 @@ export default {
   mixins: [componentsMixins, extsMixins, JfbBaseWalletDetailMixin],
   data() {
     return {
-      operate_type_name: "",
+      trade_type_name: "",
       operate_type: "",
       list: [],
       amount: "",
@@ -89,7 +89,7 @@ export default {
         .then((res) => {
           this.list = res.list;
           this.amount = res.amount;
-          this.operate_type_name = res.operate_type_name;
+          this.trade_type_name = res.trade_type_name;
           this.operate_type = res.operate_type;
           this.status = true;
         })

package/src/components/JfbBaseWalletIndex/JfbBaseWalletIndex.vue

@@ -73,13 +73,14 @@
       <view class="jfb-base-wallet-index__body-wrap">
         <view class="jfb-base-wallet-index__body-filter">
           <picker
+            class="cancel"
             fields="month"
             mode="date"
             :value="date"
             @change="bindDateChange"
           >
             <view class="jfb-base-wallet-index__body-filter-condition">
-              <text>{{date?date:'全部月份'}}</text>
+              <text>{{ date }}</text>
               <XdFontIcon size="24" icon="iconxia_down"></XdFontIcon>
             </view>
           </picker>
@@ -91,7 +92,13 @@
             @change="bindOperateChange"
           >
             <view class="jfb-base-wallet-index__body-filter-condition">
-              <text>{{operate_type?operate_type==='R'?"全部支出":"全部收入":'全部收支'}}</text>
+              <text>{{
+                operate_type
+                  ? operate_type === "R"
+                    ? "全部支出"
+                    : "全部收入"
+                  : "全部收支"
+              }}</text>
               <XdFontIcon size="24" icon="iconxia_down"></XdFontIcon>
             </view>
           </picker>
@@ -110,7 +117,9 @@
                     item.operate_type === 'A' ? 'iconshouru' : 'iconzhichu'
                   "
                 ></XdFontIcon>
-                <text style="margin-left:10rpx">{{ item.trade_type_name }}</text>
+                <text style="margin-left: 10rpx">{{
+                  item.trade_type_name
+                }}</text>
               </view>
               <view>
                 <view
@@ -156,7 +165,11 @@
             <view>付款方式</view>
             <view @click="handleChangePayType">
               <view> {{ qrcodeInfo.wallet_name }} </view>
-              <XdFontIcon v-if="typeList.length" size="20" icon="iconxia_down"></XdFontIcon>
+              <XdFontIcon
+                v-if="typeList.length"
+                size="20"
+                icon="iconxia_down"
+              ></XdFontIcon>
             </view>
           </view>
           <view class="jfb-base-wallet-index__body-pay-id"
@@ -250,7 +263,7 @@ export default {
           label: "收入",
           value: "A",
         },
-      ], 
+      ],
       qrcodeInfo: {},
       date: "",
       operate_type: "",
@@ -297,6 +310,7 @@ export default {
   methods: {
     async onJfbLoad(options) {
       this.type = options.type;
+      this.date = `${new Date().getFullYear()}-${String(new Date().getMonth() + 1).padStart(2, '0')}`;
       await jfbRootExec("getWalletList", {
         vm: this,
         data: { support_method: this.type },
@@ -321,7 +335,7 @@ export default {
     handleChangePayType() {
       this.showQrcode = false;
       this.handleClose();
-      this.handleShowQrcode()
+      this.handleShowQrcode();
     },
     getList() {
       console.log(this.data, this.operate_type, "operate_typeoperate_type");
@@ -800,3 +814,8 @@ export default {
   }
 }
 </style>
+<style>
+.cancel ::v-deep .uni-picker-action-cancel ::after {
+  content: "全部" !important;
+}
+</style>

package/src/components/JfbBaseWalletItem/JfbBaseWalletItem.vue

@@ -70,7 +70,7 @@
             @change="bindDateChange"
           >
             <view class="jfb-base-wallet-item__body-filter-condition">
-              <text>{{date?date:'全部月份'}}</text>
+              <text>{{ date }}</text>
               <XdFontIcon size="24" icon="iconxia_down"></XdFontIcon>
             </view>
           </picker>
@@ -82,11 +82,17 @@
             @change="bindOperateChange"
           >
             <view class="jfb-base-wallet-item__body-filter-condition">
-              <text>{{operate_type?operate_type==='R'?"全部支出":"全部收入":'全部收支'}}</text>
+              <text>{{
+                operate_type
+                  ? operate_type === "R"
+                    ? "全部支出"
+                    : "全部收入"
+                  : "全部收支"
+              }}</text>
               <XdFontIcon size="24" icon="iconxia_down"></XdFontIcon>
             </view>
           </picker>
-        </view> 
+        </view>
         <view class="jfb-base-wallet-item__body-list">
           <view v-if="detailList.length">
             <view
@@ -101,9 +107,9 @@
                     item.operate_type === 'A' ? 'iconshouru' : 'iconzhichu'
                   "
                 ></XdFontIcon>
-                <text style="margin-left: 10rpx"
-                  >{{ item.trade_type_name }}</text
-                >
+                <text style="margin-left: 10rpx">{{
+                  item.trade_type_name
+                }}</text>
               </view>
               <view>
                 <view
@@ -197,6 +203,9 @@ export default {
   methods: {
     async onJfbLoad(options) {
       this.type = options.type;
+      this.date = `${new Date().getFullYear()}-${String(
+        new Date().getMonth() + 1
+      ).padStart(2, "0")}`;
       this.wallet_type = options.wallet_type;
       await jfbRootExec("getWalletDetail", {
         vm: this,