提交

css/task.css

@@ -212,7 +212,7 @@ img{
 /* 冰淇淋 */
 .bingqilingBox_bg{
   width: 94%;
-  height: 43.05rem;
+  min-height: 43.05rem;
   background: url("../images/task/ice/bg.png");
   background-size: 100% 100%;
   position: relative;

html/task/home.html

@@ -185,14 +185,6 @@
 
       </div>
     </div>
-  </div>
-  <!-- 奖券 -->
-  <div id="wodejiangquanBox" class="none">
-  
-  </div>
-  <!-- 兑换 -->
-  <div id="wodeduihuanBox" class="none">
-
   </div>
   <!-- 说明 -->
   <div id="huodongshuoming" class="none">
@@ -211,6 +203,26 @@
     <div class="qiandaoBox_bg">
       
     </div>
+  </div>
+  <!-- 商城 -->
+  <div id="shangchengBox" class="none">
+    <div class="shangchengBox_bg">
+
+    </div>
+  </div>
+    <!-- 奖券 -->
+  <div id="jiangquanBox" class="none">
+    <div class="jiangquanBox_bg">
+
+    </div>
+  </div>
+  <!-- 奖券 -->
+  <div id="wodejiangquanBox" class="none">
+
+  </div>
+  <!-- 兑换 -->
+  <div id="wodeduihuanBox" class="none">
+
   </div>
 	<script type="text/javascript" src="../../js/jquery-1.10.2.js"></script>
 	<script type="text/javascript" src="../../js/md5.js"></script>
@@ -220,29 +232,98 @@
 	<script type="text/javascript" src="../../js/bts/bootstrap.min.js"></script> 
 	<script type="text/javascript" src="../../js/autosize.js"></script>
   <script> 
-   let msg = {
-      activityId: 1,
-      customerId: 1549,
-      taskId: 26
-    }
+    let TaskHistory = [], IceList = [], UserMaterials = [], activityId = 1, customerId = 1549, taskId = 26;
     // let url = 'http://efficient.oytour.com/'
     let url = getApiUrl().urlJava
-    $.ajax({
-      type: "POST",
-      url: `${url}api/mactivity/getTaskHistory`,
-      contentType: "application/json",
-      data: getJavaData(msg),
-      async: false,
-      success: function (res) {
-        if (res.resultCode === 1) {
-          let data = res.data.data
-          console.log(data)
+    // 获取签到记录
+    function getQiandao(){
+      let msg = {
+        activityId: activityId,
+        customerId: customerId,
+        taskId: taskId
+      }
+      $.ajax({
+        type: "POST",
+        url: `${url}api/mactivity/getTaskHistory`,
+        contentType: "application/json",
+        data: getJavaData(msg),
+        async: false,
+        success: function (res) {
+          if (res.resultCode === 1) {
+            TaskHistory = res.data.data
+          }
+        },
+        error: function (res) {
+
         }
-      },
-      error: function (res) {
+      })
+    }
+    // 获取用户所有材料列表
+    function getUserMaterials(){
+      let msg = {
+        activityId: activityId,
+        customerId: customerId,
+      }
+      $.ajax({
+        type: "POST",
+        url: `${url}api/mactivity/getUserMaterialsInventory`,
+        contentType: "application/json",
+        data: getJavaData(msg),
+        async: false,
+        success: function (res) {
+          if (res.resultCode === 1) {
+            let data = res.data.data
+            for(let i = 0; i < data.length; i++) {
+              if (data[i].MaterialName === '牛奶') {
+                data[i].src = '../../images/task/ice/c_tang.png'
+              } else if (data[i].MaterialName === '糖') {
+                data[i].src = '../../images/task/ice/c_tang.png'
+              } else if (data[i].MaterialName === '蛋黄') {
+                data[i].src = '../../images/task/ice/c_danhuang.png'
+              } else if (data[i].MaterialName === '酸奶') {
+                data[i].src = '../../images/task/ice/c_suan.png'
+              } else if (data[i].MaterialName === '草莓') {
+                data[i].src = '../../images/task/ice/c_caomei.png'
+              } else if (data[i].MaterialName === '葡萄干') {
+                data[i].src = '../../images/task/ice/c_putao.png'
+              } else if (data[i].MaterialName === '巧克力') {
+                data[i].src = '../../images/task/ice/c_qiaoke.png'
+              } else if (data[i].MaterialName === '礼盒') {
+                data[i].src = '../../images/task/ice/c_lihe.png'
+              }
+            }
+            getIce(data)
+          }
+        },
+        error: function (res) {
 
+        }
+      })
+    }
+    // 获取冰淇淋
+    function getIce(data){
+      let msg = {
+        activityId: activityId,
+        customerId: customerId,
       }
-    })
+      $.ajax({
+        type: "POST",
+        url: `${url}api/mactivity/getUserCreamsInventory`,
+        contentType: "application/json",
+        data: getJavaData(msg),
+        async: false,
+        success: function (res) {
+          if (res.resultCode === 1) {
+            IceList = res.data.data
+            console.log(data)
+          }
+        },
+        error: function (res) {
+
+        }
+      })
+    }
+    getUserMaterials()
     // 打开弹窗
     function showBox(id){
       // $('body').css('overflow', 'hidden')