jufubao-base 1.0.20 → 1.0.21

package/src/components/JfbBaseLine/JfbBaseLineMixin.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/JfbBaseLogin/JfbBaseLogin.vue

@@ -14,118 +14,241 @@
     </view>
     <!-- #endif -->
     <view class="jfb-base-login__body">
-      <view @click="onJfbBack">返回</view>
       <view v-if="showStep == 1" class="panel-login-auth">
         <view class="logo-wrap">
-          <image mode="aspectFit" src="https://sandbox-jfb-public-images-common.oss-cn-qingdao.aliyuncs.com/uploads/20220824/3580302c0264f06ba7739f245339249b.png"/>
+          <image
+            mode="aspectFit"
+            src="https://sandbox-jfb-public-images-common.oss-cn-qingdao.aliyuncs.com/uploads/20220824/3580302c0264f06ba7739f245339249b.png"
+          />
         </view>
         <view class="login_types">
-          <!--#ifdef H5-->
-          <xd-button v-if="hasAuthLogin" type="primary" radius="10rpx" @click="doLoginAuth">快捷登录</xd-button>
-          <!-- #endif -->
           <!--#ifdef MP-->
-          <xd-button v-if="hasAuthLogin" type="primary" radius="10rpx" open-type="getUserInfo" @getuserinfo="getuserinfo">快捷登录</xd-button>
+          <xd-button
+            v-if="hasAuthLogin"
+            type="primary"
+            radius="10rpx"
+            open-type="getUserInfo"
+            @getuserinfo="getuserinfo"
+          >快捷登录</xd-button>
           <!-- #endif -->
-          <xd-button v-if="hasAccountLogin" style="margin-top: 40rpx"
+          <xd-button
+            v-if="hasAccountLogin"
+            style="margin-top: 40rpx"
             :disabled="!panelIsChecked"
             type="primary"
-            radius="10rpx" @click="doLoginAccount">账号登录</xd-button>
-
+            radius="10rpx"
+            @click="doLoginAccount"
+          >账号登录</xd-button>
           <view class="protocol">
-            <xd-form-checkbox class="xd-form-checkbox" v-model="panel_1_checked" mode="default" multiple :localdata="[{value: 1, text: '请阅读并同意《隐私政策》《用户服务协议》'}]"></xd-form-checkbox>
-            <!-- <checkbox :checked="panel_1_checked" :color="$mainColor" /> 请阅读并同意《隐私政策》《用户服务协议》 -->
+            <xd-form-checkbox
+              class="xd-form-checkbox"
+              v-model="panel_1_checked"
+              mode="default"
+              multiple
+              :localdata="[{value: 1, text: '请阅读并同意《隐私政策》《用户服务协议》'}]"
+            ></xd-form-checkbox>
           </view>
         </view>
       </view>
-      <view v-if="showStep == 2" class="panel-login-password">
+      <view
+        v-if="showStep == 2"
+        class="panel-login-password"
+      >
         <view class="phone-login-type">
-          <view v-if="phoneLogin" class="_item" :class="{active:accountLoginType=='phone'}" @click="setAccountLoginType('phone')">验证码登录</view>
-          <view v-if="pwdLogin" class="_item" :class="{active:accountLoginType=='pwd'}" @click="setAccountLoginType('pwd')">密码登录</view>
+          <view
+            v-if="phoneLogin"
+            class="_item"
+            :class="{active:accountLoginType=='phone'}"
+            @click="setAccountLoginType('phone')"
+          >验证码登录<text :style="{background: mainColor}"></text></view>
+          <view
+            v-if="pwdLogin"
+            class="_item"
+            :class="{active:accountLoginType=='pwd'}"
+            @click="setAccountLoginType('pwd')"
+          >密码登录<text :style="{background: mainColor}"></text></view>
         </view>
         
         <xd-form label-width="128"
           style="margin-top: 40rpx;"
           label-align="right"
           content-align="left"
