diff --git a/api/request.js b/api/request.js index 950802d..72fcf21 100644 --- a/api/request.js +++ b/api/request.js @@ -12,8 +12,8 @@ import {updToken} from './updateToken' // wx6bd4fcc040bfa025 水感应 正式appid // wx9ae0c63d0c58caeb 测试appid 三猿 // wx3056ec23196eaf02 水感应 测试 -// const api = "https://api.shui.shuiganying.com/api/" // 正式环境 -const api = "https://shuitest.shuiganying.com/api/" // 测试环境 +const api = "https://api.shui.shuiganying.com/api/" // 正式环境 +// const api = "https://shuitest.shuiganying.com/api/" // 测试环境 const header = { "Accept" : "application/json" } diff --git a/app.js b/app.js index 1c53703..cd3cc3f 100644 --- a/app.js +++ b/app.js @@ -7,10 +7,17 @@ import api from "api/index" App({ onLaunch(e) { let { scene } = e - // 检查入口场景值 - if(scene === 1011 || scene === 1047 || scene === 1124 || scene === 1089 || scene === 1038){ + // 1011 扫描二维码 + // 1017 前往小程序体验版的入口页 + // 1025 扫描一维码 + // 1047 扫描小程序码 + // 1124 扫“一物一码”打开小程序 + if(scene === 1011 || scene === 1017 || scene === 1025 || scene === 1047 || scene === 1124){ this.globalData.isOfficial = true + } else { + this.globalData.isOfficial = false + } // 检查用户登录状态 diff --git a/pages/recruit/exchange/exchange.js b/pages/recruit/exchange/exchange.js index 5b4b082..0db749c 100644 --- a/pages/recruit/exchange/exchange.js +++ b/pages/recruit/exchange/exchange.js @@ -100,8 +100,6 @@ Page({ this.setData({ exchangesHide: false }) - wx.redirectTo({ - url: '/pages/user/index' - }) + wx.navigateBack() } }) \ No newline at end of file diff --git a/pages/recruit/exchange/exchange.wxml b/pages/recruit/exchange/exchange.wxml index 8b06f5c..9b5deb4 100644 --- a/pages/recruit/exchange/exchange.wxml +++ b/pages/recruit/exchange/exchange.wxml @@ -69,7 +69,7 @@ - + 收下啦 ~ diff --git a/pages/recruit/exchange/exchange.wxss b/pages/recruit/exchange/exchange.wxss index 654f76f..b4b0ff3 100644 --- a/pages/recruit/exchange/exchange.wxss +++ b/pages/recruit/exchange/exchange.wxss @@ -254,7 +254,7 @@ button[disabled]{ height: 100vh; left: 0; top: 0; - background-color: rgba(0, 0, 0, .6); + background-color: rgba(0, 0, 0, .8); z-index: 1000; display: none; } diff --git a/pages/recruit/index.js b/pages/recruit/index.js index f2e9b0b..3b8bcf1 100644 --- a/pages/recruit/index.js +++ b/pages/recruit/index.js @@ -444,5 +444,11 @@ Page({ wx.navigateTo({ url: '/pages/index/assess/assess?type=2' }) + }, + + onHide(){ + this.setData({ + followState: false + }) } }) \ No newline at end of file diff --git a/pages/recruit/index.wxml b/pages/recruit/index.wxml index 280cea7..a3fbdf1 100644 --- a/pages/recruit/index.wxml +++ b/pages/recruit/index.wxml @@ -439,7 +439,7 @@ 关注公众号 - + 请关注”水感应“公众号以便收到活动通知 请长按识别二维码关注公众号 diff --git a/pages/recruit/poster/poster.js b/pages/recruit/poster/poster.js index a163f3e..58704c3 100644 --- a/pages/recruit/poster/poster.js +++ b/pages/recruit/poster/poster.js @@ -25,11 +25,7 @@ Page({ /** * 生命周期函数--监听页面加载 */ - onLoad() { - wx.showLoading({ - title: '请求中...', - }) - }, + onLoad() {}, // 切换城市 changeCity(){ this.setData({ diff --git a/pages/recruit/poster/poster.wxml b/pages/recruit/poster/poster.wxml index 2cec4ae..b62f925 100644 --- a/pages/recruit/poster/poster.wxml +++ b/pages/recruit/poster/poster.wxml @@ -1,5 +1,5 @@ - {{codeType == 'city' && !styleShow ?'切换城市':styleShow ?'关闭切换':'切换背景'}} + {{codeType == 'city' && !styleShow ?'切换海报':styleShow ?'关闭切换':'切换海报'}} @@ -55,5 +55,5 @@ - 数据加载中... + 数据加载中，请耐心等待... \ No newline at end of file diff --git a/pages/recruit/referto/referto.wxml b/pages/recruit/referto/referto.wxml index 55ea5f8..3e5ce08 100644 --- a/pages/recruit/referto/referto.wxml +++ b/pages/recruit/referto/referto.wxml @@ -31,25 +31,19 @@ - - + + {{ areasArr[areaIndex].name }} - - - {{ cityArr[cityIndex].name }} - - - {{ regiArr[regiIndex].name }} @@ -61,6 +55,9 @@ + + ({{'此地区剩余名额' + areaData.surplus + '人'}}) + diff --git a/pages/recruit/referto/referto.wxss b/pages/recruit/referto/referto.wxss index 6d3a874..8e6faef 100644 --- a/pages/recruit/referto/referto.wxss +++ b/pages/recruit/referto/referto.wxss @@ -124,6 +124,16 @@ page { margin-bottom: 30rpx; } +.site-input picker { + margin-bottom: 30rpx; + position: relative; +} + +.surplus { + text-align: center; + color: #db0000; +} + .site-input label text { color: #ee291b; } @@ -166,7 +176,7 @@ page { height: 44rpx; position: absolute; right: 20rpx; - top: calc(50% + 22rpx); + top: calc(50% - 22rpx); } .site-btn { diff --git a/pages/recruit/refertoEdit/refertoEdit.js b/pages/recruit/refertoEdit/refertoEdit.js index b714366..7f4f779 100644 --- a/pages/recruit/refertoEdit/refertoEdit.js +++ b/pages/recruit/refertoEdit/refertoEdit.js @@ -50,11 +50,10 @@ Page({ */ eitInfo(id) { wx.$api.recruit.Edit(id).then(res => { - console.log(res) let typeValue = res.data.types.findIndex(val=> val.experience_type_id == res.data.enroll.experience_type.experience_type_id) - let areasValue = res.data.provinces.findIndex(val=> val.name == res.data.province.name), - cityValue = res.data.cities.findIndex(val=> val.name == res.data.city.name), - regiValue = res.data.districts.findIndex(val=> val.name == res.data.district.name) + let areasValue = res.data.provinces.findIndex(val=> val.name == res.data.express.province.name), + cityValue = res.data.cities.findIndex(val=> val.name == res.data.express.city.name), + regiValue = res.data.districts.findIndex(val=> val.name == res.data.express.district.name) this.setData({ enrollData : res.data.enroll, typesIndex : typeValue, @@ -65,9 +64,9 @@ Page({ areaIndex : areasValue, cityIndex : cityValue, regiIndex : regiValue, - areaId : res.data.province.region_id, - cityId : res.data.city.region_id, - regiId : res.data.district.region_id, + areaId : res.data.express.province.region_id, + cityId : res.data.express.city.region_id, + regiId : res.data.express.district.region_id }) }).catch(err => {}) }, @@ -188,7 +187,10 @@ Page({ let data = { name : value.name, address : value.address, - experience_type_id : this.data.typesArr[this.data.typesIndex].experience_type_id + experience_type_id : this.data.typesArr[this.data.typesIndex].experience_type_id, + province_id : this.data.areaId, + city_id : this.data.cityId, + district_id : this.data.regiId, } this.setData({ disabled: true diff --git a/pages/water/details/details.wxml b/pages/water/details/details.wxml index a7287bb..561166d 100644 --- a/pages/water/details/details.wxml +++ b/pages/water/details/details.wxml @@ -45,7 +45,7 @@ 使用水滴 - ￥{{goodsData.water_number}} + {{goodsData.water_number}} diff --git a/project.config.json b/project.config.json index ea72c51..bfdbf9f 100644 --- a/project.config.json +++ b/project.config.json @@ -45,7 +45,7 @@ }, "compileType": "miniprogram", "libVersion": "2.17.0", - "appid": "wx9ae0c63d0c58caeb", + "appid": "wx6bd4fcc040bfa025", "projectname": "miniprogram-92", "condition": {}, "editorSetting": { diff --git a/project.private.config.json b/project.private.config.json index a5a7470..f34c6a1 100644 --- a/project.private.config.json +++ b/project.private.config.json @@ -98,6 +98,13 @@ "query": "", "launchMode": "default", "scene": 1011 + }, + { + "name": "", + "pathName": "pages/index/index", + "query": "", + "launchMode": "default", + "scene": 1011 } ] }