jufubao-base 1.0.243-beta201 → 1.0.243-beta202

package/src/components/JfbBaseOpenVipDetail/JfbBaseOpenVipDetailLess.less

@@ -0,0 +1,79 @@
+/**
+* @desc 获取绝对路径完整地址
+* @param @path
+**/
+//例如：https://image.jufubao.cn/20220501010108/image/bg/default_gonghui_bg.png
+@basePath: 'business/';
+@doMain: '//sandbox-img.jufubao.cn/';
+
+.getBusinessImageUrl(@path, @size: 'size8') {
+  @url: "@{doMain}@{basePath}@{path}?x-oss-process=style/@{size}";
+  background-image: url(@url);
+}
+
+//start
+.jfb-base-open-vip-detail {
+  box-sizing: border-box;
+
+  &__body{
+      position: relative;
+      overflow: hidden;
+      z-index: 2
+  }
+
+  &.editx,&.editx:hover {
+    position: relative;
+    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;
+    }
+
+  }
+
+
+  &__edit {
+    cursor: pointer;
+    position: absolute;
+    right: unit(0, rpx);
+    top: unit(-52, rpx);
+    height: unit(50, rpx);
+    line-height: unit(50, rpx);
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    background: rgba(0, 0, 0, .6);
+    border-radius: unit(10, rpx);
+    box-shadow: 0 0 10px rbga(0, 0, 0, 0.3);
+    color: #fff;
+    font-size: unit(22, rpx);
+
+    &-icon{
+      padding: 0 unit(20, rpx);
+    }
+
+    &.editx {
+      box-sizing: border-box;
+
+    }
+  }
+}
+//end
+
+
+/**notPreview**/
+.jfb-base-open-vip-detail {
+  //&:before {
+    //content: " ";
+    //display: table;
+  //}
+}
+/**endNotPreview**/

package/src/components/JfbBaseOpenVipDetail/JfbBaseOpenVipDetailMixin.js

@@ -0,0 +1,30 @@
+'use strict';
+
+
+//@AttrImport
+import Attr from "./Attr";
+//@EndAttrImport
+
+
+export default {
+  data() {
+    return {
+      //#ifdef H5
+      
+      //@AttrData
+      Attr:{}, //对外开发编辑属性
+      //@EndAttrData
+      
+      // #endif
+      cssRoot: 'jfb-base-open-vip-detail'
+    }
+  },
+  created() {
+    
+    //@AttrDataCreated
+    this.Attr = this.$xdUniHelper.customClone(Attr);
+    //@EndAttrDataCreated
+    
+
+  },
+}

package/src/components/JfbBaseOpenVipDetail/Mock.js

@@ -0,0 +1,15 @@
+"use strict";
+
+module.exports = {
+  getVipConfirm: {
+    vip_card_id: 1,
+    product_id: 60038515,
+    product_name: "年卡会员",
+    sale_price: 20000,
+    platform_discount_amount: 120,
+    user_pay_amount: 20000,
+    life_cycle_label: "1年",
+    request_id: "cc61b6e3a8e0931f"
+  },
+  createVipOrder: {}
+};

package/src/components/JfbBaseOrderDetail/JfbBaseOrderDetail.vue

@@ -120,27 +120,46 @@
                 </view>
               </view>
             </view>
