From 5aab2bacb605399ae0feeca011891ca9fe1ca081 Mon Sep 17 00:00:00 2001 From: GL <954534408@qq.com> Date: Tue, 17 Nov 2020 16:15:33 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E6=B6=88=E6=81=AF=E6=8E=A8=E9=80=81?= =?UTF-8?q?=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/config.js | 10 +- custom-tab-bar/index.js | 72 ++++- ext.json | 8 +- index/index.js | 2 +- index/index.wxml | 2 +- index/user.js | 585 ++++++++++++++++++++-------------------- project.config.json | 2 +- utils/spell.js | 10 +- 8 files changed, 379 insertions(+), 312 deletions(-) diff --git a/config/config.js b/config/config.js index 68bb1a0..2b2c016 100755 --- a/config/config.js +++ b/config/config.js @@ -5,7 +5,15 @@ let sockUrls = extConfig.attr.socketUrl; var config = { url: configUrls, wsurl: sockUrls, - api: { + api: { + /* + *记录微信订阅 + */ + wxMsg:'/user/updateMsg', + /** + * 微信消息推送获取模板id + */ + templateId:"/wxMsg/templateList", /** * 接口用途:login */ diff --git a/custom-tab-bar/index.js b/custom-tab-bar/index.js index b3c4a44..fe0901d 100644 --- a/custom-tab-bar/index.js +++ b/custom-tab-bar/index.js @@ -1,12 +1,13 @@ const extConfig = wx.getExtConfigSync ? wx.getExtConfigSync() : {} let ifStoreApp = extConfig.attr.ifStoreApp; +const Http = require("../utils/HttpBasics"); +var config = require("../config/config.js"); Component({ data: { selected: 0, "color": "#abb1be", "selectedColor": "#FD782D", - "list": [ - { + "list": [{ "pagePath": "/index/index", "iconPath": "../assets/images/home.png", "selectedIconPath": "../assets/images/home-a.png", @@ -33,10 +34,9 @@ Component({ ] }, attached() { - if (ifStoreApp==1){ + if (ifStoreApp == 1) { this.setData({ - list: [ - { + list: [{ "pagePath": "/index/index", "iconPath": "../assets/images/home.png", "selectedIconPath": "../assets/images/home-a.png", @@ -52,8 +52,7 @@ Component({ }) } else if (ifStoreApp == 2) { this.setData({ - list: [ - { + list: [{ "pagePath": "/index/index", "iconPath": "../assets/images/home.png", "selectedIconPath": "../assets/images/home-a.png", @@ -79,10 +78,67 @@ Component({ switchTab(e) { const data = e.currentTarget.dataset; const url = data.path; + if(data.index==0||data.index==3){ + this.getTemplateId() + } wx.switchTab({url}); this.setData({ selected: data.index }) - } + }, + getTemplateId() { + Http.get({ + url: config.api.templateId, + data: { + pageNum: 1, + pageSize: 100 + } + }).then(res => { + const { + code, + data + } = res + if (code == 200) { + this.setData({ + templateId: data.list + }) + this.setWxMessage() + } else { + return + } + }) + }, + setWxMessage() { + let tmplIds = [] + this.data.templateId.map(res => { + tmplIds.push(res.templateId) + }) + console.log(tmplIds[0], "?|?|?|", this.data.templateId) + wx.requestSubscribeMessage({ + tmplIds: tmplIds, + success(res) { + let _statue = null + tmplIds.map((item,index)=>{//判读用户是否点击了确定 + if(res[item]=="accept"){ + _statue = 'ok' + } + }) + if (_statue == 'ok') { + Http.post({ + url: config.api.wxMsg + }).then(res => { + console.log(res) + }) + return + } + // for (let i = 0; i < tmplIds.length;i++){ + // if (res.tmplIds[i] == 'accept'){ + // console.log("发送") + // } + // } + } + }) + }, + } }) \ No newline at end of file diff --git a/ext.json b/ext.json index d947234..02eff8c 100644 --- a/ext.json +++ b/ext.json @@ -16,14 +16,14 @@ } ], "configUrl": "https://ctest.malls.iformall.com/C/api", - "etcpAppId": "wx192b7d2e8dcbefd0", + "etcpAppId": "wx219a81b9c87aa4f7", "etcpVersion": "release", "etcpCallbackUrl": "https://admintest.malls.iformall.com/api/carCallback/etcpPaidCallback", "ifHaveWebSocket": "0", "ifHaveCarModular": "1" }, - "name": "金泸商务", - "weappId": "wx649b3be73c1afe47", + "name": "富茂光谷测试版", + "weappId": "wx219a81b9c87aa4f7", "appVersion": "C.test.5.2.0" }, "debug": false, @@ -69,7 +69,7 @@ "provider": "wx2b03c6e691cd7370" } }, - "extAppid": "wx649b3be73c1afe47", + "extAppid": "wx219a81b9c87aa4f7", "extEnable": true, "permission": { "scope.userLocation": { diff --git a/index/index.js b/index/index.js index 18ccd5b..293b2ed 100644 --- a/index/index.js +++ b/index/index.js @@ -287,7 +287,7 @@ Page({ }) }, onUnload() { - wx.removeStorageSync('squareList') + // wx.removeStorageSync('squareList') }, onShow: function() { this.ifShowSqare(); diff --git a/index/index.wxml b/index/index.wxml index ec4d4be..7ae2fb6 100644 --- a/index/index.wxml +++ b/index/index.wxml @@ -1,5 +1,5 @@ - + diff --git a/index/user.js b/index/user.js index c994aa7..a61a0a1 100644 --- a/index/user.js +++ b/index/user.js @@ -7,71 +7,72 @@ const imgurl = require("../utils/imgurl"); var config = require("../config/config.js"); const bgColor = require("../utils/bgColor.js") Page({ + /** + * 页面的初始数据 + */ + data: { + templateId: [], + aboutShow: false, + navigationBarHeight, + ifStoreApp: ifStoreApp, + aboutUs: imgurl.aboutUs.url, + banneColor: bgColor.colorFirst.user.banneColor, + levelBg: bgColor.colorFirst.user.levelBg, + view: bgColor.colorFirst.user.view, + redirectUrl: imgurl.redirect.url, + editUrl: imgurl.edit.url, + activeUrl: imgurl.active.url, + dingUrl: imgurl.ding.url, + duihuan: imgurl.duihuan.url, + quansUrl: imgurl.quans.url, + wmintegral: imgurl.wmintegral.url, + cardiconUrl: imgurl.cardicon.url, + myactivitygift: imgurl.myactivitygift.url, + myactivity: imgurl.myactivity.url, + cheUrl: imgurl.che.url, + giftUrl: imgurl.gift.url, + wmbarginicon: imgurl.wmbarginicon.url, + wmspellgroup: imgurl.wmspellgroup.url, + canIUse: wx.canIUse('official-account'), + mineFlag: "", + flag: 'hidden', + score: '0', + curPhone: '', + name: "", + birthdate: "", + sex: "", + showEdit: false, + ismember: false, + canvasHidden: false, + maskHidden: true, + imagePath: '', + appVersion: "", + placeholder: '' + }, + checkUserStatus() { + let that = this; + Http.get({ + url: config.api.checkPhoneStatus, + data: {} + }).then(res => { + wx.navigateTo({ + url: '/pages/edit/edit', + }) + }).catch(err => { + wx.navigateTo({ + url: `/pages/getphoneInfo/index?mineFlag=mine`, + }) + }) + }, + gotoPhoneInfo() { /** - * 页面的初始数据 + * 将值传到用户手机号授权的页面 + * */ - data: { - aboutShow: false, - navigationBarHeight, - ifStoreApp: ifStoreApp, - aboutUs: imgurl.aboutUs.url, - banneColor: bgColor.colorFirst.user.banneColor, - levelBg: bgColor.colorFirst.user.levelBg, - view: bgColor.colorFirst.user.view, - redirectUrl: imgurl.redirect.url, - editUrl: imgurl.edit.url, - activeUrl: imgurl.active.url, - dingUrl: imgurl.ding.url, - duihuan: imgurl.duihuan.url, - quansUrl: imgurl.quans.url, - wmintegral: imgurl.wmintegral.url, - cardiconUrl: imgurl.cardicon.url, - myactivitygift: imgurl.myactivitygift.url, - myactivity: imgurl.myactivity.url, - cheUrl: imgurl.che.url, - giftUrl: imgurl.gift.url, - wmbarginicon: imgurl.wmbarginicon.url, - wmspellgroup: imgurl.wmspellgroup.url, - canIUse: wx.canIUse('official-account'), - mineFlag: "", - flag: 'hidden', - score: '0', - curPhone: '', - name: "", - birthdate: "", - sex: "", - showEdit: false, - ismember: false, - canvasHidden: false, - maskHidden: true, - imagePath: '', - appVersion: "", - placeholder: '' - }, - checkUserStatus() { - let that = this; - Http.get({ - url: config.api.checkPhoneStatus, - data: {} - }).then(res => { - wx.navigateTo({ - url: '/pages/edit/edit', - }) - }).catch(err => { - wx.navigateTo({ - url: `/pages/getphoneInfo/index?mineFlag=mine`, - }) - }) - }, - gotoPhoneInfo() { - /** - * 将值传到用户手机号授权的页面 - * - */ - wx.redirectTo({ - url: `/pages/getphoneInfo/index?path=main` - }); - }, + wx.redirectTo({ + url: `/pages/getphoneInfo/index?path=main` + }); + }, /* 判断是否授权*/ userAuthorization() { @@ -91,250 +92,252 @@ Page({ + /** + * 跳转到成长值的页面 + */ + gotograde: function() { + wx.navigateTo({ + url: '/pages/czdetail/czdetail', + }) + }, + /** + * 跳转到商场信息的页面 + */ + gomallInfo: function() { + wx.navigateTo({ + url: '/pages/mallInfo/mallInfo', + }) + }, + showVersion: function() { /** - * 跳转到成长值的页面 - */ - gotograde: function () { - wx.navigateTo({ - url: '/pages/czdetail/czdetail', - }) - }, - /** - * 跳转到商场信息的页面 + * 长按显示版本号 */ - gomallInfo: function () { - wx.navigateTo({ - url: '/pages/mallInfo/mallInfo', - }) - }, - showVersion: function () { - /** - * 长按显示版本号 - */ - let that = this; - if (that.data.flag == 'hidden') { - that.setData({ - flag: 'show' - }); - } - }, - gotoedit: function () { - this.checkUserStatus(); - }, - onLoad() { - this.getLocation(); - this.updateScene(); - // this.getRoomId(); - // this.getRoomList(); - console.log(wx.getExtConfigSync()) - }, - //获取房间列表 - getRoomList(){ - debugger - Http.get({ - url: config.api.getRoomList, + let that = this; + if (that.data.flag == 'hidden') { + that.setData({ + flag: 'show' + }); + } + }, + gotoedit: function() { + this.checkUserStatus(); + }, + onLoad() { + this.getLocation(); + this.updateScene(); + // this.getRoomId(); + // this.getRoomList(); + console.log(wx.getExtConfigSync()) + }, + //获取房间列表 + getRoomList() { + debugger + Http.get({ + url: config.api.getRoomList, + data: { + token: app.globalData.token, + appId: config.weapp.AppId + } + }).then(res => { + console.log(res) + }) + }, + getRoomId() { + let roomId = [3] // 填写具体的房间号,可通过下面【获取直播房间列表】 API 获取 + let customParams = encodeURIComponent(JSON.stringify({ + path: 'pages/index/index', + pid: 1 + })) // 开发者在直播间页面路径上携带自定义参数(如示例中的path和pid参数),后续可以在分享卡片链接和跳转至商详页时获取,详见【获取自定义参数】、【直播间到商详页面携带参数】章节(上限600个字符,超过部分会被截断) + console.log(customParams, 777777777) + this.setData({ + roomId, + customParams + }) + }, + /** + * 获得经纬度 + */ + getLocation() { + let that = this; + wx.getLocation({ + type: "wgs84", + success: function(res) { + console.log(res) + if (res && res.longitude && res.latitude) { + Http.post({ + url: config.api.updateLBS, data: { - token: app.globalData.token, - appId:config.weapp.AppId + latitude: res.latitude, + longitude: res.longitude } - }).then(res => { + }).then(res => { console.log(res) + }) + } + }, + fail: error => { + console.log(error); + } + }) + }, + /** + * 用户更新scene + */ + updateScene() { + Http.post({ + url: config.api.updateScene, + data: { + scene: app.globalData.scene + } + }).then(res => { + console.log(res) + }) + }, + /** + * 生命周期函数--监听页面显示 + */ + onShow: function() { + let that = this; + that.userAuthorization() + if (typeof that.getTabBar === 'function' && + that.getTabBar()) { + if (ifStoreApp == 1) { + that.getTabBar().setData({ + selected: 1 }) - }, - getRoomId() { - let roomId = [3] // 填写具体的房间号,可通过下面【获取直播房间列表】 API 获取 - let customParams = encodeURIComponent(JSON.stringify({ path: 'pages/index/index', pid: 1 })) // 开发者在直播间页面路径上携带自定义参数(如示例中的path和pid参数),后续可以在分享卡片链接和跳转至商详页时获取,详见【获取自定义参数】、【直播间到商详页面携带参数】章节(上限600个字符,超过部分会被截断) - console.log(customParams,777777777) - this.setData({ - roomId, - customParams - }) - }, - /** - * 获得经纬度 - */ - getLocation() { - let that = this; - wx.getLocation({ - type: "wgs84", - success: function (res) { - console.log(res) - if (res && res.longitude && res.latitude) { - Http.post({ - url: config.api.updateLBS, - data: { - latitude: res.latitude, - longitude: res.longitude - } - }).then(res => { - console.log(res) - }) - } - }, - fail: error => { - console.log(error); - } + } else if (ifStoreApp == 2) { + that.getTabBar().setData({ + selected: 2 }) - }, - /** - * 用户更新scene - */ - updateScene() { - Http.post({ - url: config.api.updateScene, - data: { - scene: app.globalData.scene - } - }).then(res => { - console.log(res) + } else { + that.getTabBar().setData({ + selected: 3 }) - }, + } + + } + that.setData({ + appVersion: extConfig.appVersion, + }) /** - * 生命周期函数--监听页面显示 + * couponNum + * couponNum2 */ - onShow: function () { - let that = this; - that.userAuthorization() - if (typeof that.getTabBar === 'function' && - that.getTabBar()) { - if (ifStoreApp == 1) { - that.getTabBar().setData({ - selected: 1 - }) - } else if (ifStoreApp == 2) { - that.getTabBar().setData({ - selected: 2 - }) - } else { - that.getTabBar().setData({ - selected: 3 - }) - } + let num = wx.getStorageSync('couponNum'); + let num1 = wx.getStorageSync('couponNum2'); + wx.hideTabBarRedDot({ + index: 3 + }); + if (num == 'couponNum1') { + wx.setStorage({ + key: 'couponNum', + data: "couponNum1", + }) + that.setData({ + couponNum: "couponNum1" + }) + } else if (num == 'couponNum') { + that.setData({ + couponNum: "couponNum" + }) + }; + if (num1 == 'couponNum3') { + wx.setStorage({ + key: 'couponNum2', + data: "couponNum3", + }) + that.setData({ + couponNum2: "couponNum3" + }) + } else if (num1 == 'couponNum2') { + that.setData({ + couponNum2: "couponNum2" + }); + }; + Http.get({ + url: config.api.getScore, + data: {} + }).then(res => { + if (res.data.address && res.data.name && res.data.sex && res.data.birthdate) { + that.setData({ + showEdit: true + }) + } + let curPhone = res.data.phone ? res.data.phone : ''; + if (curPhone) { + let curPhoneList = curPhone.split(''); + let curPhoneList01 = []; + curPhoneList.forEach((item, index) => { + if (index >= 3 && index <= 6) { + item = '*'; + } + curPhoneList01.push(item); + }) + curPhone = curPhoneList01.join(''); } that.setData({ - appVersion: extConfig.appVersion, + score: res.data.score, + curPhone: curPhone, + levelName: res.data.levelName, }) - /** - * couponNum - * couponNum2 - */ - let num = wx.getStorageSync('couponNum'); - let num1 = wx.getStorageSync('couponNum2'); - wx.hideTabBarRedDot({ - index: 3 - }); - if (num == 'couponNum1') { - wx.setStorage({ - key: 'couponNum', - data: "couponNum1", - }) - that.setData({ - couponNum: "couponNum1" - }) - } else if (num == 'couponNum') { - that.setData({ - couponNum: "couponNum" - }) - }; - if (num1 == 'couponNum3') { - wx.setStorage({ - key: 'couponNum2', - data: "couponNum3", - }) - that.setData({ - couponNum2: "couponNum3" - }) - } else if (num1 == 'couponNum2') { - that.setData({ - couponNum2: "couponNum2" - }); - }; - - Http.get({ - url: config.api.getScore, - data: {} - }).then(res => { - if (res.data.address && res.data.name && res.data.sex && res.data.birthdate) { - that.setData({ - showEdit: true - }) - } - let curPhone = res.data.phone?res.data.phone:''; - if (curPhone) { - let curPhoneList = curPhone.split(''); - let curPhoneList01 = []; - curPhoneList.forEach((item,index) => { - if (index>=3 && index<=6) { - item = '*'; - } - curPhoneList01.push(item); - }) - curPhone = curPhoneList01.join(''); - } - that.setData({ - score: res.data.score, - curPhone: curPhone, - levelName: res.data.levelName, - }) - if (res.data.nickName) { - that.setData({ - ismember: true, - memberId: res.data.id - }) - var size = this.setCanvasSize(); - var initUrl = JSON.stringify({ - flagid: res.data.id - }); - } + if (res.data.nickName) { + that.setData({ + ismember: true, + memberId: res.data.id + }) + var size = this.setCanvasSize(); + var initUrl = JSON.stringify({ + flagid: res.data.id + }); + } + }) + .catch(err => { + wx.showModal({ + title: '提示', + content: err.errMsg, + showCancel: false }) - .catch(err => { - wx.showModal({ - title: '提示', - content: err.errMsg, - showCancel: false - }) - }) - //暂时注释 - // that.getrun(); + }) + //暂时注释 + // that.getrun(); - //查询关于我们 - Http.get({ - url: config.api.getMallInfo, - data: {} - }).then(res => { - console.log(res) - if (res.data.businessHours !== '[]') { - that.setData({ - aboutShow: true - }) - } else { - that.setData({ - aboutShow: false - }) - } - }) - .catch(err => { - }) - }, - //适配不同屏幕大小的canvas - setCanvasSize: function () { - var size = {}; - try { - var res = wx.getSystemInfoSync(); - var scale = 750 / 500; - //不同屏幕下canvas的适配比例;设计稿是750宽 - var width = res.windowWidth / scale; - var height = width; - //canvas画布为正方形 - size.w = width; - size.h = height; - } catch (e) { - // Do something when catch error - console.log("获取设备信息失败" + e); + //查询关于我们 + Http.get({ + url: config.api.getMallInfo, + data: {} + }).then(res => { + console.log(res) + if (res.data.businessHours !== '[]') { + that.setData({ + aboutShow: true + }) + } else { + that.setData({ + aboutShow: false + }) } - return size; - }, + }) + .catch(err => {}) + }, + //适配不同屏幕大小的canvas + setCanvasSize: function() { + var size = {}; + try { + var res = wx.getSystemInfoSync(); + var scale = 750 / 500; + //不同屏幕下canvas的适配比例;设计稿是750宽 + var width = res.windowWidth / scale; + var height = width; + //canvas画布为正方形 + size.w = width; + size.h = height; + } catch (e) { + // Do something when catch error + console.log("获取设备信息失败" + e); + } + return size; + }, -}); +}); \ No newline at end of file diff --git a/project.config.json b/project.config.json index 850364e..353b36f 100644 --- a/project.config.json +++ b/project.config.json @@ -31,7 +31,7 @@ "userConfirmedUseCompilerModuleSwitch": false }, "compileType": "miniprogram", - "libVersion": "2.5.0", + "libVersion": "2.9.5", "appid": "wxfa336cad86ed598d", "projectname": "oldC", "isGameTourist": false, diff --git a/utils/spell.js b/utils/spell.js index aa8c663..7297820 100644 --- a/utils/spell.js +++ b/utils/spell.js @@ -28,11 +28,11 @@ const spellStatus=[ value: 16 }, { - name: '失败请稍后', + name: '失败请稍候', value: 98 }, { - name: '失败请稍后', + name: '失败请稍候', value: 99 } ] @@ -66,15 +66,15 @@ const spellStatus02 = [ value: 16 }, { - name: '失败请稍后', + name: '失败请稍候', value: 98 }, { - name: '失败请稍后', + name: '失败请稍候', value: 99 } ] module.exports={ spellStatus, spellStatus02 -} \ No newline at end of file +} \ No newline at end of file