jufubao-base 1.0.212-beta101 → 1.0.212

package/package.json

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

package/src/components/JfbBaseConPhone/Api.js

@@ -67,4 +67,14 @@ module.exports = [
     isConsole: true,
     disabled: true,
   },
+  {
+    mapFnName: "getConOssSign",
+    title: "获取上传参数",
+    path: "/common-user/v1/h5-oss/sign",
+    isRule: false,
+    data: {
+    },
+    isConsole: true,
+    disabled: true,
+  },
 ];

package/src/components/JfbBaseConPhone/JfbBaseConPhone.vue

@@ -42,51 +42,47 @@
                 placeholder="请输入验证码"
                 type="text"
               />
-              <XdButton
+              <xd-button
                 :disabled="disabled"
                 class="jfb-base-con-phone__body-wrap-input-code-btn"
                 type="primary"
                 :bg-color="mainColor"
                 size="small"
                 @click="handleSendCode"
-                >{{ message }}</XdButton
-              >
+              >{{ message }}</xd-button>
             </view>
-            <XdButton
+            <xd-button
               type="primary"
               :bg-color="mainColor"
               width="360rpx"
               radius="20rpx"
               size="small"
               :disabled="!phoneNumber || !valid_code"
-              @click="handleConfirm"
-              >确认领取</XdButton
-            >
+              @click="handleConfirmCheck"
+            >确认领取</xd-button>
           </view>
           <view v-else class="jfb-base-con-phone__body-wrap-input">
             <view class="jfb-base-con-phone__body-wrap-input-phone">
               <view class="jfb-base-con-phone__body-wrap-input-phone-change">
                 <view>当前登录手机号</view>
-                <XdButton
+                <xd-button
                   style="margin: 0"
                   type="primary"
                   :bg-color="mainColor"
                   size="small"
                   @click="showCode = true"
-                  >切换手机号</XdButton
-                >
+                >切换手机号</xd-button>
               </view>
               <view>{{ showOhoneNumber }}</view>
             </view>
-            <XdButton
+            <xd-button
               type="primary"
               :bg-color="mainColor"
               width="360rpx"
               radius="20rpx"
               size="medium"
-              @click="handleConfirm"
-              >直接领取</XdButton
-            >
+              @click="handleConfirmCheck"
+            >直接领取</xd-button>
           </view>
         </view>
         <view
@@ -121,15 +117,28 @@
         </view>
       </view>
       <view
-        :style="{
-          height: layoutInfo.bodyMinHeightRpx + 'rpx',
-        }"
+        :style="{height: layoutInfo.bodyMinHeightRpx + 'rpx',}"
         v-else
         class="empty_data"
       >
         <image :src="emptyBg"></image>
-        {{ errmessage }}
+        <text>{{ errmessage }}</text>
       </view>
+      <!--签名-->
+      <xd-dailog :show.sync="dialogShow" title="签名" class="my_dialog">
+        <view class="dialog_head">
+          <view class="h_main">请签名</view>
+          <view class="h_sub">请务必由本人签收，字迹工整</view>
+        </view>
+        <view class="sign_box">
+          <xd-signature ref="signatureRef" v-if="showSignatureRef"></xd-signature>
+        </view>
+        <view slot="btn" class="btn_wrap">
+          <xd-button style="width: 220rpx;" @click="clearSign">重写</xd-button>
+          <xd-button style="width: 220rpx;margin-left: 60rpx;" type="primary" @click="submitSign">确定</xd-button>
+        </view>
+      </xd-dailog>
+      <!--签名-->
     </view>
   </view>
 </template>
@@ -145,12 +154,16 @@ import extsMixins from "@/mixins/extsMixins";
 import { mapState } from "vuex";
 import colorCardMixins from "@/mixins/colorCardMixins";
 import getServiceUrl from "@/common/getServiceUrl";
