jufubao-base 1.0.232-beta5 → 1.0.232-beta7

package/src/components/JfbBaseConsumpCode/Mock.js

@@ -1,13 +1,22 @@
 'use strict';
 
 module.exports = {
-  
-  getConsumpByIdFilmSquate:{},
-  
-  updateConsumpFilmPaiqiDate:{},
-  
-  removeConsumpFilmAddress:{},
-  
-  addConsumpFilmcart:{},
-  
+
+  getConsumpCode: { "payment_code": "h.161.v71913434717194", "expiration_time": 1744971193, "expiration_sec": 60, "temp_order_id": "quickpay-5000358-DBeMnvrvInuINYeTqbCXw", "confirm_notice": false, "notice": "", "cash_order_id": "", "code_url": "\/common\/v1\/image\/qrcode?code_content=h.161.v71913434717194&size=240", "plus_discount": 0, "is_st_flow": "张三", "barcode_url": "\/common\/v1\/image\/barcode?code_content=h.161.v71913434717194", "shop_name": "六九豆浆饺子(石门市场店)", "request_id": "52ebf80c255ebcb5" },
+
+  getConsumpCodeScanStatus: { "status": "P", "message": "", "order_data": "{\"total_amount\":\"0\",\"pay_expire_time\":\"0\",\"message\":\"\",\"status\":\"P\",\"cash_order_id\":\"\",\"user_id\":\"5000358\",\"channel_order_id\":\"\",\"cart_order_id\":\"\"}", "seconds": 0, "request_id": "a54ac53ad31312d6" },
+
+  getConsumpListUserPayChannel: { "list": [{ "channel_provider_id": "1rRq74ACKJj5nIx5CgLpb", "channel_provider_name": "微信", "channel_code": "wxpay", "channel_logo": "https:\/\/jfb-public-images.oss-cn-qingdao.aliyuncs.com\/system-paychannel-logo-wxpay.png?x-oss-process=style\/200_200" }], "request_id": "e142d26c3d24c060" },
+
+  batchConsumpUseCardCreated: { "request_order_id": "quickpay-5000358-DBeMnvrvInuINYeTqbCXw", "request_id": "e17499843ece44b1" },
+
+  getConsumpAsyncSubmitStatus: { "hand_status": "U", "hand_status_msg": "异步下单中", "order_id": "", "pay_order_id": "", "need_pay_price": "0", "request_id": "fddff0af4216825d" },
+
+  getConsumpShopList: { "namespaces": [{ "label": "蛋糕(勿改)", "value": "cake" }], "brands": [{ "label": "测试1111", "value": 14, "icon": "\/uploads\/20230324\/3265afeb6a1f2a94f25c968a09275574.png" }, { "label": "品牌jls0519", "value": 100003, "icon": "\/uploads\/20230710\/44f645b06fe4da358f7b0ee06259afcd.jpg" }], "list": [{ "brand_id": 14, "brand_name": "测试1111", "brand_type": "MA", "business_status": "CLOSED", "consume_mode": ["SELL"], "consume_mode_name": "", "distance": "42km", "distance_conversion": "41.9km", "default_consume_type": "CV", "consume_type": ["CV"], "is_support_jhd": true, "address": "顺义区东六环与顺于路交叉口东150米", "province_name": "", "city_name": "", "area_name": "", "street_name": "", "phone": "(010)89430806", "resource_shop_id": 8003489, "exts_params": "eyJyZXNvdXJjZV9zaG9wX2lkIjo4MDAzNDg5LCJzaG9wX2lkIjoxMTUzNTIwLCJ2ZXJzaW9uIjoyfQ", "resource_shop_name": "六九豆浆饺子(石门市场店)", "shop_icon": "\/uploads\/20230324\/3265afeb6a1f2a94f25c968a09275574.png", "shop_id": 1153520, "shop_tags": [], "stars": 0, "time_slot_name": "-", "business_code": "", "longitude": "116.630756", "latitude": "40.134773" }, { "brand_id": 100003, "brand_name": "品牌jls0519", "brand_type": "MA", "business_status": "OPEN_BUSINESS", "consume_mode": ["SELL"], "consume_mode_name": "", "distance": "55km", "distance_conversion": "54.8km", "default_consume_type": "", "consume_type": [""], "is_support_jhd": false, "address": "东城区东直门街道东城区东直门内南大街4号（东直门内第一个十字路口东南角）", "province_name": "", "city_name": "", "area_name": "", "street_name": "", "phone": "64034959", "resource_shop_id": 8000077, "exts_params": "eyJyZXNvdXJjZV9zaG9wX2lkIjo4MDAwMDc3LCJzaG9wX2lkIjoxMDIzNTMwLCJ2ZXJzaW9uIjoyfQ", "resource_shop_name": "东直门[2]", "shop_icon": "\/uploads\/20230710\/44f645b06fe4da358f7b0ee06259afcd.jpg", "shop_id": 1023530, "shop_tags": [], "stars": 0, "time_slot_name": "09:00-18:00", "business_code": "", "longitude": "116.44373384708321", "latitude": "39.94636369444035" }, { "brand_id": 100003, "brand_name": "品牌jls0519", "brand_type": "MA", "business_status": "OPEN_BUSINESS", "consume_mode": ["SELL"], "consume_mode_name": "", "distance": "56km", "distance_conversion": "55.5km", "default_consume_type": "JHD", "consume_type": ["JHD"], "is_support_jhd": true, "address": "东城区建国门街道北京inn", "province_name": "", "city_name": "", "area_name": "", "street_name": "", "phone": "18843854566", "resource_shop_id": 8000078, "exts_params": "eyJyZXNvdXJjZV9zaG9wX2lkIjo4MDAwMDc4LCJzaG9wX2lkIjoxMDM3MjY2LCJ2ZXJzaW9uIjoyfQ", "resource_shop_name": "a加盟商-185", "shop_icon": "\/uploads\/20230710\/44f645b06fe4da358f7b0ee06259afcd.jpg", "shop_id": 1037266, "shop_tags": [], "stars": 0, "time_slot_name": "-", "business_code": "", "longitude": "116.43814998003319", "latitude": "39.9280800962547" }], "total_size": 3, "next_page_token": "", "request_id": "fa91f05cff4b280b" },
+
+  getConsumpSettleMainInfo: { "shop_id": 1037266, "shop_logo": "\/uploads\/20230710\/44f645b06fe4da358f7b0ee06259afcd.jpg", "shop_name": "a加盟商-185", "shop_brand": 100003, "shop_partner_name": "A加盟商-余额测试", "settle_tag_list": [{ "label": "幸福西饼、goodlike品牌", "value": 262, "price": 0, "price_yuan": "0.00", "is_static_price": false, "icon_url": "https:\/\/sandbox-img.jufubao.cn\/uploads\/20230728\/70f4dd90cdf2681e71ccf41d332d71a0.jpeg" }], "request_id": "a4a6cfe9db905597" },
+
+  getConsumpBaseUserInfo: { "user_name": "", "user_code": "WuE5Wotf08", "nickname": "张三", "real_name": "", "head_url": "https:\/\/thirdwx.qlogo.cn\/mmopen\/vi_32\/AOqEDeiaxss8GR4jD1GicIgyqWSOZV8xN23Iw3DOzFjVBzTFbdv21X7u9ZASQJYsTNm07XSq6ebzp4K4qu1JT26qGZ0qYFMe1nHdQjFZib83Fg\/132", "province_code": "", "city_code": "", "province_name": "", "city_name": "", "sex": "1", "sex_name": "男", "birthday_date": "2025-04-16", "phone_number": "177****7945", "show_user_name": "张三", "user_level": "VIP", "vip_expire_time": 1776157293, "request_id": "f1dbb1c0bb8da893" }，
+
+  addConsumpCashierTempOrderData: { "cart_order_id": "c08f38347ec8bc5b", "request_id": "779bf62e988587ce" }
 }

