diff --git a/app.js b/app.js index c7b8aca..8ea144c 100644 --- a/app.js +++ b/app.js @@ -6,17 +6,23 @@ App({ // ip: 'http://localhost:8001', sessionId: "", header: { - "content-type": "application/x-www-form-urlencoded", + "content-type": "application/x-www-form-urlencoded", + appId:"wxb0c590fd696b79be", + "g-open-env":'MP_MINI', Authorization: "", Cookie: "", }, headers2: { - "content-type": "multipart/form-data", + "content-type": "multipart/form-data", + appId:"wxb0c590fd696b79be", + "g-open-env":'MP_MINI', Authorization: "", Cookie: "", }, headers: { - "content-type": "application/x-www-form-urlencoded", + "content-type": "application/x-www-form-urlencoded", + appId:"wxb0c590fd696b79be", + "g-open-env":'MP_MINI', Authorization: "", Cookie: "", }, diff --git a/app.json b/app.json index e844879..25d3b0d 100644 --- a/app.json +++ b/app.json @@ -53,6 +53,7 @@ } }, "requiredPrivateInfos":[ + "getLocation", "chooseLocation", "chooseAddress" ], @@ -99,4 +100,5 @@ "style": "v2", "sitemapLocation": "sitemap.json", "lazyCodeLoading": "requiredComponents" + } \ No newline at end of file diff --git a/pages/company/company/index.js b/pages/company/company/index.js index 7046ae8..db575e5 100644 --- a/pages/company/company/index.js +++ b/pages/company/company/index.js @@ -21,7 +21,27 @@ Page({ onReady() { }, - + goMap(){ + console.log("123") + wx.getLocation({ + type: 'gcj02', //返回可以用于wx.openLocation的经纬度 + success (res) { + console.log(res); + const latitude = 34.757034; + const longitude = 113.772587; + wx.openLocation({ + latitude, + longitude, + name:'郑州一才企业管理有限公司', + address:'河南省郑州市管城回族区心怡路与东站南街交叉口郑东升龙广场2号楼5楼', + scale: 18 + }) + }, + fail(res){ + console.log(res) + } + }) + }, /** * 生命周期函数--监听页面显示 */ diff --git a/pages/company/company/index.wxml b/pages/company/company/index.wxml index fb170ef..3e95c28 100644 --- a/pages/company/company/index.wxml +++ b/pages/company/company/index.wxml @@ -32,7 +32,7 @@ 客户经理 - {{serviceInfo.userName }} + {{serviceInfo.userName || '李经理' }}

{{serviceInfo.tel || '0371-6611 3723'}}

 diff --git a/pages/detail/index.js b/pages/detail/index.js index 06f71a9..c0126d5 100644 --- a/pages/detail/index.js +++ b/pages/detail/index.js @@ -468,7 +468,8 @@ Page({ // that.getStoreJobDetailById(); // }, // }) - }, + }, + onShareAppMessage(){}, // onShareAppMessage1: function () { // var path = commonUtil.getCurrentPageUrlWithArgs(); // if (app.globalData.isLogin && app.globalData.agencyStatus - 0 != 0) { diff --git a/pages/index/index.js b/pages/index/index.js index 509dbb7..b78a507 100644 --- a/pages/index/index.js +++ b/pages/index/index.js @@ -636,57 +636,7 @@ Page({ console.log("清除成功"); }, inputBlur () { }, - getListByTypeAndIndustry: function () { - var that = this; - wx.request({ - url: app.globalData.ip + "/labels/getListByTypeAndIndustry", - data: { - type: 90, - industry: 2, - }, - header: app.globalData.header, - method: "GET", - success: function (res) { - console.log(res.data.data); - wx.setStorageSync("FILTER_LIST", res.data.data); - res.data.data.forEach((item) => { - if (item.typeClassify == "0") { - that.data.tagArray0.push(item); - } else if (item.typeClassify == "1") { - that.data.tagArray1.push(item); - } else if (item.typeClassify == "2") { - that.data.tagArray2.push(item); - } else if (item.typeClassify == "3") { - that.data.tagArray3.push(item); - } else if (item.typeClassify == "4") { - that.data.tagArray4.push(item); - } - }); - that.setData({ - tagArray0: that.data.tagArray0, - tagArray1: that.data.tagArray1, - tagArray2: that.data.tagArray2, - tagArray3: that.data.tagArray3, - tagArray4: that.data.tagArray4, - }); - - var jobSpecialLabelIdArray = that.data.storeJobListSearchForm.jobSpecialLabelIds.split(","); - - res.data.data.forEach((item) => { - item["checked"] = false; - jobSpecialLabelIdArray.forEach((item1) => { - if (item.id == item1) { - item["checked"] = true; - } - }); - }); - - that.setData({ - jobSpecialLabelList: res.data.data, - }); - }, - }); - }, + getListByTypeAndIndustry: function () {}, golistSharePage () { if (this.data.isLogin) { if (app.globalData.loginUserInfo.agencyStatus == 1) { @@ -706,58 +656,7 @@ Page({ }, getBrandNameAllList: function () { var that = this; - wx.request({ - url: app.globalData.ip + "/labels/type/95", // 分类列表获取接口 - header: app.globalData.header, - method: "GET", - success: function (res) { - console.log(res); - if (res.data.status == 200) { - if (that.data.storeJobListSearchForm.brandIds) { - var brandIdArray = that.data.storeJobListSearchForm.brandIds.split(","); - } - console.log(res.data.data.labels); - wx.setStorageSync("CLASSIFY_LIST", res.data.data.labels); - res.data.data.labels.forEach((item) => { - item["checked"] = false; - if (brandIdArray) { - brandIdArray.forEach((item1) => { - if (item.id == item1) { - item["checked"] = true; - } - }); - } - }); - that.setData({ - brandList: res.data.data.labels, - }); - } - }, - }); - // wx.request({ - // url: app.globalData.ip + "/brand/getBrandNameAllList", // 品牌列表获取接口 - // data: {}, - // header: app.globalData.header, - // method: "GET", - // success: function (res) { - // console.log(res); - - // var brandIdArray = that.data.storeJobListSearchForm.brandIds.split(","); - - // res.data.data.forEach((item) => { - // item["checked"] = false; - // brandIdArray.forEach((item1) => { - // if (item.id == item1) { - // item["checked"] = true; - // } - // }); - // }); - // that.setData({ - // brandList: res.data.data, - // }); - // }, - // }); - }, + }, selectBrand: function (e) { var that = this; @@ -1094,8 +993,6 @@ Page({ copyList: JSON.parse(JSON.stringify(this.data.filterData)), }); // that.getJobList(); - that.getBannerList(); - that.getchannelList(); }, onReady () { let that = this; @@ -1186,7 +1083,7 @@ Page({ console.log(res); if (res.data.status == 200) { that.setData({ - bannerList: res.data.data.banners, + bannerList: res.data.data.pageBean.banners, }); } }, @@ -1199,19 +1096,19 @@ Page({ * */ getTemplateList () { - let that = this; - wx.request({ - url: app.globalData.ip + "/daotian/image/list", - success (res) { - console.log(res); - if (res.data.status == 200) { - app.globalData.templateList = res.data.data.images; - that.setData({ - templateList: res.data.data.images, - }); - } - }, - }); + // let that = this; + // wx.request({ + // url: app.globalData.ip + "/daotian/image/list", + // success (res) { + // console.log(res); + // if (res.data.status == 200) { + // app.globalData.templateList = res.data.data.pageBean.images; + // that.setData({ + // templateList: res.data.data.pageBean.images, + // }); + // } + // }, + // }); }, /** @@ -1227,7 +1124,7 @@ Page({ console.log(res); if (res.data.status == 200) { that.setData({ - navList: res.data.data.channels, + navList: res.data.data.pageBean.channels, }); } }, @@ -1618,7 +1515,7 @@ Page({ header: app.globalData.headers, success: function (res) { console.log(res); - let collectList = res.data.data.recordList; + let collectList = res.data.data.pageBean.recordList; let jobs = that.data.recordList; if (collectList != null && collectList != "" && collectList != undefined && collectList.length != 0 && jobs != null && jobs != "" && jobs != undefined && jobs.length != 0) { for (var j = 0; j != jobs.length; ++j) { @@ -1815,7 +1712,7 @@ Page({ }); console.log(that.data.storeJobListSearchForm); wx.request({ - url: app.globalData.ip + "/overall/store/job/list", + url: app.globalData.ip + "/yishoudan/custom/job/listApp", method: "POST", header: app.globalData.headers, data: that.data.storeJobListSearchForm, @@ -1824,8 +1721,8 @@ Page({ console.log(res); that.setData({ - totalPage: res.data.data.pageCount, - currPage: res.data.data.currentPage, + totalPage: res.data.data.pageBean.pageCount, + currPage: res.data.data.pageBean.currentPage, }); setTimeout(function () { @@ -1833,8 +1730,8 @@ Page({ triggered: false, }); }, 1000); - if (res.data.data.recordList == null || res.data.data.recordList.length == 0 || res.data.data.recordList.length < that.data.storeJobListSearchForm.pageSize) { - var jobListTemp = commonUtil.disposeJobListData(res.data.data.recordList); + if (res.data.data.pageBean.recordList == null || res.data.data.pageBean.recordList.length == 0 || res.data.data.pageBean.recordList.length < that.data.storeJobListSearchForm.pageSize) { + var jobListTemp = commonUtil.disposeJobListData(res.data.data.pageBean.recordList); that.data.recordList = that.data.recordList.concat(jobListTemp); that.setData({ @@ -1843,7 +1740,7 @@ Page({ isTrigger: false, }); } else { - var jobListTemp = commonUtil.disposeJobListData(res.data.data.recordList); + var jobListTemp = commonUtil.disposeJobListData(res.data.data.pageBean.recordList); that.data.recordList = that.data.recordList.concat(jobListTemp); that.setData({ @@ -1887,7 +1784,7 @@ Page({ recordList: that.data.recordList, currentJobDrawer: that.data.currentJobDrawer, }); - // if (that.data.recordList.length < res.data.data.recordCount) { + // if (that.data.recordList.length < res.data.data.pageBean.recordCount) { // that.setData({ // hasMoreData: true, // }); @@ -2156,8 +2053,8 @@ Page({ }, success: function (res) { console.log(res); - app.globalData.openId = res.data.data.openId; - let promise = app.setLoginUserTokenInfo(res.data.data.phoneNumber, null); + app.globalData.openId = res.data.data.pageBean.openId; + let promise = app.setLoginUserTokenInfo(res.data.data.pageBean.phoneNumber, null); var collected = e.currentTarget.dataset.collected; if (collected) { promise.then((res) => { @@ -2210,7 +2107,7 @@ Page({ }, success: function (res) { console.log(res); - let promise = app.setLoginUserTokenInfo(res.data.data.phoneNumber, null); + let promise = app.setLoginUserTokenInfo(res.data.data.pageBean.phoneNumber, null); var collected = e.currentTarget.dataset.collected; if (collected) { promise.then((res) => { @@ -2223,7 +2120,7 @@ Page({ promise.then((res) => { wx.navigateTo({ url: "../enroll/index?applyType=1", - //url: "../enroll/index?applyType=1&tel=" + res.data.data.phoneNumber + //url: "../enroll/index?applyType=1&tel=" + res.data.data.pageBean.phoneNumber }); }); } @@ -2288,7 +2185,7 @@ Page({ }, success: function (res) { console.log(res); - let promise = app.setLoginUserTokenInfo(res.data.data.phoneNumber, null); + let promise = app.setLoginUserTokenInfo(res.data.data.pageBean.phoneNumber, null); promise.then((res) => { that.setData({ isLogin: app.globalData.isLogin, @@ -2319,7 +2216,7 @@ Page({ }, success: function (res) { console.log(res); - let promise = app.setLoginUserTokenInfo(res.data.data.phoneNumber, null); + let promise = app.setLoginUserTokenInfo(res.data.data.pageBean.phoneNumber, null); promise.then((res) => { that.setData({ isLogin: app.globalData.isLogin, @@ -2368,8 +2265,8 @@ Page({ console.log("获取来源对应的代理人，来源ID：", id); console.log(res); try { - if (app.isNotEmptyCheck(res.data.data)) { - wx.setStorageSync("storageSyncAgencyUserId", res.data.data); + if (app.isNotEmptyCheck(res.data.data.pageBean)) { + wx.setStorageSync("storageSyncAgencyUserId", res.data.data.pageBean); } //先设置代理人缓存人再登录 app.getLoginUserTokenInfo(); diff --git a/pages/messageDetail/index.json b/pages/messageDetail/index.json index 3be9a48..1322522 100644 --- a/pages/messageDetail/index.json +++ b/pages/messageDetail/index.json @@ -1,7 +1,4 @@ { - "usingComponents": { - "mp-html": "mp-html" - }, "navigationBarTitleText" : "消息", "backgroundColor":"#f5f5f5", "navigationBarBackgroundColor": "#0dcc91", diff --git a/pages/messageDetail/index.wxml b/pages/messageDetail/index.wxml index 240ad6b..09ceb49 100644 --- a/pages/messageDetail/index.wxml +++ b/pages/messageDetail/index.wxml @@ -61,6 +61,6 @@ {{currentInfo.title}} - + diff --git a/pages/type/type/index.js b/pages/type/type/index.js index 9685cd9..a14fd5a 100644 --- a/pages/type/type/index.js +++ b/pages/type/type/index.js @@ -87,6 +87,16 @@ Page({ scrollInfoView:'category_0', sList:[], + }, + handleTab(e){ + console.log('点击tab',e) + + this.setData({ + active:e.currentTarget.dataset.active,// tab切换 + scrollInfoView:'category_' + e.currentTarget.dataset.active // 右侧锚点滚动 + }); + console.log(this.data.scrollInfoView) + }, goLogin() { wx.setStorageSync("comeFromPage", "index");