jufubao-base 1.0.243-beta2 → 1.0.243-beta202

package/src/components/JfbBasePersonalData/JfbBasePersonalData.vue

@@ -0,0 +1,278 @@
+<template>
+  <view class="jfb-base-personal-data" @click="handleEditxSelect" :class="{ editx : isEditx && active }">
+    <!--#ifdef H5-->
+    <view class="jfb-base-personal-data__edit" :class="{ editx : isEditx && active }" v-if="isEditx && active">
+      <view class="jfb-base-personal-data__edit-icon" @click="delEdit">删除</view>
+    </view>
+    <!-- #endif -->
+    <view class="jfb-base-personal-data__body" v-if="info">
+      <view class="jfb-base-personal-data__body-item">
+        <view class="jfb-base-personal-data__body-item-label">头像</view>
+        <view class="profile">
+          <image :src="info.head_url"></image>
+          <!--#ifdef MP-->
+          <button type="default" open-type="chooseAvatar" @chooseavatar="handleChooseAvatar"></button>
+          <!-- #endif -->
+        </view>
+
+      </view>
+      <view class="jfb-base-personal-data__body-item">
+        <view class="jfb-base-personal-data__body-item-label">账号</view>
+        <view class="jfb-base-personal-data__body-item-value">{{info.phone_number}}</view>
+      </view>
+      <view class="jfb-base-personal-data__body-item">
+        <view class="jfb-base-personal-data__body-item-label">名称</view>
+        <!--#ifdef MP-->
+        <input
+          @change="handleWxSetInfo"
+          class="jfb-base-personal-data__body-item-value"
+          v-model="info.nickname"
+          type="nickname"
+        >
+        <!-- #endif -->
+        <!--#ifdef H5-->
+        <input
+          @blur="handleSetInfo"
+          @confirm="handleSetInfo"
+          class="jfb-base-personal-data__body-item-value"
+          v-model="info.nickname"
+          type="text"
+        >
+        <!-- #endif -->
+      </view>
+      <view class="jfb-base-personal-data__body-item">
+        <view class="jfb-base-personal-data__body-item-label">性别</view>
+        <XdSelect
+          @change="handleSetSex"
+          padding="0"
+          color="#999"
+          class="select"
+          :defaultValue="info.sex"
+          v-model="info.sex"
+          :list="sexList"
+        >
+          <template>
+            <view class="jfb-base-personal-data__body-item-value">
+              <XdFontIcon
+                class="icon"
+                color="#999999"
+                size="24"
+                icon="iconxiangyou_xian"
+              ></XdFontIcon>
+            </view>
+          </template>
+        </XdSelect>
+      </view>
+      <view class="jfb-base-personal-data__body-item">
+        <view class="jfb-base-personal-data__body-item-label">生日</view>
+        <view style="display: flex;align-items: center" @click="showDate=true">
+          <view class="jfb-base-personal-data__body-item-value">{{info.birthday_date}}</view>
+          <XdFontIcon class="icon" color="#999999" size="24" icon="iconxiangyou_xian"></XdFontIcon>
+        </view>
+      </view>
+      <XdDate ref="calendar" :selectType="false" :main-color="mainColor" :current-is-show-other-month="false"
+        :show.sync="showDate" :clear-date="true" :insert="false" :lunar="false" :selected-circle="false"
+        :date="info.birthday_date" @confirm="confirmDate" @close="closeDate"></XdDate>
+    </view>
+  </view>
+</template>
+
+<script>
+  import XdFontIcon from "@/components/XdFontIcon/XdFontIcon";
+  import XdDate from '@/components/XdDate/XdDate.vue'
+  import XdSelect from "@/components/XdSelect/XdSelect";
+  import { jfbRootExec } from "@/utils/xd.event";
+  import JfbBasePersonalDataMixin from "./JfbBasePersonalDataMixin";
+  import { getContainerPropsValue } from "@/utils/xd.base";
+  import componentsMixins from "@/mixins/componentsMixins";
+  import extsMixins from "@/mixins/extsMixins";
+  import {mapActions} from "vuex";
+  import getServiceUrl from "@/common/getServiceUrl";
+  export default {
+    name: "JfbBasePersonalData",
+    components: {
+      XdFontIcon,
+      XdSelect,
+      XdDate
+    },
+    mixins: [
+      componentsMixins, extsMixins, JfbBasePersonalDataMixin
+    ],
+    data() {
+      return {
+        info: {},
+        single: '',
+        showDate: false,
+        sexList: [
+          {
+            label: '男',
+            value: '1'
+          },
+          {
+            label: '女',
+            value: '2'
+          }
+        ],
+      }
+    },
+    watch: {
+      container(value, oldValue) {
+        if (JSON.stringify(value) === JSON.stringify(oldValue)) return;
+        if (this.$configProject['isPreview']) this.init(value)
+      },
+    },
+    created() {
+      this.init(this.container);
+    },
+    methods: {
+      //#ifdef MP
+      ...mapActions(['getUploadParams']),
+
+      handleChooseAvatar({detail}){
+        this.info.head_url = detail.avatarUrl;
+        let temp = detail.avatarUrl.split('.')
+        let ext = temp[temp.length -1];
+        let name = `${this.info.nickname}.${ext}`;
+        this.$xdShowLoading({});
+        this.getUploadParams({name,type: 'public'})
+          .then(res=>{
+            uni.uploadFile({
+              url: res.action,
+              filePath: detail.avatarUrl,
+              name: 'file',
+              formData: this.$xdUniHelper.cloneDeep(res),
+              success: (uploadFileRes) => {
+                this.handleSetInfo({head_url: res.url}, ()=>{
+                  this.$xdHideLoading()
+                })
+
+              },
+              error:()=>{
+                this.$xdHideLoading()
+              }
+            });
+          })
+          .catch(err=>{
+            this.$xdHideLoading()
+          });
+      },
+
+      handleWxSetInfo(){
+        if(this.info.nickname) {
+          this.handleSetInfo();
+        }
+      },
+      //#endif
+
+      onJfbLoad(options) {
+        this.getInfo()
+      },
+      /**
+       * @description 监听事件变化
+       * @param container {object} 业务组件对象自己
+       */
+      init(container) {
+      },
+
+      getInfo() {
+        jfbRootExec("getBasePersonInfo", {
+          vm: this,
+          data: {},
+        }).then(res => {
+          this.info = res
+          if(this.info.head_url) this.info.head_url = getServiceUrl(this.info.head_url,'size2')
+        })
+      },
+      confirmDate(e) {
+        this.info.birthday_date = e.fulldate
+        this.handleSetInfo()
+      },
+      closeDate() {},
+      handleSetSex(data) {
+        this.info.sex = data.item.value
+        this.handleSetInfo()
+      },
+
+      handleSetInfo(ext={}, cb) {
+        let params = {
+          nickname: this.info.nickname,
+          sex: this.info.sex,
+          birthday_date: this.info.birthday_date
+        }
+        //设置扩展信息
+        if(!this.$xdUniHelper.isEmpty(ext)) {
+          params = Object.assign({},params,ext);
+        }
+        debugger
+        jfbRootExec("setBasePersonInfo", {
+          vm: this,
+          data: params,
+        }).then(res => {
+          this.getInfo();
+          if(typeof cb === 'function') cb();
+        })
+      },
+
+    }
+  }
+
+</script>
+
+<style scoped lang="less">
+  @import "./JfbBasePersonalDataLess.less";
+
+  .jfb-base-personal-data {
+    &__body {
+      .icon {
+        margin-left: 8rpx;
+      }
+
+      &-item {
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+        border-radius: 20rpx;
+        background: #FFFFFF;
+        padding: 32rpx 46rpx;
+        margin: 20rpx;
+
+        &-label {
+          color: #333;
+          font-size: 28rpx;
+        }
+
+        &-value {
+          color: #999999;
+          font-size: 28rpx;
+          text-align: right;
+          display: flex;
+          align-items: center;
+        }
+
+        .profile {
+          width: 80rpx;
+          height: 80rpx;
+          border-radius: 50%;
+          position: relative;
+          overflow: hidden;
+
+          & > image {
+            width: 78rpx;
+            height: 78rpx;
+            border-radius: 50%;
+            border:1px solid #ccc;
+            box-sizing: border-box;
+          }
+          & > button {
+            position: absolute;
+            left: 0;
+            right: 0;
+            bottom: 0;
+            top: 0;
+            opacity: 0;
+          }
+        }
+      }
+    }
+  }
+</style>