package/src/components/JfbBaseOpenVip/Api.js

@@ -6,53 +6,24 @@
  */
 module.exports = [
   {
-    //设置方法名字当别忘记加上【模块名字】：Open
-    mapFnName: 'getOpenByIdFilmSquate',
-    title: '获取电影广场列表',
-    path: '/api/account/film/list-film-square',
+    mapFnName: 'getBaseUserInfo',
+    title: '获取用户信息',
+    path: '/passport/v1/user/get',
+    params: {},
     isRule: false,
-    params: {
-      last_key: ['当前页', 'Number', '必选'],
-      page_size: ['每页数量', 'Number', '必选'],
-    },
-    isConsole: true,
-    disabled: true,
-  },
-  {
-    //设置方法名字当别忘记加上【模块名字】：Open
-    mapFnName: 'updateOpenFilmPaiqiDate',
-    title: '更新排期',
-    path: '/api/account/film/paiqi-date',
-    isRule: false,
-    params: {
-      film_id: ['电影id', 'Number', '必选'],
-      cinema_id: ['影院id', 'Number', '必选'],
-    },
     isConsole: true,
     disabled: true,
   },
   {
-    //设置方法名字当别忘记加上【模块名字】：Open
-    mapFnName: 'removeOpenFilmAddress',
-    title: '删除我的配送地址',
-    path: '/api/account/film/paiqi-date',
+    mapFnName: "getVipList",
+    title: "会员中心 - 会员卡列表",
+    path: "/member/v1/:namespace/vip-card",
     isRule: false,
     params: {
-      film_id: ['电影id', 'Number', '必选'],
+      namespace: ['业务线', 'String', true],
+      is_show_exchange_code: ['是否展示 兑换码 ', 'Y/N，默认N', false],
     },
     isConsole: true,
-    disabled: true,
-  },
-  {
-    //设置方法名字当别忘记加上【模块名字】：Open
-    mapFnName: 'addOpenFilmcart',
-    title: '添加购物车',
-    path: '/api/account/film/paiqi-date',
-    isRule: false,
-    params: {
-      film_id: ['电影id', 'Number', '必选'],
-    },
-    isConsole: true,
-    disabled: true,
-  },
+    disabled: true
+  }
 ];

