Home Explore Help
Register Sign In
licailing
/
modern_point
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

Merge branch 'master' of http://git.izouma.com/xiongzhu/9th

panhui 4 years ago
parent
05ae071dea ee32b93de4
commit
003d109350
16 changed files with 380 additions and 21 deletions
Split View Show Diff Stats
  1. 1 1
      src/main/java/com/izouma/nineth/config/Constants.java
  2. 1 1
      src/main/nine-space/public/index.html
  3. BIN
      src/main/pc-space/src/assets/background/bg-01@3x.png
  4. BIN
      src/main/pc-space/src/assets/background/bg-02@3x.png
  5. BIN
      src/main/pc-space/src/assets/background/bg-03@3x.png
  6. 11 2
      src/main/pc-space/src/views/Casting.vue
  7. 6 2
      src/main/pc-space/src/views/CastingDetail.vue
  8. 11 6
      src/main/pc-space/src/views/user/AccountData.vue
  9. 123 0
      src/main/resources/static/AlipayHtml.html
  10. 1 2
      src/main/resources/static/aliAuthorize.css
  11. BIN
      src/main/resources/static/img/browser.png
  12. BIN
      src/main/resources/static/img/zfb.png
  13. BIN
      src/main/resources/static/img/zhifu_img_liulanqi_ios.png
  14. 94 0
      src/main/resources/static/zfb.html
  15. 9 7
      src/main/resources/templates/AlipayHtml.ftlh
  16. 123 0
      src/main/resources/templates/AlipayHtml1.ftlh

+ 1 - 1
src/main/java/com/izouma/nineth/config/Constants.java
View File 

@@ -9,7 +9,7 @@ public interface Constants {
 
         String ID_NO    = "^[1-9]\\d{7}((0\\d)|(1[0-2]))(([0-2]\\d)|3[0-1])\\d{3}$|^[1-9]\\d{5}[1-9]\\d{3}((0\\d)|(1[0-2]))(([0-2]\\d)|3[0-1])\\d{3}[0-9xX]$";
 
     }
 
 
-    String DEFAULT_AVATAR = "https://awesomeadmin.oss-cn-hangzhou.aliyuncs.com/image/avatar_male.png";
 
+    String DEFAULT_AVATAR = "https://9space-2021.oss-cn-shenzhen.aliyuncs.com/image/2021-11-26-18-49-04fkFHRAhM.jpg";
 
 
     String SMS_SIGN_NAME = "身份验证";

+ 1 - 1
src/main/nine-space/public/index.html
View File 

@@ -1,5 +1,5 @@
 
 <!DOCTYPE html>
 
-<html lang="">
 
+<html lang="zh-Hans">
 
     <head>
 
         <meta charset="utf-8" />
 
         <meta http-equiv="X-UA-Compatible" content="IE=edge" />

BIN
src/main/pc-space/src/assets/background/bg-01@3x.png
View File


BIN
src/main/pc-space/src/assets/background/bg-02@3x.png
View File


BIN
src/main/pc-space/src/assets/background/bg-03@3x.png
View File


+ 11 - 2
src/main/pc-space/src/views/Casting.vue
View File 

@@ -29,14 +29,19 @@
 
             >
 
                 <el-image
 
                     class="imgBox"
 
-                    :src="item.bg || require('../assets/bg-moren备份 2@3x.png')"
 
+                    :src="item.bg || require('../assets/background/bg-02@3x.png')"
 
                     fit="cover"
 
                     :lazy="true"
 
                 ></el-image>
 
                 <img class="img" :src="item.avatar || require('../assets/img_default_photo.png')" alt="" />
 
                 <div class="text">
 
                     <div class="name">{{ item.nickname }}</div>
 
-                    <img class="img1" src="../assets/img/renzheng_icon@3x.png" alt="" />
 
+                    <img
 
+                        v-if="userInfo.authStatus === 'SUCCESS'"
 
+                        class="img1"
 
+                        src="../assets/img/renzheng_icon@3x.png"
 
+                        alt=""
 
+                    />
 
                 </div>
 
                 <div class="text">
 
                     <div class="name name1">{{ item.id }}</div>
 
@@ -83,6 +88,7 @@
 
 <script>
 
 import pageableTable from '../mixins/pageableTable';
 
 import user from '../mixins/user';
 
