nyx weapp: 页面更新 & 数据更新

1. 完成日历活动每天最多3个 2. 优化我的订单页面

nyx weapp: 页面更新 & 数据更新
1. 完成日历活动每天最多3个 2. 优化我的订单页面
c1d2e6c3 · jscat · 0cae3a64 · c1d2e6c3 · c1d2e6c3 · c1d2e6c3
Commit c1d2e6c3 authored Sep 07, 2020 by jscat
--- a/增值产品-小程序及app/nyx-master/pages/member/schedule/schedule.js
+++ b/增值产品-小程序及app/nyx-master/pages/member/schedule/schedule.js
 // pages/schedule/schedule.js
@@ -130,7 +130,7 @@ Page({
        var result = {}
        for (var i = 0; i < res.data.length; i++) {
-          var title = res.data[i].titleAbbr
+          var title = res.data[i].title.substr(0, 6)
          var start_datetime = res.data[i].startDatetime
          var end_datetime = res.data[i].endDatetime
          _this.getYearAndMonthAndDay(start_datetime, end_datetime, strMonth, title, result)
@@ -145,7 +145,7 @@ Page({
              year: parseInt(list[0]),
              month: parseInt(list[1]),
              day: parseInt(list[2]),
-              todoText: result[key].join("\n"),
+              todoText: result[key].slice(0,3).join("\n"),
              color: '#f40' // 单独定义代办颜色 (标记点、文字)
            }
            days.push(value)
@@ -221,15 +221,16 @@ Page({
        console.log("====");
        var days = []
        for(var key in result) {
-            var list = key.split("-")
+          var list = key.split("-")
-            var value = {
+          var value = {
-              year: parseInt(list[0]),
+            year: parseInt(list[0]),
-              month: parseInt(list[1]),
+            month: parseInt(list[1]),
-              day: parseInt(list[2]),
+            day: parseInt(list[2]),
-              todoText: result[key].join("\n"),
+            todoText: result[key].slice(0,3).join("\n"),
-              color: '#f40' // 单独定义代办颜色 (标记点、文字)
+            color: '#f40' // 单独定义代办颜色 (标记点、文字)
-            }
+          }
-            days.push(value)
+          days.push(value)
        }
        this.calendar.setTodoLabels({
@@ -256,7 +257,9 @@ Page({
    var i=0;
    var startTime = new Date(start.split('-').join('/'));
    var endTime = new Date(end.split('-').join('/'));
-    while((endTime.getTime()-startTime.getTime())>=0){
+    var len = 0
+    while((endTime.getTime()-startTime.getTime())>=0)
+    {
      // console.log("===enter while")
      var year = startTime.getFullYear();
      var month = (startTime.getMonth()+1).toString().length==1?'0'+(startTime.getMonth()+1).toString():(startTime.getMonth()+1).toString();
@@ -270,6 +273,10 @@ Page({
      {
        result[strKey] = [title];
      }
+      else
+      {
+        result[strKey] = [];
+      }
      startTime.setDate(startTime.getDate()+1);
      i+=1;

--- a/增值产品-小程序及app/nyx-master/pages/my/my-orders/my-orders.js
+++ b/增值产品-小程序及app/nyx-master/pages/my/my-orders/my-orders.js
 // pages/my/my-orders/my-orders.js
@@ -44,8 +44,8 @@ Page({
    showModalBarcode : false,
    /* 订单 可使用/不可用状态 */
-    selectTab : true,
    pageIndex : 1,
+    orderStatus: "",
  },
@@ -74,11 +74,11 @@ Page({
    {
      //getPoints(scrollType, pageNum, pageCount, matchStatus)
      //onLoad的时候展示可使用的订单
-      var order_status = '20'
+      var orderStatus = '10::20'
-      _this.getOrders(0, 1, 4, order_status);
+      _this.getOrders(0, 1, 6, orderStatus);
      _this.setData({
-        selectTab : '20', // 默认为可使用 tab
+        orderStatus : orderStatus, // 默认为可使用 tab
        isHideLoadMore : _this.__data__.orders.length < 4 ? true : false, 
      })
    }    
@@ -136,7 +136,7 @@ Page({
      console.log('加载更多')
      setTimeout(() => {
-        _this.getOrders(1, pageIndex, 4, orderStatus);
+        _this.getOrders(1, pageIndex, 6, orderStatus);
      }, 1000)
    }
    else {
@@ -159,7 +159,7 @@ Page({
    var _this = this;
    //指明具体是list的哪一个item
    var indexId    = e.currentTarget.dataset.id
-    var qrcode_url = _this.__data__.orders[indexId].order_qrcode
+    var qrcode_url = _this.__data__.orders[indexId].qrcode_url
    var qrcode     = _this.__data__.orders[indexId].order_id
     this.setData({
        showModalBarcode : true,
@@ -187,9 +187,9 @@ Page({
    //js的e.currentTarget.dataSet.id 对应wxml的 data-id="tab0"
    var id = e.currentTarget.id;
    var dataId = e.currentTarget.dataset.id
-    _this.getOrders(0, 1, 4, dataId);
+    _this.getOrders(0, 1, 6, dataId);
    _this.setData({
-        selectTab: dataId,
+        orderStatus: dataId,
    })
@@ -241,7 +241,6 @@ Page({
            {
              order_item["product_desc"] = res.data.data[i].productDesc
              order_item["unit_price"] = res.data.data[i].unitPrice
-              order_item["item_price"] = res.data.data[i].itemPrice
              order_item["quantity"] = res.data.data[i].quantity
              orderInfo[result["order_id"]]['order_item'].push(order_item)
            }
@@ -249,10 +248,9 @@ Page({
            {
              result["member_name"] = res.data.data[i].memberName
              result["title"] = res.data.data[i].title
-              result["total_price"] = res.data.data[i].totalPrice
+              result["total_price"] = parseFloat(res.data.data[i].totalPrice).toFixed(2)
              order_item["product_desc"] = res.data.data[i].productDesc
              order_item["unit_price"] = res.data.data[i].unitPrice
-              order_item["item_price"] = res.data.data[i].itemPrice
              order_item["quantity"] = res.data.data[i].quantity
              result['order_item'] = [order_item]            
              result["order_status"] = res.data.data[i].orderStatus

--- a/增值产品-小程序及app/nyx-master/pages/my/my-orders/my-orders.wxml
+++ b/增值产品-小程序及app/nyx-master/pages/my/my-orders/my-orders.wxml
 <view class="page"> 
 <view class="page"> 
  <!-- Tab: refer to 有品·优惠券 -->
  <view class="weui-flex" style="height: 120rpx;">
-      <view class="weui-flex__item weui-flex justify align border" data-id="20" id="id-20" bindtap="tab">
+      <view class="weui-flex__item weui-flex justify align border" data-id="10::20" id="id-10::20" bindtap="tab">
        <view class="placeholder">
        <text class="text {{selectTab=='20'?'selected':''}}">可使用</text>
      </view></view>
-      <view class="weui-flex__item weui-flex justify align border" data-id="10" id="id-10" bindtap="tab">
+      <!-- <view class="weui-flex__item weui-flex justify align border" data-id="10" id="id-10" bindtap="tab">
        <view class="placeholder">
        <text class="text {{selectTab=='10'?'selected':''}}">待付款</text>
-      </view></view>
+      </view></view> -->
      <view class="weui-flex__item weui-flex justify align border" data-id="00::30" id="id-00::30" bindtap="tab">
        <view class="placeholder">
        <text class="text {{selectTab=='00::30'?'selected':''}}">不可用</text>
@@ -33,7 +33,7 @@
          <view class="note-row">
              <image class="writer-image" src="{{item.product_image}}"/>
              <view class="note-column">
-                <span>{{sub_item.product_desc}}</span>
+                <span>{{item.title}}·{{sub_item.product_desc}}</span>
                <span>
                  <view class="price-row">
                    <view class="sub-price">￥{{sub_item.unit_price}}</view>

--- a/增值产品-小程序及app/nyx-master/pages/my/my-orders/my-orders.wxss
+++ b/增值产品-小程序及app/nyx-master/pages/my/my-orders/my-orders.wxss
 .page{
@@ -321,7 +321,6 @@
  }
  .sub-price{
-    color: #666;
    font-size: 16px;
    margin-right: 5%;
    margin-top: 0;