package/src/components/JfbBaseOpenVip/Attr.js

@@ -233,12 +233,12 @@ export default {
         notice: '',
       },
       {
-        label: '支付跳转路径:',
+        label: '会员详情路径:',
         ele: 'xd-select-pages-path',
-        valueKey: 'payPath',
+        valueKey: 'vipDetailPath',
         groupKey:'advanced',
-        placeholder: '请选择支付跳转路径',
-        value: data['payPath'] || null,
+        placeholder: '请选择会员详情路径',
+        value: data['vipDetailPath'] || null,
         setting: {
           router: XdBus.getParentApi('getPagesTree'),
         },

package/src/components/JfbBaseOpenVip/JfbBaseOpenVip.vue

@@ -16,15 +16,18 @@
     <view class="jfb-base-open-vip__body" :style="[bodyStyle]">
       <!-- 用户信息 -->
       <view class="u_header">
-        <view class="u_avatar"></view>
+        <view class="u_avatar">
+          <image :src="uInfo.head_url" mode="aspectFill"></image>
+        </view>
         <view class="u_info">
           <view class="u_info-top">
-            <view class="vip_name">黑白灰</view>
-            <view v-if="0" class="vip_level">普通用户</view>
-            <view v-else class="vip_level plus">PLUS会员</view>
+            <view class="vip_name">{{ uInfo.show_user_name }}</view>
+            <view v-if="isVip" class="vip_level plus">PLUS会员</view>
+            <view v-else class="vip_level">普通用户</view>
           </view>
           <view class="u_sub">
-            <view>138****7353</view>
+            <view v-if="isVip">已省xx</view>
+            <view v-else>{{ uInfo.phone_number }}</view>
           </view>
         </view>
         <view class="buy_btn" @click="showDrawer=true">立即续费</view>
@@ -37,7 +40,9 @@
             <view class="vip_box-title">PLUS会员</view>
             <view>开通享受更多权益</view>
           </view>
-          <view class="vip_logo"></view>
+          <view class="vip_logo">
+            <image :src="siteLogo" mode="aspectFill"></image>
+          </view>
         </view>
         <view class="vip_banner">
           <view class="banner_item" v-for="i in 4" :key="i">
@@ -61,12 +66,18 @@
           </view>
         </view>
       </view>
-
-      <xd-vip-list @handlePrivacy="handlePrivacy"></xd-vip-list>
+      
+      <xd-vip-list :list="vipCardList"
+        @handlePrivacy="handlePrivacy"
+        @toVipDetail="toVipDetail"
+      ></xd-vip-list>
 
       <xd-down-drawer :show.sync="showDrawer" height="480rpx">
         <view class="drawer_title">立即续费</view>
-        <xd-vip-list @handlePrivacy="handlePrivacy"></xd-vip-list>
+        <xd-vip-list :list="vipCardList"
+          @handlePrivacy="handlePrivacy"
+          @toVipDetail="toVipDetail"
+        ></xd-vip-list>
       </xd-down-drawer>
 
     </view>
@@ -83,6 +94,7 @@
   import { getContainerPropsValue } from "@/utils/xd.base";
   import componentsMixins from "@/mixins/componentsMixins";
   import extsMixins from "@/mixins/extsMixins";
+  import getServiceUrl from "@/common/getServiceUrl"
 
   export default {
     name: "JfbBaseOpenVip",
@@ -100,8 +112,13 @@
         closeMask: true,
 
         showDrawer: false,
+        uInfo: {},
+        xnamespace: "",
+        vipCardList: [],
+
+        siteLogo: "",
         //todo
-        payPath: "",
+        vipDetailPath: "",
       }
     },
     computed: {
@@ -110,6 +127,9 @@
           minHeight: this.layoutInfo.bodyMinHeightRpx + "rpx",
           '--main-color': this.mainColor
         }
