jufubao-base 1.0.425 → 1.0.427

package/get.package.path.js

@@ -8,11 +8,11 @@
  */
 const getPackagePath = (threePackagePath, packname = 'gxd-commands-bussiness')=>{
   if(packname === 'gxd-commands-bussiness') {
-    return `/Users/shiyonggao/home/root/Base-Jufubao/xd-commands-bussiness/${threePackagePath}`;
+    return `/Users/shiyonggao/Desktop/code/BASE/UNIAPP/xd-commands-bussiness/${threePackagePath}`;
   }
 
   if (packname === 'gxd-uni-library-editx') {
-    return `/Users/shiyonggao/home/root/Base-Jufubao/xd-uni-library-editx/${threePackagePath}`;
+    return `/Users/shiyonggao/Desktop/code/BASE/UNIAPP/xd-uni-library-editx/${threePackagePath}`;
   }
 
 };

package/package.json

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

package/src/components/JfbBaseAfterSales/JfbBaseAfterSales.vue

@@ -160,7 +160,7 @@
         customer_feedback: "",
         showDialog: false,
         last_service_order_id: "",
-        
+
         productList: [],
         afterSalesTypes: [],
         baseInfo: {},
@@ -355,6 +355,16 @@
           })
           return;
         }
+
+        if(this.refundStepPath === '') {
+          this.$xdAlert({
+            content: '请配置售后详情跳转链接',
+            type: "error"
+          })
+          return;
+        }
+        this.$xdShowLoading({});
+
         let data = {
           main_order_id: order_id,
           sub_order_id: this.service_product_list[0].sub_order_id,
@@ -373,9 +383,16 @@
           vm: this,
           data: data
         }).then(res => {
-          this.$xdUniHelper.navigateTo({
-            url: `${this.refundStepPath}?service_order_id=${res.service_order_id}`,
-          });
+          this.$xdHideLoading();
+          setTimeout(() => {
+            this.$xdUniHelper.navigateTo({
+              url: `${this.refundStepPath}?service_order_id=${res.service_order_id}`,
+            });
+          }, 500);
+
+        }).catch(err => {
+          this.$xdHideLoading();
+          console.error(err)
         })
       },
       handleSelectProduct(productList){

package/src/components/JfbBaseAfterSalesFast/JfbBaseAfterSalesFast.vue

@@ -105,7 +105,7 @@
         return this.fixedStyle({ height: 20, zIndex: 111 });
       },
     },
-    
+
     created() {
       this.init(this.container);
 
@@ -116,6 +116,7 @@
         this.order_id = options.order_id;
         this.p_getAfterSalesTypeList();
       },
+
       /**
        * @description 监听事件变化
        * @param container {object} 业务组件对象自己
@@ -143,6 +144,16 @@
           })
           return;
         }
+
+        if(this.refundStepPath === '') {
+          this.$xdAlert({
+            content: '请配置售后详情跳转链接',
+            type: "error"
+          })
+          return;
+        }
+
+        this.$xdShowLoading({});
         jfbRootExec("createAfterServiceOrderQuick", {
           vm: this,
           data: {
@@ -150,9 +161,16 @@
             after_sale_type: this.after_sale_type,
           }
         }).then(res => {
-          this.$xdUniHelper.navigateTo({
-            url: `${this.refundStepPath}?service_order_id=${res.service_order_id}`,
-          });
+          this.$xdHideLoading();
+          setTimeout(() => {
+            this.$xdUniHelper.navigateTo({
+              url: `${this.refundStepPath}?service_order_id=${res.service_order_id}`,
+            });
+          }, 500);
+
+        }).catch((err)=>{
+          this.$xdHideLoading();
+          console.error(err)
         })
       },
       toChoseReason(){

package/src/components/JfbBaseRecharge/Attr.js

@@ -1,270 +1,13 @@
 'use strict';
+import advanced from "./cusAttr/advanced";
+import content from "./cusAttr/content";
 
-/**
- * @description 当表单组件中有联动操作时候，使用方法进行返回
- */
 export default {
   style: [],
-  content: (data) => {
+  content: (data, gValue, gColor, oldData) => {
     return [
-      {
-        label: '票券框自定义文案:',
-        ele: 'el-input',
-        type: 'text',
-        valueKey: 'card_num_placeholder',
-        groupKey:'content',
-        value: data.card_num_placeholder||'',
-        placeholder: '请输入票券框自定义文案',
-        className: 'input80'
-      },
-      {
-        label: '票券充值点数自定义文案:',
-        ele: 'el-input',
-        type: 'text',
-        valueKey: 'point_placeholder',
-        groupKey:'content',
-        value: data.point_placeholder || '',
-        placeholder: '请输入票券充值点数自定义文案',
-        className: 'input80'
-      },
-      {
-        label: '注意事项:',
-        ele: 'xd-site-news',
-        valueKey: 'notice',
-        groupKey:'content',
-        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')({});
-
-          //获取返回参数(场景类型名称为必填)
-          let loading = { close(){}}
-
-          //获取显示内容
-          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') {
-            loading = XdBus.getParentApi('loading')({});
-            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') {
-            loading = XdBus.getParentApi('loading')({});
-            XdBus.getParentApi('getListNewsPosition')(data.params)
-              .then(res => {
-                loading.close();
-                data.cb(res)
-              })
-              .catch(error => {
-                loading.close();
-                console.error(error);
-              });
-          }
-
-          //位置创建
-          if (action === 'addPostion') {
-            loading = XdBus.getParentApi('loading')({});
-            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') {
-            loading = XdBus.getParentApi('loading')({});
-            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') {
-            loading = XdBus.getParentApi('loading')({});
-            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') {
-            loading = XdBus.getParentApi('loading')({});
-            XdBus.getParentApi('getListNewsContent')(data.params)
-              .then(res => {
-                loading.close();
-                data.cb(res)
-              })
-              .catch(error => {
-                loading.close();
-                console.error(error);
-              });
-          }
-
-          //广告内容创建
-          if (action === 'addContent') {
-            loading = XdBus.getParentApi('loading')({});
-            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') {
-            loading = XdBus.getParentApi('loading')({});
-            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') {
-            loading = XdBus.getParentApi('loading')({});
-            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') {
-            loading = XdBus.getParentApi('loading')({});
-            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') {
-            loading = XdBus.getParentApi('loading')({});
-            XdBus.getParentApi('getXdBusUpdateView')('onUpdateView', {});
-            loading.close()
-          }
-        },
-      },
-      {
-        label: '票券支付路径:',
-        ele: 'xd-select-pages-path',
-        valueKey: 'payPath',
-        groupKey:'advanced',
-        placeholder: '请选择票券支付路径',
-        value: data['payPath'] || {},
-        setting: {
-          router: XdBus.getParentApi('getPagesTree'),
-        },
-        inline: false,
-      },
+      ...content(data, gValue, gColor, oldData),
+      ...advanced(data, gValue, gColor, oldData),
     ].filter(i=>i)
   },
   advanced: [ ],

