Merge branch 'dev-4.9.3' of http://192.168.32.253:3000/Software/android-cloud-H5 into dev-4.9.3

microserviceUserH5/static/js/vender/vue/api.js

@@ -70,9 +70,9 @@ function getStrategy() {
   })
 }
 //新用户使用激活码
-function getActivationCode(data) {
+function getActivationCode(data,tagId) {
   return service({
-    url: `/api/public/v4/actFissionAward/getActivationCode?username=${data}`,
+    url: `/api/public/v4/actFissionAward/getActivationCode?username=${data}&tagId=${tagId}`,
     method: 'get',
 
   

microserviceUserH5/vcloud/actFission.html

@@ -220,7 +220,7 @@
 
 		.van-swipe-item p:first-of-type {
 			font-size: 0.28rem;
-			width: 2.4rem;
+			width: 1.8rem;
 			color: #00FFFF;
 			display: block;
 			overflow: hidden;

microserviceUserH5/vcloud/actFissionShare.html

@@ -251,12 +251,13 @@
             data: {
                 isshow: true,
                 id: GetRequest().id ? GetRequest().id : 404,
-                username: GetRequest().username ? GetRequest().username : 'dL8gP1638608074',
+                username: GetRequest().username ? GetRequest().username : 'Cqowt16032622',
                 topic: null,
                 defaultImg: 'this.src="' + "../static/offImg/tou.png" + '"',
                 marqueeList: [],
                 code: '',
-                msg:'活动已下架'
+                msg:'活动已下架',
+                tagId:0,
 
             },
             created() {
@@ -308,7 +309,7 @@
                     })
                     var clipboard = new ClipboardJS('.copybtn')
 
-                    getActivationCode(this.username).then(res => {
+                    getActivationCode(this.username, this.tagId).then(res => {
                         this.$toast.clear();
                         if (res.status === 0) {
                             //此处为点击的dom的类名
@@ -391,6 +392,7 @@
                             if (res.data) {
                                 this.isshow = true;
                                 this.topic = res.data.content;
+                                this.tagId=res.data.tagId;
                                 console.log(this.topic)
                             } else {
                                 this.msg=res.msg;

microserviceUserH5/vcloud/doubleChristmasActivity.html

@@ -211,7 +211,7 @@
 			operate('dt_双旦_h5_立即参与');
 			if (isMiniprogram) { // 小程序
 				wx.miniProgram.navigateTo({
-					url: '/packageA/order/buy/index'
+					url: '/packageA/order/buy/index?type=activity'
 				})
 			} else if (isAndroid) { // 安卓
 				window.native.startPurchase(1, 365);
@@ -228,7 +228,7 @@
 				}
 				if (isMiniprogram) { // 小程序
 					wx.miniProgram.navigateTo({
-						url: '/packageA/order/buy/index'
+						url: '/packageA/order/buy/index?type=activity'
 					})
 				} else if (isAndroid) { // 安卓
 					window.native.startPurchase(1, 365);