jufubao-base 1.0.187-beta2 → 1.0.187

package/package.json

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

package/src/components/JfbBaseAddress/Attr.js

@@ -1,6 +1,5 @@
 'use strict';
 import StyleForm from "@/utils/StyleForm";
-import IConList from "@/ICONS"
 let styleForm = new StyleForm(
   {border: null, shadow: null, spacing: '',  bgColor:'',  margin: null},
   null,
@@ -12,35 +11,6 @@ export default {
   advanced: [],
   content: (data)=>{
     return [
-      {
-        label: "布局样式配置",
-        ele: "xd-radio",
-        valueKey: "layout_style",
-        value: data.layout_style || 'old',
-        list: [
-          {label: '布局1', value: 'old'},
-          {label: '布局2', value: 'tfk'},
-        ],
-        groupKey: "style",
-      },
-      {
-        label: "编辑图标",
-        ele: "xd-select-list",
-        valueKey: "edit_icon",
-        value: data.edit_icon || 'iconbianji-01',
-        list: IConList,
-        className: 'input80',
-        groupKey: "content",
-      },
-      {
-        label: "删除图标",
-        ele: "xd-select-list",
-        valueKey: "delete_icon",
-        value: data.delete_icon || 'iconshanchu-01',
-        list: IConList,
-        className: 'input80',
-        groupKey: "content",
-      },
       {
         label: '选取地区路径:',
         ele: 'xd-select-pages-path',
@@ -53,85 +23,7 @@ export default {
         },
         inline: false,
       },
-      ...styleForm.getForm(data, '内容列表样式配置'),
-      {
-        label: "圆角设置",
-        ele: 'xd-site-select-list',
-        valueKey: 'cardRadius',
-        value: data['cardRadius'] || '',
-        groupKey:'style',
-        placeholder: '请选择内容圆角设置',
-        multiple: false,
-        className: 'input80',
-        handleCustom({ action, data }) {
-          XdBus.getParentApi('getOptionsSettingList')({ setting_id: 'edtix_style_radius' })
-            .then(res => {
-              data.cb(res.list)
-            })
-            .catch(error => {
-              console.error(error);
-            });
-        },
-      },
-      {
-        label: "底部按钮配置",
-        ele: "title",
-        groupKey: "style",
-        size: "small"
-      },
-      {
-        label: "容器内边距:",
-        ele: "xd-margin-padding",
-        valueKey: "bottomPadding",
-        value: data.bottomPadding || null,
-        groupKey: "style",
-        setting: {
-          type: 'padding',
-        },
-        placeholder: '请设置边距',
-        inline: false,
-        notice: '设置内边距，<span style="color: red">单位：像素</span>。默认值：<span style="color: red">20</span>像素',
-      },
-      {
-        label: "容器背景颜色:",
-        ele: "xd-color",
-        valueKey: "bottomBgColor",
-        value: data.bottomBgColor || null,
-        groupKey: "style",
-      },
-      {
-        label: "按钮背景颜色:",
-        ele: "xd-color",
-        valueKey: "bottomBtnBgColor",
-        value: data.bottomBtnBgColor || null,
-        groupKey: "style",
-      },
-      {
-        label: "按钮文字颜色:",
-        ele: "xd-color",
-        valueKey: "bottomBtnTextColor",
-        value: data.bottomBtnTextColor || null,
-        groupKey: "style",
-      },
-      {
-        label: "按钮圆角:",
-        ele: "xd-site-select-list",
-        valueKey: "bottomBtnRadius",
-        value: data['bottomBtnRadius'] || '',
-        groupKey:'style',
-        placeholder: '请选择内容圆角设置',
-        multiple: false,
-        className: 'input80',
-        handleCustom({ action, data }) {
-          XdBus.getParentApi('getOptionsSettingList')({ setting_id: 'edtix_style_radius' })
-            .then(res => {
-              data.cb(res.list)
-            })
-            .catch(error => {
-              console.error(error);
-            });
-        },
-      }
+      ...styleForm.getForm(data, '内容列表样式配置')
     ].filter(i=>i)
   },
 }

package/src/components/JfbBaseAddress/JfbBaseAddress.vue

@@ -26,108 +26,81 @@
         class="jfb-base-address__body-address"
         v-if="addressList && addressList.length > 0"
       >
-        <template v-if="layout_style === 'old'">
-          <view
-            :style="{
-              marginBottom: jfbListSpacing + 'rpx',
-              boxShadow: jfbListShadowComputed,
-              border: jfbListBorderComputed,
-              backgroundColor: jfbListBgColor,
-              borderRadius: cardRadius + 'rpx'
-            }"
-            class="jfb-base-address__body-address-item"
-            v-for="(item, index) in addressList"
-            @click="handleSelectAddress(item)"
-            :key="index"
-          >
-            <view class="jfb-base-address__body-address-item-top">
-              <view
-                v-if="item.is_default === 'Y'"
-                :style="{
-                  backgroundColor: mainColor,
-                  color: '#fff',
-                  fontSize: '24rpx',
-                  padding: '4rpx 10rpx',
-                  borderRadius: '4rpx',
-                  marginRight: '20rpx',
-                }"
-                >默认</view
-              >
-              <view
-                :style="{
-                  color: '#999999',
-                  flex: 1,
-                  paddingRight: item.is_valid === 'N' ? '40rpx' : '',
-                }"
-              >
-                <view>
-                  {{ item | getCodeName }}
-                </view>
-              </view>
-              <view
-                style="position: absolute; right: 40rpx; width: 50rpx"
-                v-if="item.is_valid === 'N'"
-              >
-                <xd-font-icon
-                  size="32"
-                  :color="dangerColor"
-                  icon="iconmingchengtubiao"
-                ></xd-font-icon>
-              </view>
-            </view>
-            <view class="jfb-base-address__body-address-item-middle">
-              {{ item.address_detail }} {{ item.house_number }}
-            </view>
+        <view
+          :style="{
+            marginBottom: jfbListSpacing + 'rpx',
+            boxShadow: jfbListShadowComputed,
+            border: jfbListBorderComputed,
+            backgroundColor: jfbListBgColor,
+          }"
+          class="jfb-base-address__body-address-item"
+          v-for="(item, index) in addressList"
+          @click="handleSelectAddress(item)"
+          :key="index"
+        >
+          <view class="jfb-base-address__body-address-item-top">
             <view
