jufubao-gift 1.0.37 → 1.0.38-beta1

package/package.json

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

package/src/components/JfbGiftListNew/Attr.js

@@ -43,6 +43,7 @@ export default {
         ],
         inline: false,
         groupKey: "content",
+        notice: "<div style='padding-left: 120px;'>按归类时，卡必须配置归类</div>"
       },
       data.tabType === 'pool' &&{
         label: "是否展示池名称",
@@ -56,6 +57,18 @@ export default {
         inline: false,
         groupKey: "content",
       },
+      data.colNum === 1 && {
+        label: "是否展示立即兑换",
+        ele: "xd-radio",
+        valueKey: "showExchange",
+        value: data.showExchange || "Y",
+        list: [
+          { label: "展示", value: "Y" },
+          { label: "隐藏", value: "N" },
+        ],
+        inline: false,
+        groupKey: "content",
+      },
       {
         label: "列表样式配置",
         ele: "title",
@@ -190,6 +203,17 @@ export default {
         inline: false,
         groupKey: "advanced",
       },
+      {
+        label: "收银台路径",
+        ele: 'xd-select-pages-path', //package 名称
+        valueKey: 'exchangePath', //form[valueKey]
+        value: data['exchangePath'] || {},
+        setting: {
+          router: XdBus.getParentApi('getPagesTree')
+        },
+        inline: false,
+        groupKey: "advanced",
+      },
     ].filter(i=>i)
   },
   advanced: [],

package/src/components/JfbGiftListNew/JfbGiftListNew.vue

@@ -46,13 +46,16 @@
             <image :src="item.thumb" mode="aspectFill"/>
           </view>
           <view class="item_cont">
-            <view class="gift_nw">
-              <view class="gift_name" :style="{
-                color: listTextColor,
-              }">{{item.gift_name}}</view>
-            </view>
-            <view v-if="showPrice === 'Y'" class="gift_price">
-              <xd-unit :price="item.market_price" :isOld="false"></xd-unit>
+            <view class="gift_name" :style="{
+              color: listTextColor,
+            }">{{item.gift_name}}</view>
+            <view class="gift_btm">
+              <view v-if="showPrice === 'Y'" class="gift_price">
+                <xd-unit :price="item.market_price" :isOld="false"></xd-unit>
+              </view>
+              <view v-if="showExchange === 'Y'">
+                <xd-button type="primary" size="mini" @click="toExchange(item)">立即兑换</xd-button>
+              </view>
             </view>
           </view>
         </view>
@@ -65,6 +68,7 @@
   import XdFontIcon from "@/components/XdFontIcon/XdFontIcon";
   import XdTab from "@/components/XdTab/XdTab";
   import XdUnit from "@/components/XdUnit/XdUnit";
+  import XdButton from "@/components/XdButton/XdButton"
   import { jfbRootExec } from "@/utils/xd.event";
   import JfbGiftListNewMixin from "./JfbGiftListNewMixin";
   import { getContainerPropsValue, gCPVal } from "@/utils/xd.base";
@@ -77,15 +81,18 @@
       XdFontIcon,
       XdTab,
       XdUnit,
+      XdButton
     },
     mixins: [
       componentsMixins, extsMixins, JfbGiftListNewMixin
     ],
     data() {
       return {
+        closeMask: true,
         poolList: [],
         poolActiveIndex: 0,
         mode: "",
+        scene: "market",
 
         giftList: [],
 
@@ -99,6 +106,8 @@
         showPrice: "Y",  //是否显示价格
         showPoolName: "Y",  //是否显示礼包池名字
         detailPath: "",  //详情页路径
+        showExchange: "",  //是否展示立即兑换
+        exchangePath: "",
 
         //style
         listBgColor: "",  //列表背景色
@@ -161,6 +170,8 @@
         this.tabType = gCPVal(container, 'tabType', "pool")
         this.showPrice = getContainerPropsValue(container, 'content.showPrice', "Y");
         this.showPoolName = getContainerPropsValue(container, 'content.showPoolName', "Y");
+        this.showExchange = getContainerPropsValue(container, 'content.showExchange', "");
+        this.exchangePath = getContainerPropsValue(container, 'content.exchangePath', {value: ""}).value;
         this.detailPath = getContainerPropsValue(container, 'content.detailPath', {value: ""}).value;
         this.radius = getContainerPropsValue(container, "content.radius", '0');
         this.is_border = getContainerPropsValue(container, "content.is_border", 'N');
@@ -185,8 +196,9 @@
         }
       },
       handleGiftClick(item){
+        if(this.$configProject['isPreview']) return;
         let curPool = this.poolList[this.poolActiveIndex];
-        let toPath = `${this.detailPath}?gift_id=${item.gift_id}&mode=${this.mode}&scene=market`
+        let toPath = `${this.detailPath}?gift_id=${item.gift_id}&mode=${this.mode}&scene=${this.scene}`
         if(curPool && curPool.value){
           toPath += `&gift_pool_id=${curPool.value}`;
         }
@@ -202,7 +214,7 @@
             page_size: 20,
             is_show_price: this.showPrice,
             show: this.tabType,
-            scene: "market"
+            scene: this.scene,
           }
         }).then(res => {
           if(this.$configProject['isPreview']){
@@ -221,7 +233,7 @@
         let curPool = this.poolList[this.poolActiveIndex];
         let data = {
           mode: this.mode,
-          scene: "market",
+          scene: this.scene,
           is_show_price: this.showPrice,
           show: this.tabType,
           page_size,
@@ -252,6 +264,12 @@
           this.hasNext = res.next_page_token ? true : false;
         })
       },
+      toExchange(item){
+        let mode = this.mode === 1 ? "first" : "second";
+        this.$xdUniHelper.redirectTo({
+          url: `${this.exchangePath}?mode=${mode}&gift_partner=${JSON.stringify([item.gift_id])}&scene=${this.scene}`
+        })
+      },
       handleTab(item,index, name){
         console.log("handleTab")
         console.log(item,index, name);
@@ -335,6 +353,11 @@
               -webkit-box-orient: vertical;
               word-break: break-all;
             }
+            .gift_btm{
+              display: flex;
+              align-items: center;
+              justify-content: space-between;
+            }
           }
           &.col_1{
             width: 100%;