jufubao-base 1.0.116-beta10 → 1.0.116-beta11

package/package.json

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

package/src/components/JfbBaseCardMerge/JfbBaseCardMerge.vue

@@ -45,6 +45,7 @@
           content-align="left"
           labelPosition="left"
           labelAlign="left"
+          v-if="0"
         >
           <view class="flex align-center">
             <xd-form-input
@@ -207,13 +208,13 @@ export default {
       this.$set(this.mergeForm, "valid_token", valid_token);
     },
     handleToSubmit() {
-      if (!this.mergeForm.valid_code) {
-        uni.showToast({
-          title: "验证码不能为空！",
-          icon: "none",
-        });
-        return;
-      }
+      // if (!this.mergeForm.valid_code) {
+      //   uni.showToast({
+      //     title: "验证码不能为空！",
+      //     icon: "none",
+      //   });
+      //   return;
+      // }
       this.$xdConfirm({
         title: "是否确认合并卡",
         isHtml: true,
@@ -237,8 +238,8 @@ export default {
               data: {
                 from_card_number: this.mergeForm.from_card_number,
                 to_card_number: this.mergeForm.to_card_number,
-                valid_code: this.mergeForm.valid_code,
-                valid_token: this.mergeForm.valid_token
+                // valid_code: this.mergeForm.valid_code,
+                // valid_token: this.mergeForm.valid_token
               },
             })
               .then((res) => {

package/src/components/JfbBaseConFlashHome/Attr.js

@@ -69,7 +69,7 @@ export default {
         className: 'input80',
       },
       {
-        label: '展示商品个数:',
+        label: '展示商品总数:',
         ele: 'el-input',
         type: 'number',
         valueKey: 'number',

package/src/components/JfbBaseConFlashHome/JfbBaseConFlashHome.vue

@@ -16,11 +16,15 @@
     </view>
     <!-- #endif -->
     <view class="jfb-base-con-flash-home__body">
-      <view class="jfb-base-con-flash-home__body-wrap">
+      <view
+        :style="{ flexDirection: position === 1 ? 'row' : 'row-reverse' }"
+        class="jfb-base-con-flash-home__body-wrap"
+      >
         <view
           :style="{
             backgroundImage: `url(${secondBackground})`,
             backgroundSize: '100% 100%',
+            marginRight: position === 1 ? '0' : '20rpx',
           }"
           class="jfb-base-con-flash-home__body-wrap-session"
         >
@@ -38,38 +42,43 @@
           </view>
         </view>
         <swiper
-          :vertical="true"
-          :autoplay="false"
+          :vertical="productShowType === 'top'"
+          :autoplay="productShowType !== 'regular'"
           class="jfb-base-con-flash-home__body-wrap-product"
+          :style="{
+            marginRight: position === 1 ? '0' : '20rpx',
+          }"
         >
-          <swiper-item v-for="(item, index) in 5" :key="index">
-            <view class="jfb-base-con-flash-home__body-wrap-product-item">
-              <image
-                src="https://img.js.design/assets/img/6487c11d31971ab22c07c220.png#dfe2fe09e053ed42de4af607382569ac"
-              ></image>
-              <view class="jfb-base-con-flash-home__body-wrap-product-item-name"
-                >方家铺子中宁四星红枸杞250g</view
-              >
-              <view class="prod_price" v-if="isPrice === 'Y'">
-                <xd-unit
-                  :price="200"
-                  :isOld="false"
-                  color="#000000"
-                  :iconSize="0.3"
-                  :fontSize="38"
-                />
-                <!-- todo -->
+          <swiper-item v-for="(item, index) in product_group" :key="index">
+            <view class="jfb-base-con-flash-home__body-wrap-product-group">
+              <view v-for="(SItem, SIndex) in item" :key="SIndex">
                 <view
-                  v-if="
-                    isShowDiscount === 'Y' &&
-                    checkDiscountPrice({
-                      market_price: 1200,
-                      sale_price: 1000,
-                    })
-                  "
-                  class="prod_oldPrice"
-                  >原价：{{ dividePrice(1200) }}</view
+                  class="jfb-base-con-flash-home__body-wrap-product-group-item"
+                  :style="{
+                    marginLeft: SIndex === 0&&position === 2 ? '0' : '20rpx',
+                  }"
                 >
+                  <image :src="SItem.img"></image>
+                  <view
+                    class="jfb-base-con-flash-home__body-wrap-product-group-item-name"
+                    >{{ SItem.name }}</view
+                  >
+                  <view class="prod_price" v-if="isPrice === 'Y'">
+                    <xd-unit
+                      :price="SItem.sale_price"
+                      :isOld="false"
+                      color="#000000"
+                      :iconSize="0.14"
+                      :fontSize="20"
+                    />
+                    <!-- todo -->
+                    <view
+                      v-if="isShowDiscount === 'Y' && checkDiscountPrice(SItem)"
+                      class="prod_oldPrice"
+                      >原价：{{ dividePrice(SItem.market_price) }}</view
+                    >
+                  </view>
+                </view>
               </view>
             </view>
           </swiper-item>
@@ -106,6 +115,74 @@ export default {
       textColor: "",
       textBgColor: "",
       isPrice: "Y",
+      productList: [
+        {
+          img: "https://img.js.design/assets/img/6487c11d31971ab22c07c220.png#dfe2fe09e053ed42de4af607382569ac",
+          name: "方家铺子中宁四星红枸杞250g",
+          market_price: 1200,
+          sale_price: 1000,
+        },
+        {
+          img: "https://img.js.design/assets/img/6487c11d31971ab22c07c220.png#dfe2fe09e053ed42de4af607382569ac",
+          name: "方家铺子中宁四星红枸杞250g",
+          market_price: 1200,
+          sale_price: 1000,
+        },
+        {
+          img: "https://img.js.design/assets/img/6487c11d31971ab22c07c220.png#dfe2fe09e053ed42de4af607382569ac",
+          name: "方家铺子中宁四星红枸杞250g",
+          market_price: 1200,
+          sale_price: 1000,
+        },
+        {
+          img: "https://img.js.design/assets/img/6487c11d31971ab22c07c220.png#dfe2fe09e053ed42de4af607382569ac",
+          name: "方家铺子中宁四星红枸杞250g",
+          market_price: 1200,
+          sale_price: 1000,
+        },
+        {
+          img: "https://img.js.design/assets/img/6487c11d31971ab22c07c220.png#dfe2fe09e053ed42de4af607382569ac",
+          name: "方家铺子中宁四星红枸杞250g",
+          market_price: 1200,
+          sale_price: 1000,
+        },
+        {
+          img: "https://img.js.design/assets/img/6487c11d31971ab22c07c220.png#dfe2fe09e053ed42de4af607382569ac",
+          name: "方家铺子中宁四星红枸杞250g",
+          market_price: 1200,
+          sale_price: 1000,
+        },
+        {
+          img: "https://img.js.design/assets/img/6487c11d31971ab22c07c220.png#dfe2fe09e053ed42de4af607382569ac",
+          name: "方家铺子中宁四星红枸杞250g",
+          market_price: 1200,
+          sale_price: 1000,
+        },
+        {
+          img: "https://img.js.design/assets/img/6487c11d31971ab22c07c220.png#dfe2fe09e053ed42de4af607382569ac",
+          name: "方家铺子中宁四星红枸杞250g",
+          market_price: 1200,
+          sale_price: 1000,
+        },
+        {
+          img: "https://img.js.design/assets/img/6487c11d31971ab22c07c220.png#dfe2fe09e053ed42de4af607382569ac",
+          name: "方家铺子中宁四星红枸杞250g",
+          market_price: 1200,
+          sale_price: 1000,
+        },
+        {
+          img: "https://img.js.design/assets/img/6487c11d31971ab22c07c220.png#dfe2fe09e053ed42de4af607382569ac",
+          name: "方家铺子中宁四星红枸杞250g",
+          market_price: 1200,
+          sale_price: 1000,
+        },
+        {
+          img: "https://img.js.design/assets/img/6487c11d31971ab22c07c220.png#dfe2fe09e053ed42de4af607382569ac",
+          name: "方家铺子中宁四星红枸杞250g",
+          market_price: 1200,
+          sale_price: 1000,
+        },
+      ],
     };
   },
   watch: {
@@ -113,6 +190,16 @@ export default {
       this.init(value);
     },
   },
+  computed: {
+    product_group() {
+      let groupedProducts = [];
+      for (let i = 0; i < this.productList.length; i += 3) {
+        let group = this.productList.slice(i, i + 3);
+        groupedProducts.push(group);
+      }
+      return groupedProducts;
+    },
+  },
   created() {
     this.init(this.container);
 
@@ -214,11 +301,15 @@ export default {
 
 .jfb-base-con-flash-home {
   &__body {
+    uni-swiper {
+      height: 258rpx !important;
+    }
     &-wrap {
       display: flex;
+      padding: 20rpx 0 20rpx 20rpx;
       &-session {
-        width: 84px;
-        height: 129px;
+        width: 168rpx;
+        height: 258rpx;
         border-radius: 8rpx;
         display: flex;
         flex-direction: column-reverse;
@@ -249,33 +340,42 @@ export default {
       &-product {
         display: flex;
         flex: 1;
-        &-item {
-          width: 84px;
-          height: 129px;
-          border-radius: 8rpx;
-          background: rgba(255, 255, 255, 1);
+        &-group {
           display: flex;
-          flex-direction: column;
-          justify-content: flex-start;
-          align-items: center;
-          image {
-            width: 168rpx;
-            height: 168rpx;
-          }
-          &-name {
-            font-size: 14rpx;
-            color: #333;
-            text-align: left;
-            vertical-align: top;
+          &-item {
+            width: 152rpx;
+            height: 240rpx;
+            border-radius: 8rpx;
+            padding: 0 0 15rpx 6rpx;
+            background: rgba(255, 255, 255, 1);
+            display: flex;
+            flex-direction: column;
+            justify-content: flex-start;
+            align-items: center;
+            margin-left: 20rpx;
+            box-shadow: 0px 8rpx 16rpx rgba(0, 0, 0, 0.1);
+            image {
+              width: 168rpx;
+              height: 168rpx;
+            }
+            &-name {
+              font-size: 14rpx;
+              color: #333;
+              text-align: left;
+              vertical-align: top;
+            }
           }
         }
       }
       .prod_price {
         display: flex;
         align-items: center;
+        margin-top: 18rpx;
+        width: 100%;
+        justify-content: flex-start;
 
         .prod_oldPrice {
-          font-size: 20rpx;
+          font-size: 14rpx;
           text-decoration: line-through;
           color: #888888;
           margin-left: 10rpx;

package/src/components/JfbBaseConPhone/JfbBaseConPhone.vue

@@ -15,7 +15,7 @@
     <!-- #endif -->
     <view class="jfb-base-con-phone__body" v-if="done">
       <view
-        v-if="couponList && couponList.length > 0"
+        v-if="has_times==='Y'"
         class="jfb-base-con-phone__body-wrap"
         :style="{
           height: layoutInfo.bodyMinHeightRpx + 'rpx',
@@ -162,7 +162,7 @@ export default {
       options: {},
       activity_id: "",
       done: false,
-      couponList: [],
+      has_times: 'N',
       errmessage: "",
       showOhoneNumber: "", //仅用于展示
       order_num: null,
@@ -216,7 +216,7 @@ export default {
       })
         .then((res) => {
           console.log(res, "res");
-          this.couponList = [{}] || res.list;
+          this.has_times = res.has_times;
           this.showBtn = res.phone_button;
           this.btnOneName = res.button_name_one;
           this.btnTwoName = res.button_name_two;

package/src/components/JfbBaseConPhone/Mock.js

@@ -1,5 +1,26 @@
 'use strict';
 
 module.exports = {
-  aaaa: {}
+  getCouponPhoneList: {
+    "list":[
+      {"prize_id":153,"prize_name":"满50减50","prize_type":"满减券","prize_num":1,"can_take":"Y","is_over":"N","can_take_num":"P","today_times":1,"today_num":0,"total_times":1,"total_num":0,"remain_card_count":55},
+      {"prize_id":153,"prize_name":"满50减50","prize_type":"满减券","prize_num":1,"can_take":"Y","is_over":"N","can_take_num":"P","today_times":1,"today_num":0,"total_times":1,"total_num":0,"remain_card_count":55},
+      {"prize_id":153,"prize_name":"满50减50","prize_type":"满减券","prize_num":1,"can_take":"Y","is_over":"N","can_take_num":"P","today_times":1,"today_num":0,"total_times":1,"total_num":0,"remain_card_count":55}
+    ],
+    "background":"//sandbox-img.jufubao.cn/uploads/20231204/96b801e0dc27422c183dc90d905dd2ed.jpg",
+    "used_up_url": "",
+    "has_times": "Y",
+    "can_take":"Y",
+    "message":"",
+    "app_coupon_url":"//sandbox-img.jufubao.cn/uploads/20231205/fee9b644b83495c9ba8a4db277600b54.jpg",
+    "app_activity_button":"//sandbox-img.jufubao.cn/uploads/20231207/35f3065b2b2bc3fc2dda73d7b5b9eae8.jpg",
+    "app_coupon_button_bg_url":"//sandbox-img.jufubao.cn/uploads/20231212/026a3ea901f87f51b531d06c24604676.png",
+    "app_coupon_button_see_url": "//sandbox-img.jufubao.cn/uploads/20231212/026a3ea901f87f51b531d06c24604676.png",
+    "app_coupon_invalid_url":"//sandbox-img.jufubao.cn/uploads/20231208/8b153ce4870686a37295c16fbc992235.jpg",
+    "rule":"<p>打发&middot;</p>",
+    "request_id":"a2603f2a480485f4"
+  },
+  getAllCouponPhone: {
+    "request_id": "5987aa28c709d4ef"
+  }
 }