Browse Source

修改bug

ymm 3 years ago
parent
commit
72ef7855d1

+ 20 - 17
microserviceUserH5/static/js/vender/vue/config.js

@@ -2,16 +2,18 @@
 // var base_url = 'http://jakehou92.ticp.io'; //测试服务器
 // var base_url = 'http://192.168.100.137:3001'; //测试服务器
 // var base_url = 'http://192.168.100.98:3001'; //测试服务器
-//var base_url = baseUrl; //测试服务器
+var base_url = baseUrl; //测试服务器
 //http://test.androidscloud.com
-var base_url = baseUrl;
+//var base_url = 'https://per.cs.se.androidscloud.com/';
 //https://www.nn-jtjt.com/app
 // var base_url = 'http://kmpark.cdwatertek.com/appwechatpay'; //测试服务器
 // var base_url = 'http://192.168.100.83:3001'; //测试服务器
 //var base_url = 'http://**********'; //正式服务器
 
-const fileCenterApi = 'https://wjzx.androidscloud.com:9091'
 
+const fileCenterApi = 'https://wjzx.androidscloud.com:9091'
+// https://per.cs.se.androidscloud.com/
+// https://per.cs.se.androidscloud.com/
 axios.defaults.headers['Content-Type'] = 'application/json';
 // axios.defaults.headers['Access-Control-Allow-Origin'] = '*';
 
