jufubao-base 1.0.184-beta2 → 1.0.185

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jufubao-base",
-  "version": "1.0.184-beta2",
+  "version": "1.0.185",
   "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,26 +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);
-            });
-        },
-      }
+      ...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>
@@ -177,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,
@@ -202,7 +174,6 @@ export default {
     XdButton,
     XdDownDrawer,
     XdAddress,
-    XdTfkItem,
   },
   mixins: [componentsMixins, extsMixins, JfbBaseAddressMixin],
   data() {
@@ -213,12 +184,7 @@ export default {
       location_url: "",
       addressList: null,
       ...styleForm.getDataItem(),
-      version: '',
-
-      layout_style: "old",
-      edit_icon: "",
-      delete_icon: "",
-      cardRadius: 16,
+      version: ''
     };
   },
   filters: {
@@ -270,11 +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);
-      console.log("edit_icon", this.edit_icon)
     },
     getList(callback) {
       this.$xdShowLoading({});
@@ -529,8 +490,7 @@ export default {
         })
         .catch(this.$xdLog.catch);
     },
-    //接口数据接口映射到组件数据接口
-    apiDataMapCompData(item){
+    handleEdit(item) {
       let city_name = [
         item["province_name"],
         item["city_name"],
@@ -543,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] };
@@ -560,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({
@@ -721,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;
@@ -747,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;

package/src/components/JfbBaseFastLink/Attr.js

@@ -27,9 +27,22 @@ export default {
           {label: '悬浮', value: 'fixed'},
         ],
         inline: false,
-        notice: `使用悬浮布局时，快速链接数量不可超过<span style="color:red"> 3 </span>个，并且把该组件移动到最后`
+        notice: `使用悬浮布局时，链接数量不可超过<span style="color:red"> 3 </span>个，超出部分不显示, 并且把该组件移动到最后`
       },
-      data['is_layout'] ==='fixed' && {
+      {
+        label: '默认是否收起:',
+        ele: 'xd-radio',
+        valueKey: 'isNotExpand',
+        groupKey:'content',
+        value: data['isNotExpand'] || 'Y',
+        className: 'input80',
+        list: [
+          {label: '是', value: 'Y'},
+          {label: '否', value: 'N'},
+        ],
+        hidden: data['is_layout'] !=='fixed'
+      },
+      data['is_layout'] ==='fixed' && 0 &&  {
         label: '自定义名称:',
         ele: 'el-input',
         type: 'text',
@@ -68,16 +81,16 @@ export default {
         },
       },
       {
-        label: '间距:',
+        label: '行间距:',
         ele: 'el-input',
         groupKey:'style',
         type: 'number',
         valueKey: 'padding',
         value: data.padding===undefined? data.padding: '',
-        placeholder: '请输入间距',
+        placeholder: '请输入行间距',
         className: 'input60',
         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>像素',
       },
       {
         label: '外边距设置:',

package/src/components/JfbBaseFastLink/JfbBaseFastLink.vue

@@ -50,6 +50,7 @@
           >弹窗模式方便编辑(占位)，在线上此模块不显</view>
         </template>
         <xd-fast-nav
+          :is-not-expand="isNotExpand === 'Y'"
           :list="listNave"
           :color="mainColor"
           :is-preview="isPreview"
@@ -86,6 +87,7 @@
         list: [],
         backgroundColor: '',
         isPreview:false,
+        isNotExpand: 'Y',
 
         //基础信息
         background: '#fff',
@@ -104,12 +106,7 @@
         is_border_c: '',
 
         //其他
-        margin: {
-          top: 0,
-          left: 0,
-          right: 0,
-          bottom: 0
-        },
+        margin: {},
         padding: 20, //间距
       }
     },
@@ -157,7 +154,7 @@
       handleClick(item){
         if(item.path && item.path.value) {
           this.$xdUniHelper.navigateTo({
-            url : `${item.path.value}` 
+            url : `${item.path.value}`
           })
         }
       },
@@ -173,7 +170,7 @@
         this.iconColor = getContainerPropsValue(container, 'content.iconColor', '#999');
         this.padding = getContainerPropsValue(container, 'content.padding', 20);
         this.is_layout = getContainerPropsValue(container, 'content.is_layout', 'noraml');
-        this.fastName = getContainerPropsValue(container, 'content.fastName', '快速导航');
+        //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);
@@ -187,6 +184,7 @@
         this.margin = getContainerPropsValue(container, 'content.margin', {top: 0, left: 0, right: 0, bottom: 0});
         this.subColor = getContainerPropsValue(container, 'content.textSubColor', '#000');
         this.fontSubSize = getContainerPropsValue(container, 'content.fontSubSize', 24);
+        this.isNotExpand = getContainerPropsValue(container, 'content.isNotExpand', 'Y');
         if(this.is_layout === 'fixed') {
           this.listNave = this.list.map(item=>{
             let {appValue,path} = item.path
@@ -212,6 +210,8 @@
               jumpUrl = `${jumpUrl}${bus}`;
               return { name: item.name, path: jumpUrl, icon: item.icon, size: item.size }
             }
+          }).filter((item,index)=>{
+            return index < 3
           });
         }
 

package/src/components/JfbBaseFastLink/XdFastNav.vue

@@ -75,7 +75,12 @@
           return {}
         }
       },
