diff --git a/components/indexCom/barometerChild/index.js b/components/indexCom/barometerChild/index.js index 9b4df80..969403b 100644 --- a/components/indexCom/barometerChild/index.js +++ b/components/indexCom/barometerChild/index.js @@ -64,7 +64,6 @@ Component({ } arr.push(ele.Time) }) - console.log(dName) this.setData({ positiveOption:brokenLine(dName,bar,dColor,arr), }) diff --git a/contrastPackages/eventRatio/weibo/index.js b/contrastPackages/eventRatio/weibo/index.js index 3a10c31..424e26b 100644 --- a/contrastPackages/eventRatio/weibo/index.js +++ b/contrastPackages/eventRatio/weibo/index.js @@ -112,7 +112,6 @@ Component({ data[index].push(j.value) } } - console.log(data); //横轴，数据，纵轴 this.setData({ brandOption4: sHistogram(xMsg, data, ['事件一', '事件二'], dColor) diff --git a/pages/brandCrisis/crisisList/index.wxml b/pages/brandCrisis/crisisList/index.wxml index 4ef1b29..d7a5368 100644 --- a/pages/brandCrisis/crisisList/index.wxml +++ b/pages/brandCrisis/crisisList/index.wxml @@ -31,7 +31,7 @@ - + @@ -58,7 +58,7 @@ - + diff --git a/pages/brandCrisis/index.js b/pages/brandCrisis/index.js index 3c33824..3e61c23 100644 --- a/pages/brandCrisis/index.js +++ b/pages/brandCrisis/index.js @@ -150,7 +150,6 @@ Page({ this.setData({ crisisNum: val.totalNum }) - console.log('cd',val.totalNum > 999) }).then(res => { this.setData({ crisisList: res diff --git a/pages/index/Brandsales/Brandsales.wxml b/pages/index/Brandsales/Brandsales.wxml index 87dbb63..b9a6379 100644 --- a/pages/index/Brandsales/Brandsales.wxml +++ b/pages/index/Brandsales/Brandsales.wxml @@ -36,7 +36,7 @@ - + 结束时间不能小于开始时间 diff --git a/pages/index/Salesranking/Allbrands/Allbrands.wxml b/pages/index/Salesranking/Allbrands/Allbrands.wxml index 4a2282c..9415831 100644 --- a/pages/index/Salesranking/Allbrands/Allbrands.wxml +++ b/pages/index/Salesranking/Allbrands/Allbrands.wxml @@ -41,7 +41,7 @@ - + diff --git a/pages/index/Salesranking/Salesranking.js b/pages/index/Salesranking/Salesranking.js index 987540b..975a354 100644 --- a/pages/index/Salesranking/Salesranking.js +++ b/pages/index/Salesranking/Salesranking.js @@ -72,8 +72,7 @@ Page({ let date = this.getLastMonth(res, i); dateArr.push(date); }; - console.log('xsd',dateArr) - this.setData({dateList: dateArr}); + this.setData({dateList: dateArr, currentDate: dateArr[0]}); }) }, getLastMonth(dt, number = 0) { diff --git a/pages/index/Salesranking/Salesranking.wxml b/pages/index/Salesranking/Salesranking.wxml index 8a7d587..2d3514d 100644 --- a/pages/index/Salesranking/Salesranking.wxml +++ b/pages/index/Salesranking/Salesranking.wxml @@ -12,7 +12,7 @@ - + @@ -95,7 +95,7 @@ 点击加载 --> - + diff --git a/pages/index/detailedvolume/detailedvolume.wxml b/pages/index/detailedvolume/detailedvolume.wxml index cef6c25..cab35d2 100644 --- a/pages/index/detailedvolume/detailedvolume.wxml +++ b/pages/index/detailedvolume/detailedvolume.wxml @@ -21,5 +21,5 @@ - + \ No newline at end of file diff --git a/pages/insight/pages/brandInsight/brandDataList/index.wxml b/pages/insight/pages/brandInsight/brandDataList/index.wxml index e263ce5..528673a 100644 --- a/pages/insight/pages/brandInsight/brandDataList/index.wxml +++ b/pages/insight/pages/brandInsight/brandDataList/index.wxml @@ -70,7 +70,7 @@ - + diff --git a/pages/insight/pages/eventInsight/evDatalist/index.wxml b/pages/insight/pages/eventInsight/evDatalist/index.wxml index 3615b4d..2e2a9ed 100644 --- a/pages/insight/pages/eventInsight/evDatalist/index.wxml +++ b/pages/insight/pages/eventInsight/evDatalist/index.wxml @@ -72,7 +72,7 @@ - + diff --git a/pages/insight/pages/modalInsight/modalDataList/index.wxml b/pages/insight/pages/modalInsight/modalDataList/index.wxml index 278b35f..fdd8f49 100644 --- a/pages/insight/pages/modalInsight/modalDataList/index.wxml +++ b/pages/insight/pages/modalInsight/modalDataList/index.wxml @@ -70,7 +70,7 @@ - + diff --git a/pages/insight/pages/themeList/index.wxml b/pages/insight/pages/themeList/index.wxml index 09693bb..b053497 100644 --- a/pages/insight/pages/themeList/index.wxml +++ b/pages/insight/pages/themeList/index.wxml @@ -104,7 +104,7 @@ - + diff --git a/pages/mine/index.js b/pages/mine/index.js index 0b6508a..5f378cf 100644 --- a/pages/mine/index.js +++ b/pages/mine/index.js @@ -28,16 +28,21 @@ Page({ }, // 上传头像的验证 beforeRead(event) { - const { file, callback } = event.detail; + const { + file, + callback + } = event.detail; callback(file.type === 'image'); }, // 上传图片 afterRead(event) { - const { file } = event.detail; + const { + file + } = event.detail; let url = file.url; let base64 = wx.getFileSystemManager().readFileSync(url, "base64"); let unionID = wx.getStorageSync('unionID'); - if(!unionID) { + if (!unionID) { return false; } let obj = { @@ -56,7 +61,7 @@ Page({ }) }, getUser() { - if(wx.getStorageSync("userInfo")) { + if (wx.getStorageSync("userInfo")) { let userInfo = wx.getStorageSync("userInfo"); this.setData({ nickName: userInfo.nickName, @@ -77,19 +82,31 @@ Page({ }, layout() { let that = this; - wx.showModal({ - title: '提示', - content: "确定要退出嘛？", - success(res) { - if(res.confirm) { - wx.setStorageSync("userInfo", null); - wx.setStorageSync("token", ""); - wx.setStorageSync("openid", ""); - that.getUser(); - } + let obj = { + action: 'LogOut', + openid: wx.getStorageSync('openid'), + token: wx.getStorageSync('token') || 't%2BrswgjvzGM=' + } + app.globalData.request(obj, (res => { + if (res.Code == 1) { + wx.showModal({ + title: '提示', + content: "确定要退出嘛？", + success(res) { + if (res.confirm) { + wx.setStorageSync("userInfo", null); + wx.setStorageSync("token", ""); + wx.setStorageSync("openid", ""); + that.getUser(); + } + } + }) + } else { + wx.showModal({ + title: '提示', + content: err.Msg, + }) } - }) - + })) } - }); \ No newline at end of file diff --git a/pages/mine/pages/myReport/index.wxml b/pages/mine/pages/myReport/index.wxml index 3f36b8c..d9ec4b2 100644 --- a/pages/mine/pages/myReport/index.wxml +++ b/pages/mine/pages/myReport/index.wxml @@ -11,6 +11,6 @@ - + \ No newline at end of file diff --git a/pages/mine/pages/register/register.js b/pages/mine/pages/register/register.js index 7bc0b13..14bd20d 100644 --- a/pages/mine/pages/register/register.js +++ b/pages/mine/pages/register/register.js @@ -3,261 +3,303 @@ const app = getApp() import timer from '../../../../utils/timer' Page({ - /** - * 页面的初始数据 - */ - data: { - sUserName: '', - sPwd: '', - sPhone: '', - sEmail: '', - companyName: '', - brandName: '', - sVerifycode: '', - captchaLabel: '获取验证码', - captchaDisabled: false - }, - //用户输入 - usernameInput(e) { - this.setData({ - sUserName: e.detail.value - }) - }, - //密码输入 - passwordInput(e) { - this.setData({ - sPwd: e.detail.value - }) - }, - //手机号输入 - sPhoneInput(e) { - this.setData({ - sPhone: e.detail.value - }) - }, - //邮箱输入 - sEmailInput(e) { - this.setData({ - sEmail: e.detail.value - }) - }, - //名称输入 - companyInput(e) { - this.setData({ - companyName: e.detail.value - }) - }, - //品牌输入 - brandInput(e) { - this.setData({ - brandName: e.detail.value - }) - }, - //验证码输入 - codeInput(e) { - this.setData({ - sVerifycode: e.detail.value - }) - }, - //获取验证码 - captcha() { - let b = this.validPhone(); - if (!b) return; - let obj = { - action: 'getVERCode', - sPhone: this.data.sPhone, - } - app.globalData.request(obj).then(res => { - // 定时60s - timer(this) - if (res.Code == 1) { - wx.showModal({ - title: '提示', - content: data.Msg, - + /** + * 页面的初始数据 + */ + data: { + sUserName: '', + sPwd: '', + sPhone: '', + sEmail: '', + companyName: '', + brandName: '', + sVerifycode: '', + captchaLabel: '获取验证码', + captchaDisabled: false + }, + //用户输入 + usernameInput(e) { + this.setData({ + sUserName: e.detail.value }) - } - }).catch(err => { - wx.showModal({ - title: '提示', - content: err.Msg, - }) - }) - }, - /** - * 生命周期函数--监听页面加载 - */ - //提交审核 - Submit() { - let a = this.validfrom(); - if (!a) return; - let obj = { - action: 'regUser', - sUserName: this.data.sUserName, - sPwd: this.data.sPwd, - sPhone: this.data.sPhone, - sEmail: this.data.sEmail, - companyName: this.data.companyName, - brandName: this.data.brandName, - sVerifycode: this.data.sVerifycode, - } - app.globalData.request(obj).then((res) => { - wx.showModal({ - title: '提示', - content: data.Msg, - }) - }).catch(err => { - wx.showModal({ - title: '提示', - content: err.Msg, - }) - }) - }, - validPhone() { - let b = true; - let sPhone = this.data.sPhone; - //验证手机号 - if (!this.data.sPhone) { - wx.showModal({ - title: '提示', - content: "手机号不能为空", - }) - b = false; - return b; - } - //验证手机格式 - if (!(/^1[34578]\d{9}$/.test(sPhone))) { - wx.showModal({ - title: '提示', - content: "手机格式错误", - }) - b = false - return b; - } - return b; - }, - validfrom() { - let a = true; - //验证用户名 - if (!this.data.sUserName) { - wx.showModal({ - title: '提示', - content: "用户名不能为空", - }) - a = false; - return a; - } - //验证密码 - if (!this.data.sPwd) { - wx.showModal({ - title: '提示', - content: "密码不能为空", - }) - a = false; - return a; - } - //验证手机号 - if (!this.data.sPhone) { - wx.showModal({ - title: '提示', - content: "手机号不能为空", - }) - a = false; - return a; - } - //验证邮箱 - if (!this.data.sEmail) { - wx.showModal({ - title: '提示', - content: "邮箱不能为空", - }) - a = false; - return a; - } - //验证公司名称 - if (!this.data.companyName) { - wx.showModal({ - title: '提示', - content: "公司名称不能为空", - }) - a = false; - return a; - } - //验证品牌 - if (!this.data.brandName) { - wx.showModal({ - title: '提示', - content: "公司品牌不能为空", - }) - a = false; - return a; - } - //验证验证码 - if (!this.data.sVerifycode) { - wx.showModal({ - title: '提示', - content: "验证码不能为空", - }) - a = false; - return a; - } - return a; - }, - handlerBack() { - wx.navigateBack({ - delta: 1 - }); - }, - onLoad(options) { + }, + //密码输入 + passwordInput(e) { + this.setData({ + sPwd: e.detail.value + }) + }, + //手机号输入 + sPhoneInput(e) { + this.setData({ + sPhone: e.detail.value + }) + }, + //邮箱输入 + sEmailInput(e) { + this.setData({ + sEmail: e.detail.value + }) + }, + //名称输入 + companyInput(e) { + this.setData({ + companyName: e.detail.value + }) + }, + //品牌输入 + brandInput(e) { + this.setData({ + brandName: e.detail.value + }) + }, + //验证码输入 + codeInput(e) { + this.setData({ + sVerifycode: e.detail.value + }) + }, - }, + //获取验证码 + captcha() { + let b = this.validPhone(); + if (!b) return; + let obj = { + action: 'getVERCode', + sPhone: this.data.sPhone, + } + app.globalData.request(obj).then(res => { + // 定时60s + timer(this) + if (res.Code == 1) { + wx.showModal({ + title: '提示', + content: data.Msg, - /** - * 生命周期函数--监听页面初次渲染完成 - */ - onReady() { + }) + } + }).catch(err => { + wx.showModal({ + title: '提示', + content: err.Msg, + }) + }) + }, + /** + * 生命周期函数--监听页面加载 + */ + //提交审核 + Submit() { + let a = this.validfrom(); + if (!a) return; + let obj = { + action: 'regUser', + sUserName: this.data.sUserName, + sPwd: this.data.sPwd, + sPhone: this.data.sPhone, + sEmail: this.data.sEmail, + companyName: this.data.companyName, + brandName: this.data.brandName, + sVerifycode: this.data.sVerifycode, + } + // app.globalData.request(obj).then((res) => { + // console.log('cd',res) + // wx.showModal({ + // title: '提示', + // content: res.Msg, + // }) + // }) + app.globalData.request(obj, (res) => { + if (res.Code == 1) { + wx.showModal({ + title: '提示', + content: res.Msg, + }) - }, + } else { + wx.showModal({ + title: '提示', + content: err.Msg, + }) + } + }) + }, + getlist() { + let obj = { + action: 'ifUserAdminOnly', + sUserName: this.data.sUserName, + sPhone: this.data.sPhone, + sEmail: this.data.sEmail, + } + console.log('cdssx', obj) + app.globalData.request(obj, (res) => { + console.log('cdx', res.data) + if (res.Code == 1) { + wx.showModal({ + title: '提示', + content: res.Msg, + success(res) { + if (res.confirm) { + this.captcha() + } else { - /** - * 生命周期函数--监听页面显示 - */ - onShow() { + } + } + }) + } else { + wx.showModal({ + title: '提示', + content: res.Msg, + }) + } + }) - }, + }, + validPhone() { + let b = true; + let sPhone = this.data.sPhone; + //验证手机号 + if (!this.data.sPhone) { + wx.showModal({ + title: '提示', + content: "手机号不能为空", + }) + b = false; + return b; + } + //验证手机格式 + if (!(/^1[34578]\d{9}$/.test(sPhone))) { + wx.showModal({ + title: '提示', + content: "手机格式错误", + }) + b = false + return b; + } + return b; + }, + validfrom() { + let a = true; + //验证用户名 + if (!this.data.sUserName) { + wx.showModal({ + title: '提示', + content: "用户名不能为空", + }) + a = false; + return a; + } + //验证密码 + if (!this.data.sPwd) { + wx.showModal({ + title: '提示', + content: "密码不能为空", + }) + a = false; + return a; + } + //验证手机号 + if (!this.data.sPhone) { + wx.showModal({ + title: '提示', + content: "手机号不能为空", + }) + a = false; + return a; + } + //验证邮箱 + if (!this.data.sEmail) { + wx.showModal({ + title: '提示', + content: "邮箱不能为空", + }) + a = false; + return a; + } + //验证公司名称 + if (!this.data.companyName) { + wx.showModal({ + title: '提示', + content: "公司名称不能为空", + }) + a = false; + return a; + } + //验证品牌 + if (!this.data.brandName) { + wx.showModal({ + title: '提示', + content: "公司品牌不能为空", + }) + a = false; + return a; + } + //验证验证码 + if (!this.data.sVerifycode) { + wx.showModal({ + title: '提示', + content: "验证码不能为空", + }) + a = false; + return a; + } + return a; + }, + handlerBack() { + wx.navigateBack({ + delta: 1 + }); + }, + onLoad(options) { - /** - * 生命周期函数--监听页面隐藏 - */ - onHide() { + }, - }, + /** + * 生命周期函数--监听页面初次渲染完成 + */ + onReady() { - /** - * 生命周期函数--监听页面卸载 - */ - onUnload() { + }, - }, + /** + * 生命周期函数--监听页面显示 + */ + onShow() { - /** - * 页面相关事件处理函数--监听用户下拉动作 - */ - onPullDownRefresh() { + }, - }, + /** + * 生命周期函数--监听页面隐藏 + */ + onHide() { - /** - * 页面上拉触底事件的处理函数 - */ - onReachBottom() { + }, - }, + /** + * 生命周期函数--监听页面卸载 + */ + onUnload() { - /** - * 用户点击右上角分享 - */ - onShareAppMessage() { + }, - } + /** + * 页面相关事件处理函数--监听用户下拉动作 + */ + onPullDownRefresh() { + + }, + + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom() { + + }, + + /** + * 用户点击右上角分享 + */ + onShareAppMessage() { + + } }) \ No newline at end of file diff --git a/pages/mine/pages/register/register.wxml b/pages/mine/pages/register/register.wxml index 1543c3e..a0ef1c6 100644 --- a/pages/mine/pages/register/register.wxml +++ b/pages/mine/pages/register/register.wxml @@ -16,7 +16,7 @@ 验证码 - + diff --git a/subPackages/pages/detail/index.js b/subPackages/pages/detail/index.js index d28846c..2f4a366 100644 --- a/subPackages/pages/detail/index.js +++ b/subPackages/pages/detail/index.js @@ -75,7 +75,7 @@ Page({ let data = arr[0]; let c1 = data._source.content.replace(/\ - - + {{title}} + @@ -67,7 +67,7 @@ - +