-            <view
-              class="jfb-base-order-detail__body-delivery-bottom"
-              v-if="info.film_show.detail && info.film_show.detail !== null"
-            >
-              <view class="jfb-base-order-detail__body-delivery-bottom-title">{{info.film_show.detail.title }}</view>
-              <view
-                v-for="(Ditem, Dindex) in info.film_show.detail.items"
-                :key="Dindex"
-                class="jfb-base-order-detail__body-delivery-bottom-item"
-                :style="{
-                  marginBottom: lineHeight + 'rpx'
-                }"
-              >
-                <view style="width: 130rpx"
-                  >{{ Ditem.label }} <span v-if="Ditem.label">:</span>
+            <view v-if="info.film_show.part&&info.film_show.part.length>0" class="jfb-base-order-detail__body-no-delivery-supplement">
+              <view @click="handleViewSupplement(item)" class="jfb-base-order-detail__body-no-delivery-supplement-item" v-for="(item,index) in info.film_show.part" :key="index">
+                <view class="jfb-base-order-detail__body-no-delivery-supplement-item-info">
+                  <view v-if="item.tag_name" :style="{color: mainColor, borderColor: mainColor}" class="jfb-base-order-detail__body-no-delivery-supplement-item-info-tag">{{item.tag_name}}</view>
+                  <view class="jfb-base-order-detail__body-no-delivery-supplement-item-info-title">{{item.show_title}}</view>
                 </view>
-                <view>{{ Ditem.value }}</view>
+                <xd-font-icon size="24" color="#B1B1B1" icon="iconxiangyou_xian"></xd-font-icon>
               </view>
             </view>
           </view>
         </view>
+        <view
+        class="jfb-base-order-detail__body-card jfb-base-order-detail__body-delivery-info"
+        :style="{
+          background: backgroundColor,
+          border: borderBox,
+          borderRadius: radius + 'rpx',
+          boxShadow: shadowBox,
+          marginBottom: padding + 'rpx',
+        }"
+        v-if="info.film_show&&info.film_show.detail && info.film_show.detail !== null"
+      >
+        <view class="jfb-base-order-detail__body-delivery-info-title">
+          <view :style="{background:mainColor}" class="line"></view>
+          {{info.film_show.detail.title }}
+        </view>
+        <view
+          v-for="(Ditem, Dindex) in info.film_show.detail.items"
+          :key="Dindex"
+          class="jfb-base-order-detail__body-delivery-info-item"
+          :style="{
+            marginBottom: lineHeight + 'rpx'
+          }"
+        >
+          <view style="width: 130rpx"
+            >{{ Ditem.label }} <span v-if="Ditem.label">:</span>
+          </view>
+          <view>{{ Ditem.value }}</view>
+        </view>
+      </view>
         <view v-if="info.sub_orders && info.sub_orders.length > 0">
           <view
             :style="{
@@ -571,11 +590,15 @@
             >
               <view :style="{ fontWeight: item.style }">{{ item.label }}</view>
               <xd-unit
+                v-if="item.type === 'price'"
+                :colorNew="isPlusSite ? '#999':''"
+                :largeZero="false"
                 :fontSize="28"
                 :iconSize="0.28"
                 :fontWeight="item.style"
                 :price="item.value"
               ></xd-unit>
+              <view v-else style="font-size: 28rpx;" :style="{color: isPlusSite ? '#999':'', fontWeight: item.style}" v-html="item.value"></view>
             </view>
             <view
               v-if="item.type === 'line'"
@@ -758,6 +781,19 @@
                 </xd-button>
               </view>
             </view>
+            <view v-else-if="item.action === 'apply_refund'">
+              <xd-button
+                v-if="showApplyAfter === 'Y'"
+                size="small"
+                :type="item.type !== undefined ? item.type: 'primary'"
+                :radius="bottomBtnRadius + 'rpx'"
+                :style="{
+                  height: bottomBtnHeight + 'rpx',
+                  lineHeight: bottomBtnHeight + 'rpx',
+                }"
+                @click="handleAction(item)"
+              >{{ item.text }}</xd-button>
+            </view>
             <view v-else>
               <xd-button
                 size="small"
@@ -804,6 +840,20 @@
       <view v-if="dialogCode && dialogCode.tips" class="dialog_password"> {{ dialogCode.tips}}</view>
       <view v-if="dialogPassword" class="dialog_password">{{ dialogPassword }}</view>
     </xd-dailog>
