jufubao-mall 2.0.86 → 2.0.88

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jufubao-mall",
-  "version": "2.0.86",
+  "version": "2.0.88",
   "private": false,
   "description": "聚福宝商城业务组件插件包",
   "main": "index.js",

package/src/components/JfbMallProductInfo/Api.js

@@ -116,4 +116,17 @@ module.exports = [
     isConsole: true,
     disabled: true,
   },
+  {
+    title: "根据供应商ID更新在线客服内容",
+    path: "/aftersale/v1/online-customer-service/update",
+    mapFnName: "updateCustomerService",
+    isRule: false,
+    data: {
+      supplier_id: ['供应商ID', 'Number', true],
+      content: ['在线客服内容', 'String', true],
+      namespace: ['业务线', 'String', true],
+    },
+    isConsole: true,
+    disabled: true,
+  }
 ];

package/src/components/JfbMallProductInfo/JfbMallProductInfo.vue

@@ -222,6 +222,12 @@
             <xd-font-icon :icon="indexIcon" :color="iconColor"></xd-font-icon>
             <view v-if="showIconText === 'Y'" :style="{color: iconColor}">首页</view>
           </view>
+          <view v-if="showService === 'Y'" class="icon_tab"
+            :style="{width: iconWidth + 'rpx'}"
+            @click="toService">
+            <xd-font-icon :icon="serviceIcon" :color="iconColor"></xd-font-icon>
+            <view v-if="showIconText === 'Y'" :style="{color: iconColor}">客服</view>
+          </view>
           <view v-if="showCart === 'Y'" class="icon_tab"
             :style="{width: iconWidth + 'rpx'}"
             @click="toCart">
@@ -431,6 +437,7 @@
         showCart: "Y",  //是否展示购物车
         showBuyNow: "Y",
         showAddCart: "Y",
+        showService: "Y",
         shopPath: "",
         cartPath: "",
         vipPath: "",
@@ -448,6 +455,7 @@
         //icon
         indexIcon: '',
         cartIcon: '',
+        serviceIcon: '',
         iconColor: '',
         noticeBackgroundColor: "",
         detailBackground: "",
@@ -759,6 +767,8 @@
         this.showCart = gCPVal(value, 'showCart', "Y");
         this.showBuyNow = gCPVal(value, 'showBuyNow', "Y");
         this.showAddCart = gCPVal(value, 'showAddCart', "Y");
+        this.showService = gCPVal(value, 'showService', "");
+        this.serviceIcon = gCPVal(value, 'serviceIcon', 'iconkefu');
         this.showIndexIcon = gCPVal(value, 'showIndexIcon', "Y");
         this.indexIcon = gCPVal(value, 'indexIcon', 'iconbhhome');
         this.cartIcon = gCPVal(value, 'cartIcon', 'icongouwuche');
@@ -1330,6 +1340,36 @@
           url: this.cartPath
         })
       },
+      toService() {
+        if(this.$configProject['isPreview']) return;
+        const product = this.base_info;
+        const price = this.choseSkuPrice.sale_price || (product.prices && product.prices.sale_price) || 0;
+        const content = {
+          title: product ? product.product_name : '',
+          desc: this.choseSkuName || '',
+          picture: product && product.thumb ? getServiceUrl(product.thumb, 'size4') : '',
+          url: location.href,
+          goodsId: product ? product.product_id + '' : 0,
+          note: "￥" + price/100,
+        };
+        jfbRootExec("updateCustomerService", {
+          vm: this,
+          data: {
+            namespace: this.xnamespace,
+            supplier_id: this.brand_info.supplier_id,
+            content: JSON.stringify(content)
+          }
+        }).then(res => {
+          this.doOpenCustomerService(res);
+        })
+      },
+      doOpenCustomerService(data) {
+        const isSandbox = this.projectAttr.api_host && this.projectAttr.api_host.includes('sandbox');
+        let host = isSandbox ? 'sandbox-misc.jufubao.cn' : location.host;
+        let query = `from=product&sdk_key=${data.app_key}&data_key=${data.redis_key}&api=${this.projectAttr.api_host}`;
+        let url = `http://${host}/cm/index.html?${query}`;
+        this.$xdUniHelper.redirectTo({ url });
+      },
       handleConfirmJdSku({ number, type }){
         this.jdSkuShow = false;
         this.curSku = {number};

package/src/components/JfbMallProductInfo/cusAttr/content.js

@@ -245,6 +245,39 @@ export default (data, gValue, gColor, oldData) => {
       ele: 'xd-line',
       groupKey: 'content',
     },
+    {
+      label: '底部客服',
+      ele: 'xd-cus-switch',
+      valueKey: 'showService',
+      value: dataVal({ data, key: 'showService', dValue: gValue.isAdd && gValue.isFirst ? 'Y' : "N", gValue }),
+      className: 'input100',
+      groupKey: 'content',
+      labelInline: true,
+      cusStyle: { marginBottom: '10px' },
+      hidden: data.showBuyNow !== 'Y',
+      setting: {
+        tips: ['显示', '不显示'],
+        isBackType: 'string'
+      },
+    },
+    { ele: 'group_start' },
+    {
+      label: '图标样式',
+      ele: 'xd-select-list',
+      valueKey: 'serviceIcon',
+      labelInline: true,
+      value: dataVal({ data, key: 'serviceIcon', dValue: '', gValue }),
+      placeholder: '请输入客服ICON',
+      className: 'input60',
+      groupKey: 'content',
+      list: ICONS,
+      hidden: data.showService !== 'Y'
+    },
+    { ele: 'group_end' },
+    {
+      ele: 'xd-line',
+      groupKey: 'content',
+    },
     {
       label: '自定义内容',
       ele: 'xd-cus-switch',

package/src/components/JfbMallProductList/JfbMallProductList.vue

@@ -510,6 +510,9 @@
         if(options.startPrice) this.startPrice = options.startPrice;
         if( options.endPrice) this.endPrice = options.endPrice;
         if( options.keyword) this.keyword = options.keyword;
+        // #ifdef H5
+        if( options.keyword) this.keyword = decodeURIComponent(options.keyword);
+        // #endif
         if( options.pid) this.pid = Number(options.pid);
         if( options.cateId || options.cateid) this.cateId =  Number(options.cateId||options.cateid);
         if( options.brand_id) {

package/src/components/JfbMallSearch/JfbMallSearch.vue

@@ -302,8 +302,12 @@
             console.log(err);
           })
         }else{
+          let uKey = this.keyword;
+          // #ifdef H5
+          uKey = encodeURIComponent(this.keyword);
+          // #endif
           this.$xdUniHelper.navigateTo({
-            url: this.productListPath + `?keyword=${this.keyword}&search_focus_back=Y`
+            url: this.productListPath + `?keyword=${uKey}&search_focus_back=Y`
           })
         }
       },