jufubao-base 1.0.56-beta2003 → 1.0.56-beta2005

package/package.json

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

package/src/components/JfbBaseCardDisabledEntry/Api.js

@@ -1,13 +1,7 @@
 'use strict';
 
 /**
- * @description API模型
- * 建议：Ffff=>模块  Xxxx=>自定义名字
- * 获取单记录(getByIdFfffXxxx)
- * 获取列表记录(getByListFfffXxxx)
- * 添加列表记录(addFfffXxxxx)
- * 删除列表记录(removeFfffXxxxx|deleteFfffXxxx)
- * 更新列表记录(updateFfffXxxxx)
+ * @description api
  * @type {*[]}
  */
 module.exports = [
@@ -31,4 +25,15 @@ module.exports = [
     params: {},
     disabled: true,
   },
+  {
+    mapFnName: 'batchDisabledCardUnbindEntry',
+    isRule: false,
+    title: '批量解绑卡',
+    prefix: 'list',
+    path: '/card/v1/card-bind/batch-unbind-card',
+    data: {
+      card_numbers: ['卡号(英文逗号分隔)', 'String', '必选'],
+    },
+    disabled: true,
+  },
 ];

package/src/components/JfbBaseCardDisabledEntry/JfbBaseCardDisabledEntry.vue

@@ -38,12 +38,6 @@
                 <text>券号：</text>
                 <text>{{item.card_number}}</text>
               </view>
-              <view @click.stop="toDetail(item)" v-if="0">
-                <view>
-                  <xd-font-icon icon="iconerweima" width="56" height="56" size="50" color="#fff"></xd-font-icon>
-                </view>
-                <view>点击查看</view>
-              </view>
             </div>
             <view class="card-list__date">
               <text>有效期：</text>
