nyx weapp: 页面优化, 数据优化

1. 添加活动地址

增值产品-小程序及app/nyx-master/pages/activity/activity-info/activity-info.js

-// pages/activity/activity-info/activity-info.js
+// pages/activity/activity-info/activity-info.js
@@ -52,6 +52,7 @@ Page({
       activityInfo['title'] = options.title;
       activityInfo['content'] = options.content;      
       activityInfo['like'] = options.like;
+      activityInfo['address_name'] = options.address_name;
       activityInfo['product_desc'] = options.product_desc;
       activityInfo['unit_price'] = options.unit_price;
       activityInfo['member_id'] = options.member_id;

增值产品-小程序及app/nyx-master/pages/activity/activity-info/activity-info.wxml

-<wxs module="tutil" src="./../../../utils/date.wxs"></wxs>
+<wxs module="tutil" src="./../../../utils/date.wxs"></wxs>
@@ -35,7 +35,7 @@
       <!-- 时间 -->
       <span>时间: {{tutil.formatDate_hm_interval(activityInfo.start_datetime, activityInfo.end_datetime)}}</span>
 
-      <span>地点: {{activityInfo.product_desc}}</span>
+      <span>地点: {{activityInfo.address_name}}</span>
     </view>
     <view class="note-content">
       内容: {{activityInfo.content}}

增值产品-小程序及app/nyx-master/pages/activity/activity.js

-// pages/activity/activity.js
+// pages/activity/activity.js
@@ -267,6 +267,7 @@ Page({
             result["content"] = res.data.data[i].content
             result["quiz"] = res.data.data[i].quiz
             result["point"] = res.data.data[i].point
+            result["address_name"] = res.data.data[i].addressName
             result["product_desc"] = res.data.data[i].productDesc
             result["unit_price"] = res.data.data[i].unitPrice
             result["note_image"] = res.data.data[i].noteImage.split("::")
@@ -282,7 +283,7 @@ Page({
               +"&content="+result["content"]
               +"&like="+result["num_like"]
               +"&quiz="+result["quiz"]
-              +"&point="+result["point"]
+              +"&point="+result["point"]              
               +"&member_id="+result["member_id"]
               +"&member_name="+result["member_name"]
               +"&member_slogan="+result["member_slogan"]
@@ -292,6 +293,7 @@ Page({
               +"&note_image="+res.data.data[i].noteImage //传递原始string数据, List不正确
               +"&title="+result["title"]
               +"&content="+result["content"]
+              +"&address_name="+result["address_name"]
               +"&like="+result["num_like"]
               +"&unit_price="+result["unit_price"]
               +"&product_desc="+result["product_desc"]

增值产品-小程序及app/nyx-master/pages/activity/activity.wxml

-<wxs module="tutil" src="./../../utils/date.wxs"></wxs>
+<wxs module="tutil" src="./../../utils/date.wxs"></wxs>
@@ -90,10 +90,7 @@
           <view style="display:flex; flex-direction: row; flex:1;align-items:center;">
           <span class="price">￥{{item.unit_price}}</span>
           <view style="display:flex; flex-direction: column; flex:1;align-items:center;">
-            <span class="date">{{tutil.formatDate_md_week(item.start_datetime)}}</span>
-            <block wx:if="{{item.end_datetime!=''}}" >
-              <span class="date">{{tutil.formatDate_md_week(item.end_datetime)}}</span>
-            </block>
+            <span class="date">{{tutil.formatDate_mdw_interval(item.start_datetime, item.end_datetime)}}</span>
           </view>
           </view>
         </block>

增值产品-小程序及app/nyx-master/utils/date.wxs

-var formatTime = function (date) {
+var formatTime = function (date) {
@@ -19,8 +19,8 @@ var formatDate_md = function (date) {
 
 var formatDate_md_week = function (date) {
   // 输入 2020-02-04 19:33:00
-  // 返回 02/04 周三
-  var str = date.toString().substring(5, 10).replace("_","/")
+  // 返回 02-04 周三
+  var str = date.toString().substring(5, 10)
   var week = getWeekByDate_today_2(date)
   return str + " " + week
 }
@@ -56,6 +56,25 @@ var formatDate_ymdw_today_2 = function (date) {
   return year +"年" + month + "月" + day + "日" + " " + week
 }
 
+var formatDate_mdw_interval = function(date1, date2){
+  // 输入 2020-02-04 19:30:00, 2020-02-05 22:00:00
+  // 返回 02-04 周一\n02-05 周二
+
+  // 输入 2020-02-04 19:30:00, 2020-02-04 22:00:00
+  // 返回 02-04 周一
+
+  var mdw1 = formatDate_md_week(date1);
+  var mdw2 = formatDate_md_week(date2);
+  if(date2 == "" || mdw1 == mdw2)
+  {
+    return mdw1
+  }
+  else
+  {
+    return mdw1 + "\n" + mdw2
+  }
+}
+
 var formatDate_ymdw_today_interval = function(date1, date2){
   // 输入 2020-02-04 19:30:00, 2020-02-04 22:00:00
   // 返回 2020年02月04日 周一 - 2020年02月05日 周二
@@ -173,5 +192,6 @@ formatAnswer: formatAnswer,
 formatDate_md_week: formatDate_md_week,
 formatNumberLike: formatNumberLike,
 formatDate_ymdw_today_interval: formatDate_ymdw_today_interval,
-formatDate_hm_interval: formatDate_hm_interval
+formatDate_hm_interval: formatDate_hm_interval,
+formatDate_mdw_interval: formatDate_mdw_interval
 }
\ No newline at end of file