jufubao-base 1.0.397 → 1.0.398-beta2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jufubao-base",
-  "version": "1.0.397",
+  "version": "1.0.398-beta2",
   "private": false,
   "description": "聚福宝业务组件基础插件包",
   "main": "index.js",
@@ -33,7 +33,7 @@
   "dependencies": {
     "@dcloudio/uni-app-plus": "2.0.1-33920220208001",
     "@dcloudio/uni-h5": "2.0.1-33920220208001",
-    "@dcloudio/uni-helper-json": "*",
+    "@dcloudio/uni-helper-json": "^1.0.13",
     "@dcloudio/uni-i18n": "2.0.1-33920220208001",
     "@dcloudio/uni-mp-360": "2.0.1-33920220208001",
     "@dcloudio/uni-mp-alipay": "2.0.1-33920220208001",
@@ -45,22 +45,22 @@
     "@dcloudio/uni-quickapp-native": "2.0.1-33920220208001",
     "@dcloudio/uni-quickapp-webview": "2.0.1-33920220208001",
     "@dcloudio/uni-stat": "2.0.1-33920220208001",
-    "@vue/shared": "^3.0.0",
-    "color": "^3.1.3",
-    "core-js": "^2.6.5",
-    "dingtalk-jsapi": "^3.0.31",
+    "@vue/shared": "^3.5.39",
+    "color": "^3.2.1",
+    "core-js": "^2.6.12",
+    "dingtalk-jsapi": "^3.2.9",
     "flyio": "^0.6.2",
     "gxd-commands-bussiness": "^1.0.12",
     "gxd-uni-library-editx": "1.0.196-beta13",
     "jweixin-module": "^1.6.0",
     "md5": "^2.3.0",
-    "path-to-regexp": "^6.2.1",
-    "qs": "^6.9.6",
+    "path-to-regexp": "^6.3.0",
+    "qs": "^6.15.3",
     "regenerator-runtime": "^0.12.1",
-    "vconsole": "^3.15.0",
-    "vue": "^2.6.10",
-    "vue-clipboard2": "^0.3.1",
-    "vuex": "^3.2.0"
+    "vconsole": "^3.15.1",
+    "vue": "^2.7.16",
+    "vue-clipboard2": "^0.3.3",
+    "vuex": "^3.6.2"
   },
   "repository": {
     "type": "git",
@@ -68,7 +68,7 @@
   },
   "homepage": "http://uni.e56buy.com/",
   "devDependencies": {
-    "@dcloudio/types": "*",
+    "@dcloudio/types": "^3.4.32",
     "@dcloudio/uni-automator": "2.0.1-33920220208001",
     "@dcloudio/uni-cli-i18n": "2.0.1-33920220208001",
     "@dcloudio/uni-cli-shared": "2.0.1-33920220208001",
@@ -79,38 +79,38 @@
     "@dcloudio/vue-cli-plugin-uni-optimize": "2.0.1-33920220208001",
     "@dcloudio/webpack-uni-mp-loader": "2.0.1-33920220208001",
     "@dcloudio/webpack-uni-pages-loader": "2.0.1-33920220208001",
-    "@types/uni-app": "*",
+    "@types/uni-app": "^1.4.8",
     "@vue/cli-plugin-babel": "^3.12.0",
     "@vue/cli-service": "^3.12.0",
-    "babel-plugin-import": "^1.11.0",
-    "cross-env": "^7.0.2",
+    "ali-oss": "^6.23.0",
+    "art-template": "^4.13.4",
+    "babel-plugin-import": "^1.13.8",
+    "copy-dir": "^1.3.0",
+    "copy-webpack-plugin": "5.1.2",
+    "cross-env": "^7.0.3",
+    "ejs": "^3.1.10",
     "jest": "^25.4.0",
-    "less": "^3.12.2",
-    "less-loader": "^7.0.1",
-    "mini-css-extract-plugin": "^1.1.1",
-    "mini-types": "*",
-    "miniprogram-api-typings": "*",
+    "js-base64": "^2.6.4",
+    "js-beautify": "^1.15.4",
+    "less": "^3.13.1",
+    "less-loader": "^7.3.0",
+    "md5": "^2.3.0",
+    "mini-css-extract-plugin": "^1.6.2",
+    "mini-types": "^0.1.7",
+    "miniprogram-api-typings": "^5.2.1",
+    "mockjs": "1.0.1-beta3",
     "postcss-comment": "^2.0.0",
+    "progress": "^2.0.3",
     "require-context": "^1.1.0",
-    "sass": "^1.29.0",
+    "sass": "^1.101.0",
     "sass-loader": "^8.0.2",
-    "sass-resources-loader": "^2.1.1",
+    "sass-resources-loader": "^2.2.5",
     "scss-loader": "0.0.1",
     "uglifyjs-webpack-plugin": "^1.1.1",
-    "vue-template-compiler": "^2.6.10",
     "uni-read-pages": "^1.0.5",
-    "webpack": "4.44.2",
-    "js-base64": "^2.6.4",
-    "progress": "^2.0.3",
-    "ali-oss": "^6.16.0",
-    "ejs": "^3.1.6",
-    "js-beautify": "^1.14.0",
-    "art-template": "^4.13.2",
-    "mockjs": "1.0.1-beta3",
     "vue-baidu-map": "^0.21.22",
-    "copy-webpack-plugin": "5.1.2",
-    "copy-dir": "^1.3.0",
-    "md5": "^2.3.0"
+    "vue-template-compiler": "^2.7.16",
+    "webpack": "4.44.2"
   },
   "browserslist": [
     "Android >= 4",

package/src/components/JfbBaseOrderDetail/Api.js

@@ -96,4 +96,28 @@ module.exports = [
     isConsole: true,
     disabled: true,
   },
+  {
+    title: "C端查看app_key",
+    path: "/aftersale/v1/online-customer-service/check",
+    mapFnName: "checkCustomerService",
+    isRule: false,
+    params: {
+      main_order_id: ['订单ID', 'String', true],
+    },
+    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/JfbBaseOrderDetail/Attr.js

@@ -724,6 +724,20 @@ export default {
           { label: '隐藏', value: '0' },
         ]
       },
+      {
+        label: '在线客服展示/隐藏:',
+        ele: 'xd-radio',
+        valueKey: 'is_show_customer_service',
+        value: data['is_show_customer_service'] || 'Y',
+        groupKey:'content',
+        placeholder: '请选择在线客服展示/隐藏',
+        multiple: false,
+        className: 'input80',
+        list: [
+          { label: '显示', value: 'Y' },
+          { label: '隐藏', value: 'N' },
+        ]
+      },
       {
         label: '售后服务页面路径:',
         ele: 'xd-select-pages-path',

package/src/components/JfbBaseOrderDetail/JfbBaseOrderDetail.vue

@@ -858,13 +858,24 @@
       </view>
       <view
         style="height: 100rpx"
-        v-if="info.buttons && info.buttons.length > 0"
+        v-if="(info.buttons && info.buttons.length > 0) || is_show_customer_service === 'Y'"
       ></view>
       <view
         class="jfb-base-order-detail__body-btn"
         :style="prod_bottom"
-        v-if="info.buttons && info.buttons.length > 0"
+        v-if="(info.buttons && info.buttons.length > 0) || is_show_customer_service === 'Y'"
       >
+        <view>
+          <view
+            v-if="is_show_customer_service === 'Y'"
+            class="cs-btn"
+            @click="handleCustomerService"
+          >
+            <xd-font-icon icon="iconkefu" size="40" color="#333"></xd-font-icon>
+            <text class="cs-btn__text">客服</text>
+          </view>
+        </view>
+        
         <view :style="[bottomBoxStyle]" class="btn_wrap">
           <view v-for="(item, index) in info.buttons" :key="index">
             <view
@@ -1003,6 +1014,42 @@
         <xd-button type="primary" @click="showSupplement=false">关闭</xd-button>
       </view>
     </XdDownDrawer>
+    <XdDownDrawer :isClose="false" height="auto" :show.sync="showCustomerDrawer">
+      <view class="customer-drawer">
+        <view class="customer-drawer-title">
+          <view style="margin: 0 auto">请选择要咨询的订单</view>
+        </view>
+        <view class="customer-drawer-list">
+          <view
+            v-for="(item, index) in customerSubOrders"
+            :key="index"
+            class="customer-drawer-item"
+          >
+            <view class="customer-drawer-item-sub">子单号：{{ item.sub_order_id }}</view>
+            <view class="customer-drawer-item-body">
+              <xd-jfb-image
+                width="120"
+                height="120"
+                bgc="#f8f8f8"
+                radius="10"
+                shadow="10"
+                mode="scaleToFill"
+                :src="item.products[0].product_thumb"
+              ></xd-jfb-image>
+              <view class="customer-drawer-item-info">
+                <view class="customer-drawer-item-price">
+                  <xd-unit :price="item.products[0].sale_price" :color="mainColor" :fontSize="32"></xd-unit>
+                </view>
+                <view class="customer-drawer-item-count">共{{ item.products.reduce((sum, p) => sum + p.product_num, 0) }}件</view>
+              </view>
+              <view class="customer-drawer-item-btn" @click="handleGoCustomerService(item)">
+                <xd-button type="primary" size="small">去咨询</xd-button>
+              </view>
+            </view>
+          </view>
+        </view>
+      </view>
+    </XdDownDrawer>
   </view>
 </template>
 
@@ -1132,6 +1179,7 @@ export default {
 
       code_location: 'none',
       is_show_invoice: 'N',
+      is_show_customer_service: 'Y',
       invoicePath: '',
       isShowInvoice: false,
       invoiceStatus: '',
@@ -1140,6 +1188,9 @@ export default {
       reorderTips: [],
       reorderBtnItem: null,
 
+      showCustomerDrawer: false,
+      customerSubOrders: [],
+
       //是否显示电话
       isSHowPhone:'N', //是否显示手机号码
       isPhoneReg: /^[\d-]+$/
@@ -1635,6 +1686,7 @@ export default {
         }
       }
       this.is_show_invoice = getContainerPropsValue(container, "content.is_show_invoice", "N");
+      this.is_show_customer_service = getContainerPropsValue(container, "content.is_show_customer_service", "Y");
       this.invoicePath = getContainerPropsValue(container, "content.invoicePath", { value: "", }).value;
       this.viewInvoicePath = getContainerPropsValue(container, "content.viewInvoicePath", { value: "", }).value;
     },
@@ -1855,6 +1907,97 @@ export default {
         console.error(`item.action=${item.action}, 此action不可用`)
       }
     },
+    handleCustomerService() {
+      jfbRootExec("checkCustomerService", {
+        vm: this,
+        data: {
+          main_order_id: this.main_order_id,
+        },
+      })
+        .then((res) => {
+          if (res.is_pop === 'Y') {
+            // 弹出子订单选择弹框
+            this.customerSubOrders = this.info.sub_orders || [];
+            this.showCustomerDrawer = true;
+          } else {
+            // 直接跳转客服
+            this.goCustomerServicePage();
+          }
+        })
+        .catch((err) => {
+          console.log(err, 'checkCustomerService err');
+        });
+    },
+    goCustomerServicePage(subOrder) {
+      const order = subOrder || (this.info.sub_orders && this.info.sub_orders[0]);
+      if (order) {
+        const product = order.products && order.products[0];
+        const orderTime = this.getOrderTime();
+        const content = {
+          title: product ? product.product_name : '',
+          desc: product ? product.product_sku_name : '',
+          picture: product ? getServiceUrl(product.product_thumb, 'size4') : '',
+          url: product && product.product_detail_url ? (() => {
+            try {
+              const urlObj = JSON.parse(product.product_detail_url);
+              return location.origin + '/' + urlObj.dir + urlObj.path + "?product_id=" + product.product_id;
+            } catch (e) {
+              return '';
+            }
+          })() : '',
+          orderSku: product ? product.product_sku_name : '',
+          orderCount: order.products ? order.products.reduce((sum, p) => sum + p.product_num, 0) : 0,
+          payMoney: order.products ? `¥${order.products.reduce((sum, p) => sum + p.sale_price * p.product_num, 0).toFixed(2)}` : '',
+          goodsId: product ? String(product.product_id) : '',
+          orderStatus: order.status ? order.status.status_name : '',
+          orderId: order.sub_order_id,
+          orderTime: orderTime,
+          orderStageType: this.getOrderStageType(order.status),
+        };
+        jfbRootExec("updateCustomerService", {
+          vm: this,
+          data: {
+            supplier_id: order.supplier_id,
+            content: JSON.stringify(content),
+            namespace: this.biz_code,
+          },
+        })
+          .then((res) => {
+            this.doOpenCustomerService(res);
+          })
+          .catch((err) => {
+            console.log(err, 'updateCustomerService err');
+          });
+      }
+    },
+    getOrderTime() {
+      if (!this.info.detail || !Array.isArray(this.info.detail)) return '';
+      const item = this.info.detail.find(d => d.label === '下单时间');
+      return item ? item.value : '';
+    },
+    getOrderStageType(status) {
+      if (!status) return '';
+      const statusName = status.status_name || '';
+      // 售前阶段：10000 发货前阶段：20000 发货后阶段：30000 售后阶段：40000
+      if (statusName.includes('退款') || statusName.includes('退货') || statusName.includes('售后')) return '40000';
+      if (statusName.includes('发货') || statusName.includes('配送') || statusName.includes('完成')) return '30000';
+      if (statusName.includes('待发货') || statusName.includes('待付款')) return '20000';
+      return '10000';
+    },
+    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=order&sdk_key=${data.app_key}&data_key=${data.redis_key}&api=${this.projectAttr.api_host}`;
+      let url = `http://${host}/cm/index.html?${query}`;
+      console.log("customerService url: " + url);
+      this.$xdUniHelper.redirectTo({
+        url: url,
+      })
+    },
+    handleGoCustomerService(item) {
+      this.showCustomerDrawer = false;
+      this.goCustomerServicePage(item);
+    },
     handleReorderDlgConfirm(){
       this.showReorderDialog = false;
       if(this.reorderStatus !== 'not'){
@@ -2614,7 +2757,7 @@ export default {
       background: #fff;
       z-index: 3000;
       display: flex;
-      justify-content: flex-end;
+      justify-content: space-between;
       align-items: center;
 
       .btn_wrap{
@@ -2624,6 +2767,30 @@ export default {
           font-size: @xd-font-size-lg;
         }
       }
+
+      .cs-btn {
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+        justify-content: center;
+        min-width: unit(100, rpx);
+        height: 100%;
+        padding: 0 unit(20, rpx);
+        background: none;
+        border: none;
+        outline: none;
+
+        &__text {
+          font-size: unit(20, rpx);
+          color: #333;
+          margin-top: unit(6, rpx);
+        }
+      }
+
+      .cs-btn--button {
+        padding: 0;
+        line-height: 1;
+      }
     }
 
     &-product {
@@ -2698,6 +2865,58 @@ export default {
       font-size: 28rpx;
     }
   }
+
+  .customer-drawer {
+    padding: 24rpx;
+    &-title {
+      display: flex;
+      align-items: center;
+      color: #666666;
+      font-size: 28rpx;
+    }
+    &-list {
+      margin-top: 40rpx;
+    }
+    &-item {
+      background: #fff;
+      border-radius: 16rpx;
+      padding: 32rpx;
+      margin-bottom: 32rpx;
+      &-sub {
+        font-size: 24rpx;
+        color: #999;
+        margin-bottom: 24rpx;
+      }
+      &-body {
+        display: flex;
+        align-items: center;
+        image {
+          width: 140rpx;
+          height: 140rpx;
+          border-radius: 10rpx;
+        }
+      }
+      &-info {
+        flex: 1;
+        margin-left: 28rpx;
+        display: flex;
+        flex-direction: column;
+        justify-content: center;
+      }
+      &-price {
+        color: #333;
+        font-size: 32rpx;
+      }
+      &-count {
+        margin-top: 8rpx;
+        font-size: 24rpx;
+        color: #999;
+      }
+      &-btn {
+        flex-shrink: 0;
+      }
+    }
+  }
 }
 
 // 自动刷新倒计时

package/get.package.path.js

@@ -1,22 +0,0 @@
-'use strict';
-
-/**
- * @description 第三方库
- * @param threePackagePath {String} 第三方库所在项目路径存放路径路
- * @param packname {String} 包名字
- * @returns {string|*}
- */
-const getPackagePath = (threePackagePath, packname = 'gxd-commands-bussiness')=>{
-  if(packname === 'gxd-commands-bussiness') {
-    return `/Users/shiyonggao/Desktop/code/BASE/UNIAPP/xd-commands-bussiness/${threePackagePath}`;
-  }
-
-  if (packname === 'gxd-uni-library-editx') {
-    return `/Users/shiyonggao/Desktop/code/BASE/UNIAPP/xd-uni-library-editx/${threePackagePath}`;
-  }
-
-};
-
-module.exports = {
-  getPackagePath
-}