-          :border="true">
-          <xd-form-item label="手机号" content-align="left">
-            <xd-form-input v-model="accountForm.phone_number" placeholder="请输入11位手机号" />
+          :border="true"
+        >
+          <xd-form-item
+            label="手机号"
+            content-align="left"
+          >
+            <xd-form-input
+              v-model="accountForm.phone_number"
+              placeholder="请输入11位手机号"
+            />
           </xd-form-item>
-
-          <xd-form-item v-if="accountLoginType=='phone'" label="验证码" content-align="left">
+          <xd-form-item
+            v-if="accountLoginType=='phone'"
+            label="验证码"
+            content-align="left"
+          >
             <view class="flex align-center">
-              <xd-form-input v-model="accountForm.verification_code" placeholder="请输入验证码" />
-              <view class="get_code" @click="reGetCode">{{time ? time + '秒后获取':'获取验证码'}}</view>
+              <xd-form-input
+                v-model="accountForm.verification_code"
+                placeholder="请输入验证码"
+              />
+              <view
+                class="get_code"
+                @click="reGetCode"
+                :style="{color: mainColor}"
+              >{{time ? time + '秒后获取':'获取验证码'}}</view>
             </view>
           </xd-form-item>
-          <xd-form-item v-if="accountLoginType=='pwd'" label="密码" content-align="left">
-            <xd-form-input type="password" v-model="accountForm.password" placeholder="请输入密码" />
+          <xd-form-item
+            v-if="accountLoginType=='pwd'"
+            label="密码"
+            content-align="left"
+          >
+            <xd-form-input
+              type="password"
+              v-model="accountForm.password"
+              placeholder="请输入密码"
+            />
           </xd-form-item>
         </xd-form>
         <view class="form-group">
-          <xd-form-checkbox class="xd-form-checkbox" v-model="panel_1_checked" mode="default" multiple :localdata="[{value: 1, text: '登录即同意《隐私政策》《用户服务协议》'}]"></xd-form-checkbox>
+          <xd-form-checkbox
+            class="xd-form-checkbox"
+            v-model="panel_1_checked"
+            mode="default"
+            multiple
+            :localdata="[{value: 1, text: '登录即同意《隐私政策》《用户服务协议》'}]"
+          ></xd-form-checkbox>
         </view>
         <view class="form-group">
-          <xd-button style="flex: 1;" type="primary" radius="10rpx" @click="doLoginForm">登录</xd-button>
+          <xd-button
+            style="flex: 1;"
+            type="primary"
+            radius="10rpx"
+            @click="doLoginForm"
+          >登录</xd-button>
         </view>
-        <view v-if="accountLoginType=='pwd'" class="forget_password" @click="toValidPhone">忘记密码</view>
-
-        <view class="not_login" @click="toNotLoginHome">暂不登录，去逛逛</view>
-
+        <view
+          v-if="accountLoginType=='pwd'"
+          class="forget_password"
+          @click="toValidPhone"
+        >忘记密码</view>
+        <view
+          class="not_login"
+          :style="{color: mainColor}"
+          @click="toNotLoginHome"
+        >暂不登录，去逛逛</view>
       </view>
-      <view v-if="showStep == 3" class="panel-forget-password">
+      <view
+        v-if="showStep == 3"
+        class="panel-forget-password"
+      >
         <view class="form-group">
           <view style="font-size: 36rpx;">请输入手机号</view>
           <view style="font-size:26rpx;color: #A6A6A6;">为了您的账号安全，请先验证手机号</view>
         </view>
-        <xd-form label-width="120"
+        <xd-form
+          label-width="120"
           style="margin-top: 40rpx;"
-          label-align="right" content-align="left" :border="true">
-          <xd-form-item label="手机号" content-align="left">
-            <xd-form-input v-model="resetForm.phone_number" placeholder="请输入11位手机号" />
+          label-align="right"
+          content-align="left"
+          :border="true"
+        >
+          <xd-form-item
+            label="手机号"
+            content-align="left"
+          >
+            <xd-form-input
+              v-model="resetForm.phone_number"
+              placeholder="请输入11位手机号"
+            />
           </xd-form-item>
