jufubao-base 1.0.232-beta6 → 1.0.232-beta8

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/JfbBaseOpenVip.vue

@@ -26,8 +26,8 @@
             <view v-else class="vip_level">普通用户</view>
           </view>
           <view class="u_sub">
-            <view v-if="isVip">已省xx</view>
-            <view v-else>{{ uInfo.phone_number }}</view>
+            <view v-if="isVip" style="color:#999999;">已省xx</view>
+            <view v-else style="color:#333333;">{{ uInfo.phone_number }}</view>
           </view>
         </view>
         <view class="buy_btn" @click="showDrawer=true">立即续费</view>
@@ -67,7 +67,7 @@
         </view>
       </view>
       
-      <xd-vip-list :list="vipCardList"
+      <xd-vip-list v-if="!isVip" :list="vipCardList"
         @handlePrivacy="handlePrivacy"
         @toVipDetail="toVipDetail"
       ></xd-vip-list>
@@ -258,6 +258,7 @@
           }
           .u_sub{
             margin-top: 24rpx;
+            font-size: 24rpx;
           }
         }
         .buy_btn{

package/src/components/JfbBasePointsCard/Attr.js

@@ -157,6 +157,18 @@ export default {
         },
         inline: false,
       },
+      {
+        label: '积分详情路径:',
+        ele: 'xd-select-pages-path',
+        valueKey: 'pointsPath',
+        groupKey:'advanced',
+        placeholder: '请选择积分详情路径',
+        value: data['coupointsPathponPath'] || null,
+        setting: {
+          router: XdBus.getParentApi('getPagesTree'),
+        },
+        inline: false,
+      },
       {
         label: '优惠券路径:',
         ele: 'xd-select-pages-path',

package/src/components/JfbBasePointsDetail/JfbBasePointsDetail.vue

@@ -149,12 +149,13 @@
             ).fullTime;
             return item;
           })
-          this.hasNext = res.next_page_token !== "";
           if (this.page_token === 1) {
             this.recordList = list
           } else {
             this.recordList = this.recordList.concat(list);
           }
