diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 3453344f7..30c3c3b5b 100755 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -69,6 +69,7 @@ your_dashboard = Dashboard your_profile = Profile your_starred = Starred your_settings = Settings +invite_friends = Invite Friends all = All sources = Sources diff --git a/options/locale/locale_zh-CN.ini b/options/locale/locale_zh-CN.ini index d527218d3..e1354bdfd 100755 --- a/options/locale/locale_zh-CN.ini +++ b/options/locale/locale_zh-CN.ini @@ -69,6 +69,7 @@ your_dashboard=个人中心 your_profile=个人信息 your_starred=已点赞 your_settings=设置 +invite_friends=邀请好友 all=所有 sources=自建 diff --git a/public/img/ad/ad01.png b/public/img/ad/ad01.png new file mode 100644 index 000000000..379c39bd1 Binary files /dev/null and b/public/img/ad/ad01.png differ diff --git a/public/img/ad/ad02.png b/public/img/ad/ad02.png new file mode 100644 index 000000000..4aa522f2e Binary files /dev/null and b/public/img/ad/ad02.png differ diff --git a/public/img/ad/ad03.jpg b/public/img/ad/ad03.jpg new file mode 100644 index 000000000..247b40d3e Binary files /dev/null and b/public/img/ad/ad03.jpg differ diff --git a/templates/base/head_navbar.tmpl b/templates/base/head_navbar.tmpl index a5a898ad0..48c2f720c 100755 --- a/templates/base/head_navbar.tmpl +++ b/templates/base/head_navbar.tmpl @@ -180,6 +180,10 @@ {{.i18n.Tr "custom.Platform_Tutorial"}} + + + {{.i18n.Tr "invite_friends"}} + {{if .IsAdmin}}
diff --git a/templates/base/head_navbar_fluid.tmpl b/templates/base/head_navbar_fluid.tmpl index 84781db11..9e31cc2db 100644 --- a/templates/base/head_navbar_fluid.tmpl +++ b/templates/base/head_navbar_fluid.tmpl @@ -177,6 +177,10 @@ {{.i18n.Tr "custom.Platform_Tutorial"}} + + + + {{.i18n.Tr "invite_friends"}} {{if .IsAdmin}}
diff --git a/templates/base/head_navbar_home.tmpl b/templates/base/head_navbar_home.tmpl index 64e04b4c3..471540f64 100644 --- a/templates/base/head_navbar_home.tmpl +++ b/templates/base/head_navbar_home.tmpl @@ -160,6 +160,10 @@ {{.i18n.Tr "custom.Platform_Tutorial"}} + + + {{.i18n.Tr "invite_friends"}} + {{if .IsAdmin}}
diff --git a/templates/base/head_navbar_pro.tmpl b/templates/base/head_navbar_pro.tmpl index e9f662bbe..0b5babf6e 100644 --- a/templates/base/head_navbar_pro.tmpl +++ b/templates/base/head_navbar_pro.tmpl @@ -181,6 +181,10 @@ {{.i18n.Tr "custom.Platform_Tutorial"}} + + + {{.i18n.Tr "invite_friends"}} + {{if .IsAdmin}}
diff --git a/templates/user/auth/signup_inner.tmpl b/templates/user/auth/signup_inner.tmpl index 6ba10e8e7..43667f6f5 100644 --- a/templates/user/auth/signup_inner.tmpl +++ b/templates/user/auth/signup_inner.tmpl @@ -35,6 +35,9 @@ {{if .DisableRegistration}}

{{.i18n.Tr "auth.disable_register_prompt"}}

