Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
N
nyx
概览
Overview
Details
Activity
Cycle Analytics
版本库
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
问题
0
Issues
0
列表
Board
标记
里程碑
合并请求
0
Merge Requests
0
CI / CD
CI / CD
流水线
作业
日程表
图表
维基
Wiki
代码片段
Snippets
成员
Collapse sidebar
Close sidebar
活动
图像
聊天
创建新问题
作业
提交
Issue Boards
Open sidebar
发现
nyx
Commits
b1f5f5b4
Commit
b1f5f5b4
authored
Sep 17, 2020
by
jscat
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
nyx weapp: 功能调整
1. 信息详情页(activity-info)转发的时候,用户加载时候不存在nyxCode, member数据和like数据 加载到onLoad()里
parent
1775af20
隐藏空白字符变更
内嵌
并排
正在显示
6 个修改的文件
包含
213 行增加
和
153 行删除
+213
-153
增值产品-小程序及app/nyx-master/app.js
+106
-1
增值产品-小程序及app/nyx-master/config.js
+4
-2
增值产品-小程序及app/nyx-master/pages/activity/activity-info/activity-info.js
+57
-22
增值产品-小程序及app/nyx-master/pages/activity/activity.js
+42
-124
增值产品-小程序及app/nyx-master/pages/member/activity-post/activity-submit/activity-submit.js
+2
-2
增值产品-小程序及app/nyx-master/project.config.json
+2
-2
没有找到文件。
增值产品-小程序及app/nyx-master/app.js
查看文件 @
b1f5f5b4
//app
.js
//app
.js
...
...
@@ -239,6 +239,7 @@ App({
regUser
:
function
(
uuid
)
{
var
_this
=
this
;
_this
.
globalData
.
nyxCode
=
uuid
;
_this
.
globalData
.
authStatus
=
"00"
;
wx
.
setStorageSync
(
'nyxCode'
,
uuid
)
wx
.
setStorageSync
(
'authStatus'
,
"00"
)
var
userInfo
=
{}
...
...
@@ -477,5 +478,108 @@ App({
})
},
// 获取collects数据
// scrollType: 是否是翻页
// tips; 该函数是my-collects函数的简略版, 而且是单次运行的
getCollectsStorage
:
function
(
scrollType
,
pageNum
,
pageCount
,
resolve
,
reject
)
{
var
_this
=
this
;
var
userId
=
_this
.
globalData
.
nyxCode
var
query_url
=
'&userId='
+
userId
var
strUrl
=
config
.
collect_query_url
+
"?pageCount="
+
pageCount
+
"&pageNum="
+
pageNum
+
query_url
config
.
debug
==
1
?
console
.
log
(
"===strUrl is:
\"
"
+
strUrl
+
"
\"
"
)
:
""
wx
.
request
({
url
:
strUrl
,
method
:
'GET'
,
header
:
{
'Cookie'
:
wx
.
getStorageSync
(
'cookieKey'
),
},
success
:
function
(
res
)
{
if
(
res
.
data
.
resultCode
==
200
)
{
//表示HTTP请求成功
console
.
log
(
res
.
data
);
// 设置全局的点赞标记 step1
var
likeDictStorage
=
wx
.
getStorageSync
(
'likeDictStorage'
)
||
{}
for
(
var
i
=
0
;
i
<
res
.
data
.
data
.
length
;
i
++
)
{
var
result
=
{}
result
[
"activity_id"
]
=
res
.
data
.
data
[
i
].
activityId
// 设置全局的点赞标记 step2
likeDictStorage
[
result
[
"activity_id"
]]
=
1
}
// 设置全局的点赞标记 step3
wx
.
setStorageSync
(
'likeDictStorage'
,
likeDictStorage
)
console
.
log
(
"===app getCollectsStorage passed"
)
resolve
(
"===app getCollectsStorage passed"
)
}
},
fail
:
function
(
err
)
{
console
.
log
(
"===app getCollectsStorage failed"
,
err
.
errMsg
)
reject
(
new
Error
(
"===app getCollectsStorage failed"
));
}
})
},
// 获取member_user info 数据
// scrollType: 是否是翻页
// tips; 该函数是my-collects函数的简略版, 而且是单次运行的
getMemberInfo
:
function
(
scrollType
,
pageNum
,
pageCount
,
resolve
,
reject
)
{
var
_this
=
this
;
var
userId
=
_this
.
globalData
.
nyxCode
var
query_url
=
'&userId='
+
userId
var
strUrl
=
config
.
user_member_query_url
+
"?pageCount="
+
pageCount
+
"&pageNum="
+
pageNum
+
query_url
config
.
debug
==
1
?
console
.
log
(
"===strUrl is:
\"
"
+
strUrl
+
"
\"
"
)
:
""
wx
.
request
({
url
:
strUrl
,
method
:
'GET'
,
header
:
{
'Cookie'
:
wx
.
getStorageSync
(
'cookieKey'
),
},
success
:
function
(
res
)
{
if
(
res
.
data
.
resultCode
==
200
)
{
//表示HTTP请求成功
console
.
log
(
res
.
data
);
var
members
=
[]
var
memberInfo
=
{}
if
(
res
.
data
.
data
.
length
>
0
)
{
for
(
var
i
=
0
;
i
<
res
.
data
.
data
.
length
;
i
++
)
{
var
result
=
{}
result
[
"member_id"
]
=
res
.
data
.
data
[
i
].
memberId
result
[
"address_id"
]
=
res
.
data
.
data
[
i
].
addressId
result
[
"default_member"
]
=
res
.
data
.
data
[
i
].
defaultMember
result
[
"member_name"
]
=
res
.
data
.
data
[
i
].
memberName
result
[
"member_address"
]
=
res
.
data
.
data
[
i
].
addressName
result
[
"member_slogan"
]
=
res
.
data
.
data
[
i
].
memberSlogan
==
undefined
?
""
:
res
.
data
.
data
[
i
].
memberSlogan
result
[
"member_logo"
]
=
res
.
data
.
data
[
i
].
memberLogo
members
.
push
(
result
)
}
}
// 设置
wx
.
setStorageSync
(
'members'
,
members
)
wx
.
setStorageSync
(
'memberInfo'
,
members
[
0
])
app
.
globalData
.
memberInfo
=
members
[
0
]
app
.
globalData
.
members
=
members
resolve
(
"===app getMemberInfo passed"
)
}
},
fail
:
function
(
err
)
{
console
.
log
(
"===app getMemberInfo failed"
,
err
.
errMsg
)
reject
(
new
Error
(
"===app getMemberInfo failed"
));
}
})
},
})
\ No newline at end of file
增值产品-小程序及app/nyx-master/config.js
查看文件 @
b1f5f5b4
//con
fig.js API全局域名配置
//con
fig.js API全局域名配置
...
...
@@ -3,19 +3,21 @@
// env = 0; //本地java测试,需要启动java后台
// env = 1; //阿里云服务器测试版本
// env = 2; //阿里云服务器生产版本
var
env
=
0
;
;
var
env
=
0
;
var
debug
=
0
;
//是否打印调试信息
var
host_key
=
"https://fun.hisuhong.com"
;
var
login_url
=
"https://fun.hisuhong.com"
;
var
socket_url
=
""
//https://fun.hisuhong.com/swagger-ui.html
if
(
env
==
2
)
{
host_key
=
"https://fun.hisuhong.com"
;
login_url
=
"https://fun.hisuhong.com"
;
socket_url
=
"wss://wssfun.hisuhong.com"
}
//https://wx.hisuhong.com/swagger-ui.html
else
if
(
env
==
1
)
{
debug
=
1
...
...
增值产品-小程序及app/nyx-master/pages/activity/activity-info/activity-info.js
查看文件 @
b1f5f5b4
// pa
ges/activity/activity-info/activity-info.js
// pa
ges/activity/activity-info/activity-info.js
...
...
@@ -51,7 +51,19 @@ Page({
})
//step1: 初始化商家及用户数据
if
(
wx
.
getStorageSync
(
'nyxCode'
))
{
var
nyxCode
=
wx
.
getStorageSync
(
'nyxCode'
);
//不存在
if
(
!
nyxCode
)
{
//注册新用户
console
.
log
(
"===onLoad_regUser"
)
wx
.
clearStorageSync
(
'nyxCode'
);
var
nyxCode
=
"uid_"
+
util
.
wxuuid
()
wx
.
setStorageSync
(
'nyxCode'
,
nyxCode
);
app
.
globalData
.
nyxCode
=
nyxCode
;
app
.
regUser
(
nyxCode
);
// nyxCode, userInfo, authStatus: storage, globalData
}
else
{
_this
.
setData
({
nyxCode
:
wx
.
getStorageSync
(
'nyxCode'
),
userInfo
:
wx
.
getStorageSync
(
'userInfo'
),
...
...
@@ -84,27 +96,50 @@ Page({
//step3: 获取products, 活动的具体类别
_this
.
getProducts
(
activityInfo
[
'activity_id'
])
//step4: 初始化 likeDictStorage
if
(
!
wx
.
getStorageSync
(
'likeDictStorage'
))
{
var
likeDictStorage
=
{}
wx
.
setStorageSync
(
'likeDictStorage'
,
likeDictStorage
)
}
else
{
var
likeDictStorage
=
wx
.
getStorageSync
(
'likeDictStorage'
)
if
(
likeDictStorage
.
hasOwnProperty
([
activityInfo
[
'activity_id'
]])
&&
likeDictStorage
[
activityInfo
[
'activity_id'
]]
==
1
)
{
//同步更新likeStatus和likeUrl
var
likeStatus
=
1
var
likeUrl
=
"../../../icon/activity/like_selected.png"
_this
.
setData
({
likeStatus
:
likeStatus
,
likeUrl
:
likeUrl
,
})
// step4 确定member信息, 写入 data.members
let
promise_member
=
new
Promise
(
function
(
resolve
,
reject
)
{
app
.
getMemberInfo
(
0
,
1
,
20
,
resolve
,
reject
);
})
promise_member
.
then
(
function
(
value
){
var
members
=
wx
.
getStorageSync
(
'members'
)
var
memberInfo
=
wx
.
getStorageSync
(
'memberInfo'
)
_this
.
setData
({
memberInfo
,
members
})
console
.
log
(
"===enter promise_member then_passed_"
+
value
)
},
function
(
value
){
console
.
log
(
"===enter promise_member then_failed_"
+
value
)
},
);
// step5 数据载入页面, 初始化
// 初始载入'我已收藏'的清单, 存入storage
let
promise_like
=
new
Promise
(
function
(
resolve
,
reject
)
{
app
.
getCollectsStorage
(
0
,
1
,
100
,
resolve
,
reject
);
})
promise_like
.
then
(
function
(
value
){
var
likeDictStorage
=
wx
.
getStorageSync
(
'likeDictStorage'
)
if
(
likeDictStorage
.
hasOwnProperty
([
activityInfo
[
'activity_id'
]])
&&
likeDictStorage
[
activityInfo
[
'activity_id'
]]
==
1
)
{
//同步更新likeStatus和likeUrl
var
likeStatus
=
1
var
likeUrl
=
"../../../icon/activity/like_selected.png"
_this
.
setData
({
likeStatus
:
likeStatus
,
likeUrl
:
likeUrl
,
})
}
console
.
log
(
"===enter promise_like then_passed_"
+
value
)
},
function
(
value
){
console
.
log
(
"===enter promise_like then_failed_"
+
value
)
}
}
)
},
...
...
增值产品-小程序及app/nyx-master/pages/activity/activity.js
查看文件 @
b1f5f5b4
// pa
ges/activity/activity.js
// pa
ges/activity/activity.js
...
...
@@ -84,9 +84,10 @@ Page({
var
_this
=
this
;
//入口页面,先确定nyxCode
/*step1 先确定用户信息 */
/*step1 先确定用户信息
-- global page 需求
*/
var
nyxCode
=
wx
.
getStorageSync
(
'nyxCode'
);
//step2 确定城市信息
//step2 确定城市信息 -- local page 需求
var
LatestCityList
=
wx
.
getStorageSync
(
'LatestCityList'
)
||
[]
if
(
LatestCityList
.
length
>
0
)
{
...
...
@@ -109,7 +110,7 @@ Page({
var
nyxCode
=
"uid_"
+
util
.
wxuuid
()
wx
.
setStorageSync
(
'nyxCode'
,
nyxCode
);
app
.
globalData
.
nyxCode
=
nyxCode
;
app
.
regUser
(
nyxCode
);
app
.
regUser
(
nyxCode
);
// nyxCode, userInfo, authStatus: storage, globalData
}
else
//存在
{
...
...
@@ -147,32 +148,28 @@ Page({
}
// step3 确定member信息, 写入 data.members
_this
.
getMemberInfo
(
0
,
1
,
20
)
var
device
=
wx
.
getSystemInfoSync
()
//self.device = app.globalData.myDevice
// jscat miniprogram default width is 750rpx
var
deviceRatio
=
device
.
windowWidth
/
750
var
winWidth
=
device
.
windowWidth
*
deviceRatio
var
noteHeight
=
device
.
windowHeight
-
(
40
-
60
)
_this
.
setData
({
searchHeight
:
40
,
navHeight
:
40
,
noteTop
:
(
40
+
40
),
noteHeight
:
noteHeight
,
deviceRatio
:
deviceRatio
,
let
promise_member
=
new
Promise
(
function
(
resolve
,
reject
)
{
app
.
getMemberInfo
(
0
,
1
,
20
,
resolve
,
reject
);
})
wx
.
setNavigationBarTitle
({
title
:
'酒肆活动'
,
})
// step4 数据载入页面, 初始化
promise_member
.
then
(
function
(
value
){
var
members
=
wx
.
getStorageSync
(
'members'
)
var
memberInfo
=
wx
.
getStorageSync
(
'memberInfo'
)
_this
.
setData
({
memberInfo
,
members
})
console
.
log
(
"===enter promise_member then_passed_"
+
value
)
},
function
(
value
){
console
.
log
(
"===enter promise_member then_failed_"
+
value
)
},
);
// step4 数据载入页面, 初始化 - global page
// 初始载入'我已收藏'的清单, 存入storage
wx
.
setStorageSync
(
'likeDictStorage'
,
{})
_this
.
getCollectsStorage
(
0
,
1
,
100
);
app
.
getCollectsStorage
(
0
,
1
,
100
,
resolve
,
reject
);
// step5 初始载入四个推荐的
竞答活动
// step5 初始载入四个推荐的
活动 - local page
if
(
_this
.
__data__
.
activities
.
length
==
0
)
{
var
switchId
=
app
.
globalData
.
switchId
...
...
@@ -189,7 +186,7 @@ Page({
}
// step6 event 订阅, 主要接受activity-info.js里 emit 发送的消息
// step6 event 订阅, 主要接受activity-info.js里 emit 发送的消息
local page
event
.
on
(
'LikeChanged'
,
this
,
function
(
data
)
{
var
activity_id
=
data
[
'activity_id'
]
var
num_like
=
data
[
'num_like'
]
...
...
@@ -207,6 +204,25 @@ Page({
})
})
// step7 窗口初始化
var
device
=
wx
.
getSystemInfoSync
()
//self.device = app.globalData.myDevice
// jscat miniprogram default width is 750rpx
var
deviceRatio
=
device
.
windowWidth
/
750
var
winWidth
=
device
.
windowWidth
*
deviceRatio
var
noteHeight
=
device
.
windowHeight
-
(
40
-
60
)
_this
.
setData
({
searchHeight
:
40
,
navHeight
:
40
,
noteTop
:
(
40
+
40
),
noteHeight
:
noteHeight
,
deviceRatio
:
deviceRatio
,
})
wx
.
setNavigationBarTitle
({
title
:
'酒肆活动'
,
})
},
/**
...
...
@@ -573,104 +589,6 @@ Page({
},
// 获取collects数据
// scrollType: 是否是翻页
// tips; 该函数是my-collects函数的简略版, 而且是单次运行的
getCollectsStorage
:
function
(
scrollType
,
pageNum
,
pageCount
)
{
var
_this
=
this
;
var
userId
=
_this
.
__data__
.
nyxCode
var
query_url
=
'&userId='
+
userId
var
strUrl
=
config
.
collect_query_url
+
"?pageCount="
+
pageCount
+
"&pageNum="
+
pageNum
+
query_url
config
.
debug
==
1
?
console
.
log
(
"===strUrl is:
\"
"
+
strUrl
+
"
\"
"
)
:
""
wx
.
request
({
url
:
strUrl
,
method
:
'GET'
,
header
:
{
'Cookie'
:
wx
.
getStorageSync
(
'cookieKey'
),
},
success
:
function
(
res
)
{
if
(
res
.
data
.
resultCode
==
200
)
{
//表示HTTP请求成功
console
.
log
(
res
.
data
);
// 设置全局的点赞标记 step1
var
likeDictStorage
=
wx
.
getStorageSync
(
'likeDictStorage'
)
||
{}
for
(
var
i
=
0
;
i
<
res
.
data
.
data
.
length
;
i
++
)
{
var
result
=
{}
result
[
"activity_id"
]
=
res
.
data
.
data
[
i
].
activityId
// 设置全局的点赞标记 step2
likeDictStorage
[
result
[
"activity_id"
]]
=
1
}
// 设置全局的点赞标记 step3
wx
.
setStorageSync
(
'likeDictStorage'
,
likeDictStorage
)
}
}
})
},
// 获取member_user info 数据
// scrollType: 是否是翻页
// tips; 该函数是my-collects函数的简略版, 而且是单次运行的
getMemberInfo
:
function
(
scrollType
,
pageNum
,
pageCount
)
{
var
_this
=
this
;
var
userId
=
_this
.
__data__
.
nyxCode
var
query_url
=
'&userId='
+
userId
var
strUrl
=
config
.
user_member_query_url
+
"?pageCount="
+
pageCount
+
"&pageNum="
+
pageNum
+
query_url
config
.
debug
==
1
?
console
.
log
(
"===strUrl is:
\"
"
+
strUrl
+
"
\"
"
)
:
""
wx
.
request
({
url
:
strUrl
,
method
:
'GET'
,
header
:
{
'Cookie'
:
wx
.
getStorageSync
(
'cookieKey'
),
},
success
:
function
(
res
)
{
if
(
res
.
data
.
resultCode
==
200
)
{
//表示HTTP请求成功
console
.
log
(
res
.
data
);
var
members
=
[]
var
memberInfo
=
{}
if
(
res
.
data
.
data
.
length
>
0
)
{
for
(
var
i
=
0
;
i
<
res
.
data
.
data
.
length
;
i
++
)
{
var
result
=
{}
result
[
"member_id"
]
=
res
.
data
.
data
[
i
].
memberId
result
[
"address_id"
]
=
res
.
data
.
data
[
i
].
addressId
result
[
"default_member"
]
=
res
.
data
.
data
[
i
].
defaultMember
result
[
"member_name"
]
=
res
.
data
.
data
[
i
].
memberName
result
[
"member_address"
]
=
res
.
data
.
data
[
i
].
addressName
result
[
"member_slogan"
]
=
res
.
data
.
data
[
i
].
memberSlogan
==
undefined
?
""
:
res
.
data
.
data
[
i
].
memberSlogan
result
[
"member_logo"
]
=
res
.
data
.
data
[
i
].
memberLogo
members
.
push
(
result
)
}
}
// 设置
wx
.
setStorageSync
(
'members'
,
members
)
wx
.
setStorageSync
(
'memberInfo'
,
members
[
0
])
app
.
globalData
.
memberInfo
=
members
[
0
]
app
.
globalData
.
members
=
members
memberInfo
=
members
[
0
]
_this
.
setData
({
memberInfo
})
}
}
})
},
})
//通过Promise方式为wx.request添加同步操作
...
...
增值产品-小程序及app/nyx-master/pages/member/activity-post/activity-submit/activity-submit.js
查看文件 @
b1f5f5b4
// pa
ges/member/activity-post/activity-submit/activity-submit.js
// pa
ges/member/activity-post/activity-submit/activity-submit.js
...
...
@@ -723,7 +723,7 @@ Page({
},
fail
:
function
(
err
)
{
console
.
log
(
"fail to upload file"
,
err
.
errMsg
)
reject
(
new
Error
(
'failed to upload file'
));
reject
(
new
Error
(
'failed to upload file'
));
},
complete
:
function
()
{
console
.
log
(
"complete to upload file"
);
...
...
增值产品-小程序及app/nyx-master/project.config.json
查看文件 @
b1f5f5b4
{
{
...
...
@@ -18,7 +18,7 @@
"disablePlugins"
:
[],
"outputPath"
:
""
},
"useCompilerModule"
:
tru
e
,
"useCompilerModule"
:
fals
e
,
"userConfirmedUseCompilerModuleSwitch"
:
false
},
"compileType"
:
"miniprogram"
,
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论