jufubao-base 1.0.412 → 1.0.413-beta2

package/.claude/settings.local.json

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

package/package.json

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

package/src/components/JfbBaseCardEntry/JfbBaseCardEntry.vue

@@ -817,12 +817,10 @@ export default {
         color: '#fff',
         bgColor: '',
       });
-      if (this.isPreview) {
-        if(this.bussShowType !== bussShowType){
-          this.clearDefault();
-          this.cardPageNum = 0;
-          this.onJfbLoad(this.options);
-        }
+      if(this.bussShowType !== bussShowType){
+        this.clearDefault();
+        this.cardPageNum = 0;
+        this.onJfbLoad(this.options);
       }
       this.bussShowType = bussShowType;
     },

package/src/components/JfbBaseOrderDetail/Attr.js

@@ -732,17 +732,59 @@ export default {
         ]
       },
       {
-        label: "核销订单样式",
+        label: '订单来源:',
+        ele: 'xd-radio',
+        valueKey: 'showOrderSource',
+        value: data['showOrderSource'] || 'N',
+        groupKey:'content',
+        placeholder: '请选择',
+        list: [
+          { label: '显示', value: 'Y' },
+          { label: '隐藏', value: 'N' },
+        ],
+      },
+      {
+        label: '快递提示',
+        ele: 'xd-cus-switch',
+        valueKey: 'showLogisticsTip',
+        value: dataVal({ data, key: 'showLogisticsTip', dValue: 'Y', gValue }),
+        className: 'input100',
+        groupKey:'content',
+        labelInline:true,
+        inline: false,
+        cusStyle:{marginBottom: '10px'},
+        setting: {
+          tips:['显示','不显示'],
+          isBackType: 'string'
+        },
+        notice:'仅针对配送方式为快递的商品展示',
+      },
+      { ele: 'group_start' },
+      {
+        label: "展示方式",
         ele: "xd-radio",
-        valueKey: 'qrcodeLayout',
+        valueKey: "logisticsTipType",
+        value: dataVal({ data, key: 'logisticsTipType', dValue: 'shop', gValue }),
         groupKey:'content',
-        value: data['qrcodeLayout'] || '1',
-        placeholder: '请选择核销订单样式',
         list: [
-          { label: '样式1', value: '1' },
-          { label: '样式2', value: '2' },
-        ]
+          { label: "按拆单展示", value: "shop"},
+          { label: "按商品展示", value: "prod"},
+        ],
+        hidden: data.showLogisticsTip === 'N',
+        labelInline: true,
       },
+      {
+        label: "",
+        ele: "el-input",
+        valueKey: "logisticsTipText",
+        value: dataVal({ data, key: 'logisticsTipText', dValue: '', gValue }),
+        hidden: data.showLogisticsTip === 'N',
+        labelInline: true,
+        className: 'input100',
+        placeholder: '订单生成后72小时发货，如遇节假日发货顺延',
+        groupKey:'content',
+      },
+      { ele: 'group_end' },
       {
         label: '底部客服',
         ele: 'xd-cus-switch',

package/src/components/JfbBaseOrderDetail/JfbBaseOrderDetail.vue

@@ -227,6 +227,14 @@
                 <view> {{ Fitem.label }}： </view>
                 <view> {{ Fitem.value }} </view>
               </view>
+              <!-- 订单来源 -->
+              <view v-if="showOrderSource==='Y' && Sitem.special_names" class="postage_tip">
+                订单来源：{{ Sitem.special_names }}
+              </view>
+              <!-- 配送提示 -->
+              <view v-if="showLogisticsTip==='Y' && logisticsTipType==='prod'" class="postage_tip">
+                <view>{{ Sitem.postage_tip ||  logisticsTipText}}</view>
+              </view>
             </view>
             <view
               class="jfb-base-order-detail__body-delivery-bottom"
@@ -293,83 +301,52 @@
               marginBottom: padding + 'rpx',
             }"
             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"
