jufubao-base 1.0.169-beta4 → 1.0.169-beta6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jufubao-base",
-  "version": "1.0.169-beta4",
+  "version": "1.0.169-beta6",
   "private": false,
   "description": "聚福宝业务组件基础插件包",
   "main": "index.js",

package/src/components/JfbBaseMapSearch/MapSearchMp.vue

@@ -46,7 +46,7 @@
 			this.BMap = new bmap.BMapWX({
 				ak: this.ak
 			})
-			uni.getLocation({
+			wx.getFuzzyLocation({
 				type: "gcj08",
 				success: res => {
 					console.log("getLocation", res);

package/src/components/JfbBaseOrderDetail/Api.js

@@ -1,13 +1,7 @@
 'use strict';
 
 /**
- * @description API模型
- * 建议：Ffff=>模块  Xxxx=>自定义名字
- * 获取单记录(getByIdFfffXxxx)
- * 获取列表记录(getByListFfffXxxx)
- * 添加列表记录(addFfffXxxxx)
- * 删除列表记录(removeFfffXxxxx|deleteFfffXxxx)
- * 更新列表记录(updateFfffXxxxx)
+ * @description 订单详情模块
  * @type {*[]}
  */
 module.exports = [
@@ -45,4 +39,15 @@ module.exports = [
     isConsole: true,
     disabled: true,
   },
+  {
+    mapFnName: 'deleteBaseOrder', //自定义方法名字（必选）
+    title: '删除订单',
+    path: '/order/v1/order/delete-main-order',
+    isRule: false,
+    data: {
+      main_order_id: ['id', 'Number', '必选'],
+    },
+    isConsole: true,
+    disabled: true,
+  },
 ];

package/src/components/JfbBaseOrderDetail/Attr.js

@@ -22,20 +22,6 @@ export default {
         inline: false,
         notice: '前台页面展示会根据返回数据类型进行页面渲染'
       },
-      {
-        label: '是否需要客服电话:',
-        ele: 'xd-radio',
-        valueKey: 'is_hot',
-        value: data['is_hot'] || 'N',
-        groupKey:'content',
-        placeholder: '请选择是否需要客服电话',
-        multiple: false,
-        className: 'input80',
-        list: [
-          { label: '是', value: 'Y' },
-          { label: '否', value: 'N' },
-        ]
-      },
       {
         label: '自定义内容:',
         ele: 'xd-site-news',
@@ -260,6 +246,20 @@ export default {
           }
         },
       },
+      {
+        label: '是否需要客服电话:',
+        ele: 'xd-radio',
+        valueKey: 'is_hot',
+        value: data['is_hot'] || 'N',
+        groupKey:'content',
+        placeholder: '请选择是否需要客服电话',
+        multiple: false,
+        className: 'input80',
+        list: [
+          { label: '是', value: 'Y' },
+          { label: '否', value: 'N' },
+        ]
+      },
       {
         label: "是否展示可用门店:",
         ele: 'xd-radio',
@@ -274,6 +274,20 @@ export default {
           { label: '否', value: 'N' },
         ]
       },
+      {
+        label: "是否允许删除订单:",
+        ele: 'xd-radio',
+        valueKey: "is_show_delete_order",
+        value: data['is_show_delete_order'] || 'N',
+        groupKey:'content',
+        placeholder: '请选择是否允许删除订单',
+        multiple: false,
+        className: 'input80',
+        list: [
+          { label: '允许', value: 'Y' },
+          { label: '不允许', value: 'N' },
+        ]
+      },
       {
         label: '外填充:',
         ele: 'xd-margin-padding',

package/src/components/JfbBaseOrderDetail/JfbBaseOrderDetail.vue

@@ -683,9 +683,8 @@
           <view v-else>
             <xd-button
               size="small"
-              type="primary"
+              :type="item.type !== undefined ? item.type: 'primary'"
               radius="40rpx"
-              :bg-color="mainColor"
               @click="handleAction(item)"
             >{{ item.text }}</xd-button>
           </view>
@@ -741,6 +740,7 @@ import { mapState } from "vuex";
 import bizMock from "./bizMock";
 import Color from "color";
 
+
 export default {
   name: "JfbBaseOrderDetail",
   components: {
@@ -774,6 +774,7 @@ export default {
       is_not_show_price: "",
       brandTextColor:'',
       is_show_support_shop: "",
+      is_show_delete_order:'N', //删除订单
 
       showPassword: false,
       dialogPassword: "",
@@ -822,6 +823,11 @@ export default {
         this.getOrderDetail();
       }
     },
+    is_show_delete_order(){
+      if (this.isPreview) {
+        this.getOrderDetail();
+      }
+    },
   },
   computed: {
     ...mapState(['siteInfo']),
@@ -857,8 +863,7 @@ export default {
   },
   methods: {
     onJfbLoad(options) {
-      this.main_order_id =
-        options.id || options.order_id || options.main_order_id;
+      this.main_order_id = options.id || options.order_id || options.main_order_id;
       this.getOrderDetail();
     },
 
@@ -993,6 +998,20 @@ export default {
             ).fullTime;
             res.film_show.thumb = getServiceUrl(res.film_show.thumb);
           }
+
+          //增加删除订单按钮
+          if(this.is_show_delete_order  === 'Y') {
+            let pay = (res.buttons||[]).filter(item => item.action === 'pay');
+            let del = [{action:'delete', text:'删除订单', type: 'info'}];
+            if(pay.length === 1) del = []
+            res.buttons = del.concat(res.buttons || []).map(item=>{
+              if(item.action === 'view_logistics' && !item.type) {
+                item.type = 'default';
+              }
+              return item
+            });
+          }
+
           if (res.product) {
             jfbRootExec("getBaseProductDetail", {
               vm: this,
@@ -1011,7 +1030,8 @@ export default {
               .catch((err) => {
                 console.log(err, "err");
               });
-          } else {
+          }
+          else {
             this.info = res;
             if (this.info.status.loading_timeout != "-1") {
               this.timeDown();
@@ -1051,6 +1071,7 @@ export default {
       this.is_border_w = getContainerPropsValue(container, "content.is_border_w", 2);
       this.viewStatus = getContainerPropsValue(container, "content.viewStatus", "mall");
       this.is_show_support_shop = getContainerPropsValue(container, "content.is_show_support_shop", "N");
+      this.is_show_delete_order = 'Y'//getContainerPropsValue(container, "content.is_show_delete_order", "N");
     },
     getCountDown() {
       this.timer = setInterval(() => {
@@ -1135,25 +1156,15 @@ export default {
     },
     handleAction(item) {
       if (item.action === "view_logistics") {
-        // if (
-        //   this.info.extras.first_logistics_package_id &&
-        //   this.info.extras.logistics_count === 1
-        // ) {
-        //   this.$xdUniHelper.navigateTo({
-        //     url: `${this.logisticsPath}?package_id=${this.info.extras.first_logistics_package_id}`,
-        //   });
-        // } else {
-        //   this.$xdUniHelper.navigateTo({
-        //     url: `${this.packageListPath}?order_id=${this.main_order_id}`,
-        //   });
-        // }
         this.$xdUniHelper.navigateTo({
           url: `${this.packageListPath}?order_id=${this.main_order_id}`,
         });
-      } else {
+      }
+      else if(item.action === 'cancel_unpaid') {
         this.$xdConfirm({
           styles: this.styles,
           content: "是否取消订单",
+          zIndex: 3000,
           success: (action) => {
             if (action.confirm) {
               jfbRootExec("cancelBaseOrder", {
@@ -1175,6 +1186,43 @@ export default {
           },
         });
       }
+      else if(item.action === 'delete'){
+        this.$xdConfirm({
+          styles: this.styles,
+          content: "是否要删除当前订单吗？",
+          zIndex: 3000,
+          success: (action) => {
+            if (action.confirm) {
+              this.handleDeleteOrder();
+            }
+          },
+        });
+      }
+      else {
+        console.error(`item.action=${item.action}, 此action不可用`)
+      }
+    },
+
+    handleDeleteOrder(){
+      jfbRootExec("deleteBaseOrder", {
+        vm: this,
+        data: {
+          main_order_id: this.main_order_id,
+        },
+      })
+        .then((res) => {
+          this.$xdAlert({
+            content: "删除成功",
+            time: 2000,
+            zIndex: 3000,
+          });
+          setTimeout(()=>{
+            this.$xdUniHelper.navigateBack()
+          },3000)
+        })
+        .catch((err) => {
+          console.log(err, "err");
+        });
     },
 
     onJfbShow(options) {

package/src/components/JfbBaseOrderDetail/Mock.js

@@ -95,5 +95,7 @@ module.exports = {
       "shop_address": "北京3北京西夏区城区河北省廊坊市三河市燕郊开发区燕高路西侧实验小学南侧 "
     },
     "request_id": "6178d3499b91f274"
-  }
+  },
+  cancelBaseOrder:{"pay_order_id": "488003809474256896","request_id": "6178d3499b91f274"},
+  deleteBaseOrder:{"pay_order_id": "488003809474256896","request_id": "6178d3499b91f274"},
 }

package/src/components/JfbBaseTfkCardBind/Api.js

@@ -6,53 +6,72 @@
  */
 module.exports = [
   {
-    //设置方法名字当别忘记加上【模块名字】：Tfk
-    mapFnName: 'getTfkByIdFilmSquate',
-    title: '获取电影广场列表',
-    path: '/api/account/film/list-film-square',
+    mapFnName: 'qrcodeCardBind',
     isRule: false,
-    params: {
-      last_key: ['当前页', 'Number', '必选'],
-      page_size: ['每页数量', 'Number', '必选'],
+    title: '根据二维码绑定卡',
+    prefix: 'qrcode',
+    path: '/card/v1/card-bind/bind-card-by-qrcode',
+    data: {
+      card_qrcode: ['二维码内容', 'String', '必选'],
     },
-    isConsole: true,
     disabled: true,
   },
   {
-    //设置方法名字当别忘记加上【模块名字】：Tfk
-    mapFnName: 'updateTfkFilmPaiqiDate',
-    title: '更新排期',
-    path: '/api/account/film/paiqi-date',
+    mapFnName: 'getByPwdCardDetail',
     isRule: false,
-    params: {
-      film_id: ['电影id', 'Number', '必选'],
-      cinema_id: ['影院id', 'Number', '必选'],
+    title: '根据卡号密码获得卡信息',
+    prefix: 'detal',
+    path: '/card/v1/card-bind/get-card-by-password',
+    data: {
+      card_number: ['卡号', 'String', '必选'],
+      card_password: ['卡号密码', 'String', '必选']
     },
-    isConsole: true,
     disabled: true,
   },
   {
-    //设置方法名字当别忘记加上【模块名字】：Tfk
-    mapFnName: 'removeTfkFilmAddress',
-    title: '删除我的配送地址',
-    path: '/api/account/film/paiqi-date',
+    mapFnName: 'getByQrCardDetail',
     isRule: false,
-    params: {
-      film_id: ['电影id', 'Number', '必选'],
+    title: '根据二维码获得卡信息',
+    prefix: 'detal',
+    path: '/card/v1/card-bind/get-card-by-qrcode',
+    data: {
+      card_qrcode: ['二维码', 'String', '必选'],
     },
-    isConsole: true,
     disabled: true,
   },
   {
-    //设置方法名字当别忘记加上【模块名字】：Tfk
-    mapFnName: 'addTfkFilmcart',
-    title: '添加购物车',
-    path: '/api/account/film/paiqi-date',
+    mapFnName: 'pwdCardBind',
     isRule: false,
-    params: {
-      film_id: ['电影id', 'Number', '必选'],
+    title: '根据卡号密码绑定卡',
+    prefix: 'pwd',
+    path: '/card/v1/card-bind/bind-card-by-password',
+    data: {
+      card_number: ['卡号', 'String', '必选'],
+      card_password: ['密码', 'String', '可选'],
+    },
+    disabled: true,
+  },
+  {
+    mapFnName: 'qrCardBind',
+    isRule: false,
+    title: '根据二维码绑定卡',
+    prefix: 'qrcode',
+    path: '/card/v1/card-bind/bind-card-by-qrcode',
+    data: {
+      card_qrcode: ['二维码', 'String', '必选'],
     },
-    isConsole: true,
     disabled: true,
   },
+  {
+    mapFnName: "checkValidCode",
+    title: "图片验证码 - 校验",
+    path: "/common/v1/valid_code/image/check",
+    isRule: false,
+    data: {
+      token: ['随机请求码，前端生成', 'String', '必选'],
+      valid_code: ['验证码', 'String', '必选'],
+    },
+    isConsole: true,
+    disabled: true,
+  }
 ];

package/src/components/JfbBaseTfkCardBind/Attr.js

@@ -624,7 +624,31 @@ export default {
         placeholder: '请设置边距',
         inline: false,
         notice: '设置内边距，<span style="color: red">单位：像素</span>。默认值：<span style="color: red">20</span>像素',
-      }
+      },
+      {
+        label: '我的票券跳转地址:',
+        ele: 'xd-select-pages-path',
+        valueKey: 'my_card_url',
+        groupKey: 'advanced',
+        placeholder: '请选择我的票券跳转地址',
+        value: null,
+        setting: {
+          router: XdBus.getParentApi('getPagesTree'),
+        },
+        inline: false,
+      },
+      {
+        label: '卡绑定成功回跳地址:',
+        ele: 'xd-select-pages-path',
+        valueKey: 'back_url',
+        groupKey: 'advanced',
+        placeholder: '请选择卡绑定成功回跳地址',
+        value: null,
+        setting: {
+          router: XdBus.getParentApi('getPagesTree'),
+        },
+        inline: false,
+      },
     ].filter(i=>i)
   },
   advanced: [],

package/src/components/JfbBaseTfkCardBind/JfbBaseTfkCardBind.vue

@@ -35,11 +35,11 @@
     }">
       <view class="menu_wrap" :style="menuBoxStyle">
         <view class="menu_list">
-          <view class="menu_item">
+          <view class="menu_item" @click="switchShowType('ticket')">
             <view class="menu_inner" :class="menuShowType"
               :style="[menuType == 'ticket' ? menuItemActiveStyle : menuItemStyle, menuItemBoxStyle]">实体券</view>
           </view>
-          <view class="menu_item">
+          <view class="menu_item" @click="switchShowType('code')">
             <view class="menu_inner" :class="menuShowType"
               :style="[menuType == 'code' ? menuItemActiveStyle : menuItemStyle, menuItemBoxStyle]">电子码</view>
           </view>
@@ -114,6 +114,7 @@
           <view :style="btnWrapStyle">
             <xd-button type="primary"
               :radius="btnRadius + 'rpx'"
+              @click="toBindCardTicket"
             >
               <xd-font-icon :icon="btnIcon.icon"
                 style="display: inline-flex;margin-right: 12rpx;"
@@ -145,6 +146,7 @@
         <view :style="digitalBtnWrapStyle">
           <xd-button type="primary"
             :radius="btnRadius + 'rpx'"
+            @click="toBindCardDigital"
           >
             <xd-font-icon :icon="btnIcon.icon"
               style="display: inline-flex;margin-right: 12rpx;"
@@ -193,6 +195,7 @@
         validImageAPIUrl: "",
         valid_token: "",
         formRenderKey: "formRenderKey",
+        hasCon: "", //是否有优惠券
        
         //todo
         tips: "",
@@ -252,6 +255,8 @@
         digitalCodeLabelWidth: "",
         digitalCodeRadius: 0,
         digitalCodeColor: "",
+        my_card_url: "",
+        backUrl: "",
       }
     },
     computed: {
@@ -316,6 +321,7 @@
         return this.styleObjectToString({
           background: this.tipBgColor,
           padding: padding,
+          fontSize: '24rpx',
         })
       },
       menuItemBoxStyle(){
@@ -407,6 +413,8 @@
         this.digitalCodeLabelWidth = getContainerPropsValue(value, "content.digitalCodeLabelWidth", '100');
         this.digitalCodeRadius = getContainerPropsValue(value, "content.digitalCodeRadius", '0');
         this.digitalCodeColor = getContainerPropsValue(value, "content.digitalCodeColor", '#dddddd');
+        this.my_card_url = getContainerPropsValue(this.container, 'content.my_card_url', { value: "" }).value;
+        this.backUrl = getContainerPropsValue(this.container, 'content.back_url', { value: "" }).value;
 
         console.log(this.digitalCodeRadius, "digitalCodeRadius");
 
@@ -419,9 +427,130 @@
           this.formRenderKey = Date.now();
         }
       },
-      
+      toShowCouponDialog(){
+        if(this.info){
+          jfbRootFnExec(this, 'onCustomEvent')("@showBaseConDialog", {user_card_number: this.form.card_number})
+        }
+      },
+      switchShowType(type){
+        this.menuType = type;
+      },
+      handlerAfterBindCard(res){
+        //已绑定卡券处理
+        if(res.pop_info && res.pop_info.pop_code === '1001'){
+          this.handleBindConfirm();
+          return;
+        }
+        let path = this.getUrlCallback(this.my_card_url || this.backUrl);
+        //有优惠券处理
+        if(this.hasCon){
+          this.toShowCouponDialog();
+          this.$bus.$on("onCloseConDialog",(container_id) => {
+            if(container_id === this.hasCon){
+              this.$xdUniHelper.redirectTo({
+                url: path,
+              });
+            }
+          })
+        }
+
+        //票券绑定成功
+        else{
+          this.$xdAlert({
+            content: "票券绑定成功",
+            close: () => {
+              this.$xdUniHelper.redirectTo({
+                url: path,
+              });
+            },
+          });
+        }
+      },
+      //卡券已被自己绑定时的弹框
+      handleBindConfirm(){
+        this.$xdConfirm({
+          styles: this.styles,
+          width: '90%',
+          content: '您已绑定该票券，无需再次绑定',
+          confirmText: '我的票券',
+          cancelText: '返回',
+          showClose: false,
+          success: (res) => {
+            if (res.confirm) {
+              let path = this.getUrlCallback(this.my_card_url || this.backUrl);
+              this.$xdUniHelper.redirectTo({ url: path});
+            }else{
+            }
+          }
+        })
+      },
+      //绑定实体券
+      async toBindCardTicket(){
+        console.log(this.form, 'this.form')
+        const { card_password, card_number, valid_code } = this.form;
+        if(!valid_code) return uni.showToast({
+          title: '请输入验证码',
+          icon: "none"
+        })
+        await this.checkValidToken();
+
+        jfbRootExec("pwdCardBind", {
+          vm: this,
+          data: {
+            card_password: card_password,
+            card_number: card_number + "",
+            is_show_pop: "Y"
+          }
+        }).then(res => {
+          this.handlerAfterBindCard(res);
+        })
+      },
+      //绑定电子码票券
+      toBindCardDigital(){
+        const { code } = this.form;
+
+        if(!code) return "";
+        jfbRootExec("pwdCardBind", {
+          vm: this,
+          data: {
+            card_password: code,
+            is_show_pop: "Y"
+          }
+        }).then(res => {
+          this.handlerAfterBindCard(res);
+        })
+      },
+      checkValidToken(){
+        const { valid_code } = this.form;
+        let token = this.valid_token;
+        return new Promise((r,j) => {
+          jfbRootExec("checkValidCode", {
+            vm: this,
+            data: {
+              token,
+              valid_code
+            }
+          }).then(res => {
+            if(res.is_valid){
+              r();
+            }else{
+              uni.showToast({
+                title: '验证码错误',
+                duration: 2000,
+                icon: "none"
+              });
+              this.switchValidToken();
+              j();
+            }
+          })
+        })
+      },
+      switchValidToken(){
+        let valid_token = this.$xdUniHelper.randomChar(20);
+        this.valid_token = valid_token;
+      },
       onJfbScroll(options) {
-        console.log('event.onJfbScroll', options)
+        // console.log('event.onJfbScroll', options)
       },
       onJfbReachBottom(options) {
         console.log('event.onJfbReachBottom', options)
@@ -438,9 +567,12 @@
       onJfbUpdate(...data) {
         console.log('event.onJfbUpdate', data)
       },
-      onJfbCustomEvent(options) {
-        console.log('event.onJfbReachBottom', options)
-      },
+      onJfbCustomEvent({action, data}){
+      if(action === 'baseConDialog@hasCon'){
+        this.hasCon = data;
+      }
+      console.log('onJfbCustomEvent',action, data);
+    }
     }
   }
 

package/src/components/JfbBaseTfkCardBind/Mock.js

@@ -1,13 +1,23 @@
 'use strict';
 
 module.exports = {
-  
-  getTfkByIdFilmSquate:{},
-  
-  updateTfkFilmPaiqiDate:{},
-  
-  removeTfkFilmAddress:{},
-  
-  addTfkFilmcart:{},
-  
+  getByPwdCardDetail: {
+    "card_number": "101001000005195",
+    "card_point": 0,
+    "card_type_name": "聚福宝",
+    "end_time": "2024-10-31 23:59:59",
+    "card_status": "Y",
+    "card_status_name": "开启",
+    "unit": "点",
+    "main_product_name": "",
+    "is_exchange": "N",
+    "is_expired":'Y',
+    "request_id": "741c41d86c5ae0cf",
+    "main_business_code_name": "蛋糕(勿改)",
+    "other_card_point": 4073,
+  },
+  pwdCardBind: { "id": 20, "request_id": "91f76bd11d5889be" },
+  qrcodeCardBind: {},
+  getByQrCardDetail: {},
+  qrCardBind: {},
 }

package/src/components/JfbBaseTfkCardDetail/Api.js

@@ -16,6 +16,17 @@ module.exports = [
     },
     disabled: true,
   },
+  {
+    mapFnName: 'loginTfkCardBind',
+    isRule: false,
+    title: '登录卡',
+    prefix: 'login',
+    path: '/card/v1/card-bind/login-card',
+    data: {
+      card_number: ['卡号', 'String', '必选'],
+    },
+    disabled: true,
+  },
   {
     mapFnName: 'getListBaseNewsContent', //自定义方法名字（必选）
     title: '获取内容',