Merge branch 'V20220926' into zouap

templates/user/profile.tmpl

@@ -48,9 +48,10 @@
 									</li>
 								{{end}}
 							{{end}}
-							{{if and .IsSigned (eq .SignedUserName .Owner.Name)}}
+							
 							<li>
-								{{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 .IsSigned (eq .SignedUserName .Owner.Name)}}
 								<div class=__ad_profile_c__ style="margin-top:6px;height:50px;display:none;">
 									<a class="__ad_profile__" href="" target="_blank"><img src="" style="width:100%;height:100%" /></a>
 								</div>
@@ -78,9 +79,9 @@
 										});
 									})();
 								</script>
+								{{end}}
 							</li>
-							{{end}}
-							<li>{{svg "octicon-clock" 16}} {{.i18n.Tr "user.join_on"}} {{.Owner.CreatedUnix.FormatShort}}</li>
+														
 							{{if and .Orgs .HasOrgsVisible}}
 							
 							<li style="border-bottom: none;padding-bottom: 0;"><div style="border-bottom: 1px solid #eaeaea;padding-top: 5px;padding-bottom:5px"> <b>{{.i18n.Tr "organization"}} </b></div></li>

web_src/vuepages/langs/config/en-US.js

@@ -166,7 +166,8 @@ const en = {
     inviteFriends: 'Invite Friends',
     inviteFriendsTips: 'Copy QR code or invite registration link to share with friends',
     clickToViewTheEventDetails: 'Click to view the event details',
-    copyRegistrationInvitationLink: 'Copy registration invitation link',    
+    copyRegistrationInvitationLink: 'Copy registration invitation link',
+    registrationAdress: 'Registration Adress: ',
     recommender: 'Recommender: ',
     invitedFriends: 'Invited friends',
     registrationTime: 'Registration time',

web_src/vuepages/langs/config/zh-CN.js

@@ -166,7 +166,8 @@ const zh = {
     inviteFriends: '邀请好友',
     inviteFriendsTips: '复制二维码或者邀请注册链接分享给好友',
     clickToViewTheEventDetails: '点击查看活动详情',
-    copyRegistrationInvitationLink: '复制注册邀请链接',
+    copyRegistrationInvitationLink: '复制邀请注册链接',
+    registrationAdress: '注册地址：',
     recommender: '推荐人：',
     invitedFriends: '已邀请好友',
     registrationTime: '注册时间',

web_src/vuepages/pages/user/invite/index.vue

@@ -19,9 +19,10 @@
         <div class="txt-1">
           <span>{{ pageOpeniDesc }}</span>
         </div>
-        <div class="txt-2"><span>{{ invitationLink + invitationCode }}</span></div>
+        <div class="txt-2"><span>{{ $t('user.registrationAdress') }}</span><span>{{ invitationLink + invitationCode
+        }}</span></div>
         <div class="txt-3"><span>{{ $t('user.recommender') }}</span><span>{{ invitationCode }}</span></div>
-        <el-button class="__copy_link_btn__" type="primary">{{ $t('user.copyRegistrationInvitationLink') }}</el-button>
+        <el-button class="__copy_link_btn__" type="primary" style="background:rgb(21, 114, 255);">{{ $t('user.copyRegistrationInvitationLink') }}</el-button>
       </div>
       <div class="qr-code">
         <div id="__qr-code__" style="width:120px;height:120px;"></div>
@@ -30,7 +31,7 @@
     <div class="table-container">
       <div>
         <el-table border :data="tableData" style="width:100%" v-loading="loading" stripe>
-          <el-table-column prop="ID" :label="$t('user.invitedFriends')" align="left" header-align="center">
+          <el-table-column prop="ID" :label="$t('user.invitedFriends')" align="left" header-align="left">
             <template slot-scope="scope">
               <div style="display:flex;align-items:center;padding-left:20px;">
                 <img :src="scope.row.avatarSrc" alt="" style="height:45px;width:45px;margin-right:10px;" />
@@ -47,7 +48,7 @@
           </el-table-column>
           <template slot="empty">
             <span style="font-size: 12px">{{
-                loading ? $t('loading') : $t('noData')
+            loading ? $t('loading') : $t('noData')
             }}</span>
           </template>
         </el-table>
@@ -98,7 +99,7 @@ export default {
     initCopy() {
       const clipboard = new Clipboard('.__copy_link_btn__', {
         text: () => {
-          return this.invitationLink + this.invitationCode;
+          return `${this.pageOpeniDesc}\n${this.$t('user.registrationAdress')}${this.invitationLink + this.invitationCode}\n${this.$t('user.recommender')}${this.invitationCode}`;
         },
       });
       clipboard.on('success', (e) => {