jufubao-base 1.0.63-beta216 → 1.0.63-beta218

package/src/components/JfbBaseOrderDetail/JfbBaseOrderDetail.vue

@@ -235,7 +235,7 @@
                 :key="Dindex"
                 class="jfb-base-order-detail__body-delivery-bottom-item"
               >
-                <view :style="{width: '130rpx'}">
+                <view :style="{ width: '130rpx' }">
                   <text v-html="Ditem.label"></text>
                   <text v-if="Ditem.label">:</text>
                 </view>
@@ -255,7 +255,9 @@
             marginBottom: padding + 'rpx',
           }"
         >
-          <view class="jfb-base-order-detail__body-settle-title">{{info.settle_tag_info.layer_name }}</view>
+          <view class="jfb-base-order-detail__body-settle-title">{{
+            info.settle_tag_info.layer_name
+          }}</view>
           <view
             v-for="(item, index) in info.settle_tag_info.settle_tag_info_list"
             :key="index"
@@ -280,7 +282,9 @@
             "
             class="jfb-base-order-detail__body-card jfb-base-order-detail__body-cashier"
           >
-            <view class="jfb-base-order-detail__body-cashier-text">{{info.codes[0].show_type === "qrcode" ? "二维码" : "条形码" }}</view>
+            <view class="jfb-base-order-detail__body-cashier-text">{{
+              info.codes[0].show_type === "qrcode" ? "二维码" : "条形码"
+            }}</view>
             <image
               :style="{
                 height: info.codes[0].show_type === 'qrcode' ? '50vw' : '25vw',
@@ -412,7 +416,9 @@
                   </view>
                   <view
                     class="jfb-base-order-detail__body-num-info-copy"
-                    @click="handleShowCode(item)">查看二维码</view>
+                    @click="handleShowCode(item)"
+                    >查看二维码</view
+                  >
                   <view
                     v-if="item.code_end_time"
                     class="jfb-base-order-detail__body-cashier-code"
@@ -438,7 +444,8 @@
                   <view
                     class="jfb-base-order-detail__body-num-info-copy"
                     @click="handleShowCode(item)"
-                    >查看一维码</view>
+                    >查看一维码</view
+                  >
                   <view
                     v-if="item.code_end_time"
                     class="jfb-base-order-detail__body-cashier-code"
@@ -469,7 +476,8 @@
                   <view
                     class="jfb-base-order-detail__body-num-info-copy"
                     @click="copy(item.code)"
-                  >复制</view>
+                    >复制</view
+                  >
                 </view>
                 <view
                   v-if="item.code_end_time"
@@ -601,30 +609,30 @@
             </view>
           </view>
         </view>
-        <view v-if="info.contacts&&info.contacts.length>0">
+        <view v-if="info.contacts && info.contacts.length > 0">
           <view
-          :style="{
-            background: backgroundColor,
-            border: borderBox,
-            borderRadius: radius + 'rpx',
-            boxShadow: shadowBox,
-            marginBottom: padding + 'rpx',
-          }"
-          class="jfb-base-order-detail__body-card jfb-base-order-detail__body-link"
-          v-for="(item,index) in info.contacts"
-          :key="index"
-        >
-          <view class="jfb-base-order-detail__body-link-title">{{ item.title }}</view>
-          <view v-for="(Sitem, Sindex) in item.data" :key="Sindex">
-            <view
-              class="jfb-base-order-detail__body-link-item"
-            >
-              <view v-html="Sitem.label"></view>
-              <view v-html="Sitem.value"></view>
+            :style="{
+              background: backgroundColor,
+              border: borderBox,
+              borderRadius: radius + 'rpx',
+              boxShadow: shadowBox,
+              marginBottom: padding + 'rpx',
+            }"
+            class="jfb-base-order-detail__body-card jfb-base-order-detail__body-link"
+            v-for="(item, index) in info.contacts"
+            :key="index"
+          >
+            <view class="jfb-base-order-detail__body-link-title">{{
+              item.title
+            }}</view>
+            <view v-for="(Sitem, Sindex) in item.data" :key="Sindex">
+              <view class="jfb-base-order-detail__body-link-item">
+                <view v-html="Sitem.label"></view>
+                <view v-html="Sitem.value"></view>
+              </view>
             </view>
           </view>
         </view>
-        </view>
         <view
           :style="{
             background: backgroundColor,
@@ -642,11 +650,14 @@
             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
+                ><text v-html="item.label"></text
+                ><text v-if="item.label">：</text></view
+              >
               <view v-html="item.value"></view>
             </view>
             <view
-              :style="{'marginLeft': '30rpx'}"
+              :style="{ marginLeft: '30rpx' }"
               v-if="item.type === 'copy'"
               class="jfb-base-order-detail__body-order-copy"
               @click="copy(item.value)"
@@ -818,6 +829,7 @@ export default {
         right: 0,
         bottom: 0,
       },