+import XdDailog from "@/components/XdDailog/XdDailog"
+import XdSignature from "@/components/XdSignature/XdSignature"
 
 export default {
   name: "JfbBaseConPhone",
   components: {
     XdFontIcon,
     XdButton,
+    XdDailog,
+    XdSignature
   },
   computed: {
     ...mapState(["pageBusinessCode"]),
@@ -162,6 +175,8 @@ export default {
   data() {
     return {
       showCode: true,
+      phone_signature:'N', //是否需要签名
+      phone_signature_url: '', //签名url地址
       phoneNumber: "", //手机号
       valid_code: "", //验证码
       btnOneName: "",
@@ -191,6 +206,11 @@ export default {
       bottomHeight: "",
       bottomWidth: "750",
       showBtn: "N",
+
+      //签名
+      dialogShow: false,
+      showSignatureRef: false,
+
     };
   },
   watch: {
@@ -210,15 +230,17 @@ export default {
   },
   methods: {
     async onJfbLoad(options) {
-      await jfbRootExec("getUserPhone", {
+      let res = await jfbRootExec("getUserPhone", {
         vm: this,
         data: {},
-      }).then((res) => {
-        this.showOhoneNumber = res.phone_number;
-        if (this.showOhoneNumber) {
-          this.showCode = false;
-        }
       });
+      //返回信息设置
+      this.showOhoneNumber = res.phone_number;
+      if (this.showOhoneNumber) {
+        this.showCode = false;
+      }
+
+      //参数设置
       this.options = options;
       this.activity_id = options.activity_id;
       this.method = options.distribution_method
@@ -226,6 +248,106 @@ export default {
         : "phone";
       await this.getList();
     },
+
+    //==签名==========
+    clearSign(){
+      this.$refs.signatureRef.clear()
+    },
+    submitSign(){
+      this.$refs.signatureRef.canvasToTempFilePath({
+        success: async (res) => {
+          let url = res.tempFilePath
+          if(!res.isEmpty){
+            //上传签名图片
+            this.$xdShowLoading({});
+            this.phone_signature_url = await this.doSubmitSign(url);
+            this.$xdHideLoading();
+            this.dialogShow = false;
+            this.handleConfirm();
+          }else{
+            uni.showToast({
+              title: "签名不能为空",
+              icon: "none"
+            })
+          }
+        }
+      })
+    },
+    doSubmitSign(url){
+      let fileName = "sign.png";
+      let file = null;
+      // #ifdef H5
+      file = this.base64ToFile(url,fileName);
+      // #endif
+      return new Promise((resolve,reject) => {
+        jfbRootExec("getConOssSign", {
+          vm: this,
+          data: { name: fileName }
+        }).then(res => {
+          console.log(res);
+          let OSSAccessKeyId = res['id']
+          let cdnUrl = res['cdn_url']
+          delete res['id']
+          delete res['cdn_url']
+          // #ifdef H5
+          uni.uploadFile({
+            url: res.action,
+            file: file,
+            name: 'file',
+            formData: {
+              ...res,
+              OSSAccessKeyId: OSSAccessKeyId,
+              name: fileName,
+              cdnUrl: cdnUrl,
+              success_action_status: 200
+            },
+            success: (r) => {
+              resolve(`/${res.key}`);
+            },
+            fail:(err)=>{
+              resolve('');
+              console.error(err)
+            }
+          });
+          // #endif
+          // #ifdef MP-WEIXIN
+          wx.uploadFile({
+            url: res.action,
+            filePath: url,
+            name: 'file',
+            formData: {
+              ...res,
+              OSSAccessKeyId: OSSAccessKeyId,
+              name: fileName,
+              cdnUrl: cdnUrl,
+              success_action_status: 200
+            },
+            success: (res) => {
+              resolve(`/${res.key}`);
+            },
+            fail:(err)=>{
+              console.error(err)
+            }
+          });
+          // #endif
+        }).catch(err => {
+          console.error(err)
+          reject();
+        })
+      })
+    },
+    base64ToFile(base64String, filename){
+      var arr = base64String.split(',');
+      var mime = arr[0].match(/:(.*?);/)[1];
+      var bstr = atob(arr[1]);
+      var n = bstr.length;
+      var u8arr = new Uint8Array(n);
+      while(n--) {
+        u8arr[n] = bstr.charCodeAt(n);
+      }
+      return new File([u8arr], filename, {type:mime});
+    },
+    //==签名==========
     filterSpaces(event) {
       // 使用replace方法去除用户输入的空格
       let value = event.target.value.replace(/\s+/g, "");
@@ -239,11 +361,7 @@ export default {
       const regex = /^1[3-9]\d{9}$/;
 
       // 检查输入的手机号是否符合格式
-      if (phoneNumber.match(regex)) {
-        return true;
-      } else {
-        return false;
-      }
+      return !!phoneNumber.match(regex);
     },
     getList() {
       jfbRootExec("getCouponPhoneList", {
@@ -263,6 +381,7 @@ export default {
           this.btnTwoName = res.button_name_two;
           this.btnOneUrl = res.button_url_one;
           this.btnTwoUrl = res.button_url_two;
+          this.phone_signature =  res.phone_signature || 'N';
           let image = await getImageInfo(getServiceUrl(res.background));
           let image1 = await getImageInfo(getServiceUrl(res.used_background));
           console.log({ ...image }, "imageimage");
@@ -341,22 +460,33 @@ export default {
         }
       }, 1000);
     },
+    handleConfirmCheck(){
+      //不需要签名逻辑
+      if(this.phone_signature === 'N') {
+        this.handleConfirm();
+        return
+      }
+      //开启签名功能
+      this.dialogShow = true;
+      this.showSignatureRef  = true;
+
+    },
     handleConfirm() {
+      let data = {
+        ...this.options,
+        distribution_method: this.method,
+        namespace: this.pageBusinessCode,
+        activity_id: this.activity_id,
+        phone: this.showCode ? this.phoneNumber : null,
+        valid_code: this.showCode ? this.valid_code : null,
+        biz_name: "login",
+      }
+      if(this.phone_signature === 'Y') data['phone_signature'] = this.phone_signature_url;
       this.$xdShowLoading({});
-      jfbRootExec("getAllCouponPhone", {
-        vm: this,
-        data: {
-          ...this.options,
-          distribution_method: this.method,
-          namespace: this.pageBusinessCode,
-          activity_id: this.activity_id,
-          phone: this.showCode ? this.phoneNumber : null,
-          valid_code: this.showCode ? this.valid_code : null,
-          biz_name: "login",
-        },
-      })
+      jfbRootExec("getAllCouponPhone", {vm: this, data: data})
         .then((res) => {
-          if (res.code == 400) {
+          //失败状态
+          if (res.code === 400) {
             this.$xdHideLoading();
             this.$xdAlert({
               content: res.message,
@@ -367,6 +497,8 @@ export default {
             this.getList();
             return;
           }
+
+          //成功处理
           this.order_num = res.tmp_order_number;
           setTimeout(() => {
             this.getResult();
@@ -540,5 +672,36 @@ export default {
       }
     }
   }
+
+  .my_dialog{
+    /deep/ .xd-dailog__body-content-box{
+      padding: 0;
+    }
+    .dialog_head{
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+      padding: 48rpx 0;
+
+      .h_main{
+        font-size: 36rpx;
+        color: #333333;
+        font-weight: 500;
+      }
+      .h_sub{
+        font-size: 24rpx;
+        color: #808080;
+        font-weight: 400;
+      }
+    }
+    .sign_box{
+      width: 600rpx;
+      height: 460rpx;
+      background-color: #F2F2F2;
+    }
+    .btn_wrap{
+      display: flex;
+    }
+  }
 }
 </style>

package/src/components/JfbBaseFooter/Attr.js

@@ -117,7 +117,6 @@ export default {
         setting: {
           router: XdBus.getParentApi('getPagesTree'),
           icons:ICONS,
-
           showField: {
             path: true,
             icon: true,

package/src/components/JfbBasePhoneCollect/JfbBasePhoneCollect.vue

@@ -41,6 +41,18 @@
               'margin-top': '40rpx'
             }"
         >
+          <xd-form-item 
+            v-if="isCollectUsername"
+            class="form-item"
+            :class="[inputStyle]" 
+            :labelWidth="labelWidth" 
+            label="姓名" 
+            content-align="left">
+            <xd-form-input
+              v-model="accountForm.user_name"
+              placeholder="请输入姓名"
+            />
+          </xd-form-item>
           <xd-form-item 
             class="form-item"
             :class="[inputStyle]" 
@@ -131,6 +143,9 @@ import XdFormInput from "@/components/XdFormInput/XdFormInput";
 import XdButton from "@/components/XdButton/XdButton";
 import XdFormCheckbox from "@/components/XdFormCheckbox/XdFormCheckbox";
 import JfbBasePhoneCollectMixin from "./JfbBasePhoneCollectMixin";
+//#ifdef H5
+import cookie from "@/common/cookie";
+//#endif
 
 export default {
   // #ifdef MP-WEIXIN
@@ -159,6 +174,7 @@ export default {
       provider_id: "",
       callback_url: "",
       is_show_skip: "Y",
+      isCollectUsername: false,
 
       inputStyle: "linear", //输入框样式 linear:线性  face: 面性
       formBorderColor: "#F9F9F9", //
@@ -294,6 +310,9 @@ export default {
   },
   created() {
     this.init(this.container);
+    // #ifdef H5
+    this.isCollectUsername = !!cookie.get("JFB-IS-COLLECT-NAME");
+    // #endif
   },
   methods: {
     handlePrivacy(code) {
@@ -413,8 +432,9 @@ export default {
     },
     doLoginForm() {
       const { provider_id } = this;
-      const { phone_number, verification_code } = this.accountForm;
+      const { phone_number, verification_code, user_name } = this.accountForm;
       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", {
@@ -423,6 +443,7 @@ export default {
           provider_id,
           phone_number,
           verification_code,
+          user_name,
         },
       }).then((res) => {
         this.$xdHideLoading()

package/src/components/JfbBasePhoneLogin/JfbBasePhoneLogin.vue

@@ -43,6 +43,19 @@
             'margin-top': '40rpx',
           }"
         >
+          <xd-form-item
+            v-if="isCollectUsername"
+            class="form-item"
+            :class="[inputStyle]"
+            :labelWidth="labelWidth"
+            label="姓名"
+            content-align="left"
+          >
+            <xd-form-input
+              v-model="accountForm.user_name"
+              placeholder="请输入姓名"
+            />
+          </xd-form-item>
           <xd-form-item
             class="form-item"
             :class="[inputStyle]"
@@ -134,6 +147,9 @@ import XdForm from "@/components/XdForm/XdForm";
 import XdFormInput from "@/components/XdFormInput/XdFormInput";
 import XdButton from "@/components/XdButton/XdButton";
 import XdFormCheckbox from "@/components/XdFormCheckbox/XdFormCheckbox";
+//#ifdef H5
+import cookie from "@/common/cookie";
+//#endif
 
 export default {
   // #ifdef MP-WEIXIN
@@ -162,6 +178,7 @@ export default {
       auth_code: "",
       provider_id: "",
       callback_url: "",
+      isCollectUsername: false,
 
       inputStyle: "linear", //输入框样式 linear:线性  face: 面性
       formBorderColor: "#F9F9F9", //
@@ -305,6 +322,9 @@ export default {
   },
   created() {
     this.init(this.container);
+    // #ifdef H5
+    this.isCollectUsername = !!cookie.get("JFB-IS-COLLECT-NAME");
+    // #endif
   },
   methods: {
     handlePrivacy(code) {
@@ -489,9 +509,13 @@ export default {
     },
     doLoginForm() {
       const { auth_code, provider_id } = this;
-      const { phone_number, verification_code } = this.accountForm;
-      if (!phone_number || !verification_code)
+      const { phone_number, verification_code, user_name } = this.accountForm;
+      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("phoneLogin", {
         vm: this,
@@ -500,6 +524,7 @@ export default {
           provider_id,
           phone_number,
           verification_code,
+          user_name
         },
       })
         .then((res) => {

package/src/components/JfbBasePoster/JfbBasePoster.vue

@@ -68,7 +68,6 @@
                 :current="current"
                 circular
                 @animationfinish="handleAnimationfinish"
-                @change="handleChange"
               >
                 <swiper-item v-for="(item,index) in info" :key="index" @click.stop="handleClick(item,index)">
                   <image :style="{width: getOneWidth + 'rpx', height: getOneHeight + 'rpx'}" :src="item['image_url']" mode="aspectFill"></image>
@@ -84,7 +83,6 @@
                 :height="getOneHeight + 'rpx'"
                 :interval="carouselTime"
                 @onClickItem="handleClick"
-                @change="handleChange"
                 @animationfinish="handleAnimationfinish"
               >
                 <template slot-scope="{ item, index}">
@@ -448,14 +446,7 @@
 				}
         return temp
 			},
-
-      handleAnimationfinish(e){
-
-      },
-
-      handleChange(e) {
-        this.current = e.detail.current;
-
+      handleAnimationfinish(e) {
         //不支持背景不处理
         if(this.isSupport==='N') return;
         console.warn(`handleAnimationfinish.start`)
@@ -478,6 +469,7 @@
           let bg = null;
           if(this.currentImage) bg = this.currentImage;
           this.$xdRoot.$emit("setLayoutPageBg", bg);
+          this.current = e.detail.current;
         }
       },
 
@@ -552,7 +544,6 @@
           }
         })
 			},
-
       handleOne(list){
         this.info = this.handleImage(list);