+      },
+      isVip(){
+        return this.uInfo.user_level === 'VIP';
       }
     },
     watch: {
@@ -120,28 +140,39 @@
     },
     created() {
       this.init(this.container);
-
+      this.siteLogo = getServiceUrl(this.projectAttr['site_logo']);
       //todo
     },
     methods: {
       onJfbLoad(options) {
-
-        // jfbRootExec('baiduUserLogin', {
-
-        //   vm: this,//   data: {
-
-        //     account: 'gaoshiyong',//     password: '123456789',//     type: 3,//     ...options
-
-        //   }
-
-        // }).then().catch()
+        this.setNameSpace(options);
+        this.p_getBaseUserInfo();
+        this.p_getVipList();
       },
       /**
        * @description 监听事件变化
        * @param container {object} 业务组件对象自己
        */
       init(container) {
-        this.payPath = getContainerPropsValue(container, 'content.payPath', {value: ""}).value;
+        this.vipDetailPath = getContainerPropsValue(container, 'content.vipDetailPath', {value: "/system/system/vipdetail"}).value;
+      },
+      p_getBaseUserInfo(){
+        jfbRootExec("getBaseUserInfo", {
+          vm: this,
+          data: {}
+        }).then(res => {
+          this.uInfo = res;
+        })
+      },
+      p_getVipList(){
+        jfbRootExec("getVipList", {
+          vm: this,
+          data: {
+            namespace: this.xnamespace,
+          }
+        }).then(res => {
+          this.vipCardList = res.list;
+        })
       },
       handlePrivacy(code){
         let params = `page_id=${this.pageAttr["page_id"]}`;
@@ -150,8 +181,13 @@
           url: `/pages/content/content?${params}`
         })
       },
