jufubao-base 1.0.232-beta5 → 1.0.232-beta7

package/src/components/JfbBaseOpenVipDetail/JfbBaseOpenVipDetail.vue

@@ -13,18 +13,29 @@
       <view class="jfb-base-open-vip-detail__edit-icon" @click="delEdit">删除</view>
     </view>
     <!-- #endif -->
-    <view class="jfb-base-open-vip-detail__body">
+    <view class="jfb-base-open-vip-detail__body" :style="[bodyStyle]">
       <view class="combo_section">
-        <view class="combo_section-title">套餐名称：年卡会员</view>
-        <xd-list-item label="套餐金额" paddingLR="40rpx">¥125.00</xd-list-item>
-        <xd-list-item label="套餐期限" paddingLR="40rpx">30天</xd-list-item>
+        <view class="combo_section-title">套餐名称：{{ vipInfo.product_name }}</view>
+        <xd-list-item label="套餐金额" paddingLR="40rpx">¥{{ $xdUniHelper.divisionFloatNumber(vipInfo.sale_price, 100) }}</xd-list-item>
+        <xd-list-item label="套餐期限" paddingLR="40rpx">{{ vipInfo.life_cycle_label }}</xd-list-item>
       </view>
 
       <view class="combo_section">
-        <xd-list-item label="套餐金额" paddingLR="40rpx">¥125.00</xd-list-item>
-        <xd-list-item label="平台优惠" paddingLR="40rpx">-¥125.00</xd-list-item>
+        <xd-list-item label="套餐金额" paddingLR="40rpx">¥{{ $xdUniHelper.divisionFloatNumber(vipInfo.user_pay_amount, 100) }}</xd-list-item>
+        <xd-list-item label="平台优惠" paddingLR="40rpx">-¥{{ $xdUniHelper.divisionFloatNumber(vipInfo.platform_discount_amount, 100) }}</xd-list-item>
+      </view>
+      
+      <view class="fixed_bottom" :style="[fixed_bottom]">
+        <view class="pay_btn" @click="p_createVipOrder">
+          立即支付
+          <xd-unit style="margin-left: 16rpx;"
+            :price="vipInfo.sale_price"
+            :isOld="false"
+            colorNew="#FFFFFF"
+          ></xd-unit>
+        </view>
+        <view class="plus_privacy">开通视为同意 <text @click.stop="handlePrivacy('privacy_service')"></text>《共享PLUS会员用户协议》</view>
       </view>
-
     </view>
   </view>
 </template>
@@ -32,6 +43,8 @@
 <script>
   import XdFontIcon from "@/components/XdFontIcon/XdFontIcon";
   import XdListItem from "@/components/CusListItem/CusListItem"
+  import XdUnit from "@/components/XdUnit/XdUnit.vue"
+  import XdButton from "@/components/XdButton/XdButton";
   import { jfbRootExec } from "@/utils/xd.event";
   import JfbBaseOpenVipDetailMixin from "./JfbBaseOpenVipDetailMixin";
   import { getContainerPropsValue } from "@/utils/xd.base";