+    <XdDownDrawer :isClose="false" height="auto" :show.sync="showSupplement">
+      <view class="supplement">
+        <view class="supplement-title">
+          <xd-font-icon @click="showSupplement=false" color="#666" size="30" icon="iconxiangzuo_xian"></xd-font-icon>
+          <view style="margin: 0 auto">{{supplementTitle}}</view>
+        </view>
+        <view style="color: #333333;margin-top: 58rpx;font-size: 28rpx;font-weight: 500">已购</view>
+        <view class="supplement-item" v-for="(item, index) in supplementList" :key="index">
+          <view>{{item.product_name}}</view>
+          <view>{{getAmount(item.sale_price)}}元 x {{item.product_num}}</view>
+        </view>
+        <xd-button type="primary" @click="showSupplement=false">关闭</xd-button>
+      </view>
+    </XdDownDrawer>
   </view>
 </template>
 
@@ -814,6 +864,7 @@ import XdTag from "@/components/XdTag/XdTag";
 import XdUnit from "@/components/XdUnit/XdUnit";
 import XdButton from "@/components/XdButton/XdButton";
 import XdDailog from "@/components/XdDailog/XdDailog";
+import XdDownDrawer from "@/components/XdDownDrawer/XdDownDrawer";
 import { jfbRootExec } from "@/utils/xd.event";
 import JfbBaseOrderDetailMixin from "./JfbBaseOrderDetailMixin";
 import componentsMixins from "@/mixins/componentsMixins";