+              v-if="item.is_default === 'Y'"
               :style="{
-                backgroundColor: item.is_select === 'Y' ? mainColor : '#CCC',
+                backgroundColor: mainColor,
+                color: '#fff',
+                fontSize: '24rpx',
+                padding: '4rpx 10rpx',
+                borderRadius: '4rpx',
+                marginRight: '20rpx',
+              }"
+              >默认</view
+            >
+            <view
+              :style="{
+                color: '#999999',
+                flex: 1,
+                paddingRight: item.is_valid === 'N' ? '40rpx' : '',
               }"
-              class="jfb-base-address__body-address-item-bottom"
             >
               <view>
-                <view style="margin-right: 40rpx">{{ item.name }}</view>
-                <view>{{ item.phone }}</view>
-              </view>
-              <view>
-                <xd-font-icon
-                  @click.native.stop="handleEdit(item)"
-                  style="margin-right: 40rpx"
-                  icon="iconbianji-01"
-                  size="32"
-                ></xd-font-icon>
-                <xd-font-icon
-                  @click.native.stop="handleDel(item)"
-                  icon="iconshanchu-01"
-                  size="32"
-                ></xd-font-icon>
+                {{ item | getCodeName }}
               </view>
             </view>
+            <view
+              style="position: absolute; right: 40rpx; width: 50rpx"
+              v-if="item.is_valid === 'N'"
+            >
+              <xd-font-icon
+                size="32"
+                :color="dangerColor"
+                icon="iconmingchengtubiao"
+              ></xd-font-icon>
+            </view>
+          </view>
+          <view class="jfb-base-address__body-address-item-middle">
+            {{ item.address_detail }} {{ item.house_number }}
           </view>
-        </template>
-        <template v-else>
           <view
             :style="{
-              marginBottom: jfbListSpacing + 'rpx',
-              boxShadow: jfbListShadowComputed,
-              border: jfbListBorderComputed,
-              backgroundColor: jfbListBgColor,
-              borderRadius: cardRadius + 'rpx'
+              backgroundColor: item.is_select === 'Y' ? mainColor : '#CCC',
             }"
-            v-for="(item, index) in addressList"
-            @click="handleSelectAddress(item)"
-            :key="index"
+            class="jfb-base-address__body-address-item-bottom"
           >
-            <xd-tfk-item
-              :edit_icon="edit_icon"
-              :delete_icon="delete_icon"
-              :item="item"
-              :dangerColor="dangerColor"
-              @editAddress="handleEdit(item)"
-              @delAddress="handleDel(item)"
-              @setDefault="handleSetDefault(item)"
-            ></xd-tfk-item>
+            <view>
+              <view style="margin-right: 40rpx">{{ item.name }}</view>
+              <view>{{ item.phone }}</view>
+            </view>
+            <view>
+              <xd-font-icon
+                @click.native.stop="handleEdit(item)"
+                style="margin-right: 40rpx"
+                icon="iconbianji-01"
+                size="32"
+              ></xd-font-icon>
+              <xd-font-icon
+                @click.native.stop="handleDel(item)"
+                icon="iconshanchu-01"
+                size="32"
+              ></xd-font-icon>
+            </view>
           </view>
