jufubao-base 1.0.238-beta71 → 1.0.239-beta1

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,6 +590,9 @@
             >
               <view :style="{ fontWeight: item.style }">{{ item.label }}</view>
               <xd-unit
+                :isShowIcon="isShowIcon"
+                :colorNew="isPlusSite ? '#999':''"
+                :largeZero="false"
                 :fontSize="28"
                 :iconSize="0.28"
                 :fontWeight="item.style"
@@ -804,6 +826,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 +850,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 +871,7 @@ export default {
     XdButton,
     XdDailog,
     XdJfbImage,
+    XdDownDrawer
   },
   mixins: [componentsMixins, extsMixins, JfbBaseOrderDetailMixin],
   data() {
@@ -901,6 +939,10 @@ export default {
       showPreviewCode: true,
       is_show_product: "",
       btnTextSize: 20,
+
+      showSupplement: false,
+      supplementList: [],
+      supplementTitle: "",
     };
   },
   watch: {
@@ -953,7 +995,14 @@ export default {
         padding: padding,
         backgroundColor: this.bottomBgColor,
       }
-    }
+    },
+    isShowIcon() {
+      if(this.$configProject['isPreview']) return true;
+      return this.siteInfo.mapping.is_show_coin_icon==='Y'
+    },
+    isPlusSite(){
+      return this.projectAttr.headers['X-Site-Group']==="vip";
+    },
   },
   created() {
     this.noticeBgc = Color(this.warningColor).alpha(0.2).toString();
@@ -969,6 +1018,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;
@@ -1299,6 +1352,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}`,
@@ -1417,6 +1475,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;
@@ -1555,6 +1619,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 {
@@ -1578,6 +1668,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;
@@ -1620,6 +1732,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);
 
@@ -1641,8 +1782,10 @@ export default {
           }
         }
       }
+      
     }
 
+
     &-num {
       &-info {
         display: flex;
@@ -1765,7 +1908,7 @@ export default {
         color: #737373;
       }
     }
-
+ 
     &-order {
       display: flex;
       align-items: center;
@@ -1961,5 +2104,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/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

package/src/components/JfbBasePay/JfbBasePay.vue

@@ -24,6 +24,7 @@
             <view class="column_value text-gray">
               <xd-unit
                 :price="payInfo.total_amount"
+                :isShowIcon="isShowIcon"
                 :isOld="false"
                 :font-size="28"
                 :icon-size="0.28"
@@ -39,6 +40,7 @@
               <!-- <xd-button width="220rpx" radius="60rpx" type="primary" size="small" @click="xdDownDrawer=true">使用新票券</xd-button> -->
               <xd-unit
                 :price="payInfo.card_amount"
+                :isShowIcon="isShowIcon"
                 :isOld="false"
                 :font-size="28"
                 :icon-size="0.28"
@@ -100,10 +102,11 @@
       <view class="remain_pay" v-if="payInfo.channel_amount > 0">
         <view style="border-bottom: 2rpx solid #eee;" class="column-group">
           <view class="column-item" style="padding: 30rpx 60rpx">
-            <view class="column_label">仍需扣点<text class="label_sub">（可使用多张票券点数）</text></view>
+            <view class="column_label">{{text1}}<text v-if="showText2==='Y'" class="label_sub">{{ text2 }}</text></view>
             <view class="column_value text-primary">
               <xd-unit
                 :price="payInfo.channel_amount"
+                :isShowIcon="isShowIcon"
                 :isOld="false"
                 :font-size="28"
                 :icon-size="0.28"
@@ -112,8 +115,8 @@
           </view>
         </view>
         <view class="remain_header">
-          <view>选择以下补差方式</view>
-          <view class="flex align-center text-primary">
+          <view>{{ text3 }}</view>
+          <view v-if="showContinuePay==='Y'" class="flex align-center text-primary">
             <view class="margin-right">继续补差</view>
             <xd-unit
               :price="payInfo.channel_amount"
@@ -146,11 +149,14 @@
       <view class="bottom_btn-mask"></view>
       <view v-if="is_can_pay==='Y'" class="bottom_btn" :style="prod_bottom">
         <xd-button
-          width="360rpx"
+          width="480rpx"
           type="primary"
           radius="50rpx"
           @click="doThirdPay"
-        >确认</xd-button>
+        >
+          确认支付 
+          ￥{{ $xdUniHelper.divisionFloatNumber(payInfo.channel_amount, 100) }}
+        </xd-button>
       </view>
     </view>
   </view>
@@ -174,6 +180,7 @@ import {isWechat,isWechatTools} from "@/utils/xd.base";
 import color from "color";
 const Color = require('color');
 let styleForm = new StyleForm({bgColor: '#fafafa'}, getContainerPropsValue, 'pay', true);
+import { mapState } from "vuex";
 
 export default {
   name: "JfbBasePay",
@@ -212,7 +219,12 @@ export default {
       rechargeSuccessPath: "", //充值成功
       ...styleForm.getDataItem(),
       borderColor:'rgba(0,0,0,0)',
-      options:{}
+      options:{},
+      text1: "",
+      text2: "",
+      text3: "",
+      showText2: "Y",
+      showContinuePay: "",
     };
   },
   watch: {
@@ -222,6 +234,9 @@ export default {
     },
   },
   computed: {
+    ...mapState({
+      siteInfo: state => state.siteInfo,
+    }),
     prod_bottom() { 
       return this.fixedStyle({ height: 0, zIndex: 111 });
     },
@@ -232,6 +247,10 @@ export default {
       }
       return url
     },
+    isShowIcon() {
+      if(this.$configProject['isPreview']) return true;
+      return this.siteInfo.mapping.is_show_coin_icon==='Y'
+    },
     ...styleForm.getComputedItem(),
   },
   created() {
@@ -262,6 +281,11 @@ export default {
      * @param container {object} 业务组件对象自己
      */
     init(container) {
+      this.text1 = getContainerPropsValue(container, 'content.text1', "仍需扣点");
+      this.text2 = getContainerPropsValue(container, 'content.text2', "（可使用多张票券点数）");
+      this.text3 = getContainerPropsValue(container, 'content.text3', "选择以下补差方式");
+      this.showText2 = getContainerPropsValue(container, 'content.showText2', "Y");
+      this.showContinuePay = getContainerPropsValue(container, 'content.showContinuePay', 'Y');
       this.paySuccessPath = getContainerPropsValue(
         container,
         "content.pay_success_path",

package/src/components/JfbBasePay/Mock.js

@@ -24,15 +24,6 @@ module.exports = {
         "card_use_price": 10000,
         "use_card_point": "5000"
       },
-      {
-        "card_number": "101001000005195",
-        "card_type_name": "聚福宝福卡测试蛋糕",
-        "end_time": 1679034403,
-        "card_point": 5000,
-        "is_bind_card": true,
-        "card_use_price": 10000,
-        "use_card_point": "5000"
-      },
     ],
   },
   getBaseOrderStatus:{},

package/src/components/JfbBasePersonalData/Api.js

@@ -0,0 +1,26 @@
+'use strict';
+/**
+ * @description  接口配置，
+ * 在设置方法名字当时候，别忘记加上【模块名字】：Personal
+ * @type {*[]}
+ */
+module.exports = [
+  {
+    mapFnName: 'getBasePersonInfo',
+    title: '获取用户信息',
+    path: '/passport/v1/user/get',
+    params: {},
+    isRule: false,
+    isConsole: true,
+    disabled: true,
+  },
+  {
+    mapFnName: 'setBasePersonInfo',
+    title: '获取用户信息',
+    path: '/passport/v1/user/update-user-info',
+    data: {},
+    isRule: false,
+    isConsole: true,
+    disabled: true,
+  }
+];

package/src/components/JfbBasePersonalData/Attr.js

@@ -0,0 +1,13 @@
+'use strict';
+
+/**
+ * @description 当表单组件中有联动操作时候，使用方法进行返回
+ */
+export default {
+  style: [],
+  content: (data) => {
+    return [
+    ].filter(i=>i)
+  },
+  advanced: [],
+};