jufubao-base 1.0.413 → 1.0.414-beta2

package/.claude/settings.local.json

@@ -0,0 +1,7 @@
+{
+  "permissions": {
+    "allow": [
+      "Bash(node *)"
+    ]
+  }
+}

package/package.json

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

package/src/components/JfbBaseOrderDetail/JfbBaseOrderDetail.vue

@@ -295,18 +295,42 @@
             v-if="info.codes.length === 1 && (info.codes[0].show_type === 'qrcode' ||  info.codes[0].show_type === 'barcode')"
             class=" jfb-base-order-detail__body-cashier"
           >
-            <view v-if="qrcodeLayout === '2' && order_from === 'offline'" class="qr_new">
+            <view v-if="qrcodeLayout === '2' && order_from === 'offline'" class="take_qrcode_box">
+              <view class="take_qrcode_box_header">请到店出示此券核验</view>
+              <view class="take_qrcode_box_wrap">
+                <view class="take_qrcode_card">
+                  <view class="t_card_top">
+                    <view class="t_card_left">
+                      <view class="t_card_shop">
+                        <view class="c_l_img">
+                          <image :src="info.shop.brand_icon" ></image>
+                        </view>
+                        <view class="c_l_name">{{info.shop.brand_name}}</view>
+                      </view>
+                      <view class="c_l_price">
+                        <view class="c_l_price_unit">￥</view>
+                        {{info.pay_info.goods_amount}}
+                      </view>
+                    </view>
+                    <view class="t_card_right">
+                      <image class="c_r_img" :src="info.codes[0].code_url" mode=""></image>
+                    </view>
+                  </view>
+                  <view class="t_card_bottom">
+                    {{ info.codes[0].can_read_code }}
+                    {{info.codes[0].refund_tip_text}}
+                  </view>
+                </view>
+              </view>
+            </view>
+
+            <!-- <view v-if="qrcodeLayout === '2' && order_from === 'offline'" class="qr_new">
               <view class="qr_top">
                 <view class="qr_left">
                   <view class="qr_name">{{ info.shop.brand_name }}</view>
                   <view class="qr_point">
                     <view class="m_unit">￥</view>
                     <view>{{ info.pay_info.goods_amount }}</view>
-                    <!-- <xd-unit
-                      :price="info.pay_info.real_pay_amount"
-                      :font-size="72"
-                      :iocn-size="0.45"
-                    ></xd-unit> -->
                   </view>
                 </view>
                 <view class="qr_right">
@@ -322,7 +346,7 @@
                 {{ info.codes[0].can_read_code }}
                 {{info.codes[0].refund_tip_text}}
               </view>
-            </view>
+            </view> -->
             <view v-else class="jfb-base-order-detail__body-card">
               <view class="jfb-base-order-detail__body-cashier-text">{{info.codes[0].show_type === "qrcode" ? "二维码" : "条形码" }}</view>
                 <view v-if="showPreviewCode" style="position: relative">
