Commit b1f5f5b4 by jscat

nyx weapp: 功能调整

1. 信息详情页(activity-info)转发的时候,用户加载时候不存在nyxCode, member数据和like数据
加载到onLoad()里
parent 1775af20
//app.js //app.js
...@@ -239,6 +239,7 @@ App({ ...@@ -239,6 +239,7 @@ App({
regUser: function (uuid) { regUser: function (uuid) {
var _this = this; var _this = this;
_this.globalData.nyxCode = uuid; _this.globalData.nyxCode = uuid;
_this.globalData.authStatus = "00";
wx.setStorageSync('nyxCode', uuid) wx.setStorageSync('nyxCode', uuid)
wx.setStorageSync('authStatus', "00") wx.setStorageSync('authStatus', "00")
var userInfo = {} var userInfo = {}
...@@ -477,5 +478,108 @@ App({ ...@@ -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
//config.js API全局域名配置 //config.js API全局域名配置
...@@ -3,19 +3,21 @@ ...@@ -3,19 +3,21 @@
// env = 0; //本地java测试,需要启动java后台 // env = 0; //本地java测试,需要启动java后台
// env = 1; //阿里云服务器测试版本 // env = 1; //阿里云服务器测试版本
// env = 2; //阿里云服务器生产版本 // env = 2; //阿里云服务器生产版本
var env = 0;; var env = 0;
var debug = 0; //是否打印调试信息 var debug = 0; //是否打印调试信息
var host_key = "https://fun.hisuhong.com"; var host_key = "https://fun.hisuhong.com";
var login_url = "https://fun.hisuhong.com"; var login_url = "https://fun.hisuhong.com";
var socket_url = "" var socket_url = ""
//https://fun.hisuhong.com/swagger-ui.html
if(env == 2) if(env == 2)
{ {
host_key = "https://fun.hisuhong.com"; host_key = "https://fun.hisuhong.com";
login_url = "https://fun.hisuhong.com"; login_url = "https://fun.hisuhong.com";
socket_url = "wss://wssfun.hisuhong.com" socket_url = "wss://wssfun.hisuhong.com"
} }
//https://wx.hisuhong.com/swagger-ui.html
else if(env == 1) else if(env == 1)
{ {
debug = 1 debug = 1
......
// pages/activity/activity-info/activity-info.js // pages/activity/activity-info/activity-info.js
...@@ -51,7 +51,19 @@ Page({ ...@@ -51,7 +51,19 @@ Page({
}) })
//step1: 初始化商家及用户数据 //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({ _this.setData({
nyxCode: wx.getStorageSync('nyxCode'), nyxCode: wx.getStorageSync('nyxCode'),
userInfo: wx.getStorageSync('userInfo'), userInfo: wx.getStorageSync('userInfo'),
...@@ -84,27 +96,50 @@ Page({ ...@@ -84,27 +96,50 @@ Page({
//step3: 获取products, 活动的具体类别 //step3: 获取products, 活动的具体类别
_this.getProducts(activityInfo['activity_id']) _this.getProducts(activityInfo['activity_id'])
//step4: 初始化 likeDictStorage // step4 确定member信息, 写入 data.members
if (!wx.getStorageSync('likeDictStorage')) { let promise_member = new Promise(function (resolve, reject) {
var likeDictStorage = {} app.getMemberInfo(0, 1, 20, resolve, reject);
wx.setStorageSync('likeDictStorage', likeDictStorage) })
}
else promise_member.then(
{ function (value){
var likeDictStorage = wx.getStorageSync('likeDictStorage') var members = wx.getStorageSync('members')
if(likeDictStorage.hasOwnProperty([activityInfo['activity_id']]) var memberInfo = wx.getStorageSync('memberInfo')
&& likeDictStorage[activityInfo['activity_id']] == 1 ) _this.setData({ memberInfo, members})
{ console.log("===enter promise_member then_passed_" + value)
//同步更新likeStatus和likeUrl },
var likeStatus = 1 function (value){
var likeUrl = "../../../icon/activity/like_selected.png" console.log("===enter promise_member then_failed_" + value)
},
_this.setData({ );
likeStatus: likeStatus,
likeUrl: likeUrl, // 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)
} }
} )
}, },
......
// pages/activity/activity.js // pages/activity/activity.js
...@@ -84,9 +84,10 @@ Page({ ...@@ -84,9 +84,10 @@ Page({
var _this = this; var _this = this;
//入口页面,先确定nyxCode //入口页面,先确定nyxCode
/*step1 先确定用户信息 */ /*step1 先确定用户信息 -- global page 需求 */
var nyxCode = wx.getStorageSync('nyxCode'); var nyxCode = wx.getStorageSync('nyxCode');
//step2 确定城市信息
//step2 确定城市信息 -- local page 需求
var LatestCityList = wx.getStorageSync('LatestCityList') || [] var LatestCityList = wx.getStorageSync('LatestCityList') || []
if( LatestCityList.length > 0 ) if( LatestCityList.length > 0 )
{ {
...@@ -109,7 +110,7 @@ Page({ ...@@ -109,7 +110,7 @@ Page({
var nyxCode = "uid_" + util.wxuuid() var nyxCode = "uid_" + util.wxuuid()
wx.setStorageSync('nyxCode', nyxCode); wx.setStorageSync('nyxCode', nyxCode);
app.globalData.nyxCode = nyxCode; app.globalData.nyxCode = nyxCode;
app.regUser(nyxCode); app.regUser(nyxCode); // nyxCode, userInfo, authStatus: storage, globalData
} }
else //存在 else //存在
{ {
...@@ -147,32 +148,28 @@ Page({ ...@@ -147,32 +148,28 @@ Page({
} }
// step3 确定member信息, 写入 data.members // step3 确定member信息, 写入 data.members
_this.getMemberInfo(0, 1, 20) let promise_member = new Promise(function (resolve, reject) {
app.getMemberInfo(0, 1, 20, resolve, reject);
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: '酒肆活动',
})
// 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 // 初始载入'我已收藏'的清单, 存入storage
wx.setStorageSync('likeDictStorage', {}) 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) if(_this.__data__.activities.length == 0)
{ {
var switchId = app.globalData.switchId var switchId = app.globalData.switchId
...@@ -189,7 +186,7 @@ Page({ ...@@ -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) { event.on('LikeChanged', this, function(data) {
var activity_id = data['activity_id'] var activity_id = data['activity_id']
var num_like = data['num_like'] var num_like = data['num_like']
...@@ -207,6 +204,25 @@ Page({ ...@@ -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({ ...@@ -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添加同步操作 //通过Promise方式为wx.request添加同步操作
......
// pages/member/activity-post/activity-submit/activity-submit.js // pages/member/activity-post/activity-submit/activity-submit.js
...@@ -723,7 +723,7 @@ Page({ ...@@ -723,7 +723,7 @@ Page({
}, },
fail: function (err) { fail: function (err) {
console.log("fail to upload file", err.errMsg) console.log("fail to upload file", err.errMsg)
reject(new Error('failed to upload file')); reject(new Error('failed to upload file'));
}, },
complete: function () { complete: function () {
console.log("complete to upload file"); console.log("complete to upload file");
......
{ {
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
"disablePlugins": [], "disablePlugins": [],
"outputPath": "" "outputPath": ""
}, },
"useCompilerModule": true, "useCompilerModule": false,
"userConfirmedUseCompilerModuleSwitch": false "userConfirmedUseCompilerModuleSwitch": false
}, },
"compileType": "miniprogram", "compileType": "miniprogram",
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论