jufubao-base 1.0.198-beta1 → 1.0.199

package/src/components/JfbBaseUserOrder/JfbBaseUserOrder.vue

@@ -13,25 +13,29 @@
       <view class="jfb-base-user-order__edit-icon" @click="delEdit">删除</view>
     </view>
     <!-- #endif -->
-    <view
-      v-if="list.length > 0"
-      class="jfb-base-user-order__body"
-      :style="{ padding: outMargin}"
-    >
-      <view :style="{borderRadius: bodyRadius + 'rpx', backgroundColor:bodyBackgroundColor, padding:outPadding}">
-        <view class="my-order__add">
-          <view :style="{color:cardNameColor}">我的订单</view>
-          <view @click="handleToLink(afterUrl)" :style="{borderColor:subColor || mainColor,color: subColor || mainColor}">售后订单</view>
+    <view class="jfb-base-user-order__body">
+      <view class="x-line"></view>
+      <view :style="[bodyStyleComp]" v-if="list.length > 0">
+        <view class="my-order__add" :style="[titleMarginComp]">
+          <view :style="[titleStyleComp]">{{myOrderName}}</view>
+          <view
+            v-if="isShowBtn === 'Y'"
+            @click="handleToLink(afterUrl)"
+            :style="[addBtnStyleComp]"
+            class="afterBuy"
+          >
+            <text>{{afterBuyName}}</text>
+            <view v-if="isShowICONBtn === 'Y'">
+              <xd-font-icon
+                icon="iconxiangyou_xian"
+                :color="addBtnStyleComp.color"
+                :size="20"
+              ></xd-font-icon>
+            </view>
+
+          </view>
         </view>
-        <view
-          class="my-order__content"
-          :style="{
-            borderRadius: radius + 'rpx',
-            background: backgroundColor,
-            marginTop: spacing + 'rpx',
-            border: borderBox,
-          }"
-        >
+        <view class="my-order__content" :style="[contStyleComp]">
           <view class="my-order__content-type">
             <view
               class="my-order__content-type-item"
@@ -40,14 +44,16 @@
               @click="handleToLink(orderListUrl, item.status)"
             >
               <view class="my-order__content-type-item-icon">
+                <image v-if="item.image" :src="item.image"></image>
                 <xd-font-icon
+                  v-else
                   :icon="item.icon"
                   :color="iconColor"
                   :size="item.size"
                 ></xd-font-icon>
                 <view
                   v-if="item.num"
-                  :style="{backgroundColor: iconColor}"
+                  :style="[popComp]"
                   class="my-order__content-type-item-number"
                 >{{item.num}}</view>
               </view>
@@ -67,6 +73,7 @@
   import componentsMixins from "@/mixins/componentsMixins";
   import extsMixins from "@/mixins/extsMixins"
   import { getContainerPropsValue } from "@/utils/xd.base";
