jufubao-base 1.0.184-beta2 → 1.0.184

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jufubao-base",
-  "version": "1.0.184-beta2",
+  "version": "1.0.184",
   "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/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',

package/src/components/JfbBaseOrderDetail/JfbBaseOrderDetail.vue

@@ -129,9 +129,6 @@
                 v-for="(Ditem, Dindex) in info.film_show.detail.items"
                 :key="Dindex"
                 class="jfb-base-order-detail__body-delivery-bottom-item"
-                :style="{
-                  marginBottom: lineHeight + 'rpx'
-                }"
               >
                 <view style="width: 130rpx"
                   >{{ Ditem.label }} <span v-if="Ditem.label">:</span>
@@ -217,9 +214,6 @@
                 v-for="(Ditem, Dindex) in item.info"
                 :key="Dindex"
                 class="jfb-base-order-detail__body-delivery-bottom-item"
-                :style="{
-                  marginBottom: lineHeight + 'rpx'
-                }"
               >
                 <view style="width: 130rpx;display: flex;">
                   <view v-html="Ditem.label"></view>
@@ -516,9 +510,6 @@
             v-for="(item, index) in info.detail"
             :key="index"
             class="jfb-base-order-detail__body-order"
-            :style="{
-              marginBottom: lineHeight + 'rpx'
-            }"
           >
             <view :style="{ fontWeight: item.style }">
               <view style="display: flex;">
@@ -550,9 +541,6 @@
             <view
               v-if="item.type !== 'line'"
               class="jfb-base-order-detail__body-price"
-              :style="{
-                marginBottom: lineHeight + 'rpx'
-              }"
             >
               <view :style="{ fontWeight: item.style }">{{ item.label }}</view>
               <xd-unit
@@ -826,6 +814,15 @@ export default {
       backgroundColor: "",
       padding: 0,
 
+      //投影
+      is_shadow: "Y",
+      is_shadow_bg: 0,
+      is_shadow_w: 0,
+
+      //边框
+      is_border: "Y",
+      is_border_w: 0,
+      is_border_c: "",
 
       //其他
       margin: {
@@ -836,11 +833,8 @@ export default {
       },
       is_hot: "Y",
       logo: "",
-      lineHeight: 20,
 
       noticeBgc:'',
-      sectionShadow: "",
-      sectionBorder: "",
     };
   },
   watch: {
@@ -879,10 +873,14 @@ export default {
       return str
     },
     shadowBox() {
-      return this.sectionShadow;
+      if (this.is_shadow === "Y")
+        return `0 0 ${this.is_shadow_w}rpx ${this.is_shadow_bg}`;
+      else return "0 0 0 rgba(0,0,0,0)";
     },
     borderBox() {
-      return this.sectionBorder;
+      if (this.is_border === "Y")
+        return `${this.is_border_w}rpx solid ${this.is_border_c}`;
+      else return "0";
     },
   },
   created() {
@@ -1110,19 +1108,17 @@ export default {
       this.brandTextColor = getContainerPropsValue(container, "content.brandTextColor", this.mainColor);
       this.padding = getContainerPropsValue(container, "content.padding", 20);
 
+      this.is_shadow = getContainerPropsValue(container, "content.is_shadow", "N");
+      this.is_shadow_bg = getContainerPropsValue(container, "content.is_shadow_bg", "#fff");
+      this.is_shadow_w = getContainerPropsValue(container, "content.is_shadow_w", "10");
+
+      this.is_border = getContainerPropsValue(container, "content.is_border", "N");
       this.is_hot = getContainerPropsValue(container, "content.is_hot", "Y");
+      this.is_border_c = getContainerPropsValue(container, "content.is_border_c", "#fff");
+      this.is_border_w = getContainerPropsValue(container, "content.is_border_w", 2);
       this.viewStatus = getContainerPropsValue(container, "content.viewStatus", "mall");
       this.is_show_support_shop = getContainerPropsValue(container, "content.is_show_support_shop", "N");
       this.is_show_delete_order = getContainerPropsValue(container, "content.is_show_delete_order", "N");
-      this.lineHeight = getContainerPropsValue(container, "content.lineHeight", 20);
-      let sectionShadow = getContainerPropsValue(container, "content.sectionShadow", "");
-      if(sectionShadow.type === 'Y' && sectionShadow.value){
-        this.sectionShadow = `0 0 ${sectionShadow.value.width}rpx ${sectionShadow.value.color}`;
-      }else this.sectionShadow = '';
-      let sectionBorder = getContainerPropsValue(container, "content.sectionBorder", "");
-      if(sectionBorder.type === 'Y' && sectionBorder.value){
-        this.sectionBorder = `${sectionBorder.value.width}rpx solid ${sectionBorder.value.color}`;
-      }else this.sectionBorder = '';
     },
     getCountDown() {
       this.timer = setInterval(() => {

package/src/components/JfbBaseOrderList/Attr.js

@@ -4,17 +4,6 @@ export default {
   style: [],
   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-order-setting',
@@ -41,18 +30,6 @@ export default {
           {required: true, message: '设置订单配置错误！请检查配置', trigger: 'change'},
         ],
       },
-      {
-        label: "是否展示订单号:",
-        ele: 'xd-radio',
-        valueKey: 'isShowOrderNo',
-        value: data['isShowOrderNo'] || 'Y',
-        groupKey:'style',
-        list: [
-          {label: '是', value: 'Y'},
-          {label: '否', value: 'N'},
-        ],
-        hidden: data.layout_style !== 'tfk'
-      },
       {
         label: '外填充:',
         ele: 'xd-margin-padding',