jufubao-base 1.0.56-beta2010 → 1.0.56-beta2012

package/package.json

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

package/src/components/JfbBaseCardDetail/JfbBaseCardDetail.vue

@@ -247,6 +247,17 @@ export default {
     },
     
     onJfbUnload() {
+      this.timeStr = ""
+      if (this.timeer) {
+        clearTimeout(this.timeer);
+      }
+      if (this.refrushTimeer) {
+        clearTimeout(this.refrushTimeer);
+      }
+    },
+
+    onJfbHide(options) {
+      this.timeStr = ""
       if (this.timeer) {
         clearTimeout(this.timeer);
       }
@@ -294,6 +305,7 @@ export default {
         vm: this,
         success: (res) => {
           if (res.confirm) {
+            this.timeStr = ""
             clearTimeout(this.timeer);
             clearTimeout(this.refrushTimeer);
             this.stopTimer = true;
@@ -369,6 +381,9 @@ export default {
     init() {
       this.detail();
       this.refrush();
+      if(this.$configProject.isPreview) {
+        this.timeStr = "01分19秒"
+      }
       this.backUrl = getContainerPropsValue( this.container,  "content.back_url", { value: "" }).value;
     },
     
@@ -388,7 +403,9 @@ export default {
             res["other_card_point"] = this.$xdUniHelper.divisionFloatNumber(res.other_card_point, 100);
           }
           this.info = res;
-          this.setInval(this.info.card_qrcode_expire);
+          if(!this.$configProject.isPreview) {
+            this.setInval(this.info.card_qrcode_expire);
+          }
           this.show = false;
 
           //显示按钮

package/src/components/JfbBaseCardDetailEntry/JfbBaseCardDetailEntry.vue

@@ -108,7 +108,6 @@
         <!-- 靠底支付 -->
         <view class="fixe_bottom" :style="prod_bottom">
           <!-- <xd-button
-          radius="8rpx"
           size="small"
           type="primary">
           消费记录
@@ -116,7 +115,6 @@
           <xd-button
           v-if="info.is_exchange==='Y'"
           @click="handleToShift"
-          radius="8rpx"
           size="small"
           type="primary">
           券转换
@@ -124,7 +122,6 @@
           <xd-button
           v-if="isShowUnbind"
           @click="handleUnBindCard"
-          radius="8rpx"
           size="small"
           type="primary">
           解除绑定
@@ -275,6 +272,9 @@ export default {
     init() {
       this.detail();
       this.refrush();
+      if(this.$configProject.isPreview) {
+        this.timeStr = "01分19秒"
+      }
       this.backUrl = getContainerPropsValue( this.container,  "content.back_url", { value: "" }).value;
       this.shift_url = getContainerPropsValue( this.container,  "content.shift_url", { value: "" }).value;
     },
@@ -309,7 +309,9 @@ export default {
             })
           }
           this.info = res;
-          this.setInval(this.info.card_qrcode_expire);
+          if(!this.$configProject.isPreview) {
+            this.setInval(this.info.card_qrcode_expire);
+          }
           this.show = false;
           this.headerBg = this.getCardThemes(res.card_type_name);
 
@@ -395,6 +397,7 @@ export default {
         vm: this,
         success: (res) => {
           if (res.confirm) {
+            this.timeStr = ""
             clearTimeout(this.timeer);
             clearTimeout(this.refrushTimeer);
             this.stopTimer = true;
@@ -454,6 +457,7 @@ export default {
       this.$xdUniHelper.navigateBack();
     },
     onJfbUnload() {
+      this.timeStr = ""
       if (this.timeer) {
         clearTimeout(this.timeer);
       }
@@ -496,7 +500,13 @@ export default {
       // }
     },
     onJfbHide(options) {
-      console.log("event.onJfbHide", options);
+      this.timeStr = ""
+      if (this.timeer) {
+        clearTimeout(this.timeer);
+      }
+      if (this.refrushTimeer) {
+        clearTimeout(this.refrushTimeer);
+      }
     },
     onJfbBack(options) {
       console.log("event.onJfbBack", options);
@@ -530,13 +540,18 @@ export default {
       border-radius: unit(16, rpx);
       font-size: unit(40, rpx);
       font-weight: 700;
-      padding: unit(48, rpx) unit(32, rpx);
       color: #fff;
+      position: relative;
+      height: unit(260,rpx);
 
       &-wrap {
         width: unit(700, rpx);
         border-radius: unit(16, rpx);
         background-size: 100%;
+        height: 100%;
+        display: flex;
+        flex-direction: column;
+        justify-content: center;
       }
 
       &-item {
@@ -544,6 +559,7 @@ export default {
         justify-content: flex-start;
         align-content: center;
         padding-bottom: unit(32, rpx);
+        padding-left: unit(40,rpx);
       }
     }
 
@@ -583,6 +599,7 @@ export default {
       border-radius: unit(16,rpx);
       margin-top: unit(24, rpx);
       padding: unit(20,rpx) unit(70,rpx) unit(70,rpx) unit(70,rpx);
+      color: #000;
 
       & > view {
         // margin-bottom: unit(20, rpx);

package/src/components/JfbBaseCardDetailEntry/Mock.js

@@ -1,7 +1,7 @@
 'use strict';
 
 module.exports = {
-  getCardYue: {},
+  getCardYueEntry: {},
   getBaseByIdCardDetailEntry: {
     "site_entry_settings": [{
       "id": 57,

package/src/components/JfbBaseCardInfoEntry/JfbBaseCardInfoEntry.vue

@@ -49,8 +49,6 @@
         <view class="fixe_bottom" :style="prod_bottom">
           <xd-button
             type="primary"
-            radius="8rpx"
-            size="small"
             width="360rpx"
             @click="handleGetInfo"
             >确认</xd-button
@@ -137,8 +135,6 @@
         <view :style="{ height: '100rpx' }"></view>
         <view class="fixe_bottom" :style="prod_bottom">
           <xd-button
-            radius="8rpx"
-            size="small"
             type="primary"
             width="360rpx"
             @click="handleToLink"
@@ -448,13 +444,18 @@ export default {
       border-radius: unit(16, rpx);
       font-size: unit(40, rpx);
       font-weight: 700;
-      padding: unit(48, rpx) unit(32, rpx);
       color: #fff;
+      position: relative;
+      height: unit(260,rpx);
 
       &-wrap {
         width: unit(700, rpx);
         border-radius: unit(16, rpx);
         background-size: 100%;
+        height: 100%;
+        display: flex;
+        flex-direction: column;
+        justify-content: center;
       }
 
       &-item {
@@ -462,6 +463,7 @@ export default {
         justify-content: flex-start;
         align-content: center;
         padding-bottom: unit(32, rpx);
+        padding-left: unit(40,rpx);
       }
     }
 

package/src/components/JfbBaseCardShiftEntry/Attr.js

@@ -3,233 +3,235 @@
 export default {
   style: [],
   advanced: [],
-  content: [
-    {
-      label: '返回按钮地址:', //label
-      ele: 'xd-select-pages-path', //package 名称
-      valueKey: 'back_url', //form[valueKey]
-      placeholder: '请选择返回按钮地址',
-      value: null,
-      setting: {
-        router: XdBus.getParentApi('getPagesTree'),
-      },
-      inline: false,
-    },
-    {
-      label: '提示内容:',
-      ele: 'xd-site-news',
-      valueKey: 'notice',
-      value: null,
-      className: 'input70',
-      setting: {
-        config: {
-          sort: true,
-          maxlen: 100,
-          action: 'aliyun',
-          size: 5,
-          tipsformet: '上传文件格式：@imageType@，不超过@size@MB.',
-          uploadType: 'aliyun',
-          type: ['jpg', 'png', 'jpeg']
+  content: (data) => {
+    return [
+      {
+        label: '返回按钮地址:', //label
+        ele: 'xd-select-pages-path', //package 名称
+        valueKey: 'back_url', //form[valueKey]
+        placeholder: '请选择返回按钮地址',
+        value: data.back_url || null,
+        setting: {
+          router: XdBus.getParentApi('getPagesTree'),
         },
+        inline: false,
       },
-      handleCustom({action, data}) {
-        if (data && data.params) {
-          //当一个插件中出现使用内容分类时候需要设置code值，在页面引用时候容器id + code进行拼接
-          //data.params = Object.assign({}, data.params, {code: 'g_test_id'});
-        }
-
-        //获取返回参数(场景类型名称为必填)
-        let loading = XdBus.getParentApi('loading')({});
-
-        //获取显示内容
-        if (action === 'screen') {
-          XdBus.getParentApi('getOptionsSettingList')({setting_id: 'edtix_bucket_content_tip'})
-            .then(res => {
-              loading.close();
-              data.cb(res['list'])
-            })
-            .catch(error => {
-              console.error(error);
-              loading.close();
-            });
-
-        }
-
-        //获取返回参数(广告位高度必选项)
-        if (action === 'getNewsInfo') {
-          XdBus.getParentApi('cmsGetPublishEditxContent')(data.params)
-            .then(res => {
-              loading.close()
-              data.cb({list: res.list, selectId: res.selected})
-            })
-            .catch(error => {
-              loading.close()
-              console.error(error);
-            });
-        }
-
-        //获取产品业务线列表
-        if (action === 'namespace') {
-          XdBus.getParentApi('getOptionsNamespaces')({})
-            .then(res => {
-              loading.close()
-              data.cb(res['list'])
-            })
-            .catch(error => {
-              loading.close()
-              console.error(error);
-            });
-        }
-
-        //使用内容分类
-        if (action === 'cmsPublishEditxContent') {
-          XdBus.getParentApi('cmsPublishEditxContent')(data.params)
-            .then(res => {
-              console.log('cmsPublishEditxContent', res)
-              loading.close();
-              data.cb(res)
-            })
-            .catch(error => {
-              loading.close();
-              console.error(error);
-            });
-        }
-
-        //位置列表
-        if (action === 'getListPostion') {
-          XdBus.getParentApi('getListNewsPosition')(data.params)
-            .then(res => {
-              loading.close();
-              data.cb(res)
-            })
-            .catch(error => {
-              loading.close();
-              console.error(error);
-            });
-        }
-
-        //位置创建
-        if (action === 'addPostion') {
-          XdBus.getParentApi('addNewsPosition')(data.params)
-            .then(res => {
-              loading.close();
-              data.cb(true)
-            })
-            .catch(error => {
-              console.error(error);
-              loading.close();
-              data.cb(false)
-            });
-        }
-
-        //位置编辑
-        if (action === 'editPostion') {
-          XdBus.getParentApi('updateNewsPosition')(data.params)
-            .then(res => {
-              loading.close();
-              data.cb(true)
-            })
-            .catch(error => {
-              console.error(error);
-              loading.close();
-              data.cb(false)
-            });
-        }
-
-        //位置删除
-        if (action === 'deleltePostion') {
-          XdBus.getParentApi('deleteNewsPosition')(data.params)
-            .then(res => {
-              loading.close();
-              data.cb(true)
-            })
-            .catch(error => {
-              console.error(error);
-              loading.close();
-              data.cb(false)
-            });
-        }
-
-        //获取广告位内容列表
-        if (action === 'getListContent') {
-          XdBus.getParentApi('getListNewsContent')(data.params)
-            .then(res => {
-              loading.close();
-              data.cb(res)
-            })
-            .catch(error => {
-              loading.close();
-              console.error(error);
-            });
-        }
-
-        //广告内容创建
-        if (action === 'addContent') {
-          XdBus.getParentApi('addNewsContent')(data.params)
-            .then(res => {
-              loading.close();
-              data.cb(true)
-            })
-            .catch(error => {
-              console.error(error);
-              loading.close();
-              data.cb(false)
-            });
-        }
-
-        //广告内容编辑
-        if (action === 'editContent') {
-          XdBus.getParentApi('updateNewsContent')(data.params)
-            .then(res => {
-              loading.close();
-              data.cb(true)
-            })
-            .catch(error => {
-              console.error(error);
-              loading.close();
-              data.cb(false)
-            });
-        }
-
-        //广告内容删除
-        if (action === 'deleteContent') {
-          XdBus.getParentApi('deleteNewsContent')(data.params)
-            .then(res => {
-              loading.close();
-              data.cb(true)
-            })
-            .catch(error => {
-              console.error(error);
-              loading.close();
-              data.cb(false)
-            });
-        }
-
-        //内容发布
-        if (action === 'publish') {
-          console.log('publish', data.params)
-          XdBus.getParentApi('cmsPublishContent')(data.params)
-            .then(res => {
-              loading.close();
-              data.cb(res)
-            })
-            .catch(error => {
-              loading.close();
-              console.error(error);
-            });
-        }
-
-        //通知页面进行刷新
-        if (action === 'update') {
-          XdBus.getParentApi('getXdBusUpdateView')('onUpdateView', {});
-          loading.close()
-        }
+      {
+        label: '提示内容:',
+        ele: 'xd-site-news',
+        valueKey: 'notice',
+        value: data.notice || null,
+        className: 'input70',
+        setting: {
+          config: {
+            sort: true,
+            maxlen: 100,
+            action: 'aliyun',
+            size: 5,
+            tipsformet: '上传文件格式：@imageType@，不超过@size@MB.',
+            uploadType: 'aliyun',
+            type: ['jpg', 'png', 'jpeg']
+          },
+        },
+        handleCustom({action, data}) {
+          if (data && data.params) {
+            //当一个插件中出现使用内容分类时候需要设置code值，在页面引用时候容器id + code进行拼接
+            //data.params = Object.assign({}, data.params, {code: 'g_test_id'});
+          }
+  
+          //获取返回参数(场景类型名称为必填)
+          let loading = XdBus.getParentApi('loading')({});
+  
+          //获取显示内容
+          if (action === 'screen') {
+            XdBus.getParentApi('getOptionsSettingList')({setting_id: 'edtix_bucket_content_tip'})
+              .then(res => {
+                loading.close();
+                data.cb(res['list'])
+              })
+              .catch(error => {
+                console.error(error);
+                loading.close();
+              });
+  
+          }
+  
+          //获取返回参数(广告位高度必选项)
+          if (action === 'getNewsInfo') {
+            XdBus.getParentApi('cmsGetPublishEditxContent')(data.params)
+              .then(res => {
+                loading.close()
+                data.cb({list: res.list, selectId: res.selected})
+              })
+              .catch(error => {
+                loading.close()
+                console.error(error);
+              });
+          }
+  
+          //获取产品业务线列表
+          if (action === 'namespace') {
+            XdBus.getParentApi('getOptionsNamespaces')({})
+              .then(res => {
+                loading.close()
+                data.cb(res['list'])
+              })
+              .catch(error => {
+                loading.close()
+                console.error(error);
+              });
+          }
+  
+          //使用内容分类
+          if (action === 'cmsPublishEditxContent') {
+            XdBus.getParentApi('cmsPublishEditxContent')(data.params)
+              .then(res => {
+                console.log('cmsPublishEditxContent', res)
+                loading.close();
+                data.cb(res)
+              })
+              .catch(error => {
+                loading.close();
+                console.error(error);
+              });
+          }
+  
+          //位置列表
+          if (action === 'getListPostion') {
+            XdBus.getParentApi('getListNewsPosition')(data.params)
+              .then(res => {
+                loading.close();
+                data.cb(res)
+              })
+              .catch(error => {
+                loading.close();
+                console.error(error);
+              });
+          }
+  
+          //位置创建
+          if (action === 'addPostion') {
+            XdBus.getParentApi('addNewsPosition')(data.params)
+              .then(res => {
+                loading.close();
+                data.cb(true)
+              })
+              .catch(error => {
+                console.error(error);
+                loading.close();
+                data.cb(false)
+              });
+          }
+  
+          //位置编辑
+          if (action === 'editPostion') {
+            XdBus.getParentApi('updateNewsPosition')(data.params)
+              .then(res => {
+                loading.close();
+                data.cb(true)
+              })
+              .catch(error => {
+                console.error(error);
+                loading.close();
+                data.cb(false)
+              });
+          }
+  
+          //位置删除
+          if (action === 'deleltePostion') {
+            XdBus.getParentApi('deleteNewsPosition')(data.params)
+              .then(res => {
+                loading.close();
+                data.cb(true)
+              })
+              .catch(error => {
+                console.error(error);
+                loading.close();
+                data.cb(false)
+              });
+          }
+  
+          //获取广告位内容列表
+          if (action === 'getListContent') {
+            XdBus.getParentApi('getListNewsContent')(data.params)
+              .then(res => {
+                loading.close();
+                data.cb(res)
+              })
+              .catch(error => {
+                loading.close();
+                console.error(error);
+              });
+          }
+  
+          //广告内容创建
+          if (action === 'addContent') {
+            XdBus.getParentApi('addNewsContent')(data.params)
+              .then(res => {
+                loading.close();
+                data.cb(true)
+              })
+              .catch(error => {
+                console.error(error);
+                loading.close();
+                data.cb(false)
+              });
+          }
+  
+          //广告内容编辑
+          if (action === 'editContent') {
+            XdBus.getParentApi('updateNewsContent')(data.params)
+              .then(res => {
+                loading.close();
+                data.cb(true)
+              })
+              .catch(error => {
+                console.error(error);
+                loading.close();
+                data.cb(false)
+              });
+          }
+  
+          //广告内容删除
+          if (action === 'deleteContent') {
+            XdBus.getParentApi('deleteNewsContent')(data.params)
+              .then(res => {
+                loading.close();
+                data.cb(true)
+              })
+              .catch(error => {
+                console.error(error);
+                loading.close();
+                data.cb(false)
+              });
+          }
+  
+          //内容发布
+          if (action === 'publish') {
+            console.log('publish', data.params)
+            XdBus.getParentApi('cmsPublishContent')(data.params)
+              .then(res => {
+                loading.close();
+                data.cb(res)
+              })
+              .catch(error => {
+                loading.close();
+                console.error(error);
+              });
+          }
+  
+          //通知页面进行刷新
+          if (action === 'update') {
+            XdBus.getParentApi('getXdBusUpdateView')('onUpdateView', {});
+            loading.close()
+          }
+        },
+        inline: false,
+        notice: '',
+        rules: [
+          {required: true, message: '请配置温馨提示内容', trigger: 'change'},
+        ],
       },
-      inline: false,
-      notice: '',
-      rules: [
-        {required: true, message: '请配置温馨提示内容', trigger: 'change'},
-      ],
-    },
-  ],
+    ].filter(i=>i)
+  },
 };

package/src/components/JfbBaseCardShiftEntry/JfbBaseCardShiftEntry.vue

@@ -45,7 +45,7 @@
             {{info.card_type_name}}
           </view>
         </view>
-          <view class="jfb-base-card-shift-entry__body-header-item">
+          <view style="padding-top:40rpx" class="jfb-base-card-shift-entry__body-header-item">
             <view>券名：</view>
             <view>{{info.card_type_name}}</view>
           </view>
@@ -120,7 +120,7 @@
         </view>
       </view>
       <!-- 注意事项 -->
-      <view class="jfb-base-card-shift-entry__body-tips">
+      <view class="jfb-base-card-shift-entry__body-tips" v-if="notice">
         <view style="text-align:center;padding-bottom:24rpx;color:#333;font-weight:500">注意事项</view>
           <xd-content-xss :html="notice"></xd-content-xss>
       </view>
@@ -130,8 +130,6 @@
           <xd-button
           @click="handleChange"
           width="500rpx"
-          radius="8rpx"
-          size="small"
           type="primary">
           转换
         </xd-button>
@@ -329,9 +327,9 @@ export default {
       border-radius: unit(16, rpx);
       font-size: unit(40, rpx);
       font-weight: 700;
-      padding: unit(88,rpx) unit(32, rpx) unit(48, rpx) unit(32, rpx);
       color: #fff;
       position: relative;
+      height: unit(260,rpx);
 
       &__title {
         height: unit(56, rpx);
@@ -358,6 +356,10 @@ export default {
         width: unit(700, rpx);
         border-radius: unit(16, rpx);
         background-size: 100%;
+        height: 100%;
+        display: flex;
+        flex-direction: column;
+        justify-content: center;
       }
 
       &-item {
@@ -365,6 +367,7 @@ export default {
         justify-content: flex-start;
         align-content: center;
         padding-bottom: unit(32, rpx);
+        padding-left: unit(40,rpx);
       }
     }
 

package/src/mixins/colorCardMixins.js

@@ -51,7 +51,7 @@ export default {
     getCardGroupItem(list, allEntry) {
       list.map(item => {
         //设置卡片样式
-        item['theme'] = this.getCardThemes(item['card_type_name'] + item['card_type']);
+        item['theme'] = this.getCardThemes(item['card_type_name']);
         item['entries'] = this.getEntry(item['business_codes'], allEntry)
       });
       return list