Skip to content

N
nyx
Commit 22a10ea7 by jscat
Options

nyx weapp: integration from nyx-dev 

1. 新增园区和夜市功能
2. 新增活动类型字段
3. 统一community/fair的变量为entity
4. 解决集市页面(fair.wxml)当集市名称超过7的字符之后溢出的问题
5. 为活动类型添加checkField操作
parent 5ce9673d
正在显示 包含 550 行增加 和 94 行删除
增值产品-小程序及app/nyx-master/app.js
//app.js
//app.js
......@@ -67,6 +67,7 @@ App({
photoTitle: "",
photoContent: "",
photoProduct: [],
photoCbs: [],
startDatetime: "",
endDatetime: "",
......@@ -77,6 +78,7 @@ App({
defaultCity: '上海',
defaultCounty: '静安区',
citySwitched: 0,
},
......
增值产品-小程序及app/nyx-master/app.json
{
{
{
"pages": [
"pages": [
"pages/activity/activity",
"pages/community/community",
"pages/fair/fair",
"pages/mall/order/order",
"pages/activity/activity-list/activity-list",
"pages/my/my-members/my-members",
......@@ -35,16 +37,28 @@
"list": [
{
"pagePath": "pages/activity/activity",
"text": "活动",
"text": "饮事",
"iconPath": "./icon/my/activity.png",
"selectedIconPath": "./icon/my/activity.png"
},
{
"pagePath": "pages/fair/fair",
"text": "集市",
"iconPath": "./icon/fair/fair.png",
"selectedIconPath": "./icon/fair/fair.png"
},
{
"pagePath": "pages/member/activity-post/activity-post",
"text": "添加",
"iconPath": "./icon/add.png",
"selectedIconPath": "./icon/add.png"
},
},
{
"pagePath": "pages/community/community",
"text": "园区",
"iconPath": "./icon/community/community.png",
"selectedIconPath": "./icon/community/community.png"
},
{
"pagePath": "pages/my/my",
"text": "个人",
......
增值产品-小程序及app/nyx-master/config.js
//config.js API全局域名配置
//config.js API全局域名配置
......@@ -3,7 +3,7 @@
// env = 0; //本地java测试，需要启动java后台
// env = 1; //阿里云服务器测试版本
// env = 2; //阿里云服务器生产版本
var env = 2;
var env = 1;
var debug = 0; //是否打印调试信息
var host_key = "https://fun.hisuhong.com";
......@@ -51,6 +51,7 @@ var config={
notes_query_url: host_key + "/api/nyx/post/query",
activity_query_url: host_key + "/api/nyx/activity/query",
activity_period_query_url: host_key + "/api/nyx/activity/query/period",
activity_stat_query_url: host_key + "/api/nyx/activity/stat/query",
order_detail_query_url: host_key + "/api/nyx/order/detail/query",
order_add_url: host_key + "/api/nyx/add/order",
match_query_url: host_key + "/api/nyx/match/query",
......
增值产品-小程序及app/nyx-master/pages/activity/activity-list/activity-list.js
// pages/member/activity-post/activity-edit/activity-edit.js
// pages/member/activity-post/activity-edit/activity-edit.js
......@@ -25,6 +25,8 @@ Page({
// 城市模块
city: "",
entityName: "",
activityType: "",
// 分页加载部分
stride: 0,
......@@ -75,10 +77,17 @@ Page({
}
var city = app.globalData.defaultCity
var entityName = ""
var activityType = ""
if (options.city != "" && options.city != undefined )
{
city = options.city;
}
else if(options.entityName != "" && options.entityName != undefined)
{
entityName = options.entityName
activityType = options.activityType
}
wx.setNavigationBarTitle({
title: '活动列表',
......@@ -96,9 +105,11 @@ Page({
curDate: curDate,
endDate: endDate,
city: city,
entityName: entityName,
activityType: activityType,
});
_this.getActivitiesByPeriod(0, 1, stride, city, curDate, endDate);
_this.getActivitiesByPeriod(0, 1, stride, city, entityName, activityType, curDate, endDate);
}
......@@ -149,7 +160,9 @@ Page({
console.log('页面上拉触底')
var _this = this;
// var curIndex = _this.__data__.curIndex
// var strSearch = _this.__data__.category[curIndex].name
var city = _this.__data__.city
var entityName = _this.__data__.entityName
var activityType = _this.__data__.activityType
var isHideLoadMore = _this.__data__.isHideLoadMore;
var pageIndex = _this.__data__.pageIndex;
var stride = _this.__data__.stride;
......@@ -161,8 +174,7 @@ Page({
console.log('加载更多')
setTimeout(() => {
_this.getActivities(1, pageIndex, 4, strSearch);
_this.getActivitiesByPeriod(1, pageIndex, stride, city, curDate, endDate);
_this.getActivitiesByPeriod(1, pageIndex, stride, city, entityName, activityType, curDate, endDate);
}, 1000)
var bisHideLoadMoreType = true;
_this.setData({
......@@ -186,10 +198,10 @@ Page({
搜索逻辑:
1. 按照address_name和beginDate, endDate联合查询
*/
getActivitiesByPeriod : function (scrollType, pageNum, pageCount, city, beginDate, endDate) {
getActivitiesByPeriod : function (scrollType, pageNum, pageCount, city, entityName, activityType, beginDate, endDate) {
var _this = this;
var query_url = '&city=' + city + '&beginDate=' + beginDate + '&endDate=' + endDate
var query_url = '&city=' + city + '&title=' + entityName + '&activityType=' + activityType + '&entityName=' + entityName + '&beginDate=' + beginDate + '&endDate=' + endDate
var strUrl = config.activity_period_query_url + "?pageCount=" + pageCount
+ "&pageNum=" + pageNum + query_url
......
增值产品-小程序及app/nyx-master/pages/activity/activity-list/activity-list.wxml
<!-- /page/post/edit/edit 添加分类的特点，以及自定义特点 -->
<!-- /page/post/edit/edit 添加分类的特点，以及自定义特点 -->
......@@ -4,13 +4,15 @@
<view class="page" style="height:100%;width:100%">
<view class="weui-search-bar">
<!-- <text>{{city}}</text>
<image src='../../../icon/down.png' style='width: 32rpx;height: 32rpx;' class='selecrtImg'></image> -->
<navigator url="../../switchcity/switchcity?city={{city}}&type=list">
<text>{{city}}</text>
<image src='../../../icon/down.png' style='width: 32rpx;height: 32rpx;' class='selecrtImg'></image>
</navigator>
<block wx:if="{{strSearch!=''}}">
<text>{{strSearch}}</text>
</block>
<block wx:else>
<navigator url="../../switchcity/switchcity?city={{city}}&type=list">
<text>{{city}}</text>
<image src='../../../icon/down.png' style='width: 32rpx;height: 32rpx;' class='selecrtImg'></image>
</navigator>
</block>
<view class="list-activity-number">
<label>
本周活动: {{num_activities-1}}场
......
增值产品-小程序及app/nyx-master/pages/activity/activity.js
// pages/activity/activity.js
// pages/activity/activity.js
......@@ -57,18 +57,22 @@ Page({
//二维码信息
qRCodeMsg: "",
//活动类型
activityType: "00-饮事",
},
switchCategory(e) {
var _this = this;
var curIndex = e.currentTarget.dataset.index ? e.currentTarget.dataset.index : 0
var strCity = _this.__data__.city
var strCategory = _this.__data__.category[curIndex].order
var strSearch = _this.__data__.strSearch
var curIndex = e.currentTarget.dataset.index ? e.currentTarget.dataset.index : 0
var strCity = _this.__data__.city
var strCategory = _this.__data__.category[curIndex].order
var strSearch = _this.__data__.strSearch
var activityType = _this.__data__.activityType
this.setData({
curIndex: curIndex,
})
_this.getActivities(0, 1, 4, strCity, strCategory, strSearch);
_this.getActivities(0, 1, 4, strCity, activityType, strCategory, strSearch);
},
// 搜索点击事件
entrySearch(e) {
......@@ -189,12 +193,13 @@ Page({
var strCity = _this.__data__.city
var strCategory = _this.__data__.category[curIndex].order
var strSearch = _this.__data__.strSearch
var activityType = _this.__data__.activityType
this.setData({
curIndex: curIndex,
});
app.globalData.switchId = ""
_this.getActivities(0, 1, 4, strCity, strCategory, strSearch);
_this.getActivities(0, 1, 4, strCity, activityType, strCategory, strSearch);
}
......@@ -291,6 +296,8 @@ Page({
var strCity = _this.__data__.city
var strCategory = _this.__data__.category[curIndex].order
var strSearch = _this.__data__.strSearch
var activityType = _this.__data__.activityType
var isHideLoadMore = _this.__data__.isHideLoadMore;
var pageIndex = _this.__data__.pageIndex;
......@@ -301,7 +308,7 @@ Page({
console.log('加载更多')
setTimeout(() => {
_this.getActivities(1, pageIndex, 4, strCity, strCategory, strSearch);
_this.getActivities(1, pageIndex, 4, strCity, activityType, strCategory, strSearch);
}, 1000)
}
else {
......@@ -328,12 +335,13 @@ Page({
2. tab, tag=strSearch
3. 新增的search tab, '搜索'tab的时候，需要转换为搜索的关键词(_this.__data__.strSearch)
*/
getActivities: function (scrollType, pageNum, pageCount, strCity, strCategory, strSearch) {
getActivities: function (scrollType, pageNum, pageCount, strCity, activityType, strCategory, strSearch) {
var _this = this;
// 如果是"推荐"和"搜索"，需要单独处理
// '搜索'tab的时候, 需要转换为搜索的关键词(_this.__data__.strSearch)
var query_url = '&title=' + strSearch + '&orderType=' + strCategory + '&city=' + strCity
+ '&activityType=' + activityType
var strUrl = config.activity_query_url + "?pageCount=" + pageCount
+ "&pageNum=" + pageNum + query_url
......@@ -438,6 +446,7 @@ Page({
var curIndex = _this.__data__.curIndex
var strCity = _this.__data__.city
var strCategory = _this.__data__.category[curIndex].order
var activityType = _this.__data__.activityType
var strSearch = ""
this.setData({
......@@ -445,7 +454,7 @@ Page({
inputShowed: false,
});
_this.getActivities(0, 1, 4, strCity, strCategory, strSearch);
_this.getActivities(0, 1, 4, strCity, activityType, strCategory, strSearch);
},
// * 删除输入字符串
......@@ -462,8 +471,9 @@ Page({
var curIndex = _this.__data__.curIndex
var strCity = _this.__data__.city
var strCategory = _this.__data__.category[curIndex].order
var activityType = _this.__data__.activityType
console.log("===input search text_" + strSearch)
_this.getActivities(0, 1, 4, strCity, strCategory, strSearch);
_this.getActivities(0, 1, 4, strCity, activityType, strCategory, strSearch);
_this.setData({
strSearch: strSearch,
......@@ -597,7 +607,8 @@ Page({
var curIndex = _this.__data__.curIndex
var strCategory = _this.__data__.category[curIndex].order
var strSearch = _this.__data__.strSearch
_this.getActivities(0, 1, 4, strCity, strCategory, strSearch);
var activityType = _this.__data__.activityType
_this.getActivities(0, 1, 4, strCity, activityType, strCategory, strSearch);
},
......
增值产品-小程序及app/nyx-master/pages/activity/activity.wxml
<wxs module="tutil" src="./../../utils/date.wxs"></wxs>
<wxs module="tutil" src="./../../utils/date.wxs"></wxs>
......@@ -67,7 +67,7 @@
<navigator url="/pages/my/my-orders/my-orders">
<image src="../../icon/activity/order.png" style="margin-top:10rpx; margin-bottom:-10rpx"></image>
</navigator>
<text>我的预订</text>
<text style="font-size:28rpx;">我的预订</text>
</view>
</view>
......
增值产品-小程序及app/nyx-master/pages/community/community.json 0 → 100644
{
{
"usingComponents": {}
}
\ No newline at end of file
增值产品-小程序及app/nyx-master/pages/community/community.wxml 0 → 100644
<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 -->
<!-- 2020/07/17 jscat 微信小程序城市选择及搜索功能的方法-->
<!-- refer https://www.jb51.net/article/158292.htm -->
<!-- refer https://github.com/cinoliu/-selectCity -->
<view class="weui-search-bar">
<picker mode="selector" range="{{entities}}" value="{{curEntity}}" bindchange="onEntityPicker" class='address_member'>
<text>{{tutil.formatSubString(entities[curEntity],7)}}</text>
<image src='../../icon/down.png' style='width: 40rpx;height: 40rpx;' class='selecrtImg'></image>
</picker>
<view class="weui-search-bar__form">
<view class="weui-search-bar__box">
<icon class="weui-icon-search_in-box" type="search" size="16"></icon>
<input type="text" class="weui-search-bar__input" placeholder="发现{{entities[curEntity]}}" value="{{inputVal}}" focus="{{inputShowed}}" bindconfirm="startSearch" />
<view class="weui-icon-clear" wx:if="{{inputVal.length > 0}}" bindtap="clearInput">
<icon type="clear" size="16"></icon>
</view>
</view>
<label class="weui-search-bar__label" hidden="{{inputShowed}}" bindtap="showInput">
<icon class="weui-icon-search" type="search" size="16"></icon>
<view class="weui-search-bar__text">发现{{tutil.formatSubString(entities[curEntity],7)}}·感兴趣的活动</view>
</label>
</view>
<view class="weui-search-bar__cancel-btn" hidden="{{!inputShowed}}" bindtap="hideInput">取消
</view>
</view>
<view class="workbench">
<view class="list">
<!-- jscat todo 0828 以用户为主, 扫一扫暂时也不实现 -->
<!-- <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">
<image src="../../icon/activity/points.png"></image>
</navigator>
<text>积分</text>
</view> -->
<!-- todo 0728 热销暂时也不实现 -->
<!-- jscat20200816 添加活动日历 for convinience -->
<block>
<view class="items">
<navigator url="/pages/activity/activity-list/activity-list?entityName={{entities[curEntity]}}&activityType={{activityType}}">
<image src="../../icon/member/schedule.png" style="margin-top:10rpx; margin-bottom:-10rpx"></image>
<text style="font-size:28rpx;">本周活动: {{entityInfos[curEntity].num_activity}}场</text>
</navigator>
</view>
</block>
<block wx:if="{{entityInfos[curEntity].num_entity > 1}}">
<view class="items">
<image src="../../icon/community/community.png" style="margin-top:10rpx; margin-bottom:-10rpx"></image>
<text style="font-size:28rpx;">园区: {{entityInfos[curEntity].num_entity}}个</text>
</view>
</block>
<view class="items">
<image src="../../icon/activity/like.png" style="margin-top:10rpx; margin-bottom:-10rpx"></image>
<text style="font-size:28rpx;">热度: {{entityInfos[curEntity].num_like}}点</text>
</view>
</view>
</view>
<!-- 导航栏 -->
<view class="navBar" >
<scroll-view class="navBar-box" scroll-x="true" style="white-space: nowrap; display:flex ">
<view class="cate-list {{curIndex==index?'on':''}}" wx:for="{{category}}"
wx:key="{{item.id}}" data-id="{{item.id}}" data-index="{{index}}"
bindtap="switchCategory">{{item.name}}</view>
</scroll-view>
</view>
<!-- 文章列表 -->
<!--
title
unit_price
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}}&num_like={{item.num_like}}' >
<image class="writer-image" src="{{item.note_image[0]}}"/>
</navigator>
<view class="note-column">
<navigator url='{{item.url}}&num_like={{item.num_like}}' >
<!-- 商家信息 -->
<text>{{item.title}}</text>
<!-- 商品价格 -->
<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>
<!-- todo 店铺功能尚未实现 -->
<!-- <view class="desc-member-right">进店 ></view> -->
</view>
</view>
</view>
</view>
</view>
<!-- 加载更多 -->
<view class="weui-loadmore" hidden="{{isHideLoadMore}}">
<view class="weui-loading"></view>
<view class="weui-loadmore__tips">正在加载</view>
</view>
<view class="weui-loadmore" hidden="{{!isHideLoadMore}}">
<view class="weui-loadmore__tips">没有更多啦 {{'>'}}_{{'<'}} </view>
</view>
</view>
增值产品-小程序及app/nyx-master/pages/fair/fair.json 0 → 100644
{
{
"usingComponents": {}
}
\ No newline at end of file
增值产品-小程序及app/nyx-master/pages/fair/fair.wxml 0 → 100644
<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 -->
<!-- 2020/07/17 jscat 微信小程序城市选择及搜索功能的方法-->
<!-- refer https://www.jb51.net/article/158292.htm -->
<!-- refer https://github.com/cinoliu/-selectCity -->
<view class="weui-search-bar">
<picker mode="selector" range="{{entities}}" value="{{curEntity}}" bindchange="onEntityPicker" class='address_member'>
<text>{{tutil.formatSubString(entities[curEntity],7)}}</text>
<image src='../../icon/down.png' style='width: 40rpx;height: 40rpx;' class='selecrtImg'></image>
</picker>
<view class="weui-search-bar__form">
<view class="weui-search-bar__box">
<icon class="weui-icon-search_in-box" type="search" size="16"></icon>
<input type="text" class="weui-search-bar__input" placeholder="发现{{tutil.formatSubString(entities[curEntity],7)}}" value="{{inputVal}}" focus="{{inputShowed}}" bindconfirm="startSearch" />
<view class="weui-icon-clear" wx:if="{{inputVal.length > 0}}" bindtap="clearInput">
<icon type="clear" size="16"></icon>
</view>
</view>
<label class="weui-search-bar__label" hidden="{{inputShowed}}" bindtap="showInput">
<icon class="weui-icon-search" type="search" size="16"></icon>
<view class="weui-search-bar__text">发现{{tutil.formatSubString(entities[curEntity],7)}}·感兴趣的活动</view>
</label>
</view>
<view class="weui-search-bar__cancel-btn" hidden="{{!inputShowed}}" bindtap="hideInput">取消
</view>
</view>
<view class="workbench">
<view class="list">
<!-- jscat todo 0828 以用户为主, 扫一扫暂时也不实现 -->
<!-- <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">
<image src="../../icon/activity/points.png"></image>
</navigator>
<text>积分</text>
</view> -->
<!-- todo 0728 热销暂时也不实现 -->
<!-- jscat20200816 添加活动日历 for convinience -->
<block>
<view class="items">
<navigator url="/pages/activity/activity-list/activity-list?entityName={{entities[curEntity]}}&activityType={{activityType}}">
<image src="../../icon/member/schedule.png" style="margin-top:10rpx; margin-bottom:-10rpx"></image>
<text style="font-size:28rpx;">本周活动: {{entityInfos[curEntity].num_activity}}场</text>
</navigator>
</view>
</block>
<block wx:if="{{entityInfos[curEntity].num_entity > 1}}">
<view class="items">
<image src="../../icon/fair/fair.png" style="margin-top:10rpx; margin-bottom:-10rpx"></image>
<text style="font-size:28rpx;">集市: {{entityInfos[curEntity].num_entity}}个</text>
</view>
</block>
<view class="items">
<image src="../../icon/activity/like.png" style="margin-top:10rpx; margin-bottom:-10rpx"></image>
<text style="font-size:28rpx;">热度: {{entityInfos[curEntity].num_like}}点</text>
</view>
</view>
</view>
<!-- 导航栏 -->
<view class="navBar" >
<scroll-view class="navBar-box" scroll-x="true" style="white-space: nowrap; display:flex ">
<view class="cate-list {{curIndex==index?'on':''}}" wx:for="{{category}}"
wx:key="{{item.id}}" data-id="{{item.id}}" data-index="{{index}}"
bindtap="switchCategory">{{item.name}}</view>
</scroll-view>
</view>
<!-- 文章列表 -->
<!--
title
unit_price
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}}&num_like={{item.num_like}}' >
<image class="writer-image" src="{{item.note_image[0]}}"/>
</navigator>
<view class="note-column">
<navigator url='{{item.url}}&num_like={{item.num_like}}' >
<!-- 商家信息 -->
<text>{{item.title}}</text>
<!-- 商品价格 -->
<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>
<!-- todo 店铺功能尚未实现 -->
<!-- <view class="desc-member-right">进店 ></view> -->
</view>
</view>
</view>
</view>
</view>
<!-- 加载更多 -->
<view class="weui-loadmore" hidden="{{isHideLoadMore}}">
<view class="weui-loading"></view>
<view class="weui-loadmore__tips">正在加载</view>
</view>
<view class="weui-loadmore" hidden="{{!isHideLoadMore}}">
<view class="weui-loadmore__tips">没有更多啦 {{'>'}}_{{'<'}} </view>
</view>
</view>
增值产品-小程序及app/nyx-master/pages/member/activity-post/activity-edit/activity-edit.js
// pages/member/activity-post/activity-edit/activity-edit.js
// pages/member/activity-post/activity-edit/activity-edit.js
......@@ -19,6 +19,12 @@ Page({
attributeArray: ['活动类别', '价格', '库存'],
cbs: [
{name: '', type:'00-饮事', value:'饮事', holder:'饮事活动', checked: false},
{name: '', type:'01-集市', value:'集市', holder:'是否集市?', checked: false},
{name: '', type:'02-园区', value:'园区', holder:'是否园区?', checked: false},
],
},
......@@ -128,13 +134,53 @@ Page({
// 输入该组图片的标签
bindKeyTag(e) {
var _this = this;
_this.setData({
inputTag: e.detail.value
})
//全局赋值
app.globalData.postData.photoTag = e.detail.value
var cbs = _this.data.cbs
//js的e.currentTarget.id 对应wxml的 id="tab0"
//js的e.currentTarget.dataSet.id 对应wxml的 data-id="tab0"
var values = parseInt(e.currentTarget.id)
cbs[values].name = e.detail.value
this.setData({ cbs })
app.globalData.postData.photoCbs = cbs;
},
//点击checkbox
radioTap: function(e){
var _this = this
var cbs = _this.data.cbs
//js的e.currentTarget.id 对应wxml的 id="tab0"
//js的e.currentTarget.dataSet.id 对应wxml的 data-id="tab0"
var values = parseInt(e.currentTarget.id)
cbs[values].checked = cbs[values].checked == true ? false : true
cbs[values].holder = cbs[values].checked==true?cbs[values].value+'名称?':'是否'+cbs[values].value+'?'
this.setData({ cbs })
app.globalData.postData.photoCbs = cbs;
},
//点击input
inputTap: function(e){
var _this = this
var cbs = _this.data.cbs
//js的e.currentTarget.id 对应wxml的 id="tab0"
//js的e.currentTarget.dataSet.id 对应wxml的 data-id="tab0"
var values = parseInt(e.currentTarget.id)
cbs[values].checked = cbs[values].checked == true ? false : true
cbs[values].holder = cbs[values].checked==true?cbs[values].value+'名称?':'是否'+cbs[values].value+'?'
this.setData({ cbs })
app.globalData.postData.photoCbs = cbs;
},
bindKeyText(e){
var _this = this;
//js的e.currentTarget.id 对应wxml的 id="0"
......@@ -218,29 +264,46 @@ Page({
function checkField(){
var info = ""
//step1: 检查活动类别字段
var products = app.globalData.postData.photoProduct
for(var i=0; i<products.length; i++)
{
if(products[i].productDesc==undefined || products[i].productDesc=="")
{
info = "请输入第"+ i +"项活动类别"
wx.showModal({
content: info,
showCancel: false,
confirmText: '确认'
})
return false;
}
}
if(app.globalData.postData.photoTitle.length == 0)
//step2: 检查活动类型字段
var cbs = app.globalData.postData.photoCbs
//从1开始，因为'饮事'无需输入
for(var i=1; i<cbs.length; i++)
{
info = "请输入活动标题"
wx.showModal({
content: info,
showCancel: false,
confirmText: '确认'
})
return false;
//选中了checkbox, 然后没有类型
if(cbs[i].checked == true && cbs[i].name == "")
{
info = "请输入"+ cbs[i].value +"名称"
wx.showModal({
content: info,
showCancel: false,
confirmText: '确认'
})
return false;
}
}
else if(info!="")
//step3: 检查活动标题
if(app.globalData.postData.photoTitle.length == 0)
{
info = "请输入活动标题"
wx.showModal({
content: info,
showCancel: false,
......
增值产品-小程序及app/nyx-master/pages/member/activity-post/activity-edit/activity-edit.wxml
<!-- /page/post/edit/edit 添加分类的特点，以及自定义特点 -->
<!-- /page/post/edit/edit 添加分类的特点，以及自定义特点 -->
......@@ -13,14 +13,35 @@
</view>
</view>
<!-- <view class="weui-cells__title">#添加亮点</view>
<view class="weui-cells weui-cells_after-title">
<view class="weui-cell ">
<view class="weui-cell__bd">
<input class="weui-input" bindinput="bindKeyTag" placeholder="请输入亮点" />
</view>
</view>
</view> -->
<view class="weui-cells__title">#添加活动类型</view>
<view class="weui-cells weui-cells_after-title" style="font-size:30rpx;">
<view style="display:flex; flex-direction: row;">
<label class="weui-cell" style="padding-right:6px;">
<view class="weui-cell__hd">
<checkbox value="0" id="0" checked="{{cbs[0].checked}}" bindtap="radioTap"/>
</view>
<view class="weui-cell__bd {{cbs[0].checked==false?'.check-box-off':''}}" style="width:120rpx" id="0" bindtap="inputTap">
饮事活动
</view>
</label>
<label class="weui-cell" style="padding-left:6px;padding-right:6px;">
<view class="weui-cell__hd">
<checkbox value="1" id="1" checked="{{cbs[1].checked}}" bindtap="radioTap"/>
</view>
<view class="weui-cell__bd {{cbs[1].checked==false?'.check-box-off':''}}">
<input class="weui-input" id="1" bindtap="inputTap" bindinput="bindKeyTag" placeholder="{{cbs[1].holder}}" value="{{cbs[1].name}}"/>
</view>
</label>
<label class="weui-cell" style="padding-left:6px;padding-right:6px;">
<view class="weui-cell__hd">
<checkbox value="2" id="2" checked="{{cbs[2].checked}}" bindtap="radioTap"/>
</view>
<view class="weui-cell__bd {{cbs[2].checked==false?'.check-box-off':''}}">
<input class="weui-input" id="2" bindtap="inputTap" bindinput="bindKeyTag" placeholder="{{cbs[2].holder}}" value="{{cbs[2].name}}"/>
</view>
</label>
</view>
</view>
<view style="display:flex; flex-direction: row;">
<view class="section" style="background: #fff;margin-top:32rpx;padding:32rpx;width:55%">
......
增值产品-小程序及app/nyx-master/pages/member/activity-post/activity-edit/activity-edit.wxss
page{
page{
......@@ -91,4 +91,8 @@ page{
color: rgba(55, 134, 244, 1);
width: 100%;
word-break: normal;
}
\ No newline at end of file
}
.check-box-off {
color:rgba(0,0,0,0.6);
}
增值产品-小程序及app/nyx-master/pages/member/activity-post/activity-submit/activity-submit.js
// pages/member/activity-post/activity-submit/activity-submit.js
// pages/member/activity-post/activity-submit/activity-submit.js
......@@ -332,7 +332,7 @@ Page({
},
success: res => {
if (res.statusCode == 200) {
console.log("=== oss getToken 返回值_", res.data)
console.log("=== oss getToken_" + dir +"_ done", res.data)
var dict = {
accessid: res.data.data.accessid,
policy: res.data.data.policy,
......@@ -388,7 +388,7 @@ Page({
},
//上传照片(阿里云)
uploadAli: function (tag, title, content, photoArr, product, startDatetime, endDatetime) {
uploadAli: function (tag, title, content, photoArr, product, activityType, fairName, communityName,startDatetime, endDatetime) {
var _this = this;
console.log("===uploadAli_data_tag: ",tag)
console.log("===uploadAli_data_title: ",title)
......@@ -447,7 +447,10 @@ Page({
}
var callback_param = {
'callbackUrl': strUrl,
'callbackBody': 'filename=${object}&size=${size}&mimeType=${mimeType}&height=${imageInfo.height}&width=${imageInfo.width}&tag=' + encodeURI(encodeURI(tag)) + '&title=' + encodeURI(encodeURI(title)) + '&content=' + encodeURI(encodeURI(content)) + '&image=' + image + '&userId=' + user_id + '&memberId=' + member_id + '&addressId=' + address_id + encodeURI (encodeURI(strParam)) + '&startDatetime=' + startDatetime + '&endDatetime=' + endDatetime,
'callbackBody': 'filename=${object}&size=${size}&mimeType=${mimeType}&height=${imageInfo.height}&width=${imageInfo.width}&tag=' + encodeURI(encodeURI(tag)) + '&title=' + encodeURI(encodeURI(title)) + '&content=' + encodeURI(encodeURI(content)) + '&image=' + image + '&userId=' + user_id + '&memberId=' + member_id + '&addressId=' + address_id + encodeURI (encodeURI(strParam)) + '&startDatetime=' + startDatetime + '&endDatetime=' + endDatetime
+ '&activityType=' + encodeURI(encodeURI(activityType))
+ '&fairName=' + encodeURI(encodeURI(fairName))
+ '&communityName=' + encodeURI(encodeURI(communityName)),
'callbackBodyType': "application/x-www-form-urlencoded",
}
var base64_callback_body = base64.encode(JSON.stringify(callback_param));
......@@ -490,8 +493,23 @@ Page({
var photoArr = app.globalData.postData.photoArray;
var tag = app.globalData.postData.photoTag
var product = app.globalData.postData.photoProduct
var cbs = app.globalData.postData.photoCbs
var startDatetime = app.globalData.postData.startDatetime
var endDatetime = app.globalData.postData.endDatetime
var list = []
var activityType = ""
var fairName = ""
var communityName = ""
for(var i=0; i<cbs.length; i++)
{
if(cbs[i].checked == true )
{
list.push(cbs[i].type)
}
}
activityType = list.join("::")
fairName = cbs[1].checked == true ? cbs[1].name : ""
communityName = cbs[2].checked == true ? cbs[2].name : ""
//时间戳
var expire = this.data.oss['userToken'].expire;
......@@ -507,13 +525,13 @@ Page({
promise_oss.then(
function (value) {
console.log("===enter promise_oss user_token then_pass")
_this.uploadAli(tag, title, content, photoArr, product, startDatetime, endDatetime)
_this.uploadAli(tag, title, content, photoArr, product, activityType, fairName, communityName, startDatetime, endDatetime)
});
}
else
{
_this.uploadAli(tag, title, content, photoArr, product, startDatetime, endDatetime)
_this.uploadAli(tag, title, content, photoArr, product, activityType, fairName, communityName,startDatetime, endDatetime)
}
},
......@@ -529,6 +547,7 @@ Page({
photoTitle: "",
photoContent: "",
photoProduct: [],
photoCbs: [],
startDatetime: "",
endDatetime: "",
}
......@@ -707,7 +726,7 @@ Page({
app.globalData.postData.photoArray = newFilePaths;
},
// 直接注册member
// 直接注册member, 如果已经上传成功了logo
// todo not finished jscat 20200902
onRegMember(resolve)
{
......@@ -715,6 +734,7 @@ Page({
var member_id = "mid_" + util.wxuuid()
app.globalData.member.member_id = member_id
var member_name = app.globalData.member.member_name
var member_city = app.globalData.member.member_city
var member_address = app.globalData.member.member_city + app.globalData.member.member_address
//即时更新member_address的值
app.globalData.member.member_address = member_address
......@@ -724,6 +744,7 @@ Page({
console.log("===this is onRegMember");
var query_url = '?userId=' + user_id + '&memberId=' + member_id + '&memberName=' + member_name
+ '&memberCity=' + member_city
+ '&memberAddress=' + member_address
+ '&memberSlogan=' + member_slogan
var strUrl = config.member_reg_url + query_url
......@@ -754,6 +775,7 @@ Page({
var address_id = "addid_" + util.wxuuid()
app.globalData.member.member_id = member_id
var member_name = app.globalData.member.member_name
var member_city = app.globalData.member.member_city
var member_address = app.globalData.member.member_city + app.globalData.member.member_address
//即时更新member_address的值
app.globalData.member.member_address = member_address
......@@ -777,17 +799,17 @@ Page({
promise_oss.then(
function (value) {
console.log("===enter promise_oss then_pass")
_this.uploadMember(member_id, address_id, member_name, member_address, member_slogan, logoArray, resolve, reject)
_this.uploadMember(member_id, address_id, member_name, member_city, member_address, member_slogan, logoArray, resolve, reject)
});
}
else
{
_this.uploadMember(member_id, address_id, member_name, member_address, member_slogan, logoArray, resolve, reject)
_this.uploadMember(member_id, address_id, member_name, member_city, member_address, member_slogan, logoArray, resolve, reject)
}
},
//上传商家信息到(阿里云)
uploadMember: function (member_id, address_id, member_name, member_address, member_slogan, logoArray, resolve, reject) {
uploadMember: function (member_id, address_id, member_name, member_city, member_address, member_slogan, logoArray, resolve, reject) {
var _this = this;
var pic = logoArray[0]
console.log(pic)
......@@ -826,6 +848,7 @@ Page({
app.globalData.member['address_id'] = address_id
app.globalData.member['member_id'] = member_id
app.globalData.member['member_name'] = member_name
app.globalData.member['member_city'] = member_city
app.globalData.member['member_address'] = member_address
app.globalData.member['member_slogan'] = member_slogan
......@@ -833,7 +856,7 @@ Page({
var strUrl = config.oss_member_callback_url
var callback_param = {
'callbackUrl': strUrl,
'callbackBody': 'filename=${object}&size=${size}&mimeType=${mimeType}&height=${imageInfo.height}&width=${imageInfo.width}&memberName=' + encodeURI(encodeURI(member_name)) + '&memberAddress=' + encodeURI(encodeURI(member_address)) + '&memberSlogan=' + encodeURI(encodeURI(member_slogan)) + '&image=' + member_logo + '&memberId=' + member_id + '&userId=' + user_id + '&addressId=' + address_id,
'callbackBody': 'filename=${object}&size=${size}&mimeType=${mimeType}&height=${imageInfo.height}&width=${imageInfo.width}&memberName=' + encodeURI(encodeURI(member_name)) + '&memberCity=' + encodeURI(encodeURI(member_city)) + '&memberAddress=' + encodeURI(encodeURI(member_address)) + '&memberSlogan=' + encodeURI(encodeURI(member_slogan)) + '&image=' + member_logo + '&memberId=' + member_id + '&userId=' + user_id + '&addressId=' + address_id,
'callbackBodyType': "application/x-www-form-urlencoded",
}
var base64_callback_body = base64.encode(JSON.stringify(callback_param));
......@@ -1023,6 +1046,7 @@ Page({
result['address_id'] = dict[i].addressId
result['address_status'] = dict[i].addressStatus
result['member_name'] = dict[i].memberName
result['member_city'] = dict[i].memberCity
result['member_address'] = dict[i].memberAddress
result['member_slogan'] = dict[i].memberSlogan
result['member_logo'] = dict[i].memberLogo
......
增值产品-小程序及app/nyx-master/pages/member/activity-post/member-edit/member-edit.js
// pages/member/activity-post/activity-submit/activity-submit.js
// pages/member/activity-post/activity-submit/activity-submit.js
......@@ -109,6 +109,7 @@ Page({
memberInfo.address_id = ""
memberInfo.address_status = "00"
memberInfo.member_name = ""
memberInfo.member_city = ""
memberInfo.member_address = ""
memberInfo.member_slogan = "标语待完善中"
memberInfo.member_logo = ""
......@@ -420,7 +421,7 @@ Page({
var _this = this;
var memberInfo = _this.data.memberInfo
var query_url = '?memberId=' + memberInfo.member_id + '&memberAddress='+memberInfo.member_address
var query_url = '?memberId=' + memberInfo.member_id + '&memberCity='+memberInfo.member_city + '&memberAddress='+memberInfo.member_address
var strUrl = config.member_add_address_url + query_url
config.debug == 1 ? console.log("===strUrl is: \"" + strUrl + "\"") : ""
......
增值产品-小程序及app/nyx-master/pages/switchcity/switchcity.js
import { LETTERS, HOT_CITY_LIST } from '../../locale/citydata'
import { LETTERS, HOT_CITY_LIST } from '../../locale/citydata'
......@@ -100,6 +100,7 @@ Page({
//直接更新app.globalData
appInstance.globalData.defaultCity = city
appInstance.globalData.defaultCounty = ''
appInstance.globalData.citySwitched = 1
// 同步更新storage记录
// start 记录最近访问
......
增值产品-小程序及app/nyx-master/utils/date.wxs
var formatTime = function (date) {
var formatTime = function (date) {
......@@ -216,19 +216,31 @@ var formatAnswer = function (n) {
return answer
}
var formatSubString = function (str, n) {
// 输入 2020-02-04 19:33:00
// 返回 02-04
// console.log(str)
if(str != undefined && str != '')
{
str = str.toString().substring(0, n)
}
return str
}
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,
formatDate_md_week: formatDate_md_week,
formatNumberLike: formatNumberLike,
formatNumberPrice: formatNumberPrice,
formatDate_ymdw_today_interval: formatDate_ymdw_today_interval,
formatDate_hm_interval: formatDate_hm_interval,
formatDate_mdw_interval: formatDate_mdw_interval
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,
formatDate_md_week: formatDate_md_week,
formatNumberLike: formatNumberLike,
formatNumberPrice: formatNumberPrice,
formatDate_ymdw_today_interval: formatDate_ymdw_today_interval,
formatDate_hm_interval: formatDate_hm_interval,
formatDate_mdw_interval: formatDate_mdw_interval,
formatSubString: formatSubString
}
\ No newline at end of file
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论