@@ -41,7 +54,9 @@
     name: "JfbBaseOpenVipDetail",
     components: {
       XdFontIcon,
-      XdListItem
+      XdListItem,
+      XdButton,
+      XdUnit,
     },
     mixins: [
       componentsMixins, extsMixins, JfbBaseOpenVipDetailMixin
@@ -49,9 +64,27 @@
     data() {
       return {
         closeMask: true,
+        xnamespace: "",
+        notify_provider_id: "",
+
+        vip_card_id: "",
+        vipInfo: {},
         //todo
+        payPath: "",
+        paySuccessPath: "",
       }
     },
+    computed: {
+      bodyStyle(){
+        return {
+          minHeight: this.layoutInfo.bodyMinHeightRpx + "rpx",
+          '--main-color': this.mainColor
+        }
+      },
+      fixed_bottom() {
+        return this.fixedStyle({paddingBottom: 36, zIndex: 111})
+      },
+    },
     watch: {
       container(value, oldValue) {
         if (JSON.stringify(value) === JSON.stringify(oldValue)) return;
@@ -60,34 +93,58 @@
     },
     created() {
       this.init(this.container);
-
+      this.notify_provider_id = this.projectAttr.notify_provider_id;
       //todo
     },
     methods: {
       onJfbLoad(options) {
-
-        // jfbRootExec('baiduUserLogin', {
-
-        //   vm: this,//   data: {
-
-        //     account: 'gaoshiyong',//     password: '123456789',//     type: 3,//     ...options
-
-        //   }
-
-        // }).then().catch()
+        this.setNameSpace(options);
+        this.vip_card_id = options.vip_card_id;
+        this.p_getVipConfirm();
       },
       /**
        * @description 监听事件变化
        * @param container {object} 业务组件对象自己
        */
       init(container) {
+        this.payPath = getContainerPropsValue(container, 'content.payPath', {value: ""}).value;
+        this.paySuccessPath = getContainerPropsValue(container, 'content.paySuccessPath', {value: ""}).value;
+      },
+      p_getVipConfirm(){
+        jfbRootExec("getVipConfirm", {
+          vm: this,
+          data: {
+            vip_card_id: this.vip_card_id,
+            xnamespace: this.xnamespace
+          }
+        }).then(res => {
+          this.vipInfo = res;
+        })
+      },
+      p_createVipOrder(){
+        jfbRootExec("createVipOrder", {
+          vm: this,
+          data: {
+            business_code: this.xnamespace,
+            product_id: this.vipInfo.product_id,
+            notify_provider_id: this.notify_provider_id,
+            need_pay_price: this.vipInfo.user_pay_amount
+          }
+        }).then(res => {
+          if(res.need_pay_price > 0){
+            this.$xdUniHelper.redirectTo({
+              url: this.payPath + `?order_id=${res.pay_order_id}&main_order_id=${res.main_order_id}`
+            })
+          }else{
+            this.$xdUniHelper.redirectTo({
+              url: this.paySuccessPath + '?order_id=' + res.main_order_id
+            })
+          }
 
-        //this.bgcolor = getContainerPropsValue(container, 'content.bgcolor', '#fff');
-
-        //this.height = getContainerPropsValue(container, 'content.height', 10);
+        })
       },
       onJfbScroll(options) {
-        console.log('event.onJfbScroll', options)
+        // console.log('event.onJfbScroll', options)
       },
       onJfbReachBottom(options) {
         console.log('event.onJfbReachBottom', options)
@@ -135,6 +192,34 @@
           color: #999999;
         }
       }
+      .fixed_bottom{
+        position: fixed;
+        bottom: 0;
+        left: 0;
+        width: 100%;
+        padding: 36rpx;
+        box-sizing: border-box;
+        background-color: #FFFFFF;
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+        .pay_btn{
+          width: 600rpx;
+          display: flex;
+          align-items: center;
+          justify-content: center;
+          height: 80rpx;
+          background-color: var(--main-color);
+          color: #FFFFFF;
+          margin: 0 auto;
+          border-radius: 80rpx;
+        }
+        .plus_privacy{
+          font-size: 22rpx;
+          color: #999;
+          margin-top: 16rpx;
+        }
+      }
     }
   }
 </style>

package/src/components/JfbBasePersonalData/Api.js

@@ -6,53 +6,21 @@
  */
 module.exports = [
   {
-    //设置方法名字当别忘记加上【模块名字】：Personal
-    mapFnName: 'getPersonalByIdFilmSquate',
-    title: '获取电影广场列表',
-    path: '/api/account/film/list-film-square',
+    mapFnName: 'getBasePersonInfo',
+    title: '获取用户信息',
+    path: '/passport/v1/user/get',
+    params: {},
     isRule: false,
-    params: {
-      last_key: ['当前页', 'Number', '必选'],
-      page_size: ['每页数量', 'Number', '必选'],
-    },
     isConsole: true,
     disabled: true,
   },
   {
-    //设置方法名字当别忘记加上【模块名字】：Personal
-    mapFnName: 'updatePersonalFilmPaiqiDate',
-    title: '更新排期',
-    path: '/api/account/film/paiqi-date',
+    mapFnName: 'setBasePersonInfo',
+    title: '获取用户信息',
+    path: '/passport/v1/user/update-user-info',
+    data: {},
     isRule: false,
-    params: {
-      film_id: ['电影id', 'Number', '必选'],
-      cinema_id: ['影院id', 'Number', '必选'],
-    },
     isConsole: true,
     disabled: true,
-  },
-  {
-    //设置方法名字当别忘记加上【模块名字】：Personal
-    mapFnName: 'removePersonalFilmAddress',
-    title: '删除我的配送地址',
-    path: '/api/account/film/paiqi-date',
-    isRule: false,
-    params: {
-      film_id: ['电影id', 'Number', '必选'],
-    },
-    isConsole: true,
-    disabled: true,
-  },
-  {
-    //设置方法名字当别忘记加上【模块名字】：Personal
-    mapFnName: 'addPersonalFilmcart',
-    title: '添加购物车',
-    path: '/api/account/film/paiqi-date',
-    isRule: false,
-    params: {
-      film_id: ['电影id', 'Number', '必选'],
-    },
-    isConsole: true,
-    disabled: true,
-  },
+  }
 ];