package/src/components/JfbBaseRecharge/JfbBaseRecharge.vue

@@ -65,7 +65,7 @@ import XdButton from "@/components/XdButton/XdButton";
 import XdUnit from "@/components/XdUnit/XdUnit.vue";
 import { jfbRootExec } from "@/utils/xd.event";
 import JfbBaseRechargeMixin from "./JfbBaseRechargeMixin";
-import { getContainerPropsValue } from "@/utils/xd.base";
+import { gCPVal } from "@/utils/xd.base";
 import componentsMixins from "@/mixins/componentsMixins";
 import extsMixins from "@/mixins/extsMixins";
 import Color from "color";
@@ -104,7 +104,7 @@ export default {
     card_point(value) {
       if(this.timer) clearTimeout(this.timer);
       this.timer = setTimeout(()=>{
-        if (value && value != 0) {
+        if (value && value !== 0) {
           this.handleGetPrice();
         }
       }, 1000)
@@ -124,9 +124,9 @@ export default {
      * @param container {object} 业务组件对象自己
      */
     init(container) {
-      this.card_num_placeholder = getContainerPropsValue(this.container, "content.card_num_placeholder", "输入券号");
-      this.point_placeholder = getContainerPropsValue(this.container, "content.point_placeholder", "充值点数");
-      this.payPath = getContainerPropsValue(container, "content.payPath", {value: "",}).value;
+      this.card_num_placeholder = gCPVal(container, "card_num_placeholder", "输入券号");
+      this.point_placeholder = gCPVal(container, "point_placeholder", "充值点数");
+      this.payPath = gCPVal(container, "payPath", {value: "",}).value;
     },
 
 
@@ -150,6 +150,7 @@ export default {
     },
 
     toLink(pay_order_id, order_id){
+      if (this.$configProject["isPreview"]) return;
       this.$xdUniHelper.navigateTo({
         url: `${this.payPath}?order_id=${pay_order_id}&main_order_id=${order_id}&type=recharge`,
       });
@@ -223,9 +224,6 @@ export default {
     onJfbShow(options) {
       this.onJfbLoad(options);
     },
-    onJfbCustomEvent(options) {
-      console.log("event.onJfbReachBottom", options);
-    },
   },
 };
 </script>

package/src/components/JfbBaseRecharge/cusAttr/advanced.js

@@ -0,0 +1,43 @@
+'use strict';
+
+import {getAttrPathMsg} from "@/utils/AttrTools";
+
+export default (data, gValue, gColor, oldData={})=>{
+  const payPath = getAttrPathMsg(data , 'payPath', '票券支持');
+  return [
+    {
+      label: payPath.label,
+      ele: 'xd-select-pages-path',
+      valueKey: 'payPath',
+      groupKey:'advanced',
+      placeholder: payPath.hold,
+      value: payPath.path,
+      labelInline:true,
+      className: 'input100',
+      setting: {
+        mode:'new',
+        router: XdBus.getParentApi('getPagesTree'),
+      },
+      inline: false,
+    },
+    {
+      label: '版本号:',
+      ele: 'el-input',
+      type: 'text',
+      groupKey: 'advanced',
+      valueKey: 'version',
+      value: 'v2.0',
+      hidden: true,
+    },
+    {
+      label: '过滤引用模版字段:',
+      ele: 'el-input',
+      type: 'text',
+      groupKey: 'advanced',
+      valueKey: 'refFilterKey',
+      value: '["category","productStyle"]',
+      hidden: true,
+    },
+  ]
+}
+