Skip to content

N
nyx
Commit f8740917 by jscat
Options

nyx javaapp, weapp: 数据优化 

1. 为tbl_member表添加member_logo字段
2. javaapp 更改view_activity_info数据格式
3. weapp 为activity.js 和 quiz-info.js新增member_logo字段
parent 01084876
正在显示 包含 127 行增加 和 45 行删除
增值产品-小程序及app/doc/create_table_sql/key/create_table_member.sql
USE rockwell_key;
USE rockwell_key;
......@@ -15,6 +15,7 @@ CREATE TABLE `tbl_member` (
`member_name` VARCHAR(100) DEFAULT NULL COMMENT '名称',
`member_slogan` VARCHAR(200) DEFAULT NULL COMMENT '商家slogan, 比如: "充满爱与温度, 自由放松的bar"',
`member_address` VARCHAR(100) DEFAULT NULL COMMENT '地址',
`member_logo` VARCHAR(500) DEFAULT NULL COMMENT '地址',
`lon` DOUBLE(9,6) DEFAULT NULL COMMENT 'longitude 经度',
`lat` DOUBLE(8,6) DEFAULT NULL COMMENT 'latitude 纬度',
`geo_code` CHAR(12) DEFAULT NULL COMMENT 'geohash编码',
......@@ -25,19 +26,19 @@ CREATE TABLE `tbl_member` (
) ENGINE=INNODB DEFAULT CHARSET=utf8 COMMENT='商户表';
INSERT INTO `tbl_member`(`id`, `member_status`, `member_name`, `member_slogan`, `member_address`,
INSERT INTO `tbl_member`(`id`, `member_status`, `member_name`, `member_slogan`, `member_address`, `member_logo`,
`lon`, `lat`, `geo_code`,
`create_datetime`,`update_datetime`)
VALUES
('mid_001', '01', 'CinCin Wine Cellar', '', '五原路610号', NULL, NULL, NULL, '2019-11-20 11:24:45', '2019-11-20 11:24:45'),
('mid_002', '00', 'Piupiu', '', '襄阳路610号', NULL, NULL, NULL, '2019-11-20 11:24:45', '2019-11-20 11:24:45'),
('mid_003', '00', 'Just Grape', '', '汾阳路610号', NULL, NULL, NULL, '2019-11-20 11:24:45', '2019-11-20 11:24:45'),
('mid_004', '00', '朝阳1', '', '工体610号', NULL, NULL, NULL, '2019-11-20 11:24:45', '2019-11-20 11:24:45'),
('mid_005', '00', '朝阳2', '', '三里屯610号', NULL, NULL, NULL, '2019-11-20 11:24:45', '2019-11-20 11:24:45'),
('mid_006', '00', 'Enoterra红酒吧', '', '安福路55号(近常熟路)',NULL,NULL,NULL,'2020-03-30 16:20:19','2020-03-30 16:20:23'),
('mid_007', '00', 'Alimentari意式鲜食店', '', '安福路158号',NULL,NULL,NULL,'2020-03-30 16:22:05','2020-03-30 16:22:08'),
('mid_008', '00', '蟹尊苑', '', '巨鹿路889弄21号',NULL,NULL,NULL,'2020-03-30 16:23:15','2020-03-30 16:23:17'),
('mid_009', '01', '173wine红酒店', '', '上海市黄浦区南昌路173号',31.221501,99.999999,NULL,'2020-06-04 10:52:49',NULL),
('mid_123', '01', 'Bar Renaissance', '充满爱与温度, 自由放松的bar', '愚园路610号', NULL, NULL, NULL, '2019-11-20 11:24:45', '2019-11-20 11:24:45'),
('mid_456', '01', '叁年间', '', '永嘉路692号1楼',NULL,NULL,NULL,'2020-08-04 09:24:58','2020-08-04 09:25:00');
('mid_001', '01', 'CinCin Wine Cellar', '', '五原路610号', '', NULL, NULL, NULL, '2019-11-20 11:24:45', '2019-11-20 11:24:45'),
('mid_002', '00', 'Piupiu', '', '襄阳路610号', '', NULL, NULL, NULL, '2019-11-20 11:24:45', '2019-11-20 11:24:45'),
('mid_003', '00', 'Just Grape', '', '汾阳路610号', '', NULL, NULL, NULL, '2019-11-20 11:24:45', '2019-11-20 11:24:45'),
('mid_004', '00', '朝阳1', '', '工体610号', '', NULL, NULL, NULL, '2019-11-20 11:24:45', '2019-11-20 11:24:45'),
('mid_005', '00', '朝阳2', '', '三里屯610号', '', NULL, NULL, NULL, '2019-11-20 11:24:45', '2019-11-20 11:24:45'),
('mid_006', '00', 'Enoterra红酒吧', '', '安福路55号(近常熟路)', '', NULL,NULL,NULL,'2020-03-30 16:20:19','2020-03-30 16:20:23'),
('mid_007', '00', 'Alimentari意式鲜食店', '', '安福路158号', '', NULL,NULL,NULL,'2020-03-30 16:22:05','2020-03-30 16:22:08'),
('mid_008', '00', '蟹尊苑', '', '巨鹿路889弄21号', '', NULL,NULL,NULL,'2020-03-30 16:23:15','2020-03-30 16:23:17'),
('mid_009', '01', '173wine红酒店', '', '上海市黄浦区南昌路173号', '', 31.221501,99.999999,NULL,'2020-06-04 10:52:49',NULL),
('mid_123', '01', 'Bar Renaissance', '充满爱与温度, 自由放松的bar', '愚园路610号', 'https://930-test-sh.oss-cn-shanghai.aliyuncs.com/logo-dir/mid_123.jpg', NULL, NULL, NULL, '2019-11-20 11:24:45', '2019-11-20 11:24:45'),
('mid_456', '01', '叁年间', '', '永嘉路692号1楼', '', NULL,NULL,NULL,'2020-08-04 09:24:58','2020-08-04 09:25:00');
;
\ No newline at end of file
增值产品-小程序及app/doc/create_table_sql/key/create_view_activity_detail.sql
USE rockwell_key;
USE rockwell_key;
......@@ -9,7 +9,7 @@ DROP VIEW IF EXISTS view_activity_detail;
CREATE VIEW view_activity_detail
AS
SELECT aa.activity_id, bb.member_name, bb.member_slogan, aa.tag, aa.title, aa.num_like, aa.content, aa.quiz, aa.point, IFNULL(cc.product_id,"") as product_id, IFNULL(cc.product_desc,"") as product_desc, IFNULL(cc.product_status,"") as product_status, IFNULL(cc.default_status,"") as default_status, IFNULL(cc.price,0) as price, IFNULL(cc.stock, 0) as stock, aa.note_image, aa.member_id, bb.member_status, aa.create_datetime, aa.update_datetime
SELECT aa.activity_id, bb.member_name, bb.member_slogan, aa.tag, aa.title, aa.num_like, aa.content, aa.quiz, aa.point, IFNULL(cc.product_id,"") as product_id, IFNULL(cc.product_desc,"") as product_desc, IFNULL(cc.product_status,"") as product_status, IFNULL(cc.default_status,"") as default_status, IFNULL(cc.price,0) as price, IFNULL(cc.stock, 0) as stock, aa.note_image, aa.member_id, bb.member_status, bb.member_logo, aa.create_datetime, aa.update_datetime
FROM tbl_activity aa
LEFT JOIN tbl_member bb ON aa.member_id=bb.id
LEFT JOIN tbl_product cc ON aa.activity_id=cc.activity_id
\ No newline at end of file
增值产品-小程序及app/doc/create_table_sql/key/create_view_activity_info.sql
USE rockwell_key;
USE rockwell_key;
......@@ -9,7 +9,7 @@ USE rockwell_key;
DROP VIEW IF EXISTS view_activity_info;
CREATE VIEW view_activity_info
AS
SELECT aa.activity_id, bb.member_name, bb.member_slogan, aa.tag, aa.title, aa.num_like, aa.content, aa.quiz, aa.point, IFNULL(cc.product_desc,"") as product_desc, IFNULL(cc.price,0) as price, aa.note_image, aa.member_id, bb.member_status, aa.create_datetime, aa.update_datetime
SELECT aa.activity_id, bb.member_name, bb.member_slogan, aa.tag, aa.title, aa.num_like, aa.content, aa.quiz, aa.point, IFNULL(cc.product_desc,"") as product_desc, IFNULL(cc.price,0) as price, aa.note_image, aa.member_id, bb.member_status, bb.member_logo, aa.create_datetime, aa.update_datetime
FROM tbl_activity aa
LEFT JOIN tbl_member bb ON aa.member_id=bb.id
LEFT JOIN tbl_product cc ON aa.activity_id=cc.activity_id AND cc.default_status='01'
\ No newline at end of file
增值产品-小程序及app/doc/create_table_sql/流程及数据测试.sql
/*
/*
/*
目标: 梳理流程 DIN
主流程 : main
数据优化: 添加测试数据, 新增数据字段
子流程 : 好友助力
功能优化: 新增一个接口
页面优化: 比如loadmore
文件优化: 更改文件名
一. 商家活动创建流程:
1. 自定义活动
1) 新增图片, note_image
......@@ -67,8 +75,11 @@
-- 创建完毕 -> 发布 releaseActivity()
-- 我的活动 -> 发布 releaseActivity()
三. 商家活动参与流程 activity -> quiz-info -> matchTest -> quiz-result -> my-points
三. 商家活动参与流程
1. 竞答
主流程: activity -> quiz-info -> matchTest -> quiz-result -> my-points -> scan
子流程:
--311 done 进入竞答, weapp activity.wxml
--312 done 点击进入竞答详情页面 weapp activity.wxml <navigator>
--313 回到首页 weapp quiz-info.wxml bindtap="toHome"
......@@ -78,12 +89,15 @@
--317 done 转到竞答页 weapp quiz-info.js wx.navigateTo(/matchTest)
--318 done 下一题 weapp matchTest.wxml bindtap="onTypeNext"
--319 done 完成测试 weapp matchTest.js doneDaily()
--3110 转到结果页 weapp quiz-info.js wx.navigateTo(/quiz-result)
--3111 查看积分 weapp quiz-result.wxml bindtap="onCheckPoints" to my-points.wxml
--3112 分享战绩 weapp quiz-result.wxml open-type="share"
--3113 返回首页 weapp quiz-result.wxml bindtap="toHome"
--3110 done 转到结果页 weapp quiz-info.js wx.navigateTo(/quiz-result)
--3111 done 查看积分 weapp quiz-result.wxml bindtap="onCheckPoints" to my-points.wxml
--3112 done 分享战绩 weapp quiz-result.wxml open-type="share"
--3113 done 返回首页 weapp quiz-result.wxml bindtap="toHome"
--3114 好友助力
2. 活动
主流程: activity -> activity-info -> cart -> order -> my-orders -> scan
子流程:
--321 done 进入活动, weapp activity.wxml
图片 note_image
标题 title
......@@ -93,7 +107,7 @@
where 1=1
and tag='活动'
--322 点击进入活动详情页面 weapp activity_info.wxml todo 新增 activity_info.wxml todo-1:1的image
--322 点击进入活动详情页面 weapp activity-info.wxml todo 新增 activity-info.wxml todo-1:1的image
tips: 需要通过activity_id重新获取数据, 因为unit_price/product_desc 这个阶段不知道
图片 note_image
......@@ -181,7 +195,9 @@
--如果失败, 回到order.xml
--待支付页 todo weapp order-onpay.wxml
--待支付页 todo weapp order-onpay.wxml
-- 我的订单 weapp /my/my-order/my-order.wxml
......
增值产品-小程序及app/nyx-master/config.js
//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";
......
增值产品-小程序及app/nyx-master/pages/activity/activity.js
// pages/activity/activity.js
// pages/activity/activity.js
......@@ -209,6 +209,7 @@ Page({
result["member_slogan"] = res.data.data[i].memberSlogan
result["member_id"] = res.data.data[i].memberId
result["member_status"] = res.data.data[i].memberStatus
result["member_logo"] = res.data.data[i].memberLogo
result["tag"] = res.data.data[i].tag
result["title"] = res.data.data[i].title
result["num_like"] = res.data.data[i].numLike
......@@ -229,6 +230,7 @@ Page({
+"&member_id="+result["member_id"]
+"&member_name="+result["member_name"]
+"&member_slogan="+result["member_slogan"]
+"&member_logo="+result["member_logo"]
var url_activity = "../activity/activity-info/quiz-info?"
+"&activity_id="+result["activity_id"]
result["url"] = result["tag"]=='竞答'? url_quiz : url_activity
......@@ -425,23 +427,26 @@ Page({
success: function (res) {
if ( res.data.resultCode == 200 ) {
//表示query成功
console.log("qrcode查询成功");
console.log("qrcode查询完成");
console.log(res)
//得到matchId
var matchList = res.data.data;
var title = ""
if(matchList.length == 0)
{
title = "失败, 无效二维码"
title = "失败, 无效"
}
else if( matchList[0].matchStatus == '00' )
{
title = "失败，已使用二维码"
title = "失败，已使用"
}
else if( matchList[0].matchStatus == '01' )
{
title = "成功扫码"
title = "扫码成功"
}
console.log("title="+title)
wx.showToast({
title: title,
duration: 3000
......
增值产品-小程序及app/nyx-master/pages/activity/quiz-info/quiz-info.js
// pages/index/note-info/note-info.js
// pages/index/note-info/note-info.js
......@@ -55,8 +55,7 @@ Page({
quiz['member_id'] = options.member_id;
quiz['member_name'] = options.member_name;
quiz['member_slogan'] = options.member_slogan;
quiz['writer_name'] = options.writer_name == "null" ? "匿名用户" : options.writer_name;
quiz['writer_image'] = options.writer_image == "null" ? '/icon/icon_avatar1.png' : options.writer_image;
quiz['member_logo'] = options.member_logo==""?'/icon/icon_avatar1.png':options.member_logo;
}
wx.setNavigationBarTitle({
......
增值产品-小程序及app/nyx-master/pages/activity/quiz-info/quiz-info.wxml
<view class="page">
<view class="page">
......@@ -25,7 +25,7 @@
<!-- 企业信息 -->
<view class="note-row">
<image class="writer-image" src="{{quiz.writer_image}}"/>
<image class="writer-image" src="{{quiz.member_logo}}"/>
<view class="note-column">
<span class="name">{{quiz.member_name}}</span>
<span class="name">{{quiz.member_slogan}}</span>
......
增值产品-小程序及app/nyx-master/pages/my/my-points/my-points.js
// pages/my/rank/rank.js
// pages/my/rank/rank.js
......@@ -38,6 +38,7 @@ Page({
/* 优惠券 可使用/不可用状态 */
validStatus : true,
matchStatus : "",
},
......@@ -109,6 +110,25 @@ Page({
* 页面上拉触底事件的处理函数
*/
onReachBottom: function () {
console.log('页面上拉触底')
var _this = this;
var matchStatus = _this.__data__.matchStatus
var isHideLoadMore = _this.__data__.isHideLoadMore;
var pageIndex = _this.__data__.pageIndex;
//控制逻辑, 在onClick之后或者onGetComment事件之后再允许下拉更新操作
//判断是否已经全部加载完毕
//没有则加载更多
if (!isHideLoadMore) {
console.log('加载更多')
setTimeout(() => {
_this.getPoints(1, pageIndex, 4, matchStatus);
}, 1000)
}
else {
console.log('没有更多')
}
},
/**
......@@ -169,6 +189,9 @@ Page({
})
var matchStatus = dataId=="tab0" ? "01" : "00"
_this.setData({
matchStatus : matchStatus,
})
_this.getPoints(0, 1, 4, matchStatus)
},
......@@ -212,7 +235,7 @@ Page({
//进行翻页设置（加载更多）
if (scrollType == 1) {
var pointList = _this.__data__.points;
var pointsList = _this.__data__.points;
list = pointsList.concat(list)
}
_this.setData({
......
增值产品-小程序及app/nyx-master/pages/my/my-points/my-points.wxml
<view class="page">
<view class="page">
......@@ -50,6 +50,15 @@
</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>
<!-- 查看好友助力-->
<!-- 微信小程序自定义弹框 https://blog.csdn.net/qq_39702981/article/details/85104827 -->
<!-- 微信小程序自定义弹框 https://blog.csdn.net/qq_39702981/article/details/85320926 -->
......
增值产品-小程序及app/nyx-master/pages/my/my-points/my-points.wxss
.page{
.page{
......@@ -213,5 +213,29 @@
font-size: 38rpx;
color: #666666;
}
/* end - 小程序自定义弹框css */
/* end - 小程序自定义弹框css */
/* start 加载更多 */
.weui-loading {
margin: 0 5px;
width: 20px;
height: 20px;
display: inline-block;
vertical-align: middle;
-webkit-animation: weuiLoading 1s steps(12, end) infinite;
animation: weuiLoading 1s steps(12, end) infinite;
background: transparent url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxMjAiIGhlaWdodD0iMTIwIiB2aWV3Qm94PSIwIDAgMTAwIDEwMCI+PHBhdGggZmlsbD0ibm9uZSIgZD0iTTAgMGgxMDB2MTAwSDB6Ii8+PHJlY3Qgd2lkdGg9IjciIGhlaWdodD0iMjAiIHg9IjQ2LjUiIHk9IjQwIiBmaWxsPSIjRTlFOUU5IiByeD0iNSIgcnk9IjUiIHRyYW5zZm9ybT0idHJhbnNsYXRlKDAgLTMwKSIvPjxyZWN0IHdpZHRoPSI3IiBoZWlnaHQ9IjIwIiB4PSI0Ni41IiB5PSI0MCIgZmlsbD0iIzk4OTY5NyIgcng9IjUiIHJ5PSI1IiB0cmFuc2Zvcm09InJvdGF0ZSgzMCAxMDUuOTggNjUpIi8+PHJlY3Qgd2lkdGg9IjciIGhlaWdodD0iMjAiIHg9IjQ2LjUiIHk9IjQwIiBmaWxsPSIjOUI5OTlBIiByeD0iNSIgcnk9IjUiIHRyYW5zZm9ybT0icm90YXRlKDYwIDc1Ljk4IDY1KSIvPjxyZWN0IHdpZHRoPSI3IiBoZWlnaHQ9IjIwIiB4PSI0Ni41IiB5PSI0MCIgZmlsbD0iI0EzQTFBMiIgcng9IjUiIHJ5PSI1IiB0cmFuc2Zvcm09InJvdGF0ZSg5MCA2NSA2NSkiLz48cmVjdCB3aWR0aD0iNyIgaGVpZ2h0PSIyMCIgeD0iNDYuNSIgeT0iNDAiIGZpbGw9IiNBQkE5QUEiIHJ4PSI1IiByeT0iNSIgdHJhbnNmb3JtPSJyb3RhdGUoMTIwIDU4LjY2IDY1KSIvPjxyZWN0IHdpZHRoPSI3IiBoZWlnaHQ9IjIwIiB4PSI0Ni41IiB5PSI0MCIgZmlsbD0iI0IyQjJCMiIgcng9IjUiIHJ5PSI1IiB0cmFuc2Zvcm09InJvdGF0ZSgxNTAgNTQuMDIgNjUpIi8+PHJlY3Qgd2lkdGg9IjciIGhlaWdodD0iMjAiIHg9IjQ2LjUiIHk9IjQwIiBmaWxsPSIjQkFCOEI5IiByeD0iNSIgcnk9IjUiIHRyYW5zZm9ybT0icm90YXRlKDE4MCA1MCA2NSkiLz48cmVjdCB3aWR0aD0iNyIgaGVpZ2h0PSIyMCIgeD0iNDYuNSIgeT0iNDAiIGZpbGw9IiNDMkMwQzEiIHJ4PSI1IiByeT0iNSIgdHJhbnNmb3JtPSJyb3RhdGUoLTE1MCA0NS45OCA2NSkiLz48cmVjdCB3aWR0aD0iNyIgaGVpZ2h0PSIyMCIgeD0iNDYuNSIgeT0iNDAiIGZpbGw9IiNDQkNCQ0IiIHJ4PSI1IiByeT0iNSIgdHJhbnNmb3JtPSJyb3RhdGUoLTEyMCA0MS4zNCA2NSkiLz48cmVjdCB3aWR0aD0iNyIgaGVpZ2h0PSIyMCIgeD0iNDYuNSIgeT0iNDAiIGZpbGw9IiNEMkQyRDIiIHJ4PSI1IiByeT0iNSIgdHJhbnNmb3JtPSJyb3RhdGUoLTkwIDM1IDY1KSIvPjxyZWN0IHdpZHRoPSI3IiBoZWlnaHQ9IjIwIiB4PSI0Ni41IiB5PSI0MCIgZmlsbD0iI0RBREFEQSIgcng9IjUiIHJ5PSI1IiB0cmFuc2Zvcm09InJvdGF0ZSgtNjAgMjQuMDIgNjUpIi8+PHJlY3Qgd2lkdGg9IjciIGhlaWdodD0iMjAiIHg9IjQ2LjUiIHk9IjQwIiBmaWxsPSIjRTJFMkUyIiByeD0iNSIgcnk9IjUiIHRyYW5zZm9ybT0icm90YXRlKC0zMCAtNS45OCA2NSkiLz48L3N2Zz4=) no-repeat;
background-size: 100%;
}
.weui-loadmore {
width: 65%;
margin: 1.5em auto;
line-height: 1.6em;
font-size: 14px;
text-align: center;
}
.weui-loadmore__tips {
display: inline-block;
vertical-align: middle;
}
/* end 加载更多*/
\ No newline at end of file
增值产品-小程序及app/nyx_app_key/api/src/main/java/cn/com/fun/nyxkey/api/domain/Rockwell_keyV_activity_info.java
package cn.com.fun.nyxkey.api.domain;
package cn.com.fun.nyxkey.api.domain;
......@@ -20,6 +20,7 @@ public class Rockwell_keyV_activity_info{
private String memberName; // 商家名称
private String memberSlogan; // 商家slogan
private String memberStatus; // 用户状态: 00: 未注册用户; 01: 已注册用户
private String memberLogo; // 商家logo
private String tag; // 活动的标签
private String title; // 活动的标题
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论