jufubao-base 1.0.169-beta1 → 1.0.169-beta10

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

@@ -19,7 +19,7 @@ export default {
         ],
       },
       {
-        label: "温馨提示文案:",
+        label: "温馨提示文案 - 通用:",
         ele: "xd-tinymce",
         valueKey: "tips",
         value: data.tips || null,
@@ -27,7 +27,7 @@ export default {
       },
       {
         ele: "title",
-        label: "标题菜单配置",
+        label: "标题菜单配置 - 通用",
         size: "small",
         groupKey: "style",
       },
@@ -104,6 +104,7 @@ export default {
         label: "实体券表单样式配置",
         size: "small",
         groupKey: "style",
+        hidden: data.previewCurrent !== 'ticket',
       },
       {
         label: '表单容器设外边距:',
@@ -117,6 +118,7 @@ export default {
         placeholder: '请设置边距',
         inline: false,
         notice: '设置内边距，<span style="color: red">单位：像素</span>。默认值：<span style="color: red">20</span>像素',
+        hidden: data.previewCurrent !== 'ticket',
       },
       {
         label: "输入框样式:",
@@ -130,7 +132,8 @@ export default {
         list: [
           {label: '线性', value: "linear"},
           {label: '面性', value: "face"},
-        ]
+        ],
+        hidden: data.previewCurrent !== 'ticket',
       },
       data.inputStyle === 'linear' && {
         label: "表单边框颜色:",
@@ -139,6 +142,7 @@ export default {
         value: data.formBorderColor || "#F9F9F9",
         groupKey:'style',
         placeholder: "请选择表单边框颜色",
+        hidden: data.previewCurrent !== 'ticket',
       },
       data.inputStyle === 'linear' && {
         label: "表单边框宽度:",
@@ -149,6 +153,7 @@ export default {
         groupKey:'style',
         placeholder: "请输入表单边框宽度",
         className: 'input60',
+        hidden: data.previewCurrent !== 'ticket',
       },
       {
         label: "输入框间隔距离:",
@@ -159,12 +164,14 @@ export default {
         type: "number",
         placeholder: "请输入输入框间隔距离",
         className: 'input60',
+        hidden: data.previewCurrent !== 'ticket',
       },
       {
         ele: 'title',
         label: '实体券标签样式配置',
         size: 'small',
         groupKey: 'style',
+        hidden: data.previewCurrent !== 'ticket',
       },
       data.inputStyle === 'linear' && {
         label: "标签位置:",
@@ -178,7 +185,8 @@ export default {
         list: [
           {label: '居左', value: "left"},
           {label: '居上', value: "top"},
-        ]
+        ],
+        hidden: data.previewCurrent !== 'ticket',
       },
       data.inputStyle === 'linear' && {
         label: "标签文字对齐方式:",
@@ -193,7 +201,8 @@ export default {
           {label: '左对齐', value: "left"},
           {label: '右对齐', value: "right"},
           {label: '居中', value: "center"},
-        ]
+        ],
+        hidden: data.previewCurrent !== 'ticket',
       },
       {
         label: "标签宽度:",
@@ -204,6 +213,7 @@ export default {
         groupKey:'style',
         placeholder: "请输入标签宽度",
         className: 'input60',
+        hidden: data.previewCurrent !== 'ticket',
       },
       {
         label: "标签文字是否显示:",
@@ -217,7 +227,8 @@ export default {
         list: [
           {label: '显示', value: "Y"},
           {label: '不显示', value: "N"},
-        ]
+        ],
+        hidden: data.previewCurrent !== 'ticket',
       },
       data.labelShow === 'Y' && {
         label: "标签字体样式设置:",
@@ -241,6 +252,7 @@ export default {
         },
         inline: false,
         notice: '填充设置，单位：<span style="color: red">像素</span>。默认值：<span style="color: red">20</span> 像素',
+        hidden: data.previewCurrent !== 'ticket',
       },
       {
         label: "占位符字体样式设置:",
@@ -268,6 +280,7 @@ export default {
         },
         inline: false,
         notice: '填充设置，单位：<span style="color: red">像素</span>。默认值：<span style="color: red">20</span> 像素',
+        hidden: data.previewCurrent !== 'ticket',
       },
       {
         label: "内容字体样式设置:",
@@ -291,6 +304,7 @@ export default {
         },
         inline: false,
         notice: '填充设置，单位：<span style="color: red">像素</span>。默认值：<span style="color: red">20</span> 像素',
+        hidden: data.previewCurrent !== 'ticket',
       },
       {
         label: "票券号码图标:",
@@ -316,6 +330,7 @@ export default {
         },
         inline: false,
         notice: '填充设置，单位：<span style="color: red">像素</span>。默认值：<span style="color: red">20</span> 像素',
+        hidden: data.previewCurrent !== 'ticket',
       },
       {
         label: "票券密码图标:",
@@ -341,6 +356,7 @@ export default {
         },
         inline: false,
         notice: '填充设置，单位：<span style="color: red">像素</span>。默认值：<span style="color: red">20</span> 像素',
+        hidden: data.previewCurrent !== 'ticket',
       },
       {
         label: "验证码图标:",
@@ -366,12 +382,14 @@ export default {
         },
         inline: false,
         notice: '填充设置，单位：<span style="color: red">像素</span>。默认值：<span style="color: red">20</span> 像素',
+        hidden: data.previewCurrent !== 'ticket',
       },
       {
         ele: 'title',
         label: '表单右侧图标',
         size: 'small',
         groupKey: 'style',
+        hidden: data.previewCurrent !== 'ticket',
       },
       {
         label: "扫码图标:",
@@ -397,6 +415,7 @@ export default {
         },
         inline: false,
         notice: '填充设置，单位：<span style="color: red">像素</span>。默认值：<span style="color: red">20</span> 像素',
+        hidden: data.previewCurrent !== 'ticket',
       },
       {
         ele: 'title',
@@ -421,9 +440,10 @@ export default {
         placeholder: '请设置边距',
         inline: false,
         notice: '设置内边距，<span style="color: red">单位：像素</span>。默认值：<span style="color: red">20</span>像素',
+        hidden: data.previewCurrent !== 'ticket',
       },
       {
-        label: "按钮圆角",
+        label: "按钮圆角 - 通用",
         ele: 'xd-site-select-list',
         valueKey: 'btnRadius',
         value: data['btnRadius'] || '',
@@ -442,7 +462,7 @@ export default {
         },
       },
       {
-        label: "按钮图标设置",
+        label: "按钮图标设置 - 通用",
         ele: "xd-font",
         valueKey: "btnIcon",
         value: data.btnIcon || {},
@@ -471,6 +491,7 @@ export default {
         label: '电子码表单样式配置',
         size: 'small',
         groupKey: 'style',
+        hidden: data.previewCurrent !== 'code',
       },
       {
         label: "电子码表单外边距设置",
@@ -489,6 +510,7 @@ export default {
         placeholder: '请设置边距',
         inline: false,
         notice: '设置内边距，<span style="color: red">单位：像素</span>。默认值：<span style="color: red">20</span>像素',
+        hidden: data.previewCurrent !== 'code',
       },
       {
         label: "电子码按钮边距设置",
@@ -507,6 +529,7 @@ export default {
         placeholder: '请设置边距',
         inline: false,
         notice: '设置内边距，<span style="color: red">单位：像素</span>。默认值：<span style="color: red">20</span>像素',
+        hidden: data.previewCurrent !== 'code',
       },
       {
         label: "电子码票券号图标设置",
@@ -532,6 +555,7 @@ export default {
         },
         inline: false,
         notice: '填充设置，单位：<span style="color: red">像素</span>。默认值：<span style="color: red">20</span> 像素',
+        hidden: data.previewCurrent !== 'code',
       },
       {
         label: "电子码标签宽度设置",
@@ -540,6 +564,7 @@ export default {
         value: data.digitalCodeLabelWidth || 100,
         groupKey:'style',
         type: "number",
+        hidden: data.previewCurrent !== 'code',
       },
       {
         label: "电子码输入框颜色设置",
@@ -547,6 +572,7 @@ export default {
         valueKey: "digitalCodeColor",
         value: data.digitalCodeColor || "#dddddd",
         groupKey:'style',
+        hidden: data.previewCurrent !== 'code',
       },
       {
         label: '电子码输入框圆角设置:',
@@ -566,10 +592,11 @@ export default {
               console.error(error);
             });
         },
+        hidden: data.previewCurrent !== 'code',
       },
       {
         ele: 'title',
-        label: '温馨提示样式配置',
+        label: '温馨提示样式配置 - 通用',
         size: 'small',
         groupKey: 'style',
       },
@@ -597,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>
@@ -67,7 +67,7 @@
                   v-model="form.card_number"
                   placeholder="请输入票券号"
                 />
-                <view>
+                <view @click="doScanCode">
                   <xd-font-icon :icon="scanIcon.icon || 'iconsaoma'"
                     :color="scanIcon.color"
                     :style="{fontSize: scanIcon.fontSize}"
@@ -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;"
@@ -139,12 +140,13 @@
             :iconColor="digitalCodeIcon.color"
             content-align="left"
           >
-            <xd-form-input placeholder="请输入票券号" v-model="form.code" />
+            <xd-form-input prefixIcon="1" placeholder="请输入票券号" v-model="form.code" />
           </xd-form-item>
         </xd-form>
         <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,8 @@
         validImageAPIUrl: "",
         valid_token: "",
         formRenderKey: "formRenderKey",
+        hasCon: "", //是否有优惠券
+        jwxSDK: null,
        
         //todo
         tips: "",
@@ -252,6 +256,8 @@
         digitalCodeLabelWidth: "",
         digitalCodeRadius: 0,
         digitalCodeColor: "",
+        my_card_url: "",
+        backUrl: "",
       }
     },
     computed: {
@@ -316,6 +322,7 @@
         return this.styleObjectToString({
           background: this.tipBgColor,
           padding: padding,
+          fontSize: '24rpx',
         })
       },
       menuItemBoxStyle(){
@@ -363,6 +370,16 @@
       this.validImageAPIUrl = this.brandInfo['api_host'] + '/common/v1/valid_code/image/show'
       this.valid_token = this.$xdUniHelper.randomChar(20);
       //todo
+      // #ifdef H5
+      jfbRootExec("getH5WxAuthorize", {
+        vm: this,
+        data: {
+          jsApiList: ["chooseWXPay"],
+        }
+      }).then(res => {
+        this.jwxSDK = res.jwxSDK;
+      })
+      // #endif
     },
     methods: {
       onJfbLoad(options) {
@@ -407,6 +424,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 +438,147 @@
           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;
+      },
+      doScanCode(){
+        // #ifdef H5
+        this.jwxSDK.scanQRCode({
+          needResult: 1,
+          success: res => {
+            this.$set(this.form, 'card_number', res.resultStr)
+          }
+        })
+        // #endif
+        // #ifdef MP
+        uni.scanCode({
+          success: res => {
+            this.$set(this.form, 'card_number', res.result)
+          }
+        })
+        // #endif
+      },
       onJfbScroll(options) {
-        console.log('event.onJfbScroll', options)
+        // console.log('event.onJfbScroll', options)
       },
       onJfbReachBottom(options) {
         console.log('event.onJfbReachBottom', options)
@@ -438,9 +595,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: {},
 }