+      toVipDetail(vip_card_id){
+        this.$xdUniHelper.navigateTo({
+          url: `${this.vipDetailPath}?vip_card_id=${vip_card_id}`
+        })
+      },
       onJfbScroll(options) {
-        console.log('event.onJfbScroll', options)
+        // console.log('event.onJfbScroll', options)
       },
       onJfbReachBottom(options) {
         console.log('event.onJfbReachBottom', options)
@@ -190,9 +226,13 @@
         .u_avatar{
           width: 120rpx;
           height: 120rpx;
-          background-color: #f00;
           border-radius: 120rpx;
           margin-right: 24rpx;
+          overflow: hidden;
+          image{
+            width: 100%;
+            height: 100%;
+          }
         }
         .u_info{
           flex:1;
@@ -261,7 +301,10 @@
           .vip_logo{
             width: 104rpx;
             height: 104rpx;
-            background-color: #E8A841;
+            image{
+              width: 100%;
+              height: 100%;
+            }
           }
         }
 

package/src/components/JfbBaseOpenVip/Mock.js

@@ -1,13 +1,20 @@
 'use strict';
 
 module.exports = {
-  
-  getOpenByIdFilmSquate:{},
-  
-  updateOpenFilmPaiqiDate:{},
-  
-  removeOpenFilmAddress:{},
-  
-  addOpenFilmcart:{},
-  
+  getBaseUserInfo: {
+    "user_name": "15801505541",
+    "user_code": "97SJSG667V",
+    "nickname": "草鸡无敌飞侠",
+    "real_name": "",
+    "head_url": "https://sandbox-img.jufubao.cn//uploads/20230217/dc6f1817ae3714814328fcff55925d00.jpg?x-oss-process=style/size8",
+    "province_code": "",
+    "city_code": "",
+    "province_name": "",
+    "city_name": "",
+    "sex": "",
+    "sex_name": "未知",
+    "birthday_date": "",
+    "phone_number": "15801505541",
+    "request_id": "44cf5b8402ff7c2e"
+  }
 }

package/src/components/JfbBaseOpenVip/XdVipList.vue

@@ -1,13 +1,13 @@
 <template>
   <view class="xd_vip_wrap">
     <view class="vip_list">
-      <view class="vip_item" :class="{active: i==1}" v-for="i in 6" :key="i">
-        <view class="vip_name">1日体验</view>
-        <view class="vip_price">10.00</view>
+      <view class="vip_item" :class="{active: item.vip_card_id===vip_card_id}" v-for="item in uiList" :key="item.vip_card_id">
+        <view class="vip_name">{{ item.product_name}}</view>
+        <view class="vip_price">{{ $xdUniHelper.divisionFloatNumber(item.sale_price, 100) }}</view>
       </view>
     </view>
     <view class="vip_pay">
-      <xd-button type="primary" width="600rpx">立即支付￥148/年</xd-button>
+      <view class="pay_btn" @click="toVipDetail">立即支付 <xd-unit style="margin-left: 16rpx;" :price="curVipCard.sale_price" :isOld="false" colorNew="#FFFFFF"></xd-unit></view>
       <view class="vip_tip">开通视为同意<text @click.stop="handlePrivacy('privacy_service')">《共享PLUS会员用户协议》</text></view>
     </view>
   </view>
@@ -15,18 +15,45 @@
 
 <script>
   import XdButton from "@/components/XdButton/XdButton.vue"
+  import XdUnit from "@/components/XdUnit/XdUnit.vue"
   export default {
     components: {
-      XdButton
+      XdButton,
+      XdUnit
+    },
+    props: {
+      list: {
+        type: Array,
+        default(){
+          return []
+        }
+      }
+    },
+    watch: {
+      list(val){
+        this.vip_card_id = val[0].vip_card_id || ''
+        this.uiList = val
+      }
+    },
+    computed: {
+      curVipCard(){
+        return this.uiList.find(item => item.vip_card_id === this.vip_card_id) || {}
+      }
     },
     data(){
       return {
-        
+        uiList: [],
+        vip_card_id: ''
       }
     },
     methods: {
       handlePrivacy(type){
         this.$emit('handlePrivacy', type)
+      },
+      toVipDetail(){
+        if(this.vip_card_id){
+          this.$emit('toVipDetail', this.vip_card_id)
+        }
       }
     }
   }
@@ -70,6 +97,17 @@
     }
     .vip_pay{
       padding: 24rpx 0 50rpx;
+      .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;
+      }
     }
     .vip_tip{
       text-align: center;

package/src/components/JfbBaseOpenVipDetail/Api.js

@@ -6,53 +6,31 @@
  */
 module.exports = [
   {
-    //设置方法名字当别忘记加上【模块名字】：Open
-    mapFnName: 'getOpenByIdFilmSquate',
-    title: '获取电影广场列表',
-    path: '/api/account/film/list-film-square',
+    mapFnName: "getVipConfirm",
+    title: "获取vip确认信息",
+    path: "/member/v1/:xnamespace/order/confirm",
     isRule: false,
-    params: {
-      last_key: ['当前页', 'Number', '必选'],
-      page_size: ['每页数量', 'Number', '必选'],
+    data: {
+      vip_card_id: ["vip卡id", "Number", "必选"],
+      xnamespace: ['业务线', 'String', '必选']
     },
     isConsole: true,
     disabled: true,
   },
   {
-    //设置方法名字当别忘记加上【模块名字】：Open
-    mapFnName: 'updateOpenFilmPaiqiDate',
-    title: '更新排期',
-    path: '/api/account/film/paiqi-date',
+    mapFnName: "createVipOrder",
+    title: "创建VIP订单",
+    path: "/member/v1/order/submit",
     isRule: false,
-    params: {
-      film_id: ['电影id', 'Number', '必选'],
-      cinema_id: ['影院id', 'Number', '必选'],
+    data: {
+      business_code: ['业务编码', 'String', '必选'],
+      product_id: ['商品id', 'Number', '必选'],
+      notify_provider_id: ['notify_provider_id', 'Number', '可选'],
+      selected_card_list_json: ['已使用的卡券数据', 'array', '可选'],
+      selected_wallet_list_json: ['已使用的钱包数据', 'array', '可选'],
+      need_pay_price: ['需要支付的价格', 'Number', '可选']
     },
     isConsole: true,
     disabled: true,
-  },
-  {
-    //设置方法名字当别忘记加上【模块名字】：Open
-    mapFnName: 'removeOpenFilmAddress',
-    title: '删除我的配送地址',
-    path: '/api/account/film/paiqi-date',
-    isRule: false,
-    params: {
-      film_id: ['电影id', 'Number', '必选'],
-    },
-    isConsole: true,
-    disabled: true,
-  },
-  {
-    //设置方法名字当别忘记加上【模块名字】：Open
-    mapFnName: 'addOpenFilmcart',
-    title: '添加购物车',
-    path: '/api/account/film/paiqi-date',
-    isRule: false,
-    params: {
-      film_id: ['电影id', 'Number', '必选'],
-    },
-    isConsole: true,
-    disabled: true,
-  },
+  }
 ];

package/src/components/JfbBaseOpenVipDetail/Attr.js

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