+            class="jfb-base-order-detail__body-card jfb-base-order-detail__body-cashier"
           >
-            <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">
-                  <image :style="{
-                      height: '160rpx',
-                      width: '160rpx',
-                    }"
-                    :src="info.codes[0].code_url"
-                  ></image>
-                </view>
-              </view>
-              <view class="qr_bottom">
-                {{ info.codes[0].can_read_code }}
-                {{info.codes[0].refund_tip_text}}
-              </view>
+            <view class="jfb-base-order-detail__body-cashier-text">{{info.codes[0].show_type === "qrcode" ? "二维码" : "条形码" }}</view>
+            <view v-if="showPreviewCode" style="position: relative">
+              <image
+                :style="{
+                  height: info.codes[0].show_type === 'qrcode' ? '50vw' : '25vw',
+                  width: info.codes[0].show_type === 'qrcode' ? '50vw' : '85vw',
+                }"
+                :src="info.codes[0].code_url"
+              ></image>
+              <image v-if="info.codes[0].logo&&info.codes[0].show_type === 'qrcode'" class="logo-icon" :src="info.codes[0].logo"></image>
             </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">
-                  <image
-                    :style="{
-                      height: info.codes[0].show_type === 'qrcode' ? '50vw' : '25vw',
-                      width: info.codes[0].show_type === 'qrcode' ? '50vw' : '85vw',
-                    }"
-                    :src="info.codes[0].code_url"
-                  ></image>
-                  <image v-if="info.codes[0].logo&&info.codes[0].show_type === 'qrcode'" class="logo-icon" :src="info.codes[0].logo"></image>
-                </view>
-                <view v-if="info.codes[0].tips" class="jfb-base-order-detail__body-cashier-text">{{ info.codes[0].tips }}</view>
-                <view v-if="info.codes[0].can_read_password" class="jfb-base-order-detail__body-cashier-password" @click="showPassword = true">
-                  {{ showPassword ? info.codes[0].can_read_code : "查看" }}
-                </view>
-                <view v-else class="jfb-base-order-detail__body-cashier-text">
-                  {{ info.codes[0].can_read_code }}
-                </view>
-                <view v-if="info.codes[0].refund_tip_text" style="color:red;font-size:24rpx;text-align:center;margin-top:10rpx">
-                  {{info.codes[0].refund_tip_text}}
-                </view>
-                <view
-                  v-if="info.codes[0].code_end_time"
-                  class="jfb-base-order-detail__body-cashier-code"
-                  :style="{
-                    borderColor: mainColor,
-                    color: mainColor,
-                    background: bgColor,
-                  }"
-                >{{ info.codes[0].code_end_time }}</view>
-                <!-- 自动刷新倒计时 -->
-                <view v-if="info.codes[0].is_auto_refresh === 'Y'" class="jfb-base-order-detail__body-card-refresh" @click="handleCodeRefresh">
-                  <text>{{ codeRefreshMinute }}分{{ codeRefreshSecond }}秒后自动刷新</text>
-                  <xd-font-icon icon="iconmian-loading" size="24" color="#999"></xd-font-icon>
-                </view>
-                <!-- 预约按钮 -->
-                <view v-if="info.codes[0].reservation_buttons && info.codes[0].reservation_buttons.length > 0" class="jfb-base-order-detail__body-reserve">
-                  <view
-                    v-for="(btn, idx) in info.codes[0].reservation_buttons"
-                    :key="idx"
-                    class="jfb-base-order-detail__body-reserve-btn"
-                    @click="handleReservationJump(btn.url)"
-                  >{{ btn.name }}</view>
-                </view>
+            <view v-if="info.codes[0].tips" class="jfb-base-order-detail__body-cashier-text">{{ info.codes[0].tips }}</view>
+            <view v-if="info.codes[0].can_read_password" class="jfb-base-order-detail__body-cashier-password" @click="showPassword = true">
+              {{ showPassword ? info.codes[0].can_read_code : "查看" }}
+            </view>
+            <view v-else class="jfb-base-order-detail__body-cashier-text">
+              {{ info.codes[0].can_read_code }}
+            </view>
+            <view v-if="info.codes[0].refund_tip_text" style="color:red;font-size:24rpx;text-align:center;margin-top:10rpx">
+              {{info.codes[0].refund_tip_text}}
+            </view>
+            <view
+              v-if="info.codes[0].code_end_time"
+              class="jfb-base-order-detail__body-cashier-code"
+              :style="{
+                borderColor: mainColor,
+                color: mainColor,
+                background: bgColor,
+              }"
+            >{{ info.codes[0].code_end_time }}</view>
+            <!-- 自动刷新倒计时 -->
+            <view v-if="info.codes[0].is_auto_refresh === 'Y'" class="jfb-base-order-detail__body-card-refresh" @click="handleCodeRefresh">
+              <text>{{ codeRefreshMinute }}分{{ codeRefreshSecond }}秒后自动刷新</text>
+              <xd-font-icon icon="iconmian-loading" size="24" color="#999"></xd-font-icon>
+            </view>
+            <!-- 预约按钮 -->
+            <view v-if="info.codes[0].reservation_buttons && info.codes[0].reservation_buttons.length > 0" class="jfb-base-order-detail__body-reserve">
+              <view
+                v-for="(btn, idx) in info.codes[0].reservation_buttons"
+                :key="idx"
+                class="jfb-base-order-detail__body-reserve-btn"
+                @click="handleReservationJump(btn.url)"
+              >{{ btn.name }}</view>
             </view>