-        </template>
+        </view>
       </view>
       <view class="jfb-base-address__body-empty" v-else>
         <xd-font-icon icon="iconbianzu-01" size="120"></xd-font-icon>
@@ -135,19 +108,13 @@
       </view>
       <view style="height: 110rpx"></view>
       <view class="jfb-base-address__body-footer" :style="prod_bottom">
-        <view :style="[bottomBoxStyle]">
-          <xd-button
-            width="100%"
-            type="primary"
-            :style="{
-              background: bottomBtnBgColor,
-              color: bottomBtnTextColor
-            }"
-            :radius="bottomBtnRadius+'rpx'"
-            @click="showAddress = !showAddress"
-            >+新增收货地址
-          </xd-button>
-        </view>
+        <xd-button
+          width="80%"
+          type="primary"
+          :bg-color="mainColor"
+          @click="showAddress = !showAddress"
+          >+新增收货地址
+        </xd-button>
         <xd-down-drawer
           v-if="showAddress"
           :show.sync="showAddress"
@@ -183,7 +150,6 @@ import componentsMixins from "@/mixins/componentsMixins";
 import extsMixins from "@/mixins/extsMixins";
 import StyleForm from "@/utils/StyleForm";
 import { getContainerPropsValue } from "@/utils/xd.base";