package/src/components/JfbBasePersonalData/JfbBasePersonalDataLess.less

@@ -0,0 +1,79 @@
+/**
+* @desc 获取绝对路径完整地址
+* @param @path
+**/
+//例如：https://image.jufubao.cn/20220501010108/image/bg/default_gonghui_bg.png
+@basePath: 'business/';
+@doMain: '//sandbox-img.jufubao.cn/';
+
+.getBusinessImageUrl(@path, @size: 'size8') {
+  @url: "@{doMain}@{basePath}@{path}?x-oss-process=style/@{size}";
+  background-image: url(@url);
+}
+
+//start
+.jfb-base-personal-data {
+  box-sizing: border-box;
+
+  &__body{
+      position: relative;
+      overflow: hidden;
+      z-index: 2
+  }
+
+  &.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;
+    }
+
+  }
+
+
+  &__edit {
+    cursor: pointer;
+    position: absolute;
+    right: unit(0, rpx);
+    top: unit(-52, rpx);
+    height: unit(50, rpx);
+    line-height: unit(50, rpx);
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    background: rgba(0, 0, 0, .6);
+    border-radius: unit(10, rpx);
+    box-shadow: 0 0 10px rbga(0, 0, 0, 0.3);
+    color: #fff;
+    font-size: unit(22, rpx);
+
+    &-icon{
+      padding: 0 unit(20, rpx);
+    }
+
+    &.editx {
+      box-sizing: border-box;
+
+    }
+  }
+}
+//end
+
+
+/**notPreview**/
+.jfb-base-personal-data {
+  //&:before {
+    //content: " ";
+    //display: table;
+  //}
+}
+/**endNotPreview**/

