jufubao-base 1.0.243-beta201 → 1.0.243

package/src/components/JfbBaseOrderList/XdTfkOrderItem.vue

@@ -83,21 +83,10 @@
     </view>
     <view v-if="item.buttons.length" class="prod_footer">
       <view style="flex: 1;"></view>
-      <template v-for="(btn,index) in item.buttons">
-        <template v-if="btn.action === 'apply_refund'">
-          <view class="btn"
-            v-if="showApplyAfter === 'Y'"
-            :key="btn.key"
-            @click="handleBtnEvent(btn.action, item)"
-          >{{btn.text}}</view>
-        </template>
-        <view class="btn"
-          v-else
-          :key="btn.key"
-          @click="handleBtnEvent(btn.action, item)"
-        >{{btn.text}}</view>
-      </template>
-     
+      <view class="btn" 
+        v-for="(btn,index) in item.buttons" :key="btn.key"
+        @click="handleBtnEvent(btn.action, item)"
+      >{{btn.text}}</view>
     </view>
   </view>
 </template>
@@ -117,8 +106,7 @@
       isShowOrderNo: {
         type: String,
       },
-      brandTextColor: String,
-      showApplyAfter: String
+      brandTextColor: String
     },
     data(){
       return{

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

@@ -100,7 +100,7 @@
       <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"
@@ -112,8 +112,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 +146,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 +177,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 +216,12 @@ export default {
       rechargeSuccessPath: "", //充值成功
       ...styleForm.getDataItem(),
       borderColor:'rgba(0,0,0,0)',
-      options:{}
+      options:{},
+      text1: "",
+      text2: "",
+      text3: "",
+      showText2: "Y",
+      showContinuePay: "",
     };
   },
   watch: {
@@ -222,6 +231,9 @@ export default {
     },
   },
   computed: {
+    ...mapState({
+      siteInfo: state => state.siteInfo,
+    }),
     prod_bottom() { 
       return this.fixedStyle({ height: 0, zIndex: 111 });
     },
@@ -262,6 +274,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: [],
+};

package/src/components/JfbBasePersonalData/JfbBasePersonalData.vue

@@ -0,0 +1,200 @@
+<template>
+  <view class="jfb-base-personal-data" @click="handleEditxSelect" :class="{ editx : isEditx && active }">
+    <!--#ifdef H5-->
+    <view class="jfb-base-personal-data__edit" :class="{ editx : isEditx && active }" v-if="isEditx && active">
+      <view class="jfb-base-personal-data__edit-icon" @click="delEdit">删除</view>
+    </view>
+    <!-- #endif -->
+    <view class="jfb-base-personal-data__body" v-if="info">
+      <view class="jfb-base-personal-data__body-item">
+        <view class="jfb-base-personal-data__body-item-label">头像</view>
+        <image class="profile" :src="info.head_url"  ></image>
+      </view>
+      <view class="jfb-base-personal-data__body-item">
+        <view class="jfb-base-personal-data__body-item-label">账号</view>
+        <view class="jfb-base-personal-data__body-item-value">{{info.phone_number}}</view>
+      </view>
+      <view class="jfb-base-personal-data__body-item">
+        <view class="jfb-base-personal-data__body-item-label">名称</view>
+        <input @blur="handleSetInfo" @confirm="handleSetInfo" class="jfb-base-personal-data__body-item-value"
+          v-model="info.nickname" type="text">
+      </view>
+      <view class="jfb-base-personal-data__body-item">
+        <view class="jfb-base-personal-data__body-item-label">性别</view>
+        <XdSelect @change="handleSetSex" padding="0" color="#999" class="select" :defaultValue="info.sex"
+          v-model="info.sex" :list="sexList">
+          <template>
+            <view class="jfb-base-personal-data__body-item-value">
+              <XdFontIcon class="icon" color="#999999" size="24" icon="iconxiangyou_xian"></XdFontIcon>
+            </view>
+          </template>
+
+        </XdSelect>
+      </view>
+      <view class="jfb-base-personal-data__body-item">
+        <view class="jfb-base-personal-data__body-item-label">生日</view>
+        <view style="display: flex;align-items: center" @click="showDate=true">
+          <view class="jfb-base-personal-data__body-item-value">{{info.birthday_date}}</view>
+          <XdFontIcon class="icon" color="#999999" size="24" icon="iconxiangyou_xian"></XdFontIcon>
+        </view>
+      </view>
+      <XdDate ref="calendar" :selectType="false" :main-color="mainColor" :current-is-show-other-month="false"
+        :show.sync="showDate" :clear-date="true" :insert="false" :lunar="false" :selected-circle="false"
+        :date="info.birthday_date" @confirm="confirmDate" @close="closeDate"></XdDate>
+    </view>
+  </view>
+</template>
+
+<script>
+  import XdFontIcon from "@/components/XdFontIcon/XdFontIcon";
+  import XdDate from '@/components/XdDate/XdDate.vue'
+  import XdSelect from "@/components/XdSelect/XdSelect";
+  import { jfbRootExec } from "@/utils/xd.event";
+  import JfbBasePersonalDataMixin from "./JfbBasePersonalDataMixin";
+  import { getContainerPropsValue } from "@/utils/xd.base";
+  import componentsMixins from "@/mixins/componentsMixins";
+  import extsMixins from "@/mixins/extsMixins";
+  export default {
+    name: "JfbBasePersonalData",
+    components: {
+      XdFontIcon,
+      XdSelect,
+      XdDate
+    },
+    mixins: [
+      componentsMixins, extsMixins, JfbBasePersonalDataMixin
+    ],
+    data() {
+      return {
+        info: {},
+        single: '',
+        showDate: false,
+        sexList: [
+          {
+            label: '男',
+            value: '1'
+          },
+          {
+            label: '女',
+            value: '2'
+          }
+        ],
+      }
+    },
+    watch: {
+      container(value, oldValue) {
+        if (JSON.stringify(value) === JSON.stringify(oldValue)) return;
+        if (this.$configProject['isPreview']) this.init(value)
+      },
+    },
+    created() {
+      this.init(this.container);
+    },
+    methods: {
+      onJfbLoad(options) {
+        this.getInfo()
+      },
+      /**
+       * @description 监听事件变化
+       * @param container {object} 业务组件对象自己
+       */
+      init(container) {
+      },
+      getInfo() {
+        jfbRootExec("getBasePersonInfo", {
+          vm: this,
+          data: {},
+        }).then(res => {
+          this.info = res
+        })
+      },
+      confirmDate(e) {
+        console.log(e, 'confirmDate');
+        this.info.birthday_date = e.fulldate
+        this.handleSetInfo()
+      },
+      closeDate() {
+
+      },
+      handleSetSex(data) {
+        this.info.sex = data.item.value
+        this.handleSetInfo()
+      },
+      handleSetInfo() {
+        jfbRootExec("setBasePersonInfo", {
+          vm: this,
+          data: {
+            nickname: this.info.nickname,
+            sex: this.info.sex,
+            birthday_date: this.info.birthday_date
+          },
+        }).then(res => {
+          this.getInfo()
+        })
+      },
+      onJfbScroll(options) {
+        console.log('event.onJfbScroll', options)
+      },
+      onJfbReachBottom(options) {
+        console.log('event.onJfbReachBottom', options)
+      },
+      onJfbShow(options) {
+        console.log('event.onJfbShow', options)
+      },
+      onJfbHide(options) {
+        console.log('event.onJfbHide', options)
+      },
+      onJfbBack(options) {
+        console.log('event.onJfbBack', options)
+      },
+      onJfbUpdate(...data) {
+        console.log('event.onJfbUpdate', data)
+      },
+      onJfbCustomEvent(options) {
+        console.log('event.onJfbReachBottom', options)
+      },
+    }
+  }
+
+</script>
+
+<style scoped lang="less">
+  @import "./JfbBasePersonalDataLess.less";
+
+  .jfb-base-personal-data {
+    &__body {
+      .icon {
+        margin-left: 8rpx;
+      }
+
+      &-item {
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+        border-radius: 20rpx;
+        background: #FFFFFF;
+        padding: 32rpx 46rpx;
+        margin: 20rpx;
+
+        &-label {
+          color: #333;
+          font-size: 28rpx;
+        }
+
+        &-value {
+          color: #999999;
+          font-size: 28rpx;
+          text-align: right;
+          display: flex;
+          align-items: center;
+        }
+
+        .profile {
+          width: 80rpx;
+          height: 80rpx;
+          border-radius: 50%;
+        }
+      }
+    }
+  }
+</style>

package/src/components/JfbBasePersonalData/JfbBasePersonalDataLess.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-personal-data {
+  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-personal-data {
+  //&:before {
+    //content: " ";
+    //display: table;
+  //}
+}
+/**endNotPreview**/

package/src/components/JfbBasePersonalData/JfbBasePersonalDataMixin.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-personal-data'
+    }
+  },
+  created() {
+    
+    //@AttrDataCreated
+    this.Attr = this.$xdUniHelper.customClone(Attr);
+    //@EndAttrDataCreated
+    
+
+  },
+}