@@ -834,6 +885,7 @@ export default {
     XdButton,
     XdDailog,
     XdJfbImage,
+    XdDownDrawer
   },
   mixins: [componentsMixins, extsMixins, JfbBaseOrderDetailMixin],
   data() {
@@ -905,6 +957,10 @@ export default {
       refundPath: "",
       refundFastPath: "",
       btnTextSize: 20,
+
+      showSupplement: false,
+      supplementList: [],
+      supplementTitle: "",
     };
   },
   watch: {
@@ -957,7 +1013,10 @@ export default {
         padding: padding,
         backgroundColor: this.bottomBgColor,
       }
-    }
+    },
+    isPlusSite(){
+      return this.projectAttr.headers['X-Site-Group']==="vip";
+    },
   },
   created() {
     this.noticeBgc = Color(this.warningColor).alpha(0.2).toString();
@@ -973,6 +1032,10 @@ export default {
       this.getOrderDetail();
     },
 
+    getAmount(price) {
+      return this.$xdUniHelper.divisionFloatNumber(price,100)
+    },
+
     timeDown() {
       if (this.info.status.loading_timeout != "-1") {
         this.times = this.info.status.loading_timeout;
@@ -999,6 +1062,7 @@ export default {
           custom_content_container_id: this.cid,
           is_show_jhd_code: Number(this.is_show),
           is_show_product: this.is_show_product === "Y" ? 1 : 0,
+          version: 'v2'
         },
       })
         .then((res) => {
@@ -1199,7 +1263,7 @@ export default {
      * @param container {object} 业务组件对象自己
      */
     init(container) {
-      this.showApplyAfter = getContainerPropsValue(container, "content.showApplyAfter", "");
+      this.showApplyAfter = getContainerPropsValue(container, "content.showApplyAfter", "N");
 
       this.bgColor = this.$colorChange(this.mainColor).alpha(0.1).toString();
       this.brandPath = getContainerPropsValue(container, "content.brandPath", {value: "",}).value;
@@ -1306,6 +1370,11 @@ export default {
       });
       // #endif
     },
+    handleViewSupplement(item){
+      this.showSupplement=true;
+      this.supplementList = item.items
+      this.supplementTitle = item.show_title
+    },
     handleToLink(id, info) {
       this.$xdUniHelper.navigateTo({
         url: `${this.brandPath}?id=${id}&region_limit_tpl_id=${info.support_shops.region_limit_tpl_id}&xnamespace=${info.biz_code}`,
@@ -1437,6 +1506,12 @@ export default {
 
 <style scoped lang="less">
 @import "./JfbBaseOrderDetailLess.less";
+.line {
+  border-radius: 2px;
+  width: 6rpx;
+  height: 24rpx;
+  margin-right: 20rpx;
+}
 
 .code-url {
   display: flex;
@@ -1575,6 +1650,32 @@ export default {
           }
         }
       }
+      &-supplement {
+        border-top: 1px dashed #CCCCCC;
+        margin-top: 32rpx;
+        &-item {
+          display: flex;
+          align-items: center;
+          justify-content: space-between;
+          margin-top: 32rpx;
+          margin-bottom: 32rpx;
+          &-info {
+            display: flex;
+            align-items: center;
+            &-tag {
+              border: 1px solid;
+              font-size: 20rpx;
+              padding: 8rpx 16rpx;
+              border-radius: 8rpx;
+              margin-right: 20rpx;
+            }
+            &-title {
+              color: #666666;
+              font-size: 24rpx;
+            }
+          }
+        }
+      }
     }
 
     &-delivery {
@@ -1598,6 +1699,28 @@ export default {
           border-radius: unit(8, rpx);
         }
 
+         &-bottom {
+        margin-top: unit(32, rpx);
+
+        &-title {
+          color: #333333;
+          font-size: unit(28, rpx);
+          font-weight: 500;
+          margin-bottom: unit(20, rpx);
+        }
+
+        &-item {
+          color: #666666;
+          font-size: unit(28, rpx);
+          display: flex;
+          margin-bottom: unit(16, rpx);
+
+          & > view:nth-child(2) {
+            width: 80%;
+          }
+        }
+      }
+
         &-info {
           flex: 1;
           display: flex;
@@ -1640,6 +1763,35 @@ export default {
         }
       }
 
+      &-info {
+        margin-top: unit(32, rpx);
+
+        &-title {
+          color: #333333;
+          font-size: unit(28, rpx);
+          margin-bottom: unit(20, rpx);
+          display: flex;
+          align-items: center;
+        }
+
+        &-item {
+          color: #333333;
+          font-size: unit(24, rpx);
+          display: flex;
+          margin-bottom: unit(16, rpx);
+          & > view:first-child{
+            color: #999;
+          }
+
+          & > view:nth-child(2) {
+            width: 80%;
+          }
+        }
+        &-item:last-child{
+          margin-bottom: 0 !important;
+        }
+      }
+
       &-bottom {
         margin-top: unit(32, rpx);
 
@@ -1661,8 +1813,10 @@ export default {
           }
         }
       }
+      
     }
 
+
     &-num {
       &-info {
         display: flex;
@@ -1785,7 +1939,7 @@ export default {
         color: #737373;
       }
     }
-
+ 
     &-order {
       display: flex;
       align-items: center;
@@ -1981,5 +2135,23 @@ export default {
     }
 
   }
+
+  .supplement {
+    padding: 48rpx;
+    &-title {
+      display: flex;
+      align-items: center;
+      color: #666666;
+      font-size: 28rpx;
+    }
+    &-item {
+      margin: 34rpx 0;
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      color: #666;
+      font-size: 28rpx;
+    }
+  }
 }
 </style>

package/src/components/JfbBaseOrderList/Api.js

@@ -35,4 +35,15 @@ module.exports = [
     isConsole: true,
     disabled: true,
   },
+  {
+    path: "/aftersale/v1/service-order/order-support-quick-refund",
+    title: "售后订单支持快速退款",
+    mapFnName: "getSupportQuickRefund",
+    isRule: false,
+    params: {
+      order_id: ['订单ID', 'String', true],
+    },
+    isConsole: true,
+    disabled: true,
+  }
 ];

package/src/components/JfbBaseOrderList/JfbBaseOrderList.vue

@@ -152,7 +152,7 @@
               </view>
               <view
                 class="jfb-base-order-list__body-order-item-pay"
-                v-if="item.buttons.length"
+                v-if="isShowFooter(item.buttons)"
               >
                 <view v-for="(btn,index) in item.buttons" :key="btn.key">
                   <template v-if="btn.action === 'apply_refund'">
@@ -421,7 +421,10 @@ export default {
         },
       });
     },
