Merge branch 'dev_xll' into 'master'

Dev xll

See merge request !22

H5/src/api/invite.js

+import request from "@/utils/request";
+/**
+ * 用户分享邀请码 bankInfo
+ * @param {*}
+ * @returns
+ */
+export function inviteCode(userId) {
+  return request({
+    url: `/api/user/registerByQrCode?userId=${userId}`,
+    responseType: 'arraybuffer',
+    method: "get"
+  });
+}

H5/src/api/user.js

@@ -63,4 +63,4 @@ export function logout(token) {
     method: "post",
     header: { "token":  token}
   })
-}
+}
\ No newline at end of file

H5/src/router/index.js

@@ -141,6 +141,18 @@ const routes = [
     name: "customerService",
     component: () => import("@/views/customer-service"),
     meta: { title: "专属客服", noNav: true }
+  },
+  {
+    path: "/invite",
+    name: "Invite",
+    component: () => import("@/views/invite"),
+    meta: { title: "邀请码", noNav: true }
+  },
+  {
+    path: "/aboutUs",
+    name: "AboutUs",
+    component: () => import("@/views/aboutUs"),
+    meta: { title: "公司简介", noNav: true }
   }
 ];
 

H5/src/views/aboutUs.vue

+<template>
+  <div class="instructions">
+    <div class="content">
+      <p class="title">公司简介</p>
+      <p class="paragraph">
+        <span
+          >请您仔细阅读以下条款，并确认您已完全理解本协议之规定，尤其是免除及限制责任的条款、知识产权条款、法律适用及争议解决条款。请您仔细阅读以下条款，并确认您已完全理解本协议之规定，尤其是免除及限制责任的条款、知识产权条款、法律适用及争议解决条款。
+        </span>
+      </p>
+      <p class="paragraph">
+        <span>
+          请您仔细阅读以下条款，并确认您已完全理解本协议之规定，尤其是免除及限制责任的条款、知识产权条款、法律适用及争议解决条款。请您仔细阅读以下条款，并确认您已完全理解本协议之规定，尤其是免除及限制责任的条款、知识产权条款、</span
+        >
+      </p>
+      <p class="paragraph">
+        <span>
+          法律适用及争议解决条款。请您仔细阅读以下条款，并确认您已完全理解本协议之规定，尤其是免除及限制责任的条款、知识产权条款、法律适用及争议解决条款。</span
+        >
+      </p>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "instructions"
+};
+</script>
+
+<style lang="scss" scoped>
+.instructions {
+  box-sizing: border-box;
+  padding: 10px 16px;
+  p {
+    margin: 0;
+  }
+  .title {
+    font-family: PingFang-SC-Bold;
+    font-size: 16px;
+    font-weight: normal;
+    font-stretch: normal;
+    line-height: 20px;
+    color: #333333;
+    text-align: center;
+    margin-bottom: 10px;
+  }
+  .paragraph {
+    font-family: PingFang-SC-Regular;
+    font-size: 13px;
+    color: #333;
+    line-height: 21px;
+    text-indent: 2em;
+  }
+  .content {
+    box-sizing: border-box;
+    width: 345px;
+    min-height: 100vh;
+    padding: 10px 16px;
+    background-color: #ffffff;
+  }
+}
+</style>

H5/src/views/invite.vue

+<template>
+  <div class="invite-code">
+    <img :src="imgSrc" alt="" class="imgCode" />
+  </div>
+</template>
+<script>
+import { inviteCode } from "@/api/invite";
+var userId = "13933770749";
+export default {
+  data() {
+    return {
+      imgSrc: ""
+    };
+  },
+  mounted() {
+    this.inviteCode();
+  },
+  methods: {
+    inviteCode() {
+      const _this = this;
+      let loading = _this.$toast.loading({
+        forbidClick: true,
+        message: "加载中..."
+      });
+      inviteCode(userId).then(res => {
+        if (loading) _this.$toast.clear();
+        _this.imgSrc = _this.getUserPhoto(res)
+      });
+    },
+     getUserPhoto(res){
+        let uInt8Array = new Uint8Array(res);
+        let len = uInt8Array.length;
+        let binaryString = new Array(len);
+        while (len--) {
+          binaryString[len] = String.fromCharCode(uInt8Array[len]);
+        }
+        let data = window.btoa(binaryString.join(''));
+        let imageType = 'image/jpeg';
+        let imageUrl = "data:" + imageType + ";base64," + data
+        return imageUrl
+
+      },
+  }
+};
+</script>
+<style scoped lang="scss">
+.invite-code {
+    width: 100%;
+    height: 100vh;
+    background: url("../assets/images/invite.jpeg");
+    background-repeat: no-repeat;
+    background-size: 100% 100% ;
+    .imgCode{
+      position: absolute;
+      width: 60px;
+      height: 60px;
+      right: 50px;
+      bottom: 10px;
+    }
+    @media only screen and (device-width:375px) and (-webkit-device-pixel-ratio: 3) {
+    .imgCode{
+         width: 60px;
+         height: 60px;
+         bottom: 20px;
+      }
+  }
+}
+</style>

H5/src/views/register.vue

@@ -95,11 +95,11 @@ export default {
     };
   },
   mounted() {
-    let params = window.location.search
-    if(params){
-      let beInvitedCode = params.split('=')[1]
-      if(beInvitedCode){
-        this.form.beInvitedCode = beInvitedCode
+    let params = window.location.search;
+    if (params) {
+      let beInvitedCode = params.split("=")[1];
+      if (beInvitedCode) {
+        this.form.beInvitedCode = beInvitedCode;
       }
     }
     if (this.timer) {