-          <xd-form-item label="验证码" content-align="left">
+          <xd-form-item
+            label="验证码"
+            content-align="left"
+          >
             <view class="flex align-center">
-              <xd-form-input v-model="resetForm.verification_code" placeholder="请输入验证码" />
-              <view class="get_code" @click="reGetCode">{{time ? time + '秒后获取':'获取验证码'}}</view>
+              <xd-form-input
+                v-model="resetForm.verification_code"
+                placeholder="请输入验证码"
+              />
+              <view
+                class="get_code"
+                @click="reGetCode"
+		style="{color:mainColor}"
+              >{{time ? time + '秒后获取':'获取验证码'}}</view>
             </view>
           </xd-form-item>
         </xd-form>
         <view class="form-group">
-          <xd-button type="primary" radius="10rpx" @click="toResetPassword">确定</xd-button>
+          <xd-button
+            type="primary"
+            radius="10rpx"
+            @click="toResetPassword"
+          >确定</xd-button>
         </view>
-
         <view class="forget_tip">
           <view>亲爱的用户，为了您的账户安全请联系管理员，或拨打客服热线</view>
           <view class="contact_phone">400-800-9503</view>
-          <xd-button type="primary" style="width: 360rpx;">知道了</xd-button>
+          <xd-button
+            type="primary"
+            style="width: 360rpx;"
+          >知道了</xd-button>
         </view>
       </view>
-      <view v-if="showStep == 4" class="panel-reset-password">
+      <view
+        v-if="showStep == 4"
+        class="panel-reset-password"
+      >
         <view class="form-group">
           <view style="font-size: 36rpx;">手机号{{resetForm.phone_number}}</view>
           <view style="font-size:26rpx;color: #A6A6A6;">请输入新密码并牢记</view>
         </view>
-        <xd-form label-width="220rpx"
+        <xd-form
+          label-width="220rpx"
           style="margin-top: 40rpx;"
-          label-align="right" content-align="left" :border="true">
-          <xd-form-item label="输入新密码" content-align="left">
-            <xd-form-input v-model="resetForm.password" type="password" placeholder="请输入新密码" />
+          label-align="right"
+          content-align="left"
+          :border="true"
+        >
+          <xd-form-item
+            label="输入新密码"
+            content-align="left"
+          >
+            <xd-form-input
+              v-model="resetForm.password"
+              type="password"
+              placeholder="请输入新密码"
+            />
           </xd-form-item>
-          <xd-form-item label="确认新密码" content-align="left">
+          <xd-form-item
+            label="确认新密码"
+            content-align="left"
+          >
             <view class="flex align-center">
-              <xd-form-input v-model="resetForm.confirm_password" type="password" placeholder="请再次输入新密码" />
+              <xd-form-input
+                v-model="resetForm.confirm_password"
+                type="password"
+                placeholder="请再次输入新密码"
+              />
             </view>
           </xd-form-item>
         </xd-form>
         <view class="form-group">
-          <xd-button type="primary" radius="10rpx" @click="doResetPassword">确定</xd-button>
+          <xd-button
+            type="primary"
+            radius="10rpx"
+            @click="doResetPassword"
+          >确定</xd-button>
         </view>
       </view>
     </view>
   </view>
 </template>
 
+
 <script>
   // TODO: h5授权地址、小程序授权获取用户信息、手机号登录（验证码、密码）、发送验证码、验证手机号、重新设置密码
   import XdFontIcon from "@/components/XdFontIcon/XdFontIcon";
@@ -464,13 +587,11 @@
               color: #383838;
               font-size: 36rpx;
 
