jufubao-base 1.0.119-beta17 → 1.0.119-beta19

package/package.json

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

package/src/components/JfbBaseConDialog/JfbBaseConDialog.vue

@@ -297,6 +297,9 @@ export default {
       } catch (error) {
         console.log(error, "errorerror");
       }
+      console.log(!storage.get(this.containerId) &&
+          this.distribution_method !== "paid" && 
+          this.distribution_method !== "card_binded",'pppppp');
       if(this.distribution_method === 'card_binded'){
         jfbRootFnExec(this, 'onCustomEvent')("baseConDialog@hasCon", this.containerId);
       }

package/src/components/JfbBaseConPhone/JfbBaseConPhone.vue

@@ -14,96 +14,110 @@
     </view>
     <!-- #endif -->
     <view class="jfb-base-con-phone__body" v-if="done">
-      <view
-        v-if="has_times === 'Y'"
-        class="jfb-base-con-phone__body-wrap"
-        :style="{
-          height: layoutInfo.bodyMinHeightRpx + 'rpx',
-          backgroundImage: `url(${background})`,
-          backgroundSize: '100% 100%',
-        }"
-      >
-        <view v-if="showCode" class="jfb-base-con-phone__body-wrap-input">
-          <view>
-            <input
-              @input="filterSpaces"
-              v-model="phoneNumber"
-              placeholder="请输入手机号"
-              type="text"
-            />
-          </view>
-          <view
-            class="jfb-base-con-phone__body-wrap-input-code"
-            style="margin-bottom: 54rpx"
-          >
-            <input
-              v-model="valid_code"
-              placeholder="请输入验证码"
-              type="text"
-            />
-            <XdButton
-              :disabled="disabled"
-              class="jfb-base-con-phone__body-wrap-input-code-btn"
-              type="primary"
-              :bg-color="mainColor"
-              size="small"
-              @click="handleSendCode"
-              >{{ message }}</XdButton
+      <view v-if="has_times === 'Y'">
+        <view
+          class="jfb-base-con-phone__body-wrap"
+          :style="{
+            height: topHeight + 'rpx',
+            width: topWidth + 'rpx',
+            backgroundImage: `url(${background})`,
+            backgroundSize: '100% 100%',
+          }"
+        >
+          <view v-if="showCode" class="jfb-base-con-phone__body-wrap-input">
+            <view>
+              <input
+                @input="filterSpaces"
+                v-model="phoneNumber"
+                placeholder="请输入手机号"
+                type="text"
+              />
+            </view>
+            <view
+              class="jfb-base-con-phone__body-wrap-input-code"
+              style="margin-bottom: 54rpx"
             >
-          </view>
-          <XdButton
-            type="primary"
-            :bg-color="mainColor"
-            width="360rpx"
-            radius="20rpx"
-            size="small"
-            :disabled="!phoneNumber || !valid_code"
-            @click="handleConfirm"
-            >确认领取</XdButton
-          >
-        </view>
-        <view v-else class="jfb-base-con-phone__body-wrap-input">
-          <view class="jfb-base-con-phone__body-wrap-input-phone">
-            <view class="jfb-base-con-phone__body-wrap-input-phone-change">
-              <view>当前登录手机号</view>
+              <input
+                v-model="valid_code"
+                placeholder="请输入验证码"
+                type="text"
+              />
               <XdButton
-                style="margin: 0"
+                :disabled="disabled"
+                class="jfb-base-con-phone__body-wrap-input-code-btn"
                 type="primary"
                 :bg-color="mainColor"
                 size="small"
-                @click="showCode = true"
-                >切换手机号</XdButton
+                @click="handleSendCode"
+                >{{ message }}</XdButton
               >
             </view>
-            <view>{{ showOhoneNumber }}</view>
+            <XdButton
+              type="primary"
+              :bg-color="mainColor"
+              width="360rpx"
+              radius="20rpx"
+              size="small"
+              :disabled="!phoneNumber || !valid_code"
+              @click="handleConfirm"
+              >确认领取</XdButton
+            >
+          </view>
+          <view v-else class="jfb-base-con-phone__body-wrap-input">
+            <view class="jfb-base-con-phone__body-wrap-input-phone">
+              <view class="jfb-base-con-phone__body-wrap-input-phone-change">
+                <view>当前登录手机号</view>
+                <XdButton
+                  style="margin: 0"
+                  type="primary"
+                  :bg-color="mainColor"
+                  size="small"
+                  @click="showCode = true"
+                  >切换手机号</XdButton
+                >
+              </view>
+              <view>{{ showOhoneNumber }}</view>
+            </view>
+            <XdButton
+              type="primary"
+              :bg-color="mainColor"
+              width="360rpx"
+              radius="20rpx"
+              size="small"
+              @click="handleConfirm"
+              >直接领取</XdButton
+            >
           </view>
