npm - jufubao-base - Versions diffs - 1.0.134-beta11 → 1.0.134-beta12 - Mend

jufubao-base 1.0.134-beta11 → 1.0.134-beta12

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (83) hide show

package/src/components/JfbBaseLogin/JfbBaseLoginLess.less CHANGED Viewed

@@ -14,7 +14,6 @@
 //start
 .jfb-base-login {
   box-sizing: border-box;
-  min-height: unit(100, rpx);
   &__body{
       position: relative;
@@ -22,8 +21,9 @@
       z-index: 2
   }
-  &.editx,&:hover {
+  &.editx,&.editx:hover {
     position: relative;
+    min-height: unit(100, rpx);
     z-index: 3;
     &::after {
       border: 2rpx dashed blue;

package/src/components/JfbBaseLoginForgetPwd/JfbBaseLoginForgetPwdLess.less CHANGED Viewed

@@ -14,7 +14,6 @@
 //start
 .jfb-base-login-forget-pwd {
   box-sizing: border-box;
-  min-height: unit(100, rpx);
   &__body{
       position: relative;
@@ -22,8 +21,9 @@
       z-index: 2
   }
-  &.editx,&:hover {
+  &.editx,&.editx:hover {
     position: relative;
+    min-height: unit(100, rpx);
     z-index: 3;
     &::after {
       border: 2rpx dashed blue;

package/src/components/JfbBaseLoginSetPwd/JfbBaseLoginSetPwdLess.less CHANGED Viewed

@@ -14,7 +14,6 @@
 //start
 .jfb-base-login-set-pwd {
   box-sizing: border-box;
-  min-height: unit(100, rpx);
   &__body{
       position: relative;
@@ -22,8 +21,9 @@
       z-index: 2
   }
-  &.editx,&:hover {
+  &.editx,&.editx:hover {
     position: relative;
+    min-height: unit(100, rpx);
     z-index: 3;
     &::after {
       border: 2rpx dashed blue;

package/src/components/JfbBaseMapOverlay/JfbBaseMapOverlayLess.less CHANGED Viewed

@@ -14,7 +14,6 @@
 //start
 .jfb-base-map-overlay {
   box-sizing: border-box;
-  min-height: unit(100, rpx);
   &__body{
       position: relative;
@@ -22,8 +21,9 @@
       z-index: 2
   }
-  &.editx,&:hover {
+  &.editx,&.editx:hover {
     position: relative;
+    min-height: unit(100, rpx);
     z-index: 3;
     &::after {
       border: 2rpx dashed blue;

package/src/components/JfbBaseMapSearch/JfbBaseMapSearchLess.less CHANGED Viewed

@@ -14,7 +14,6 @@
 //start
 .jfb-base-map-search {
   box-sizing: border-box;
-  min-height: unit(100, rpx);
   &__body{
       position: relative;
@@ -22,8 +21,9 @@
       z-index: 2
   }
-  &.editx,&:hover {
+  &.editx,&.editx:hover {
     position: relative;
+    min-height: unit(100, rpx);
     z-index: 3;
     &::after {
       border: 2rpx dashed blue;

package/src/components/JfbBaseMergeUserCard/JfbBaseMergeUserCardLess.less CHANGED Viewed

@@ -14,7 +14,6 @@
 //start
 .jfb-base-merge-user-card {
   box-sizing: border-box;
-  min-height: unit(100, rpx);
   &__body{
       position: relative;
@@ -22,8 +21,9 @@
       z-index: 2
   }
-  &.editx,&:hover {
+  &.editx,&.editx:hover {
     position: relative;
+    min-height: unit(100, rpx);
     z-index: 3;
     &::after {
       border: 2rpx dashed blue;

package/src/components/JfbBaseMultipleExpress/JfbBaseMultipleExpressLess.less CHANGED Viewed

@@ -14,7 +14,6 @@
 //start
 .jfb-base-multiple-express {
   box-sizing: border-box;
-  min-height: unit(100, rpx);
   &__body{
       position: relative;
@@ -22,8 +21,9 @@
       z-index: 2
   }
-  &.editx,&:hover {
+  &.editx,&.editx:hover {
     position: relative;
+    min-height: unit(100, rpx);
     z-index: 3;
     &::after {
       border: 2rpx dashed blue;

package/src/components/JfbBaseMy/JfbBaseMyLess.less CHANGED Viewed

@@ -14,7 +14,6 @@
 //start
 .jfb-base-my {
   box-sizing: border-box;
-  min-height: unit(100, rpx);
   &__body{
       position: relative;
@@ -22,8 +21,9 @@
       z-index: 2
   }
-  &.editx,&:hover {
+  &.editx,&.editx:hover {
     position: relative;
+    min-height: unit(100, rpx);
     z-index: 3;
     &::after {
       border: 2rpx dashed blue;

package/src/components/JfbBaseMySetting/JfbBaseMySettingLess.less CHANGED Viewed

@@ -14,7 +14,6 @@
 //start
 .jfb-base-my-setting {
   box-sizing: border-box;
-  min-height: unit(100, rpx);
   &__body{
       position: relative;
@@ -22,8 +21,9 @@
       z-index: 2
   }
-  &.editx,&:hover {
+  &.editx,&.editx:hover {
     position: relative;
+    min-height: unit(100, rpx);
     z-index: 3;
     &::after {
       border: 2rpx dashed blue;

package/src/components/JfbBaseNotice/JfbBaseNotice.vue CHANGED Viewed

@@ -424,7 +424,6 @@
   @import "./JfbBaseNoticeLess.less";
   .jfb-base-notice {
-    min-height: 72rpx!important;
     &__body{
       .content-list {
         display: flex;

package/src/components/JfbBaseNotice/JfbBaseNoticeLess.less CHANGED Viewed

@@ -14,7 +14,6 @@
 //start
 .jfb-base-notice {
   box-sizing: border-box;
-  min-height: unit(100, rpx);
   &__body{
       position: relative;
@@ -22,8 +21,9 @@
       z-index: 2
   }
-  &.editx,&:hover {
+  &.editx,&.editx:hover {
     position: relative;
+    min-height: unit(100, rpx);
     z-index: 3;
     &::after {
       border: 2rpx dashed blue;

package/src/components/JfbBaseNoticeBottom/JfbBaseNoticeBottomLess.less CHANGED Viewed

@@ -14,7 +14,6 @@
 //start
 .jfb-base-notice-bottom {
   box-sizing: border-box;
-  min-height: unit(100, rpx);
   &__body{
       position: relative;
@@ -22,8 +21,9 @@
       z-index: 2
   }
-  &.editx,&:hover {
+  &.editx,&.editx:hover {
     position: relative;
+    min-height: unit(100, rpx);
     z-index: 3;
     &::after {
       border: 2rpx dashed blue;

package/src/components/JfbBaseNoticeTop/JfbBaseNoticeTopLess.less CHANGED Viewed

@@ -14,7 +14,6 @@
 //start
 .jfb-base-notice-top {
   box-sizing: border-box;
-  min-height: unit(100, rpx);
   &__body{
       position: relative;
@@ -22,8 +21,9 @@
       z-index: 2
   }
-  &.editx,&:hover {
+  &.editx,&.editx:hover {
     position: relative;
+    min-height: unit(100, rpx);
     z-index: 3;
     &::after {
       border: 2rpx dashed blue;

package/src/components/JfbBaseOrderDetail/JfbBaseOrderDetail.vue CHANGED Viewed

@@ -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: {
@@ -893,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;
@@ -1459,6 +1463,7 @@ export default {
           &-sku {
             color: #999999;
             font-size: unit(28, rpx);
+            .uni-max-cut(2, 80);
           }
           &-price {
@@ -1470,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;
           }
         }
       }
@@ -1731,7 +1736,7 @@ export default {
         font-size: @xd-font-size-lg;
       }
     }
   }
   .dialog_password{
     text-align: center;

package/src/components/JfbBaseOrderDetail/JfbBaseOrderDetailLess.less CHANGED Viewed

@@ -14,7 +14,6 @@
 //start
 .jfb-base-order-detail {
   box-sizing: border-box;
-  min-height: unit(100, rpx);
   &__body{
       position: relative;
@@ -22,8 +21,9 @@
       z-index: 2
   }
-  &.editx,&:hover {
+  &.editx,&.editx:hover {
     position: relative;
+    min-height: unit(100, rpx);
     z-index: 3;
     &::after {
       border: 2rpx dashed blue;

package/src/components/JfbBaseOrderList/JfbBaseOrderList.vue CHANGED Viewed

@@ -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,6 +260,8 @@ export default {
         right: 0,
         bottom: 0,
       },
+      noticeBgc:'',
     };
   },
@@ -275,6 +290,7 @@ export default {
     },
   },
   created() {
+    this.noticeBgc = Color(this.warningColor).alpha(0.2).toString();
     this.init(this.container);
   },
   methods: {
@@ -483,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) {
@@ -663,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;
@@ -681,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 CHANGED Viewed

@@ -14,7 +14,6 @@
 //start
 .jfb-base-order-list {
   box-sizing: border-box;
-  min-height: unit(100, rpx);
   &__body{
       position: relative;
@@ -22,8 +21,9 @@
       z-index: 2
   }
-  &.editx,&:hover {
+  &.editx,&.editx:hover {
     position: relative;
+    min-height: unit(100, rpx);
     z-index: 3;
     &::after {
       border: 2rpx dashed blue;

package/src/components/JfbBasePay/JfbBasePayLess.less CHANGED Viewed

@@ -14,7 +14,6 @@
 //start
 .jfb-base-pay {
   box-sizing: border-box;
-  min-height: unit(100, rpx);
   &__body{
       position: relative;
@@ -22,8 +21,9 @@
       z-index: 2
   }
-  &.editx,&:hover {
+  &.editx,&.editx:hover {
     position: relative;
+    min-height: unit(100, rpx);
     z-index: 3;
     &::after {
       border: 2rpx dashed blue;

package/src/components/JfbBasePhoneCollect/JfbBasePhoneCollectLess.less CHANGED Viewed

@@ -14,7 +14,6 @@
 //start
 .jfb-base-phone-collect {
   box-sizing: border-box;
-  min-height: unit(100, rpx);
   &__body{
       position: relative;
@@ -22,8 +21,9 @@
       z-index: 2
   }
-  &.editx,&:hover {
+  &.editx,&.editx:hover {
     position: relative;
+    min-height: unit(100, rpx);
     z-index: 3;
     &::after {
       border: 2rpx dashed blue;

package/src/components/JfbBasePhoneLogin/JfbBasePhoneLoginLess.less CHANGED Viewed

@@ -14,7 +14,6 @@
 //start
 .jfb-base-phone-login {
   box-sizing: border-box;
-  min-height: unit(100, rpx);
   &__body{
       position: relative;
@@ -22,8 +21,9 @@
       z-index: 2
   }
-  &.editx,&:hover {
+  &.editx,&.editx:hover {
     position: relative;
+    min-height: unit(100, rpx);
     z-index: 3;
     &::after {
       border: 2rpx dashed blue;

package/src/components/JfbBasePoster/JfbBasePosterLess.less CHANGED Viewed

@@ -14,7 +14,6 @@
 //start
 .jfb-base-poster {
   box-sizing: border-box;
-  min-height: unit(100, rpx);
   &__body{
       position: relative;
@@ -22,8 +21,9 @@
       z-index: 2
   }
-  &.editx,&:hover {
+  &.editx,&.editx:hover {
     position: relative;
+    min-height: unit(100, rpx);
     z-index: 3;
     &::after {
       border: 2rpx dashed blue;

package/src/components/JfbBasePosterBigSmall/JfbBasePosterBigSmallLess.less CHANGED Viewed

@@ -14,7 +14,6 @@
 //start
 .jfb-base-poster-big-small {
   box-sizing: border-box;
-  min-height: unit(100, rpx);
   &__body{
       position: relative;
@@ -22,8 +21,9 @@
       z-index: 2
   }
-  &.editx,&:hover {
+  &.editx,&.editx:hover {
     position: relative;
+    min-height: unit(100, rpx);
     z-index: 3;
     &::after {
       border: 2rpx dashed blue;

package/src/components/JfbBasePosterEntry/JfbBasePosterEntryLess.less CHANGED Viewed

@@ -14,7 +14,6 @@
 //start
 .jfb-base-poster-entry {
   box-sizing: border-box;
-  min-height: unit(100, rpx);
   &__body{
       position: relative;
@@ -22,8 +21,9 @@
       z-index: 2
   }
-  &.editx,&:hover {
+  &.editx,&.editx:hover {
     position: relative;
+    min-height: unit(100, rpx);
     z-index: 3;
     &::after {
       border: 2rpx dashed blue;

package/src/components/JfbBasePosterType/JfbBasePosterTypeLess.less CHANGED Viewed

@@ -14,7 +14,6 @@
 //start
 .jfb-base-poster-type {
   box-sizing: border-box;
-  min-height: unit(100, rpx);
   &__body{
       position: relative;
@@ -22,8 +21,9 @@
       z-index: 2
   }
-  &.editx,&:hover {
+  &.editx,&.editx:hover {
     position: relative;
+    min-height: unit(100, rpx);
     z-index: 3;
     &::after {
       border: 2rpx dashed blue;

package/src/components/JfbBaseRecharge/JfbBaseRechargeLess.less CHANGED Viewed

@@ -14,7 +14,6 @@
 //start
 .jfb-base-recharge {
   box-sizing: border-box;
-  min-height: unit(100, rpx);
   &__body{
       position: relative;
@@ -22,8 +21,9 @@
       z-index: 2
   }
-  &.editx,&:hover {
+  &.editx,&.editx:hover {
     position: relative;
+    min-height: unit(100, rpx);
     z-index: 3;
     &::after {
       border: 2rpx dashed blue;

package/src/components/JfbBaseRechargeOrder/JfbBaseRechargeOrderLess.less CHANGED Viewed

@@ -14,7 +14,6 @@
 //start
 .jfb-base-recharge-order {
   box-sizing: border-box;
-  min-height: unit(100, rpx);
   &__body{
       position: relative;
@@ -22,8 +21,9 @@
       z-index: 2
   }
-  &.editx,&:hover {
+  &.editx,&.editx:hover {
     position: relative;
+    min-height: unit(100, rpx);
     z-index: 3;
     &::after {
       border: 2rpx dashed blue;

package/src/components/JfbBaseRechargeOrderDetail/JfbBaseRechargeOrderDetailLess.less CHANGED Viewed

@@ -14,7 +14,6 @@
 //start
 .jfb-base-recharge-order-detail {
   box-sizing: border-box;
-  min-height: unit(100, rpx);
   &__body{
       position: relative;
@@ -22,8 +21,9 @@
       z-index: 2
   }
-  &.editx,&:hover {
+  &.editx,&.editx:hover {
     position: relative;
+    min-height: unit(100, rpx);
     z-index: 3;
     &::after {
       border: 2rpx dashed blue;

package/src/components/JfbBaseRechargeSuccess/JfbBaseRechargeSuccessLess.less CHANGED Viewed

@@ -14,7 +14,6 @@
 //start
 .jfb-base-recharge-success {
   box-sizing: border-box;
-  min-height: unit(100, rpx);
   &__body{
       position: relative;
@@ -22,8 +21,9 @@
       z-index: 2
   }
-  &.editx,&:hover {
+  &.editx,&.editx:hover {
     position: relative;
+    min-height: unit(100, rpx);
     z-index: 3;
     &::after {
       border: 2rpx dashed blue;

package/src/components/JfbBaseSearch/JfbBaseSearchLess.less CHANGED Viewed

@@ -14,7 +14,6 @@
 //start
 .jfb-base-search {
   box-sizing: border-box;
-  min-height: unit(100, rpx);
   &__body{
       position: relative;
@@ -22,8 +21,9 @@
       z-index: 2
   }
-  &.editx,&:hover {
+  &.editx,&.editx:hover {
     position: relative;
+    min-height: unit(100, rpx);
     z-index: 3;
     &::after {
       border: 2rpx dashed blue;