-            
           </view>
           <!--单条条形码或者二维码-->
           <!--其他情况显示-->
@@ -1158,7 +1135,6 @@ export default {
       is_show_support_shop: "",
       is_show_delete_order:'N', //删除订单
       ticket_method_msg:'', //取票提示文案
-      qrcodeLayout: '1',
 
       showPassword: false,
       dialogPassword: "",
@@ -1222,7 +1198,10 @@ export default {
       refundPath: "",
       refundFastPath: "",
       btnTextSize: 20,
-      order_from: "",
+      showOrderSource: "",
+      showLogisticsTip: "",
+      logisticsTipType: "",
+      logisticsTipText: "",
 
       showSupplement: false,
       supplementList: [],
@@ -1385,11 +1364,13 @@ 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,
+          is_show_sub_order_postage_tip: (this.showLogisticsTip === 'Y' && this.logisticsTipType === 'shop') ? 1 : 0,
+          default_sub_order_postage_tip: this.logisticsTipText
         },
       })
         .then((res) => {
-          
+
           //跳转到第三方订单
           if(res['third_order_detail_url']) {
             this.$xdUniHelper.redirectTo({url: res['third_order_detail_url']}, false, true);
@@ -1401,7 +1382,6 @@ export default {
 
           this.biz_code = res.biz_code;
           this.is_not_show_price = res.is_not_show_price;
-          this.order_from = res.order_from;
 
           //旅游模块
           if(res.extras && res.extras.travel_booking_info) {
@@ -1415,10 +1395,6 @@ export default {
             res.pay_info.real_pay_amount,
             100
           );
-          res.pay_info.goods_amount = this.$xdUniHelper.divisionFloatNumber(
-            res.pay_info.goods_amount,
-            100
-          );
           res.pay_info.base =
             res.pay_info.base &&
             res.pay_info.base.map((item) => {
@@ -1714,7 +1690,6 @@ 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.sectionShadow = this.getShadowCompatibleOldStyle(sectionShadow, {
         type: this.is_shadow,
         width: this.is_shadow_w,
@@ -1743,6 +1718,10 @@ export default {
           this.showPreviewCode = true;
         }
       }
+      this.showOrderSource = getContainerPropsValue(container, "content.showOrderSource", 'N');
+      this.showLogisticsTip = getContainerPropsValue(container, "content.showLogisticsTip", 'Y');
+      this.logisticsTipType = getContainerPropsValue(container, "content.logisticsTipType", 'shop');
+      this.logisticsTipText = getContainerPropsValue(container, "content.logisticsTipText", '订单生成后72小时发货，如遇节假日发货顺延');
       this.is_show_invoice = getContainerPropsValue(container, "content.is_show_invoice", "N");
       this.showService = getContainerPropsValue(container, "content.showService", "");
       this.serviceIcon = getContainerPropsValue(container, "content.serviceIcon", 'iconkefu');
@@ -2209,45 +2188,11 @@ export default {
   height: 24rpx;
   margin-right: 20rpx;
 }
-.qr_new{
-  .qr_top{
-    width: 100%;
-    display: flex;
-    padding: 32rpx 32rpx 16rpx;
-    box-sizing: border-box;
-    .qr_left{
-      flex: 1;
-      .qr_name{
-        color: #333333;
-        font-size: 32rpx;
-        font-weight: 500;
-      }
-      .qr_point{
-        margin-top: 16rpx;
-        font-size: 72rpx;
-        color: #333333;
-        font-weight: 500;
-        display: flex;
-        align-items: flex-end;
-        .m_unit{
-          font-size: 48rpx;
-          margin-bottom: 12rpx;
-        }
-      }
-    }
-    .qr_right{
-      image{
-        margin: 0;
-        transform: initial;
-      }
-    }
-  }
-  .qr_bottom{
-    font-size: 24rpx;
-    color: #666666;
-    border-top: 1px solid #EEEEEE;
-    padding: 16rpx 32rpx 32rpx;
-  }
+
+.postage_tip{
+  color: rgb(229, 116, 112);
+  font-size: 24rpx;
+  margin: 10px 0;
 }
 
 .code-url {

package/src/components/JfbBaseOrderDetail/Mock.js

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

package/src/components/JfbBaseSuccess/Attr.js

@@ -32,18 +32,6 @@ export default {
           {"label": "否", "value": "N"},
         ],
       },
-      {
-        label: "支付成功展示隐藏:",
-        ele: "xd-radio",
-        valueKey: 'is_show_pay',
-        groupKey:'content',
-        value: data['is_show_pay'] || 'Y',
-        placeholder: '请选择',
-        list: [
-          {"label": "是", "value": "Y"},
-          {"label": "否", "value": "N"},
-        ],
-      },
       {
         label: '是否显示码:',
         ele: 'xd-radio',

package/src/components/JfbBaseSuccess/JfbBaseSuccess.vue

@@ -26,7 +26,7 @@
       <template v-if="noUserLoding === false && info !== null">
         <view :style="{ margin: jfbListMarginComputed }">
           <view
-            v-if="info.status.status_type === 'wait' || is_show_pay === 'Y'"
+            v-if="info.status.status_type === 'wait' || is_show_order_info === 'Y'"
             class="jfb-base-success__body-icon"
             :style="{
               marginBottom: jfbListSpacing + 'rpx',
@@ -44,7 +44,7 @@
                   :color="info.status.iconColor"
                 ></xd-font-icon>
               </view>
-              <view style="margin-top: 16rpx;">{{ info.status.status_name }}</view>
+              <view>{{ info.status.status_name }}</view>
               <view class="jfb-base-success__body-icon-item-tip">{{info.status.comment }}</view>
             </view>
             <view class="jfb-base-success__body-icon-btn">
@@ -455,7 +455,6 @@ export default {
       index: "", //首页跳转
       is_show_code: "",
       is_show_order_info: "",
-      is_show_pay: "",
       is_show_product: "",
       webViewPath: "/pages/webview/webview", //容器路径
       isPreview: false,
@@ -613,7 +612,6 @@ export default {
         "content.is_show_order_info",
         "Y"
       );
-      this.is_show_pay = getContainerPropsValue(value, 'content.is_show_pay', 'Y')
       this.is_show_product = getContainerPropsValue(
         value,
         "content.is_show_product",

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
-}