jufubao-base 1.0.67-beta201 → 1.0.67-beta203

package/package.json

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

package/src/components/JfbBaseConDialog/JfbBaseConDialog.vue

@@ -20,7 +20,7 @@
       <view class="jfb-base-con-dialog__body-dialog" v-if="isShow">
         <view class="jfb-base-con-dialog__body-dialog-mask"></view>
         <view class="jfb-base-con-dialog__body-dialog-content">
-          <view class="jfb-base-con-dialog__body-dialog-content-num">
+          <view v-if="list.length>1" class="jfb-base-con-dialog__body-dialog-content-num">
             <text>{{ currentIndex + 1 }}/{{ list.length }}</text>
           </view>
           <view style="display: flex; align-items: center">
@@ -96,7 +96,7 @@ export default {
     };
   },
   computed: {
-    ...mapState(["pageNamespace"]),
+    ...mapState(["pageBusinessCode"]),
   },
   watch: {
     container(value) {
@@ -125,7 +125,7 @@ export default {
       jfbRootExec("getCouponDialogList", {
         vm: this,
         data: {
-          namespace: this.pageNamespace,
+          namespace: this.pageBusinessCode,
         },
       })
         .then((res) => {

package/src/components/JfbBaseConList/JfbBaseConList.vue

@@ -16,10 +16,15 @@
       <view class="jfb-base-con-list__edit-icon" @click="delEdit">删除</view>
     </view>
     <!-- #endif -->
-    <view class="jfb-base-con-list__body">
-      <view class="jfb-base-con-list__body-header">
-        <image :src="background"></image>
-      </view>
+    <view
+      class="jfb-base-con-list__body"
+      :style="{
+        backgroundImage: `url(${background})`,
+        backgroundSize: '100% 100%',
+        backgroundRepeat: 'no-repeat',
+        height: `${layoutInfo.bodyMinHeightRpx}rpx`,
+      }"
+    >
       <view class="jfb-base-con-list__body-content">
         <view class="jfb-base-con-list__body-content-header">
           <view class="jfb-base-con-list__body-content-header-left">
@@ -50,35 +55,70 @@
                 <view :style="{ color: mainColor }">满减券</view>
                 <view>{{ item.prize_name }}</view>
               </view>
-              <view class="jfb-base-con-list__body-content-list-item-left-num">
+            </view>
+            <view class="jfb-base-con-list__body-content-list-item-right">
+              <view
+                class="jfb-base-con-list__body-content-list-item-right-name"
+              >
                 <view>{{ item.prize_name }}</view>
-                <view :style="{ color: mainColor,display:'flex',alignItems:'center' }">
-                  <xd-font-icon style="margin-right:10rpx" size="24" icon="icondanchuangguanbi_xian"></xd-font-icon>
+                <xd-font-icon
+                  v-if="item.remain_card_count > 0"
+                  size="100"
+                  :style="{
+                    color: item.can_take === 'N' ? '#D6D6D6' : mainColor,
+                    position: 'absolute',
+                    right: '-30rpx',
+                    top: '-40rpx',
+                  }"
+                  :icon="
+                    item.can_take === 'N' ? 'iconyilingqu' : 'icondailingqu'
+                  "
+                ></xd-font-icon>
+                <xd-font-icon
+                  v-else
+                  size="100"
+                  :style="{
+                    color: '#D6D6D6',
+                    position: 'absolute',
+                    right: '-30rpx',
+                    top: '-40rpx',
+                  }"
+                  icon="iconyifawan"
+                ></xd-font-icon>
+              </view>
+              <view class="jfb-base-con-list__body-content-list-item-right-num">
+                <view
+                  :style="{
+                    color: mainColor,
+                    display: 'flex',
+                    alignItems: 'center',
+                    fontSize: '28rpx',
+                  }"
+                >
+                  <xd-font-icon
+                    style="margin-right: 10rpx"
+                    size="22"
+                    icon="icondanchuangguanbi_xian"
+                  ></xd-font-icon>
                   {{ item.prize_num }}
-                  </view>
+                </view>
+
+                <xd-button
+                  size="small"
+                  :disabled="item.can_take === 'N'"
+                  @click="getCoupont(item)"
+                  type="primary"
+                  :style="btn"
+                  >{{ item.can_take === "N" ? "已领取" : "领取" }}</xd-button
+                >
               </view>
             </view>
-            <view class="jfb-base-con-list__body-content-list-item-right">
-              <xd-font-icon
-                size="100"
-                :style="{ color: disabled ? '#D6D6D6' : mainColor }"
-                :icon="disabled ? 'iconyilingqu' : 'icondailingqu'"
-              ></xd-font-icon>
-            </view>
           </view>
         </view>
       </view>
-      <view style="height: 120rpx"></view>
-      <view class="bottom_btn" :style="prod_bottom">
-        <xd-button
-          :disabled="disabled"
-          @click="getCoupont"
-          type="primary"
-          :style="btn"
-          width="60%"
-          >{{ disabled ? "已领取" : "一键领取" }}</xd-button
-        >
-      </view>
+      <view class="jfb-base-con-list__body-foot"
+        >可在个人中心-我的票券进行查看</view
+      >
       <xd-dailog
         :cancel="false"
         :confirm="false"
@@ -119,7 +159,6 @@ export default {
     return {
       contentBackground: "",
       couponList: [],
-      disabled: false,
       notice: "",
       showRule: false,
       btn: "",
@@ -135,9 +174,6 @@ export default {
     };
   },
   computed: {
-    prod_bottom() {
-      return this.fixedStyle({ height: 0, zIndex: 111 });
-    },
     couponBackground() {
       return {
         background: `url(${this.app_coupon_url})`,
@@ -181,15 +217,16 @@ export default {
                 background: `url(${getServiceUrl(res.app_activity_button)})`,
                 backgroundSize: "100% 100%",
                 backgroundRepeat: "no-repeat",
+                margin: "0",
               }
-            : { background: this.mainColor };
+            : { background: this.mainColor, margin: "0" };
           this.couponList = res.list;
         })
         .catch((err) => {
           console.log(err, "err");
         });
     },
-    getCoupont() {
+    getCoupont(item) {
       this.$xdShowLoading({});
       jfbRootExec("getAllCoupon", {
         vm: this,
@@ -197,6 +234,7 @@ export default {
           distribution_method: this.method,
           namespace: this.pageBusinessCode,
           activity_id: this.activity_id,
+          prize_id: item.prize_id,
         },
       })
         .then((res) => {
@@ -223,7 +261,7 @@ export default {
               time: 2000,
               isClose: false,
             });
-            this.disabled = true;
+            this.getList();
             if (this.timeer) {
               clearTimeout(this.timeer);
             }
@@ -232,12 +270,11 @@ export default {
           if (res.status_type === "error") {
             this.$xdHideLoading();
             this.$xdAlert({
-              content: "领取失败",
+              content: res.message,
               zIndex: 3200,
               time: 2000,
               isClose: false,
             });
-            this.disabled = false;
             if (this.timeer) {
               clearTimeout(this.timeer);
             }
@@ -318,22 +355,15 @@ export default {
 .jfb-base-con-list {
   &__body {
     position: relative;
-    &-header {
-      height: unit(600, rpx);
-      & > image {
-        width: 100%;
-        height: 100%;
-      }
-    }
+    overflow-y: auto;
     &-content {
       border-radius: unit(20, rpx);
       background: #fff;
-      padding: unit(40, rpx);
-      position: absolute;
-      top: unit(164, rpx);
-      left: 50%;
-      transform: translateX(-50%);
-      width: unit(600, rpx);
+      padding: unit(34, rpx);
+      margin-top: unit(164, rpx);
+      margin-right: auto;
+      margin-left: auto;
+      width: unit(650, rpx);
 
       &-header {
         display: flex;
@@ -364,15 +394,14 @@ export default {
         margin-top: unit(20, rpx);
 
         &-item {
-          margin-top: unit(20, rpx);
           display: flex;
           justify-content: space-between;
           align-items: center;
           padding: unit(20, rpx) unit(30, rpx);
           border-radius: unit(12, rpx);
+          margin: unit(20, rpx) auto 0 auto;
           &-left {
             display: flex;
-
             &-info {
               padding: unit(20, rpx) unit(36, rpx);
               & > view:first-child {
@@ -385,30 +414,31 @@ export default {
                 color: #fff;
               }
             }
-
+          }
+          &-right {
+            margin-left: unit(24, rpx);
+            flex: 1;
+            &-name {
+              position: relative;
+              font-size: unit(40, rpx);
+              color: #000;
+              display: flex;
+              align-items: center;
+              justify-content: space-between;
+            }
             &-num {
-              margin-left: unit(24, rpx);
-              margin-top: unit(10, rpx);
-              & > view:first-child {
-                font-size: unit(40, rpx);
-                margin-bottom: unit(16, rpx);
-              }
-              & > view:nth-child(2) {
-                font-size: unit(28, rpx);
-              }
+              margin-top: unit(40, rpx);
+              display: flex;
+              justify-content: space-between;
             }
           }
         }
       }
     }
-    .bottom_btn {
-      position: fixed;
-      width: 100%;
-      display: flex;
-      justify-content: center;
-      align-items: center;
-      height: unit(120, rpx);
-      background: #ffffff;
+    &-foot {
+      color: #a6a6a6;
+      font-size: unit(24, rpx);
+      text-align: center;
     }
   }
 }