jufubao-base 1.0.415 → 1.0.416

package/package.json

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

package/src/components/JfbBaseOrderDetail/Attr.js

@@ -731,6 +731,60 @@ export default {
           { label: '隐藏', value: '0' },
         ]
       },
+      {
+        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: "logisticsTipType",
+        value: dataVal({ data, key: 'logisticsTipType', dValue: 'shop', gValue }),
+        groupKey:'content',
+        list: [
+          { 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-radio",

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"
@@ -1248,6 +1256,10 @@ export default {
       refundPath: "",
       refundFastPath: "",
       btnTextSize: 20,
+      showOrderSource: "",
+      showLogisticsTip: "",
+      logisticsTipType: "",
+      logisticsTipText: "",
       order_from: "",
 
       showSupplement: false,
@@ -1412,6 +1424,8 @@ export default {
           is_show_product: this.is_show_product === "Y" ? 1 : 0,
           version: 'v2',
           is_show_after_btn: this.showApplyAfter === 'Y' ? 1 : 0,
+          is_show_sub_order_postage_tip: (this.showLogisticsTip === 'Y' && this.logisticsTipType === 'shop') ? 1 : 2,
+          default_sub_order_postage_tip: this.logisticsTipText,
           style: this.qrcodeLayout
         },
       })
@@ -1773,6 +1787,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');
@@ -2368,6 +2386,12 @@ export default {
   }
 }
 
+.postage_tip{
+  color: rgb(229, 116, 112);
+  font-size: 24rpx;
+  margin: 10px 0;
+}
+
 .code-url {
   display: flex;
   justify-content: flex-start;