+      isNotExpand:{
+        type:Boolean,
+        default: true
+      },
     },
+
     data(){
       return {
         uizIndex: 100,
@@ -83,6 +88,11 @@
         lineColor: '#fff'
       }
     },
+    watch:{
+      isNotExpand(value){
+        this.close = value;
+      }
+    },
 
     computed:{
       uiTop(){
@@ -92,6 +102,8 @@
 
     created() {
       this.lineColor = Color(this.color).alpha(0.2).toString();
+      this.close =  this.isNotExpand;
+
     },
 
     methods: {

package/src/components/JfbBaseOrderDetail/Attr.js

@@ -332,39 +332,95 @@ export default {
         notice: '间距设置，<span style="color: red">单位：像素</span>。默认值：<span style="color: red">20</span>像素',
       },
       {
-        label: "主体信息行间距:",
-        ele: 'el-input',
-        type: 'number',
-        valueKey: 'lineHeight',
+        ele: 'title',
+        label: '投影设置',
+        size: 'small',
         groupKey:'style',
-        value: data['lineHeight'] || 20,
-        placeholder: '请输入主体信息行间距',
-        className: 'input80',
       },
       {
-        label: '投影设置:',
-        ele: "xd-shadow",
-        valueKey: "sectionShadow",
-        value: data.sectionShadow || {},
+        label: '是否有投影:',
+        ele: 'xd-radio',
+        groupKey:'style',
+        valueKey: 'is_shadow',
+        value: data['is_shadow'] || 'N',
+        placeholder: '请选择是否投影',
+        multiple: false,
+        className: 'input80',
+        list: [
+          { label: '是', value: 'Y' },
+          { label: '否', value: 'N' },
+        ]
+      },
+      data['is_shadow'] === 'Y' && {
+        label: '投影颜色:',
+        ele: 'xd-color',
+        groupKey:'style',
+        valueKey: 'is_shadow_bg',
+        value: data['is_shadow_bg'] || '',
+        placeholder: '请选择投影颜色',
+        classNmae: 'input80',
+      },
+      data['is_shadow'] === 'Y' && {
+        label: '投影范围:',
+        ele: 'xd-site-select-list',
+        valueKey: 'is_shadow_w',
         groupKey:'style',
-        handleCustom({action, data}) {
-          XdBus.getParentApi('getOptionsSettingList')({setting_id: 'edtix_style_radius'})
+        value: data['is_shadow_w'] || '10',
+        placeholder: '请选择投影范围',
+        multiple: false,
+        className: 'input80',
+        handleCustom({ action, data }) {
+          XdBus.getParentApi('getOptionsSettingList')({
+            setting_id: 'edtix_style_radius',
+            key: Date.now()
+          })
             .then(res => {
               data.cb(res.list)
             })
             .catch(error => {
               console.error(error);
-              data.cb([])
             });
         },
       },
       {
-        label: "边框设置:",
-        ele: "xd-border",
-        valueKey: "sectionBorder",
-        value: data.sectionBorder || {},
+        ele: 'title',
+        label: '边框设置',
+        size: 'small',
         groupKey:'style',
       },
+      {
+        label: '是否有边框:',
+        ele: 'xd-radio',
+        valueKey: 'is_border',
+        value: data['is_border'] || 'N',
+        groupKey:'style',
+        placeholder: '请选择是否有边框',
+        multiple: false,
+        className: 'input80',
+        list: [
+          { label: '是', value: 'Y' },
+          { label: '否', value: 'N' },
+        ]
+      },
+      data['is_border'] === 'Y' && {
+        label: '边框颜色:',
+        ele: 'xd-color',
+        groupKey:'style',
+        valueKey: 'is_border_c',
+        value: data['is_border_c'] || '',
+        placeholder: '请选择边框颜色',
+        classNmae: 'input80',
+      },
+      data['is_border'] === 'Y' && {
+        label: '边框大小:',
+        groupKey:'style',
+        ele: 'el-input',
+        type: 'number',
+        valueKey: 'is_border_w',
+        value: data['is_border_w'] || '',
+        placeholder: '请输入边框颜色',
+        className: 'input80',
+      },
       {
         label: '内容圆角设置:',
         ele: 'xd-site-select-list',