diff --git a/pages/collect/index.wxml b/pages/collect/index.wxml index c9ccf1a..66a4b36 100644 --- a/pages/collect/index.wxml +++ b/pages/collect/index.wxml @@ -38,7 +38,7 @@ {{item.jobName || item.aliasName}} - {{item.salaryClassifyValue}} + {{item.monthlyPay}}元/月 diff --git a/pages/detail/index.js b/pages/detail/index.js index 7c44b5e..bb8e551 100644 --- a/pages/detail/index.js +++ b/pages/detail/index.js @@ -168,7 +168,7 @@ Page({ let resImg = e.currentTarget.dataset.src; var imgArr = []; - this.data.jobDetail.storeImage.forEach((item) => { + this.data.images.forEach((item) => { // let regs = /\.(jpg|jpeg|png)(\?.*)?$/; // item.isImg = regs.test(item.url.toLowerCase()); if (item.isImg) { diff --git a/pages/detail/index.wxml b/pages/detail/index.wxml index 9c5e2af..7562735 100644 --- a/pages/detail/index.wxml +++ b/pages/detail/index.wxml @@ -33,13 +33,69 @@ - - + + {{jobDetail.monthlyPay || '--'}}元/月 + + + + + + + + + - - - {{item1}} + --> + + + {{item1}} + + + {{item1}} + + + + + + + + {{jobDetail.storeAddr ? jobDetail.storeAddr :'暂无地址信息'}} + + + + + + + + + + + + + + + + + + + 职位描述 + {{jobDetail.jobInfo}} + + + + + + + + 面试 + + + 面试时间 + {{jobDetail.interviewDuration}} {{item1}} diff --git a/pages/detail/index.wxss b/pages/detail/index.wxss index 5d6b792..fb7d76b 100644 --- a/pages/detail/index.wxss +++ b/pages/detail/index.wxss @@ -40,7 +40,7 @@ page, margin-right: 16px; } .jobMoney { - font-size: 18px; + font-size: 16px; font-weight: 601; line-height: 20px; } diff --git a/pages/index/index.wxml b/pages/index/index.wxml index f888e7d..27a8913 100644 --- a/pages/index/index.wxml +++ b/pages/index/index.wxml @@ -295,7 +295,7 @@ {{item.jobName || item.aliasName}} - {{item.salaryClassifyValue}} + {{item.monthlyPay}}元/月 @@ -304,7 +304,7 @@ {{ item.distanceKm}} {{item.age}} - + diff --git a/pages/index/index.wxss b/pages/index/index.wxss index 7c1bb3c..5d2cdf6 100644 --- a/pages/index/index.wxss +++ b/pages/index/index.wxss @@ -375,7 +375,7 @@ height: 746rpx; } .hourPay { /* f18 c633 lh1 flex-1 tr */ - font-size: 18px; + font-size: 16px; line-height: 1; flex: 1; text-align: right; diff --git a/pages/jobListSearch/index.wxml b/pages/jobListSearch/index.wxml index 0490109..e857b35 100644 --- a/pages/jobListSearch/index.wxml +++ b/pages/jobListSearch/index.wxml @@ -276,7 +276,7 @@ {{item.jobName}} {{item.aliasName}} - {{item.salaryClassifyValue}} + {{item.monthlyPay}}元/月 diff --git a/pages/mine/addAddress/index.wxml b/pages/mine/addAddress/index.wxml index a2d8d83..203120e 100644 --- a/pages/mine/addAddress/index.wxml +++ b/pages/mine/addAddress/index.wxml @@ -45,7 +45,7 @@ - + diff --git a/pages/mine/opinion/index.js b/pages/mine/opinion/index.js index 351f0d0..2ff97c2 100644 --- a/pages/mine/opinion/index.js +++ b/pages/mine/opinion/index.js @@ -14,12 +14,15 @@ Page({ troubleList:[ "投诉", "建议", "故障", "其他" ], - actived:0 + actived:0, + count:4, }, chooseMedia () { var that = this; + + console.log( that.data.count) wx.chooseMedia({ - count: 4, + count: that.data.count, mediaType: ['image'], sizeType: ['original', 'compressed'], sourceType: ['album', 'camera'], @@ -51,7 +54,8 @@ Page({ that.data.newAddImg.push(JSON.parse(res.data).data) that.setData({ files: that.data.files, - newAddImg: that.data.newAddImg + newAddImg: that.data.newAddImg, + count: 4 - that.data.files.length }) // currData.data = JSON.parse(res.data); @@ -91,7 +95,8 @@ Page({ that.pushImg(); that.setData({ files: that.data.files, - newAddImg: that.data.newAddImg + newAddImg: that.data.newAddImg, + count: 4 - that.data.files.length }) } else if (res.cancel) { @@ -202,7 +207,8 @@ console.log(that.data.newAddImg) data: { content: that.data.textVal, classify: Number(that.data.actived + 1), - imgs:that.data.newAddImg.toString() + imgs:that.data.newAddImg.toString(), + appId:app.globalData.appId }, success: function (res) { console.log(res); diff --git a/pages/type/type/index.wxml b/pages/type/type/index.wxml index 3ae8e80..b8f4540 100644 --- a/pages/type/type/index.wxml +++ b/pages/type/type/index.wxml @@ -34,8 +34,8 @@ - {{item.jobName || item.aliasName}} - {{item.salaryClassifyValue}} + {{item.jobName || item.aliasName}} + {{item.monthlyPay}}元/月 diff --git a/project.private.config.json b/project.private.config.json index 690cd1f..699b89e 100644 --- a/project.private.config.json +++ b/project.private.config.json @@ -8,6 +8,13 @@ "condition": { "miniprogram": { "list": [ + { + "name": "我的2", + "pathName": "pages/mine/index", + "query": "", + "launchMode": "default", + "scene": null + }, { "name": "反馈与建议", "pathName": "pages/mine/opinion/index", @@ -193,5 +200,5 @@ ] } }, - "libVersion": "3.4.0" + "libVersion": "3.0.0" } \ No newline at end of file