Commit 15f1e2d6 by jscat

nyx weapp: 功能调整

1. 主要调整activity.wxml 和 activity-info.wxml 页面的数据展示
parent 4647c4f5
//config.js API全局域名配置
//config.js API全局域名配置
//config.js API全局域名配置
var prod = 0; //阿里云服务器生产版本
var local = 0; //本地java测试,需要启动java 后台
var test = 1; //阿里云服务器测试版本
var local = 1; //本地java测试,需要启动java 后台
var test = 0; //阿里云服务器测试版本
var debug = 0; //是否打印调试信息
var host_key = "https://fun.hisuhong.com";
......
// pages/activity/activity-info/activity-info.js
// pages/activity/activity-info/activity-info.js
......@@ -53,10 +53,12 @@ Page({
activityInfo['content'] = options.content;
activityInfo['like'] = options.like;
activityInfo['product_desc'] = options.product_desc;
activityInfo['unit_price'] = options.price;
activityInfo['unit_price'] = options.unit_price;
activityInfo['member_id'] = options.member_id;
activityInfo['member_name'] = options.member_name;
activityInfo['member_slogan'] = options.member_slogan;
activityInfo['start_datetime'] = options.start_datetime;
activityInfo['end_datetime'] = options.end_datetime;
activityInfo['member_logo'] = options.member_logo==""?'/icon/icon_avatar1.png':options.member_logo;
}
......
<view class="page">
<wxs module="tutil" src="./../../../utils/date.wxs"></wxs>
<wxs module="tutil" src="./../../../utils/date.wxs"></wxs>
<view class="page">
<!-- 图片 -->
......@@ -23,11 +25,20 @@
</view>
</view>
<view class="note-content">
{{activityInfo.title}} {{activityInfo.product_desc}}
<view class="note-content" style="display: flex; flex-direction: column">
<span>主题: {{activityInfo.title}}</span>
<span>类别: {{activityInfo.product_desc}}</span>
<!-- 日期 -->
<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>地点: {{activityInfo.product_desc}}</span>
</view>
<view class="note-content">
{{activityInfo.content}}
内容: {{activityInfo.content}}
</view>
</view>
......@@ -40,6 +51,8 @@
</view>
</view>
<view class="bottom_placeholder"></view>
<!-- start bottom-->
<!-- refer to https://www.jb51.net/article/129438.htm -->
<view class="bottom_total">
......
.scroll-view_H{
.scroll-view_H{
......@@ -115,13 +115,20 @@
height: 2rpx;
background: lightgray;
}
.bottom_placeholder {
position: relative;
width: 100%;
height: 160rpx;
line-height: 10rpx;
}
.bottom_total {
position: fixed;
display: flex;
flex-direction: column;
bottom: 0;
width: 100%;
height: 180rpx;
height: 160rpx;
line-height: 10rpx;
background: white;
}
......
// pages/activity/activity.js
// pages/activity/activity.js
......@@ -268,8 +268,13 @@ Page({
result["quiz"] = res.data.data[i].quiz
result["point"] = res.data.data[i].point
result["product_desc"] = res.data.data[i].productDesc
result["price"] = res.data.data[i].price
result["unit_price"] = res.data.data[i].unitPrice
result["note_image"] = res.data.data[i].noteImage.split("::")
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
var url_quiz = "../activity/quiz-info/quiz-info?"
+"&activity_id="+result["activity_id"]
+"&note_image="+res.data.data[i].noteImage //传递原始string数据, List不正确
......@@ -288,12 +293,14 @@ Page({
+"&title="+result["title"]
+"&content="+result["content"]
+"&like="+result["num_like"]
+"&price="+result["price"]
+"&unit_price="+result["unit_price"]
+"&product_desc="+result["product_desc"]
+"&member_id="+result["member_id"]
+"&member_name="+result["member_name"]
+"&member_slogan="+result["member_slogan"]
+"&member_logo="+result["member_logo"]
+"&member_logo="+result["member_logo"]
+"&start_datetime="+result["start_datetime"]
+"&end_datetime="+result["end_datetime"]
result["url"] = result["tag"]=='竞答'? url_quiz : url_activity
list.push(result)
}
......
<view class="page">
<wxs module="tutil" src="./../../utils/date.wxs"></wxs>
<wxs module="tutil" src="./../../utils/date.wxs"></wxs>
<view class="page">
<!-- 搜索框 -->
<!--refer https://blog.csdn.net/weixin_44022446/article/details/86438015 -->
......@@ -44,7 +46,14 @@
<image src="../../icon/activity/order.png"></image>
</navigator>
<text>订单</text>
</view>
</view>
<!-- jscat20200816 添加活动日历 for convinience -->
<view class="items">
<navigator url="/pages/member/schedule/schedule">
<image src="../../icon/member/schedule.png"></image>
</navigator>
<text>活动日历</text>
</view>
</view>
</view>
......@@ -78,11 +87,19 @@
<span class="name">{{item.member_name}}</span>
</block>
<block wx:else>
<span class="price">¥{{item.price}}</span>
<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>
</view>
</view>
</block>
<view class="like" bindtap="onSubmitLike" data-post-id="{{item.post_id}}">
<image class="like-icon" src="../../icon/activity/like.png" style="width:30rpx;height:30rpx"/>
<span>{{item.num_like}}</span>
<span>{{tutil.formatNumberLike(item.num_like)}}</span>
</view>
</view>
</view>
......
/*
/*
......@@ -92,8 +92,13 @@
font-size: 32rpx;
color: #FF6600;
font-weight: bold;
flex : 1;
}
.date{
font-size: 24rpx;
margin-left: 10rpx;
margin-right: 10rpx;
}
.writer image{
width: 30px;
height: 30px;
......
var formatTime = function (date) {
var formatTime = function (date) {
......@@ -17,6 +17,14 @@ var formatDate_md = function (date) {
return str
}
var formatDate_md_week = function (date) {
// 输入 2020-02-04 19:33:00
// 返回 02/04 周三
var str = date.toString().substring(5, 10).replace("_","/")
var week = getWeekByDate_today_2(date)
return str + " " + week
}
var formatDate_ymd = function (date) {
// 输入 2020-02-04 19:33:00
// 返回 2020-02-04
......@@ -26,7 +34,7 @@ var formatDate_ymd = function (date) {
var formatDate_ymdw_today = function (date) {
// 输入 2020-02-04 19:33:00
// 返回 2020年02月04日
// 返回 2020年02月04日 星期三
var date = getDate(date);
var year = date.getFullYear()
var month = date.getMonth() + 1
......@@ -36,23 +44,97 @@ var formatDate_ymdw_today = function (date) {
return year +"年" + month + "月" + day + "日" + " " + week
}
var formatDate_ymdw_today_2 = function (date) {
// 输入 2020-02-04 19:33:00
// 返回 2020年02月04日 周三
var date = getDate(date);
var year = date.getFullYear()
var month = date.getMonth() + 1
var day = date.getDate()
var week = getWeekByDate_today_2(date)
return year +"年" + month + "月" + day + "日" + " " + week
}
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日 周二
var ymdw1 = formatDate_ymdw_today_2(date1);
var ymdw2 = formatDate_ymdw_today_2(date2);
if(date2 == "" || ymdw1 == ymdw2)
{
return ymdw1
}
else
{
return ymdw1 + " - " + ymdw2
}
}
var formatDate_hm_interval = function (date1, date2) {
// 输入 2020-02-04 19:30:00, 2020-02-04 22:00:00
// 返回 19:30 - 22:00
var date1 = getDate(date1);
var date2 = getDate(date2);
var hm1 = formatNumber(date1.getHours()) + ":" +formatNumber(date1.getMinutes())
var hm2 = formatNumber(date2.getHours()) + ":" +formatNumber(date2.getMinutes())
if( hm1 == "00:00")
{
return "全天"
}
else if( hm1 == hm2)
{
return hm1
}
else
{
return hm1 + " - " + hm2
}
}
var getWeekByDate_today = function (date) {
//数日
var show_day = ['星期日', '星期一', '星期二', '星期三', '星期四', '星期五', '星期六'];
// 变为星期几
var show_day = ['星期日', '星期一', '星期二', '星期三', '星期四', '星期五', '星期六'];
var date = getDate(date);
var day = date.getDay();
return show_day[day];
}
var getWeekByDate_today_2 = function (date) {
// 变为周几
var show_day = ['周日', '周一', '周二', '周三', '周四', '周五', '周六'];
var date = getDate(date);
var day = date.getDay();
return show_day[day];
}
var formatNumber = function(n) {
n = n.toString()
return n[1] ? n : '0' + n
// 输入 8
// 返回 08
n = n.toString()
return n[1] ? n : '0' + n
}
var toFix = function (value) {
return value*100 //此处由小数0.25变成25
}
var formatNumberLike = function (value) {
// 输入 1132
// 返回 1.1k
var num = value
if(num >= 100000)
{
num = "100k"
}
else if(num >= 1000)
{
num = value / 1000
num = num.toFixed(1) + "k"
}
return num
}
//jscat 2020/03/03 将数字1234转为ABCD
var formatAnswer = function (n) {
answer = ""
......@@ -82,9 +164,14 @@ var formatAnswer = function (n) {
module.exports = {
formatDate_ymd: formatDate_ymd,
formatDate_ymdw_today: formatDate_ymdw_today,
formatDate_ymdw_today_2: formatDate_ymdw_today_2,
formatDate_md: formatDate_md,
formatTime: formatTime,
formatNumber: formatNumber,
toFix: toFix,
formatAnswer: formatAnswer
formatAnswer: formatAnswer,
formatDate_md_week: formatDate_md_week,
formatNumberLike: formatNumberLike,
formatDate_ymdw_today_interval: formatDate_ymdw_today_interval,
formatDate_hm_interval: formatDate_hm_interval
}
\ No newline at end of file
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论