+      is_hot: "Y",
     };
   },
   watch: {
@@ -832,6 +844,7 @@ export default {
     },
   },
   computed: {
+    ...mapState(['siteInfo']),
     prod_bottom() {
       return this.fixedStyle({ height: 0, zIndex: 111 });
     },
@@ -853,7 +866,6 @@ export default {
     },
   },
   created() {
-    console.log(this.brandInfo, "settings");
     this.isPreview = this.$configProject.isPreview;
     if (this.isPreview) {
       this.showPayCard = true;
@@ -894,7 +906,6 @@ export default {
         },
       })
         .then((res) => {
-          debugger
           this.biz_code = res.biz_code;
           if (this.isPreview) {
             switch (this.viewStatus) {
@@ -943,6 +954,14 @@ export default {
                 );
                 return Sitem;
               });
+              if (this.is_hot === "Y") {
+                item.info.push({
+                  label: "客服电话",
+                  style: "normal",
+                  type: "text",
+                  value: this.siteInfo.mapping.customer_phone,
+                });
+              }
               return item;
             });
           res.pay_info.cards =
@@ -1062,6 +1081,7 @@ export default {
         "content.is_border",
         "N"
       );
+      this.is_hot = getContainerPropsValue(container, "content.is_hot", "Y");
       this.is_border_c = getContainerPropsValue(
         container,
         "content.is_border_c",
@@ -1424,9 +1444,8 @@ export default {
         white-space: nowrap;
         overflow: hidden;
         text-overflow: ellipsis;
-        
-        
-        &>view {
+
+        & > view {
           white-space: pre-wrap;
           word-wrap: break-word;
           word-break: break-all;

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/JfbBaseOrderList.vue

@@ -323,7 +323,7 @@ export default {
         []
       ).map((item) => {
         return {
-          name: item.label,
+          name: item.customName || item.label,
           ...item,
           size: Number(item.size ? item.size : 18) * 2,
         };

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/Attr.js

@@ -17,22 +17,21 @@ export default {
         value: data.pay_success_path || null,
         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,
       },
+      // {
+      //   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

@@ -229,6 +229,13 @@ export default {
     prod_bottom() {
       return this.fixedStyle({ height: 0, zIndex: 111 });
     },
+    getSuccessUrl(){
+      let url = this.paySuccessPath;
+      if(this.type === 'recharge') {
+        url = this.rechargeSuccessPath || url;
+      }
+      return url
+    },
     ...styleForm.getComputedItem(),
   },
   created() {
@@ -247,7 +254,7 @@ export default {
       this.type = options.type;
       this.p_getPayOrderDetail();
       this.p_getListUserPayChannel();
-      
+
       //充值不进行检查订单状态
       if(this.type !== 'recharge') {
         this.p_getBaseOrderDetail();
@@ -381,8 +388,9 @@ export default {
               },
             })
               .then((res) => {
-                if (this.type === "recharge") this.$xdUniHelper.redirectTo({url: this.rechargeSuccessPath + `?order_id=${this.main_order_id}`,});
-                this.$xdUniHelper.redirectTo({url: this.paySuccessPath + `?order_id=${this.main_order_id}`});
+                this.$xdUniHelper.redirectTo({
+                  url: this.getSuccessUrl + `?order_id=${this.main_order_id}`
+                });
               })
               .catch(error=>{
                 this.$xdLog.setARMSCustomError('update_loading_fail', {options: this.options, error});
@@ -449,7 +457,7 @@ export default {
       if (flat) this.channel_provider_id = channel_provider_id;
       else this.channel_provider_id = "";
     },
-   
+
     onJfbBack(options) {
       this.$xdUniHelper.navigateBack();
     },
@@ -506,11 +514,11 @@ export default {
         border-radius: 10rpx;
         margin: 0 auto 30rpx auto;
         padding: 30rpx 0 10rpx;
-        
+
         &:last-child {
           margin-bottom: 0;
         }
-        
+
         ._header {
           display: flex;
           justify-content: space-between;
@@ -579,7 +587,7 @@ export default {
       align-items: center;
       height: unit(120, rpx);
       background: #ffffff;
-      
+
       &-mask {
         height: unit(120, rpx);
       }

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/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;

package/src/components/JfbBaseSearch/JfbBaseSearchLess.less

@@ -15,7 +15,7 @@
 .jfb-base-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/JfbBaseSetPwd/JfbBaseSetPwdLess.less

@@ -15,7 +15,7 @@
 .jfb-base-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/JfbBaseSuccess/JfbBaseSuccessLess.less

@@ -15,7 +15,7 @@
 .jfb-base-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;

package/src/components/JfbBaseTestApi/JfbBaseTestApiLess.less

@@ -15,7 +15,7 @@
 .jfb-base-test-api {
   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/JfbBaseTestBody/JfbBaseTestBodyLess.less

@@ -15,7 +15,7 @@
 .jfb-base-test-body {
   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/JfbBaseTestBottom/JfbBaseTestBottomLess.less

@@ -15,7 +15,7 @@
 .jfb-base-test-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/JfbBaseTestNotice/JfbBaseTestNoticeLess.less

@@ -15,7 +15,7 @@
 .jfb-base-test-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/JfbBaseTestTop/JfbBaseTestTopLess.less

@@ -15,7 +15,7 @@
 .jfb-base-test-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/JfbBaseUserCenter/JfbBaseUserCenterLess.less

@@ -15,7 +15,7 @@
 .jfb-base-user-center {
   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/JfbBaseUserInfo/JfbBaseUserInfoLess.less

@@ -15,7 +15,7 @@
 .jfb-base-user-info {
   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;