-import XdTfkItem from "./XdTfkItem"
 let styleForm = new StyleForm(
   {
     border: null,
@@ -208,7 +174,6 @@ export default {
     XdButton,
     XdDownDrawer,
     XdAddress,
-    XdTfkItem,
   },
   mixins: [componentsMixins, extsMixins, JfbBaseAddressMixin],
   data() {
@@ -219,17 +184,7 @@ export default {
       location_url: "",
       addressList: null,
       ...styleForm.getDataItem(),
-      version: '',
-
-      layout_style: "old",
-      edit_icon: "",
-      delete_icon: "",
-      cardRadius: 16,
-      bottomPadding: "",
-      bottomBgColor: "",
-      bottomBtnBgColor: "",
-      bottomBtnTextColor: "",
-      bottomBtnRadius: "",
+      version: ''
     };
   },
   filters: {
@@ -255,16 +210,6 @@ export default {
       return this.fixedStyle({ height: 0, zIndex: 111 });
     },
     ...styleForm.getComputedItem(),
-    bottomBoxStyle(){
-      let padding = `${this.checkValue(this.bottomPadding.top, 20)}rpx`;
-      padding = `${padding} ${this.checkValue(this.bottomPadding.right, 20)}rpx`;
-      padding = `${padding} ${this.checkValue(this.bottomPadding.bottom, 20)}rpx`;
-      padding = `${padding} ${this.checkValue(this.bottomPadding.left, 20)}rpx`;
-      return {
-        padding: padding,
-        backgroundColor: this.bottomBgColor,
-      }
-    }
   },
   methods: {
     onJfbLoad(options) {
@@ -291,16 +236,6 @@ export default {
         { value: "" }
       ).value;
       styleForm.getInitItem(this, value);
-      this.layout_style = getContainerPropsValue(value, "content.layout_style", "old");
-      this.edit_icon = getContainerPropsValue(value, "content.edit_icon", "iconbianji-01");
-      this.delete_icon = getContainerPropsValue(value, "content.delete_icon", "iconshanchu-01");
-      this.cardRadius = getContainerPropsValue(value, "content.cardRadius", 16);
-      this.bottomPadding = getContainerPropsValue(value, "content.bottomPadding", {});
-      this.bottomBgColor = getContainerPropsValue(value, "content.bottomBgColor", "#FFFFFF");
-      this.bottomBtnBgColor = getContainerPropsValue(value, "content.bottomBtnBgColor", this.mainColor);
-      this.bottomBtnTextColor = getContainerPropsValue(value, "content.bottomBtnTextColor", "#FFFFFF");
-      this.bottomBtnRadius = getContainerPropsValue(value, "content.bottomBtnRadius", 40);
-      console.log("bottomBtnRadius", this.bottomBtnRadius)
     },
     getList(callback) {
       this.$xdShowLoading({});
@@ -555,8 +490,7 @@ export default {
         })
         .catch(this.$xdLog.catch);
     },
-    //接口数据接口映射到组件数据接口
-    apiDataMapCompData(item){
+    handleEdit(item) {
       let city_name = [
         item["province_name"],
         item["city_name"],
@@ -569,15 +503,13 @@ export default {
         item["area_code"],
         item["street_code"],
       ];
-      return {
+      this.defaultValue = {
         receipt_username: item["name"],
         receipt_address: item["address_detail"],
         receipt_phone: item["phone"],
         receipt_default: item["is_default"] === "Y" ? true : false,
         city_name: city_name,
         city_code: city_code,
-        receipt_city_code: city_code,
-        receipt_city_name: city_name,
         receipt_region_name: city_name.join("  "),
         city_selected_data: city_name.map((item, index) => {
           return { label: item, value: city_code[index] };
@@ -586,20 +518,11 @@ export default {
         latitude: item["latitude"] || null,
         longitude: item["longitude"] || null,
         house_number: item["house_number"],
-      }
-    },
-    handleEdit(item) {
-      this.defaultValue = this.apiDataMapCompData(item);
+      };
 
       console.log("handleEdit", item, this.defaultValue);
       this.showAddress = true;
     },
-    handleSetDefault(item){
-      let is_default = item.is_default === "Y" ? "N" : "Y";
-      this.$set(item, 'is_default', is_default);
-      let saveData = this.apiDataMapCompData({...item, is_default});
-      this.handleSave(saveData);
-    },
     handleDel(item) {
       console.log("handleDel", item);
       this.$xdConfirm({
@@ -747,10 +670,9 @@ export default {
 
     &-address {
       &-item {
-        // border-radius: unit(16, rpx);
+        border-radius: unit(16, rpx);
         margin-bottom: unit(20, rpx);
         box-shadow: 0px 0px unit(20, rpx) 0px rgba(0, 0, 0, 0.1);
-        overflow: hidden;
 
         &-top {
           display: flex;
@@ -773,7 +695,7 @@ export default {
           padding: unit(20, rpx) unit(40, rpx);
           font-size: unit(28, rpx);
           color: #fff;
-          // border-radius: 0px 0px unit(16, rpx) unit(16, rpx);
+          border-radius: 0px 0px unit(16, rpx) unit(16, rpx);
 
           & > view {
             display: flex;
@@ -787,7 +709,9 @@ export default {
       position: fixed;
       left: 0;
       right: 0;
+      padding-top: unit(20, rpx);
       background: #fff;
+      height: unit(100, rpx);
     }
   }
 }

package/src/components/JfbBaseFastLink/Attr.js

@@ -1,5 +1,4 @@
 'use strict';
-import ICONS from '@/ICONS'
 
 /**
  * @description 当表单组件中有联动操作时候，使用方法进行返回
@@ -86,15 +85,15 @@ export default {
         ele: 'el-input',
         groupKey:'style',
         type: 'number',
-        valueKey: 'rowSpacing',
-        value: data.rowSpacing===undefined? data.rowSpacing: '',
+        valueKey: 'padding',
+        value: data.padding===undefined? data.padding: '',
         placeholder: '请输入行间距',
         className: 'input60',
         inline: false,
         notice: '设置行间距，<span style="color: red">单位：像素</span>。默认值：<span style="color: red">20</span>像素',
       },
       {
-        label: '边距设置:',
+        label: '外边距设置:',
         ele: 'xd-margin-padding',
         groupKey:'style',
         valueKey: 'margin',
@@ -102,22 +101,9 @@ export default {
         setting: {
           type: 'margin',
         },
-        placeholder: '边距设置',
+        placeholder: '外边距设置',
         inline: false,
-        notice: '边距设置，<span style="color: red">单位：像素</span>。默认值：<span style="color: red">0</span>像素',
-      },
-      {
-        label: '填充设置:',
-        ele: 'xd-margin-padding',
-        groupKey:'style',
-        valueKey: 'padding',
-        value: data['padding'] || null,
-        setting: {
-          type: 'padding',
-        },
-        placeholder: '填充设置',
-        inline: false,
-        notice: '填充设置，<span style="color: red">单位：像素</span>。默认值：<span style="color: red">20</span>像素',
+        notice: '内容边距设置，<span style="color: red">单位：像素</span>。默认值：<span style="color: red">20</span>像素',
       },
       {
         ele: 'title',
@@ -253,9 +239,7 @@ export default {
             icon: true,
             notice: false,
             subTitle: true,
-            params: true,
-          },
-          icons:ICONS,
+          }
         },
         handleCustom({action, data}) {
           if (action === 'number') {

package/src/components/JfbBaseFastLink/JfbBaseFastLink.vue

@@ -16,15 +16,17 @@
     <view class="jfb-base-fast-link__body">
       <template v-if="is_layout === 'noraml'">
         <view class="x-line"></view>
-        <view
-          class="fast-link"
-          :style="[bodyStyle]"
-          v-if="list.length > 0">
+        <view class="fast-link" :style="{ margin: outMargin}" v-if="list.length > 0">
           <view
             class="fast-link__item"
             v-for="item in list"
             :key="item.key"
-            :style="[contStyle]"
+            :style="{
+              background: backgroundColor,
+              border: borderBox,
+              borderRadius: radius + 'rpx',
+              marginBottom: padding + 'rpx'
+            }"
             @click="handleClick(item)"
           >
             <view class="fast-link__item-icon" v-if="item.icon">
@@ -105,8 +107,7 @@
 
         //其他
         margin: {},
-        padding:{},
-        rowSpacing: 20, //间距
+        padding: 20, //间距
       }
     },
     watch: {
@@ -117,32 +118,16 @@
     },
 
     computed: {
-      bodyStyle(){
-        let margin = `${this.checkValue(this.margin.top, 0)}rpx`;
-        margin = `${margin} ${this.checkValue(this.margin.right, 0)}rpx`;
-        margin = `${margin} ${this.checkValue(this.margin.bottom, 0)}rpx`;
-        margin = `${margin} ${this.checkValue(this.margin.left, 0)}rpx`;
-
-        let padding = `${this.checkValue(this.margin.top, 20)}rpx`;
-        padding = `${padding} ${this.checkValue(this.margin.right, 20)}rpx`;
-        padding = `${padding} ${this.checkValue(this.margin.bottom, 20)}rpx`;
-        padding = `${padding} ${this.checkValue(this.margin.left, 20)}rpx`;
-
-        return {
-          margin,
-          padding
-        }
+      outMargin(){
+        let str = `${this.checkValue(this.margin.top, 20)}rpx`;
+        str = `${str} ${this.checkValue(this.margin.right, 20)}rpx`;
+        str = `${str} ${this.checkValue(this.margin.bottom, 20)}rpx`;
+        str = `${str} ${this.checkValue(this.margin.left, 20)}rpx`;
+        return str
       },
-
-      contStyle(){
-        let border = 0;
-        if (this.is_border === 'Y') border = `${this.is_border_w}rpx solid ${this.is_border_c}`;
-        return {
-          background: this.backgroundColor,
-          borderRadius: this.radius + 'rpx',
-          marginBottom: this.rowSpacing + 'rpx',
-          border
-        }
+      borderBox() {
+        if (this.is_border === 'Y') return `${this.is_border_w}rpx solid ${this.is_border_c}`;
+        else return '0';
       },
 
       subNameSize(){
@@ -167,7 +152,6 @@
         }
       },
       handleClick(item){
-        if (this.$configProject['isPreview']) return
         if(item.path && item.path.value) {
           this.$xdUniHelper.navigateTo({
             url : `${item.path.value}`
@@ -184,8 +168,9 @@
         this.fontSize = getContainerPropsValue(container, 'content.fontSize', 26);
         this.radius = getContainerPropsValue(container, 'content.radius', 10);
         this.iconColor = getContainerPropsValue(container, 'content.iconColor', '#999');
-        this.rowSpacing = getContainerPropsValue(container, 'content.rowSpacing', 20);
+        this.padding = getContainerPropsValue(container, 'content.padding', 20);
         this.is_layout = getContainerPropsValue(container, 'content.is_layout', 'noraml');
+        //this.fastName = getContainerPropsValue(container, 'content.fastName', '快速导航');
         this.is_border = getContainerPropsValue(container, 'content.is_border', 'N');
         this.is_border_c = getContainerPropsValue(container, 'content.is_border_c', '#fff');
         this.is_border_w = getContainerPropsValue(container, 'content.is_border_w', 2);
@@ -228,8 +213,8 @@
           }).filter((item,index)=>{
             return index < 3
           });
-
         }
+
       },
     }
   }

package/src/components/JfbBaseFastLink/XdFastNav.vue

@@ -30,7 +30,7 @@
           <view v-show="index !== 0" :style="{background: lineColor}"></view>
         </view>
       </view>
-      <view class="xd-fast-nave__body-mask" v-if="!close" @click="close=true"></view>
+      <view class="xd-fast-nave__body-mask" v-if="0&&!close" @click="close=true"></view>
     </view>
   </view>
 </template>
@@ -112,7 +112,6 @@
           console.warn(item.path);
           return;
         }
-        this.close = true;
         this.$xdUniHelper.navigateTo({
           url: item.path
         },false);