package/src/components/JfbBasePersonalData/Attr.js

@@ -6,43 +6,7 @@
 export default {
   style: [],
   content: (data) => {
-    return [
-      {
-        label: '背景颜色:',
-        ele: 'xd-color',
-        valueKey: 'bgColor',
-        value: data.bgColor || '',
-        placeholder: '请输入占位框背景颜色',
-        groupKey:'content',
-      },
-      {
-        label: '选中路径:',
-        groupKey:'advanced',
-        className: 'input100',
-        ele: 'xd-select-pages-path',
-        valueKey: 'select-pages-path',
-        value: data['select-pages-path'] || null,
-        setting: {
-          router: XdBus.getParentApi('getPagesTree')
-        },
-      },
-      data.bgColor && {
-        label: '高度:',
-        ele: 'el-input',
-        groupKey:'style',
-        type: 'number',
-        valueKey: 'height',
-        value: data.height || 100,
-        placeholder: '请输入占位框高度，单位像素，默认：10px',
-        className: 'input60',
-      },
-      {
-        label: '', //label
-        groupKey:'advanced',
-        ele: 'slot', //package 名称
-        slot: 'is_reference',
-      },
-    ].filter(i=>i)
+    return [].filter(i=>i)
   },
   advanced: [],
 };

package/src/components/JfbBasePersonalData/JfbBasePersonalData.vue

@@ -5,22 +5,24 @@
       <view class="jfb-base-personal-data__edit-icon" @click="delEdit">删除</view>
     </view>
     <!-- #endif -->
-    <view class="jfb-base-personal-data__body">
+    <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="data.profile"  ></image>
+        <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">{{data.account}}</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 class="jfb-base-personal-data__body-item-value" v-model="data.name" type="text">
+        <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 padding="0" color="#999" class="select" :defaultValue="data.sex" v-model="data.sex" :list="sexList">
+        <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>
@@ -32,13 +34,13 @@
       <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">{{data.birthday}}</view>
