jufubao-base 1.0.21 → 1.0.23-beta2

package/src/components/JfbBaseSetPwd/JfbBaseSetPwd.vue

@@ -1,34 +1,50 @@
 <template>
   <view
     class="jfb-base-set-pwd"
-    @click="handleSelect"
-    :class="{ editx : isEditx && active }"
+    @click="handleEditxSelect"
+    :class="{
+      editx : isEditx && active,
+      noBorder: noBorder
+    }"
   >
     <!--#ifdef H5-->
     <view
       class="jfb-base-set-pwd__edit"
       :class="{ editx : isEditx && active }"
-      v-if="isEditx && active"
+      v-if="isEditx && active && !noBorder"
     >
       <view class="jfb-base-set-pwd__edit-icon" @click="delEdit">删除</view>
     </view>
     <!-- #endif -->
     <view class="jfb-base-set-pwd__body">
       <view>
-        <view class="jfb-base-set-pwd__body-title">
-          您暂未设置平台支付密码，请设置
-        </view>
+        <view
+          class="jfb-base-set-pwd__body-title"
+          :style="{
+            background:noticeBackgroundColor,
+            color: warningColor
+          }"
+        >您暂未设置平台支付密码，请设置</view>
         <view class="jfb-base-set-pwd__body-form">
           <view class="jfb-base-set-pwd__body-form-label">手机号</view>
           <view class="jfb-base-set-pwd__body-form-value">
             <input class="jfb-base-set-pwd__body-form-input" type="text" placeholder="请输入11位手机号" v-model="phone">
           </view>
         </view>
-        <view class="jfb-base-set-pwd__body-form" style="padding: 60rpx 0rpx 60rpx 60rpx">
+        <view class="jfb-base-set-pwd__body-form">
           <view class="jfb-base-set-pwd__body-form-label">验证码</view>
           <input style="width: 300rpx" class="jfb-base-set-pwd__body-form-input" type="text" placeholder="获取验证码" v-model="code">
-          <view v-if="!status" class="jfb-base-set-pwd__body-form-code" @click="handleGetCode">{{statusMsg}}</view>
-          <view v-else class="jfb-base-set-pwd__body-form-code" style="width: 200rpx">{{statusMsg}}</view>
+          <view
+            v-if="!status"
+            class="jfb-base-set-pwd__body-form-code"
+            @click="handleGetCode"
+            :style="{color:mainColor}"
+          >{{statusMsg}}</view>
+          <view
+            v-else
+            class="jfb-base-set-pwd__body-form-code"
+            :style="{color:mainColor,width: 200 + 'rpx'}"
+          >{{statusMsg}}</view>
         </view>
         <view class="jfb-base-set-pwd__body-form">
           <view class="jfb-base-set-pwd__body-form-label">输入密码</view>
@@ -38,9 +54,11 @@
           <view class="jfb-base-set-pwd__body-form-label">确认密码</view>
           <input class="jfb-base-set-pwd__body-form-input" type="text" v-model="confirmPwd" placeholder="请再次输入支付密码">
         </view>
-        <view class="jfb-base-set-pwd__body-footer"
-              :style="{bottom: layoutInfo.bottom + 'rpx',height: layoutInfo.bottom + 'rpx'}">
-          <xd-button type="primary" width="360rpx">确认</xd-button>
+        <view
+          class="jfb-base-set-pwd__body-footer"
+          :style="prod_bottom"
+        >
+          <xd-button type="primary" @click="handleConfirm" width="360rpx">确认</xd-button>
         </view>
       </view>
     </view>
@@ -52,6 +70,10 @@
   import XdButton from "@/components/XdButton/XdButton";
   import {jfbRootExec} from "@/utils/xd.event";
   import JfbBaseSetPwdMixin from "./JfbBaseSetPwdMixin";
+  import componentsMixins from "@/mixins/componentsMixins";
+  import extsMixins from "@/mixins/extsMixins"
+
+  const Color = require('color');
 
   export default {
     name: "JfbBaseSetPwd",
@@ -59,9 +81,7 @@
       XdFontIcon,
       XdButton
     },
-    mixins: [
-      JfbBaseSetPwdMixin
-    ],
+    mixins: [componentsMixins,extsMixins,JfbBaseSetPwdMixin],
     data() {
       return {
         phone: '',
@@ -71,14 +91,28 @@
         second: 0,
         statusMsg: '获取验证码',
         status: false,
-        //todo
+  
+        noticeBackgroundColor: '',
+        selfMask: true
       }
     },
