Skip to content

N
nyx
Commit a6215ea6 by jscat
Options

nyx weapp: 主流程更新(以活动为核心 0821) 

1. 调整slogan的位置(如果超过多行之后会溢出)
2. 调整首页activity的布局, 每行显示
3. 调整我的活动页面的字体颜色
parent 35d9699b
正在显示 包含 393 行增加 和 215 行删除
增值产品-小程序及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>
...@@ -44,8 +44,10 @@ ...@@ -44,8 +44,10 @@
<!-- 企业信息 --> <!-- 企业信息 -->
<view class="note-row"> <view class="note-row">
<image class="writer-image" src="{{activityInfo.member_logo}}"/> <view class="note-column-left align justify">
<view class="note-column"> <image class="writer-image" src="{{activityInfo.member_logo}}"/>
</view>
<view class="note-column" style="margin-right: 4%">
<span class="name">{{activityInfo.member_name}}</span> <span class="name">{{activityInfo.member_name}}</span>
<span class="name">{{activityInfo.member_slogan}}</span> <span class="name">{{activityInfo.member_slogan}}</span>
</view> </view>
......
增值产品-小程序及app/nyx-master/pages/activity/activity-info/activity-info.wxss
.scroll-view_H{ .scroll-view_H{
...@@ -94,10 +94,14 @@ ...@@ -94,10 +94,14 @@
flex-direction: column; flex-direction: column;
margin-left: 30rpx; margin-left: 30rpx;
} }
.note-column-left{
width : 120rpx;
margin-left: 5%;
display: flex;
}
.writer-image{ .writer-image{
width: 120rpx; width: 120rpx;
height: 120rpx; height: 120rpx;
margin-left: 5%;
} }
/* start bottom style */ /* start bottom style */
......
增值产品-小程序及app/nyx-master/pages/activity/activity.wxml
<wxs module="tutil" src="./../../utils/date.wxs"></wxs> <wxs module="tutil" src="./../../utils/date.wxs"></wxs>
...@@ -28,24 +28,25 @@ ...@@ -28,24 +28,25 @@
<view class="workbench"> <view class="workbench">
<view class="list"> <view class="list">
<view class="items">
<view bindtap="getQRCode">
<image src="../../icon/activity/scan.png"></image>
</view>
<text>扫一扫</text>
</view>
<view class="items"> <view class="items">
<view bindtap="getQRCode">
<image src="../../icon/activity/scan.png"></image>
</view>
<text>扫一扫</text>
</view>
<!-- todo 0820 以活动为主, 积分暂时也不实现 -->
<!-- <view class="items">
<navigator url="/pages/my/my-points/my-points"> <navigator url="/pages/my/my-points/my-points">
<image src="../../icon/activity/points.png"></image> <image src="../../icon/activity/points.png"></image>
</navigator> </navigator>
<text>积分</text> <text>积分</text>
</view> </view> -->
<!-- todo 0728 热销暂时也不实现 --> <!-- todo 0728 热销暂时也不实现 -->
<view class="items"> <view class="items">
<navigator url="/pages/my/my-orders/my-orders"> <navigator url="/pages/my/my-orders/my-orders">
<image src="../../icon/activity/order.png"></image> <image src="../../icon/activity/order.png"></image>
</navigator> </navigator>
<text>订单</text> <text>我的活动</text>
</view> </view>
<!-- jscat20200816 添加活动日历 for convinience --> <!-- jscat20200816 添加活动日历 for convinience -->
<view class="items"> <view class="items">
...@@ -66,43 +67,49 @@ ...@@ -66,43 +67,49 @@
</scroll-view> </scroll-view>
</view> </view>
<!-- 文章列表 --> <!-- 文章列表 -->
<scroll-view class="list-block" scroll-y="true" style="height:{{noteHeight}}px"> <!--
<!-- 文章封面内容 --> title
<view class="notes-block" wx:for="{{activities}}" wx:for-item="item" wx:key="{{index}}"> unit_price
<view class="note-info"> date
<navigator url="{{item.url}}" > like
<view class="note-img"> member_name 进店 >
<image src="{{item.note_image[0]}}"/>
</view>
</navigator>
<text>{{item.title}}</text>
</view>
<!-- 作者信息 -->
<view class="note-handle">
<navigator class="writer" url="../activity/act-writer/act-writer">
</navigator>
<block wx:if="{{item.tag=='竞答'}}" >
<span class="name">{{item.member_name}}</span>
</block>
<block wx:else>
<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_mdw_interval(item.start_datetime, item.end_datetime)}}</span>
</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>{{tutil.formatNumberLike(item.num_like)}}</span>
</view>
</view>
</view>
</scroll-view> -->
<!-- Content: refer to 有品·优惠券 + 点评(可使用) -->
<view class="coupon-list" wx:for="{{activities}}" wx:for-item="item" wx:key="{{index}}">
<view class="item stamp stamp01" style="192rpx;">
<!-- 商品信息 -->
<view class="note-row">
<navigator url="{{item.url}}" >
<image class="writer-image" src="{{item.note_image[0]}}"/>
</navigator>
<view class="note-column">
<navigator url="{{item.url}}" >
<!-- 商家信息 -->
{{item.title}}
<!-- 商品价格 -->
<span>
<view class="price-row">
<view class="sub-price">￥{{item.unit_price}}</view>
</view>
</span>
<!-- 活动日期 -->
<span class="desc">
{{tutil.formatDate_mdw_interval(item.start_datetime, item.end_datetime)}}
</span>
</navigator>
<!-- 活动点赞 -->
<!-- <span>{{tutil.formatNumberLike(item.num_like)}}</span> -->
<!-- 商家名称 -->
<view class="note-row align">
<view class="desc-member-left">{{item.member_name}}</view>
<view class="desc-member-right">进店 ></view>
</view>
</view>
</view>
</view>
</view>
<!-- 加载更多 --> <!-- 加载更多 -->
<view class="weui-loadmore" hidden="{{isHideLoadMore}}"> <view class="weui-loadmore" hidden="{{isHideLoadMore}}">
......
增值产品-小程序及app/nyx-master/pages/activity/activity.wxss
/* /*
...@@ -31,168 +31,222 @@ ...@@ -31,168 +31,222 @@
text-align: center; text-align: center;
font-size: 32rpx; font-size: 32rpx;
color: #9d9d9d; color: #9d9d9d;
margin-left: 30rpx;
} }
.navBar-box .cate-list.on { .navBar-box .cate-list.on {
color: #000000; color: #000000;
font-weight: bold; font-weight: bold;
} }
/* list-block -> note-block -> note-info */
.list-block{ .placeholder{
height:100%; margin: 0px;
display:flex; text-align: center;
box-sizing:border-box; vertical-align: middle;
flex-direction:column; line-height: 2.3em;
align-items:center; color: rgba(0,0,0);
justify-content:center;
} }
.notes-block{ /* justify-content: center;(水平居中) align-items: center;(垂直居中) */
width: 46%; .justify{
margin: 6px; justify-content: center;
background: #fff; }
border-radius: 5px; .align{
position: relative; align-items: center;
float: left; }
/* display: block; */ .border{
border: 3rpx solid #ccc;
border-radius: 0rpx;
padding: 10rpx;
}
.text{
font-size: 34rpx;
}
.selected{
color: #ff0000;
}
/* coupon css */
.coupon-list{width: 100%; margin: 0 auto}
.coupon-list .item{width: 100%; height: 300rpx;}
.coupon-list .item .float-li{width: 100%; height: 100%; border-right: 2rpx dashed rgba(255,255,255,.3)}
.coupon-list .item .float-li-right{width: 220rpx; padding-right: 20rpx; height:100%; color: #fff}
.coupon-left{position: relative}
.coupon-left .t{position: absolute; color: #fff}
.coupon-left .t1{width: 710rpx; display: flex; margin-left: 20rpx; margin-top: 20rpx; height: 160rpx; color: #fff}
.coupon-left .t1-left{width: 160rpx; font-size: 70rpx; font-weight: bold}
.coupon-left .t1-right{width: 520rpx; font-size: 50rpx; }
/* .coupon-left .t2{left: 20rpx; top:160rpx} */
.coupon-left .t2{width: 710rpx; display: flex; margin-left: 20rpx; margin-top: 0rpx; height: 50rpx; color: #fff}
.coupon-left .t2-left{width: 520rpx; }
.coupon-left .t2-right{width: 160rpx;}
.coupon-left .t3{width: 710rpx; display: flex; margin-left: 20rpx; margin-top: 0rpx; height: 50rpx; color: #fff}
.coupon-left .t3-left{width: 520rpx; }
.coupon-left .t3-right{width: 160rpx;}
.coupon-left .t3-right image{
width: 40rpx;
height: 40rpx;
font-size: 0;
}
.coupon-left .t4{width: 710rpx; display: flex; margin-left: 20rpx; margin-top: 0rpx; height: 50rpx; color: #fff}
.coupon-left .t4-left{width: 520rpx; }
.coupon-left .t4-right{width: 160rpx;}
.coupon-left .t4-right image{
width: 40rpx;
height: 40rpx;
font-size: 0;
} }
.note-info{ .coupon-right .t{text-align: center}
font-size: 34rpx; .coupon-right .t1{font-size: 40rpx; padding: 30rpx 0 10rpx 0;}
.coupon-right .t3{padding-top:20rpx}
.coupon-right .t3 text{background: #fff; color: #333; border-radius: 7rpx; padding: 10rpx 40rpx}
.note{background: #faeab7}
.stamp{position:relative;overflow:hidden}
.stamp i{position: absolute;left: 20%;top: 90rpx;height: 500rpx;width: 700rpx;background-color: rgba(255,255,255,.15);transform: rotate(-30deg);
} }
.stamp01{background:radial-gradient(rgba(0, 0, 0, 0) 0, rgba(0, 0, 0, 0) 30rpx, #F39B00 30rpx);background-size:10rpx 10rpx;background-position:9rpx 3rpx; background: #FFFFFF}
/*item title*/ /* 失效样式 */
.note-info text{ .stamp06{background:radial-gradient(rgba(0, 0, 0, 0) 0, rgba(0, 0, 0, 0) 30rpx, #e2e2e2 30rpx);background-size:10rpx 10rpx;background-position:9rpx 3rpx; background: #acacac
width: 100%;
overflow : hidden;
white-space: nowrap;
text-overflow: ellipsis;
display: inline-block;
word-break: break-all;
/* margin: 5px; */
} }
.note-img image{
/* start - 小程序自定义弹框css */
/* 遮罩层 */
.mask{
width: 100%; width: 100%;
height: 170px; height: 100%;
border-radius: 5px; position: fixed;
top: 0;
left: 0;
background: #000;
z-index: 9000;
opacity: 0.5;
} }
.note-handle{
/* 弹出层 */
.modalDlg{
width: 80%;
height: 540rpx;
position: fixed;
top: 240rpx;
left: 0;
right: 0;
z-index: 9999;
margin: 0 auto;
background-color: #fff;
border-radius:5px;
display: flex; display: flex;
flex-direction: row; flex-direction: column;
} align-items: center;
.name{
margin-left: 0px;
line-height: 38px;
font-size: 30rpx;
flex: 1;
} }
.price{
margin-left: 0px; /* 弹出层里面的图片 */
line-height: 38px;
font-size: 32rpx;
color: #FF6600; /* 弹出层里面的文字 */
font-weight: bold; .title{
display: flex;
font-size: 38rpx;
color: #cccccc;
width: 80%;
height: 80rpx;
padding: 20rpx;
align-items: center;
justify-content: center;
} }
.date{ .title-right{
font-size: 24rpx; display: flex;
margin-left: 10rpx; height: 80rpx;
margin-right: 10rpx; position: absolute;
align-items: center;
text-align: right;
font-size: 38rpx;
color: #cccccc;
padding: 20rpx;
right: 20rpx;
} }
.writer image{ .title-right image{
width: 30px; width: 50rpx;
height: 30px; height: 50rpx;
border-radius: 50%; font-size: 0;
} }
.like{
margin-right: 2px; /* 图片+文字 */
display: flex; .weui-width{
width: 80%;
} }
.like image{
width: 20px; .placeholder-modal{
height: 20px; margin: 0px;
margin: auto; text-align: center;
vertical-align: middle;
line-height: 2.3em;
background-color: #fff;
} }
.like span{
font-size: 30rpx; /* 好友助力积分列表 */
color: #9f9f9f; .list-point{
margin: auto; width: 100%;
} height: 2rpx;
background: #ccc;
/*搜索框 */ font-size: 32rpx;
.weui-search-bar {
position: relative;
padding: 8px 10px;
display: -webkit-box;
display: -webkit-flex;
display: flex; display: flex;
box-sizing: border-box; flex-direction: column;
background-color: #EFEFF4; /* align-items: center; */
border-top: 1rpx solid #D7D6DC; left: 40rpx;
border-bottom: 1rpx solid #D7D6DC;
}
.weui-icon-search {
margin-right: 4px;
font-size: inherit;
vertical-align: middle;
margin-top:0%;
} }
.weui-icon-search_in-box {
position: absolute; .list-point .text{
left: 10px; margin-left: 160rpx;
top: 0px;
vertical-align: middle;
margin-top:0%;
font-size: inherit;
} }
.weui-search-bar__text {
display: inline-block; .title-right image{
font-size: 16px; width: 50rpx;
height: 50rpx;
font-size: 0;
} }
.weui-search-bar__form {
position: relative; /* barcode券码查看 */
-webkit-box-flex: 1; .list-barcode{
-webkit-flex: auto;
flex: auto;
border-radius: 5px;
background: #FFFFFF;
border: 1rpx solid #E6E6EA;
}
.weui-search-bar__box {
position: relative;
padding-left: 30px;
padding-right: 30px;
width: 100%; width: 100%;
box-sizing: border-box; height: 2rpx;
z-index: 1; background: #ccc;
} font-size: 32rpx;
.weui-search-bar__input { display: flex;
height: 28px; flex-direction: column;
line-height: 28px; align-items: center;
font-size: 16px;
} }
.weui-search-bar__label {
position: absolute; .list-barcode .text{
top: 0; align-items: center;
right: 0; margin-left: 20rpx;
bottom: 0;
left: 0;
z-index: 2;
border-radius: 3px;
text-align: center;
color: #9B9B9B;
background: #FFFFFF;
line-height: 28px;
} }
.weui-search-bar__cancel-btn {
margin-left: 10px; .list-barcode image{
line-height: 28px; overflow: visible;
color: #09BB07; width: 300rpx;
white-space: nowrap; height: 300rpx;
} }
/* 弹出层里面的按钮 */
.ok{
width: 100%;
height: 2rpx;
background: #ccc;
text-align: center;
font-size: 38rpx;
color: #666666;
}
/* end - 小程序自定义弹框css */
/* 加载更多 */ /* start 加载更多 */
.weui-loading { .weui-loading {
margin: 0 5px; margin: 0 5px;
width: 20px; width: 20px;
...@@ -208,23 +262,125 @@ ...@@ -208,23 +262,125 @@
width: 65%; width: 65%;
margin: 1.5em auto; margin: 1.5em auto;
line-height: 1.6em; line-height: 1.6em;
font-size: 28rpx; font-size: 14px;
text-align: center; text-align: center;
} }
.weui-loadmore__tips { .weui-loadmore__tips {
display: inline-block; display: inline-block;
vertical-align: middle; vertical-align: middle;
} }
/* end 加载更多*/
.note-info{
width: 100%;
/* position: fixed; */
border-radius: 5rpx;
float: left;
margin-top: 20rpx;
margin-bottom: 20rpx;
}
.note-member{
display: flex;
font-size: 32rpx;
margin-left: 5%;
margin-right: 5%;
margin-top: 0;
text-align:justify;
vertical-align: center;
}
/*城市选择器 */ .note-member .member-left{width: 520rpx; flex:1}
/* start of citypicker */ .note-member .member-right{width: 160rpx;justify-content: flex-end;display: flex;}
.selecrtImg{ .note-member .member-right image{
float:right; width: 60rpx;
height: 60rpx;
font-size: 0;
}
.note-price{
color: #FF6600;
font-size: 16px;
margin-left: 5%;
margin-right: 5%;
margin-top: 0;
text-align:justify;
}
.note-content{
font-size: 16px;
/* 后期用于 '展开' 功能 */
/* overflow : hidden;
text-overflow: ellipsis;
display: -webkit-box;
-webkit-line-clamp: 4;
-webkit-box-orient: vertical; */
margin-left: 5%;
margin-right: 4%;
margin-top: 20rpx;
text-align:justify;
}
.note-row{
width: 100%;
display: flex;
flex-direction: row;
}
.note-column{
display: flex;
flex-direction: column;
margin-left: 30rpx;
margin-right: 30rpx;
width: 55%;
}
.writer-image{
width: 240rpx;
height: 240rpx;
margin-left: 30rpx;
margin-top: 10rpx; margin-top: 10rpx;
margin-right: 10rpx;
margin-left: 10rpx;
} }
/* end of citypicker */
.price-row{
display: flex;
flex-direction: row;
}
.sub-price{
color: #FF6600;
font-size: 34rpx;
margin-right: 5%;
margin-top: 0;
text-align:justify;
flex: 1;
font-weight: bold;
}
.sub-quantity{
display: flex;
font-size: 16px;
justify-content: flex-end;
}
/* refer to jd */
.desc {
font-size: 30rpx;
color: #a7a7a7;
}
.desc-member-left {
font-size: 30rpx;
color: #a7a7a7;
margin-right: 20rpx;
}
.desc-member-right {
font-size: 30rpx;
}
/* start of workbench*/ /* start of workbench*/
.workbench{ .workbench{
...@@ -282,3 +438,4 @@ ...@@ -282,3 +438,4 @@
} }
/* end of workbench*/ /* end of workbench*/
增值产品-小程序及app/nyx-master/pages/my/my-orders/my-orders.js
// pages/my/my-orders/my-orders.js // pages/my/my-orders/my-orders.js
...@@ -55,7 +55,7 @@ Page({ ...@@ -55,7 +55,7 @@ Page({
onLoad: function (options) { onLoad: function (options) {
var _this = this; var _this = this;
wx.setNavigationBarTitle({ wx.setNavigationBarTitle({
title: '我的订单', title: '我的活动',
}) })
//初始化数据 //初始化数据
......
增值产品-小程序及app/nyx-master/pages/my/my-orders/my-orders.wxml
<view class="page"> <view class="page">
...@@ -44,9 +44,16 @@ ...@@ -44,9 +44,16 @@
</view> </view>
</block> </block>
<view class="note-price" style="font-weight: bold"> <view class="note-row">
<span>总价: ￥{{item.total_price}}</span> <view class="note-price-left">
</view> <span>总价:</span>
</view>
<view class="note-column">
<view class="note-price-right">
￥{{item.total_price}}
</view>
</view>
</view>
</view> </view>
</view> </view>
......
增值产品-小程序及app/nyx-master/pages/my/my-orders/my-orders.wxss
.page{ .page{
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
.coupon-left{position: relative} .coupon-left{position: relative}
.coupon-left .t{position: absolute; color: #fff} .coupon-left .t{position: absolute; color: #fff}
.coupon-left .t1{width: 710rpx; display: flex; margin-left: 20rpx; margin-top: 20rpx; height: 160rpx; color: #fff} .coupon-left .t1{width: 710rpx; display: flex; margin-left: 20rpx; margin-top: 20rpx; height: 160rpx; color: #fff}
.coupon-left .t1-left{width: 160rpx; font-size: 70rpx; font-weight: bold} .coupon-left .t1-left{width: 160rpx; font-size: 70rpx;}
.coupon-left .t1-right{width: 520rpx; font-size: 50rpx; } .coupon-left .t1-right{width: 520rpx; font-size: 50rpx; }
/* .coupon-left .t2{left: 20rpx; top:160rpx} */ /* .coupon-left .t2{left: 20rpx; top:160rpx} */
...@@ -262,16 +262,24 @@ ...@@ -262,16 +262,24 @@
height: 60rpx; height: 60rpx;
font-size: 0; font-size: 0;
} }
.note-price{ /* 左边: 总价 */
color: #FF6600; .note-price-left{
color: #000;
font-size: 16px; font-size: 16px;
margin-left: 5%; margin-left: 5%;
margin-right: 5%; width: 120rpx;
}
/* 右边: 具体价格 */
.note-price-right{
color: #000;
font-size: 16px;
margin-top: 0; margin-top: 0;
text-align:justify; font-weight: bold;
} }
.note-content{ .note-content{
font-size: 16px; font-size: 16px;
...@@ -313,7 +321,7 @@ ...@@ -313,7 +321,7 @@
} }
.sub-price{ .sub-price{
color: #FF6600; color: #666;
font-size: 16px; font-size: 16px;
margin-right: 5%; margin-right: 5%;
margin-top: 0; margin-top: 0;
......
增值产品-小程序及app/nyx-master/pages/my/my.wxml
<view class="page"> <view class="page">
...@@ -23,18 +23,19 @@ ...@@ -23,18 +23,19 @@
</view> </view>
<view class="weui-cells"> <view class="weui-cells">
<navigator class="weui-cell weui-cell_access" hover-class="weui-cell_active" url="/pages/my/my-points/my-points"> <!-- todo 0820 以活动为主, 积分暂时也不实现 -->
<!-- <navigator class="weui-cell weui-cell_access" hover-class="weui-cell_active" url="/pages/my/my-points/my-points">
<view class="weui-cell__hd"> <view class="weui-cell__hd">
<image src="/icon/activity/points.png" /> <image src="/icon/activity/points.png" />
</view> </view>
<view class="weui-cell__bd">我的积分</view> <view class="weui-cell__bd">我的积分</view>
<view class="weui-cell__ft weui-cell__ft_in-access"></view> <view class="weui-cell__ft weui-cell__ft_in-access"></view>
</navigator> </navigator> -->
<navigator class="weui-cell weui-cell_access" hover-class="weui-cell_active" url="/pages/my/my-orders/my-orders"> <navigator class="weui-cell weui-cell_access" hover-class="weui-cell_active" url="/pages/my/my-orders/my-orders">
<view class="weui-cell__hd"> <view class="weui-cell__hd">
<image src="/icon/my/activity.png" /> <image src="/icon/my/activity.png" />
</view> </view>
<view class="weui-cell__bd">我的预订</view> <view class="weui-cell__bd">我的活动</view>
<view class="weui-cell__ft weui-cell__ft_in-access"></view> <view class="weui-cell__ft weui-cell__ft_in-access"></view>
</navigator> </navigator>
<!-- 只针对member商家开放 --> <!-- 只针对member商家开放 -->
......
增值产品-小程序及app/nyx-master/utils/date.wxs
var formatTime = function (date) { var formatTime = function (date) {
...@@ -22,7 +22,6 @@ var formatDate_md_week = function (date) { ...@@ -22,7 +22,6 @@ var formatDate_md_week = function (date) {
// 返回 02-04 周三 // 返回 02-04 周三
var str = date.toString().substring(5, 10) var str = date.toString().substring(5, 10)
var week = getWeekByDate_today_2(date) var week = getWeekByDate_today_2(date)
console.log("===week",week)
return str + " " + week return str + " " + week
} }
...@@ -73,7 +72,7 @@ var formatDate_mdw_interval = function(date1, date2){ ...@@ -73,7 +72,7 @@ var formatDate_mdw_interval = function(date1, date2){
} }
else else
{ {
return mdw1 + "\n" + mdw2 return mdw1 + " - " + mdw2
} }
} }
...@@ -95,11 +94,8 @@ var formatDate_ymdw_today_interval = function(date1, date2){ ...@@ -95,11 +94,8 @@ var formatDate_ymdw_today_interval = function(date1, date2){
var formatDate_hm_interval = function (date_start, date_end) { var formatDate_hm_interval = function (date_start, date_end) {
// 输入 2020-02-04 19:30:00, 2020-02-04 22:00:00 // 输入 2020-02-04 19:30:00, 2020-02-04 22:00:00
// 返回 19:30 - 22:00 // 返回 19:30 - 22:00
//console.log("===hm,date1", date1)
var date1 = getDate(date_start.split('-').join('/')); var date1 = getDate(date_start.split('-').join('/'));
//console.log("===hm_after,date11", date11)
var date2 = getDate(date_end.split('-').join('/')); var date2 = getDate(date_end.split('-').join('/'));
//console.log("===hm_after,date21", date21)
var hm1 = formatNumber(date1.getHours()) + ":" +formatNumber(date1.getMinutes()) var hm1 = formatNumber(date1.getHours()) + ":" +formatNumber(date1.getMinutes())
var hm2 = formatNumber(date2.getHours()) + ":" +formatNumber(date2.getMinutes()) var hm2 = formatNumber(date2.getHours()) + ":" +formatNumber(date2.getMinutes())
if( hm1 == "00:00") if( hm1 == "00:00")
...@@ -129,10 +125,6 @@ var getWeekByDate_today_2 = function (date) { ...@@ -129,10 +125,6 @@ var getWeekByDate_today_2 = function (date) {
var show_day = ['周日', '周一', '周二', '周三', '周四', '周五', '周六']; var show_day = ['周日', '周一', '周二', '周三', '周四', '周五', '周六'];
var date1 = getDate(date.split('-').join('/')); var date1 = getDate(date.split('-').join('/'));
var day = date1.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]; return show_day[day];
} }
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论