Skip to content

7
7-Eleven
Commit 5a41e79c by 高淑倩
Options

Merge branch 'dev_7.1.0' of ssh://gitlab.bigaka.net:2287/gaoshq/7-Eleven into dev_7.1.0

parents 3faeac9b ab234d12
Showing with 97 additions and 30 deletions
src/pages/addAddress/addAddress.js
......@@ -53,6 +53,7 @@ wxService.page({
* 生命周期函数--监听页面显示
*/
onShow: function () {
const { memberId } = wx.getStorageSync('_baseUserInfo')
this.init()
if(this.data.id){
this.getAddressInfo()
......
src/pages/category/category.js
......@@ -44,6 +44,7 @@ wxService.page({
* 生命周期函数--监听页面显示
*/
onShow: function () {
const { memberId, member } = wx.getStorageSync('_baseUserInfo')
if (typeof this.getTabBar === 'function' &&
this.getTabBar()) {
this.getTabBar().setData({
......@@ -130,6 +131,7 @@ wxService.page({
onShareAppMessage: function (res) {
//修改为参数memberId
const { memberId, member } = wx.getStorageSync('_baseUserInfo')
var path = `pages/category/category`;
if (memberId) {
let m = Integer.digit(memberId, 10, 64);
......
src/pages/extendProduct/extendProduct.js
......@@ -316,6 +316,7 @@ wxService.page({
* 生命周期函数--监听页面显示
*/
onShow: function () {
const { memberId, member } = wx.getStorageSync('_baseUserInfo')
this.getExtendProBanner()
this.getExtendProList(1,10)
this.data.currentShareContent = null;
......@@ -384,15 +385,17 @@ wxService.page({
imageUrl: this.data.proData[0].productImgUrl, // 可以更换分享的图片
}
}else{
const { memberId, member } = wx.getStorageSync('_baseUserInfo')
//修改为参数memberId
var path = `pages/extendProduct/extendProduct`;
console.log('推广商品memberId-----', memberId)
if (memberId){
let m = Integer.digit(memberId, 10, 64);
path = `pages/extendProduct/extendProduct?m=${m}`;
}
return {
path: path,
imageUrl: this.data.extendProList[0].productImgUrl,
imageUrl: this.data.extendProList && this.data.extendProList.length > 0 ? this.data.extendProList[0].productImgUrl : '',
}
}
}
......
src/pages/myAddress/myAddress.js
......@@ -44,6 +44,7 @@ wxService.page({
* 生命周期函数--监听页面显示
*/
onShow: function () {
const { memberId, member } = wx.getStorageSync('_baseUserInfo')
this.getAddressList()
},
......
src/pages/myShare/myShare.js
......@@ -60,6 +60,7 @@ wxService.page({
* 生命周期函数--监听页面显示
*/
onShow() {
const { memberId, member } = wx.getStorageSync('_baseUserInfo')
let time = Date.parse(new Date())
if (member && member.premiumExpireTime && member.premiumExpireTime > time) {
this.setData({
......@@ -194,7 +195,7 @@ wxService.page({
// 分享
_onTapShare(e){
const { memberId, member } = wx.getStorageSync('_baseUserInfo')
let tentacleInfo = {
content: JSON.stringify(e.detail),
contentId: e.detail.id,
......@@ -265,6 +266,7 @@ wxService.page({
}
} else{
//修改为参数memberId
const { memberId, member } = wx.getStorageSync('_baseUserInfo')
var path = `pages/myShare/myShare`;
if (memberId) {
let m = Integer.digit(memberId, 10, 64);
......
src/pages/pointDetail/pointDetail.js
......@@ -248,6 +248,7 @@ wxService.page({
* 生命周期函数--监听页面显示
*/
onShow: function () {
const { memberId, member } = wx.getStorageSync('_baseUserInfo')
// 登录接口返回err
const reLoginErrFlag = wx.getStorageSync('reLoginErr')
const baseUserInfo = wx.getStorageSync('_baseUserInfo')
......@@ -322,6 +323,7 @@ wxService.page({
*/
onShareAppMessage: function () {
//修改为参数memberId
const { memberId, member } = wx.getStorageSync('_baseUserInfo')
var path = `pages/pointDetail/pointDetail`;
if (memberId) {
let m = Integer.digit(memberId, 10, 64);
......
src/pages/pointList/pointList.js
......@@ -41,6 +41,7 @@ wxService.page({
* 生命周期函数--监听页面显示
*/
onShow() {
const { memberId, member } = wx.getStorageSync('_baseUserInfo')
this.getPointList()
},
getPointList() {
......@@ -170,6 +171,7 @@ wxService.page({
*/
onShareAppMessage: function () {
//修改为参数memberId
const { memberId, member } = wx.getStorageSync('_baseUserInfo')
var path = `pages/pointList/pointList`;
if (memberId) {
let m = Integer.digit(memberId, 10, 64);
......
src/pages/productDetail/productDetail.js
......@@ -3,7 +3,6 @@ var app = getApp()
const wxService = require('../../utils/wxService')
import { Integer } from '../../utils/integerDigitalConvertion'
const utils = require('../../utils/util')
const { memberId, member } = wx.getStorageSync('_baseUserInfo')
wxService.page({
/**
......@@ -31,7 +30,6 @@ wxService.page({
* 生命周期函数--监听页面加载
*/
onLoad: function (options) {
wx.hideShareMenu();
if (options && options.id) {
this.setData({
productId: options.id,
......@@ -43,10 +41,28 @@ wxService.page({
wx.removeStorageSync('TIME_EXPIRATION');
}
}
let memberId = options.memberId;
if (memberId) {
let content = {
title: this.data.productInfo.productName,
id: this.data.productInfo.productId,
url: this.data.productInfo.indexUrl
}
let tentacleInfo = {
content: JSON.stringify(content),
contentId: this.data.productInfo.productId,
tentacleId: memberId,
contentType: app.globalData.contants.SHARE_TYPE.PRODUCT_DETAIL, //内容类型
title: this.data.productInfo.productName, //标题
type: 3// 1:门店,2:员工(暂时不做),3:会员,4:第三方外部渠道,5:智能营销
}
this.generatePointObject(tentacleInfo);
}
},
swiperChange(e) {
console.log(e)
this.setData({
swiperCurrent: e.detail.current
})
......@@ -114,6 +130,7 @@ wxService.page({
* 生命周期函数--监听页面显示
*/
onShow: function () {
const { memberId, member } = wx.getStorageSync('_baseUserInfo')
this.getProInfo()
this.getOpenStatus()
this.data.currentShareContent = null
......@@ -287,13 +304,38 @@ wxService.page({
* 用户点击右上角分享
*/
onShareAppMessage: function (res) {
let id = Integer.digit(this.data.currentShareContent.id, 10, 64);
let tentacleId = Integer.digit(this.data.currentShareContent.tentacleId, 10, 64);
var path = 'pages/productDetail/productDetail?i=' + id + '&t=' + tentacleId;
console.log(path)
return {
path: path,
imageUrl: this.data.productInfo.indexUrl, // 可以更换分享的图片
// let id = Integer.digit(this.data.currentShareContent.id, 10, 64);
// let tentacleId = Integer.digit(this.data.currentShareContent.tentacleId, 10, 64);
// var path = 'pages/productDetail/productDetail?i=' + id + '&t=' + tentacleId;
// console.log(path)
// return {
// path: path,
// imageUrl: this.data.productInfo.indexUrl, // 可以更换分享的图片
// }
if (res.from != 'menu') {
let id = Integer.digit(this.data.currentShareContent.id, 10, 64);
let tentacleId = Integer.digit(this.data.currentShareContent.tentacleId, 10, 64);
var path = 'pages/productDetail/productDetail?i=' + id + '&t=' + tentacleId;
console.log(path)
return {
path: path,
imageUrl: this.data.productInfo.indexUrl
}
} else {
//修改为参数memberId
var path = `pages/productDetail/productDetail`;
const { memberId, member } = wx.getStorageSync('_baseUserInfo')
console.log('--------------------memberId-=---', memberId)
if (memberId) {
let m = Integer.digit(memberId, 10, 64);
let contentId = Integer.digit(this.data.productInfo.productId, 10, 64);
path = `pages/productDetail/productDetail?i=${contentId}&m=${m}`;
}
return {
path: path,
imageUrl: this.data.productInfo.indexUrl
}
}
}
})
\ No newline at end of file
src/pages/productDetail/productDetail.wxss
......@@ -170,6 +170,7 @@ page{
.product-footer {
background: #ffffff;
position: fixed;
height: 100rpx;
left: 0;
......
src/pages/userCenter/userCenter.js
......@@ -70,6 +70,7 @@ wxService.page({
* 生命周期函数--监听页面显示
*/
onShow() {
const { memberId, member } = wx.getStorageSync('_baseUserInfo')
let tentacleInfo = wx.getStorageSync('TENTACLE_CONTENT');
// 取会员卡号
......@@ -275,7 +276,9 @@ wxService.page({
onShareAppMessage: function (res) {
//修改为参数memberId
const { memberId, member } = wx.getStorageSync('_baseUserInfo')
var path = `pages/userCenter/userCenter`;
console.log('首页memberId------', memberId)
if (memberId) {
let m = Integer.digit(memberId, 10, 64);
path = `pages/userCenter/userCenter?m=${m}`;
......
src/pages/wantToBuyDetail/wantToBuyDetail.js
......@@ -58,6 +58,7 @@ wxService.page({
* 生命周期函数--监听页面显示
*/
onShow() {
const { memberId, member } = wx.getStorageSync('_baseUserInfo')
this.getContentDetail()
this.data.currentShareContent = null;
......@@ -113,6 +114,7 @@ wxService.page({
// 分享
onTapShare() {
const { memberId, member } = wx.getStorageSync('_baseUserInfo')
let content = {
title: this.data.contentInfo.headline,
id: this.data.contentInfo.id,
......@@ -153,6 +155,7 @@ wxService.page({
// 获取内容详情
getContentDetail(){
const { memberId, member } = wx.getStorageSync('_baseUserInfo')
wxService.post(`/merchant/contentMobileTerminal/getContentParticulars`,{
id: this.data.id,
userId: memberId
......@@ -255,6 +258,7 @@ wxService.page({
}else{
//修改为参数memberId
var path = `pages/wantToBuyDetail/wantToBuyDetail`;
const { memberId, member } = wx.getStorageSync('_baseUserInfo')
console.log('--------------------memberId-=---', memberId)
if (memberId) {
let m = Integer.digit(memberId, 10, 64);
......
src/subPackage/page/pages/categoryPro/categoryPro.js
......@@ -70,6 +70,7 @@ wxService.page({
* 生命周期函数--监听页面显示
*/
onShow: function () {
const { memberId, member } = wx.getStorageSync('_baseUserInfo')
this.setData({
'form.sortType': this.data.currentTab
})
......@@ -170,6 +171,7 @@ wxService.page({
onShareAppMessage: function (res) {
//修改为参数memberId
const { memberId, member } = wx.getStorageSync('_baseUserInfo')
var path = `subPackage/page/pages/categoryPro/categoryPro`;
if (memberId) {
let m = Integer.digit(memberId, 10, 64);
......
src/subPackage/page/pages/friendShareList/friendShareList.js
......@@ -52,6 +52,7 @@ wxService.page({
* 生命周期函数--监听页面显示
*/
onShow() {
const { memberId, member } = wx.getStorageSync('_baseUserInfo')
this.getExtendInfo()
this.data.currentShareContent = null;
},
......@@ -125,6 +126,7 @@ wxService.page({
// });
//修改为参数memberId
const { memberId, member } = wx.getStorageSync('_baseUserInfo')
var path = `subPackage/page/pages/friendShareList/friendShareList`;
if (memberId) {
let m = Integer.digit(memberId, 10, 64);
......
src/subPackage/page/pages/friendShareList/friendShareList.json
{
"navigationBarTitleText": "分享列表",
"usingComponents": {}
"usingComponents": {
"go-home": "/component/goHome/goHome"
}
}
\ No newline at end of file
src/subPackage/page/pages/fun/fun.js
......@@ -119,6 +119,7 @@ wxService.page({
*/
onShareAppMessage: function (res) {
//修改为参数memberId
const { memberId, member } = wx.getStorageSync('_baseUserInfo')
var path = `subPackage/page/pages/fun/fun`;
if (memberId) {
let m = Integer.digit(memberId, 10, 64);
......
src/subPackage/page/pages/myRelease/myRelease.js
......@@ -49,6 +49,7 @@ wxService.page({
* 生命周期函数--监听页面显示
*/
onShow() {
const { memberId, member } = wx.getStorageSync('_baseUserInfo')
let time = Date.parse(new Date())
if (member && member.premiumExpireTime && member.premiumExpireTime > time) {
this.setData({
......@@ -191,6 +192,7 @@ wxService.page({
// 分享
_onTapShare(e) {
const { memberId, member } = wx.getStorageSync('_baseUserInfo')
console.log(e)
let tentacleInfo = {
content: JSON.stringify(e.detail),
......@@ -263,6 +265,7 @@ wxService.page({
}
else {
//修改为参数memberId
const { memberId, member } = wx.getStorageSync('_baseUserInfo')
var path = `subPackage/page/pages/myRelease/myRelease`;
if (memberId) {
let m = Integer.digit(memberId, 10, 64);
......
src/subPackage/page/pages/myReleaseDetail/myReleaseDetail.js
......@@ -60,6 +60,7 @@ wxService.page({
// 分享
onTapShare(){
const { memberId, member } = wx.getStorageSync('_baseUserInfo')
let content = {
title: this.data.contentInfo.headline,
id: this.data.contentInfo.id,
......@@ -101,6 +102,7 @@ wxService.page({
// 获取内容详情
getContentDetail() {
const { memberId, member } = wx.getStorageSync('_baseUserInfo')
wxService.post(`/merchant/contentMobileTerminal/terminalContentParticulars`, {
id: this.data.id,
userId: memberId
......@@ -176,6 +178,7 @@ wxService.page({
// 删除
closeDialog(){
const { memberId, member } = wx.getStorageSync('_baseUserInfo')
wxService.post(`/merchant/contentMobileTerminal/contentDelete`, {
id: this.data.contentInfo.id,
userId: memberId
......@@ -199,6 +202,7 @@ wxService.page({
* 生命周期函数--监听页面显示
*/
onShow: function () {
const { memberId, member } = wx.getStorageSync('_baseUserInfo')
if(this.data.id){
this.getContentDetail()
}
......@@ -261,6 +265,7 @@ wxService.page({
}else{
//修改为参数memberId
var path = `pages/wantToBuyDetail/wantToBuyDetail`;
const { memberId, member } = wx.getStorageSync('_baseUserInfo')
console.log('--------------------memberId-=---', memberId)
if (memberId) {
let m = Integer.digit(memberId, 10, 64);
......
src/subPackage/page/pages/subPage/subPage.js
......@@ -59,7 +59,7 @@ wxService.page({
},()=>{
this.initPage(this.data.pageId)
})
},
/**
* 监听子组件事件
......@@ -78,6 +78,7 @@ wxService.page({
* 生命周期函数--监听页面显示
*/
onShow() {
const { memberId, member } = wx.getStorageSync('_baseUserInfo')
console.log('user=============', this.options)
// 取会员卡号
......@@ -267,21 +268,6 @@ wxService.page({
* 用户点击右上角分享
*/
onShareAppMessage: function (res) {
let tentacleInfo = {
content: '首页',
title: '首页',
contentType: app.globalData.contants.SHARE_TYPE.HOME,
type: 3// 1:门店,2:员工(暂时不做),3:会员,4:第三方外部渠道,5:智能营销
};
wxService.getTentacleContent(tentacleInfo).then(res => {
if (res && res.tentacleId) {
let tentacleId = Integer.digit(res.tentacleId, 10, 64);
var path = `pages/userCenter/userCenter?t=${tentacleId}`;
console.log('path', path)
return {
path: `pages/userCenter/userCenter?t=${tentacleId}`
}
}
});
}
})
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment