jufubao-mall 2.0.33 → 2.0.35-beta1

package/src/components/JfbMallConfirm/Mock.js

@@ -7,64 +7,82 @@ module.exports = {
         card_number: "101001000005193",
         card_type_name: "聚福宝福卡测试蛋糕",
         end_time: "2024-10-31",
-        card_point: 100000000,
-        is_bind_card: true
+        card_point: 30000,
+        is_bind_card: true,
+        unit: "点",
+        show_name: "满50减10"
       },
       {
         card_number: "101001000005184",
         card_type_name: "聚福宝福卡测试蛋糕",
         end_time: "2024-10-31",
-        card_point: 100000000,
-        is_bind_card: true
+        card_point: 10000,
+        is_bind_card: true,
+        unit: "点",
+        show_name: "满50减10"
       },
       {
         card_number: "101001000005185",
         card_type_name: "聚福宝福卡测试蛋糕",
         end_time: "2024-10-31",
-        card_point: 99671000,
-        is_bind_card: true
+        card_point: 9960,
+        is_bind_card: true,
+        unit: "点",
+        show_name: "满50减10"
       },
       {
         card_number: "101001000006990",
         card_type_name: "聚福宝福卡测试蛋糕",
         end_time: "2025-05-03",
-        card_point: 1400,
-        is_bind_card: true
+        card_point: 14000,
+        is_bind_card: true,
+        unit: "点",
+        show_name: "满50减10"
       },
       {
         card_number: "171004000000012",
         card_type_name: "聚福宝测试C40",
         end_time: "2025-05-03",
         card_point: 0,
-        is_bind_card: true
+        is_bind_card: true,
+        unit: "点",
+        show_name: "满50减10"
       },
       {
         card_number: "101001000006989",
         card_type_name: "聚福宝福卡测试蛋糕",
         end_time: "2025-05-03",
         card_point: 3600,
-        is_bind_card: true
+        is_bind_card: true,
+        unit: "点",
+        show_name: "满50减10"
       },
       {
         card_number: "171004000000011",
         card_type_name: "聚福宝测试C40",
         end_time: "2025-05-03",
         card_point: 0,
-        is_bind_card: true
+        is_bind_card: true,
+        unit: "点",
+        show_name: "满50减10"
       },
       {
         card_number: "101001000005479",
         card_type_name: "聚福宝福卡测试蛋糕",
         end_time: "2024-02-03",
-        card_point: 10000000,
-        is_bind_card: true
+        card_point: 10000,
+        is_bind_card: true,
+        unit: "点",
+        show_name: "满50减10"
       },
       {
         card_number: "101001000005478",
         card_type_name: "聚福宝福卡测试蛋糕",
         end_time: "2024-02-23",
-        card_point: 1000000,
-        is_bind_card: true
+        card_point: 10000,
+        is_bind_card: true,
+        unit: "点",
+        show_name: "满50减10"
       }
     ],
     request_id: "ee8f030d48df4faa"
