Home Explore Help
Register Sign In
tangdehang
/
android-cloud-H5
Watch 1
Star 0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

Merge remote-tracking branch 'origin/dev-4.9.3' into uat

heyang 3 years ago
parent
3972e7f14b 91d7a4a750
commit
072db191cc
2 changed files with 12 additions and 7 deletions
Split View Show Diff Stats
  1. 2 2
      microserviceUserH5/vcloud/actFission.html
  2. 10 5
      microserviceUserH5/vcloud/actFissionShare.html

+ 2 - 2
microserviceUserH5/vcloud/actFission.html
View File 

@@ -265,7 +265,7 @@
 
 					<van-swipe vertical class="notice-swipe" :autoplay="2000" :show-indicators="false">
 
 						<van-swipe-item v-for="(item,index) in marqueeList">
 
 							<img :src="standarImg(item.headImgUrl)" :onerror="defaultImg" alt="">
 
-							<p>{{item.surfaceName}}</p>
 
+							<p>{{item.sharerSurfaceName}}</p>
 
 							<p>已领取分享奖励</p>
 
 						</van-swipe-item>
 
 
@@ -291,7 +291,7 @@
 
 								<img :src="standarImg(item.headImgUrl)" class="tou" :onerror="defaultImg" alt="">
 
 								<div class="text">
 
 									<p>{{item.surfaceName}}</p>
 
-									<p>{{item.createTime}}</p>
 
+									<p>{{item.registerTime}}</p>
 
 								</div>
 
 							</div>
 
 							<div class="right-nav">

+ 10 - 5
microserviceUserH5/vcloud/actFissionShare.html
View File 

@@ -255,7 +255,7 @@
 
 <body>
 
     <div class="ipt"></div>
 
     <div id="app" v-cloak class="container ">
 
-       
+
 
         <div v-if='isshow&&topic!=null' style="margin: 0 auto;">
 
             <div class="footer">
 
                 <div class="download-btn">
 
@@ -318,7 +318,7 @@
 
             data: {
 
                 isshow: true,
 
                 id: GetRequest().id ? GetRequest().id : 404,
 
-                username: GetRequest().username ? GetRequest().username : 'KtIC61639034703',
 
+                username: GetRequest().username ? GetRequest().username : '3yWfB1632299939',
 
                 topic: null,
 
                 defaultImg: 'this.src="' + "../static/offImg/tou.png" + '"',
 
                 marqueeList: [],
 
@@ -380,6 +380,11 @@
 
                     //     forbidClick: true,
 
                     //     loadingType: 'spinner',
 
                     this.stopManyClick(() => {
 
+                        systemBuriedPoint({
 
+                            pointName: 'dt_裂变_h5_复制激活码'
 
+                        }).then(res => {
 
+                          
+                        })
 
                         getActivationCode(this.username, this.tagId, this.uuid).then(res => {
 
                             this.$toast.clear();
 
                             if (res.status === 0) {
 
@@ -393,15 +398,15 @@
 
                                 });
 
                                 setTimeout(() => {
 
                                     this.$dialog.close();
 
-                                    this.download();
 
+                                    //this.download();
 
                                 }, 2000)
 
                             }
 
 
                         }).catch((error) => {
 
-                           
+
 
                             console.log(error)
 
                             this.$toast('复制失败');
 
-                            this.download()
 
+                            //this.download()
 
 
                         });
 
                     })