jufubao-base 1.0.134 → 1.0.136

package/src/components/JfbBaseOrderDetail/JfbBaseOrderDetail.vue

@@ -221,6 +221,7 @@
                 class="jfb-base-order-detail__body-delivery-content-info-form"
                 v-for="(Fitem, Findex) in Sitem.product_form_data"
                 :key="Findex"
+                :style="{backgroundColor:noticeBgc,color: warningColor,borderRadius: radius + 'rpx',}"
               >
                 <view> {{ Fitem.label }}： </view>
                 <view> {{ Fitem.value }} </view>
@@ -791,6 +792,7 @@ import { getContainerPropsValue } from "@/utils/xd.base";
 import getServiceUrl from "@/common/getServiceUrl";
 import { mapState } from "vuex";
 import bizMock from "./bizMock";
+import Color from "color";
 
 export default {
   name: "JfbBaseOrderDetail",
@@ -849,7 +851,9 @@ export default {
         bottom: 0,
       },
       is_hot: "Y",
-      logo: ""
+      logo: "",
+
+      noticeBgc:'',
     };
   },
   watch: {
@@ -875,9 +879,11 @@ export default {
     },
     ...mapState(["brandInfo"]),
     outMargin() {
-      return `${this.margin.top || 20}rpx ${this.margin.right || 20}rpx ${
-        this.margin.bottom || 20
-      }rpx ${this.margin.left || 20}rpx`;
+      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
     },
     shadowBox() {
       if (this.is_shadow === "Y")
@@ -891,7 +897,7 @@ export default {
     },
   },
   created() {
-    console.log(this.brandInfo, "settings");
+    this.noticeBgc = Color(this.warningColor).alpha(0.2).toString();
     this.isPreview = this.$configProject.isPreview;
     if (this.isPreview) {
       this.showPayCard = true;
@@ -1457,6 +1463,7 @@ export default {
           &-sku {
             color: #999999;
             font-size: unit(28, rpx);
+            .uni-max-cut(2, 80);
           }
 
           &-price {
@@ -1468,9 +1475,9 @@ export default {
           &-form {
             display: flex;
             align-items: center;
-            color: #666666;
             font-size: unit(24, rpx);
             margin-bottom: unit(32, rpx);
+            padding: 10rpx 32rpx;
           }
         }
       }
@@ -1729,7 +1736,7 @@ export default {
         font-size: @xd-font-size-lg;
       }
     }
-    
+
   }
   .dialog_password{
     text-align: center;

package/src/components/JfbBaseOrderDetail/JfbBaseOrderDetailLess.less

@@ -13,9 +13,7 @@
 
 //start
 .jfb-base-order-detail {
-  border: 1px dashed rgba(0, 0, 0, 0);
   box-sizing: border-box;
-  min-height: unit(50, rpx);
 
   &__body{
       position: relative;
@@ -23,21 +21,22 @@
       z-index: 2
   }
 
-  &.editx {
+  &.editx,&.editx:hover {
     position: relative;
-    border: 1px dashed blue;
-    box-sizing: border-box;
-    z-index: 3
-
-  }
-
-  &:hover {
-    border: 1px dashed blue;
-  }
+    min-height: unit(100, rpx);
+    z-index: 3;
+    &::after {
+      border: 2rpx dashed blue;
+      content: " ";
+      position: absolute;
+      top:0;
+      left:0;
+      bottom:0;
+      right:0;
+      z-index: 4;
+      cursor: pointer;
+    }
 
-  &.noBorder {
-    border-color: rgba(0,0,0,0);
-    border-width: 0;
   }
 
 
@@ -72,9 +71,9 @@
 
 /**notPreview**/
 .jfb-base-order-detail {
-  &:before {
-    content: " ";
-    display: table;
-  }
+  //&:before {
+    //content: " ";
+    //display: table;
+  //}
 }
 /**endNotPreview**/

package/src/components/JfbBaseOrderList/Attr.js

@@ -5,22 +5,49 @@ export default {
   content: (data)=>{
     return [
       {
-        label: '外边距:',
+        label: '设置订单状态:',
+        ele: 'xd-order-setting',
+        valueKey: 'orderTypeList',
+        value: data['orderTypeList'] || null,
+        groupKey:'content',
+        setting: {
+          router: XdBus.getParentApi('getPagesTree'),
+        },
+        handleCustom({action, data}) {
+          if (action === 'number') {
+            data.cb([
+              {"label": "全部", "value": 'all'},
+              {"label": "待付款", "value": 'unpaid'},
+              {"label": "待收货", "value": 'unreceived'},
+              {"label": "已取消", "value": 'cancel'},
+              {"label": "已完成", "value": 'com'},
+            ])
+          }
+        },
+        inline: false,
+        notice: '设置订单状态, ICON图标（<a href="https://www.iconfont.cn/manage/index?spm=a313x.7781069.1998910419.db775f1f3&manage_type=myprojects&projectId=3378319&keyword=&project_type=&page=" style="color: blue" target="_blank">ICONFONT库</a>）、ICON大小（单位：<sapn style="color: red">像素</sapn>）同一个订单状态不可<sapn style="color: red">重复配置</sapn>',
+        rules: [
+          {required: true, message: '设置订单配置错误！请检查配置', trigger: 'change'},
+        ],
+      },
+      {
+        label: '外填充:',
         ele: 'xd-margin-padding',
         valueKey: 'margin',
         value: data['margin'] || null,
-        disabled: false,
+        groupKey:'style',
         setting: {
-          type: 'margin',
+          type: 'padding',
         },
-        placeholder: '请设置外边距',
+        placeholder: '请设置外填充',
         inline: false,
-        notice: '设置外边距，<span style="color: red">单位：像素</span>。默认值：0像素',
+        notice: '设置外填充，<span style="color: red">单位：像素</span>。默认值：<span style="color: red">20</span>像素',
       },
       {
         label: '背景颜色:',
         ele: 'xd-color',
         valueKey: 'backgroundColor',
+        groupKey:'style',
         value: data['backgroundColor'] || null,
         placeholder: '请选择背景颜色',
         classNmae: 'input80',
@@ -30,19 +57,24 @@ export default {
         ele: 'el-input',
         type: 'number',
         valueKey: 'padding',
+        groupKey:'style',
         value: data.padding || '',
         placeholder: '请输入间距',
         className: 'input80',
+        inline: false,
+        notice: '间距设置，<span style="color: red">单位：像素</span>。默认值：<span style="color: red">20</span>像素',
       },
       {
         ele: 'title',
         label: '投影设置',
-        size: 'small', //default/mini/small
+        size: 'small',
+        groupKey:'style',
       },
       {
         label: '是否有投影:',
         ele: 'xd-radio',
         valueKey: 'is_shadow',
+        groupKey:'style',
         value: data['is_shadow'] || 'N',
         placeholder: '请选择是否投影',
         multiple: false,
@@ -55,6 +87,7 @@ export default {
       data['is_shadow'] === 'Y' && {
         label: '投影颜色:',
         ele: 'xd-color',
+        groupKey:'style',
         valueKey: 'is_shadow_bg',
         value: data['is_shadow_bg'] || '',
         placeholder: '请选择投影颜色',
@@ -62,6 +95,7 @@ export default {
       },
       data['is_shadow'] === 'Y' && {
         label: '投影范围:',
+        groupKey:'style',
         ele: 'xd-site-select-list',
         valueKey: 'is_shadow_w',
         value: data['is_shadow_w'] || '10',
@@ -84,10 +118,12 @@ export default {
       {
         ele: 'title',
         label: '边框设置',
-        size: 'small', //default/mini/small
+        size: 'small',
+        groupKey:'style',
       },
       {
         label: '是否有边框:',
+        groupKey:'style',
         ele: 'xd-radio',
         valueKey: 'is_border',
         value: data['is_border'] || 'N',
@@ -102,6 +138,7 @@ export default {
       data['is_border'] === 'Y' && {
         label: '边框颜色:',
         ele: 'xd-color',
+        groupKey:'style',
         valueKey: 'is_border_c',
         value: data['is_border_c'] || '',
         placeholder: '请选择边框颜色',
@@ -111,15 +148,17 @@ export default {
         label: '边框大小:',
         ele: 'el-input',
         type: 'number',
+        groupKey:'style',
         valueKey: 'is_border_w',
         value: data['is_border_w'] || '',
-        placeholder: '请输入边框颜色',
+        placeholder: '请输入边框大小',
         className: 'input80',
       },
       {
         label: '内容圆角设置:',
         ele: 'xd-site-select-list',
         valueKey: 'radius',
+        groupKey:'style',
         value: data['radius'] || '',
         placeholder: '请选择内容圆角设置',
         multiple: false,
@@ -134,40 +173,12 @@ export default {
             });
         },
       },
+
       {
-        ele: 'title',
-        label: '其他',
-        size: 'small', //default/mini/small
-      },
-      {
-        label: '设置订单状态:', //label
-        ele: 'xd-order-setting', //package 名称
-        valueKey: 'orderTypeList', //form[valueKey]
-        value: data['orderTypeList'] || null,
-        setting: {
-          router: XdBus.getParentApi('getPagesTree'),
-        },
-        handleCustom({action, data}) {
-          if (action === 'number') {
-            data.cb([
-              {"label": "全部", "value": 'all'},
-              {"label": "待付款", "value": 'unpaid'},
-              {"label": "待收货", "value": 'unreceived'},
-              {"label": "已取消", "value": 'cancel'},
-              {"label": "已完成", "value": 'com'},
-            ])
-          }
-        },
-        inline: false,
-        notice: '设置订单状态, ICON图标（<a href="https://www.iconfont.cn/manage/index?spm=a313x.7781069.1998910419.db775f1f3&manage_type=myprojects&projectId=3378319&keyword=&project_type=&page=" style="color: blue" target="_blank">ICONFONT库</a>）、ICON大小（单位：<sapn style="color: red">像素</sapn>）同一个订单状态不可<sapn style="color: red">重复配置</sapn>',
-        rules: [
-          {required: true, message: '设置订单配置错误！请检查配置', trigger: 'change'},
-        ],
-      },
-      {
-        label: '订单详情路径:', //label
-        ele: 'xd-select-pages-path', //package 名称
-        valueKey: 'detailPath', //form[valueKey]
+        label: '订单详情路径:',
+        ele: 'xd-select-pages-path',
+        valueKey: 'detailPath',
+        groupKey:'advanced',
         placeholder: '请选择订单详情路径',
         value: data['detailPath'] || null,
         setting: {
@@ -176,9 +187,10 @@ export default {
         inline: false,
       },
       {
-        label: '去支付路径:', //label
-        ele: 'xd-select-pages-path', //package 名称
-        valueKey: 'payPath', //form[valueKey]
+        label: '去支付路径:',
+        ele: 'xd-select-pages-path',
+        valueKey: 'payPath',
+        groupKey:'advanced',
         placeholder: '请选择去支付路径',
         value: data['payPath'] || null,
         setting: {

package/src/components/JfbBaseOrderList/JfbBaseOrderList.vue

@@ -19,7 +19,7 @@
     <view
       class="jfb-base-order-list__body"
     >
-      <view class="fixed_top" :style="{top: (layoutInfo.top-2)+'rpx'}">
+      <view class="fixed_top" :style="{top: (layoutInfo.top - 2)+'rpx'}">
         <xd-tab
           v-if="initStatus"
           :tabIndex="tabIndex"
@@ -158,6 +158,18 @@
                   :fontSize="28"
                 ></xd-unit>
               </view>
+              <view style="color:#999" v-if="item['main_user_server_amount'] !== undefined && item['main_user_server_amount'] >= 0">
+                <text>（平台服务费：</text>
+                <xd-unit
+                  :isOld="false"
+                  :price="item['main_user_server_amount']"
+                  :fontSize="24"
+                  :is-gray="true"
+                  color="#999"
+                  :icon-size=".25"
+                ></xd-unit>
+                <text>）</text>
+              </view>
             </view>
             <view
               class="jfb-base-order-list__body-order-item-pay"
@@ -199,6 +211,7 @@ import componentsMixins from "@/mixins/componentsMixins";
 import extsMixins from "@/mixins/extsMixins";
 import { getContainerPropsValue } from "@/utils/xd.base";
 import getServiceUrl from "@/common/getServiceUrl";
+import Color from "color";
 
 export default {
   name: "JfbBaseOrderList",
@@ -247,14 +260,18 @@ export default {
         right: 0,
         bottom: 0,
       },
+
+      noticeBgc:'',
     };
   },
 
   computed: {
     outMargin() {
-      return `${this.margin.top || 20}rpx ${this.margin.right || 20}rpx ${
-        this.margin.bottom || 20
-      }rpx ${this.margin.left || 20}rpx`;
+      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
     },
     shadowBox() {
       if (this.is_shadow === "Y")
@@ -273,6 +290,7 @@ export default {
     },
   },
   created() {
+    this.noticeBgc = Color(this.warningColor).alpha(0.2).toString();
     this.init(this.container);
   },
   methods: {
@@ -481,10 +499,16 @@ export default {
     },
 
     handleToLink(path, item) {
-      console.log("path", path);
-      this.$xdUniHelper.navigateTo({
-        url: `${path}?id=${item.main_order_id}`,
-      });
+      //跳转到第三方订单详情
+      if(item['third_order_detail_url']) {
+        this.$xdUniHelper.navigateTo({
+          url: item['third_order_detail_url'],
+        });
+      }else{
+        this.$xdUniHelper.navigateTo({
+          url: `${path}?id=${item.main_order_id}`,
+        });
+      }
     },
 
     onJfbReachBottom(options) {
@@ -661,6 +685,7 @@ export default {
           border-top: unit(2, rpx) solid #eee;
           padding: 0 unit(40, rpx);
           height: unit(90, rpx);
+          flex-flow: wrap;
 
           & > view:first-child {
             color: #999;
@@ -679,6 +704,16 @@ export default {
               .skeleton-item(300rpx, 28rpx);
             }
           }
+
+          & >view:nth-child(3){
+            text-align: right;
+            display: flex;
+            width: 100%;
+            flex-shrink: 0;
+            align-items: center;
+            justify-content: flex-end;
+            padding-bottom: 10rpx;
+          }
         }
 
         &-pay {

package/src/components/JfbBaseOrderList/JfbBaseOrderListLess.less

@@ -13,9 +13,7 @@
 
 //start
 .jfb-base-order-list {
-  border: 1px dashed rgba(0, 0, 0, 0);
   box-sizing: border-box;
-  min-height: unit(50, rpx);
 
   &__body{
       position: relative;
@@ -23,21 +21,22 @@
       z-index: 2
   }
 
-  &.editx {
+  &.editx,&.editx:hover {
     position: relative;
-    border: 1px dashed blue;
-    box-sizing: border-box;
-    z-index: 3
-
-  }
-
-  &:hover {
-    border: 1px dashed blue;
-  }
+    min-height: unit(100, rpx);
+    z-index: 3;
+    &::after {
+      border: 2rpx dashed blue;
+      content: " ";
+      position: absolute;
+      top:0;
+      left:0;
+      bottom:0;
+      right:0;
+      z-index: 4;
+      cursor: pointer;
+    }
 
-  &.noBorder {
-    border-color: rgba(0,0,0,0);
-    border-width: 0;
   }
 
 
@@ -72,9 +71,9 @@
 
 /**notPreview**/
 .jfb-base-order-list {
-  &:before {
-    content: " ";
-    display: table;
-  }
+  //&:before {
+    //content: " ";
+    //display: table;
+  //}
 }
 /**endNotPreview**/

package/src/components/JfbBasePay/Attr.js

@@ -1,7 +1,7 @@
 'use strict';
 
 import StyleForm from "@/utils/StyleForm";
-let styleForm = new StyleForm({bgColor: ''}, null, 'pay');
+let styleForm = new StyleForm({bgColor: ''}, null, 'pay', true);
 
 export default {
   style: [],
@@ -15,23 +15,12 @@ export default {
         valueKey: 'pay_success_path', //form[valueKey]
         placeholder: '请选择支付成功路径',
         value: data.pay_success_path || null,
+        groupKey:'advanced',
         setting: {
           router: XdBus.getParentApi('getPagesTree'),
         },
         inline: false,
       },
-      // {
-      //   label: '充值成功跳转路径:', //label
-      //   ele: 'xd-select-pages-path', //package 名称
-      //   valueKey: 'rechargeSuccessPath', //form[valueKey]
-      //   placeholder: '请选择充值成功路径',
-      //   value: data.rechargeSuccessPath || null,
-      //   setting: {
-      //     router: XdBus.getParentApi('getPagesTree'),
-      //
-      //   },
-      //   inline: false,
-      // },
     ].filter(i=>i)
   },
 }

package/src/components/JfbBasePay/JfbBasePay.vue

@@ -72,7 +72,7 @@
               <view>ID：{{ ticket.card_number }}</view>
               <view>有效期至：{{ ticket.end_time }}</view>
             </view>
-            <view class="_footer">
+            <view class="_footer" :style="{borderTop:'1px solid ' + borderColor }">
               <view class="_item">
                 <text>剩余：</text>
                 <xd-unit
@@ -180,8 +180,9 @@ import XdRadio from "@/components/XdRadio/XdRadio";
 import XdUnit from "@/components/XdUnit/XdUnit";
 import StyleForm from "@/utils/StyleForm";
 import {isWechat,isWechatTools} from "@/utils/xd.base";
-
-let styleForm = new StyleForm({bgColor: '#fafafa'}, getContainerPropsValue, 'pay');
+import color from "color";
+const Color = require('color');
+let styleForm = new StyleForm({bgColor: '#fafafa'}, getContainerPropsValue, 'pay', true);
 
 export default {
   name: "JfbBasePay",
@@ -219,6 +220,7 @@ export default {
       paySuccessPath: "", //支付成功
       rechargeSuccessPath: "", //充值成功
       ...styleForm.getDataItem(),
+      borderColor:'rgba(0,0,0,0)',
       options:{}
     };
   },
@@ -278,8 +280,8 @@ export default {
         "content.rechargeSuccessPath",
         { value: "" }
       ).value;
-
-      styleForm.getInitItem(this, container)
+      styleForm.getInitItem(this, container);
+      this.borderColor = color(this.jfbPayBgColor).lighten(0.5).hex();
     },
     getTimeFormat(time) {
       let date = null;
@@ -575,7 +577,6 @@ export default {
           justify-content: space-between;
           font-size: 24rpx;
           padding: 20rpx 30rpx;
-          border-top: unit(2, rpx) solid #eee;
           ._item {
             display: flex;
             align-items: center;

package/src/components/JfbBasePay/JfbBasePayLess.less

@@ -13,9 +13,7 @@
 
 //start
 .jfb-base-pay {
-  border: 1px dashed rgba(0, 0, 0, 0);
   box-sizing: border-box;
-  min-height: unit(50, rpx);
 
   &__body{
       position: relative;
@@ -23,21 +21,22 @@
       z-index: 2
   }
 
-  &.editx {
+  &.editx,&.editx:hover {
     position: relative;
-    border: 1px dashed blue;
-    box-sizing: border-box;
-    z-index: 3
-
-  }
-
-  &:hover {
-    border: 1px dashed blue;
-  }
+    min-height: unit(100, rpx);
+    z-index: 3;
+    &::after {
+      border: 2rpx dashed blue;
+      content: " ";
+      position: absolute;
+      top:0;
+      left:0;
+      bottom:0;
+      right:0;
+      z-index: 4;
+      cursor: pointer;
+    }
 
-  &.noBorder {
-    border-color: rgba(0,0,0,0);
-    border-width: 0;
   }
 
 
@@ -72,9 +71,9 @@
 
 /**notPreview**/
 .jfb-base-pay {
-  &:before {
-    content: " ";
-    display: table;
-  }
+  //&:before {
+    //content: " ";
+    //display: table;
+  //}
 }
 /**endNotPreview**/

package/src/components/JfbBasePay/Mock.js

@@ -34,5 +34,6 @@ module.exports = {
         "use_card_point": "5000"
       },
     ],
-  }
+  },
+  getBaseOrderStatus:{},
 }