@@ -137,6 +155,7 @@ module.exports = {
   getMallCartConfirm: {
     total_amount: 46578,
     logistics_amount: 100,
+    origin_amount: 46578,
     is_can_buy: "N",
     user_logistics_discount_method: "",
     user_logistics_discount_amount: "0",
@@ -147,9 +166,9 @@ module.exports = {
     main_show_delivery_price: "Y",
     shop_group: [
       {
-        repo_name: "仓库61527",
+        repo_name: "仓库1",
         supplier_id: 61527,
-        delivery_method: "logistics",
+        delivery_method: "samecity",
         user_logistics_amount: 50,
         user_logistics_discount_id: "0",
         user_logistics_discount_name: "",
@@ -168,12 +187,12 @@ module.exports = {
         brand_id: 3,
         support_delivery_method_options: [
           { label: "快递配送", value: "logistics" },
-          {
-            label: "同城配送",
-            value: "samecity"
-          },
+          { label: "同城配送", value: "samecity" },
           { label: "到店自提", value: "takeout" }
         ],
+        sub_show_delivery_method: "Y",
+        sub_show_delivery_price: "Y",
+        time_label: "配送时间",
         supplier_logistics_amount_origin: "50",
         product: [
           {
@@ -205,7 +224,7 @@ module.exports = {
             product_thumb:
               "https://sandbox-img.jufubao.cn/uploads/20230406/0b890cd5a947d9c5724b412d34cd4000.png",
             product_form_data:
-              '[{"id":"blessing","type":"input","struct":{"title":"祝福语","explain":"请务必确保输入的号码准确无误，填错号码无法进行退还操作，后果自负。","default":"","placeholder":"","required":true},"options":[],"value":"祝福语"}]',
+              '[{"id":"blessing","type":"input","struct":{"title":"祝福语","explain":"请务必准确填写号码，号码错误将无法进行退还操作。","default":"","placeholder":"","required":true},"options":[],"value":"祝福语"}]',
             brand_id: 3,
             brand_name: "北京味多美蛋糕叔叔/HEYTEA/喜茶/凯蒂猫/Quange/全格",
             aftersale_service: ",refund,exchange",
@@ -227,7 +246,7 @@ module.exports = {
             region_limit_tpl_id: "jaZLgT57MsMuI6EdCg1Zu",
             gift_id: 0,
             product_sku_id: "0",
-            product_sku_name: "",
+            product_sku_name: "规格：400g/袋",
             is_activity: "Y"
           },
           {
@@ -259,7 +278,7 @@ module.exports = {
             product_thumb:
               "https://sandbox-img.jufubao.cn/uploads/20230406/0b890cd5a947d9c5724b412d34cd4000.png",
             product_form_data:
-              '[{"id":"blessing","type":"input","struct":{"title":"祝福语","explain":"请务必确保输入的号码准确无误，填错号码无法进行退还操作，后果自负。","default":"","placeholder":"","required":true},"options":[],"value":"祝福语"}]',
+              '[{"id":"blessing","type":"input","struct":{"title":"祝福语","explain":"请务必准确填写号码，号码错误将无法进行退还操作。","default":"","placeholder":"","required":true},"options":[],"value":"祝福语"}]',
             brand_id: 3,
             brand_name: "北京味多美蛋糕叔叔/HEYTEA/喜茶/凯蒂猫/Quange/全格",
             aftersale_service: ",refund,exchange",
@@ -287,7 +306,7 @@ module.exports = {
         ]
       },
       {
-        repo_name: "仓库61527",
+        repo_name: "仓库2",
         supplier_id: 61527,
         delivery_method: "logistics",
         user_logistics_amount: 0,
@@ -308,10 +327,7 @@ module.exports = {
         brand_id: 3,
         support_delivery_method_options: [
           { label: "快递配送", value: "logistics" },
-          {
-            label: "同城配送",
-            value: "samecity"
-          },
+          { label: "同城配送", value: "samecity" },
           { label: "到店自提", value: "takeout" }
         ],
         supplier_logistics_amount_origin: "0",
@@ -358,7 +374,7 @@ module.exports = {
         ]
       },
       {
-        repo_name: "仓库61527",
+        repo_name: "仓库3",
         supplier_id: 61527,
         delivery_method: "logistics",
         user_logistics_amount: 50,
@@ -379,12 +395,12 @@ module.exports = {
         brand_id: 100003,
         support_delivery_method_options: [
           { label: "快递配送", value: "logistics" },
-          {
-            label: "同城配送",
-            value: "samecity"
-          },
+          { label: "同城配送", value: "samecity" },
           { label: "到店自提", value: "takeout" }
         ],
+        sub_show_delivery_method: "Y",
+        sub_show_delivery_price: "Y",
+        time_label: "配送时间",
         supplier_logistics_amount_origin: "50",
         product: [
           {
@@ -683,10 +699,10 @@ module.exports = {
     city_name: "秦皇岛市",
     area_name: "卢龙县",
     street_name: "卢龙镇",
-    address_detail: "qww",
+    address_detail: "福成上上城四期南园12号楼3单元1203",
     house_number: "",
-    name: "测试",
-    phone: "18843854566",
+    name: "张先生",
+    phone: "178****9900",
     is_default: "Y",
     tag: 0,
     is_select: "Y",
@@ -728,13 +744,15 @@ module.exports = {
     next_page_token: "",
     request_id: "3c64153d7c1eec3a"
   },
-  getPayMethod: {
-    list: [
-      { method: "card", show_name: "使用票券1", icon: "icon_4" },
-      { method: "wallet", show_name: "使用我的元宝", icon: "icon_1" },
-      { method: "score", show_name: "使用积分", icon: "icon_3" }
+  getMallPayMethod: {
+    "list":[
+      {"method":"third","show_name":"使用补差","icon":"icon_2"},
+      {"method":"card","show_name":"使用票券","icon":"icon_4"},
+      {"method":"score","show_name":"使用积分","icon":"icon_3"},
+      {"method":"wallet","show_name":"使用余额","icon":"icon_1"},
+      {"method":"coupon","show_name":"使用满减券","icon":"icon_1"}
     ],
-    request_id: "3746368129d64b96"
+    "request_id":"83b92e9b30d37c9f"
   },
   getUserWallet: {
     show_name: "我的元宝",

package/src/components/JfbMallConfirm/XdAddrDefault.vue

@@ -1,20 +1,22 @@
 <template>
   <view class="xd-addr-default">
     <view v-if="curAddr" class="addr_wrap">
-      <view class="icon_addr">
-        <xd-font-icon size="32" style="color: #B1B1B1;" icon="icondizhitubiao"></xd-font-icon>
-      </view>
       <view class="addr_info">
         <view class="addr_name">{{curAddr.name}} <text class="_phone">{{curAddr.phone}}</text></view>
         <view class="address-detail">
-          {{curAddr.province_name}}{{curAddr.city_name}}{{curAddr.area_name}}{{curAddr.street_name}}{{curAddr.address_detail}}{{curAddr.house_number}}
+          <view class="icon_wrap">
+            <xd-font-icon size="28" style="color: #999999;" icon="icondizhitubiao"></xd-font-icon>
+          </view>
+          <view style="flex:1;width: 500rpx;">
+            {{curAddr.province_name}}{{curAddr.city_name}}{{curAddr.area_name}}{{curAddr.street_name}}{{curAddr.address_detail}}{{curAddr.house_number}}
+          </view>
         </view>
         <view class="address-prompt-message">
           为方便您顺利收件，请填写真实姓名
         </view>
       </view>
       <view class="arrow_right">
-        <xd-font-icon size="32" style="color: #B1B1B1;" icon="iconxiangyou_xian"></xd-font-icon>
+        <!-- <xd-font-icon size="32" style="color: #B1B1B1;" icon="iconxiangyou_xian"></xd-font-icon> -->
       </view>
     </view>
     <view class="empty_addr" v-else>
@@ -57,7 +59,7 @@
     .addr_wrap{
       display: flex;
       align-items: center;
-      padding: 34rpx 0 34rpx 12rpx;
+      padding: 32rpx 0 32rpx 48rpx;
       .icon_addr{
         display: flex;
         width: 70rpx;
@@ -74,20 +76,31 @@
         flex: 1;
         width: 400rpx;
         .addr_name{
-          font-size: 30rpx;
-          color: #191a1b;
+          font-size: 28rpx;
+          font-weight: 500;
+          color: #333333;
+          padding-left: 44rpx;
         }
         ._phone{
-          color: #797d82;
           margin-left: 8rpx;
         }
         .address-detail{
-          font-size: 26rpx;
-          color: #797d82;
+          font-size: 28rpx;
+          color: #666666;
+          margin: 20rpx 0 8rpx;
+          display: flex;
+          align-items: flex-start;
+
+          .icon_wrap{
+            width: 44rpx;
+            padding: 8rpx 12rpx 0 0rpx;
+            box-sizing: border-box;
+          }
         }
         .address-prompt-message{
-          font-size: 22rpx;
-          color: #baa27a;
+          font-size: 24rpx;
+          color: var(--g-theme-dangerColor);
+          padding-left: 44rpx;
         }
       }
     }

package/src/components/JfbMallConfirm/XdAddrOld.vue

@@ -33,7 +33,7 @@
 
 <style lang="less" scoped>
   .xd-addr-old{
-    padding: 40rpx 60rpx;
+    padding: 28rpx 48rpx;
     display: flex;
     justify-content: space-between;
     align-items: center;
@@ -49,20 +49,22 @@
       display: flex;
       font-size: 28rpx;
       color: #333;
+      font-weight: 500;
       .default_tag{
-        background: #D9B0FF;
+        background: var(--g-theme-mainColor);
         font-size: 24rpx;
-        padding: 0 20rpx;
-        line-height: 40rpx;
+        font-weight: 400;
+        padding: 8rpx 16rpx;
+        line-height: 1;
         border-radius: 4px;
         color: #FFFFFF;
-        margin-right: 32rpx;
+        margin-right: 20rpx;
       }
     }
     .addr_detail{
-      font-size: 32rpx;
+      font-size: 28rpx;
       color: #333333;
-      margin: 20rpx 0;
+      margin: 12rpx 0;
     }
     .addr_info{
       font-size: 28rpx;

package/src/components/JfbMallConfirm/XdListItem.vue

@@ -24,7 +24,7 @@
         v-if="showRight"
         :style="{
           marginLeft: '10rpx',
-          color: '#B1B1B1'
+          color: rIconColor
         }"
         size="24"
         icon="iconxiangyou_xian"
@@ -52,7 +52,7 @@ export default {
     },
     paddingTB:{
       type: String,
-      default: "24rpx"
+      default: "20rpx"
     },
     paddingLR: {
       type: String,
@@ -81,6 +81,10 @@ export default {
     className: {
       type: String,
       default: ''
+    },
+    rIconColor: {
+      type: String,
+      default: '#333333'
     }
   }
 
@@ -99,6 +103,8 @@ export default {
     .my-list_label{
       font-size: 28rpx;
       font-weight: 400;
+      height: 40rpx;
+      line-height: 40rpx;
     }
   }
   &.size_default{
@@ -106,6 +112,8 @@ export default {
     .my-list_label{
       font-size: 28rpx;
       font-weight: 400;
+      height: 40rpx;
+      line-height: 40rpx;
     }
   }
   &.size_small{

package/src/components/JfbMallConfirm/cusAttr/advanced.js

@@ -0,0 +1,91 @@
+'use strict';
+
+export default (data)=>{
+  return [
+    {
+      label: '收货地址',
+      ele: 'xd-select-pages-path',
+      valueKey: 'shipAddressPath',
+      groupKey:'advanced',
+      className: 'input100',
+      placeholder: '请选择收货地址跳转地址',
+      value: data.shipAddressPath || null,
+      labelInline: true,
+      setting: {
+        router: XdBus.getParentApi('getPagesTree'),
+      },
+    },
+    {
+      label: '去支付',
+      ele: 'xd-select-pages-path',
+      valueKey: 'payPath',
+      placeholder: '请选择支付跳转地址',
+      value: data.payPath || null,
+      labelInline: true,
+      setting: {
+        router: XdBus.getParentApi('getPagesTree'),
+      },
+      groupKey:'advanced',
+      className: 'input100',
+    },
+    {
+      label: '支付成功',
+      ele: 'xd-select-pages-path',
+      valueKey: 'paySuccessPath',
+      placeholder: '请选择支付成功跳转地址',
+      value: data.paySuccessPath || null,
+      setting: {
+        router: XdBus.getParentApi('getPagesTree'),
+      },
+      labelInline: true,
+      groupKey:'advanced',
+      className: 'input100',
+    },
+    {
+      label: '选择城市',
+      ele: 'xd-select-pages-path',
+      valueKey: 'choseCityPath',
+      placeholder: '请选择选择城市跳转地址',
+      value: data.choseCityPath || null,
+      setting: {
+        router: XdBus.getParentApi('getPagesTree'),
+      },
+      labelInline: true,
+      groupKey:'advanced',
+      className: 'input100',
+    },
+    {
+      label: "预览模式",
+      ele: "xd-radio",
+      valueKey: "preview",
+      value: data.preview || 'N',
+      groupKey:'advanced',
+      className: 'input100',
+      labelInline: true,
+      inline: false,
+      notice: "开启后不能提交订单",
+      list: [
+        {label: "开启", value: "Y"},
+        {label: "关闭", value: "N"}
+      ]
+    },
+    {
+      label: '版本号:',
+      ele: 'el-input',
+      type: 'text',
+      groupKey: 'advanced',
+      valueKey: 'version',
+      value: 'v2.0',
+      hidden: true,
+    },
+    {
+      label: '引用过滤字段设置:',
+      ele: 'el-input',
+      type: 'text',
+      groupKey: 'content',
+      valueKey: 'refFilterContent',
+      value: '["address_layout", "showTopLine", "coupon_layout", "addr_style", "cont_style"]',
+      hidden: true,
+    },
+  ]
+}