jufubao-base 1.0.181-beta1 → 1.0.181-beta2

package/package.json

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

package/src/components/JfbBaseCardDelay/JfbBaseCardDelay.vue

@@ -284,6 +284,7 @@ export default {
       display: flex;
       justify-content: center;
       align-items: center;
+      background:#fff
     }
     .package {
       display: flex;

package/src/components/JfbBaseCardDetailEntry/JfbBaseCardDetailEntry.vue

@@ -71,7 +71,7 @@
         <view v-if="0">
           <xd-button size="small" type="primary" width="100%">消费记录</xd-button>
         </view>
-        <view v-if="1||info.is_can_transfer==='Y'">
+        <view v-if="info.is_can_transfer==='Y'">
           <xd-button
             width="100%"
             @click="handleGive()"

package/src/components/JfbBaseCardGive/JfbBaseCardGive.vue

@@ -96,7 +96,7 @@
         <xd-button type="primary" @click="handleShare">再次分享</xd-button>
         <!-- #endif -->
         <!-- #ifdef MP-WEIXIN -->
-        <button class="share-btn" @click="handleShare" open-type="share">
+        <button :style="{background:mainColor}" class="share-btn" @click="handleShare" open-type="share">
           再次分享
         </button>
         <!-- #endif -->
@@ -115,7 +115,7 @@
             >超过24H未领取，票券会自动退回您的账户中。</view
           >
           <!-- #ifdef MP-WEIXIN -->
-          <button class="share-btn" @click="handleShare" open-type="share">
+          <button :style="{background:mainColor}" class="share-btn" @click="handleShare" open-type="share">
             通知微信好友
           </button>
           <!-- #endif -->
@@ -127,15 +127,14 @@
         </view>
       </xd-dailog>
       <xd-dailog
-        title=""
+        title="取消失败"
         :cancel="false"
         :confirm="false"
         :show.sync="resultDialog"
       >
         <view class="dialog">
-          <view class="dialog-title">取消失败</view>
           <view class="dialog-content">{{ errMsg }}</view>
-          <xd-button @click="resultDialog = false" width="360rpx" type="primary"
+          <xd-button @click="handleCancel" width="360rpx" type="primary"
             >确定</xd-button
           >
         </view>
@@ -202,6 +201,7 @@ export default {
       await this.getDetail();
     },
     getDetail() {
+      this.$xdShowLoading({});
       jfbRootExec("getBaseByIdCardDetailGive", {
         vm: this,
         data: {
@@ -210,6 +210,7 @@ export default {
         },
       })
         .then((res) => {
+          this.$xdHideLoading({});
           this.info = res;
           this.info.card_point = this.$xdUniHelper.divisionFloatNumber(
             this.info.card_point,
@@ -230,6 +231,7 @@ export default {
           }
         })
         .catch((err) => {
+          this.$xdHideLoading({});
           console.log(err, "err");
         });
     },
@@ -248,6 +250,12 @@ export default {
       ).url;
     },
     handleCancel() {
+      this.resultDialog = false;
+      this.getDetail();
+    },
+    handleCancel() {
+      this.$xdShowLoading({});
+
       jfbRootExec("cancelGiveCard", {
         vm: this,
         data: {
@@ -261,12 +269,16 @@ export default {
           } else {
             this.getDetail();
           }
+          this.$xdHideLoading({});
         })
         .catch((err) => {
+          this.$xdHideLoading({});
+
           console.log(err, "err");
         });
     },
     handleGive() {
+      this.$xdShowLoading({});
       jfbRootExec("confirmGiveCard", {
         vm: this,
         data: {
@@ -277,8 +289,10 @@ export default {
         .then((res) => {
           this.getDetail();
           this.dialogShow = true;
+          this.$xdHideLoading({});
         })
         .catch((err) => {
+          this.$xdHideLoading({});
           console.log(err, "err");
         });
     },
@@ -292,7 +306,7 @@ export default {
       uni.setClipboardData({
         data: text,
         success: () => {
-          //this.$xdAlert({ content: "复制成功" });
+          this.$xdAlert({ content: "复制成功" });
         },
       });
       // #endif
@@ -312,6 +326,11 @@ export default {
 
       // #endif
     },
+    onJfbShow(options) {
+      console.log("onJfbShow8888");
+
+      // this.dialogShow = false;
+    },
   },
 };
 </script>
@@ -480,16 +499,15 @@ export default {
     }
     .share-btn {
       opacity: 1;
-      background: #ff5a39;
-      font-size: 19px;
-      height: 44px;
-      line-height: 44px;
-      border-radius: 22px;
+      font-size: 36rpx;
+      height: 80rpx;
+      line-height: 80rpx;
+      border-radius: 44rpx;
       color: #fff;
       width: auto;
       box-shadow: 0 0 0 rgba(0, 0, 0, 0);
       border: 0;
-      padding: 0 33px;
+      padding: 0 60rpx;
       margin: 0;
     }
   }

package/src/components/JfbBaseCardReceive/JfbBaseCardReceive.vue

@@ -90,11 +90,11 @@
         </view>
       </view>
       <view
-        v-if="info.transfer_record.status !== 'Y'"
+        v-if="info.transfer_record.status === 'N'"
         style="height: 110rpx"
       ></view>
       <view
-        v-if="info.transfer_record.status !== 'Y'"
+        v-if="info.transfer_record.status === 'N'"
         class="jfb-base-card-receive__body-footer"
         :style="prod_bottom"
       >
@@ -103,13 +103,12 @@
         >
       </view>
       <xd-dailog
-        title=""
+        title="领取失败"
         :cancel="false"
         :confirm="false"
         :show.sync="dialogShow"
       >
         <view class="dialog">
-          <view class="dialog-title">领取失败</view>
           <view class="dialog-content">{{ errMsg }}</view>
           <xd-button @click="handleClose" width="360rpx" type="primary"
             >确定</xd-button
@@ -117,13 +116,12 @@
         </view>
       </xd-dailog>
       <xd-dailog
-        title=""
+        title="领取成功"
         :cancel="false"
         :confirm="false"
         :show.sync="resultDialog"
       >
         <view class="dialog">
-          <view class="dialog-title">领取成功</view>
           <view class="dialog-content">恭喜您领取成功</view>
           <view class="dialog-notice">票券已放入您的票券列表中</view>
           <!-- <button open-type="share">通知微信好友</button> -->
@@ -166,7 +164,7 @@ export default {
       info: null,
       transfer_auth_code: null,
       dialogShow: false,
-      resultDialog: false,
+      resultDialog: true,
       isPreview: false,
       errMsg: "",
     };
@@ -229,6 +227,7 @@ export default {
         });
     },
     handleReceive() {
+      this.$xdShowLoading({});
       jfbRootExec("receiveCard", {
         vm: this,
         data: {
@@ -243,8 +242,10 @@ export default {
             this.resultDialog = true;
             this.getDetail();
           }
+          this.$xdHideLoading({});
         })
         .catch((err) => {
+          this.$xdHideLoading({});
           console.log(err, "err");
         });
     },
@@ -254,6 +255,8 @@ export default {
     },
 
     toUse() {
+      console.log(this.use_url,'this.use_url');
+      
       this.$xdUniHelper.navigateTo({
         url: `${this.use_url}`,
       });
@@ -327,7 +330,6 @@ export default {
       }
     }
     .dialog {
-      padding-top: 70rpx;
       .dialog-title {
         font-size: 40rpx;
         font-weight: 500;

package/src/components/JfbBaseCardReceiveCover/JfbBaseCardReceiveCover.vue

@@ -48,7 +48,7 @@ export default {
     return {
       btnBg: "",
       contentBg: "",
-      greeting: "我的时代看哈稍等哈手机卡好卡哈哈哈哈哈哈",
+      greeting: "",
       receive_get_url: "",
       btnColor: "",
       transfer_auth_code: null,
@@ -60,10 +60,12 @@ export default {
       return this.styleObjectToString({
         backgroundImage: "url(" + this.btnBg + ")",
         backgroundRepeat: "no-repeat",
-        backgroundSize: "100% 100%",
+        backgroundSize: 'cover',
         width: "326rpx",
         height: "90rpx",
-        lineHeight: "80rpx",
+        display: "flex",
+        justifyContent: "center",
+        alignItems: "center",
         color: this.btnColor,
         border: "none",
       });
@@ -134,6 +136,7 @@ export default {
       );
     },
     handleToReceive() {
+      if(this.status === "T") return;
       this.$xdUniHelper.navigateTo({
         url: `${this.receive_get_url}?transfer_auth_code=${this.transfer_auth_code}`,
       });

package/src/components/JfbBasePay/Attr.js

@@ -17,7 +17,7 @@ export default {
         value: data.pay_success_path || null,
         groupKey:'advanced',
         setting: {
-          router: XdBus.getParentApi('getPagesTree'),
+          router: XdBus.getParentApi('getPag©esTree'),
         },
         inline: false,
       },

package/src/components/JfbBasePay/JfbBasePay.vue

@@ -222,7 +222,7 @@ export default {
     },
   },
   computed: {
-    prod_bottom() {
+    prod_bottom() { 
       return this.fixedStyle({ height: 0, zIndex: 111 });
     },
     getSuccessUrl(){
@@ -416,9 +416,15 @@ export default {
               },
             })
               .then((res) => {
-                this.$xdUniHelper.redirectTo({
-                  url: this.getSuccessUrl + `?order_id=${this.main_order_id}`
-                });
+                if(this.type) {
+                  this.$xdUniHelper.redirectTo({
+                    url: this.getSuccessUrl + `?order_id=${this.main_order_id}&type=${this.type}`
+                  });
+                } else {
+                  this.$xdUniHelper.redirectTo({
+                    url: this.getSuccessUrl + `?order_id=${this.main_order_id}`
+                  });
+                }
               })
               .catch(error=>{
                 this.$xdLog.setARMSCustomError('update_loading_fail', {options: this.options, error});

package/src/components/JfbBaseRechargeOrderDetail/JfbBaseRechargeOrderDetail.vue

@@ -21,7 +21,7 @@
         class="jfb-base-recharge-order-detail__body-delay jfb-base-recharge-order-detail__body-card"
       >
         <image
-          src="https://img.js.design/assets/img/66bad59319ceba995cccf478.png#fbe012b12eff21137811ee558189f911"
+          src="https://img3.jufubao.cn/uploads/20240911/f013c774b2ae205e13d1e9cad062b5db.jpg?ver=1726047927908"
         ></image>
         <view class="jfb-base-recharge-order-detail__body-delay-info">
           <view>{{ info.package_name }}</view>