jufubao-base 1.0.20 → 1.0.21

package/src/components/JfbBaseSetPwd/JfbBaseSetPwdMixin.js

@@ -93,16 +93,31 @@ export default {
       //#ifdef H5
       
       //@AttrData
-      Attr, //对外开发编辑属性
+      Attr:{}, //对外开发编辑属性
       //@EndAttrData
       
       active: false, //是否选择当前状态
       isEditx: true, //当前为Editx模式
       edit: false, //是否开启编辑模式
       // #endif
+
+      //风格键
+      mainColor: '',
+      successColor: '',
+      warningColor: '',
+      subMainColor: '',
+      infoColor: '',
+      defaultColor: '',
+      dangerColor: ''
     }
   },
   created() {
+    
+    //@AttrDataCreated
+    this.Attr = this.$xdUniHelper.customClone(Attr);
+    //@EndAttrDataCreated
+    
+
     //设置插件cid
     if (this.cid) {
       this.containerId = this.cid;
@@ -110,6 +125,9 @@ export default {
       this.containerId = this.$xdUniHelper.randomChar(20);
     }
 
+    //初始化风格
+    this.initThemesToData();
+
     //#ifdef H5
     //监听用户点击状态显示虚框
     XdBus.addEvent('select', ({containerId}) => {
@@ -132,6 +150,26 @@ export default {
     onCheck() {
     },
 
+    /***
+     * @description 业务组件风格map到data中
+     */
+    initThemesToData() {
+      Object.keys(this.styles).map(key => {
+        let k = key.replace('$', '');
+        if (this[k] !== undefined) this[k] = this.styles[key];
+      });
+      console.log('initThemesToData',this)
+    },
+
+    /**
+     * @description 其子级插件获取当前插件的业务组件风格列表
+     * @returns {*}
+     */
+    getParentThemes(){
+      return this.styles;
+    },
+
+
     //#ifdef H5
     /**
      * @description 点击删除操作按钮
@@ -153,8 +191,8 @@ export default {
       //#ifdef H5
       if (this.active) return;
       this.active = true;
-      let AttrObj = this.$xdUniHelper.checkVarType(Attr) === 'object' ?
-        Attr: { style: [], advanced: [], content: []};
+      let AttrObj = this.$xdUniHelper.checkVarType(this.Attr) === 'object' ?
+        this.Attr : { style: [], advanced: [], content: []};
       console.log('handleSelect.Attr', AttrObj);
 
       //设置已绑定数据

package/src/components/JfbBaseSuccess/JfbBaseSuccess.vue

@@ -231,8 +231,9 @@
         
         console.log('getOrderStatus.start', this.statusUrl);
         getNoUrl({url:this.statusUrl, params: {...this.params, order_id: this.order_id}})
-          .then(res=>{
+          .then(([res])=>{
             console.log(res);
+            resolve(this.handleOrderResolve(res));
           })
           .catch(error => {
             console.error(error);
@@ -240,6 +241,52 @@
           })
       },
 
+      handleOrderResolve({info, order}){
+        let icon = "iconshijian";
+        let iconColor = '#333';
+        let btn = [{'label': '返回首页', type: 'info', radius: '10rpx', value: 1}];
+        if(order.orderStatus == '3000'){
+          icon = "icondingdanwancheng";
+          iconColor = "green";
+          btn = btn.concat([
+            {
+              label: getContainerPropsValue(this.container, 'content.custom_btn_name'),
+              type: 'primary',
+              radius: '12rpx',
+              value: 2
+            }
+          ])
+        }else if(order.orderStatus == '3002'){
+          iconColor = "red";
+          icon = "icongerenzhongxinchufabaocuo";
+          btn = btn.concat([
+            {'label': '重新支付', type: 'info', radius: '10rpx', value: 3},
+          ])
+        }
+
+        let result = {
+          //基础信息
+          info: {
+            descTitle: info.descTitle,
+            desc: info.desc,
+            tips: order.tips,
+            btn: btn,
+          },
+  
+          //订单信息
+          order: {
+            icon: icon,
+            iconSize: 80, //图标大小
+            iconColor: iconColor, //图标颜色
+            orderName: order.orderName, //订单状态名称
+            orderStatus: order.orderStatus, //订单状态名称,
+            content: '',
+            tips: order.tips,
+          },
+        };
+        return result;
+      },
+
       handleOnBtnClick({btn}) {
         if (btn['value'] === 1) {
           this.$xdUniHelper.redirectTo({
@@ -252,6 +299,9 @@
             url: `${this.detail}?${other}`
           })
         }
+        if (btn['value'] === 3) {
+          this.$xdUniHelper.navigateBack();
+        }
       },
       
       /**

package/src/components/JfbBaseSuccess/JfbBaseSuccessMixin.js

@@ -93,16 +93,31 @@ export default {
       //#ifdef H5
       
       //@AttrData
-      Attr, //对外开发编辑属性
+      Attr:{}, //对外开发编辑属性
       //@EndAttrData
       
       active: false, //是否选择当前状态
       isEditx: true, //当前为Editx模式
       edit: false, //是否开启编辑模式
       // #endif
+
+      //风格键
+      mainColor: '',
+      successColor: '',
+      warningColor: '',
+      subMainColor: '',
+      infoColor: '',
+      defaultColor: '',
+      dangerColor: ''
     }
   },
   created() {
+    
+    //@AttrDataCreated
+    this.Attr = this.$xdUniHelper.customClone(Attr);
+    //@EndAttrDataCreated
+    
+
     //设置插件cid
     if (this.cid) {
       this.containerId = this.cid;
@@ -110,6 +125,9 @@ export default {
       this.containerId = this.$xdUniHelper.randomChar(20);
     }
 
+    //初始化风格
+    this.initThemesToData();
+
     //#ifdef H5
     //监听用户点击状态显示虚框
     XdBus.addEvent('select', ({containerId}) => {
@@ -132,6 +150,26 @@ export default {
     onCheck() {
     },
 
+    /***
+     * @description 业务组件风格map到data中
+     */
+    initThemesToData() {
+      Object.keys(this.styles).map(key => {
+        let k = key.replace('$', '');
+        if (this[k] !== undefined) this[k] = this.styles[key];
+      });
+      console.log('initThemesToData',this)
+    },
+
+    /**
+     * @description 其子级插件获取当前插件的业务组件风格列表
+     * @returns {*}
+     */
+    getParentThemes(){
+      return this.styles;
+    },
+
+
     //#ifdef H5
     /**
      * @description 点击删除操作按钮
@@ -153,8 +191,8 @@ export default {
       //#ifdef H5
       if (this.active) return;
       this.active = true;
-      let AttrObj = this.$xdUniHelper.checkVarType(Attr) === 'object' ?
-        Attr: { style: [], advanced: [], content: []};
+      let AttrObj = this.$xdUniHelper.checkVarType(this.Attr) === 'object' ?
+        this.Attr : { style: [], advanced: [], content: []};
       console.log('handleSelect.Attr', AttrObj);
 
       //设置已绑定数据

package/src/components/JfbBaseTestApi/JfbBaseTestApiMixin.js

@@ -93,16 +93,31 @@ export default {
       //#ifdef H5
       
       //@AttrData
-      Attr, //对外开发编辑属性
+      Attr:{}, //对外开发编辑属性
       //@EndAttrData
       
       active: false, //是否选择当前状态
       isEditx: true, //当前为Editx模式
       edit: false, //是否开启编辑模式
       // #endif
+
+      //风格键
+      mainColor: '',
+      successColor: '',
+      warningColor: '',
+      subMainColor: '',
+      infoColor: '',
+      defaultColor: '',
+      dangerColor: ''
     }
   },
   created() {
+    
+    //@AttrDataCreated
+    this.Attr = this.$xdUniHelper.customClone(Attr);
+    //@EndAttrDataCreated
+    
+
     //设置插件cid
     if (this.cid) {
       this.containerId = this.cid;
@@ -110,6 +125,9 @@ export default {
       this.containerId = this.$xdUniHelper.randomChar(20);
     }
 
+    //初始化风格
+    this.initThemesToData();
+
     //#ifdef H5
     //监听用户点击状态显示虚框
     XdBus.addEvent('select', ({containerId}) => {
@@ -132,6 +150,26 @@ export default {
     onCheck() {
     },
 
+    /***
+     * @description 业务组件风格map到data中
+     */
+    initThemesToData() {
+      Object.keys(this.styles).map(key => {
+        let k = key.replace('$', '');
+        if (this[k] !== undefined) this[k] = this.styles[key];
+      });
+      console.log('initThemesToData',this)
+    },
+
+    /**
+     * @description 其子级插件获取当前插件的业务组件风格列表
+     * @returns {*}
+     */
+    getParentThemes(){
+      return this.styles;
+    },
+
+
     //#ifdef H5
     /**
      * @description 点击删除操作按钮
@@ -153,8 +191,8 @@ export default {
       //#ifdef H5
       if (this.active) return;
       this.active = true;
-      let AttrObj = this.$xdUniHelper.checkVarType(Attr) === 'object' ?
-        Attr: { style: [], advanced: [], content: []};
+      let AttrObj = this.$xdUniHelper.checkVarType(this.Attr) === 'object' ?
+        this.Attr : { style: [], advanced: [], content: []};
       console.log('handleSelect.Attr', AttrObj);
 
       //设置已绑定数据

package/src/components/JfbBaseTestBody/JfbBaseTestBodyMixin.js

@@ -92,9 +92,20 @@ export default {
       isEditx: true, //当前为Editx模式
       edit: false, //是否开启编辑模式
       // #endif
+
+      //风格键
+      mainColor: '',
+      successColor: '',
+      warningColor: '',
+      subMainColor: '',
+      infoColor: '',
+      defaultColor: '',
+      dangerColor: ''
     }
   },
   created() {
+    
+
     //设置插件cid
     if (this.cid) {
       this.containerId = this.cid;
@@ -102,6 +113,9 @@ export default {
       this.containerId = this.$xdUniHelper.randomChar(20);
     }
 
+    //初始化风格
+    this.initThemesToData();
+
     //#ifdef H5
     //监听用户点击状态显示虚框
     XdBus.addEvent('select', ({containerId}) => {
@@ -124,6 +138,26 @@ export default {
     onCheck() {
     },
 
+    /***
+     * @description 业务组件风格map到data中
+     */
+    initThemesToData() {
+      Object.keys(this.styles).map(key => {
+        let k = key.replace('$', '');
+        if (this[k] !== undefined) this[k] = this.styles[key];
+      });
+      console.log('initThemesToData',this)
+    },
+
+    /**
+     * @description 其子级插件获取当前插件的业务组件风格列表
+     * @returns {*}
+     */
+    getParentThemes(){
+      return this.styles;
+    },
+
+
     //#ifdef H5
     /**
      * @description 点击删除操作按钮
@@ -145,8 +179,8 @@ export default {
       //#ifdef H5
       if (this.active) return;
       this.active = true;
-      let AttrObj = this.$xdUniHelper.checkVarType(Attr) === 'object' ?
-        Attr: { style: [], advanced: [], content: []};
+      let AttrObj = this.$xdUniHelper.checkVarType(this.Attr) === 'object' ?
+        this.Attr : { style: [], advanced: [], content: []};
       console.log('handleSelect.Attr', AttrObj);
 
       //设置已绑定数据

package/src/components/JfbBaseTestBottom/JfbBaseTestBottomMixin.js

@@ -92,9 +92,20 @@ export default {
       isEditx: true, //当前为Editx模式
       edit: false, //是否开启编辑模式
       // #endif
+
+      //风格键
+      mainColor: '',
+      successColor: '',
+      warningColor: '',
+      subMainColor: '',
+      infoColor: '',
+      defaultColor: '',
+      dangerColor: ''
     }
   },
   created() {
+    
+
     //设置插件cid
     if (this.cid) {
       this.containerId = this.cid;
@@ -102,6 +113,9 @@ export default {
       this.containerId = this.$xdUniHelper.randomChar(20);
     }
 
+    //初始化风格
+    this.initThemesToData();
+
     //#ifdef H5
     //监听用户点击状态显示虚框
     XdBus.addEvent('select', ({containerId}) => {
@@ -124,6 +138,26 @@ export default {
     onCheck() {
     },
 
+    /***
+     * @description 业务组件风格map到data中
+     */
+    initThemesToData() {
+      Object.keys(this.styles).map(key => {
+        let k = key.replace('$', '');
+        if (this[k] !== undefined) this[k] = this.styles[key];
+      });
+      console.log('initThemesToData',this)
+    },
+
+    /**
+     * @description 其子级插件获取当前插件的业务组件风格列表
+     * @returns {*}
+     */
+    getParentThemes(){
+      return this.styles;
+    },
+
+
     //#ifdef H5
     /**
      * @description 点击删除操作按钮
@@ -145,8 +179,8 @@ export default {
       //#ifdef H5
       if (this.active) return;
       this.active = true;
-      let AttrObj = this.$xdUniHelper.checkVarType(Attr) === 'object' ?
-        Attr: { style: [], advanced: [], content: []};
+      let AttrObj = this.$xdUniHelper.checkVarType(this.Attr) === 'object' ?
+        this.Attr : { style: [], advanced: [], content: []};
       console.log('handleSelect.Attr', AttrObj);
 
       //设置已绑定数据

package/src/components/JfbBaseTestTop/JfbBaseTestTopMixin.js

@@ -92,9 +92,20 @@ export default {
       isEditx: true, //当前为Editx模式
       edit: false, //是否开启编辑模式
       // #endif
+
+      //风格键
+      mainColor: '',
+      successColor: '',
+      warningColor: '',
+      subMainColor: '',
+      infoColor: '',
+      defaultColor: '',
+      dangerColor: ''
     }
   },
   created() {
+    
+
     //设置插件cid
     if (this.cid) {
       this.containerId = this.cid;
@@ -102,6 +113,9 @@ export default {
       this.containerId = this.$xdUniHelper.randomChar(20);
     }
 
+    //初始化风格
+    this.initThemesToData();
+
     //#ifdef H5
     //监听用户点击状态显示虚框
     XdBus.addEvent('select', ({containerId}) => {
@@ -124,6 +138,26 @@ export default {
     onCheck() {
     },
 
+    /***
+     * @description 业务组件风格map到data中
+     */
+    initThemesToData() {
+      Object.keys(this.styles).map(key => {
+        let k = key.replace('$', '');
+        if (this[k] !== undefined) this[k] = this.styles[key];
+      });
+      console.log('initThemesToData',this)
+    },
+
+    /**
+     * @description 其子级插件获取当前插件的业务组件风格列表
+     * @returns {*}
+     */
+    getParentThemes(){
+      return this.styles;
+    },
+
+
     //#ifdef H5
     /**
      * @description 点击删除操作按钮
@@ -145,8 +179,8 @@ export default {
       //#ifdef H5
       if (this.active) return;
       this.active = true;
-      let AttrObj = this.$xdUniHelper.checkVarType(Attr) === 'object' ?
-        Attr: { style: [], advanced: [], content: []};
+      let AttrObj = this.$xdUniHelper.checkVarType(this.Attr) === 'object' ?
+        this.Attr : { style: [], advanced: [], content: []};
       console.log('handleSelect.Attr', AttrObj);
 
       //设置已绑定数据