@@ -39,23 +41,24 @@ const service = axios.create({
 // })
 service.interceptors.response.use(
   response => {
-      const code = response.data.code
-      // tryHideFullScreenLoading();
-     
-      if (response && code != 200) {
+    const code = response.data.code
+    // tryHideFullScreenLoading();
+
+    if (response && code != 200) {
 
-        // if(response.data.msg) Toast(`${response.data.msg}`)
-      }
-      // if(response.data.msg=='请先登录'){
-      //   window.location.href='../html/login.html'
-      // }
-      return response.data
+      // if(response.data.msg) Toast(`${response.data.msg}`)
+    }
+    // if(response.data.msg=='请先登录'){
+    //   window.location.href='../html/login.html'
+    // }
+    return response.data
   },
   error => {
-      console.log(error) // for debug
-      alert('服务器异常, 请稍后重试')
-      // tryHideFullScreenLoading();
-      return Promise.reject(error)
+    console.log(error) // for debug
+    //  alert('服务器异常, 请稍后重试')
+    //  toast('网络异常,请稍后重试!');
+    // tryHideFullScreenLoading();
+    return Promise.reject(error)
   }
 )
 

BIN
microserviceUserH5/static/offImg/time-end.png


BIN
microserviceUserH5/static/offImg/time.png


+ 10 - 20
microserviceUserH5/vcloud/actFission.html

@@ -7,7 +7,7 @@
 	<meta name="description" content="活动">
 	<title>免费领机</title>
 	<link rel="icon" href="../static/img/favicon2.ico" type="img/x-ico">
-	<link rel="stylesheet" href="../static/css/index.css?v=1.0.0.2">
+	<link rel="stylesheet" href="../static/css/index.css?v=1.0.0.5">
 	<link rel="stylesheet" href="../static/css/vant.css" />
 	<script src="../static/js/vender/vue/vue.min.js"></script>
 	<script src="../static/js/vender/vue/vant.min.js"></script>
@@ -38,22 +38,22 @@
 		.bottom-btn {
 			position: absolute;
 			width: 100%;
-			bottom: -0.12rem;
+			bottom: 0.32rem;
 			display: flex;
 			justify-content: center;
 			left: 0;
 		}
 
 		.bottom-btn .time-box {
-			width: 6.26rem;
-			height: 1.88rem;
+			width: 5.34rem;
+			height: 1.44rem;
 			background: url("../static/offImg/time.png") no-repeat;
 			background-size: 100% 100%;
 		}
 
 		.no-start {
-			width: 6.26rem !important;
-			height: 1.88rem !important;
+			width: 5.34rem !important;
+			height: 1.44rem !important;
 			background: url("../static/offImg/time-end.png") no-repeat !important;
 			background-size: 100% 100% !important;
 		}
@@ -342,7 +342,7 @@
 			data: {
 				isshow: false,
 				token: GetRequest().token ? GetRequest().token :
-					'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJyYW5kb20iOiIzMTE4NiIsImNsaWVudCI6IjUiLCJleHAiOjE2NDA4NDU5OTgsInVzZXJuYW1lX2FwcGxldCI6Ik1WQm5LMTYzMTY3NjI4NyJ9.e0-pXxv4nPJMMgqpZGtEpit5u8MeH8fCPgYRRNjOwQc',
+					'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJyYW5kb20iOiI3ODM0NyIsImNsaWVudCI6IjUiLCJleHAiOjE2NDA4NDkxMjUsInVzZXJuYW1lX2FwcGxldCI6Iko4VENqMTYzODk0MTc2MyJ9.J4vY-mSQnxh0K9DxNVKbelL1IXMx0GGVTClRKqfbyLo',
 				rewardList: [],
 				queryParams: {
 					pageNum: 1,
@@ -366,13 +366,13 @@
 			},
 			mounted() {
 				this.getActDetailList(); //获取活动上下架
-
 				this.getMarquee(); //跑马灯
 
 
 			},
 			methods: {
 				goReward() {
+					this.getActDetailList();
 					if (this.actStatus != 1) {
 						return
 					}
@@ -410,15 +410,6 @@
 				standarImg(id) {
 					return `${fileCenterApi}/file-center/fileOperate/getImage?id=${id}`;
 				},
-				// getActDetail(){
-				// 	getActDetail(this.token).then(res => {
-				// 		if (res.status === 0) {
-
-				// 		} else {
-				// 			this.$toast(res.msg);
-				// 		}
-				// 	})
-				// },
 				getActDetailList() { //获取活动状态
 					this.$toast.loading({
 						duration: 0,
@@ -442,10 +433,10 @@
 						if (res.status == 0) {
 							this.loading = false //取消正在加载状态
 							let infolist = res.data.list;
+							this.total = res.data.total;
 							if (infolist) {
 								this.rewardList = this.rewardList.concat(infolist);
-								if (infolist.length < this.queryParams
-									.pageSize) { //判断接口返回数据量小于请求数据量,则表示此为最后一页
+								if (this.rewardList.length >= this.total) { //判断接口返回数据量小于请求数据量,则表示此为最后一页
 									this.finished = true;
 								}
 							} else {
@@ -458,7 +449,6 @@
 								this.queryParams.pageNum -= 1
 							}
 						}
-
 					}).catch((error) => {
 						console.log(error)
 						this.$toast('网络异常');

+ 69 - 52
microserviceUserH5/vcloud/actFissionShare.html

@@ -4,9 +4,9 @@
 <head>
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0">
-    <meta name="description" content=" ">
+    <meta name="description" content="双子星邀请你免费领取云手机">
     <link rel="icon" href="../static/img/favicon2.ico" type="img/x-ico">
-    <link rel="stylesheet" href="../static/css/index.css?v=1.0.0.6">
+    <link rel="stylesheet" href="../static/css/index.css?v=1.0.0.9">
     <link rel="stylesheet" href="../static/css/vant.css" />
     <script src="../static/js/vender/jquery-3.4.1.min.js"></script>
     <!-- <script src="../static/js/vender/vue/vue.min.js"></script>
@@ -16,7 +16,7 @@
     <script src="../static/js/vender/vue/axios.min.js"></script>
     <script src="../static/js/vender/vue/config.js"></script>
     <script src="../static/js/vender/vue/api.js"></script> -->
-    <title> 分享攻略</title>
+    <title>分享攻略</title>
     <style>
         [v-cloak] {
             display: none !important;
@@ -25,13 +25,13 @@
         .container {
             display: flex;
             height: 100vh;
-            padding: 0.2rem 0.3rem;
+            padding-top: 0.2rem;
             /* align-items: center;
 			justify-content: center; */
         }
 
         .top-banner {
-            width: 6.82rem;
+            width: 6.8rem;
             height: 0.82rem;
             background: url("../static/offImg/share-top.png") no-repeat;
             background-size: 100% 100%;
@@ -48,7 +48,7 @@
         }
 
         .download-btn {
-            width: 6.9rem;
+            width: 7.2rem;
             height: 1.3rem;
             background: url('../static/offImg/btn-down.png') no-repeat scroll top center #3B7FFF;
             background-size: 100% 100%;
@@ -127,7 +127,6 @@
 
         .topic-info {
             padding-bottom: 1.6rem;
-
         }
 
         .topic-info img {
@@ -220,12 +219,36 @@
 
         .top-banner {
             margin: 0 auto;
+            margin-bottom: 0.1rem;
+        }
+
+        .hide {
+            display: none !important;
         }
 
+        .van-overlay {
+            background-color: rgba(0, 0, 0, 0.5);
+        }
 
+        .van-dialog__content {
+            /* padding: 0.3rem 0.6rem; */
+            min-height: unset !important;
+        }
 
-        .hide {
-            display: none;
+        .van-dialog {
+            border-radius: 0.2rem;
+            width: unset !important;
+        }
+
+        .van-dialog__message {
+            padding: 0.3rem 0.6rem;
+            font-size: 0.3rem;
+            white-space: nowrap;
+            font-family: PingFangSC-Regular, PingFang SC;
+        }
+
+        .van-dialog__content {
+            border-radius: 0.2rem;
         }
     </style>
 </head>
@@ -233,14 +256,23 @@
 <body>
 
     <div id="app" v-cloak class="container ">
+        <div class="ipt"></div>
         <div v-if='isshow&&topic!=null' style="margin: 0 auto;">
-
+            <div class="footer">
+                <div class="download-btn">
+                    <div class="left-nav">
+                        <p>激活码:</p>
+                        <p>AS4*********SD3</p>
+                    </div>
+                    <div class="button-download copybtn" @click='createCopy()'>点击复制并下载</div>
+                </div>
+            </div>
             <div class="top-banner">
                 <van-notice-bar :scrollable="false">
                     <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 class="hide">测试1212111111112</p>
+                            <p class="hide">双子星邀请你免费领取云手机</p>
                             <p>{{item.surfaceName}}</p>
                             <p>已获得星动云手机套餐</p>
                         </van-swipe-item>
@@ -250,18 +282,9 @@
             </div>
             <div class="top-content">
                 <div v-html="topic" class="topic-info"></div>
-                <div class="ipt"></div>
 
             </div>
-            <div class="footer">
-                <div class="download-btn">
-                    <div class="left-nav">
-                        <p>激活码:</p>
-                        <p>AS4*********SD3</p>
-                    </div>
-                    <div class="button-download copybtn" @click='createCopy()'>点击复制并下载</div>
-                </div>
-            </div>
+
         </div>
         <div v-if='!isshow' class="hideContainer">
             <div>
@@ -310,6 +333,9 @@
                 // window.location.href = 'investigate.html'
             },
             mounted() {
+                // this.$dialog.alert({
+                //     message: '激活码总数已上限,谢谢参与'
+                // })
                 //  document.querySelector('#app').classList.remove('hide');
                 this.getActDetail();
                 this.getMarquee(); //跑马灯
@@ -382,8 +408,7 @@
                 download() {
                     if (isAndroid) {
                         console.log(isAndroid);
-                        window.location.href =
-                            'http://www.androidscloud.com//suanchou';
+                        window.location.href = 'http://www.androidscloud.com//suanchou';
                     } else if (isIOS) {
                         window.location.href = 'https://www.pgyer.com/gemini6';
                     }
@@ -418,9 +443,7 @@
                             } else {
                                 this.msg = res.msg;
                                 this.isshow = false;
-
                             }
-
                         }
                         console.log(res)
 
@@ -431,35 +454,29 @@
                 },
                 copyUrl() {
                     this.stopManyClick(() => {
-                        var oInput = document.createElement('input'); //创建一个input
-                        oInput.setAttribute("readonly", "readonly"); //设置只读,否则移动端使用复制功能时可能会造成软件盘弹出
+                        // var oInput = document.createElement('input'); //创建一个input
+                        // oInput.setAttribute("readonly", "readonly"); //设置只读,否则移动端使用复制功能时可能会造成软件盘弹出
                         // this.$nextTick();
                         setTimeout(() => {
-                            try {
-                                const input = document.createElement('textarea')
-                                input.value = this.code
-                                document.body.appendChild(input)
-                                input.select() // 选择对象
-                                document.execCommand('Copy') // 执行浏览器复制命令
-                                input.style.display = 'none'
-                                input.remove()
-                                this.$dialog.alert({
-                                    message: `复制成功`
-                                });
-                                setTimeout(() => {
-                                    this.$dialog.close();
-                                    this.download();
-                                }, 2000)
-                            } catch (err) {
-                                this.$dialog.alert({
-                                    message: `复制失败`
-                                });
-                                setTimeout(() => {
-                                    this.$dialog.close();
-                                    //  this.download();
-                                }, 2000)
-                            }
-                        }, 0)
+                            var oInput = document.createElement('input'); //创建一个input
+                            oInput.setAttribute("readonly",
+                                "readonly"); //设置只读,否则移动端使用复制功能时可能会造成软件盘弹出
+                            oInput.value = this.code;
+                            $('.ipt')[0].appendChild(oInput); //将input插入到body
+                            // oInput.select(); // 选择对象 ios不支持
+                            this.selectText(oInput, 0, oInput.value.length);
+                            document.execCommand("Copy"); // 执行浏览器复制命令
+                            this.$dialog.alert({
+                                message: '复制成功'
+                            })
+                            setTimeout(() => {
+                                this.$dialog.close();
+                                this.download();
+                            }, 2000)
+                            oInput.style.display = 'none'; // 将input隐藏
+                            oInput.blur();
+                            oInput.remove(); // 将input销毁
+                        }, 100)
 
                     })
 

+ 6 - 8
microserviceUserH5/vcloud/test.html

@@ -4,26 +4,24 @@
 <head>
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0">
-    <meta name="description" content="分享攻略 ">
+    <meta name="description" content="双子星邀请你免费领取云手机">
     <link rel="icon" href="../static/img/favicon2.ico" type="img/x-ico">
     <!-- <link rel="stylesheet" href="../static/css/index.css?v=1.0.0.3">
     <link rel="stylesheet" href="../static/css/vant.css" /> -->
     <script src="../static/js/vender/config.js"></script>
- 
-    <title>攻略分享 </title>
+    <title>分享攻略</title>
     <style>
-      
+
     </style>
 </head>
 
 <body>
- 
-   
+
     <!-- <script type="text/javascript" src="https://res.wx.qq.com/open/js/jweixin-1.2.0.js"></script> -->
 
     <script type="text/javascript">
-    let username= GetRequest().username ? GetRequest().username : 'dL8gP1638608074'
-     window.location.href='./actFissionShare.html?username='+username;
+        let username = GetRequest().username ? GetRequest().username : 'dL8gP1638608074'
+        window.location.href = './actFissionShare.html?username=' + username;
     </script>
 </body>