nyx weapp: 数据更新+功能更新

1. date.wxs ios的日期格式不知 yy-mm-ss 这种 2. 添加活动读取代码 3. 添加schedule读取代码 4. 添加order读取代码

nyx weapp: 数据更新+功能更新
1. date.wxs ios的日期格式不知 yy-mm-ss 这种 2. 添加活动读取代码 3. 添加schedule读取代码 4. 添加order读取代码
74c85493 · jscat · ba34b145 · 74c85493 · 74c85493 · 74c85493
Commit 74c85493 authored Aug 18, 2020 by jscat
--- a/增值产品-小程序及app/nyx-master/config.js
+++ b/增值产品-小程序及app/nyx-master/config.js
 //config.js API全局域名配置
@@ -45,6 +45,7 @@ var config={
  userinfo_query_url: host_key + "/api/nyx/userinfo/query",
  notes_query_url: host_key + "/api/nyx/post/query",
  activity_query_url: host_key + "/api/nyx/activity/query",
+  order_detail_query_url: host_key + "/api/nyx/order/detail/query",
  match_query_url: host_key + "/api/nyx/match/query",
  match_query_by_id_url: host_key + "/api/nyx/match/query/id",
  match_query_then_update_url: host_key + "/api/nyx/match/queryThenUpdate/id",

--- a/增值产品-小程序及app/nyx-master/pages/activity/activity-info/activity-info.js
+++ b/增值产品-小程序及app/nyx-master/pages/activity/activity-info/activity-info.js
 // pages/activity/activity-info/activity-info.js
@@ -50,6 +50,7 @@ Page({
      activityInfo['activity_id'] = options.activity_id;
      activityInfo['note_image'] = options.note_image.split("::");
      activityInfo['title'] = options.title;
+      activityInfo['title_abbr'] = options.title_abbr;
      activityInfo['content'] = options.content;      
      activityInfo['like'] = options.like;
      activityInfo['address_name'] = options.address_name;

--- a/增值产品-小程序及app/nyx-master/pages/activity/activity-info/activity-info.wxml
+++ b/增值产品-小程序及app/nyx-master/pages/activity/activity-info/activity-info.wxml
 <wxs module="tutil" src="./../../../utils/date.wxs"></wxs>
@@ -33,7 +33,7 @@
      <span>日期: {{tutil.formatDate_ymdw_today_interval(activityInfo.start_datetime, activityInfo.end_datetime)}}</span>
      <!-- 时间 -->
-      <span>时间: {{tutil.formatDate_hm_interval(activityInfo.start_datetime, activityInfo.end_datetime)}}</span>
+      <span>时间: 19:30 - 22:00</span>
      <span>地点: {{activityInfo.address_name}}</span>
    </view>

--- a/增值产品-小程序及app/nyx-master/pages/activity/activity.js
+++ b/增值产品-小程序及app/nyx-master/pages/activity/activity.js
 // pages/activity/activity.js
@@ -78,8 +78,11 @@ Page({
      //注册新用户
      console.log("===onLoad_regUser")
      wx.clearStorageSync('nyxCode');
-      nyxCode = "uid_" + util.wxuuid()
+      var nyxCode = "uid_" + util.wxuuid()
      wx.setStorageSync('nyxCode', nyxCode);
+      //todo set mid_456
+      var memberId = "mid_456"
+      wx.setStorageSync('memberId', memberId);
      app.globalData.nyxCode = nyxCode;
      app.regUser(nyxCode);
    }
@@ -111,7 +114,7 @@ Page({
    }
    // todo temp 暂时设置所有用户为商家(可以查看个人->商家管理)
-    wx.setStorageSync('memberId', "mid_001")
+    wx.setStorageSync('memberId', "mid_456")
    var device = wx.getSystemInfoSync()
    //self.device = app.globalData.myDevice
@@ -263,6 +266,7 @@ Page({
            result["member_logo"] = res.data.data[i].memberLogo
            result["tag"] = res.data.data[i].tag
            result["title"] = res.data.data[i].title
+            result["title_abbr"] = res.data.data[i].titleAbbr
            result["num_like"] = res.data.data[i].numLike
            result["content"] = res.data.data[i].content
            result["quiz"] = res.data.data[i].quiz
@@ -274,7 +278,7 @@ Page({
            var start_datetime = res.data.data[i].startDatetime
            var end_datetime = res.data.data[i].endDatetime
            result["start_datetime"] = start_datetime
-            result["end_datetime"] = end_datetime == start_datetime ? "" : end_datetime
+            result["end_datetime"] = end_datetime
            var url_quiz = "../activity/quiz-info/quiz-info?"
              +"&activity_id="+result["activity_id"]
@@ -292,6 +296,7 @@ Page({
              +"activity_id="+result["activity_id"]
              +"&note_image="+res.data.data[i].noteImage //传递原始string数据, List不正确
              +"&title="+result["title"]
+              +"&title_abbr="+result["title_abbr"]
              +"&content="+result["content"]
              +"&address_name="+result["address_name"]
              +"&like="+result["num_like"]

--- a/增值产品-小程序及app/nyx-master/pages/member/schedule/schedule.js
+++ b/增值产品-小程序及app/nyx-master/pages/member/schedule/schedule.js
 // pages/schedule/schedule.js
@@ -3,6 +3,8 @@
 var config = wx.getStorageSync("config");
 var app = getApp();
+// https://treadpit.github.io/wx_calendar/
 Page({
  /**
@@ -13,9 +15,14 @@ Page({
    nyxCode : "",
    authStatus : "0",
    userInfo : {},
+    memberId: "",
+    memberName: "",
    bGetUserInfo : false,
    bUpdateUserData: false,
+    curDate : "",
+    days : [],
  },
  /**
@@ -30,6 +37,7 @@ Page({
        nyxCode: wx.getStorageSync('nyxCode'),
        userInfo: wx.getStorageSync('userInfo'),
        authStatus: wx.getStorageSync('authStatus'),
+        memberId : wx.getStorageSync('memberId'),
      })    
    }
@@ -53,17 +61,6 @@ Page({
  onShow: function () {
    var _this = this
-    //初始化数据
-    if (wx.getStorageSync('nyxCode')) {
-      _this.setData({
-        nyxCode: wx.getStorageSync('nyxCode'),
-        userInfo: wx.getStorageSync('userInfo'),
-        authStatus: wx.getStorageSync('authStatus'),
-        matchSeason: wx.getStorageSync('matchSeason'),
-      })
-    }
  },
  /**
@@ -111,73 +108,66 @@ Page({
   * 日历初次渲染完成后触发事件，如设置事件标记
   */
  afterCalendarRender(e) {
+    var _this = this;
    console.log('===afterCalendarRender', e);
+    // => { year: 2019, month: 12}
+    const ym = this.calendar.getCurrentYM()
+    var month = ym['month'].toString().length==1?'0'+ym['month']:ym['month']
+    var strCurDate = ym['year'] + "-" +month
+    console.log("===strCurdate", strCurDate)
+    var query_url = '&curDate=' + strCurDate
+    _this.setData({
+      curDate : strCurDate,
+    })
+    var strUrl = config.activity_query_url + "?pageCount=" + 100
+                                        + "&pageNum=" + 1 + query_url
+    getData(strUrl, "").then(res => {
+      console.log(res.data)
+      if(res.data.length >0) //有数据
+      {
+        var strMonth = _this.__data__.curDate.split("-")[1]
+        var list = []
+        var result = {}
+        for (var i = 0; i < res.data.length; i++) {
+          var title = res.data[i].titleAbbr
+          var start_datetime = res.data[i].startDatetime
+          var end_datetime = res.data[i].endDatetime
+          _this.getYearAndMonthAndDay(start_datetime, end_datetime, strMonth, title, result)
+        }
+        //进行setLabel
+        console.log("====",result);
+        var days = []
+        for(var key in result) {
+            var list = key.split("-")
+            var value = {
+              year: parseInt(list[0]),
+              month: parseInt(list[1]),
+              day: parseInt(list[2]),
+              todoText: result[key].join("\n"),
+              color: '#f40' // 单独定义代办颜色 (标记点、文字)
+            }
+            days.push(value)
+        }
        this.calendar.setTodoLabels({
          // 待办点标记设置
          pos: 'bottom', // 待办点标记位置 ['top', 'bottom']
          dotColor: '', // 待办点标记颜色
          circle: false, // 待办圆圈标记设置（如圆圈标记已签到日期），该设置与点标记设置互斥
          showLabelAlways: false, // 点击时是否显示待办事项（圆点/文字），在 circle 为 true 及当日历配置 showLunar 为 true 时，此配置失效
-      days: [
+          days: days,
-        {
-          year: 2020,
-          month: 8,
-          day: 15,
-          todoText: '周年庆\n烤肉海鲜自助',
-          color: '#f40' // 单独定义代办颜色 (标记点、文字)
-        },
-        {
-          year: 2020,
-          month: 8,
-          day: 8,
-          todoText: '599/6瓶套装',
-          color: '#f40' // 单独定义代办颜色 (标记点、文字)
-        },
-        {
-          year: 2020,
-          month: 8,
-          day: 16,
-          todoText: '帝王嘉品鉴会',
-          color: '#f40' // 单独定义代办颜色 (标记点、文字)
-        },
-        {
-          year: 2020,
-          month: 8,
-          day: 3,
-          todoText: '盲品活动',
-          color: '#f40' // 单独定义代办颜色 (标记点、文字)
-        },        
-        {
-          year: 2020,
-          month: 8,
-          day: 1,
-          todoText: '埃特纳红葡会',
-          color: '#f40' // 单独定义代办颜色 (标记点、文字)
-        },        
-        {
-          year: 2020,
-          month: 8,
-          day: 13,
-          todoText: '陈年主题专场',
-          color: '#f40' // 单独定义代办颜色 (标记点、文字)
-        },
-        {
-          year: 2020,
-          month: 8,
-          day: 8,
-          todoText: '红丹魄白丹魄',
-          color: '#f40' // 单独定义代办颜色 (标记点、文字)
-        },
-        {
-          year: 2020,
-          month: 8,
-          day: 31,
-          todoText: '罗翌的酒市集',
-          color: '#f40' // 单独定义代办颜色 (标记点、文字)
-        },
-      ]
        });
+      }
+      else
+      {
+        console.log("==onLoad_userInfo success")        
+      }
+    })
  },
@@ -198,5 +188,111 @@ Page({
  },
+  // 当日期改变的时候
+  whenChangeMonth(e)
+  {
+    var _this = this;
+    console.log('===whenChangeMonth', e.detail);
+    var month = e.detail.next['month'].toString().length==1?'0'+e.detail.next['month']:e.detail.next['month']
+    var strCurDate = e.detail.next['year'] + "-" +month
+    console.log("===strCurDate: ", strCurDate)
+    var query_url = '&curDate=' + strCurDate
+    _this.setData({
+      curDate : strCurDate,
+    })
+    var strUrl = config.activity_query_url + "?pageCount=" + 100
+                                        + "&pageNum=" + 1 + query_url
+    getData(strUrl, "").then(res => {
+      console.log(res.data)
+      if(res.data.length >0) //无数据
+      {
+        //
+        var strMonth = _this.__data__.curDate.split("-")[1]
+        var list = []
+        var result = {}
+        for (var i = 0; i < res.data.length; i++) {
+          var title = res.data[i].titleAbbr
+          var start_datetime = res.data[i].startDatetime
+          var end_datetime = res.data[i].endDatetime
+          _this.getYearAndMonthAndDay(start_datetime, end_datetime, strMonth, title, result)
+        }
+        //进行setLabel
+        console.log("====");
+        var days = []
+        for(var key in result) {
+            var list = key.split("-")
+            var value = {
+              year: parseInt(list[0]),
+              month: parseInt(list[1]),
+              day: parseInt(list[2]),
+              todoText: result[key].join("\n"),
+              color: '#f40' // 单独定义代办颜色 (标记点、文字)
+            }
+            days.push(value)
+        }
+        this.calendar.setTodoLabels({
+          // 待办点标记设置
+          pos: 'bottom', // 待办点标记位置 ['top', 'bottom']
+          dotColor: '', // 待办点标记颜色
+          circle: false, // 待办圆圈标记设置（如圆圈标记已签到日期），该设置与点标记设置互斥
+          showLabelAlways: false, // 点击时是否显示待办事项（圆点/文字），在 circle 为 true 及当日历配置 showLunar 为 true 时，此配置失效
+          days: days,
+        });
+      }
+      else
+      {
+        console.log("==onLoad_userInfo success")        
+      }
+    })
+  },
+  // 获取Activities数据
+  getYearAndMonthAndDay: function(start, end, strMonth, title, result){
+    var i=0;
+    var startTime = new Date(start.split('-').join('/'));
+    var endTime = new Date(end.split('-').join('/'));
+    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();
+      var day = startTime.getDate().toString().length==1?'0'+startTime.getDate():startTime.getDate();
+      var strKey = year+"-"+month+"-"+day
+      if(month == strMonth && result.hasOwnProperty(strKey))
+      {
+        result[strKey].push(title);
+      }
+      else if(month == strMonth)
+      {
+        result[strKey] = [title];
+      }
+      startTime.setDate(startTime.getDate()+1);
+      i+=1;
+    }
+  }
 })
+//通过Promise方式为wx.request添加同步操作
+const getData = (url, param) => {
+  return new Promise((resolve, reject) => {
+    wx.request({
+      url: url,
+      method: 'GET',
+      data: param,
+      success(res) {
+        resolve(res.data)
+      },
+      fail(err) {
+        reject(err)
+      }
+    })
+  })
+}
\ No newline at end of file
--- a/增值产品-小程序及app/nyx-master/pages/my/my-members/my-members.js
+++ b/增值产品-小程序及app/nyx-master/pages/my/my-members/my-members.js
 // pages/my/my-member/my-member.js
@@ -28,7 +28,7 @@ Page({
        nyxCode: wx.getStorageSync('nyxCode'),
        userInfo: wx.getStorageSync('userInfo'),
        authStatus: wx.getStorageSync('authStatus'),
-		memberId: "mid_123",
+        memberId : wx.getStorageSync('memberId'),
      })
    }

--- 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
@@ -23,87 +23,6 @@ Page({
    //活动列表
    orders : [],
-    //活动信息
-    orderInfo_2 : {
-      item_height : 130 + 20 + 120*2 + 30*3, // basic + margin-bottom(20rpx) + item(n) + margin(n+1)
-      member_name : "Renaissance Bar",
-      title : "酒市集",
-      total_price : 149.00,
-      order_id : "oid_123",
-      order_status : "交易成功",
-      product_image : "https://930-test-sh.oss-cn-shanghai.aliyuncs.com/user-dir/sakura.jpg",
-      qrcode_url : "https://930-test-sh.oss-cn-shanghai.aliyuncs.com/qrcode-dir/mid_11235813.png",      
-      order_item :[
-        {
-          product_desc :"会员",
-          unit_price : "59.00",
-          quantity : 1,
-          item_price : "59.00",
-        },
-        {
-          product_desc :"普通用户",
-          unit_price : "99.00",
-          quantity : 1,
-          item_price : "99.00",
-        }
-      ]
-    },
-    orderInfo_1 : {
-      member_name : "Renaissance Bar",
-      title : "酒市集",
-      total_price : 149.00,
-      order_id : "oid_123",
-      order_status : "交易成功",
-      product_image : "https://930-test-sh.oss-cn-shanghai.aliyuncs.com/user-dir/sakura.jpg",
-      order_qrcode : "https://930-test-sh.oss-cn-shanghai.aliyuncs.com/qrcode-dir/mid_11235813.png",
-      item_height : 130 + 20 + 120 + 30*2, // 控制item的高度
-      order_item :[
-        {
-          product_desc :"普通用户",
-          unit_price : "99.00",
-          quantity : 1,
-          item_price : "99.00",
-        }
-      ]
-    },    
-    orderInfo_3 : {
-      member_name : "Renaissance Bar",
-      title : "酒市集",
-      total_price : 149.00,
-      order_id : "oid_123",
-      order_status : "交易成功",
-      product_image : "https://930-test-sh.oss-cn-shanghai.aliyuncs.com/user-dir/sakura.jpg",
-      order_qrcode : "https://930-test-sh.oss-cn-shanghai.aliyuncs.com/qrcode-dir/mid_11235813.png",
-      item_height : 130 + 20 + 120*3 + 30*4, // 控制item的高度
-      order_item :[
-        {
-          product_desc :"普通用户",
-          unit_price : "99.00",
-          quantity : 1,
-          item_price : "99.00",
-        },
-        {
-          product_desc :"普通用户",
-          unit_price : "99.00",
-          quantity : 2,
-          item_price : "198.00",
-        },
-        {
-          product_desc :"普通用户",
-          unit_price : "99.00",
-          quantity : 3,
-          item_price : "297.00",
-        },
-      ]
-    }, 
    //选中barcode的qrcode和url
    qrcode : "",
    qrcode_url : "",  
@@ -125,7 +44,7 @@ Page({
    /* 订单 可使用/不可用状态 */
    selectTab : true,
-    matchStatus : "",
+    pageIndex : 1,
  },
@@ -136,7 +55,7 @@ Page({
  onLoad: function (options) {
    var _this = this;
    wx.setNavigationBarTitle({
-      title: '我的预订',
+      title: '我的订单',
    })
    //初始化数据
@@ -145,7 +64,7 @@ Page({
        nyxCode: wx.getStorageSync('nyxCode'),
        userInfo: wx.getStorageSync('userInfo'),
        authStatus: wx.getStorageSync('authStatus'),
-        matchSeason: wx.getStorageSync('matchSeason'),
+        memberId: wx.getStorageSync('memberId'),
      })
    }
@@ -153,18 +72,13 @@ Page({
    if(_this.__data__.orders.length == 0)
    {
      //getPoints(scrollType, pageNum, pageCount, matchStatus)
-      //onLoad的时候展示可使用的积分
+      //onLoad的时候展示可使用的订单
-      var orders = []
+      var order_status = '20'
-      orders.push(_this.__data__.orderInfo_2)
-      orders.push(_this.__data__.orderInfo_3)
-      orders.push(_this.__data__.orderInfo_1)
+      _this.getOrders(0, 1, 4, order_status);
-      //_this.getPoints(0, 1, 4, matchStatus);
      _this.setData({
-        orders : orders,
        selectTab : '20', // 默认为可使用 tab
-        isHideLoadMore : orders.length < 4 ? true : false, 
+        isHideLoadMore : _this.__data__.orders.length < 4 ? true : false, 
      })
    }    
@@ -210,7 +124,7 @@ Page({
  onReachBottom: function () {
    console.log('页面上拉触底')
    var _this = this;
-    var matchStatus = _this.__data__.matchStatus
+    var orderStatus = _this.__data__.orderStatus
    var isHideLoadMore = _this.__data__.isHideLoadMore;
    var pageIndex = _this.__data__.pageIndex;
@@ -221,7 +135,7 @@ Page({
      console.log('加载更多')
      setTimeout(() => {
-        _this.getPoints(1, pageIndex, 4, matchStatus);
+        _this.getOrders(1, pageIndex, 4, orderStatus);
      }, 1000)
    }
    else {
@@ -267,10 +181,12 @@ Page({
   */
  tab: function(e) {
    var _this = this;
+    var pageIndex = _this.__data__.pageIndex
    //js的e.currentTarget.id 对应wxml的 id="tab0"
    //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.setData({
        selectTab: dataId,
    })
@@ -282,12 +198,12 @@ Page({
   * 用户自定义函数
   * 
   */
-  // 获取points数据
+  // 获取orders数据
  // scrollType: 是否是翻页, 0-不翻页 | 1-翻页
-  getPoints: function (scrollType, pageNum, pageCount, memberStatus) {
+  getOrders: function (scrollType, pageNum, pageCount, orderStatus) {
    var _this = this;
-    var query_url = '&matchStatus='+memberStatus
+    var query_url = '&orderStatus='+orderStatus
-    var strUrl = config.match_query_url + "?pageCount=" + pageCount
+    var strUrl = config.order_detail_query_url + "?pageCount=" + pageCount
                                        + "&pageNum=" + pageNum + query_url
    config.debug == 1 ? console.log("===strUrl is: \"" + strUrl + "\"") : ""
    wx.request({
@@ -305,24 +221,62 @@ Page({
          if (res.data.data.length < pageCount) {
            bisHideLoadMoreType = true;
          }
+          var orders = []
+          /*
+            orderInfo :
+            {
+              "oid_001" : {},
+              "oid_002" : {},
+              "oid_003" : {},
+            }
+          */
+          var orderInfo = {}
          for (var i = 0; i < res.data.data.length; i++) {
            var result = {}
-            result["total_point"] = res.data.data[i].totalPoint
+            var order_item = {}
+            result["order_id"] = res.data.data[i].orderId
+            if(orderInfo.hasOwnProperty(result["order_id"]))
+            {
+              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)
+            }
+            else
+            {
              result["member_name"] = res.data.data[i].memberName
-            result["bonus_count"] = res.data.data[i].bonusCount
+              result["title"] = res.data.data[i].title
-            result["bonus_point"] = res.data.data[i].bonusPoint
+              result["total_price"] = res.data.data[i].totalPrice
-            result["match_id"] = res.data.data[i].matchId                        
+              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
+              result["product_image"] = res.data.data[i].productImage
              result["qrcode_url"] = res.data.data[i].qrcodeUrl
-            list.push(result)
+              orderInfo[result["order_id"]] = result
+            }
+            console.log("===", orderInfo)
+          }
+          var list = []
+          for(var key in orderInfo) {
+            var len = orderInfo[key]['order_item'].length
+            var item_height = 130 + 20 + 120*len + 30*(len+1) // 控制item的高度
+            orderInfo[key]['item_height'] = item_height
+            list.push(orderInfo[key])
          }
          //进行翻页设置（加载更多）
          if (scrollType == 1) {
-            var pointsList = _this.__data__.points;
+            var orderList = _this.__data__.orders;
-            list = pointsList.concat(list)
+            list = orderList.concat(list)
          }
          _this.setData({
-            points: list,
+            orders: list,
            pageIndex: pageNum + 1,
            isHideLoadMore: bisHideLoadMoreType,
          })

--- 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"> 
@@ -37,7 +37,7 @@
                <span>
                  <view class="price-row">
                    <view class="sub-price">￥{{sub_item.unit_price}}</view>
-                    <view class="sub-quantity"> x{{sub_item.quantity}}</view>
+                    <view class="sub-quantity">x{{sub_item.quantity}}</view>
                  </view>
                </span>
              </view>

--- a/增值产品-小程序及app/nyx-master/pages/my/my-points/my-points.js
+++ b/增值产品-小程序及app/nyx-master/pages/my/my-points/my-points.js
 // pages/my/rank/rank.js
@@ -57,7 +57,7 @@ Page({
        nyxCode: wx.getStorageSync('nyxCode'),
        userInfo: wx.getStorageSync('userInfo'),
        authStatus: wx.getStorageSync('authStatus'),
-        matchSeason: wx.getStorageSync('matchSeason'),
+        memberId: wx.getStorageSync('memberId'),
      })
    }

--- a/增值产品-小程序及app/nyx-master/pages/my/my.js
+++ b/增值产品-小程序及app/nyx-master/pages/my/my.js
 // pages/my/my.js
@@ -32,7 +32,7 @@ Page({
        nyxCode: wx.getStorageSync('nyxCode'),
        userInfo: wx.getStorageSync('userInfo'),
        authStatus: wx.getStorageSync('authStatus'),
-        memberId : "mid_123",
+        memberId : wx.getStorageSync('memberId'),
      })    
    }

--- a/增值产品-小程序及app/nyx-master/utils/date.wxs
+++ b/增值产品-小程序及app/nyx-master/utils/date.wxs
 var formatTime = function (date) {
 var formatTime = function (date) {
-var date = getDate(date)
+var date = getDate(date.split('-').join('/'))
 var year = date.getFullYear()
 var month = date.getMonth() + 1
 var day = date.getDate()
@@ -22,6 +22,7 @@ var formatDate_md_week = function (date) {
  // 返回 02-04 周三
  var str = date.toString().substring(5, 10)
  var week = getWeekByDate_today_2(date)
+  console.log("===week",week)
  return str + " " + week
 }
@@ -35,10 +36,10 @@ var formatDate_ymd = function (date) {
 var formatDate_ymdw_today = function (date) {
    // 输入 2020-02-04 19:33:00
    // 返回 2020年02月04日 星期三
-    var date = getDate(date); 
+    var date1 = getDate(date.split('-').join('/')); 
-    var year = date.getFullYear()
+    var year = date1.getFullYear()
-    var month = date.getMonth() + 1
+    var month = date1.getMonth() + 1
-    var day = date.getDate()
+    var day = date1.getDate()
    var week = getWeekByDate_today(date)
    return year +"年" + month + "月" + day + "日" + " " + week
@@ -47,10 +48,10 @@ var formatDate_ymdw_today = function (date) {
 var formatDate_ymdw_today_2 = function (date) {
  // 输入 2020-02-04 19:33:00
  // 返回 2020年02月04日 周三
-  var date = getDate(date); 
+  var date1 = getDate(date.split('-').join('/')); 
-  var year = date.getFullYear()
+  var year = date1.getFullYear()
-  var month = date.getMonth() + 1
+  var month = date1.getMonth() + 1
-  var day = date.getDate()
+  var day = date1.getDate()
  var week = getWeekByDate_today_2(date)
  return year +"年" + month + "月" + day + "日" + " " + week
@@ -90,11 +91,14 @@ var formatDate_ymdw_today_interval = function(date1, date2){
  }
 }
-var formatDate_hm_interval = function (date1, date2) {
+var formatDate_hm_interval = function (date_start, date_end) {
  // 输入 2020-02-04 19:30:00, 2020-02-04 22:00:00
  // 返回 19:30 - 22:00
-  var date1 = getDate(date1); 
+  //console.log("===hm,date1", date1)
-  var date2 = getDate(date2); 
+  var date1 = getDate(date_start.split('-').join('/')); 
+  //console.log("===hm_after,date11", date11)
+  var date2 = getDate(date_end.split('-').join('/')); 
+  //console.log("===hm_after,date21", date21)
  var hm1 = formatNumber(date1.getHours()) + ":" +formatNumber(date1.getMinutes())
  var hm2 = formatNumber(date2.getHours()) + ":" +formatNumber(date2.getMinutes())
  if( hm1 == "00:00")
@@ -114,16 +118,20 @@ var formatDate_hm_interval = function (date1, date2) {
 var getWeekByDate_today = function (date) {
      // 变为星期几
      var show_day = ['星期日', '星期一', '星期二', '星期三', '星期四', '星期五', '星期六'];
-      var date = getDate(date);
+      var date1 = getDate(date.split('-').join('/'));
-      var day = date.getDay();
+      var day = date1.getDay();
      return show_day[day];
 }
 var getWeekByDate_today_2 = function (date) {
    // 变为周几
    var show_day = ['周日', '周一', '周二', '周三', '周四', '周五', '周六'];
-    var date = getDate(date);
+    var date1 = getDate(date.split('-').join('/'));
-    var day = date.getDay();
+    var day = date1.getDay();
+    console.log("===date",date)
+    console.log("===date_now",date1)
+    console.log("===day",day)
+    console.log("===show_day[day]",show_day[day])
    return show_day[day];
 }