package/src/components/JfbBasePersonalData/JfbBasePersonalDataMixin.js

@@ -0,0 +1,30 @@
+'use strict';
+
+
+//@AttrImport
+import Attr from "./Attr";
+//@EndAttrImport
+
+
+export default {
+  data() {
+    return {
+      //#ifdef H5
+      
+      //@AttrData
+      Attr:{}, //对外开发编辑属性
+      //@EndAttrData
+      
+      // #endif
+      cssRoot: 'jfb-base-personal-data'
+    }
+  },
+  created() {
+    
+    //@AttrDataCreated
+    this.Attr = this.$xdUniHelper.customClone(Attr);
+    //@EndAttrDataCreated
+    
+
+  },
+}

package/src/components/JfbBasePersonalData/Mock.js

@@ -0,0 +1,13 @@
+'use strict';
+
+module.exports = {
+  
+  getPersonalByIdFilmSquate:{},
+  
+  updatePersonalFilmPaiqiDate:{},
+  
+  removePersonalFilmAddress:{},
+  
+  addPersonalFilmcart:{},
+  
+}

package/src/components/JfbBasePhoneCollect/JfbBasePhoneCollect.vue

@@ -395,11 +395,9 @@ export default {
       if (this.jfbTimeer > 0) return;
       const { phone_number } = this.accountForm;
       if (!/^1[3-9]\d{9}$/.test(phone_number)) {
-        this.$xdAlert({
-          content: '请填写正确的手机号',
-          time: 2500,
-          isClose: false,
-          zIndex: 5000
+        uni.showToast({
+          title: "请填写正确的手机号",
+          icon: "none",
         });
         return false;
       }
@@ -436,22 +434,8 @@ export default {
     doLoginForm() {
       const { provider_id } = this;
       const { phone_number, verification_code, user_name } = this.accountForm;
-      if (!phone_number || !verification_code) {
-        return this.$xdAlert({
-          content: '手机号跟验证码不能为空',
-          time: 2500,
-          isClose: false,
-          zIndex: 5000
-        });
-      }
-      if(this.isCollectUsername && !user_name){
-        return this.$xdAlert({
-          content: '用户名不能为空',
-          time: 2500,
-          isClose: false,
-          zIndex: 5000
-        });
-      }
+      if (!phone_number || !verification_code) return uni.showToast({ title: "手机号跟验证码不能为空", icon: "none" });
+      if(this.isCollectUsername && !user_name) return uni.showToast({ title: "用户名不能为空", icon: "none" });
 
       this.$xdShowLoading({})
       jfbRootExec("phoneCollect", {

package/src/components/JfbBasePhoneLogin/JfbBasePhoneLogin.vue

@@ -133,16 +133,27 @@
         >暂不登录，去逛逛</view> -->
       </view>
       <xd-dialog :show.sync="showDialog"
-        title="系统提示"
         :showClose="false"
-        :btnRadius="60"
-        maskAutoClose>
+        maskAutoClose
+        :showTitle="false">
         <view class="p_dialog_content">
-          <view class="cont_text">检测到短信发送异常<br/>您是否跳过当前步骤</view>
+          <view class="">
+            <xd-font-icon icon="iconmingchengtubiao" :size="48" color="#666"></xd-font-icon>
+          </view>
+          <view class="cont_text">检测到短信发送异常<br/>是否跳过手机号收集？</view>
         </view>
-        <view slot="btn" class="btn_foot">
-          <xd-button width="240rpx" type="info" @click="p_loginNotJump">取消</xd-button>
-          <xd-button width="240rpx" type="primary" @click="p_loginJumpPhone">跳过</xd-button>
+        <view slot="btn" class="btn_foot" style="background-color: #DDD;">
+          <view class="btn_item not_jump_btn" :style="{
+            backgroundColor: '#FFF',
+          }"
+          @click="p_loginNotJump"
+          >不跳过</view>
+          <view class="btn_item" :style="{
+            backgroundColor: mainColor,
+            color: '#FFF'
+          }"
+          @click="p_loginJumpPhone"
+          >跳过</view>
         </view>
       </xd-dialog>
     </view>
@@ -198,6 +209,7 @@ export default {
       callback_url: "",
       isCollectUsername: false,
       showDialog: false,
+      share_code: "",
 
       inputStyle: "linear", //输入框样式 linear:线性  face: 面性
       formBorderColor: "#F9F9F9", //
@@ -359,6 +371,13 @@ export default {
       this.auth_code = options.auth_code;
       this.provider_id = options.provider_id;
       this.callback_url = options.callback_url;
+      if(options['x-share']){
+        let decodeParams = Base64.decode(options['x-share']);
+        try{
+          let commonParams = JSON.parse(decodeParams);
+          this.share_code = commonParams.share_code;
+        }catch(e){}
+      }
     },
     /**
      * @description 监听事件变化
@@ -497,11 +516,9 @@ export default {
       if (this.jfbTimeer > 0) return;
       const { phone_number } = this.accountForm;
       if (!/^1[3-9]\d{9}$/.test(phone_number)) {
-        this.$xdAlert({
-          content: '请填写正确的手机号',
-          time: 2500,
-          isClose: false,
-          zIndex: 5000
+        uni.showToast({
+          title: "请填写正确的手机号",
+          icon: "none",
         });
         return false;
       }
@@ -557,6 +574,7 @@ export default {
           auth_code,
           provider_id,
           phone_number,
+          share_code: this.share_code,
         }
       }).then(res => {
         this.$xdHideLoading();
@@ -574,20 +592,10 @@ export default {
       const { auth_code, provider_id } = this;
       const { phone_number, verification_code, user_name } = this.accountForm;
       if (!phone_number || !verification_code){
-        return this.$xdAlert({
-          content: '手机号跟验证码不能为空',
-          time: 2500,
-          isClose: false,
-          zIndex: 5000
-        });
+        return uni.showToast({ title: "手机号跟验证码不能为空", icon: "none" });
       }
       if(this.isCollectUsername && !user_name){
-        return this.$xdAlert({
-          content: '用户名不能为空',
-          time: 2500,
-          isClose: false,
-          zIndex: 5000
-        });
+        return uni.showToast({ title: "用户名不能为空", icon: "none" });
       }
       this.$xdShowLoading({});
       jfbRootExec("phoneLogin", {
@@ -597,7 +605,8 @@ export default {
           provider_id,
           phone_number,
           verification_code,
-          user_name
+          user_name,
+          share_code: this.share_code
         },
       })
         .then((res) => {
@@ -654,12 +663,12 @@ export default {
     ::v-deep .xd-dailog__body{
       overflow: hidden;
     }
-    // ::v-deep .xd-dailog__body-content{
-    //   padding: 0;
-    //   overflow: hidden;
-    // }
+    ::v-deep .xd-dailog__body-content{
+      padding: 0;
+      overflow: hidden;
+    }
     .p_dialog_content{
-      padding: 20rpx 0rpx;
+      padding: 100rpx 0rpx;
       display: flex;
       align-items: center;
       justify-content: center;
@@ -667,7 +676,7 @@ export default {
         text-align: left;
         margin-left: 12rpx;
         font-size: 32rpx;
-        color: #999999;
+        color: #333;
       }
     }
     .btn_foot{

package/src/components/JfbBasePointsCard/Api.js

@@ -0,0 +1,18 @@
+'use strict';
+/**
+ * @description  接口配置，
+ * 在设置方法名字当时候，别忘记加上【模块名字】：Points
+ * @type {*[]}
+ */
+module.exports = [
+  {
+    //设置方法名字当别忘记加上【模块名字】：Points
+    mapFnName: 'getPointsPropertyList',
+    title: '用户资产 - 列表',
+    path: '/pay/v1/property/list',
+    isRule: false,
+    params: {},
+    isConsole: true,
+    disabled: true,
+  },
+];