jufubao-base 1.0.160-beta1 → 1.0.162-beta10

package/src/components/JfbBaseCardBind/JfbBaseCardBind.vue

@@ -52,6 +52,8 @@ import JfbBaseCardBindMixin from "./JfbBaseCardBindMixin";
 import { Base64 } from "js-base64";
 import { getContainerPropsValue } from "@/utils/xd.base";
 
+
+//未启用
 export default {
   name: "JfbBaseCardBind",
   components: {

package/src/components/JfbBaseCardDisabled/JfbBaseCardDisabled.vue

@@ -81,7 +81,7 @@
                   @click.stop="handleUnBindCard(item)"
                   v-if="isShowUnbind"
                   :style="{ background: '#fff',color:'#999',border: '1px solid #999' }"
-                  >解绑</view>
+                >解绑</view>
               </view>
             </view>
           </view>
@@ -110,7 +110,7 @@ export default {
   data() {
     return {
       disableList: [],
-      isShowUnbind: false,
+      isShowUnbind: true,
       loadingList: true,
     };
   },
@@ -138,7 +138,7 @@ export default {
       })
         .then((res) => {
           this.loadingList = false;
-          this.isShowUnbind = (res["is_can_unbind"] === 'Y' || res["is_can_unbind"] === undefined);
+          //this.isShowUnbind = (res["is_can_unbind"] === 'Y' || res["is_can_unbind"] === undefined);
           res.list = res.list.map((item) => {
             return {
               ...item,

package/src/components/JfbBaseCardDisabledEntry/JfbBaseCardDisabledEntry.vue

@@ -169,7 +169,7 @@ export default {
   mixins: [componentsMixins, extsMixins, JfbBaseCardDisabledEntryMixin, colorCardMixins, cardListMixins],
   data() {
     return {
-      isShowUnbind: false,
+      isShowUnbind: true,
       isShowIndex:false,
     };
   },
@@ -200,7 +200,7 @@ export default {
       this.$xdShowLoading({});
       jfbRootExec("getDisableCardListEntry", {vm: this, data: {is_all: "Y", is_show_entry_settings: 'Y'},})
         .then((res) => {
-          this.isShowUnbind = (res["is_can_unbind"] === 'Y' || res["is_can_unbind"] === undefined);
+          //this.isShowUnbind = (res["is_can_unbind"] === 'Y' || res["is_can_unbind"] === undefined);
           res.list = res.list.map((item) => {
             return {
               ...item,

package/src/components/JfbBaseCardEntry/Attr.js

@@ -252,6 +252,18 @@ export default {
       inline: false,
       notice: '请配置温馨提示内容，未配置的情况将不显示此模块',
     },
+    {
+      label: '票券已登录文案:',
+      ele: 'el-input',
+      type: 'text',
+      valueKey: 'logged_name',
+      groupKey:'content',
+      value: '',
+      placeholder: '请输入票券已登录文案',
+      className: 'input80',
+      inline: false,
+      notice: '当未设置文案时候，前台页面显示为"<span style="color:red">已登录</span>"，建议不超过<span style="color:red">4</span>个汉字'
+    },
     {
       label: "是否展示核销二维码",
       ele: "xd-radio",

package/src/components/JfbBaseCardEntry/JfbBaseCardEntry.vue

@@ -173,7 +173,12 @@
               }"
             >
               <view class="card-list-warp" :style="{backgroundImage: 'url('+ item['theme']['image'] +')'}">
-                <view class="card-list__title"><view>{{item['card_type_name']}}</view></view>
+                <view class="card-list__title">
+                  <view>
+                    <view>{{item['card_type_name']}}</view>
+                    <view v-if="item['is_login'] === 'Y'"><text></text><text>已登录</text></view>
+                  </view>
+                </view>
                 <view class="card-list__content">
                   <view>
                     <text>券号：</text>
@@ -957,16 +962,44 @@ export default {
     align-items: center;
 
     & > view {
-      padding: 0 unit(80, rpx);
+      padding: 0 unit(40, rpx);
       font-size: unit(24, rpx);
       line-height: unit(56, rpx);
       background: rgba(102, 102, 102, 0.4);
       color: #fff;
       border-radius: 0 0 unit(16, rpx) 0;
+      display: flex;
+      justify-content: center;
+      align-items: center;
 
       .skeleton-card &{
         .skeleton-item(120rpx, 50rpx, 0 0 16rpx 0, #EEEEEE);
       }
+
+      & > view:nth-child(2) {
+        height: 36rpx;
+        line-height: 36rpx;
+        background-color: rgb(41, 203, 151);
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        margin-left: 30rpx;
+        padding: 0 20rpx;
+        border-radius: 8rpx;
+
+        & > text:nth-child(1) {
+          width: 10rpx;
+          height: 10rpx;
+          border-radius: 50%;
+          background-color: #fff;
+          margin-right: 10rpx;
+        }
+
+        & > text:nth-child(2) {
+          font-size: 24rpx;
+        }
+      }
+
     }
 
   }

package/src/components/JfbBaseCardEntry/Mock.js

@@ -14,6 +14,7 @@ module.exports = {
       "other_card_point": 0,
       "is_exchange": "N",
       "card_point_type": 1,
+      "is_login":'Y',
       "business_codes": ["health"]
     }, {
       "card_number": "121000100000028",

package/src/components/JfbBaseCardInfo/JfbBaseCardInfo.vue

@@ -19,27 +19,31 @@
     <view class="jfb-base-card-info__body" style="position: relative">
       <view v-if="!qrcode && showForm">
         <view>
-          <view class="jfb-base-card-info__body-form">
+          <view class="jfb-base-card-info__body-form" @click="handleLabel('card_number')">
             <view class="jfb-base-card-info__body-form-label">票券号码</view>
             <input
+              placeholder-style="line-height:26rpx;font-size:28rpx;color:#ccc"
               type="number"
+              :focus="card_number_focus"
               max="32"
               v-model="card_number"
               :placeholder="card_num_placeholder"
             />
           </view>
-          <view class="jfb-base-card-info__body-form">
+          <view class="jfb-base-card-info__body-form" @click="handleLabel('card_password')">
             <view class="jfb-base-card-info__body-form-label">票券密码</view>
             <input
               class="mp"
+              placeholder-style="line-height:26rpx;font-size:28rpx;color:#ccc"
               max="18"
               :password="isPassword"
+              :focus="card_password_focus"
               v-model="card_password"
               :placeholder="card_pwd_placeholder"
             />
             <!--#ifdef H5-->
             <xd-font-icon
-              @click="handleIcon()"
+              @click.stop="handleIcon()"
               :icon="isPassword ? 'iconbiyan' : 'iconchakan'"
             ></xd-font-icon>
             <!--#endif-->
@@ -47,7 +51,7 @@
             <xd-font-icon
               :width="72"
               :height="72"
-              @click="handleIcon()"
+              @click.stop="handleIcon()"
               :icon="isPassword ? 'iconbiyan' : 'iconchakan'"
             ></xd-font-icon>
             <!--#endif-->
@@ -160,6 +164,10 @@ export default {
       my_card_url: "", //我的票券跳转地址
 
       inCallbackUrlOrg:'',//是否带有回调地址
+
+      card_password_focus: false,
+      card_number_focus: false,
+
     };
   },
   computed: {
@@ -177,10 +185,25 @@ export default {
         return this.valueKey.filter(item => item.key !== "end_time");
       }
       return this.valueKey;
-    }
+    },
+  },
+  watch:{
+    container(value,oldValue) {
+      if(JSON.stringify(value) === JSON.stringify(oldValue)) return;
+      if (this.$configProject['isPreview']) this.init(value)
+    },
+  },
+  created() {
+    this.init(this.container)
   },
-  created() {},
   methods: {
+    handleLabel(el){
+      this.card_password_focus = false;
+      this.card_number_focus = false;
+      setTimeout(()=>{
+        this[`${el}_focus`] = true;
+      },50)
+    },
     handleIcon(){
       this.isPassword = !this.isPassword
     },
@@ -269,39 +292,26 @@ export default {
         }
       })
     },
-    init() {
-      this.backUrl = getContainerPropsValue(
-        this.container,
-        "content.back_url",
-        { value: "/pages/card/card" }
-      ).value;
-      this.card_num_placeholder = getContainerPropsValue(
-        this.container,
-        "content.card_num_placeholder",
-        "请输入券号(电子券除外)"
-      );
-      this.card_pwd_placeholder = getContainerPropsValue(
-        this.container,
-        "content.card_pwd_placeholder",
-        "请输入密码"
-      );
-      this.is_show_balance = getContainerPropsValue(this.container, 'content.is_show_balance', "N");
-      this.my_card_url = getContainerPropsValue(this.container, 'content.my_card_url', { value: "" }).value;
+    init(container) {
+      this.backUrl = getContainerPropsValue(container, "content.back_url", { value: "/pages/card/card" }).value;
+      this.card_num_placeholder = getContainerPropsValue(container, "content.card_num_placeholder", "请输入券号(电子券除外)");
+      this.card_pwd_placeholder = getContainerPropsValue(container, "content.card_pwd_placeholder", "请输入密码");
+      this.is_show_balance = getContainerPropsValue(container, 'content.is_show_balance', "N");
+      this.my_card_url = getContainerPropsValue(container, 'content.my_card_url', { value: "" }).value;
     },
     onJfbLoad(options) {
-      this.init();
-
-      this.qrcode = options.qrcode;
+      this.qrcode = options.qrcode || options.pa;
 
       //#ifdef MP-WEIXIN
-      if(options.qrcode) {
-        this.qrcode = decodeURIComponent(options.qrcode);
+      if(this.qrcode) {
+        this.qrcode = decodeURIComponent(this.qrcode);
       }
       //#endif
 
       if(options.inCallback) {
         this.inCallbackUrlOrg = options.inCallback;
       }
+
       if (this.qrcode) {
         jfbRootExec("getByQrCardDetail", {
           vm: this,
@@ -413,8 +423,7 @@ export default {
         color: #a6a6a6;
         margin-right: unit(70, rpx);
         text-align: center;
-
-
+        font-size: unit(28, rpx);
       }
 
       & .mp {
@@ -425,7 +434,8 @@ export default {
       }
 
       input {
-        font-size: unit(24, rpx);
+        font-size: unit(28, rpx);
+        flex: 1;
       }
 
       &-value {
@@ -458,6 +468,7 @@ export default {
         color: #a6a6a6;
         margin-right: unit(70, rpx);
         text-align: center;
+
       }
 
       &-value {

package/src/components/JfbBaseCardInfoEntry/JfbBaseCardInfoEntry.vue

@@ -16,26 +16,30 @@
     <view class="jfb-base-card-info-entry__body" :style="{minHeight: layoutInfo.bodyMinHeightRpx + 'rpx'}">
       <view v-if="!qrcode && showForm">
         <view>
-          <view class="jfb-base-card-info-entry__body-form">
+          <view class="jfb-base-card-info-entry__body-form" @click="handleLabel('card_number')">
             <view class="jfb-base-card-info-entry__body-form-label">票券号码</view>
             <input
+              placeholder-style="line-height:26rpx;font-size:28rpx;color:#ccc"
               type="number"
+              :focus="card_number_focus"
               max="32"
               v-model="card_number"
               :placeholder="card_num_placeholder"
             />
           </view>
-          <view class="jfb-base-card-info-entry__body-form">
+          <view class="jfb-base-card-info-entry__body-form" @click="handleLabel('card_password')">
             <view class="jfb-base-card-info-entry__body-form-label">票券密码</view>
             <input
               max="18"
+              placeholder-style="line-height:26rpx;font-size:28rpx;color:#ccc"
               :password="isPassword"
+              :focus="card_password_focus"
               v-model="card_password"
               :placeholder="card_pwd_placeholder"
             />
             <!--#ifdef H5-->
             <xd-font-icon
-              @click="handleIcon()"
+              @click.stop="handleIcon()"
               :icon="isPassword ? 'iconbiyan' : 'iconchakan'"
             ></xd-font-icon>
             <!--#endif-->
@@ -43,7 +47,7 @@
             <xd-font-icon
               :width="72"
               :height="72"
-              @click="handleIcon()"
+              @click.stop="handleIcon()"
               :icon="isPassword ? 'iconbiyan' : 'iconchakan'"
             ></xd-font-icon>
             <!--#endif-->
@@ -165,6 +169,9 @@ export default {
       my_card_url: "",  //我的票券跳转地址
       inCallbackUrlOrg:'',//是否带有回调地址
       is_show_balance: "N", //是否显示余额
+
+      card_password_focus: false,
+      card_number_focus: false,
     };
   },
   watch: {
@@ -190,6 +197,14 @@ export default {
   },
 
   methods: {
+    handleLabel(el){
+      this.card_password_focus = false;
+      this.card_number_focus = false;
+      setTimeout(()=>{
+        this[`${el}_focus`] = true;
+      },50)
+    },
+
     handleIcon(){
       this.isPassword = !this.isPassword
     },
@@ -302,17 +317,19 @@ export default {
       this.entryGroupId = getContainerPropsValue(container,"content.entryGroupId","default");
     },
     onJfbLoad(options) {
-      this.qrcode = options.qrcode;
+      this.qrcode = options.qrcode || options.pa;
 
       //#ifdef MP-WEIXIN
-      if(options.qrcode) {
-        this.qrcode = decodeURIComponent(options.qrcode);
+      if(this.qrcode) {
+        this.qrcode = decodeURIComponent(this.qrcode);
       }
       //#endif
 
       if(options.inCallback) {
         this.inCallbackUrlOrg = options.inCallback;
       }
+
+
       if (this.qrcode) {
         jfbRootExec("getByQrCardDetailEntry", {
           vm: this,
@@ -447,6 +464,7 @@ export default {
         color: #a6a6a6;
         margin-right: unit(70, rpx);
         text-align: center;
+        font-size: unit(28, rpx);
       }
 
       & .mp {
@@ -458,7 +476,8 @@ export default {
       }
 
       input {
-        font-size: unit(24, rpx);
+        font-size: unit(28, rpx);
+        flex: 1;
       }
 
       &-value {

package/src/components/JfbBaseCardShift/JfbBaseCardShift.vue

@@ -40,11 +40,11 @@
       </view>
       <view :style="{height:bottomHeight+100+'rpx'}"></view>
       <view class="jfb-base-card-shift__body-footer" :style="prod_bottom">
+        <xd-button type="primary" width="360rpx" @click="handleChange">立即转换</xd-button>
         <view class="jfb-base-card-shift__body-agree">
           <xd-radio size="small" v-model="isCheck"></xd-radio>
           <view>我已经阅读和同意积分转换规则</view>
         </view>
-        <xd-button type="primary" width="360rpx" @click="handleChange">立即转换</xd-button>
       </view>
       <xd-dailog
         class="dialog"
@@ -55,14 +55,22 @@
         :cancel="false"
       >
         <view class="jfb-base-card-shift__body-success">
-          <xd-font-icon
-            size="100"
-            color="#52C41A"
-            icon="icondui-01"
-          ></xd-font-icon>
-          <view class="jfb-base-card-shift__body-success-title">转换成功</view>
-          <view class="jfb-base-card-shift__body-success-content">您已成功将{{ card_number }} 转换为{{ changeNumber }}已自动帮您绑定成功，可在卡列表查询</view>
-          <xd-button type="primarys" width="360rpx" @click="handleToLink">返回列表</xd-button>
+          <view class="jfb-base-card-shift__body-success-head">
+            <xd-font-icon
+              size="42"
+              :color="mainColor"
+              icon="icondui-01"
+            ></xd-font-icon>
+            <view class="jfb-base-card-shift__body-success-title" :style="{
+              color: mainColor
+            }">票券转换成功</view>
+          </view>
+          
+          <view class="jfb-base-card-shift__body-success-content">
+            已成功将 <text class="b">{{ card_number }}</text><br/> 转换成为 <text class="b">{{ changeNumber }}</text><br/>
+            <text @click="handleToLink">可在券包中查看</text>
+          </view>
+          <!-- <xd-button type="primarys" width="360rpx" @click="handleToLink">返回列表</xd-button> -->
         </view>
       </xd-dailog>
     </view>
@@ -270,8 +278,7 @@ export default {
       justify-content: center;
       font-size: unit(24, rpx);
       color: #bbb;
-      padding: unit(20, rpx) 0;
-      margin-bottom: unit(40,rpx);
+      margin: unit(40,rpx) 0;
 
       & > view {
         margin-left: unit(25, rpx);
@@ -284,13 +291,21 @@ export default {
       right: 0;
       // bottom: unit(120,rpx) !important;
       height: unit(100, rpx);
+      background: #FFFFFF;
+      padding-top: unit(20, rpx);
     }
 
     &-success {
       padding: unit(70, rpx);
       &-title {
-        font-size: unit(42, rpx);
+        font-size: unit(36, rpx);
         color: #242424;
+        margin-left: 8px;
+      }
+      &-head{
+        display: flex;
+        align-items: center;
+        justify-content: center;
       }
 
       &-content {
@@ -298,7 +313,11 @@ export default {
         color: #5a5a5a;
         text-align: center;
         line-height: unit(42, rpx);
-        margin: unit(50, rpx) 0;
+        margin: unit(40, rpx) 0 0;
+        .b{
+          font-weight: bold;
+          margin-left: 8rpx;
+        }
       }
     }
 

package/src/components/JfbBaseCardSweepInfo/JfbBaseCardSweepInfo.vue

@@ -10,9 +10,7 @@
       :class="{ editx: isEditx && active }"
       v-if="isEditx && active"
     >
-      <view class="jfb-base-card-sweep-info__edit-icon" @click="delEdit"
-        >删除</view
-      >
+      <view class="jfb-base-card-sweep-info__edit-icon" @click="delEdit">删除</view>
     </view>
     <!-- #endif -->
     <view class="jfb-base-card-sweep-info__body" style="position: relative">
@@ -65,7 +63,7 @@
 
 <script>
 import XdFontIcon from "@/components/XdFontIcon/XdFontIcon";
-import { jfbRootExec } from "@/utils/xd.event";
+import { jfbRootExec, jfbRootFnExec } from "@/utils/xd.event";
 import JfbBaseCardSweepInfoMixin from "./JfbBaseCardSweepInfoMixin";
 import XdButton from "@/components/XdButton/XdButton";
 import XdUnit from "@/components/XdUnit/XdUnit";
@@ -111,6 +109,7 @@ export default {
 
       inCallbackUrlOrg:'',//是否带有回调地址
       is_show_balance: "N", //是否显示余额
+      hasCon: "", //是否有优惠券
     };
   },
   watch: {
@@ -143,6 +142,11 @@ export default {
 
   },
   methods: {
+    toShowCouponDialog(){
+      if(this.info){
+        jfbRootFnExec(this, 'onCustomEvent')("@showBaseConDialog", {user_card_number: this.info.card_number})
+      }
+    },
     handleToLink(path) {
       if (this.pa) {
         jfbRootExec("qrCardBind", {
@@ -152,30 +156,56 @@ export default {
           },
         })
           .then((res) => {
-            this.$xdAlert({
-              content: "绑定成功",
-              close: () => {
-                //#ifdef H5
-                let base = this.jfbAuthorize.getBasePath(this);
-                let url = `${location.origin}${base}${this.backUrl}`;
-                url = this.getUrlCallback(url)
-                this.$xdLog.setARMSInfo({url}, 'static_qr_card_bind');
+            //有优惠券处理
+            if(this.hasCon){
+              this.toShowCouponDialog();
+              this.$bus.$on("onCloseConDialog",(container_id) => {
+                if(container_id === this.hasCon){
+                  //#ifdef H5
+                  let base = this.jfbAuthorize.getBasePath(this);
+                  let url = `${location.origin}${base}${this.backUrl}`;
+                  url = this.getUrlCallback(url)
+                  this.$xdLog.setARMSInfo({url}, 'static_qr_card_bind');
 
-                setTimeout(()=>{
-                  window.location.href = url;
-                },50);
-                // #endif
+                  setTimeout(()=>{
+                    window.location.href = url;
+                  },50);
+                  // #endif
 
-                //#ifndef H5
-                let wPath = this.getUrlCallback(this.backUrl)
-                this.$xdUniHelper.redirectTo({
-                  url:wPath,
-                });
-                // #endif
+                  //#ifndef H5
+                  let wPath = this.getUrlCallback(this.backUrl)
+                  this.$xdUniHelper.redirectTo({
+                    url:wPath,
+                  });
+                  // #endif
+                }
+              })
+            } else {
+              this.$xdAlert({
+                content: "绑定成功",
+                close: () => {
+                  //#ifdef H5
+                  let base = this.jfbAuthorize.getBasePath(this);
+                  let url = `${location.origin}${base}${this.backUrl}`;
+                  url = this.getUrlCallback(url)
+                  this.$xdLog.setARMSInfo({url}, 'static_qr_card_bind');
 
+                  setTimeout(()=>{
+                    window.location.href = url;
+                  },50);
+                  // #endif
 
-              },
-            });
+                  //#ifndef H5
+                  let wPath = this.getUrlCallback(this.backUrl)
+                  this.$xdUniHelper.redirectTo({
+                    url:wPath,
+                  });
+                  // #endif
+
+
+                },
+              });
+            }
           })
           .catch();
       }
@@ -186,6 +216,7 @@ export default {
     },
     onJfbLoad(options) {
       this.pa = options.pa;
+
       if(options.inCallback) {
         this.inCallbackUrlOrg = options.inCallback;
       }
@@ -233,6 +264,12 @@ export default {
     onJfbShow(options) {
       this.onJfbLoad(options);
     },
+    onJfbCustomEvent({action, data}){
+      if(action === 'baseConDialog@hasCon'){
+        this.hasCon = data;
+      }
+      console.log('onJfbCustomEvent',action, data);
+    }
   },
 };
 </script>