{{else}} +
+ 您的好友 Itx003 邀请你加入启智社区AI协作平台，畅享充沛的免费算力资源！ +
@@ -71,6 +74,16 @@ {{template "user/auth/phone_verify" .}} {{end}} + +
+
+
+ 推荐人 +
+ +
+
+
diff --git a/templates/user/dashboard/repolist.tmpl b/templates/user/dashboard/repolist.tmpl index ff85d72d4..b89fdbf1f 100644 --- a/templates/user/dashboard/repolist.tmpl +++ b/templates/user/dashboard/repolist.tmpl @@ -18,6 +18,9 @@ v-cloak >
+
+ +
{{.i18n.Tr "repository"}} {{.i18n.Tr "organization"}} diff --git a/templates/user/profile.tmpl b/templates/user/profile.tmpl index fa5e0c9b7..c1e81af3f 100755 --- a/templates/user/profile.tmpl +++ b/templates/user/profile.tmpl @@ -48,6 +48,12 @@ {{end}} {{end}} +
  • + {{svg "octicon-clock" 16}} {{.i18n.Tr "user.join_on"}} {{.Owner.CreatedUnix.FormatShort}} +
    + +
    +
  • {{svg "octicon-clock" 16}} {{.i18n.Tr "user.join_on"}} {{.Owner.CreatedUnix.FormatShort}}
    • {{if and .Orgs .HasOrgsVisible}} diff --git a/templates/user/settings/invite.tmpl b/templates/user/settings/invite.tmpl new file mode 100644 index 000000000..ae210b442 --- /dev/null +++ b/templates/user/settings/invite.tmpl @@ -0,0 +1,7 @@ +{{template "base/head" .}} + +
    +
    +
    + +{{template "base/footer" .}} diff --git a/web_src/js/features/ad.js b/web_src/js/features/ad.js new file mode 100644 index 000000000..55036c1d9 --- /dev/null +++ b/web_src/js/features/ad.js @@ -0,0 +1,87 @@ +; (function () { + const adList = [{ + id: 1, + pos: { + left: 50, + bottom: 50, + }, + src: '/img/ad/ad01.png', + url: '/user/invitation_tpl', + width: 144, + height: 108, + }/*, { + id: 2, + pos: { + right: 50, + bottom: 50, + }, + src: '/img/ad/ad01.png', + url: '/user/invitation_tpl', + width: 144, + height: 108, + }*/]; + + function createAd(adList) { + const adInfoStr = window.localStorage.getItem('ads') || '{}'; + let adInfoObj = JSON.parse(adInfoStr); + const today = new Date(); + const timeEnd = new Date(today.getFullYear(), today.getMonth(), today.getDate() + 1).getTime(); + const now = Date.now(); + if (!adInfoObj.expires || adInfoObj.expires <= now) { + adInfoObj = { + expires: timeEnd, + }; + } + for (var i = 0, iLen = adList.length; i < iLen; i++) { + var adI = adList[i]; + var showOr = adInfoObj[adI.id] === false ? false : true; + adInfoObj[adI.id] = showOr; + if (!showOr) continue; + var adEl = $(`
    + + + +
    + +
    +
    `); + $('body').append(adEl); + } + window.localStorage.setItem('ads', JSON.stringify(adInfoObj)); + } + + function initAdEvent() { + $('body').on('click', '.__ad_c__ .__ad_close__', function () { + var self = $(this); + var adEl = self.closest('.__ad_c__'); + var adId = adEl.attr('_id'); + const adInfoStr = window.localStorage.getItem('ads') || '{}'; + const adInfoObj = JSON.parse(adInfoStr); + adInfoObj[adId] = false; + window.localStorage.setItem('ads', JSON.stringify(adInfoObj)); + adEl.remove(); + }); + var scrollTopOld = $(document).scrollTop(); + var timeHandler = null; + $(window).scroll(function (e) { + var scrollTop = $(document).scrollTop(); + var offSet = scrollTop - scrollTopOld; + scrollTopOld = scrollTop; + timeHandler && clearTimeout(timeHandler); + $('.__ad_c__').animate({ bottom: 50 + offSet + 'px' }, 0); + timeHandler = setTimeout(function () { + $('.__ad_c__').animate({ bottom: 50 + 'px' }, 0); + }, 20); + }); + } + + setTimeout(function () { + createAd(adList); + initAdEvent(); + }, 0); +})(); diff --git a/web_src/js/index.js b/web_src/js/index.js index cd8d7d211..b796d020a 100755 --- a/web_src/js/index.js +++ b/web_src/js/index.js @@ -52,6 +52,7 @@ import router from "./router/index.js"; import { Message } from "element-ui"; import { i18nVue } from "./features/i18nVue.js"; +import './features/ad.js'; Vue.use(ElementUI); Vue.prototype.$axios = axios; diff --git a/web_src/js/standalone/phoneverify.js b/web_src/js/standalone/phoneverify.js index 44b7fee82..8280a5d89 100644 --- a/web_src/js/standalone/phoneverify.js +++ b/web_src/js/standalone/phoneverify.js @@ -77,7 +77,7 @@ }); function mouseMove(e) { - var _clientX = e.clientX; + var _clientX = e.clientX !== undefined ? e.clientX : e.targetTouches[0].clientX; var offset = _clientX - clientX; var triggerEl = self.dom.find('.slide-trigger'); var triggerWidth = triggerEl.width(); @@ -99,6 +99,8 @@ function mouseUp(e) { $(document).off('mousemove', mouseMove); $(document).off('mouseup', mouseUp); + $(document).off('touchmove', mouseMove); + $(document).off('touchend', mouseUp); self.isMoving = false; $.ajax({ url: '/verifySlideImage', @@ -106,7 +108,7 @@ dataType: 'json', data: { slide_id: self.imgID, - x: parseInt(self.dom.find('.slide-image-small').position().left) + x: parseInt(self.dom.find('.slide-image-small').position().left / self.dom.find('.slide-image-big').attr('scale')) }, success: function (res) { if (res && res.Code === 0) { @@ -138,13 +140,18 @@ }); } - this.dom.find('.slide-trigger').on('mousedown', function (e) { + function mouseDown(e) { if (self.verifySucess) return; - clientX = e.clientX; + clientX = e.clientX !== undefined ? e.clientX : e.targetTouches[0].clientX; oLeft = $(this).position().left; $(document).on('mousemove', mouseMove); $(document).on('mouseup', mouseUp); - }); + $(document).on('touchmove', mouseMove); + $(document).on('touchend', mouseUp); + } + + this.dom.find('.slide-trigger').on('mousedown', mouseDown); + this.dom.find('.slide-trigger').on('touchstart', mouseDown); this.dom.find('.verify-code-send-btn').on('click', function () { if (!self.canSendCode) return; @@ -199,6 +206,7 @@ self.dom.find('.slide-bar-wrap').css('display', 'flex'); self.dom.find('.verify-code-c').css('display', 'flex'); self.dom.find('.modify-phone-number').hide(); + self.refreshImages(); }); }; @@ -210,6 +218,8 @@ this.imgID = ''; this.dom.find('.slide-bar').removeClass('sucess error').css('width', '30px'); this.dom.find('.slide-trigger').removeClass('sucess error').css('left', '0px'); + var scale = this.dom.find('.slide-bar-bg').width() / 391; + this.dom.find('.slide-image-big').css('transform', `scale(${scale})`).attr('scale', scale); this.dom.find('.slide-trigger .icon').hide(); this.dom.find('.slide-trigger .icon.arrow').show(); this.dom.find('.slide-txt').show(); diff --git a/web_src/less/standalone/_phoneverify.less b/web_src/less/standalone/_phoneverify.less index 4ed2940ac..9b38fd9d6 100644 --- a/web_src/less/standalone/_phoneverify.less +++ b/web_src/less/standalone/_phoneverify.less @@ -174,10 +174,11 @@ width: 391px; height: 196px; top: 36px; - left: 0; + left: 1px; border-radius: 2px; z-index: 100; display: none; + transform-origin: 0 0; } .__phone-verify-code .slide-bar-c .slide-image-small { diff --git a/web_src/vuepages/apis/modules/userinvite.js b/web_src/vuepages/apis/modules/userinvite.js new file mode 100644 index 000000000..7d79b3f4d --- /dev/null +++ b/web_src/vuepages/apis/modules/userinvite.js @@ -0,0 +1,11 @@ +import service from '../service'; + +// 邀请好友页面数据 +export const getUserInvitationCode = () => { + return service({ + url: '/user/invitation_code', + method: 'get', + params: {}, + data: {}, + }); +} diff --git a/web_src/vuepages/pages/user/invite/index.vue b/web_src/vuepages/pages/user/invite/index.vue new file mode 100644 index 000000000..86cdc7a54 --- /dev/null +++ b/web_src/vuepages/pages/user/invite/index.vue @@ -0,0 +1,279 @@ + + + + + diff --git a/web_src/vuepages/pages/user/invite/vp-user-invite.js b/web_src/vuepages/pages/user/invite/vp-user-invite.js new file mode 100644 index 000000000..48e542500 --- /dev/null +++ b/web_src/vuepages/pages/user/invite/vp-user-invite.js @@ -0,0 +1,17 @@ +import Vue from 'vue'; +import ElementUI from 'element-ui'; +import 'element-ui/lib/theme-chalk/index.css'; +import localeEn from 'element-ui/lib/locale/lang/en'; +import localeZh from 'element-ui/lib/locale/lang/zh-CN'; +import { i18n, lang } from '~/langs'; +import App from './index.vue'; + +Vue.use(ElementUI, { + locale: lang === 'zh-CN' ? localeZh : localeEn, + size: 'small', +}); + +new Vue({ + i18n, + render: (h) => h(App), +}).$mount('#__vue-root');