-
+    isShowFooter(buttons){
+      if(this.showApplyAfter === 'Y') return buttons.length > 0;
+      else return buttons.filter(item => item.action !== 'apply_refund').length > 0;
+    },
     handleBtnEvent(action, item) {
       if (action === "cancel_unpaid") {
         //取消订单
@@ -445,17 +448,31 @@ export default {
           url: `${this.payPath}?order_id=${item.pay_order_id}&main_order_id=${item.main_order_id}`,
         });
       } else if( action === 'apply_refund'){
-        //普通退款
-        if(item.is_support_quick_refund !== "Y"){
-          this.$xdUniHelper.navigateTo({
-            url: `${this.refundPath}?order_id=${item.main_order_id}`,
-          });
-        }else{
-          //极速退款
-          this.$xdUniHelper.navigateTo({
-            url: `${this.refundFastPath}?order_id=${item.main_order_id}`,
-          });
-        }
+
+        this.$xdShowLoading({});
+        jfbRootExec("getSupportQuickRefund", {
+          vm: this,
+          data: {
+            main_order_id: item.main_order_id
+          }
+        }).then(res => {
+          this.$xdHideLoading();
+          //普通退款
+          if(res.is_support_quick_refund !== "Y"){
+            this.$xdUniHelper.navigateTo({
+              url: `${this.refundPath}?order_id=${item.main_order_id}`,
+            });
+          }else{
+            //极速退款
+            this.$xdUniHelper.navigateTo({
+              url: `${this.refundFastPath}?order_id=${item.main_order_id}`,
+            });
+          }
+        }).catch(err => {
+          this.$xdHideLoading();
+        })
+
+        
       }
     },
 
@@ -469,6 +486,7 @@ export default {
           tab,
           page_size: this.page_size,
           page_token: this.page_token,
+          is_show_after_btn: this.showApplyAfter === 'Y' ? 1 : 0
         },
       })
         .then((res) => {

package/src/components/JfbBasePay/Attr.js

@@ -8,6 +8,58 @@ export default {
   advanced: [],
   content: data=>{
     return [
+      {
+        label: "仍需扣点文案:",
+        ele: "el-input",
+        valueKey: "text1",
+        value: data.text1 || "仍需扣点",
+        groupKey: "content",
+        inline: false,
+        className: "input80",
+      },
+      {
+        label: "（可使用多张票券点数）是否展示",
+        ele: 'xd-radio',
+        valueKey: "showText2",
+        value: data.showText2 || 'Y',
+        groupKey: "content",
+        inline: true,
+        list: [
+          { label: "展示", value: "Y" },
+          { label: "不展示", value: "N" },
+        ],
+      },
+      data.showText2 === 'Y' && {
+        label: "（可使用多张票券点数）文案:",
+        ele: "el-input",
+        valueKey: "text2",
+        value: data.text2 || '（可使用多张票券点数）',
+        placeholder: '（可使用多张票券点数）',
+        groupKey: "content",
+        inline: false,
+        className: "input80",
+      },
+      {
+        label: "选择以下补差方式文案:",
+        ele: "el-input",
+        valueKey: "text3",
+        value: data.text3 || '选择以下补差方式',
+        groupKey: "content",
+        inline: false,
+        className: "input80",
+      },
+      {
+        label: "是否展示继续补差",
+        ele: "xd-radio",
+        valueKey: "showContinuePay",
+        value: data.showContinuePay || 'Y',
+        groupKey: "content",
+        inline: true,
+        list: [
+          { label: "展示", value: "Y" },
+          { label: "不展示", value: "N" },
+        ],
+      },
       ...styleForm.getForm(data),
       {
         label: '支付成功跳转路径:', //label