jufubao-base 1.0.63-beta6 → 1.0.64-beta200

package/src/components/JfbBaseCardV2/JfbBaseCardV2Less.less

@@ -15,7 +15,7 @@
 .jfb-base-card-v2 {
   border: 1px dashed rgba(0, 0, 0, 0);
   box-sizing: border-box;
-  min-height: unit(100, rpx);
+  min-height: unit(50, rpx);
 
   &__body{
       position: relative;

package/src/components/JfbBaseCardV3/JfbBaseCardV3Less.less

@@ -15,7 +15,7 @@
 .jfb-base-card-v3 {
   border: 1px dashed rgba(0, 0, 0, 0);
   box-sizing: border-box;
-  min-height: unit(100, rpx);
+  min-height: unit(50, rpx);
 
   &__body{
       position: relative;

package/src/components/JfbBaseCity/JfbBaseCityLess.less

@@ -15,7 +15,7 @@
 .jfb-base-city {
   border: 1px dashed rgba(0, 0, 0, 0);
   box-sizing: border-box;
-  min-height: unit(100, rpx);
+  min-height: unit(50, rpx);
 
   &__body{
       position: relative;

package/src/components/JfbBaseClear/JfbBaseClearLess.less

@@ -15,7 +15,7 @@
 .jfb-base-clear {
   border: 1px dashed rgba(0, 0, 0, 0);
   box-sizing: border-box;
-  min-height: unit(100, rpx);
+  min-height: unit(50, rpx);
 
   &__body{
       position: relative;

package/src/components/JfbBaseEntry/JfbBaseEntryLess.less

@@ -15,7 +15,7 @@
 .jfb-base-entry {
   border: 1px dashed rgba(0, 0, 0, 0);
   box-sizing: border-box;
-  min-height: unit(100, rpx);
+  min-height: unit(50, rpx);
 
   &__body{
       position: relative;

package/src/components/JfbBaseExpressDetail/JfbBaseExpressDetailLess.less

@@ -15,7 +15,7 @@
 .jfb-base-express-detail {
   border: 1px dashed rgba(0, 0, 0, 0);
   box-sizing: border-box;
-  min-height: unit(100, rpx);
+  min-height: unit(50, rpx);
 
   &__body{
       position: relative;

package/src/components/JfbBaseFastLink/JfbBaseFastLinkLess.less

@@ -15,7 +15,7 @@
 .jfb-base-fast-link {
   border: 1px dashed rgba(0, 0, 0, 0);
   box-sizing: border-box;
-  min-height: unit(100, rpx);
+  min-height: unit(50, rpx);
 
   &__body{
       position: relative;

package/src/components/JfbBaseFooter/JfbBaseFooterLess.less

@@ -15,7 +15,7 @@
 .jfb-base-footer {
   border: 1px dashed rgba(0, 0, 0, 0);
   box-sizing: border-box;
-  min-height: unit(100, rpx);
+  min-height: unit(50, rpx);
 
   &__body{
       position: relative;

package/src/components/JfbBaseHeader/JfbBaseHeaderLess.less

@@ -15,7 +15,7 @@
 .jfb-base-header {
   border: 1px dashed rgba(0, 0, 0, 0);
   box-sizing: border-box;
-  min-height: unit(100, rpx);
+  min-height: unit(50, rpx);
 
   &__body{
       position: relative;

package/src/components/JfbBaseLine/JfbBaseLineLess.less

@@ -15,7 +15,7 @@
 .jfb-base-line {
   border: 1px dashed rgba(0, 0, 0, 0);
   box-sizing: border-box;
-  min-height: unit(100, rpx);
+  min-height: unit(50, rpx);
 
   &__body{
       position: relative;

package/src/components/JfbBaseLogin/JfbBaseLoginLess.less

@@ -15,7 +15,7 @@
 .jfb-base-login {
   border: 1px dashed rgba(0, 0, 0, 0);
   box-sizing: border-box;
-  min-height: unit(100, rpx);
+  min-height: unit(50, rpx);
 
   &__body{
       position: relative;

package/src/components/JfbBaseLoginForgetPwd/JfbBaseLoginForgetPwdLess.less

@@ -15,7 +15,7 @@
 .jfb-base-login-forget-pwd {
   border: 1px dashed rgba(0, 0, 0, 0);
   box-sizing: border-box;
-  min-height: unit(100, rpx);
+  min-height: unit(50, rpx);
 
   &__body{
       position: relative;

package/src/components/JfbBaseLoginSetPwd/JfbBaseLoginSetPwdLess.less

@@ -15,7 +15,7 @@
 .jfb-base-login-set-pwd {
   border: 1px dashed rgba(0, 0, 0, 0);
   box-sizing: border-box;
-  min-height: unit(100, rpx);
+  min-height: unit(50, rpx);
 
   &__body{
       position: relative;

package/src/components/JfbBaseMapOverlay/JfbBaseMapOverlayLess.less

@@ -15,7 +15,7 @@
 .jfb-base-map-overlay {
   border: 1px dashed rgba(0, 0, 0, 0);
   box-sizing: border-box;
-  min-height: unit(100, rpx);
+  min-height: unit(50, rpx);
 
   &__body{
       position: relative;

package/src/components/JfbBaseMapSearch/JfbBaseMapSearchLess.less

@@ -15,7 +15,7 @@
 .jfb-base-map-search {
   border: 1px dashed rgba(0, 0, 0, 0);
   box-sizing: border-box;
-  min-height: unit(100, rpx);
+  min-height: unit(50, rpx);
 
   &__body{
       position: relative;

package/src/components/JfbBaseMergeUserCard/JfbBaseMergeUserCardLess.less

@@ -15,7 +15,7 @@
 .jfb-base-merge-user-card {
   border: 1px dashed rgba(0, 0, 0, 0);
   box-sizing: border-box;
-  min-height: unit(100, rpx);
+  min-height: unit(50, rpx);
 
   &__body{
       position: relative;

package/src/components/JfbBaseMultipleExpress/JfbBaseMultipleExpressLess.less

@@ -15,7 +15,7 @@
 .jfb-base-multiple-express {
   border: 1px dashed rgba(0, 0, 0, 0);
   box-sizing: border-box;
-  min-height: unit(100, rpx);
+  min-height: unit(50, rpx);
 
   &__body{
       position: relative;

package/src/components/JfbBaseMy/JfbBaseMyLess.less

@@ -15,7 +15,7 @@
 .jfb-base-my {
   border: 1px dashed rgba(0, 0, 0, 0);
   box-sizing: border-box;
-  min-height: unit(100, rpx);
+  min-height: unit(50, rpx);
 
   &__body{
       position: relative;

package/src/components/JfbBaseNotice/JfbBaseNotice.vue

@@ -20,11 +20,17 @@
       }"
     >
       <template v-if="style === '3' && isPreview">
-        <view class="jfb-base-notice__body-pop">弹窗模式方便编辑(占位)，在线上此模块不显</view>
+        <view
+          class="jfb-base-notice__body-pop"
+          :style="{backgroundColor:backgroundColor, color:warningColor}"
+        >弹窗模式方便编辑(占位)，在线上此模块不显</view>
       </template>
       <template v-if="style === '2'">
         <template v-if="!content && isPreview">
-          <view class="jfb-base-notice__body-pop" style="color:red">接口无数返回，请检查是否配置成功!</view>
+          <view
+            class="jfb-base-notice__body-pop"
+            :style="{backgroundColor:backgroundColor, color:warningColor}"
+          >接口无数返回，请检查是否配置成功!</view>
         </template>
         <view v-else class="jfb-base-notice__body-scroll">
           <xd-notice-bar
@@ -43,7 +49,10 @@
       </template>
       <template v-if="style === '1'">
         <template v-if="!content && isPreview">
-          <view class="jfb-base-notice__body-pop" style="color:red">接口无数返回，请检查是否配置成功!</view>
+          <view
+            class="jfb-base-notice__body-pop"
+            :style="{backgroundColor:backgroundColor, color:warningColor}"
+          >接口无数返回，请检查是否配置成功!</view>
         </template>
         <template v-else>
           <view
@@ -92,6 +101,7 @@
   import extsMixins from "@/mixins/extsMixins"
   import { getContainerPropsValue } from "@/utils/xd.base";
   import storage from "@/common/storage";
+  import Color from "color";
   const color = require('color');
   export default {
     name: "JfbBaseNotice",
@@ -108,14 +118,14 @@
         textAlign: 'left', //标题对其方式
         noData: false,
         style: '1', //显示内容（静态/弹窗/滚动）
-        
-        
+
+
         bgc: '', //背景颜色
         textColor: '', //文字颜色
         content : '', //内容
         contentKey: 'contentKey',
         borderTitleColor: '#fff',
-        
+
         margin: {
           top: 0,
           left: 0,
@@ -133,13 +143,15 @@
         titleFontSize: 26,
         time: 3, //小时
         isPreview: false,
-  
+
         //滚动
         speed: 30, //滚动速度
         speedKey: 'speedKey',
         num: 1, //滚动记录数量
         timer: false,
         contentList: [],
+
+        backgroundColor: '',
       }
     },
     watch: {
@@ -151,7 +163,7 @@
         setTimeout(() => {
           if (this.$configProject['isPreview']) this.onJfbLoad()
         }, 400)
-        
+
       },
       num(){
         if (this.timer) {
@@ -161,7 +173,7 @@
         setTimeout(() => {
           if (this.$configProject['isPreview']) this.onJfbLoad()
         }, 400)
-       
+
       },
       style() {
         if(this.$configProject['isPreview']) this.onJfbLoad()
@@ -174,7 +186,7 @@
         setTimeout(()=>{
           this.speedKey = Date.now()
         }, 400)
-       
+
       }
     },
     computed:{
@@ -194,14 +206,15 @@
       titleRadius() {
         return `${this.radius}rpx ${this.radius}rpx 0rpx 0rpx `
       },
-  
+
     },
     created() {
+      this.backgroundColor = Color(this.warningColor).alpha(0.2).toString();
       this.isPreview = this.$configProject['isPreview'];
       this.init(this.container);
     },
     methods: {
-      
+
       /**
        * @description 监听事件变化
        * @param container {object} 业务组件对象自己
@@ -222,14 +235,14 @@
         if (this.fontSize === 26) this.titleFontSize = 36;
         if (this.fontSize === 36) this.titleFontSize = 44;
         this.isTitle = getContainerPropsValue(container, 'content.isTitle', false);
-        
+
         if(this.style === '2') {
           this.num = getContainerPropsValue(container, 'content.num', 1);
           this.speed = Number(getContainerPropsValue(container, 'content.speed', 30));
         }
         else this.num = 1;
       },
-      
+
       handlePop(){
         console.log('this.time', this.time * 60 + '分钟');
         storage.set(this.containerId, 1, this.time);
@@ -242,7 +255,7 @@
           cancel: false,
         });
       },
-      
+
       getContent(){
         jfbRootExec('getListNewsContent', {
           vm: this,
@@ -261,16 +274,16 @@
                 this.handlePop()
               }
             }
-            
+
             else if(this.style === '2') {
               console.log('getContent',res.list)
               if(res.list.length > 0) {
                 this.contentList = res.list;
                 this.speedKey = Date.now()
               }
-              
+
             }
-      
+
             //静态显示
             else {
               if (res.list.length > 0) {
@@ -280,13 +293,13 @@
               }
               this.noData = res.list.length > 0;
             }
-      
+
           })
           .catch(error => {
             console.error(error)
           })
       },
-  
+
       onJfbLoad() {
         //弹窗模式
         if(this.style === '3') {
@@ -297,19 +310,19 @@
             if(!storage.get(this.containerId)) this.getContent()
           }
         }
-        
+
         else {
           this.getContent()
         }
-        
-    
+
+
       },
-  
+
       onJfbUpdate(data) {
         storage.remove(this.containerId);
         this.getContent()
       }
-      
+
     }
   }
 
@@ -326,7 +339,9 @@
         }
       }
       &-pop {
+        min-height: 60rpx;
         text-align: center;
+        line-height: 60rpx;
         color: #666;
         font-size: unit(24, rpx);
         padding:unit(20, rpx);
@@ -334,7 +349,7 @@
       &-title {
         border-bottom: 1px solid #fff;
       }
-  
+
       &-content {
         padding: unit(8, rpx) unit(10, rpx);
       }

package/src/components/JfbBaseNotice/JfbBaseNoticeLess.less

@@ -15,7 +15,7 @@
 .jfb-base-notice {
   border: 1px dashed rgba(0, 0, 0, 0);
   box-sizing: border-box;
-  min-height: unit(100, rpx);
+  min-height: unit(50, rpx);
 
   &__body{
       position: relative;

package/src/components/JfbBaseNoticeBottom/JfbBaseNoticeBottomLess.less

@@ -15,7 +15,7 @@
 .jfb-base-notice-bottom {
   border: 1px dashed rgba(0, 0, 0, 0);
   box-sizing: border-box;
-  min-height: unit(100, rpx);
+  min-height: unit(50, rpx);
 
   &__body{
       position: relative;

package/src/components/JfbBaseNoticeTop/JfbBaseNoticeTopLess.less

@@ -15,7 +15,7 @@
 .jfb-base-notice-top {
   border: 1px dashed rgba(0, 0, 0, 0);
   box-sizing: border-box;
-  min-height: unit(100, rpx);
+  min-height: unit(50, rpx);
 
   &__body{
       position: relative;

package/src/components/JfbBaseOrderDetail/JfbBaseOrderDetail.vue

@@ -533,6 +533,38 @@
             >地址： {{ info.shop.shop_address }}
           </view>
         </view>
+        <view
+          :style="{
+            background: backgroundColor,
+            border: borderBox,
+            borderRadius: radius + 'rpx',
+            boxShadow: shadowBox,
+            marginBottom: padding + 'rpx',
+          }"
+          v-if="info.detail"
+          class="jfb-base-order-detail__body-card"
+        >
+          <view
+            v-for="(item, index) in info.detail"
+            :key="index"
+            class="jfb-base-order-detail__body-order"
+          >
+            <view :style="{ fontWeight: item.style }">
+              <view
+              ><text v-html="item.label"></text
+              ><text v-if="item.label">：</text></view
+              >
+              <view v-html="item.value"></view>
+            </view>
+            <view
+              :style="{ marginLeft: '30rpx' }"
+              v-if="item.type === 'copy'"
+              class="jfb-base-order-detail__body-order-copy"
+              @click="copy(item.value)"
+            >复制</view
+            >
+          </view>
+        </view>
         <view
           v-if="info.pay_info && biz_code !== 'gift'"
           class="jfb-base-order-detail__body-card"
@@ -625,35 +657,6 @@
           </view>
         </view>
         </view>
-        <view
-          :style="{
-            background: backgroundColor,
-            border: borderBox,
-            borderRadius: radius + 'rpx',
-            boxShadow: shadowBox,
-            marginBottom: padding + 'rpx',
-          }"
-          v-if="info.detail"
-          class="jfb-base-order-detail__body-card"
-        >
-          <view
-            v-for="(item, index) in info.detail"
-            :key="index"
-            class="jfb-base-order-detail__body-order"
-          >
-            <view :style="{ fontWeight: item.style }">
-              <view><text v-html="item.label"></text><text v-if="item.label">：</text></view>
-              <view v-html="item.value"></view>
-            </view>
-            <view
-              :style="{'marginLeft': '30rpx'}"
-              v-if="item.type === 'copy'"
-              class="jfb-base-order-detail__body-order-copy"
-              @click="copy(item.value)"
-              >复制</view
-            >
-          </view>
-        </view>
         <view
           v-if="info.productDetail"
           class="jfb-base-order-detail__body-card jfb-base-order-detail__body-shop"
@@ -830,6 +833,11 @@ export default {
         this.getOrderDetail();
       }
     },
+    is_hot(n, o) {
+      if (this.isPreview) {
+        this.getOrderDetail();
+      }
+    },
   },
   computed: {
     prod_bottom() {
@@ -943,6 +951,14 @@ export default {
                 );
                 return Sitem;
               });
+              if (this.is_hot === "Y") {
+                item.info.push({
+                  label: "客服电话",
+                  style: "normal",
+                  type: "text",
+                  value: this.isPreview ? '010-66666' :this.siteInfo.mapping.customer_phone,
+                });
+              }
               return item;
             });
           res.pay_info.cards =

package/src/components/JfbBaseOrderDetail/JfbBaseOrderDetailLess.less

@@ -15,7 +15,7 @@
 .jfb-base-order-detail {
   border: 1px dashed rgba(0, 0, 0, 0);
   box-sizing: border-box;
-  min-height: unit(100, rpx);
+  min-height: unit(50, rpx);
 
   &__body{
       position: relative;

package/src/components/JfbBaseOrderList/JfbBaseOrderListLess.less

@@ -15,7 +15,7 @@
 .jfb-base-order-list {
   border: 1px dashed rgba(0, 0, 0, 0);
   box-sizing: border-box;
-  min-height: unit(100, rpx);
+  min-height: unit(50, rpx);
 
   &__body{
       position: relative;

package/src/components/JfbBasePay/JfbBasePayLess.less

@@ -15,7 +15,7 @@
 .jfb-base-pay {
   border: 1px dashed rgba(0, 0, 0, 0);
   box-sizing: border-box;
-  min-height: unit(100, rpx);
+  min-height: unit(50, rpx);
 
   &__body{
       position: relative;

package/src/components/JfbBasePhoneCollect/JfbBasePhoneCollectLess.less

@@ -15,7 +15,7 @@
 .jfb-base-phone-collect {
   border: 1px dashed rgba(0, 0, 0, 0);
   box-sizing: border-box;
-  min-height: unit(100, rpx);
+  min-height: unit(50, rpx);
 
   &__body{
       position: relative;

package/src/components/JfbBasePhoneLogin/JfbBasePhoneLoginLess.less

@@ -15,7 +15,7 @@
 .jfb-base-phone-login {
   border: 1px dashed rgba(0, 0, 0, 0);
   box-sizing: border-box;
-  min-height: unit(100, rpx);
+  min-height: unit(50, rpx);
 
   &__body{
       position: relative;

package/src/components/JfbBasePoster/JfbBasePosterLess.less

@@ -15,7 +15,7 @@
 .jfb-base-poster {
   border: 1px dashed rgba(0, 0, 0, 0);
   box-sizing: border-box;
-  min-height: unit(100, rpx);
+  min-height: unit(50, rpx);
 
   &__body{
       position: relative;

package/src/components/JfbBasePosterEntry/JfbBasePosterEntryLess.less

@@ -15,7 +15,7 @@
 .jfb-base-poster-entry {
   border: 1px dashed rgba(0, 0, 0, 0);
   box-sizing: border-box;
-  min-height: unit(100, rpx);
+  min-height: unit(50, rpx);
 
   &__body{
       position: relative;

package/src/components/JfbBasePosterType/Attr.js

@@ -285,7 +285,7 @@ export default {
         list: [
           {"label": "一行", "value": 1},
           {"label": "两行", "value": 2},
-          {"label": "两行", "value": 3},
+          {"label": "三行", "value": 3},
         ]
       },
       {

package/src/components/JfbBasePosterType/JfbBasePosterTypeLess.less

@@ -15,7 +15,7 @@
 .jfb-base-poster-type {
   border: 1px dashed rgba(0, 0, 0, 0);
   box-sizing: border-box;
-  min-height: unit(100, rpx);
+  min-height: unit(50, rpx);
 
   &__body{
       position: relative;

package/src/components/JfbBaseRecharge/JfbBaseRechargeLess.less

@@ -15,7 +15,7 @@
 .jfb-base-recharge {
   border: 1px dashed rgba(0, 0, 0, 0);
   box-sizing: border-box;
-  min-height: unit(100, rpx);
+  min-height: unit(50, rpx);
 
   &__body{
       position: relative;

package/src/components/JfbBaseRechargeOrder/JfbBaseRechargeOrderLess.less

@@ -15,7 +15,7 @@
 .jfb-base-recharge-order {
   border: 1px dashed rgba(0, 0, 0, 0);
   box-sizing: border-box;
-  min-height: unit(100, rpx);
+  min-height: unit(50, rpx);
 
   &__body{
       position: relative;

package/src/components/JfbBaseRechargeOrderDetail/JfbBaseRechargeOrderDetailLess.less

@@ -15,7 +15,7 @@
 .jfb-base-recharge-order-detail {
   border: 1px dashed rgba(0, 0, 0, 0);
   box-sizing: border-box;
-  min-height: unit(100, rpx);
+  min-height: unit(50, rpx);
 
   &__body{
       position: relative;

package/src/components/JfbBaseRechargeSuccess/JfbBaseRechargeSuccessLess.less

@@ -15,7 +15,7 @@
 .jfb-base-recharge-success {
   border: 1px dashed rgba(0, 0, 0, 0);
   box-sizing: border-box;
-  min-height: unit(100, rpx);
+  min-height: unit(50, rpx);
 
   &__body{
       position: relative;