+          this.next_page_token = res.next_page_token
+          this.hasNext = res.next_page_token !== "";
         })
       },
       /**

package/src/components/JfbBasePointsDetail/Mock.js

@@ -1,7 +1,6 @@
 'use strict';
 
 module.exports = {
-  
   getPointsWalletDetail:{"wallet_list":[{"sort":1,"wallet_type":"US","show_name":"可用积分","amount":10000,"is_support_withdraw":"N"}],"request_id":"43fa9f773f0c3014"},
   getPointsWalletTradeList: {"next_page_token":"","total_size":0,"list":[{"trade_nnid":"zd0rYpZgWXE9Yf8e1mtH3","order_id":"111112-2025041517-03-54","amount":10000,"trade_type":"activity_a","trade_type_name":"活动收入","operate_type":"A","operate_type_name":"收入","trade_name":"","comment":"","created_time":1744707836}],"request_id":"eec94260e6f9de53"}
 }

package/src/components/JfbBaseShare/JfbBaseShare.vue

@@ -15,28 +15,30 @@
     <!-- #endif -->
     <view class="jfb-base-share__body">
       <view class="card_wrap">
-        <swiper class="card_swiper" next-margin="50rpx" previous-margin="50rpx">
-          <swiper-item class="swiper_item" v-for="i in 3" :key="i">
+        <swiper class="card_swiper" next-margin="50rpx" previous-margin="50rpx" :current="shareIndex" @change="handleSwitch">
+          <swiper-item class="swiper_item" v-for="(item,i) in shareList" :key="i">
             <view class="swiper_item-inner">
-              <view class="swiper_item-logo"></view>
+              <image :src="item.share_image_url" mode="aspectFill"></image>
+              <!-- <view class="swiper_item-logo"></view>
               <view class="swiper_item-title">邀请好友领福利</view>
               <view class="swiper_item-qrcode"></view>
-              <view class="swiper_item-visit">邀请码<br/>LWNXK7H</view>
+              <view class="swiper_item-visit">邀请码<br/>LWNXK7H</view> -->
             </view>
             <!-- <image style="width: 600rpx;height: 900rpx;"
               src="https://sandbox-img.jufubao.cn/uploads/20250410/34559f90dd5a01e7368c02bf33f1b484.png?ver=1744249748881&x-oss-process=style/size5"></image> -->
           </swiper-item>
         </swiper>
       </view>
-
+      <!-- #ifdef MP-WEIXIN -->
       <view class="share_wrap">
-        <view class="share_btn">
+        <view class="share_btn" @click="toSendWx">
           <image src="https://sandbox-img.jufubao.cn/uploads/20250410/57bc093618bc51a85dc8bb68825d2b97.png?x-oss-process=style/size8" mode="widthFix"></image>
         </view>
-        <view class="share_btn">
+        <view class="share_btn" @click="toSaveImg">
           <image src="https://sandbox-img1.jufubao.cn/uploads/20250410/faeb136bfd684ab6fa4608208ad26294.png?x-oss-process=style/size8" mode="widthFix"></image>
         </view>
       </view>
+      <!-- #endif -->
 
       <view class="visit_tip">
         好友使用你的邀请码成功注册后<br/>Ta将成为你的邀请用户
@@ -52,6 +54,8 @@
   import { getContainerPropsValue } from "@/utils/xd.base";
   import componentsMixins from "@/mixins/componentsMixins";
   import extsMixins from "@/mixins/extsMixins";
+  import getServiceUrl from "@/common/getServiceUrl";
+  import { mapState } from "vuex";
   export default {
     name: "JfbBaseShare",
     components: {
@@ -63,11 +67,14 @@
     data() {
       return {
         closeMask: true,
-
+        shareIndex: 0,
         shareList: [],
         //todo
       }
     },
+    computed: {
+      ...mapState(["shareInfo"]),
+    },
     watch: {
       container(value, oldValue) {
         if (JSON.stringify(value) === JSON.stringify(oldValue)) return;
@@ -98,11 +105,45 @@
             page_token: '1'
           }
         }).then(res => {
-          this.shareList = res.list;
+          this.shareList = res.list.map(item => {
+            item.share_image_url = getServiceUrl(item.share_image_url);
+            return item;
+          });
         })
       },
+      handleSwitch(e){
+        this.shareIndex = e.detail.current;
+      },
+      toSendWx(){
+        let shareIndex = this.shareIndex;
+        let curShare = this.shareList[shareIndex];
+        this.setShareInfo({
+          title: "您的好友邀请您使用PLUS会员",
+          imageUrl: curShare.share_image_url,
+          path: `${curShare.jump_url}`,
+        });
+      },
+      toSaveImg(){
+        let shareIndex = this.shareIndex;
+        let curShare = this.shareList[shareIndex];
+        uni.getImageInfo({
+          src: curShare.share_image_url,
+          success: (res) => {
+            uni.saveImageToPhotosAlbum({
+              filePath: res.path,
+              success: () => {
+                uni.showToast({
+                  title: '保存成功',
+                  icon: "success"
+                })
+              }
+            })
+          }
+        })
+
+      },
       onJfbScroll(options) {
-        console.log('event.onJfbScroll', options)
+        // console.log('event.onJfbScroll', options)
       },
       onJfbReachBottom(options) {
         console.log('event.onJfbReachBottom', options)
@@ -146,16 +187,18 @@
             justify-content: center;
 
             &-inner{
-              width: 630rpx;
-              height: 960rpx;
-              background: url('https://sandbox-img.jufubao.cn/uploads/20250410/2d9f5ec31efb5cddece747d8b8da51f0.png?x-oss-process=style/size8') no-repeat;
-              background-size: auto 100%;
+              width: 100%;
+              height: 100%;
+              // background: url('https://sandbox-img.jufubao.cn/uploads/20250410/2d9f5ec31efb5cddece747d8b8da51f0.png?x-oss-process=style/size8') no-repeat;
+              // background-size: auto 100%;
               box-sizing: border-box;
-              display: flex;
-              flex-direction: column;
-              align-items: center;
-              padding-top: 60rpx;
-              
+              // display: flex;
+              // flex-direction: column;
+              // align-items: center;
+              image{
+                width: 100%;
+                height: 100%;
+              }
             }
             &-logo{
               height: 96rpx;

package/src/components/JfbBaseWithDrawAgain/Mock.js

@@ -1,13 +1,10 @@
 'use strict';
 
 module.exports = {
-  
-  getWithByIdFilmSquate:{},
-  
-  updateWithFilmPaiqiDate:{},
-  
-  removeWithFilmAddress:{},
-  
-  addWithFilmcart:{},
-  
+
+  getWithdrawOrderDetail: { "detail": { "partner_id": 161, "site_id": "04c78d51890a18b8", "user_id": 5000358, "wallet_type": "UC", "total_amount": 200, "channel_amount": 200, "order_id": "i771668569418104913", "channel_code": "wxpay", "channel_code_name": "微信", "channel_order_id": "", "channel_user_id": "oJM1I6-ns0kM_byNgio_n_ZuTqCk", "channel_app_id": "wxad70f65127f9471c", "wallet_nnid": "", "wallet_trade_nnid": "", "arrival_time": 0, "extras": "", "comment": "", "created_time": 1744940123, "updated_time": 0, "status": "N", "status_name": "提现中", "service_amount": 0, "service_rate": 0 }, "channel_name": "微信", "logo": "https:\/\/jfb-public-images.oss-cn-qingdao.aliyuncs.com\/system-paychannel-logo-wxpay.png?x-oss-process=style\/200_200", "request_id": "473e8bf6986efc25" },
+
+  getWithdrawThirdPlaceOrderList: { "order_id": "i771668569418104913", "channel_data": "ABBQO+oYAAABAAAAAAAvz7kzb9HMNRWNvawBaBAAAADnGpepZahT9IkJjn90+1qgAYQYW\/LmJL0WH47tlOYOunGem4Trqj+ox5EfmQFESJ76f9lMWaLN2pvCJ5stBUZFIFIjhvk8fybnzYnmaUkvbpln+bc=", "app_id": "wxad70f65127f9471c", "mch_id": "1614921673", "request_id": "48ef7a43d95aa020" },
+
+  cancelWithdraw: { "request_id": "48ef7a43d95aa020" }
 }

package/src/components/JfbBaseWithDrawRecord/JfbBaseWithDrawRecord.vue

@@ -57,7 +57,8 @@
         bodyBorder: {},
         againWithDrawPath: '',
         page_token: 1,
-        orderList: []
+        orderList: [],
+        hasNext: true
       }
     },
     computed: {
@@ -111,12 +112,13 @@
             ).fullTime;
             return item;
           })
-          this.hasNext = res.next_page_token !== "";
           if (this.page_token === 1) {
             this.orderList = list
           } else {
             this.orderList = this.orderList.concat(list);
           }
+          this.next_page_token = res.next_page_token
+          this.hasNext = res.next_page_token !== "";
         })
       },
       handleToDetail(item) {
@@ -126,7 +128,10 @@
         console.log('event.onJfbScroll', options)
       },
       onJfbReachBottom(options) {
-        console.log('event.onJfbReachBottom', options)
+        if (this.hasNext) {
+          this.page_token = this.next_page_token;
+          this.getOrderRecord()
+        }
       },
       onJfbShow(options) {
         this.getOrderRecord()

package/src/components/JfbBaseWithDrawRecord/Mock.js

@@ -1,13 +1,7 @@
 'use strict';
 
 module.exports = {
-  
-  getWithByIdFilmSquate:{},
-  
-  updateWithFilmPaiqiDate:{},
-  
-  removeWithFilmAddress:{},
-  
-  addWithFilmcart:{},
-  
+
+  getRecordWithdrawOrderList: { "next_page_token": "2", "total_size": 0, "list": [{ "order_id": "i771668569418104913", "channel_order_id": "1330001353947642504180083243436870", "channel_code": "wxpay", "channel_code_name": "微信", "total_amount": 200, "user_id": 5000358, "status": "F", "status_name": "失败", "arrival_time": 0, "comment": "", "created_time": 1744940123 }, { "order_id": "i771066286233878607", "channel_order_id": "1330001353947642504160061966293601", "channel_code": "wxpay", "channel_code_name": "微信", "total_amount": 10, "user_id": 5000358, "status": "Y", "status_name": "成功", "arrival_time": 1744796566, "comment": "", "created_time": 1744796528 }, { "order_id": "i771065517556367438", "channel_order_id": "1330001353947642504160093737710292", "channel_code": "wxpay", "channel_code_name": "微信", "total_amount": 10, "user_id": 5000358, "status": "Y", "status_name": "成功", "arrival_time": 1744796406, "comment": "", "created_time": 1744796345 }, { "order_id": "i771062549364867149", "channel_order_id": "1330001353947642504160084846150384", "channel_code": "wxpay", "channel_code_name": "微信", "total_amount": 10, "user_id": 5000358, "status": "Y", "status_name": "成功", "arrival_time": 1744795686, "comment": "", "created_time": 1744795637 }, { "order_id": "i771061580484837452", "channel_order_id": "1330001353947642504160039106651145", "channel_code": "wxpay", "channel_code_name": "微信", "total_amount": 10, "user_id": 5000358, "status": "Y", "status_name": "成功", "arrival_time": 1744795456, "comment": "", "created_time": 1744795406 }, { "order_id": "i771059916772212811", "channel_order_id": "1330001353947642504160031021516401", "channel_code": "wxpay", "channel_code_name": "微信", "total_amount": 10, "user_id": 5000358, "status": "Y", "status_name": "成功", "arrival_time": 1744795088, "comment": "", "created_time": 1744795009 }, { "order_id": "i771054224359293002", "channel_order_id": "1330001353947642504160089300449824", "channel_code": "wxpay", "channel_code_name": "微信", "total_amount": 10, "user_id": 5000358, "status": "Y", "status_name": "成功", "arrival_time": 1744794894, "comment": "", "created_time": 1744793652 }, { "order_id": "i771037005030096968", "channel_order_id": "1330001353947642504160086581901379", "channel_code": "wxpay", "channel_code_name": "微信", "total_amount": 10, "user_id": 5000358, "status": "F", "status_name": "失败", "arrival_time": 0, "comment": "", "created_time": 1744789547 }, { "order_id": "i771034877834297415", "channel_order_id": "", "channel_code": "wxpay", "channel_code_name": "微信", "total_amount": 1000, "user_id": 5000358, "status": "F", "status_name": "失败", "arrival_time": 0, "comment": "", "created_time": 1744789040 }, { "order_id": "i771034873199591494", "channel_order_id": "", "channel_code": "wxpay", "channel_code_name": "微信", "total_amount": 1000, "user_id": 5000358, "status": "F", "status_name": "失败", "arrival_time": 0, "comment": "", "created_time": 1744789038 }], "request_id": "e6f3ea562f8fd9e9" },
+
 }

package/src/components/JfbBaseWithdraw/Mock.js

@@ -2,12 +2,6 @@
 
 module.exports = {
   
-  getWithdrawByIdFilmSquate:{},
-  
-  updateWithdrawFilmPaiqiDate:{},
-  
-  removeWithdrawFilmAddress:{},
-  
-  addWithdrawFilmcart:{},
-  
+  getWithDrawDetail:{"wallet_list":[{"sort":2,"wallet_type":"UC","show_name":"可用余额","amount":19940,"is_support_withdraw":"Y"},{"sort":0,"wallet_type":"UT","show_name":"待到账余额","amount":0,"is_support_withdraw":"N"}],"request_id":"9de3e66af2da41d4"},
+  createWithdraw: {"order_id":"i771668569418104913","request_id":"bf9328f714d693aa"}
 }