+          <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="data.birthday"
-        @confirm="confirmDate" @close="closeDate"></XdDate>
+      <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>
@@ -64,26 +66,19 @@
     ],
     data() {
       return {
+        info: {},
         single: '',
         showDate: false,
-        birthday: '',
         sexList: [
           {
             label: '男',
-            value: 1
+            value: '1'
           },
           {
             label: '女',
-            value: 2
+            value: '2'
           }
         ],
-        data: {
-          sex: 1,
-          profile: 'https://img.js.design/assets/smartFill/img316164da746310.jpg',
-          account: 5455645545,
-          name: '张三',
-          birthday: '2025-04-09'
-        }
       }
     },
     watch: {
@@ -96,19 +91,46 @@
       this.init(this.container);
     },
     methods: {
-      onJfbLoad(options) { },
+      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.data.birthday = e.fulldate
+        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.value,
+            birthday_date: this.info.birthday_date
+          },
+        }).then(res => {
+          this.getInfo()
+        })
       },
       onJfbScroll(options) {
         console.log('event.onJfbScroll', options)

package/src/components/JfbBasePointsCard/Api.js

@@ -7,51 +7,11 @@
 module.exports = [
   {
     //设置方法名字当别忘记加上【模块名字】：Points
-    mapFnName: 'getPointsByIdFilmSquate',
-    title: '获取电影广场列表',
-    path: '/api/account/film/list-film-square',
+    mapFnName: 'getPointsPropertyList',
+    title: '用户资产 - 列表',
+    path: '/pay/v1/property/list',
     isRule: false,
-    params: {
-      last_key: ['当前页', 'Number', '必选'],
-      page_size: ['每页数量', 'Number', '必选'],
-    },
-    isConsole: true,
-    disabled: true,
-  },
-  {
-    //设置方法名字当别忘记加上【模块名字】：Points
-    mapFnName: 'updatePointsFilmPaiqiDate',
-    title: '更新排期',
-    path: '/api/account/film/paiqi-date',
-    isRule: false,
-    params: {
-      film_id: ['电影id', 'Number', '必选'],
-      cinema_id: ['影院id', 'Number', '必选'],
-    },
-    isConsole: true,
-    disabled: true,
-  },
-  {
-    //设置方法名字当别忘记加上【模块名字】：Points
-    mapFnName: 'removePointsFilmAddress',
-    title: '删除我的配送地址',
-    path: '/api/account/film/paiqi-date',
-    isRule: false,
-    params: {
-      film_id: ['电影id', 'Number', '必选'],
-    },
-    isConsole: true,
-    disabled: true,
-  },
-  {
-    //设置方法名字当别忘记加上【模块名字】：Points
-    mapFnName: 'addPointsFilmcart',
-    title: '添加购物车',
-    path: '/api/account/film/paiqi-date',
-    isRule: false,
-    params: {
-      film_id: ['电影id', 'Number', '必选'],
-    },
+    params: {},
     isConsole: true,
     disabled: true,
   },

package/src/components/JfbBasePointsCard/Attr.js

@@ -21,42 +21,6 @@ export default {
           { label: '普通用户样式', value: 'N' },
         ]
       },
-      {
-        label: '是否展示积分入口:',
-        labelInline: true,
-        ele: 'xd-radio',
-        valueKey: 'isPoints',
-        groupKey: 'content',
-        value: data['isPoints'] || 'Y',
-        list: [
-          { "label": "展示", "value": 'Y' },
-          { "label": "隐藏", "value": 'N' },
-        ]
-      },
-      {
-        label: '是否展示余额入口:',
-        labelInline: true,
-        ele: 'xd-radio',
-        valueKey: 'isYue',
-        groupKey: 'content',
-        value: data['isYue'] || 'Y',
-        list: [
-          { "label": "展示", "value": 'Y' },
-          { "label": "隐藏", "value": 'N' },
-        ]
-      },
-      {
-        label: '是否展示优惠券入口:',
-        labelInline: true,
-        ele: 'xd-radio',
-        valueKey: 'isConpon',
-        groupKey: 'content',
-        value: data['isConpon'] || 'Y',
-        list: [
-          { "label": "展示", "value": 'Y' },
-          { "label": "隐藏", "value": 'N' },
-        ]
-      },
       {
         label: '外边距:',
         ele: 'xd-margin-padding',
@@ -182,24 +146,24 @@ export default {
         classNmae: 'input80',
       },
       {
-        label: '积分兑换地址路径:',
+        label: '余额提现路径:',
         ele: 'xd-select-pages-path',
-        valueKey: 'pointsPath',
+        valueKey: 'withdrawPath',
         groupKey:'advanced',
-        placeholder: '请选择积分兑换地址路径',
-        value: data['addressUrl'] || null,
+        placeholder: '请选择余额提现路径',
+        value: data['withdrawPath'] || null,
         setting: {
           router: XdBus.getParentApi('getPagesTree'),
         },
         inline: false,
       },
       {
-        label: '余额提现路径:',
+        label: '积分详情路径:',
         ele: 'xd-select-pages-path',
-        valueKey: 'withdrawPath',
+        valueKey: 'pointsPath',
         groupKey:'advanced',
-        placeholder: '请选择余额提现路径',
-        value: data['withdrawPath'] || null,
+        placeholder: '请选择积分详情路径',
+        value: data['coupointsPathponPath'] || null,
         setting: {
           router: XdBus.getParentApi('getPagesTree'),
         },