From 6c7bba2e05c011a3d640b6565a113204228e92e0 Mon Sep 17 00:00:00 2001
From: zhaojs <349234519@qq.com>
Date: 星期六, 07 十月 2023 10:58:36 +0800
Subject: [PATCH] Merge tag '首页猜你喜欢修复' into develop

---
 public/html/activity/invite2308.html |   18 +++++++++++-------
 1 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/public/html/activity/invite2308.html b/public/html/activity/invite2308.html
index 44f42cf..6f0841a 100644
--- a/public/html/activity/invite2308.html
+++ b/public/html/activity/invite2308.html
@@ -239,7 +239,8 @@
                         </div>
                         <div class="cell" style="justify-content:left;">
                             <image style="width: 24%; margin-right:0.1rem" :src="item.avatar"></image>
-                            {{"**"+item.nickname.substr(item.nickname.length-1)}}
+
+                            {{"**"+((item.nickname&&item.nickname.length>0)?item.nickname.substr(item.nickname.length-1):'')}}
                         </div>
                         <div class="cell">{{item.recruit_count}}</div>
                     </div>
@@ -291,6 +292,9 @@
         <div v-if="isShowcj" class="btngo" v-on:click="joinAct()">
             <image style="width: 70%;" src="https://yanfeiobpub.obs.cn-east-3.myhuaweicloud.com/dfg/invite_btn.png"></image>
         </div>
+        <div v-else class="btngo share" v-on:click="copyBtn('.share')">
+            <image style="width: 70%;" src="https://yanfeiobpub.obs.cn-east-3.myhuaweicloud.com/dfg/invit_pic.png"></image>
+        </div>
     </div>
     </div>
     </div>
@@ -318,7 +322,7 @@
         el: '#inviteact',
         data:{
           //posturl:'http://dfg.shop.com',
-          posturl:'https://appapitest.ushopvip.com',
+          //posturl:'http://appapitest.ushopvip.com',
           //posturl:'http://dfgapp.ushopvip.com',
           activityid:'3432534sdsd',
           loadingTxt:'鍔犺浇涓�...',
@@ -353,7 +357,7 @@
                         headers:{
                             "token":_this.getUrlPar("token")
                         },
-                        url:_this.posturl+'/api/Activity/getActInfo',
+                        url:'/api/Activity/getActInfo',
                         type:"post",
                         dataType:"json",
                         data:{
@@ -401,7 +405,7 @@
                         headers:{
                             "token":_this.getUrlPar("token")
                         },
-                        url:_this.posturl+'/api/Activity/getActRecruitCount',
+                        url:'/api/Activity/getActRecruitCount',
                         type:"post",
                         dataType:"json",
                         data:{
@@ -428,7 +432,7 @@
                         headers:{
                             "token":_this.getUrlPar("token")
                         },
-                        url:_this.posturl+'/api/Activity/attendAct',
+                        url:'/api/Activity/attendAct',
                         type:"post",
                         dataType:"json",
                         data:{
@@ -455,7 +459,7 @@
                         headers:{
                             "token":_this.getUrlPar("token")
                         },
-                        url:_this.posturl+'/api/Activity/getInviteUrl',
+                        url:'/api/Activity/getInviteUrl',
                         type:"post",
                         dataType:"json",
                         data:{
@@ -476,7 +480,7 @@
                         headers:{
                             "token":_this.getUrlPar("token")
                         },
-                        url:_this.posturl+'/api/Activity/getRankingList',
+                        url:'/api/Activity/getRankingList',
                         type:"post",
                         dataType:"json",
                         data:{

--
Gitblit v1.9.3