+import { mapState } from 'vuex';
 
 export default {
 
     data() {
 
         return {
 
@@ -115,6 +121,9 @@ export default {
 
         };
 
     },
 
     mixins: [pageableTable, user],
 
+    computed: {
 
+        ...mapState(['userInfo'])
 
+    },
 
     methods: {
 
         beforeGetData() {
 
             return { search: this.search, query: { hasRole: 'ROLE_MINTER' } };

+ 6 - 2
src/main/pc-space/src/views/CastingDetail.vue
View File 

@@ -1,12 +1,12 @@
 
 <template>
 
     <div class="detail">
 
-        <el-image class="bg" :src="info.bg || require('../assets/img/bg-moren@3x.png')" fit="cover"></el-image>
 
+        <el-image class="bg" :src="info.bg || require('../assets/background/bg-01@3x.png')" fit="cover"></el-image>
 
         <div class="detail-content center-content">
 
             <el-image :src="info.avatar" fit="cover" class="avatar"></el-image>
 
             <div class="info">
 
                 <div class="name">
 
                     <span>{{ info.nickname }}</span>
 
-                    <img src="../assets/img/renzheng_icon@3x.png" alt="" />
 
+                    <img v-if="userInfo.authStatus === 'SUCCESS'" src="../assets/img/renzheng_icon@3x.png" alt="" />
 
                 </div>
 
                 <div class="code">
 
                     <span>{{ info.id }}</span>
 
@@ -125,6 +125,7 @@
 
 import CollectionInfo from '../components/CollectionInfo.vue';
 
 import Share from '../components/Share.vue';
 
 import pageableTable from '../mixins/pageableTable';
 
+import { mapState } from 'vuex';
 
 import user from '../mixins/user';
 
 export default {
 
     components: { CollectionInfo, Share },
 
@@ -186,6 +187,9 @@ export default {
 
     mounted() {
 
         this.getDetail();
 
     },
 
+    computed: {
 
+        ...mapState(['userInfo'])
 
+    },
 
     methods: {
 
         getDetail() {
 
             this.$http.get('/user/get/' + this.$route.query.id).then(res => {

+ 11 - 6
src/main/pc-space/src/views/user/AccountData.vue
View File 

@@ -4,7 +4,7 @@
 
             <el-upload :action="uploadUrl" :show-file-list="false" :before-upload="beforeAvatarUpload2">
 
                 <img
 
                     class="top"
 
-                    :src="getImg(userInfo.bg, '', 1300) || require('../../assets/img/bg-moren@3x.png')"
 
+                    :src="getImg(userInfo.bg, '', 1300) || require('../../assets/background/bg-03@3x.png')"
 
                     alt=""
 
                     style="object-fit: cover"
 
                 />
 
@@ -57,7 +57,12 @@
 
                             <div class="box2">
 
                                 <div class="nickname">
 
                                     <div class="name1">{{ item.nickname }}</div>
 
-                                    <img class="name2" src="../../assets/img/renzheng_icon@3x.png" alt="" />
 
+                                    <img
 
+                                        v-if="userInfo.authStatus === 'SUCCESS'"
 
+                                        class="name2"
 
+                                        src="../../assets/img/renzheng_icon@3x.png"
 
+                                        alt=""
 
+                                    />
 
                                 </div>
 
                                 <div class="detail">{{ item.intro || '暂无' }}</div>
 
                                 <div class="box3">
 
@@ -737,11 +742,11 @@ export default {
 
             }
 
         }
 
         .boxIpc {
 
-            width: 900px;
 
+            width: 904px;
 
             height: 75px;
 
             background: linear-gradient(90deg, #37b074 0%, #52c174 100%);
 
             border-radius: 8px;
 
-            margin-left: 36px;
 
+            margin-left: 33px;
 
 
             .ipc-top {
 
                 padding: 16px 16px 2px 16px;
 
@@ -749,14 +754,14 @@ export default {
 
                 align-items: center;
 
                 justify-content: space-between;
 
                 .ipc-text {
 
-                    font-size: 14px;
 
+                    font-size: @menuFont2;
 
                     font-family: PingFangSC-Regular, PingFang SC;
 
                     font-weight: 400;
 
                     color: #ffffff;
 
                     line-height: 24px;
 
                 }
 
                 .ipc-text2 {
 
-                    font-size: 14px;
 
+                    font-size: @menuFont2;
 
                     font-family: PingFangSC-Regular, PingFang SC;
 
                     font-weight: 400;
 
                     color: #ffffff;

+ 123 - 0
src/main/resources/static/AlipayHtml.html
View File 

@@ -0,0 +1,123 @@
 
+<!DOCTYPE html>
 
+<html lang="zh-CN">
 
+
 
+<head>
 
+    <meta charset="utf-8">
 
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
 
+    <meta name="viewport" content="width=device-width,initial-scale=1.0">
 
+    <title>支付</title>
 
+    <script src="https://cdn.bootcss.com/jquery/3.4.1/jquery.min.js"></script>
 
+    <style>
 
+        html {
 
+            width: 100%;
 
+            height: 100%;
 
+            padding: 0;
 
+            margin: 0;
 
+            font-family: -apple-system, SF UI Text, Arial, PingFang SC, Hiragino Sans GB, Microsoft YaHei, WenQuanYi Micro Hei, sans-serif;
 
+            font-size: 14px;
 
+            font-weight: 400;
 
+            line-height: 1.6;
 
+        }
 
+
 
+        body {
 
+            width: 100%;
 
+            height: 100%;
 
+            padding: 0;
 
+            margin: 0;
 
+            background: #1677ff url(/static/img/zfb.png) no-repeat top;
 
+            background-size: 100%;
 
+        }
 
+
 
+        .overlay .overlay-img {
 
+            width: 186px;
 
+            height: 210px;
 
+            margin-right: 15px;
 
+        }
 
+
 
+        .overlay .overlay-text1 {
 
+            width: 272px;
 
+            font-size: 16px;
 
+            font-weight: bold;
 
+            color: rgba(255, 255, 255, 1);
 
+            line-height: 22px;
 
+            margin: 15px auto 0;
 
+        }
 
+
 
+        .overlay .overlay-text2 {
 
+            width: 272px;
 
+            font-size: 13px;
 
+            color: rgba(255, 255, 255, 1);
 
+            line-height: 18px;
 
+            margin: 15px auto 0;
 
+        }
 
+
 
+        .overlay {
 
+            position: fixed;
 
+            top: 0;
 
+            right: 0;
 
+            bottom: 0;
 
+            left: 0;
 
+            background: rgba(0, 0, 0, 0.7);
 
+            display: none;
 
+        }
 
+
 
+        #btn-zfb {
 
+            width: 80%;
 
+            margin: auto;
 
+            background: #ffffff;
 
+            line-height: 52px;
 
+            height: 52px;
 
+            outline: none;
 
+            color: #1677ff;
 
+            font-size: 18px;
 
+            letter-spacing: 3px;
 
+            font-weight: 400;
 
+            border: 1px solid transparent;
 
+            border-radius: 8px;
 
+            position: absolute;
 
+            top: 0;
 
+            bottom: 0;
 
+            left: 0;
 
+            right: 0;
 
+            display: none;
 
+        }
 
+    </style>
 
+</head>
 
+
 
+<body>
 
+<div class="overlay" id="overlay">
 
+    <div style="text-align: right"><img class="overlay-img" src="/static/img/zhifu_img_liulanqi_ios.png" alt=""/>
 
+    </div>
 
+    <div class="overlay-text1">请点击右上角，选择在默认浏览器中打开然后继续完成支付</div>
 
+    <div class="overlay-text2">注：由于微信限制，需要在浏览器中打开才可以完成支付宝支付</div>
 
+</div>
 
+
 
+<a id="link">
 
+    <button id="btn-zfb">打开支付宝</button>
 
+</a>
 
+<script>
 
+    function GetQueryString(name) {
 
+        var after = window.location.href.split("?")[1];
 
+        if (after) {
 
+            var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)");
 
+            var r = after.match(reg);
 
+            if (r != null) {
 
+                return decodeURIComponent(r[2]);
 
+            } else {
 
+                return null;
 
+            }
 
+        }
 
+    }
 
+
 
+    window.onload = function () {
 
+        console.log('onload');
 
+        if (/micromessenger/i.test(navigator.userAgent)) {
 
+            $('#overlay').fadeIn();
 
+        } else {
 
+            $('#btn-zfb').fadeIn();
 
+        }
 
+    }
 
+</script>
 
+</body>
 
+
 
+</html>

+ 1 - 2
src/main/resources/static/aliAuthorize.css
View File 

@@ -78,8 +78,7 @@
 
 .overlay .overlay-img {
 
     width: 186px;
 
     height: 210px;
 
-    display: block;
 
-    margin: 13px 28px 0 161px;
 
+    margin-right: 15px;
 
 }
 
 
 .overlay .overlay-text1 {

BIN
src/main/resources/static/img/browser.png
View File


BIN
src/main/resources/static/img/zfb.png
View File


BIN
src/main/resources/static/img/zhifu_img_liulanqi_ios.png
View File


+ 94 - 0
src/main/resources/static/zfb.html
View File 

@@ -0,0 +1,94 @@
 
+<!doctype html>
 
+<html lang="zh-Hans">
 
+<head>
 
+    <meta charset="UTF-8">
 
+    <meta name="viewport"
 
+          content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0">
 
+    <meta http-equiv="X-UA-Compatible" content="ie=edge">
 
+    <meta name="format-detection" content="telphone=no"/>
 
+    <meta name="format-detection" content="email=no"/>
 
+    <meta name="screen-orientation" content="portrait"/>
 
+    <meta name="theme-color" content="#1677ff"/>
 
+    <title>支付宝</title>
 
+    <style>
 
+        html, body {
 
+            background: #1677ff;
 
+            background-size: 100%;
 
+            padding: 0;
 
+            margin: 0;
 
+            height: 100%;
 
+        }
 
+
 
+        .btn-zfb {
 
+            width: 80%;
 
+            margin: auto;
 
+            background: #ffffff;
 
+            line-height: 52px;
 
+            outline: none;
 
+            color: #1677ff;
 
+            font-size: 18px;
 
+            letter-spacing: 3px;
 
+            font-weight: 400;
 
+            border: 1px solid transparent;
 
+            border-radius: 8px;
 
+            display: block;
 
+        }
 
+
 
+        .mask {
 
+            background: rgba(0, 0, 0, 0.7);
 
+            color: #ffffff;
 
+            font-size: 14px;
 
+            position: fixed;
 
+            top: 10px;
 
+            right: 0;
 
+            padding: 10px 15px 10px 10px;
 
+            border-radius: 18px;
 
+            display: flex;
 
+            align-items: center;
 
+        }
 
+
 
+        .mask img {
 
+            width: 48px;
 
+            height: 48px;
 
+            margin-right: 10px;
 
+        }
 
+
 
+        .mask .desc {
 
+            display: inline-block;
 
+            line-height: 23px;
 
+        }
 
+
 
+        .mask .desc .highlight {
 
+            color: #ff9f19;
 
+        }
 
+
 
+        .mask:after {
 
+            content: "";
 
+            position: fixed;
 
+            right: 15px;
 
+            top: 0;
 
+            width: 0;
 
+            height: 0;
 
+            border-left: 10px solid transparent;
 
+            border-right: 10px solid transparent;
 
+            border-bottom: 10px solid rgba(0, 0, 0, .7);
 
+        }
 
+
 
+        .tip {
 
+            color: #ffffff;
 
+            font-size: 18px;
 
+            text-align: center;
 
+            letter-spacing: 3px;
 
+        }
 
+    </style>
 
+</head>
 
+<body>
 
+<img src="/static/img/zfb.png" style="width: 100%"/>
 
+<!--<button class="btn-zfb">打开支付宝</button>-->
 
+<div class="tip">请在浏览器中打开</div>
 
+<div class="mask">
 
+    <img src="/static/img/browser.png"/>
 
+    <div class="desc">请在<span class="highlight">浏览器中打开</span><br>继续完成支付</div>
 
+</div>
 
+</body>
 
+</html>

+ 9 - 7
src/main/resources/templates/AlipayHtml.ftlh
View File 

@@ -38,13 +38,15 @@
 
 
         <#if weixin>
 
             <van-overlay class="overlay" show>
 
-                <#if android>
 
-                    <img class="overlay-img" src="/static/img/zhifu_img_liulanqi_and.png" alt=""/>
 
-                <#elseif ios>
 
-                    <img class="overlay-img" src="/static/img/zhifu_img_liulanqi_ios.png" alt=""/>
 
-                <#else>
 
-                    <img class="overlay-img" src="/static/img/zhifu_img_liulanqi_and.png" alt=""/>
 
-                </#if>
 
+                <div style="text-align: right">
 
+                    <#if android>
 
+                        <img class="overlay-img" src="/static/img/zhifu_img_liulanqi_and.png" alt=""/>
 
+                    <#elseif ios>
 
+                        <img class="overlay-img" src="/static/img/zhifu_img_liulanqi_ios.png" alt=""/>
 
+                    <#else>
 
+                        <img class="overlay-img" src="/static/img/zhifu_img_liulanqi_and.png" alt=""/>
 
+                    </#if>
 
+                </div>
 
                 <#if ios>
 
                     <div class="overlay-text1">请点击右上角，选择“在Safari中打开”然后继续完成支付</div>
 
                 <#else>

+ 123 - 0
src/main/resources/templates/AlipayHtml1.ftlh
View File 

@@ -0,0 +1,123 @@
 
+<!DOCTYPE html>
 
+<html lang="zh-CN">
 
+
 
+<head>
 
+    <meta charset="utf-8">
 
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
 
+    <meta name="viewport" content="width=device-width,initial-scale=1.0">
 
+    <title>支付</title>
 
+    <script src="https://cdn.bootcss.com/jquery/3.4.1/jquery.min.js"></script>
 
+    <style>
 
+        html {
 
+            width: 100%;
 
+            height: 100%;
 
+            padding: 0;
 
+            margin: 0;
 
+            font-family: -apple-system, SF UI Text, Arial, PingFang SC, Hiragino Sans GB, Microsoft YaHei, WenQuanYi Micro Hei, sans-serif;
 
+            font-size: 14px;
 
+            font-weight: 400;
 
+            line-height: 1.6;
 
+        }
 
+
 
+        body {
 
+            width: 100%;
 
+            height: 100%;
 
+            padding: 0;
 
+            margin: 0;
 
+            background: #1677ff url(/static/img/zfb.png) no-repeat top;
 
+            background-size: 100%;
 
+        }
 
+
 
+        .overlay .overlay-img {
 
+            width: 186px;
 
+            height: 210px;
 
+            margin-right: 15px;
 
+        }
 
+
 
+        .overlay .overlay-text1 {
 
+            width: 272px;
 
+            font-size: 16px;
 
+            font-weight: bold;
 
+            color: rgba(255, 255, 255, 1);
 
+            line-height: 22px;
 
+            margin: 15px auto 0;
 
+        }
 
+
 
+        .overlay .overlay-text2 {
 
+            width: 272px;
 
+            font-size: 13px;
 
+            color: rgba(255, 255, 255, 1);
 
+            line-height: 18px;
 
+            margin: 15px auto 0;
 
+        }
 
+
 
+        .overlay {
 
+            position: fixed;
 
+            top: 0;
 
+            right: 0;
 
+            bottom: 0;
 
+            left: 0;
 
+            background: rgba(0, 0, 0, 0.7);
 
+            display: none;
 
+        }
 
+
 
+        #btn-zfb {
 
+            width: 80%;
 
+            margin: auto;
 
+            background: #ffffff;
 
+            line-height: 52px;
 
+            height: 52px;
 
+            outline: none;
 
+            color: #1677ff;
 
+            font-size: 18px;
 
+            letter-spacing: 3px;
 
+            font-weight: 400;
 
+            border: 1px solid transparent;
 
+            border-radius: 8px;
 
+            position: absolute;
 
+            top: 0;
 
+            bottom: 0;
 
+            left: 0;
 
+            right: 0;
 
+            display: none;
 
+        }
 
+    </style>
 
+</head>
 
+
 
+<body>
 
+<div class="overlay" id="overlay">
 
+    <div style="text-align: right"><img class="overlay-img" src="/static/img/zhifu_img_liulanqi_ios.png" alt=""/>
 
+    </div>
 
+    <div class="overlay-text1">请点击右上角，选择在默认浏览器中打开然后继续完成支付</div>
 
+    <div class="overlay-text2">注：由于微信限制，需要在浏览器中打开才可以完成支付宝支付</div>
 
+</div>
 
+
 
+<a id="link" href="${href}">
 
+    <button id="btn-zfb">打开支付宝</button>
 
+</a>
 
+<script>
 
+    function GetQueryString(name) {
 
+        var after = window.location.href.split("?")[1];
 
+        if (after) {
 
+            var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)");
 
+            var r = after.match(reg);
 
+            if (r != null) {
 
+                return decodeURIComponent(r[2]);
 
+            } else {
 
+                return null;
 
+            }
 
+        }
 
+    }
 
+
 
+    window.onload = function () {
 
+        console.log('onload');
 
+        if (/micromessenger/i.test(navigator.userAgent)) {
 
+            $('#overlay').fadeIn();
 
+        } else {
 
+            $('#btn-zfb').fadeIn();
 
+        }
 
+    }
 
+</script>
 
+</body>
 
+
 
+</html>