heyang пре 3 година
родитељ
комит
92cd7f433e

BIN
microserviceUserH5/static/offImg/no-content.png


+ 14 - 8
microserviceUserH5/vcloud/actFission.html

@@ -279,14 +279,14 @@
 			justify-content: center;
 		}
 		.select-title{
-			margin-bottom: 0.2rem;
+			margin-bottom: 0.3rem;
 			font-size: 0.36rem;
 			text-align: center;
 		}
 		.icon{
-			width: 1.66rem;
-			height: 1.66rem;
-			margin: 0 0.1rem;
+			width: 1.21rem;
+			height: 1.21rem;
+			margin: 0 0.24rem;
 		}
 		.join-wrap{
 			background-color: #1F1A3A;
@@ -455,9 +455,10 @@
 						forbidClick: true,
 						loadingType: 'spinner',
 					});
-					getActDetailList(this.token).then(res => {
+					getActDetailList(GetRequest().token).then(res => {
 						this.$toast.clear();
 						if (res.status === 0) {
+							console.log(type)
 							if(type === 'look'){
 							    this.phoneType = res.data.phoneType;
 								return
@@ -465,6 +466,7 @@
 							this.actStatus = res.data.actStatus;
 							this.shareInfo = res.data;
 							if (this.actStatus != 1) {
+								console.log(111111111)
 								this.$toast('活动已下架');
 								return
 							}
@@ -521,9 +523,13 @@
 						forbidClick: true,
 						loadingType: 'spinner',
 					});
-					getActDetailList(this.token).then(res => {
+					getActDetailList(GetRequest().token).then(res => {
 						this.$toast.clear();
 						if (res.status === 0) {
+							if (this.actStatus != 1) {
+								this.$toast('活动已下架');
+								return
+							}
 							this.actStatus = res.data.actStatus;
 							this.shareInfo = res.data;
 						} else {
@@ -532,7 +538,7 @@
 					})
 				},
 				getAwardPage() { //获取活动列表
-					getAwardPage(this.token, this.queryParams).then(res => {
+					getAwardPage(GetRequest().token, this.queryParams).then(res => {
 						if (res.status == 0) {
 							this.loading = false //取消正在加载状态
 							let infolist = res.data.list;
@@ -582,7 +588,7 @@
 				},
 				goGetReward(id, phoneType) {
 					this.stopManyClick(() => {
-						getCheck(this.token).then(res => {
+						getCheck(GetRequest().token).then(res => {
 							if (res.status === 0) {
 								if (isAndroid) {
 									window.native.activatePhones(1, id, phoneType)

+ 14 - 2
microserviceUserH5/vcloud/actFissionList.html

@@ -60,6 +60,14 @@
 			line-clamp: 2;
 			-webkit-box-orient: vertical;
 		}
+		.no-content{
+			width: 3.74rem;
+			height: 3.14rem;
+			position: fixed;
+			top: 50%;
+			left: 50%;
+			transform: translate(-50%,-50%);
+		}
 	</style>
 </head>
 
@@ -72,6 +80,7 @@
 				<div class="contents">{{getContent(index,item.content)}}</div>
 			</div>
 		</div>
+		<img v-if="noData" src="../static/offImg/no-content.png" class="no-content" alt="" />
 	</div>
 	<script type="text/javascript" src="https://res.wx.qq.com/open/js/jweixin-1.2.0.js"></script>
 	<script src="../static/js/vender/vue/axios.min.js"></script>
@@ -86,6 +95,7 @@
 		new Vue({
 			el: '#app',
 			data: {
+				noData: true,
 				title: '',
 				tagList: []
 			},
@@ -113,9 +123,11 @@
 					}).then(res => {
 						this.$toast.clear();
 						if (res.status === 0) {
+							this.noData = false;
 							this.tagList = res.data.actFissionStrategyList;
 						} else {
-							this.$toast(res.msg);
+							this.noData = true;
+							// this.$toast(res.msg);
 						}
 					})
 				},
@@ -132,7 +144,7 @@
 					location.href = `./actFission.html?token=${GetRequest().token}`;
 				},
 				toDetail(item){
-					location.href = `./actFissionShare.html?strategyId=${item.id}&type=1`;
+					location.href = `./actFissionShare.html?strategyId=${item.id}&type=1&token=${GetRequest().token}`;
 				},
 				stopManyClick(fn) { //防抖
 					if (this.flag) {

+ 5 - 4
microserviceUserH5/vcloud/actFissionShare.html

@@ -610,7 +610,7 @@
                 // })
                 //  document.querySelector('#app').classList.remove('hide');
                 // this.validate(); // 生成验证码
-                this.getActDetail();
+                this.getActDetailList();
                 this.getMarquee(); //跑马灯
                 if (localStorage.getItem("uuid")) {
                     this.uuid = localStorage.getItem("uuid");
@@ -645,8 +645,9 @@
                 },
                 
                 //查看活动是否下架
-                getActDetail() { //获取活动状态
-                    getActDetail().then(res => {
+                getActDetailList() { //获取活动状态
+                    console.log(GetRequest().token)
+                    getActDetailList(GetRequest().token).then(res => {
                         this.$toast.clear();
                         if (res.status === 0) {
                             this.phoneType = res.data.phoneType;
@@ -856,7 +857,7 @@
                     }
                 },
                 share(){
-                    console.log(this.shareInfo.gotoUrl)
+                    console.log(this.shareInfo)
                     const {
 						title,
 						content,