jufubao-gift 1.0.32-beta2 → 1.0.33-beta2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jufubao-gift",
-  "version": "1.0.32-beta2",
+  "version": "1.0.33-beta2",
   "private": false,
   "description": "聚福宝业务组件礼包插件包",
   "main": "index.js",

package/src/components/JfbGiftListNew/Api.js

@@ -19,7 +19,7 @@ module.exports = [
     params: {
       mode: ['模式1一选一 2 二选一', 'Number', '必选'],
       gift_pool_id: ['礼包池id', 'Number', '必选'],
-      scene: ['模式百货market，礼包gift', 'Number', '必选'],
+      scene: ['模式百货market，礼包gift', 'Number', '必选', 'market'],
       is_show_price: ['模式百货market是否展示价格', 'Number', '必选'],
       page_size: ['page_size', 'Number', '必选'],
       page_token: ['page_token', 'Number', '必选'],
@@ -34,7 +34,7 @@ module.exports = [
     isRule: false,
     params: {
       mode: ['模式1一选一 2 二选一', 'Number', '必选'],
-      scene: ['模式百货market，礼包gift', 'Number', '必选'],
+      scene: ['模式百货market，礼包gift', 'Number', '必选', 'market'],
       gift_pool_id: ['礼包池id', 'Number', '必选']
     },
     isConsole: true,

package/src/components/JfbGiftListNew/Attr.js

@@ -33,6 +33,18 @@ export default {
         groupKey: "content",
       },
       {
+        label: "展示维度",
+        ele: "xd-radio",
+        valueKey: "tabType",
+        value: data.tabType || "pool",
+        list: [
+          { label: "按礼包池", value: "pool" },
+          { label: "按归类", value: "category" },
+        ],
+        inline: false,
+        groupKey: "content",
+      },
+      data.tabType === 'pool' &&{
         label: "是否展示池名称",
         ele: "xd-radio",
         valueKey: "showPoolName",

package/src/components/JfbGiftListNew/JfbGiftListNew.vue

@@ -29,7 +29,7 @@
             @onTab="(item,index) => handleTab(item,index, 'onTab')"
           ></xd-tab>
         </view>
-        <view style="height: 100rpx;"></view>
+        <!-- <view style="height: 100rpx;"></view> -->
       </template>
 
       <view class="gift_list" :style="[listWrapBoxStyle]">
@@ -65,7 +65,7 @@
   import XdUnit from "@/components/XdUnit/XdUnit";
   import { jfbRootExec } from "@/utils/xd.event";
   import JfbGiftListNewMixin from "./JfbGiftListNewMixin";
-  import { getContainerPropsValue } from "@/utils/xd.base";
+  import { getContainerPropsValue, gCPVal } from "@/utils/xd.base";
   import componentsMixins from "@/mixins/componentsMixins";
   import extsMixins from "@/mixins/extsMixins";
   import getServiceUrl from "@/common/getServiceUrl";
@@ -156,6 +156,7 @@
         this.colNum = getContainerPropsValue(container, 'content.colNum', 2);
         this.listBgColor = getContainerPropsValue(container, 'content.listBgColor', '#FFFFFF');
         this.listTextColor = getContainerPropsValue(container, 'content.listTextColor', '#333333');
+        this.tabType = gCPVal(container, 'tabType', "pool")
         this.showPrice = getContainerPropsValue(container, 'content.showPrice', "Y");
         this.showPoolName = getContainerPropsValue(container, 'content.showPoolName', "Y");
         this.detailPath = getContainerPropsValue(container, 'content.detailPath', {value: ""}).value;
@@ -174,6 +175,12 @@
         })
         let itemShadow = getContainerPropsValue(container, "content.itemShadow", {});
         this.itemShadow = this.getShadowCompatibleOldStyle(itemShadow, {})
+
+        if (this.$configProject['isPreview']) {
+          if(this.showPoolName === "Y"){
+            this.p_getGiftPoolList();
+          }
+        }
       },
       handleGiftClick(item){
         let curPool = this.poolList[this.poolActiveIndex];
@@ -192,9 +199,18 @@
             mode: this.mode,
             page_size: 20,
             is_show_price: this.showPrice,
-            scene: 'market'
+            show: this.tabType,
+            scene: "market"
           }
         }).then(res => {
+          if(this.$configProject['isPreview']){
+            if(this.tabType === 'category'){
+              this.poolList = [ { value: 1, name: "归类A" },{ value: 2, name: "归类B" },{ value: 4, name: "归类C" },]
+            }else{
+              this.poolList = res.list.map(item => ({name: item.pool_name, value: item.gift_pool_id}))
+            }
+            return;
+          }
           this.poolList = res.list.map(item => ({name: item.pool_name, value: item.gift_pool_id}))
         })
       },
@@ -203,13 +219,18 @@
         let curPool = this.poolList[this.poolActiveIndex];
         let data = {
           mode: this.mode,
-          scene: 'market',
+          scene: "market",
           is_show_price: this.showPrice,
+          show: this.tabType,
           page_size,
           page_token,
         }
         if(curPool && curPool.value){
-          data['gift_pool_id'] = curPool.value;
+          if(this.tabType === 'category'){
+            data['category_id'] = curPool.value;
+          }else{
+            data['gift_pool_id'] = curPool.value;
+          }
         }
 
         jfbRootExec("getGiftProductListNew", {
@@ -279,7 +300,6 @@
   .jfb-gift-list-new {
     &__body{
       .tab_wrap{
-        position: fixed;
         width:100%;
         z-index: 999;
         background: #FFFFFF;