diff --git a/pages/demandHall/companyDetail/index.wxml b/pages/demandHall/companyDetail/index.wxml index f2f2eea..f6190c7 100644 --- a/pages/demandHall/companyDetail/index.wxml +++ b/pages/demandHall/companyDetail/index.wxml @@ -50,7 +50,7 @@ 所属类型 - 企业 + {{detail.enterpriseType == 1? '企业' : '个人团队' }} 法定代表 diff --git a/pages/demandHall/resourcesDetail/index.wxml b/pages/demandHall/resourcesDetail/index.wxml index d53e334..94a77b9 100644 --- a/pages/demandHall/resourcesDetail/index.wxml +++ b/pages/demandHall/resourcesDetail/index.wxml @@ -5,7 +5,7 @@ {{detail.title}} - IT开发·网站建设 + {{detail.cname}} 基本信息 diff --git a/pages/index/index.wxml b/pages/index/index.wxml index 457f330..c5f62a6 100644 --- a/pages/index/index.wxml +++ b/pages/index/index.wxml @@ -107,7 +107,7 @@ {{item.title}} - IT软件·网站建设 + {{item.cname}} {{item.detailedDescription}} 了解详情 diff --git a/pages/release/companyAuth/index.js b/pages/release/companyAuth/index.js index 63ce864..73738e4 100644 --- a/pages/release/companyAuth/index.js +++ b/pages/release/companyAuth/index.js @@ -11,6 +11,7 @@ Page({ authorizationPath: '', // 授权书图片 enterpriseName: '', //企业名称 creditCode: '', //信用代码 + industryId: '', //所在行业 enterpriseScale: '请选择', //企业规模 businessLicense: '', //营业执照照片 bankAccount: '', //银行账号 @@ -31,6 +32,7 @@ Page({ * 生命周期函数--监听页面加载 */ onLoad: function (options) { + this.getResourcesCagetory() if(options.authInfo){ let authInfo = JSON.parse(decodeURIComponent(options.authInfo)); this.setData({ @@ -56,6 +58,23 @@ Page({ }) } }, + //获取供应、需求类型 + getResourcesCagetory(){ + app.http('GET','ResourcesCagetory/listResourcesCagetory').then((res)=>{ + // console.log(res) + if(res.data.success){ + this.setData({ + resourcesList: res.data.data + }) + } + }) + }, + //选择行业 + toProfession(){ + wx.navigateTo({ + url: '/pages/user/profession/index', + }) + }, checkBank(e){ // console.log(e.detail.value) app.http('get','EnterpriseAuthentication/getBankName',{bankAccount: e.detail.value}).then((res)=>{ @@ -156,6 +175,7 @@ Page({ }, submit(){ let form = this.data.form + console.log(form) if(form.isLegalPerson == 0 && form.authorizationPath == ''){ wx.showToast({ title: '请上传授权书！', @@ -293,7 +313,7 @@ Page({ * 生命周期函数--监听页面显示 */ onShow: function () { - + console.log('232322') }, /** diff --git a/pages/release/companyAuth/index.wxml b/pages/release/companyAuth/index.wxml index 64066c3..9d04032 100644 --- a/pages/release/companyAuth/index.wxml +++ b/pages/release/companyAuth/index.wxml @@ -44,8 +44,10 @@ 所在行业 - - + + + diff --git a/pages/release/companyAuth/index.wxss b/pages/release/companyAuth/index.wxss index 51ad9cb..8a46a80 100644 --- a/pages/release/companyAuth/index.wxss +++ b/pages/release/companyAuth/index.wxss @@ -72,4 +72,9 @@ line-height: 76rpx; text-align: center; margin:40rpx auto; +} +.arrorR{ + width: 14rpx; + height: 24rpx; + margin-left: 10rpx; } \ No newline at end of file diff --git a/pages/release/perfectCompanyInfo/index.wxml b/pages/release/perfectCompanyInfo/index.wxml index 90a42eb..9904bd4 100644 --- a/pages/release/perfectCompanyInfo/index.wxml +++ b/pages/release/perfectCompanyInfo/index.wxml @@ -35,7 +35,7 @@ 企业经营范围* - + diff --git a/pages/user/index.js b/pages/user/index.js index 7f18c36..4430bf1 100644 --- a/pages/user/index.js +++ b/pages/user/index.js @@ -12,6 +12,8 @@ Page({ menuHeight: app.globalData.menuHeight, navHeight: app.globalData.navHeight, menuTop: app.globalData.menuTop, + demandCounts: 0, + supplyCounts: 0, }, /** @@ -20,6 +22,17 @@ Page({ onLoad: function (options) { app.editTabbar(); app.getInfo() + this.getOrderCount() + }, + getOrderCount(){ + app.http('GET','Communicate/getOrderCounts').then((res)=>{ + if(res.data.success){ + this.setData({ + demandCounts: res.data.data.demandCounts, + supplyCounts: res.data.data.supplyCounts + }) + } + }) }, getUser(){ let userInfo = wx.getStorageSync('userInfo'); diff --git a/pages/user/index.wxml b/pages/user/index.wxml index a984e82..ba41826 100644 --- a/pages/user/index.wxml +++ b/pages/user/index.wxml @@ -24,15 +24,15 @@ - 0 + {{demandCounts}} 资源订单 - + - 0 + {{supplyCounts}} 需求订单 diff --git a/pages/user/needsOrder/index.json b/pages/user/needsOrder/index.json index 72dd29d..cb68b4c 100644 --- a/pages/user/needsOrder/index.json +++ b/pages/user/needsOrder/index.json @@ -1,4 +1,4 @@ { "usingComponents": {}, - "navigationBarTitleText": "需求订单" + "navigationBarTitleText": "我发出的需求" } \ No newline at end of file diff --git a/pages/user/profession/index.js b/pages/user/profession/index.js index 81a5fc6..ec63c9a 100644 --- a/pages/user/profession/index.js +++ b/pages/user/profession/index.js @@ -27,6 +27,7 @@ Page({ sonItemClick(e){ console.log(e) let name = e.currentTarget.dataset.name; + let id = e.currentTarget.dataset.id; let pages = getCurrentPages(); //获取当前页面js里面的pages里的所有信息。 let prevPage = pages[ pages.length - 2 ]; @@ -34,7 +35,8 @@ Page({ //也可以直接给页面上的参数赋值 prevPage.setData({ - ['form.profession']: name + ['form.profession']: name, + ['form.industryId']: id }) wx.navigateBack({ delta: 1, diff --git a/pages/user/resourcesOrder/index.json b/pages/user/resourcesOrder/index.json index 46fb35f..c551ae1 100644 --- a/pages/user/resourcesOrder/index.json +++ b/pages/user/resourcesOrder/index.json @@ -1,4 +1,4 @@ { "usingComponents": {}, - "navigationBarTitleText": "资源订单" + "navigationBarTitleText": "我收到的需求" } \ No newline at end of file diff --git a/pages/user/resourcesOrder/index.wxml b/pages/user/resourcesOrder/index.wxml index b321550..1662b38 100644 --- a/pages/user/resourcesOrder/index.wxml +++ b/pages/user/resourcesOrder/index.wxml @@ -53,7 +53,7 @@ {{c.content}} - 立项 + 立项 等待立项 已立项 项目流标 diff --git a/project.private.config.json b/project.private.config.json index f971560..8591a0b 100644 --- a/project.private.config.json +++ b/project.private.config.json @@ -17,6 +17,12 @@ "pathName": "pages/user/editNeeds/index", "query": "type=1", "scene": null + }, + { + "name": "完善个人信息", + "pathName": "pages/release/perfectPersonInfo/index", + "query": "", + "scene": null } ] }