+  import getServiceUrl from "@/common/getServiceUrl";
   export default {
     name: "JfbBaseUserOrder",
     components: {
@@ -74,23 +81,81 @@
     },
     mixins: [componentsMixins,extsMixins,JfbBaseUserOrderMixin],
     computed: {
-      outPadding() {
-        let str = `${this.checkValue(this.bodyPadding.top, 0)}rpx`;
-        str = `${str} ${this.checkValue(this.bodyPadding.right, 0)}rpx`;
-        str = `${str} ${this.checkValue(this.bodyPadding.bottom, 0)}rpx`;
-        str = `${str} ${this.checkValue(this.bodyPadding.left, 0)}rpx`;
-        return str
+      titleMarginComp(){
+        return {
+          padding: this.getMarginAndPadding(this.titleMargin, 0)
+        }
+      },
+      titleStyleComp(){
+        return {
+          fontSize: this.titleStyle.fontSize || '28rpx',
+          color: `${this.titleStyle.color || this.cardNameColor ||'#333'}`,
+          fontWeight: `${this.titleStyle.fontWeight || 'normal'}`,
+        }
       },
-      outMargin() {
-        let str = `${this.checkValue(this.bodyMargin.top, 20)}rpx`;
-        str = `${str} ${this.checkValue(this.bodyMargin.right, 20)}rpx`;
-        str = `${str} ${this.checkValue(this.bodyMargin.bottom, 20)}rpx`;
-        str = `${str} ${this.checkValue(this.bodyMargin.left, 20)}rpx`;
-        return str
+      bodyStyleComp(){
+        return {
+          margin: this.getMarginAndPadding(this.bodyMargin, 20),
+          padding: this.getMarginAndPadding(this.bodyPadding, 0),
+          borderRadius: this.bodyRadius + 'rpx',
+          backgroundColor: this.bodyBackgroundColor,
+        }
+      },
+      addBtnStyleComp(){
+        let border = {};
+        if(this.addBtnBorder && this.addBtnBorder.type === 'Y') {
+          let value = this.addBtnBorder.value ||{};
+          if(value.width) border['borderWidth'] = value.width + 'rpx';
+          if(value.color) border['borderColor'] = value.color;
+          if(value.style) border['borderStyle'] = value.style;
+        }
+        if(this.addBtnBorder && this.addBtnBorder.type === 'N') {
+          border['borderWidth'] = 0;
+          border['borderColor'] = '';
+          border['borderStyle'] = ''
+        }
+        let addBtnShadow = {};
+        if(this.addBtnShadow && this.addBtnShadow.type === 'Y') {
+          let value = this.addBtnShadow.value || {};
+          if(value.color && value.width) {
+            addBtnShadow['boxShadow'] = `0 0 ${value.width}rpx ${value.color}`
+          }
+        }
+        return {
+          color: this.addBtnStyle.color || this.mainColor,
+          fontSize: this.addBtnStyle.fontSize || '26rpx',
+          fontWeight: this.addBtnStyle.fontWeight || 'normal',
+          borderColor: this.mainColor,
+          borderWidth: '2rpx',
+          borderStyle:'solid',
+          backgroundColor: this.addBtnBgColor || 'rgba(0,0,0,0)',
+          borderRadius:this.addBtnRadius + 'rpx',
+          ...border,
+          ...addBtnShadow
+        }
       },
-      borderBox() {
-        if (this.is_border === 'Y') return `${this.is_border_w}rpx solid ${this.is_border_c}`;
-        else return '0';
+      popComp(){
+        return {
+          backgroundColor: this.popBgColor,
+          color: this.popColor || '#f00',
+        }
+      },
+      contStyleComp(){
+        let border = this.getBorderCompatibleOldStyle(this.contBorder, {
+          color: this.is_border_c,
+          width: this.is_border_w,
+          type: this.is_border,
+          style: 'solid'
+        })
+
+        return {
+          borderRadius: this.radius + 'rpx',
+          backgroundColor: this.backgroundColor,
+          marginTop: this.spacing + 'rpx',
+          border: border,
+          boxShadow: this.contShadow,
+          padding: this.getMarginAndPadding(this.contPadding,{top:40, bottom: 34, left: 20, right: 20})
+        }
       }
     },
     data() {
@@ -98,14 +163,43 @@
         options: {},
         list: [],
 
-        //基础
+        //整体
+        bodyPadding: {},
+        bodyRadius: 0,
+        bodyBackgroundColor: 'rgba(0,0,0,0)',
+        bodyMargin: { },
+        spacing:20,
+
+        //内容列表
         color: '#333',
-        backgroundColor: 'rgba(0,0,0,0)',
-        radius: 0,
         iconColor: '',
-        spacing:20,
 
-        //边框
+        //我的标题
+        myOrderName: '我的订单',
+        cardNameColor: '#333',
+        titleStyle: {},
+        titleMargin:{},
+
+        //售后订单
+        isShowBtn:'Y',
+        afterBuyName:'售后订单',
+        addBtnBgColor:'rgba(0,0,0,0)',
+        addBtnStyle:{},
+        addBtnBorder:{},
+        addBtnShadow:{},
+        addBtnRadius: '40',
+        isShowICONBtn:'N',
+
+        //数字气泡
+        popColor:'#fff',
+        popBgColor:'#f00',
+
+        //content
+        backgroundColor: 'rgba(0,0,0,0)',
+        radius: 0,
+        contPadding:{},
+        contShadow:{},
+        contBorder:{},
         is_border: 'Y',
         is_border_w: 0,
         is_border_c: '',
@@ -114,13 +208,6 @@
         afterUrl: null,
         orderListUrl: null,
 
-        //整体
-        bodyPadding: {top: 20, left: 20, right: 20, bottom: 20},
-        bodyRadius: 0,
-        bodyBackgroundColor: 'rgba(0,0,0,0)',
-        bodyMargin: {top: 0, left: 0, right: 0, bottom: 0},
-        cardNameColor: '#333',
-        subColor:'',
       }
     },
     watch: {
@@ -178,6 +265,25 @@
        * @param container {object} 业务组件对象自己
        */
       init(container) {
+        this.isShowBtn = getContainerPropsValue(container, 'content.isShowBtn', 'Y');
+        this.afterBuyName = getContainerPropsValue(container, 'content.afterBuyName', '售后订单');
+
+        //数字气泡
+        this.popColor = getContainerPropsValue(container, 'content.popColor', '#fff');
+        this.popBgColor = getContainerPropsValue(container, 'content.popBgColor', '#f00');
+
+
+        //标题
+        this.myOrderName = getContainerPropsValue(container, 'content.myOrderName', '我的订单')
+        this.titleStyle = getContainerPropsValue(container, 'content.titleStyle', {});
+        this.titleMargin = getContainerPropsValue(container,'content.titleMargin', {})
+
+        //添加按钮
+        this.addBtnBgColor = getContainerPropsValue(container, 'content.addBtnBgColor', 'rgba(0,0,0,0)');
+        this.addBtnStyle = getContainerPropsValue(container, 'content.addBtnStyle', {});
+        this.addBtnBorder = getContainerPropsValue(container, 'content.addBtnBorder', {});
+        this.addBtnRadius = getContainerPropsValue(container, 'content.addBtnRadius', '40');
+        this.addBtnShadow =  getContainerPropsValue(container, 'content.addBtnShadow', {});
 
         //整体
         this.bodyMargin = getContainerPropsValue(container, 'content.bodyMargin', {top: 0, left: 0, right: 0, bottom: 0});
@@ -192,26 +298,33 @@
         this.afterUrl = getContainerPropsValue(container, 'content.after_url', {value: ''}).value;
         this.orderListUrl = getContainerPropsValue(container, 'content.order_url', {value: ''}).value;
         this.margin = getContainerPropsValue(container, 'content.margin', {top: 0, left: 0, right: 0, bottom: 0});
+        this.isShowICONBtn = getContainerPropsValue(container, 'content.isShowICONBtn', 'N')
 
         //基础
         this.radius = getContainerPropsValue(container, 'content.radius', 0);
-        this.color = getContainerPropsValue(container, 'content.textColor', '#333');
-        this.iconColor = getContainerPropsValue(container, 'content.iconColor', this.mainColor);
         this.backgroundColor = getContainerPropsValue(container, 'content.backgroundColor', '#f8f8f8');
-
-        //边框
+        this.contPadding = getContainerPropsValue(container, 'content.contPadding', '{}')
+        this.contShadow = this.getXdShadow({width:20, color:'rgba(0,0,0,0)'},getContainerPropsValue(container, 'content.contShadow', {}))
+        this.contBorder = getContainerPropsValue(container, 'content.contBorder', {});
         this.is_border = getContainerPropsValue(container, 'content.is_border', 'N');
         this.is_border_c = getContainerPropsValue(container, 'content.is_border_c', '#f8f8f8');
         this.is_border_w = getContainerPropsValue(container, 'content.is_border_w', '2');
 
-
+        //内容列表
         this.list = getContainerPropsValue(container, 'content.orderTypeList', []).map(item=>{
+          let image = '';
+          if(this.$xdUniHelper.checkVarType(item.image) === 'object') {
+            image = getServiceUrl(item.image.url, 'size1');
+          }
           return {
             ...item,
+            image,
             size: Number(item.size ? item.size: 18) * 2,
             num: 0
           }
-        })
+        });
+        this.color = getContainerPropsValue(container, 'content.textColor', '#333');
+        this.iconColor = getContainerPropsValue(container, 'content.iconColor', this.mainColor);
       },
 
       onJfbShow(options) {
@@ -219,6 +332,7 @@
       },
 
       handleToLink(path, type) {
+        if (this.$configProject['isPreview']) return;
         this.$xdUniHelper.navigateTo({
           url: type ? `${path}?type=${type}` : path
         })
@@ -234,7 +348,15 @@
 
   .jfb-base-user-order {
     &__body{
+      & .afterBuy {
+        display: flex;
+        justify-content: center;
+        align-items: center;
 
+        & > view {
+          margin-left: 10rpx;
+        }
+      }
     }
   }
 
@@ -244,6 +366,7 @@
       justify-content: space-between;
       align-items: center;
       font-size: unit(28, rpx);
+      min-height: 62rpx;
 
       & > view:nth-child(2) {
         width: unit(200, rpx);
@@ -255,12 +378,12 @@
         text-align: center;
       }
     }
+
     &__content {
       &-type {
         display: flex;
         justify-content: space-around;
         align-items: center;
-        padding: unit(40, rpx) unit(20, rpx) unit(35, rpx);
 
         &-item {
           font-size: unit(24, rpx);
@@ -268,13 +391,18 @@
           flex: 1;
 
           &-icon {
-            height: unit(40, rpx);
-            width: unit(40, rpx);
+            height: unit(54, rpx);
+            width: unit(54, rpx);
             display: flex;
             justify-content: center;
             align-items: center;
             margin: 0 auto;
             position: relative;
+
+            & > image {
+              max-width: 100%;
+              max-height: 100%;
+            }
           }
 
           &-text {