jufubao-mall 2.0.16-beta2 → 2.0.16

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jufubao-mall",
-  "version": "2.0.16-beta2",
+  "version": "2.0.16",
   "private": false,
   "description": "聚福宝商城业务组件插件包",
   "main": "index.js",

package/src/components/JfbMallConfirm/Api.js

@@ -68,7 +68,7 @@ module.exports = [
   {
     mapFnName: 'cardList',
     title: '展示可选卡列表',
-    path: '/mall/v1/order/list-binded-cards',
+    path: '/mall/v1/order/list-binded-cards/mall',
     isRule: false,
     params: {},
     isConsole: true,
@@ -86,7 +86,7 @@ module.exports = [
   {
     mapFnName: 'selectCard',
     title: '选择卡',
-    path: '/mall/v1/order/use-binded-card',
+    path: '/mall/v1/order/use-binded-card/mall',
     isRule: false,
     data: {
       namespace: ['namespace', 'String', true],
@@ -119,7 +119,7 @@ module.exports = [
   {
     mapFnName: 'addCard',
     title: '添加卡',
-    path: '/mall/v1/order/use-new-card',
+    path: '/mall/v1/order/use-new-card/mall',
     isRule: false,
     data: {
       namespace: ['namespace', 'String', true],
@@ -266,7 +266,7 @@ module.exports = [
   {
     mapFnName: "useBindedWallet",
     title: "使用已绑钱包",
-    path: "/mall/v1/order/use-binded-wallet",
+    path: "/mall/v1/order/use-binded-wallet/mall",
     isRule: false,
     data: {
       selected_card_list_json: ['卡', 'string', true],

package/src/components/JfbMallHomeProductList/Mock.js

@@ -102,23 +102,14 @@ module.exports = {
         promo_price: 1800,
         show_prices: [
           {
-            "p": 1800,
-            "n": "PLUS价",
-            "t": "S",
-            "a": "起",
-            "s": ""
-          },
-          {
-            "p": 4300,
-            "n": "原价",
-            "t": "U"
+              "p": 1800,
+              "n": "PLUS价",
+              "t": "S"
           },
           {
-            "p": 4300,
-            "n": "省",
-            "t": "E",
-            "a": "",
-            "s": ""
+              "p": 4300,
+              "n": "原价",
+              "t": "U"
           }
         ],
         market_tags: ['flashsale','hot','new'],
@@ -169,23 +160,14 @@ module.exports = {
         promo_price: 1800,
         show_prices: [
           {
-            "p": 1800,
-            "n": "PLUS价",
-            "t": "S",
-            "a": "起",
-            "s": ""
-          },
-          {
-            "p": 4300,
-            "n": "原价",
-            "t": "U"
+              "p": 2678,
+              "n": "PLUS价",
+              "t": "S"
           },
           {
-            "p": 4300,
-            "n": "省",
-            "t": "E",
-            "a": "",
-            "s": ""
+              "p": 4300,
+              "n": "原价",
+              "t": "U"
           }
         ],
         market_tags: [],

package/src/components/JfbMallProductInfo/cusAttr/style.js

@@ -296,6 +296,9 @@ export default function (data, gValue, gColor, oldData) {
       value: dataVal({ data, key: 'saleWarmActPriceColor', dValue: '#FFEF5E', gValue }),
       hidden: !statusShow({ data, key: 'saleWarmActStyleStatus', fields: ['saleWarmActPriceColor'], gValue }) || (data.goodsLayout === 'default' || data.smsStatus === 'ing'),
       placeholder: '请选择售价颜色',
+      setting: {
+        showAlpha: true
+      },
       classNmae: 'input80',
     },
     {

package/src/components/JfbMallShop/Api.js

@@ -25,27 +25,6 @@ module.exports = [
     isConsole: true,
     disabled: true
   },
-  {
-    mapFnName: 'getShopProductList',
-    title: '获取商品列表',
-    path: '/product/v1/:xnamespace/product/search',
-    isRule: false,
-    params: {
-      xnamespace: ['path', "xnamespace", "必选"],
-      sort: ['排序', 'string', '必选'],
-      keyword: ['关键词', 'string', '必选'],
-      brand_ids: ['品牌ID，多个小写逗号隔开', 'string', '必选'],
-      filter_keys: ['过滤KEY,多个逗号隔开', 'string', '必选'],
-      city_code: ['城市CODE', 'string', '必选'],
-      custom_category_id: ['自定义分类ID', 'string', '必选'],
-      market_tags: ['营销标签 rec=推荐, hot=爆款, new=新品 多个逗号隔开', 'string', '必选'],
-      random_score_seed: ['随机排序因子, 分页时保证一样', 'string', '必选'],
-      page_size: ['page_size', 'string', '必选'],
-      page_token: ['page_token', 'string', '必选'],
-    },
-    isConsole: true,
-    disabled: true,
-  },
 
 
 ];

package/src/components/JfbMallShop/Attr.js

@@ -1,20 +1,176 @@
 'use strict';
-import style from "./cusAttr/style";
-import advanced from "./cusAttr/advanced";
-import content from "./cusAttr/content";
 
 /**
  * @description 当表单组件中有联动操作时候，使用方法进行返回
  */
 export default {
   style: [],
-  advanced: [],
-  content: (data, gValue, gColor, oldData={})=>{
-
+  content: (data) => {
     return [
-      ...content(data, gValue,gColor,oldData),
-      ...style(data, gValue,gColor,oldData),
-      ...advanced(data),
+      {
+        label: "是否展示核销入口:",
+        ele: "xd-radio",
+        valueKey: "isShowCashier",
+        value: data.isShowCashier || "Y",
+        groupKey:'content',
+        list: [
+          {"label": "展示", "value": "Y"},
+          {"label": "隐藏", "value": "N"},
+        ],
+        rules: [
+          {required: true, message: '请选择', trigger: ['blur', 'change']}
+        ],
+      },
+
+      {
+        label: '聚好兑自定义名称:',
+        ele: 'el-input',
+        type: 'text',
+        valueKey: 'name',
+        groupKey:'content',
+        value: data.name || '',
+        placeholder: '请输入聚好兑自定义',
+        className: 'input60',
+        notice: '建议使用<span style="color:red">10</span>个字以内',
+        inline: false,
+        hidden: data.isShowCashier !== 'Y',
+      },
+      {
+        label: '聚好兑描述:',
+        ele: 'el-input',
+        type: 'text',
+        valueKey: 'remark',
+        groupKey:'content',
+        value: data.remark || '',
+        placeholder: '请输入聚好兑自定义备注',
+        className: 'input60',
+        notice: '建议使用<span style="color:red">30</span>个字以内',
+        inline: false,
+        hidden: data.isShowCashier !== 'Y',
+      },
+
+      {
+        label: '扫一扫自定义名称:',
+        ele: 'el-input',
+        type: 'text',
+        valueKey: 'scanName',
+        groupKey:'content',
+        value: data.scanName || '',
+        placeholder: '请输入扫一扫自定义名称',
+        className: 'input60',
+        notice: '建议使用<span style="color:red">10</span>个字以内',
+        inline: false,
+        hidden: data.isShowCashier !== 'Y',
+      },
+      {
+        label: '扫一扫描述:',
+        ele: 'el-input',
+        type: 'text',
+        valueKey: 'scanRemark',
+        groupKey:'content',
+        value: data.scanRemark || '',
+        placeholder: '请输入扫一扫描述',
+        className: 'input60',
+        notice: '建议使用<span style="color:red">30</span>个字以内',
+        inline: false,
+        hidden: data.isShowCashier !== 'Y',
+      },
+
+      {
+        label: '去提货自定义名称:',
+        ele: 'el-input',
+        type: 'text',
+        valueKey: 'takeName',
+        groupKey:'content',
+        value: data.takeName || '',
+        placeholder: '请输入去提货自定义名称',
+        className: 'input60',
+        notice: '建议使用<span style="color:red">10</span>个字以内',
+        inline: false,
+        hidden: data.isShowCashier !== 'Y',
+      },
+      {
+        label: '去提货描述:',
+        ele: 'el-input',
+        type: 'text',
+        valueKey: 'takeRemark',
+        groupKey:'content',
+        value: data.takeRemark || '',
+        placeholder: '请输入去提货描述',
+        className: 'input60',
+        notice: '建议使用<span style="color:red">30</span>个字以内',
+        inline: false,
+        hidden: data.isShowCashier !== 'Y',
+      },
+
+
+
+      {
+        label: '聚好兑跳转路径:',
+        ele: 'xd-select-pages-path',
+        valueKey: 'exchangePath',
+        placeholder: '请选择聚好兑跳转路径',
+        groupKey:'advanced',
+        value: data['exchangePath'] || null,
+        setting: {
+          router: XdBus.getParentApi('getPagesTree'),
+        },
+        inline: false,
+      },
+      {
+        label: '去提货跳转路径:',
+        ele: 'xd-select-pages-path',
+        valueKey: 'takePath',
+        placeholder: '请选择去提货跳转路径',
+        groupKey:'advanced',
+        value: data['takePath'] || null,
+        setting: {
+          router: XdBus.getParentApi('getPagesTree'),
+        },
+        inline: false,
+      },
+      {
+        label: '扫一扫跳转路径:',
+        ele: 'xd-select-pages-path',
+        valueKey: 'scanPath',
+        placeholder: '请选择去提货跳转路径',
+        groupKey:'advanced',
+        value: data['scanPath'] || null,
+        setting: {
+          router: XdBus.getParentApi('getPagesTree'),
+        },
+        inline: false,
+      },
+
+
+      {
+        label: '填充设置:',
+        ele: 'xd-margin-padding',
+        valueKey: 'padding',
+        value: data['padding'] || null,
+        groupKey:'style',
+        setting: {
+          type: 'padding',
+        },
+        placeholder: '请设置边距',
+        inline: false,
+        notice: '填充内边距，<span style="color: red">单位：像素</span>。默认值：<span style="color: red">32</span>像素',
+      },
+      // {
+      //   label: '间距:',
+      //   ele: 'el-input',
+      //   type: 'number',
+      //   groupKey:'style',
+      //   valueKey: 'spacing',
+      //   value: data.spacing || '',
+      //   placeholder: '请输入间距',
+      //   className: 'input50',
+      //   notice: '间距设置，<span style="color: red">单位：像素</span>。默认值：<span style="color: red">32</span>像素',
+      //   inline: false,
+      // },
     ].filter(i=>i)
   },
+  advanced: [
+
+  ],
 };