+    computed: {
+      prod_bottom() {
+        return this.fixedStyle({height: 0, zIndex: 111});
+      },
+    },
     created() {
-
-      //todo
+      this.noticeBackgroundColor = Color(this.warningColor).alpha(0.2).toString();
+      
     },
     methods: {
+      handleConfirm(){
+        //if(this.$configProject.isPreview) return;
+        this.$xdAlert({
+          content: '开发中'
+        })
+        //todo
+      },
       sendSmsSuccess() {
         this.status = true;
         this.second = 119;
@@ -113,29 +147,9 @@
         return str === null || str === "" || str === undefined;
       },
       onJfbLoad(options) {
-
-        // jfbRootExec('baiduUserLogin', {
-
-        //   vm: this,//   data: {
-
-        //     account: 'gaoshiyong',//     password: '123456789',//     type: 3,//     ...options
-
-        //   }
-
-        // }).then().catch()
-      },
-      onJfbScroll(options) {
-        console.log('event.onJfbScroll', options)
-      },
-      onJfbReachBottom(options) {
-        console.log('event.onJfbReachBottom', options)
-      },
-      onJfbShow(options) {
-        console.log('event.onJfbShow', options)
-      },
-      onJfbHide(options) {
-        console.log('event.onJfbHide', options)
+      
       },
+      
       onJfbBack(options) {
         console.log('event.onJfbBack', options)
       },
@@ -153,11 +167,9 @@
 
     &__body {
       &-title {
-        background: #FFFCE0;
         font-size: unit(24, rpx);
-        color: #FE7A63;
         text-align: center;
-        padding: unit(40, rpx) 0;
+        padding: unit(20, rpx) 0;
       }
 
       &-form {
@@ -165,8 +177,8 @@
         align-items: center;
         justify-content: flex-start;
         font-size: unit(30, rpx);
-        padding: unit(60, rpx);
-        border-bottom: unit(2, rpx) solid #EEEEEEFF;
+        padding: unit(40, rpx);
+        border-bottom: unit(2, rpx) solid #eee;
 
         &-label {
           width: unit(120, rpx);
@@ -182,10 +194,9 @@
 
         &-code {
           width: unit(180, rpx);
-          height: unit(80, rpx);
-          line-height: unit(80, rpx);
+          height: unit(46, rpx);
+          line-height: unit(46, rpx);
           font-size: unit(24, rpx);
-          color: #FE7A63;
           text-align: center;
         }
 
@@ -200,7 +211,10 @@
         left: 0;
         right: 0;
         background: #fff;
-        padding-top: unit(20, rpx);
+        height: unit(320, rpx);
+        display: flex;
+        justify-content: center;
+        align-items: center;
       }
     }
   }

package/src/components/JfbBaseSetPwd/JfbBaseSetPwdLess.less

@@ -13,18 +13,30 @@
 
 //start
 .jfb-base-set-pwd {
-  border: 1px dashed rgba(0, 0, 0, 0);
   box-sizing: border-box;
 
-  &.editx {
-    position: relative;
-    border: 1px dashed blue;
-    box-sizing: border-box;
-
+  &__body{
+      position: relative;
+      overflow: hidden;
+      z-index: 2
   }
 
-  &:hover {
-    border: 1px dashed blue;
+  &.editx,&.editx:hover {
+    position: relative;
+    min-height: unit(100, rpx);
+    z-index: 3;
+    &::after {
+      border: 2rpx dashed blue;
+      content: " ";
+      position: absolute;
+      top:0;
+      left:0;
+      bottom:0;
+      right:0;
+      z-index: 4;
+      cursor: pointer;
+    }
+
   }
 
 
@@ -55,3 +67,13 @@
   }
 }
 //end
+
+
+/**notPreview**/
+.jfb-base-set-pwd {
+  //&:before {
+    //content: " ";
+    //display: table;
+  //}
+}
+/**endNotPreview**/

package/src/components/JfbBaseSetPwd/JfbBaseSetPwdMixin.js

@@ -1,114 +1,22 @@
 'use strict';
 
+
 //@AttrImport
 import Attr from "./Attr";
 //@EndAttrImport
 
-import {getContainerPropsValue} from "@/utils/xd.base";
+
 export default {
-  props: {
-    /**
-     * @description 插件在页面中到唯一ID
-     */
-    cid:{
-      type: null|String|Number,
-      default: null,
-    },
-    /**
-     * @description 业务插件相关数据集合
-     */
-    container:{
-      type: Object,
-      default() {
-        return {}
-      }
-    },
-    /**
-     * @description 页面框架属性
-     */
-    layoutInfo: {
-      type: Object,
-      default() {
-        return {}
-      }
-    },
-    /**
-     * @description 页面属性
-     */
-    pageAttr: {
-      type: Object,
-      default() {
-        return {}
-      }
-    },
-    /**
-     * @description 业务插件元素属性（插件管理时候填写属性）
-     */
-    componentAttr: {
-      type: Object|Array,
-      default() {
-        return {}
-      }
-    },
-    /**
-     * @description 业务插件所属插件库属性（业务插件库）
-     */
-    appAttr: {
-      type: Object|Array,
-      default() {
-        return {}
-      }
-    },
-    /**
-     * @description 项目配置
-     */
-    settings: {
-      type: Object,
-      default() {
-        return {}
-      }
-    },
-    /**
-     * @description 业务插件库所用风格属性
-     */
-    styles: {
-      type: Object || null,
-      default() {
-        return {}
-      }
-    },
-    /**
-     * @description 项目配置文件
-     */
-    projectAttr: {
-      type: Object || null,
-      default() {
-        return {}
-      }
-    }
-  },
   data() {
     return {
-      containerId: null, //容器ID
       //#ifdef H5
       
       //@AttrData
       Attr:{}, //对外开发编辑属性
       //@EndAttrData
       
-      active: false, //是否选择当前状态
-      isEditx: true, //当前为Editx模式
-      edit: false, //是否开启编辑模式
       // #endif
-
-      //风格键
-      mainColor: '',
-      successColor: '',
-      warningColor: '',
-      subMainColor: '',
-      infoColor: '',
-      defaultColor: '',
-      dangerColor: ''
+      cssRoot: 'jfb-base-set-pwd'
     }
   },
   created() {
@@ -118,105 +26,5 @@ export default {
     //@EndAttrDataCreated
     
 
-    //设置插件cid
-    if (this.cid) {
-      this.containerId = this.cid;
-    } else {
-      this.containerId = this.$xdUniHelper.randomChar(20);
-    }
-
-    //初始化风格
-    this.initThemesToData();
-
-    //#ifdef H5
-    //监听用户点击状态显示虚框
-    XdBus.addEvent('select', ({containerId}) => {
-      this.active = containerId === this.containerId;
-    });
-
-    //业务面板选中插件操作
-    XdBus.addEvent('onBoardSelect', ({containerId}) => {
-      if (containerId === this.containerId) {
-        this.handleSelect()
-      }
-    });
-    // #endif
   },
-  methods: {
-
-    /**
-     * 检查插件是否加载成功
-     */
-    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 点击删除操作按钮
-     */
-    delEdit(){
-      XdBus.send('onDelPackage', {
-        containerId: this.containerId,
-        componentAtrr: this.componentAtrr,
-        cid: this.cid,
-        container: this.container
-      })
-    },
-    //#endif
-
-    /**
-     * @description 点击选择插件显示边框
-     */
-    handleSelect() {
-      //#ifdef H5
-      if (this.active) return;
-      this.active = true;
-      let AttrObj = this.$xdUniHelper.checkVarType(this.Attr) === 'object' ?
-        this.Attr : { style: [], advanced: [], content: []};
-      console.log('handleSelect.Attr', AttrObj);
-
-      //设置已绑定数据
-      Object.keys(AttrObj).map(type=>{
-        AttrObj[type].map(item=>{
-           if(item.value !== undefined) item.value = getContainerPropsValue(this.container, `${type}.${item.valueKey}`, item.value);
-           if(item.defaultValue !== undefined) item.defaultValue = getContainerPropsValue(this.container, `${type}.${item.valueKey}`, item.value);
-        })
-      });
-
-      //发送点击组件事件
-      XdBus.send('onSelectPackage', {
-        containerId: this.containerId,
-        Attr: AttrObj,
-        container: this.$xdUniHelper.cloneDeep(this.container)
-      });
-
-      //绑定选中插件事件
-      XdBus.message('select', {
-        containerId: this.containerId,
-      })
-      //#endif
-    },
-
-
-  }
 }

package/src/components/JfbBaseSuccess/Api.js

@@ -0,0 +1,35 @@
+'use strict';
+
+/**
+ * @description API模型
+ * @type {*[]}
+ */
+module.exports = [
+  {
+    mapFnName: 'getOrderStatus',
+    title: '获取订单状态',
+    path: '/order/v1/order/status-detail',
+    isRule: false,
+    params: {
+      main_order_id: ['订单号', 'Number', '必选'],
+      is_show_code: ['是否显示码 1=显示,0=隐藏', 'Number', '非必选'],
+      is_show_product: ['是否显示商品 1=显示,0=隐藏 仅电子码商品', 'Number', '非必选'],
+      custom_content_page_id: ['自定义内容容器ID 不显示自定内容时请传空', 'Number', '非必选'],
+      custom_content_container_id: ['自定义内容容器ID 不显示自定内容时请传空', 'Number', '非必选'],
+    },
+    isConsole: true,
+    disabled: true,
+  },
+  {
+    mapFnName: 'getMallProductDetail',
+    title: '获取商品详情',
+    path: '/product/v1/:xnamespace/product/item/:product_id/content',
+    isRule: false,
+    params: {
+      xnamespace: ['业务线', 'Number', '必选'],
+      product_id: ['商品详情', 'Number', '必选'],
+    },
+    isConsole: true,
+    disabled: true,
+  },
+];