-          <XdButton
-            type="primary"
-            :bg-color="mainColor"
-            width="360rpx"
-            radius="20rpx"
-            size="small"
-            @click="handleConfirm"
-            >直接领取</XdButton
-          >
         </view>
-        <view v-if="showBtn === 'Y'" class="jfb-base-con-phone__body-wrap-btn">
-          <XdButton
-            size="small"
-            type="primary"
-            :bg-color="mainColor"
-            radius="20rpx"
-            @click="handleTo(btnOneUrl)"
-            >{{ btnOneName }}</XdButton
-          >
-          <XdButton
-            size="small"
-            type="primary"
-            :bg-color="mainColor"
-            radius="20rpx"
-            @click="handleTo(btnTwoUrl)"
-            >{{ btnTwoName }}</XdButton
+        <view
+          :style="{
+            height: bottomHeight + 'rpx',
+            width: bottomWidth + 'rpx',
+            backgroundImage: `url(${used_background})`,
+            backgroundSize: '100% 100%',
+          }"
+        >
+          <view
+            v-if="showBtn === 'Y'"
+            class="jfb-base-con-phone__body-wrap-btn"
           >
+            <XdButton
+              size="small"
+              type="primary"
+              :bg-color="mainColor"
+              radius="20rpx"
+              @click="handleTo(btnOneUrl)"
+              >{{ btnOneName }}</XdButton
+            >
+            <XdButton
+              size="small"
+              type="primary"
+              :bg-color="mainColor"
+              radius="20rpx"
+              @click="handleTo(btnTwoUrl)"
+              >{{ btnTwoName }}</XdButton
+            >
+          </view>
         </view>
       </view>
       <view
@@ -125,7 +139,7 @@ import XdFontIcon from "@/components/XdFontIcon/XdFontIcon";
 import XdButton from "@/components/XdButton/XdButton";
 import { jfbRootExec } from "@/utils/xd.event";
 import JfbBaseConPhoneMixin from "./JfbBaseConPhoneMixin";
-import { getContainerPropsValue } from "@/utils/xd.base";
+import { getContainerPropsValue, getImageInfo } from "@/utils/xd.base";
 import componentsMixins from "@/mixins/componentsMixins";
 import extsMixins from "@/mixins/extsMixins";
 import { mapState } from "vuex";
@@ -171,6 +185,12 @@ export default {
       date: 2, //时间底数
       time: 0, //时间幂指数
       timeer: null,
+      topHeight: "",
+      topWidth: "750",
+      used_background: "",
+      bottomHeight: "",
+      bottomWidth: "750",
+      showBtn: "N",
     };
   },
   watch: {
@@ -234,7 +254,7 @@ export default {
           activity_id: this.activity_id,
         },
       })
-        .then((res) => {
+        .then(async (res) => {
           console.log(res, "res");
           this.has_times = res.has_times;
           this.showBtn = res.phone_button;
@@ -242,7 +262,15 @@ export default {
           this.btnTwoName = res.button_name_two;
           this.btnOneUrl = res.button_url_one;
           this.btnTwoUrl = res.button_url_two;
+          let image = await getImageInfo(getServiceUrl(res.background));
+          let image1 = await getImageInfo(getServiceUrl(res.used_background));
+          console.log({ ...image }, "imageimage");
+          this.topHeight = image.imgHeight * 2;
+          this.topWidth = '100%';
+          this.bottomHeight = image1.imgHeight * 2;
+          this.bottomWidth = '100%';
           this.background = getServiceUrl(res.background);
+          this.used_background = getServiceUrl(res.used_background);
           this.errmessage = res.message;
           this.done = true;
         })
@@ -504,8 +532,8 @@ export default {
         display: flex;
         justify-content: space-around;
         align-items: center;
-        width: 100%;
-        margin-top: 64rpx;
+        width: 750rpx;
+        padding-top: 40rpx;
       }
     }
   }

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,