jufubao-base 1.0.61-beta1001 → 1.0.61-beta5

package/package.json

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

package/src/components/JfbBaseCardDetailEntry/JfbBaseCardDetailEntry.vue

@@ -463,7 +463,7 @@ export default {
     handleUnBindCard() {
       this.$xdConfirm({
         $vm: this,
-        content: "您确定要解除绑定票券吗",
+        content: "您确定要解除绑定卡券吗",
         title: "系统提示",
         width: "80%",
         isTitle: true,

package/src/components/JfbBaseCardMergeEntry/JfbBaseCardMergeEntry.vue

@@ -264,7 +264,7 @@ export default {
         title: "是否确认合并票券",
         isHtml: true,
         $vm: this,
-        content: `<div class="label-value"><div><span>转出票券：</span><span>${outHtml}</span></div><div><span>转入票券：</span><span>${inHtml}</span></div></div>`,
+        content: `<div class="label-value"><div><span>转出卡号：</span><span>${outHtml}</span></div><div><span>转入卡号：</span><span>${inHtml}</span></div></div>`,
         success: (action) => {
           let params = {
             from_card_number: this.fromSelect.value,
@@ -277,12 +277,12 @@ export default {
             if(this.$configProject.isPreview) return;
             jfbRootExec("mergeCardEntry", { vm: this,data: params})
               .then((res) => {
-                this.$xdAlert({content: '合卡成功！', time: 1000});
+                this.$xdAlert({content: '合卡成功！'});
                 setTimeout(()=>{
                   this.$xdUniHelper.navigateTo({
                     url: this.cardPath
                   })
-                }, 2000);
+                }, 1500);
               })
               .catch((err) => {
                 this.$xdLog.catch(err)