package/src/components/JfbBasePersonalData/Mock.js

@@ -0,0 +1,13 @@
+'use strict';
+
+module.exports = {
+  
+  getPersonalByIdFilmSquate:{},
+  
+  updatePersonalFilmPaiqiDate:{},
+  
+  removePersonalFilmAddress:{},
+  
+  addPersonalFilmcart:{},
+  
+}

package/src/components/JfbBasePhoneLogin/JfbBasePhoneLogin.vue

@@ -209,6 +209,7 @@ export default {
       callback_url: "",
       isCollectUsername: false,
       showDialog: false,
+      share_code: "",
 
       inputStyle: "linear", //输入框样式 linear:线性  face: 面性
       formBorderColor: "#F9F9F9", //
@@ -370,6 +371,13 @@ export default {
       this.auth_code = options.auth_code;
       this.provider_id = options.provider_id;
       this.callback_url = options.callback_url;
+      if(options['x-share']){
+        let decodeParams = Base64.decode(options['x-share']);
+        try{
+          let commonParams = JSON.parse(decodeParams);
+          this.share_code = commonParams.share_code;
+        }catch(e){}
+      }
     },
     /**
      * @description 监听事件变化
@@ -566,6 +574,7 @@ export default {
           auth_code,
           provider_id,
           phone_number,
+          share_code: this.share_code,
         }
       }).then(res => {
         this.$xdHideLoading();
@@ -596,7 +605,8 @@ export default {
           provider_id,
           phone_number,
           verification_code,
-          user_name
+          user_name,
+          share_code: this.share_code
         },
       })
         .then((res) => {

package/src/components/JfbBasePointsCard/Api.js

@@ -0,0 +1,18 @@
+'use strict';
+/**
+ * @description  接口配置，
+ * 在设置方法名字当时候，别忘记加上【模块名字】：Points
+ * @type {*[]}
+ */
+module.exports = [
+  {
+    //设置方法名字当别忘记加上【模块名字】：Points
+    mapFnName: 'getPointsPropertyList',
+    title: '用户资产 - 列表',
+    path: '/pay/v1/property/list',
+    isRule: false,
+    params: {},
+    isConsole: true,
+    disabled: true,
+  },
+];