@@ -166,7 +160,7 @@ export default {
             let cardIds = this.disableList.map(item=>{
               return item.card_number + ''
             });
-            jfbRootExec("disabledCardUnbindEntry", {vm: this, data: {card_number: cardIds.join(','),},})
+            jfbRootExec("disabledCardUnbindEntry", {vm: this, data: {card_numbers: cardIds.join(','),},})
               .then((res) => {
                 this.$xdAlert({
                   content: "解绑成功",
@@ -177,7 +171,6 @@ export default {
               })
               .catch((err) => {
                 this.$xdLog.catch(err);
-                console.log(err, "err");
               });
           }
         },

package/src/components/JfbBaseCardMergeEntry/JfbBaseCardMergeEntry.vue

@@ -68,6 +68,54 @@
           </view>
         </xd-form-item>
       </xd-form>
+      <view class="merge">
+        <view class="merge-item" :style="{background: themeOutStyle['color']}">
+          <view class="merge-item-box" :style="{backgroundImage: 'url('+ themeOutStyle['image'] +')'}">
+            <view class="merge-item-title">
+              <xd-font-icon icon="iconzhuanchu"></xd-font-icon>
+              <view>转出的票券</view>
+            </view>
+            <view>
+              <xd-select
+                :height="66"
+                radius="33rpx"
+                :list="fromList"
+                :border-color="themeOutStyle['color']"
+                justify-content="space-between"
+                :color="themeOutStyle['color']"
+                placeholder="选择转出票券"
+                v-model="fromSelect"
+              ></xd-select>
+            </view>
+          </view>
+        </view>
+        <view class="merge-item" :style="{background: themeInStyle['color']}">
+          <view class="merge-item-box" :style="{backgroundImage: 'url('+ themeInStyle['image'] +')'}">
+            <view class="merge-item-title">
+              <xd-font-icon icon="iconzhuanru"></xd-font-icon>
+              <view>转入的票券</view>
+            </view>
+            <view>
+              <xd-select
+                :height="66"
+                radius="33rpx"
+                :list="fromList"
+                :border-color="themeInStyle['color']"
+                justify-content="space-between"
+                :color="themeInStyle['color']"
+                placeholder="选择转入票券"
+                v-model="toSelect"
+              ></xd-select>
+            </view>
+          </view>
+        </view>
+      </view>
+      <view class="code">
+        <view>验证码：</view>
+        <view>
+          <xd-form-input v-model="code"></xd-form-input>
+        </view>
+      </view>
       <view class="jfb-base-card-merge-entry__body-btn">
         <xd-button @click="handleToSubmit" width="90%" type="primary" >提交</xd-button>
       </view>
@@ -90,9 +138,11 @@ import XdFormItem from "@/components/XdFormItem/XdFormItem";
 import XdFormSelect from "@/components/XdFormSelect/XdFormSelect";
 import XdFormInput from "@/components/XdFormInput/XdFormInput";
 import XdButton from "@/components/XdButton/XdButton";
+import XdSelect from "@/components/XdSelect/XdSelect";
 import XdContentXss from '@/components/XdContentXss/XdContentXss'
 import { jfbRootExec } from "@/utils/xd.event";
 import JfbBaseCardMergeEntryMixin from "./JfbBaseCardMergeEntryMixin";
+import colorCardMixins from "@/mixins/colorCardMixins";
 import { getContainerPropsValue } from "@/utils/xd.base";
 import componentsMixins from "@/mixins/componentsMixins";
 import { mapState } from "vuex";
@@ -109,9 +159,10 @@ export default {
     XdFormItem,
     XdFormInput,
     XdButton,
-    XdContentXss
+    XdContentXss,
+    XdSelect
   },
-  mixins: [componentsMixins, extsMixins, JfbBaseCardMergeEntryMixin],
+  mixins: [JfbBaseCardMergeEntryMixin, componentsMixins, extsMixins, colorCardMixins],
   data() {
     return {
       mergeForm: {},
@@ -121,6 +172,7 @@ export default {
       fromSelect: null,
       toSelect: null,
       randomKey: Date.now(),
+      code:'',
   
   
       content: "",
@@ -132,12 +184,30 @@ export default {
       //提示文案
       isPreview: false,
       statusContent: false,
+      
+      
+      
     };
   },
   computed: {
     ...mapState({
       brandInfo: (state) => state.brandInfo,
     }),
+    
+    themeOutStyle(){
+      if(this.fromSelect === null) {
+        return this.getCardThemes('1');
+      }else {
+        return this.getCardThemes(this.fromSelect.name);
+      }
+    },
+    themeInStyle() {
+      if (this.toSelect === null) {
+        return this.getCardThemes('2');
+      } else {
+        return this.getCardThemes(this.toSelect.name);
+      }
+    }
   },
   watch: {
     container(value) {
@@ -154,7 +224,7 @@ export default {
   methods: {
     onJfbLoad(options) {
       this.getContent();
-      jfbRootExec("fromCardList", {
+      jfbRootExec("fromCardListEntry", {
         vm: this,
         data: {},
       })
@@ -164,6 +234,7 @@ export default {
               label: item.card_number,
               value: item.card_number,
               card_point: item.card_point,
+              name: item.card_type_name
             };
           });
         })
@@ -206,6 +277,7 @@ export default {
       let valid_token = this.$xdUniHelper.randomChar(20);
       this.$set(this.mergeForm, "valid_token", valid_token);
     },
+    
     handleToSubmit() {
       if (!this.mergeForm.valid_code) {
         uni.showToast({
@@ -309,7 +381,6 @@ export default {
 
 .jfb-base-card-merge-entry {
   &__body {
-    padding-top: unit(40,rpx);
     .capture {
       width: unit(160, rpx);
       height: unit(70, rpx);
@@ -327,4 +398,44 @@ export default {
     }
   }
 }
+
+.merge {
+  padding: unit(30, rpx);
+  &-item {
+    position: relative;
+    border-radius: unit(16, rpx);
+    overflow: hidden;
+    margin-bottom: unit(30, rpx);
+    
+    &:last-child {
+      margin-bottom: 0;
+    }
+    
+    &-box {
+      background-size: 100%;
+      background-repeat: no-repeat;
+      background-position: top center;
+      
+      & >view:nth-child(2) {
+        padding: unit(40, rpx);
+      }
+    }
+    
+    &-title {
+      height: unit(50, rpx);
+      background: rgba(102, 102, 102, 0.4);
+      display: flex;
+      justify-content: center;
+      align-items: center;
+      color: #fff;
+      font-size: unit(24, rpx);
+      
+      &>view:nth-child(2) {
+        margin-left: unit(10, rpx);
+      }
+    }
+    
+    
+  }
+}
 </style>

package/src/components/JfbBaseCardShiftEntry/Api.js

@@ -1,13 +1,7 @@
 'use strict';
 
 /**
- * @description API模型
- * 建议：Ffff=>模块  Xxxx=>自定义名字
- * 获取单记录(getByIdFfffXxxx)
- * 获取列表记录(getByListFfffXxxx)
- * 添加列表记录(addFfffXxxxx)
- * 删除列表记录(removeFfffXxxxx|deleteFfffXxxx)
- * 更新列表记录(updateFfffXxxxx)
+ * @description 换卡API
  * @type {*[]}
  */
 module.exports = [
@@ -34,7 +28,7 @@ module.exports = [
     disabled: true,
   },
   {
-    mapFnName: 'getListGiftNewsContent', //自定义方法名字（必选）
+    mapFnName: 'getListGiftNewsContent',
     title: '获取内容',
     path: '/cms/v1/news-content',
     isRule: false,

package/src/components/JfbBaseCardShiftEntry/JfbBaseCardShiftEntry.vue

@@ -27,14 +27,10 @@
           v-for="(item, index) in valueKey"
           :key="index"
         >
-          <view class="jfb-base-card-shift-entry__body-info-label">{{
-            item.label
-          }}</view>
-          <view class="jfb-base-card-shift-entry__body-info-value">{{
-            info[item.key]
-          }}</view>
+          <view class="jfb-base-card-shift-entry__body-info-label">{{item.label }}</view>
+          <view class="jfb-base-card-shift-entry__body-info-value">{{info[item.key]}}</view>
         </view>
-        <view class="jfb-base-card-shift-entry__body-tips">
+        <view class="jfb-base-card-shift-entry__body-tips" v-if="notice">
           <xd-content-xss :html="notice"></xd-content-xss>
         </view>
       </view>
@@ -44,9 +40,7 @@
           <xd-radio size="small" v-model="isCheck"></xd-radio>
           <view>我已经阅读和同意积分转换规则</view>
         </view>
-        <xd-button type="primary" width="360rpx" @click="handleChange"
-          >立即转换</xd-button
-        >
+        <xd-button type="primary" width="360rpx" @click="handleChange">立即转换</xd-button>
       </view>
       <xd-dailog
         class="dialog"
@@ -67,9 +61,7 @@
             您已成功将 {{ card_number }} 转换为
             {{ changeNumber }}已自动帮您绑定成功，可在卡列表查询
           </view>
-          <xd-button type="primarys" width="360rpx" @click="handleToLink"
-            >返回列表</xd-button
-          >
+          <xd-button type="primarys" width="360rpx" @click="handleToLink">返回列表</xd-button>
         </view>
       </xd-dailog>
     </view>
@@ -82,14 +74,14 @@ import XdRadio from "@/components/XdRadio/XdRadio";
 import XdButton from "@/components/XdButton/XdButton";
 import XdDailog from "@/components/XdDailog/XdDailog";
 import { jfbRootExec } from "@/utils/xd.event";
-import JfbBaseCardShiftMixin from "./JfbBaseCardShiftMixin";
+import JfbBaseCardShifEntrytMixin from "./JfbBaseCardShiftEntryMixin";
 import componentsMixins from "@/mixins/componentsMixins";
 import extsMixins from "@/mixins/extsMixins";
 import { getContainerPropsValue } from "@/utils/xd.base";
 import XdContentXss from '@/components/XdContentXss/XdContentXss'
 
 export default {
-  name: "JfbBaseCardShift",
+  name: "JfbBaseCardShiftEntry",
   components: {
     XdFontIcon,
     XdRadio,
@@ -97,7 +89,7 @@ export default {
     XdDailog,
     XdContentXss
   },
-  mixins: [JfbBaseCardShiftMixin, componentsMixins, extsMixins],
+  mixins: [JfbBaseCardShifEntrytMixin, componentsMixins, extsMixins],
   data() {
     return {
       info: null,
@@ -179,23 +171,19 @@ export default {
         },
       })
         .then((res) => {
-          this.notice = res.list[0].content;
-          console.log(this.content, "this.content");
+          if(res.list && res.list.length > 0) {
+            this.notice = res.list[0].content;
+          }
         })
         .catch((error) => {
-          console.error(error);
+          this.$xdLog.catch(error)
         });
     },
 
     onJfbLoad(options) {
       this.card_number = options.card_number;
       this.getContent();
-      jfbRootExec("getByIdCardDetail", {
-        vm: this,
-        data: {
-          card_number: this.card_number,
-        },
-      })
+      jfbRootExec("getByIdCardDetailEntry", {vm: this, data: {card_number: this.card_number}})
         .then((res) => {
           let temp = {};
           Object.keys(res).map((key) => {
@@ -207,7 +195,9 @@ export default {
           });
           this.info = temp;
         })
-        .catch((err) => {});
+        .catch((err) => {
+          this.$xdLog.catch(err)
+        });
     },
     onJfbUpdate(data) {
       this.getContent();

package/src/components/JfbBaseCardShiftEntry/JfbBaseCardShiftEntryLess.less

@@ -12,7 +12,7 @@
 }
 
 //start
-.jfb-base-card-shift—entry {
+.jfb-base-card-shift-entry {
   border: 1px dashed rgba(0, 0, 0, 0);
   box-sizing: border-box;
   min-height: unit(100, rpx);

package/src/components/JfbBaseSuccess/JfbBaseSuccess.vue

@@ -813,11 +813,16 @@ export default {
     display: flex;
     justify-content: space-between;
     align-items: center;
-    font-size: unit(30, rpx);
-    line-height: unit(50, rpx);
+    font-size: unit(26, rpx);
+    line-height: unit(80, rpx);
+    border-bottom: 1px solid rgba(238, 238, 238, 1);
+    &:last-child {
+      border-bottom:0;
+    }
     
     &>view:first-child {
       color: #666;
+      font-size: unit(28, rpx);
     }
   }