Skip to content

N
nyx
Commit a6215ea6 by jscat
Options

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

1. 调整slogan的位置(如果超过多行之后会溢出)
2. 调整首页activity的布局, 每行显示
3. 调整我的活动页面的字体颜色
parent 35d9699b
正在显示 包含 376 行增加 和 198 行删除
增值产品-小程序及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">
<view class="note-column-left align justify">
<image class="writer-image" src="{{activityInfo.member_logo}}"/> <image class="writer-image" src="{{activityInfo.member_logo}}"/>
<view class="note-column"> </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>
...@@ -34,18 +34,19 @@ ...@@ -34,18 +34,19 @@
</view> </view>
<text>扫一扫</text> <text>扫一扫</text>
</view> </view>
<view class="items"> <!-- 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,44 +67,50 @@ ...@@ -66,44 +67,50 @@
</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
like
member_name 进店 >
-->
<!-- 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}}" > <navigator url="{{item.url}}" >
<view class="note-img"> <image class="writer-image" src="{{item.note_image[0]}}"/>
<image src="{{item.note_image[0]}}"/>
</view>
</navigator> </navigator>
<text>{{item.title}}</text> <view class="note-column">
</view> <navigator url="{{item.url}}" >
<!-- 作者信息 --> <!-- 商家信息 -->
<view class="note-handle"> {{item.title}}
<navigator class="writer" url="../activity/act-writer/act-writer"> <!-- 商品价格 -->
<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> </navigator>
<block wx:if="{{item.tag=='竞答'}}" > <!-- 活动点赞 -->
<span class="name">{{item.member_name}}</span> <!-- <span>{{tutil.formatNumberLike(item.num_like)}}</span> -->
</block> <!-- 商家名称 -->
<block wx:else> <view class="note-row align">
<view style="display:flex; flex-direction: row; flex:1;align-items:center;"> <view class="desc-member-left">{{item.member_name}}</view>
<span class="price">￥{{item.unit_price}}</span> <view class="desc-member-right">进店 ></view>
<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>
</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> </view>
</view> </view>
</scroll-view>
<!-- 加载更多 --> <!-- 加载更多 -->
<view class="weui-loadmore" hidden="{{isHideLoadMore}}"> <view class="weui-loadmore" hidden="{{isHideLoadMore}}">
<view class="weui-loading"></view> <view class="weui-loading"></view>
......
增值产品-小程序及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,8 +44,15 @@ ...@@ -44,8 +44,15 @@
</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">
<span>总价:</span>
</view>
<view class="note-column">
<view class="note-price-right">
￥{{item.total_price}}
</view>
</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} */
...@@ -263,15 +263,23 @@ ...@@ -263,15 +263,23 @@
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 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论