@@ -1385,7 +1409,8 @@ export default {
           is_show_jhd_code: Number(this.is_show),
           is_show_product: this.is_show_product === "Y" ? 1 : 0,
           version: 'v2',
-          is_show_after_btn: this.showApplyAfter === 'Y' ? 1 : 0
+          is_show_after_btn: this.showApplyAfter === 'Y' ? 1 : 0,
+          style: this.qrcodeLayout
         },
       })
         .then((res) => {
@@ -1419,6 +1444,7 @@ export default {
             res.pay_info.goods_amount,
             100
           );
+          res.shop.brand_icon = getServiceUrl(res.shop.brand_icon, 'size5');
           res.pay_info.base =
             res.pay_info.base &&
             res.pay_info.base.map((item) => {
@@ -1714,7 +1740,7 @@ export default {
       this.lineHeight = getContainerPropsValue(container, "content.lineHeight", 20);
       this.btnTextSize = getContainerPropsValue(container, "content.btnTextSize", 20);
       let sectionShadow = getContainerPropsValue(container, "content.sectionShadow", "");
-      this.qrcodeLayout = '2';
+      this.qrcodeLayout = getContainerPropsValue(container, "content.qrcodeLayout", '1');
       this.sectionShadow = this.getShadowCompatibleOldStyle(sectionShadow, {
         type: this.is_shadow,
         width: this.is_shadow_w,
@@ -2209,6 +2235,89 @@ export default {
   height: 24rpx;
   margin-right: 20rpx;
 }
+.take_qrcode_box {
+  margin: 30rpx;
+
+  .take_qrcode_box_header{
+    border-radius: 20rpx 20rpx 0 0;
+    background: #fff;
+    // width: 220rpx;
+    color: #000000;
+    font-size: 24rpx;
+    font-weight: 500;
+    padding: 16rpx 28rpx;
+    display: inline-block;
+  }
+  .take_qrcode_box_wrap{
+    border-radius: 0 0 20rpx 20rpx;
+    background: #fff;
+    padding: 16rpx;
+  }
+  .take_qrcode_card{
+    box-shadow: 0px 0px 10rpx rgba(0, 0, 0, 0.1);
+    border-radius: 16rpx;
+    overflow: hidden;
+    .t_card_top{
+      border-radius: 16rpx 16rpx 0 0;
+      min-height: 120rpx;
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+      padding: 32rpx;
+      .t_card_left{
+        .t_card_shop{
+          display: flex;
+          align-items: center;
+          font-size: 30rpx;
+          color: #333333;
+          font-weight: 500;
+        }
+        .c_l_name{
+          margin-left: 16rpx;
+        }
+        .c_l_img{
+          width: 46rpx;
+          height: 46rpx;
+          background: #EEEEEE;
+          border-radius: 50%;
+          overflow: hidden;
+          image{
+            width: 100% !important;
+            height: 100%;
+            margin: 0 !important;
+            transform: initial;
+          }
+        }
+        .c_l_price{
+          font-size: 68rpx;
+          font-weight: 500;
+          color: #333333;
+          margin-top: 50rpx;
+          display: flex;
+          align-items: flex-end;
+          .c_l_price_unit{
+            font-size: 46rpx;
+            margin-left: 16rpx;
+            margin-bottom: 12rpx;
+          }
+        }
+      }
+      .t_card_right{
+        .c_r_img{
+          width: 240rpx;
+          height: 240rpx;
+        }
+      }
+    }
+    .t_card_bottom{
+      border-radius: 0 0 16rpx 16rpx;
+      padding: 16rpx 32rpx;
+      font-size: 22rpx;
+      font-weight: 400;
+      color: #666666;
+    }
+  }
+}
 .qr_new{
   .qr_top{
     width: 100%;

package/src/components/JfbBaseOrderDetail/Mock.js

@@ -96,6 +96,7 @@ module.exports = {
     "shop": {
       "layer_name": "影院信息",
       "brand_name": "星巴克",
+      "brand_icon": "/uploads/20230710/44f645b06fe4da358f7b0ee06259afcd.jpg",
       "shop_id": 60487,
       "shop_name": "大地影院（北京西三旗物美店）",
       "shop_address": "北京3北京西夏区城区河北省廊坊市三河市燕郊开发区燕高路西侧实验小学南侧 "

package/src/components/JfbBaseSuccess/Attr.js

@@ -10,6 +10,31 @@ export default {
   style: [],
   content: (data={})=>{
     return [
+      {
+        ele: 'title',
+        label: '组件样式',
+        size: 'small',
+        groupKey:'content',
+      },
+      {
+        label: "样式",
+        ele: "xd-radio",
+        valueKey: "layoutStyle",
+        value: data.layoutStyle || '1',
+        groupKey: "content",
+        list: [
+          { label: '样式1', value: '1' },
+          { label: '样式2', value: '2' }
+        ],
+        labelInline:true,
+        inline: false,
+      },
+      {
+        ele: 'title',
+        label: '基础',
+        size: 'small',
+        groupKey:'content',
+      },
       {
         label: '自定义按钮名称:',
         ele: 'el-input',
@@ -25,6 +50,7 @@ export default {
         ele: 'xd-radio',
         valueKey: 'is_show_order_info',
         groupKey:'content',
+        hidden: data.layoutStyle === '2',
         value: data['is_show_order_info'] || 'Y',
         placeholder: '请选择',
         list: [
@@ -51,6 +77,7 @@ export default {
         groupKey:'content',
         value:data['is_show_code']|| '',
         placeholder: '请选择',
+        hidden: data.layoutStyle === '2',
         list: [
           {"label": "是", "value": "Y"},
           {"label": "否", "value": "N"},
@@ -63,6 +90,7 @@ export default {
         groupKey:'content',
         value:data['is_show_product'] || 'Y',
         placeholder: '请选择',
+        hidden: data.layoutStyle === '2',
         list: [
           {"label": "是", "value": "Y"},
           {"label": "否", "value": "N"},

package/src/components/JfbBaseSuccess/JfbBaseSuccess.vue

@@ -16,7 +16,10 @@
       <view class="jfb-base-success__edit-icon" @click="delEdit">删除</view>
     </view>
     <!-- #endif -->
-    <view class="jfb-base-success__body" :style="{backgroundColor: boxBgColor}">
+    <view class="jfb-base-success__body" :style="{
+      '--jfb-list-radius': (Number(jfbListRadius) * $rpxNum) + 'px',
+      backgroundColor: boxBgColor
+    }">
       <view class="x-line"></view>
       <view
         v-if="noUserLoding === true"
@@ -25,6 +28,31 @@
       >请关闭当前浏览器，返回原界面查看结果</view>
       <template v-if="noUserLoding === false && info !== null">
         <view :style="{ margin: jfbListMarginComputed }">
+          <!-- 取货码 -->
+          <view v-if="layoutStyle === '2' && info.status.status_type === 'success'" class="take_qrcode_box">
+            <view class="take_qrcode_box_header">成功兑换1张电子券</view>
+            <view class="take_qrcode_box_wrap">
+              <view class="take_qrcode_card">
+                <view class="t_card_top">
+                  <view class="t_card_left">
+                    <view style="">
+                      <image class="c_l_img" :src="info.shop.brand_icon" mode="heightFix"></image>
+                    </view>
+                    <view class="t_card_price">￥{{ info.pay_info.goods_amount }}</view>
+                  </view>
+                  <view class="t_card_right">
+                    <image class="c_r_img" :src="info.codes[0].code_url" mode=""></image>
+                  </view>
+                </view>
+                <view class="t_card_bottom">
+                  {{info.codes[0].can_read_code}}
+                  {{info.codes[0].refund_tip_text}}
+                </view>
+              </view>
+            </view>
+          </view>
+          <!-- 取货码 -->
+
           <view
             v-if="info.status.status_type === 'wait' || is_show_pay === 'Y'"
             class="jfb-base-success__body-icon"
@@ -464,6 +492,7 @@ export default {
       bgColor:'',
       ticket_method_msg:'', //取票提示文案
       is_plus_site: false,
+      layoutStyle: '1',
 
       //按钮
       btnTextColor:'',
@@ -598,6 +627,7 @@ export default {
       this.btnTextSize = getContainerPropsValue(value, "content.btnTextSize", '28');
       this.payBgColor = getContainerPropsValue(value, "content.payBgColor", '#fff');
       console.log("this., fontSize: btnTextSize + 'rpx'", this.btnTextSize)
+      this.layoutStyle = getContainerPropsValue(value, "content.layoutStyle", '1');
       this.custom_btn_path = getContainerPropsValue(
         value,
         "content.custom_btn_path",
@@ -622,6 +652,12 @@ export default {
       this.index = this.settings.index;
       this.packageData = true;
       styleForm.getInitItem(this, value);
+
+      if(this.layoutStyle === '2'){
+        this.is_show_order_info = 'N';
+        this.is_show_product = 'N';
+        this.is_show_code = 'N';
+      }
     },
 
     getStatus() {
@@ -629,11 +665,12 @@ export default {
         vm: this,
         data: {
           main_order_id: this.order_id,
-          is_show_code: this.is_show_code === "Y" ? 1 : 0,
+          is_show_code: this.layoutStyle === '2' ? 1 : (this.is_show_code === "Y" ? 1 : 0),
           is_show_product: this.is_show_product === "Y" ? 1 : 0,
           custom_content_page_id: this.pageAttr.page_id,
           custom_content_container_id: this.cid,
-          version: 'v2'
+          version: 'v2',
+          style: this.layoutStyle,
         },
       })
         .then((res) => {
@@ -834,6 +871,11 @@ export default {
             this.$xdLog.catch(err)
           });
       }
+      info.pay_info.goods_amount = this.$xdUniHelper.divisionFloatNumber(
+        info.pay_info.goods_amount,
+        100
+      );
+      info.shop.brand_icon = getServiceUrl(info.shop.brand_icon);
       this.info = info;
 
       //显示核销信息
@@ -1172,6 +1214,66 @@ export default {
   }
 }
 
+.take_qrcode_box {
+  margin-bottom: unit(20, rpx);
+
+  .take_qrcode_box_header{
+    border-radius: var(--jfb-list-radius) var(--jfb-list-radius) 0 0;
+    background: #fff;
+    // width: 220rpx;
+    color: #000000;
+    font-size: 24rpx;
+    font-weight: 500;
+    padding: 16rpx 28rpx;
+    display: inline-block;
+  }
+  .take_qrcode_box_wrap{
+    border-radius: 0 0 var(--jfb-list-radius) var(--jfb-list-radius);
+    background: #fff;
+    padding: 16rpx;
+  }
+  .take_qrcode_card{
+    box-shadow: 0px 0px 10rpx rgba(0, 0, 0, 0.1);
+    border-radius: 16rpx;
+    overflow: hidden;
+    .t_card_top{
+      background: #9C1B10;
+      border-radius: 16rpx 16rpx 0 0;
+      min-height: 120rpx;
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+      padding: 32rpx 64rpx;
+      .t_card_left{
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+        .c_l_img{
+          height: 120rpx;
+        }
+        .t_card_price{
+          color: #FFFFFF;
+          font-size: 48rpx;
+          font-weight: 500;
+        }
+      }
+      .t_card_right{
+        .c_r_img{
+          width: 240rpx;
+          height: 240rpx;
+        }
+      }
+    }
+    .t_card_bottom{
+      border-radius: 0 0 16rpx 16rpx;
+      padding: 16rpx 32rpx;
+      font-size: 22rpx;
+      font-weight: 400;
+      color: #666666;
+    }
+  }
+}
+
 .codes-index {
   color: #999;
   background: #eee;

package/src/components/JfbBaseSuccess/Mock.js

@@ -10,11 +10,20 @@ module.exports = {
       "comment": "非常感谢您购买我们的产品",
       "loading": false
     },
+    "pay_info": {
+      "goods_amount": 9990,
+      "real_pay_amount": 9990
+    },
     "settle_info":[
       {"label": "核销门店", "value": "安德鲁森中航城店", "type": "text"},
       {"label": "核销时间", "value": "2023-09-04 19:09:12", "type": "text"},
       {"label": "核销金额", "value": 10000, "type": "price"},
     ],
+    "shop": {
+      "brand_name": "聚福宝",
+      "shop_name": "聚福宝",
+      "brand_icon": "/uploads/20230710/44f645b06fe4da358f7b0ee06259afcd.jpg"
+    },
     "codes": [
       {
         "code": "tp0KPZnFPDJ8Zffw-pY52|323455",

package/get.package.path.js

@@ -1,22 +0,0 @@
-'use strict';
-
-/**
- * @description 第三方库
- * @param threePackagePath {String} 第三方库所在项目路径存放路径路
- * @param packname {String} 包名字
- * @returns {string|*}
- */
-const getPackagePath = (threePackagePath, packname = 'gxd-commands-bussiness')=>{
-  if(packname === 'gxd-commands-bussiness') {
-    return `/Users/shiyonggao/Desktop/code/BASE/UNIAPP/xd-commands-bussiness/${threePackagePath}`;
-  }
-
-  if (packname === 'gxd-uni-library-editx') {
-    return `/Users/shiyonggao/Desktop/code/BASE/UNIAPP/xd-uni-library-editx/${threePackagePath}`;
-  }
-
-};
-
-module.exports = {
-  getPackagePath
-}