-              &::after{
-                content: " ";
+              text {
                 position: absolute;
                 height: 6rpx;
                 width: 90rpx;
                 border-radius: 6rpx;
-                background-color: @xd-base-color;
                 left: 50%;
                 bottom: 0;
                 transform: translateX(-50%);

package/src/components/JfbBaseLogin/JfbBaseLoginMixin.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/JfbBaseMy/Api.js

@@ -0,0 +1,60 @@
+'use strict';
+
+/**
+ * @description API模型
+ * 建议：Ffff=>模块  Xxxx=>自定义名字
+ * 获取单记录(getByIdFfffXxxx)
+ * 获取列表记录(getByListFfffXxxx)
+ * 添加列表记录(addFfffXxxxx)
+ * 删除列表记录(removeFfffXxxxx|deleteFfffXxxx)
+ * 更新列表记录(updateFfffXxxxx)
+ * @type {*[]}
+ */
+module.exports = [
+  {
+    mapFnName: 'getByIdFilmSquate', //自定义方法名字（必选）
+    title: '获取电影广场列表',
+    path: '/api/account/film/list-film-square',
+    isRule: false,
+    params: {
+      last_key: ['当前页', 'Number', '必选'],
+      page_size: ['每页数量', 'Number', '必选'],
+    },
+    isConsole: true,
+    disabled: true,
+  },
+  {
+    mapFnName: 'updateFilmPaiqiDate', //自定义方法名字（必选）
+    title: '更新排期',
+    path: '/api/account/film/paiqi-date',
+    isRule: false,
+    params: {
+      film_id: ['电影id', 'Number', '必选'],
+      cinema_id: ['影院id', 'Number', '必选'],
+    },
+    isConsole: true,
+    disabled: true,
+  },
+  {
+    mapFnName: 'removeFilmAddress', //自定义方法名字（必选）
+    title: '删除我的配送地址',
+    path: '/api/account/film/paiqi-date',
+    isRule: false,
+    params: {
+      film_id: ['电影id', 'Number', '必选'],
+    },
+    isConsole: true,
+    disabled: true,
+  },
+  {
+    mapFnName: 'addFilmcart',  //自定义方法名字（必选）
+    title: '添加购物车',
+    path: '/api/account/film/paiqi-date',
+    isRule: false,
+    params: {
+      film_id: ['电影id', 'Number', '必选'],
+    },
+    isConsole: true,
+    disabled: true,
+  },
+];

package/src/components/JfbBaseMy/Attr.js

@@ -0,0 +1,54 @@
+'use strict';
+
+export default {
+  style: [],
+  advanced: [],
+  content: [
+    //文本信息
+    {
+      label: '标题名称:', //label
+      ele: 'el-input', //package 名称
+      type: 'text',
+      valueKey: 'title', //form[valueKey]
+      value: '', //v-model
+      placeholder: '请输入标题名称',
+      classNmae: 'input40', //样式名称 //input100,input80,input70,input60,input50,input40,input30,input20,
+      disabled: true,
+      rules: [
+        {
+          required: true,
+          type: 'url',
+          message: '请输入域名地址',
+          trigger: 'blur'
+        },
+      ]
+    },
+    {
+      label: '订单类型设置:', //label
+      ele: 'xd-order-setting', //package 名称
+      valueKey: 'orderTypeList', //form[valueKey]
+      value: {
+        path: {value: '/index/index/index', label: '首页'}, list: [{
+          icon: "hghf",
+          label: "已完成",
+          size: "12",
+          status: "4"
+        }]
+      },
+      setting: {
+        number: [
+          {"label": "全部", "value": 'all'},
+          {"label": "待付款", "value": '1'},
+          {"label": "待收货", "value": '2'},
+          {"label": "已取消", "value": '3'},
+          {"label": "已完成", "value": '4'},
+        ]
+      },
+      inline: false,
+      notice: '如：设置16:00前下单，最早可提前2小时；16:00后下单，最早可提前1天。<br />若：用户在16点前下单，最早可选择当前下单时间往后2小时的时间；16点后下单，最早只能选择第2天。',
+      rules: [
+        {required: true, message: '请添加内容', trigger: 'change'},
+      ],
+    },
+  ],
+}