压缩图片

css/task.css

@@ -34,10 +34,10 @@ img{
   text-align: center;
   position: absolute;
   left: 0;
-  bottom: 1rem;
+  bottom: 1.2rem;
   width: 100%;
   color: #FE0B02;
-  font-size: .7rem;
+  font-size: 1rem;
 }
 .block{
   padding: 0 7rem 4rem 7rem;
@@ -264,6 +264,8 @@ img{
   position: absolute;
   right: -.6rem;
   top: .4rem;
+  text-align: center;
+  line-height: 1.3rem;
 }
 .ice_box .row ul li img,.quan_box .row ul li img{
   width: 100%;
@@ -343,6 +345,8 @@ img{
   position: absolute;
   right: -.6rem;
   top: .4rem;
+  text-align: center;
+  line-height: 1.3rem;
 }
 .wodecailiao_ice_item2 .wodecailiao_ice_item_tag{
   right: 0rem;

html/task/home.html

@@ -261,10 +261,20 @@
 	<script type="text/javascript" src="../../js/awardRotate.js"></script>
 	<script type="text/javascript" src="../../js/bts/bootstrap.min.js"></script> 
 	<script type="text/javascript" src="../../js/autosize.js"></script>
-	<script type="text/javascript" src="../../js/qiandao.js"></script>
-  <script> 
-    let TaskHistory = [], IceList = [], UserMaterials = [],
-     userIceList = [], activityId = 1, customerId = 1549, 
+	
+  <script>
+    var str = location.href; //取得整个地址栏
+    var param = str.substr(str.indexOf("?")+1).split('&');
+    let userInfo = {
+      customerId: param[0].split('=')[1],
+      accountId: param[1].split('=')[1],
+      token: param[2].split('=')[1],
+      secretKey: param[3].split('=')[1],
+    }
+    localStorage.userInfo2 = JSON.stringify(userInfo);
+    console.log(userInfo)
+    let IceList = [], UserMaterials = [],
+     userIceList = [], activityId = 1, customerId = userInfo.customerId, 
      taskId = 26, iceIndex = 0,UserFamilyInventory = {},
      beginTime = '', endTime = '', ActivityInfo = '';
     // let url = 'http://efficient.oytour.com/'
@@ -534,18 +544,7 @@
       }, 1000)
     }
     getUserMaterials()
-    // 打开弹窗
-    function showBox(id){
-      // $('body').css('overflow', 'hidden')
-      $('#'+id).show()
-      $('#'+id).css('display', 'flex')
-    }
-    // 关闭弹窗
-    function closeBox (id) {
-      // $('body').css('overflow', '')
-      $('#'+id).hide()
-      $('#'+id).css('display', 'none')
-    }
+    
     // 冰糕合并切换
     function showIce (id, id2, showD, hideID) {
       $('.'+id).show()
@@ -559,7 +558,22 @@
       //   $('.bingqilingBox_bg').css('height','45rem')
       // }
     }
-	</script>
+  </script>
+  <script type="text/javascript" src="../../js/qiandao.js"></script>
+  <script>
+    // 打开弹窗
+    function showBox(id){
+      // $('body').css('overflow', 'hidden')
+      $('#'+id).show()
+      $('#'+id).css('display', 'flex')
+    }
+    // 关闭弹窗
+    function closeBox (id) {
+      // $('body').css('overflow', '')
+      $('#'+id).hide()
+      $('#'+id).css('display', 'none')
+    }
+  </script>
 </body>
 
 </html>
\ No newline at end of file

js/mian.js

@@ -19,6 +19,14 @@ function getLocalStorage() {
       return null;
   }
 }
+function getLocalStorage2() {
+  var localStorageData = window.localStorage["userInfo2"];
+  if (localStorageData != undefined) {
+      return JSON.parse(localStorageData);
+  } else {
+      return null;
+  }
+}
 function clearLocalStorage() { 
   window.localStorage.removeItem('userInfo')
 }
@@ -52,10 +60,15 @@ function getJavaData(msg) {
   let token = "";
   let key = "";
   if (getLocalStorage() != null) {
-      token = getLocalStorage().token;
-      key = getLocalStorage().SecretKey;
+    token = getLocalStorage().token;
+    key = getLocalStorage().SecretKey;
+  } else if (getLocalStorage2() != null) { 
+    if (getLocalStorage2() != null) {
+      token = getLocalStorage2().token;
+      key = getLocalStorage2().secretKey;
+  }
   }
-  let userInfo = localStorage.userInfo ? JSON.parse(localStorage.userInfo) : ''
+  let userInfo = localStorage.userInfo ? JSON.parse(localStorage.userInfo) : JSON.parse(localStorage.userInfo2) ? JSON.parse(localStorage.userInfo2) : ''
   let uid = userInfo.accountId ? userInfo.accountId : 0
   let encodeMsg = encodeURIComponent(JSON.stringify(msg)).toLowerCase();
   let md5Str = hex_md5(`msg=${encodeMsg}&timestamp=${timestamp}&token=${token}&key=${key}`);

js/qiandao.js

-var url = getApiUrl().urlJava;
-var dayList=[],TaskHistory=[],activityId = 1, customerId = 1549, taskId = 26;
+var dayList=[]
 let date = new Date();
 let newDate = date.getFullYear()+"-"+((date.getMonth()+1) < 9 ? '0' + (date.getMonth()+1) : date.getMonth()+1) + "-" + (date.getDate() < 9 ? '0' + date.getDate() : date.getDate() );
 let Year=date.getFullYear();
@@ -12,7 +11,7 @@ getActivityGoods();
     function getQiandao(){
       
       let msg = {
-        activityId: activityId,
+        activityId: 1,
         customerId: customerId,
         taskId: taskId
       }