From d5bc0d41f066c4a085d1ef0e1bdd682f275039fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E8=B1=AA?= <781521347@qq.com> Date: Tue, 28 Sep 2021 17:05:24 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app.js | 2 + pages/demandHall/createProject/index.js | 28 +++--- pages/demandHall/index.wxml | 2 +- pages/demandHall/needsContact/index.js | 9 +- pages/demandHall/needsDetail/index.wxml | 2 +- pages/demandHall/resourcesContact/index.js | 9 +- pages/login/index.js | 10 +- pages/release/companyAuth/index.js | 86 ++++++++++++---- pages/release/index.js | 48 +++++---- pages/release/index.wxml | 16 ++- pages/release/index.wxss | 1 + pages/release/perfectCompanyInfo/index.wxml | 4 +- pages/release/personAuth/index.js | 76 +++++++++++---- pages/user/editNeeds/index.js | 103 +++++++++++++------- pages/user/editNeeds/index.wxml | 2 +- pages/user/index.js | 3 +- pages/user/needsManage/index.js | 6 -- pages/user/needsManage/index.wxml | 2 +- pages/user/needsOrder/index.wxss | 4 +- pages/user/resourcesManage/index.js | 6 -- pages/user/resourcesManage/index.wxss | 3 +- pages/user/resourcesOrder/index.js | 5 +- pages/user/resourcesOrder/index.wxss | 3 + project.config.json | 6 +- 24 files changed, 289 insertions(+), 147 deletions(-) diff --git a/app.js b/app.js index 6dea786..16ab108 100644 --- a/app.js +++ b/app.js @@ -129,6 +129,7 @@ App({ var that = this; var header = { 'content-type': 'application/json', + 'version': '2.0', 'Authorization' : wx.getStorageSync('token') || '' } return new Promise( @@ -168,6 +169,7 @@ App({ ) }, globalData: { + // baseURL : 'http://192.168.0.110:8092/api/', baseURL : 'http://192.168.0.114:8092/api/', // baseURL : 'https://www.cyjyyjy.com:8093/api/', userInfo: null, diff --git a/pages/demandHall/createProject/index.js b/pages/demandHall/createProject/index.js index ce803fb..690b260 100644 --- a/pages/demandHall/createProject/index.js +++ b/pages/demandHall/createProject/index.js @@ -126,36 +126,36 @@ Page({ } }) }, - //获取资源信息 - getProjectInfo(){ - console.log(this.data.communicateId) - app.http('get','Project/toCreateProject',{communicateId:this.data.communicateId}).then((res)=>{ - if(res.data.success){ - this.setData({ - projectInfo: res.data.data - }) - } - }) - }, + /** * 生命周期函数--监听页面加载 */ onLoad: function (options) { console.log(options) let id = options.id // 立项 - let state = options.state // 项目书状态，1已申请，2等待立项，3已成立 + let state = options.state || 0 // 项目书状态，1已申请，2等待立项，3已成立 this.setData({ communicateId: id, - state: state || 0 + state: state }) this.getModeList() - if(state == 0 ){ this.getProjectInfo() } else{ this.getProjectDetail() } }, + //获取资源信息 + getProjectInfo(){ + console.log(this.data.communicateId) + app.http('get','Project/toCreateProject',{communicateId:this.data.communicateId}).then((res)=>{ + if(res.data.success){ + this.setData({ + projectInfo: res.data.data + }) + } + }) + }, //获取立项书详情 getProjectDetail(){ app.http('get','Communicate/getProjectInfo',{ communicateId: this.data.communicateId }).then((res)=>{ diff --git a/pages/demandHall/index.wxml b/pages/demandHall/index.wxml index e426385..03ece7f 100644 --- a/pages/demandHall/index.wxml +++ b/pages/demandHall/index.wxml @@ -180,7 +180,7 @@ 商家身份(所有商家均实名认证) - 个人认证 + 个人认证 企业认证 diff --git a/pages/demandHall/needsContact/index.js b/pages/demandHall/needsContact/index.js index bcd0de8..760cd00 100644 --- a/pages/demandHall/needsContact/index.js +++ b/pages/demandHall/needsContact/index.js @@ -35,7 +35,7 @@ Page({ }, getList(){ app.http('post','Resources/listMyResourcesPublish',{ - resourceType: 2 + resourceType: 1 }).then((res)=>{ if(res.data.success){ res.data.data.content.length > 0 ? this.setData({active: res.data.data.content[0].id}) : this.setData({active: null}) @@ -46,7 +46,7 @@ Page({ }) }, submit(){ - if(this.data.content == '' && this.demandId == null){ + if(this.data.content == '' && this.data.demandId == null){ wx.showToast({ title: '请填写您的申请内容！', icon: 'none' @@ -65,6 +65,11 @@ Page({ title: '提交成功！', duration: 2000 }) + setTimeout(()=>{ + wx.navigateBack({ + delta: 1, + }) + },2000) } }) }, diff --git a/pages/demandHall/needsDetail/index.wxml b/pages/demandHall/needsDetail/index.wxml index 85b79fc..74c9c35 100644 --- a/pages/demandHall/needsDetail/index.wxml +++ b/pages/demandHall/needsDetail/index.wxml @@ -1,7 +1,7 @@ - + {{detail.resourceEndTime}}停止报名 需求标题: diff --git a/pages/demandHall/resourcesContact/index.js b/pages/demandHall/resourcesContact/index.js index 092d722..4d1ab5b 100644 --- a/pages/demandHall/resourcesContact/index.js +++ b/pages/demandHall/resourcesContact/index.js @@ -37,7 +37,7 @@ Page({ }, getList(){ app.http('post','Resources/listMyResourcesPublish',{ - resourceType: 1 + resourceType: 2 }).then((res)=>{ if(res.data.success){ res.data.data.content.length > 0 ? this.setData({active: res.data.data.content[0].id}) : this.setData({active: null}) @@ -72,6 +72,13 @@ Page({ delta: 1, }) },2000) + } else{ + if(res.data.status == 5110 || res.data.status == 5111 || res.data.status == 5112){ + wx.showToast({ + title: res.data.msg, + icon: 'none' + }) + } } }) }, diff --git a/pages/login/index.js b/pages/login/index.js index 0837d67..ee06ecb 100644 --- a/pages/login/index.js +++ b/pages/login/index.js @@ -14,11 +14,11 @@ Page({ */ onLoad: function (options) { let userInfo = wx.getStorageSync('userInfo') - if(userInfo.phone && userInfo.phone != ''){ - this.setData({ - login: true - }) - } + // if(userInfo.phone && userInfo.phone != ''){ + // this.setData({ + // login: true + // }) + // } if (wx.getUserProfile) { this.setData({ canIUseGetUserProfile: true diff --git a/pages/release/companyAuth/index.js b/pages/release/companyAuth/index.js index 124100b..63ce864 100644 --- a/pages/release/companyAuth/index.js +++ b/pages/release/companyAuth/index.js @@ -22,8 +22,8 @@ Page({ idcardPicFront: '',// 法人身份证正面照 idcardPicBehind: '',// 法人身份证背面照 idcardPicHold: '',// 法人手持身份证 - }, + isEdit: false, scaleArr: ['0-25','25-99','99-200','200-500','500及以上'] }, @@ -31,10 +31,33 @@ Page({ * 生命周期函数--监听页面加载 */ onLoad: function (options) { - + if(options.authInfo){ + let authInfo = JSON.parse(decodeURIComponent(options.authInfo)); + this.setData({ + isEdit: true, + ['form.isLegalPerson']: 0, //是否为企业法人 + ['form.authorizationPath']: authInfo.authorizationPath || '', // 授权书图片 + ['form.enterpriseName']: authInfo.enterpriseName, //企业名称 + ['form.creditCode']: authInfo.creditCode, //信用代码 + ['form.enterpriseScale']: authInfo.enterpriseScale || '请选择', //企业规模 + ['form.businessLicense']: authInfo.businessLicense || '', //营业执照照片 + ['form.bankAccount']: authInfo.bankAccount || '', //银行账号 + ['form.bankName']: authInfo.bankName ||'', // 开户银行 + ['form.bankBranch']: authInfo.bankBranch ||'', // 开户网点 + ['form.legalPersonName']: authInfo.legalPersonName || '', + ['form.legalPhone']: authInfo.legalPhone || '', + ['form.legalPersonIdcard']: authInfo.legalPersonIdcard || '', + ['form.idcardPicFront']: authInfo.idcardPicFront || '', + ['form.idcardPicBehind']: authInfo.idcardPicBehind || '', + ['form.idcardPicHold']: authInfo.idcardPicHold || '', + ['form.enterpriseId']: authInfo.enterpriseId, + ['form.id']: authInfo.id, + ['form.authorizationType']: 1 + }) + } }, checkBank(e){ - console.log(e.detail.value) + // console.log(e.detail.value) app.http('get','EnterpriseAuthentication/getBankName',{bankAccount: e.detail.value}).then((res)=>{ if(res.data.success){ this.setData({ @@ -218,24 +241,45 @@ Page({ }) return } else{ - app.http('post','EnterpriseAuthentication/createAuthenticInfoTwo',this.data.form).then((res)=>{ - if(res.data.success){ - wx.showModal({ - title: '提示！', - content: '提交成功！请等待审核', - success(res) { - wx.switchTab({ - url: '/pages/index/index', - }) - } - }) - } else{ - wx.showToast({ - title: res.data.msg, - icon: 'none' - }) - } - }) + if(!this.data.isEdit){ + app.http('post','EnterpriseAuthentication/createAuthenticInfoTwo',this.data.form).then((res)=>{ + if(res.data.success){ + wx.showModal({ + title: '提示！', + content: '提交成功！请等待审核', + success(res) { + wx.switchTab({ + url: '/pages/index/index', + }) + } + }) + } else{ + wx.showToast({ + title: res.data.msg, + icon: 'none' + }) + } + }) + } else{ + app.http('post','EnterpriseAuthentication/editAuthenticInfo',this.data.form).then((res)=>{ + if(res.data.success){ + wx.showModal({ + title: '提示！', + content: '提交成功！请等待审核', + success(res) { + wx.switchTab({ + url: '/pages/index/index', + }) + } + }) + } else{ + wx.showToast({ + title: res.data.msg, + icon: 'none' + }) + } + }) + } } }, /** diff --git a/pages/release/index.js b/pages/release/index.js index 3f296b3..4964887 100644 --- a/pages/release/index.js +++ b/pages/release/index.js @@ -10,7 +10,8 @@ Page({ userInfo: {}, authStatus: 0, authType: null, - completeState: null + completeState: null, + authInfo:{} }, back(){ wx.switchTab({ @@ -22,6 +23,11 @@ Page({ wx.navigateTo({ url: '/pages/release/personAuth/index', }) + } else if(this.data.authStatus == 3){ + let authInfo = encodeURIComponent(JSON.stringify(this.data.authInfo)); + wx.navigateTo({ + url: '/pages/release/personAuth/index?authInfo=' + authInfo, + }) } else if(this.data.authStatus == 1){ wx.showToast({ title: '认证申请审核中，请等待！', @@ -34,6 +40,11 @@ Page({ wx.navigateTo({ url: '/pages/release/companyAuth/index', }) + } else if(this.data.authStatus == 3){ + let authInfo = encodeURIComponent(JSON.stringify(this.data.authInfo)); + wx.navigateTo({ + url: '/pages/release/companyAuth/index?authInfo=' + authInfo, + }) } else if(this.data.authStatus == 1){ wx.showToast({ title: '认证申请审核中，请等待！', @@ -49,18 +60,21 @@ Page({ }, isAuthentication(){ app.http('get','user/isAuthentication').then((res)=>{ - console.log(res) if(res.data.success){ this.setData({ authStatus: res.data.data.authenticationState, authType: res.data.data.authorizationType, - completeState: res.data.data.completeState + completeState: res.data.data.completeState, + authInfo: res.data.data.authInfo }) } }) }, toResources(){ let that = this; + console.log(this.data.authStatus,'authStatus') + console.log(this.data.authType,'authType') + console.log(this.data.completeState,'completeState') if(this.data.authStatus == 2 && this.data.authType == 1 && this.data.completeState == true){ wx.navigateTo({ url: '/pages/user/editNeeds/index?type=1', @@ -72,30 +86,31 @@ Page({ success(res){ if(res.confirm){ wx.navigateTo({ - url: '/pages/release/perfectCompanyInfo/index?status=' + that.data.authStatus, + url: '/pages/release/perfectCompanyInfo/index', }) } - } }) - } else if(this.data.authStatus == 3 && this.data.authType == 1 && this.data.completeState == false){ + } else if(this.data.authStatus == 0 && (this.data.authType == 1 || this.data.authType == 0) && this.data.completeState == false){ wx.showModal({ title: '提示！', - content: '您提交的企业信息未通过审核，点击确定去修改吧~', + content: '您还未完成企业认证，点击确定去认证吧~', success(res){ - wx.navigateTo({ - url: '/pages/release/perfectCompanyInfo/index?status=' + that.data.authStatus, - }) + if(res.confirm){ + wx.navigateTo({ + url: '/pages/release/companyAuth/index', + }) + } } }) } }, toNeeds(){ - if(this.data.authStatus == 2 && (this.data.authType == 2 || this.data.authType == 1) && this.data.completeState == true){ + if(this.data.authStatus == 2 && (this.data.authType == 2 || this.data.authType == 0) && this.data.completeState == true){ wx.navigateTo({ url: '/pages/user/editNeeds/index?type=2', }) - } else if((this.data.authStatus == 2 || this.data.authStatus == 3) && this.data.authType == 2 && this.data.completeState == false){ + } else if(this.data.authStatus == 2 && (this.data.authType == 2 || this.data.authType == 0) && this.data.completeState == false){ wx.showModal({ title: '提示！', content: '您还未完善个人信息，点击确定去完善吧~', @@ -105,15 +120,10 @@ Page({ }) } }) - } else if((this.data.authStatus == 2 || this.data.authStatus == 3) && this.data.authType == 1 && this.data.completeState == false){ + } else if(this.data.authStatus == 0 && (this.data.authType == 2 || this.data.authType == 0) && this.data.completeState == false){ wx.showModal({ title: '提示！', - content: '您还未完善企业信息，点击确定去完善吧~', - success(res){ - wx.navigateTo({ - url: '/pages/release/perfectCompanyInfo/index', - }) - } + content: '您还未完成认证，点击上方按钮去认证吧！', }) } }, diff --git a/pages/release/index.wxml b/pages/release/index.wxml index c4886dc..2e3fe7b 100644 --- a/pages/release/index.wxml +++ b/pages/release/index.wxml @@ -1,8 +1,8 @@ - 企业认证 - 个人认证 + 企业认证 + 个人认证 @@ -14,6 +14,18 @@ ! 注：完成企业认证后可以发布资源及需求，个人认证后只可发布需求 + + ! + {{authType == 1 ? '企业信息审核中，请耐心等待！' : '个人信息审核中， 请耐心等待'}} + + + ! + {{authType == 1 ? '企业信息审核通过，可以发布资源和需求！' : '个人信息审核通过，可以发布需求'}} + + + ! + {{authType == 1 ? '企业信息未审核通过， 请重新提交审核信息！' : '个人信息未审核通过， 请重新提交审核信息！'}} + diff --git a/pages/release/index.wxss b/pages/release/index.wxss index b621917..99ede93 100644 --- a/pages/release/index.wxss +++ b/pages/release/index.wxss @@ -35,6 +35,7 @@ color: #FF0000; font-size: 20rpx; padding-left: 54rpx; + margin-bottom: 10rpx; } .icon{ width: 26rpx; diff --git a/pages/release/perfectCompanyInfo/index.wxml b/pages/release/perfectCompanyInfo/index.wxml index 1f0d558..90a42eb 100644 --- a/pages/release/perfectCompanyInfo/index.wxml +++ b/pages/release/perfectCompanyInfo/index.wxml @@ -19,7 +19,7 @@ - + @@ -68,7 +68,7 @@ - + diff --git a/pages/release/personAuth/index.js b/pages/release/personAuth/index.js index 5f216d2..dcd67be 100644 --- a/pages/release/personAuth/index.js +++ b/pages/release/personAuth/index.js @@ -14,15 +14,30 @@ Page({ idcardPicFront: '', idcardPicBehind: '', idcardPicHold: '' - } + }, + isEdit: false }, /** * 生命周期函数--监听页面加载 */ onLoad: function (options) { - + if(options.authInfo){ + let authInfo = JSON.parse(decodeURIComponent(options.authInfo)); + this.setData({ + isEdit: true, + ['form.legalPersonName']: authInfo.legalPersonName, + ['form.legalPhone']: authInfo.legalPhone || '', + ['form.legalPersonIdcard']: authInfo.legalPersonIdcard, + ['form.idcardPicFront']: authInfo.idcardPicFront, + ['form.idcardPicBehind']: authInfo.idcardPicBehind, + ['form.idcardPicHold']: authInfo.idcardPicHold, + ['form.id']: authInfo.id, + ['form.authorizationType']: 2 + }) + } }, + inpChange(e){ let type = e.currentTarget.dataset.type let value = e.detail.value @@ -97,24 +112,45 @@ Page({ }) return } else{ - app.http('post','EnterpriseAuthentication/createAuthenticInfoOne',this.data.form).then((res)=>{ - if(res.data.success){ - wx.showModal({ - title: '提示！', - content: '提交成功！请等待审核', - success(res) { - wx.switchTab({ - url: '/pages/index/index', - }) - } - }) - } else{ - wx.showToast({ - title: res.data.msg, - icon: 'none' - }) - } - }) + if(this.data.isEdit == false){ + app.http('post','EnterpriseAuthentication/createAuthenticInfoOne',this.data.form).then((res)=>{ + if(res.data.success){ + wx.showModal({ + title: '提示！', + content: '提交成功！请等待审核', + success(res) { + wx.switchTab({ + url: '/pages/index/index', + }) + } + }) + } else{ + wx.showToast({ + title: res.data.msg, + icon: 'none' + }) + } + }) + } else{ + app.http('post','EnterpriseAuthentication/editAuthenticInfo',this.data.form).then((res)=>{ + if(res.data.success){ + wx.showModal({ + title: '提示！', + content: '提交成功！请等待审核', + success(res) { + wx.switchTab({ + url: '/pages/index/index', + }) + } + }) + } else{ + wx.showToast({ + title: res.data.msg, + icon: 'none' + }) + } + }) + } } }, /** diff --git a/pages/user/editNeeds/index.js b/pages/user/editNeeds/index.js index ff0cf9a..0af7010 100644 --- a/pages/user/editNeeds/index.js +++ b/pages/user/editNeeds/index.js @@ -30,6 +30,11 @@ Page({ active: e.currentTarget.dataset.i }) }, + capitalChange(e){ + this.setData({ + ['form.capital']: e.detail.value + }) + }, startTimeChange(e){ this.setData({ ['form.resourceStartTime']: e.detail.value @@ -121,44 +126,68 @@ Page({ }, submit(e){ let that = this - let type = e.currentTarget.dataset.type - wx.showModal({ - title: '提示！', - content: '是否确认提交？', - success(res){ - if(res.confirm){ - const params = e.detail.value - params.resourceType = that.data.form.resourceType + 1 - params.resourceImgs = that.data.form.resourceImgs - params.capital = that.data.form.capital - params.resourceAuditState = type - if (!that.WxValidate.checkForm(params)) { - const error = that.WxValidate.errorList[0] - that.showModal(error) - return false - } - app.http('post','Resources/create',params).then((res)=>{ - if(res.data.success){ - wx.showToast({ - title: '提交成功', - duration: 2000 - }) - setTimeout(()=>{ - wx.navigateBack({ - delta: 1, - }) - },2000) - } else{ - wx.showToast({ - title: '请求失败', - duration: 2000, - icon: 'none' - }) - } - }) - } else{ - console.log('已取消') + let type = e.detail.target.dataset.type + let params = e.detail.value + params.resourceType = that.data.form.resourceType + 1 + params.resourceImgs = that.data.form.resourceImgs + params.capital = that.data.form.capital + if(type == 0){ + params.isDraft = true + wx.showModal({ + title: '提示！', + content: '是否保存到草稿箱？', + success(res){ + if(res.confirm){ + if (!that.WxValidate.checkForm(params)) { + const error = that.WxValidate.errorList[0] + that.showModal(error) + return false + } + that.submitHttp(params) + } else{ + console.log('已取消') + } } + }) + } else{ + wx.showModal({ + title: '提示！', + content: '是否确认提交？', + success(res){ + if(res.confirm){ + params.isDraft = false + if (!that.WxValidate.checkForm(params)) { + const error = that.WxValidate.errorList[0] + that.showModal(error) + return false + } + that.submitHttp(params) + } else{ + console.log('已取消') + } + } + }) + } + + }, + submitHttp(params){ + app.http('post','Resources/create',params).then((res)=>{ + if(res.data.success){ + wx.showToast({ + title: '提交成功', + duration: 2000 + }) + setTimeout(()=>{ + wx.navigateBack({ + delta: 1, + }) + },2000) + } else{ + wx.showToast({ + title: '请求失败', + duration: 2000, + icon: 'none' + }) } }) }, diff --git a/pages/user/editNeeds/index.wxml b/pages/user/editNeeds/index.wxml index 3e8f55a..95e07f7 100644 --- a/pages/user/editNeeds/index.wxml +++ b/pages/user/editNeeds/index.wxml @@ -45,7 +45,7 @@ - + 元 diff --git a/pages/user/index.js b/pages/user/index.js index add65a8..7f18c36 100644 --- a/pages/user/index.js +++ b/pages/user/index.js @@ -19,6 +19,7 @@ Page({ */ onLoad: function (options) { app.editTabbar(); + app.getInfo() }, getUser(){ let userInfo = wx.getStorageSync('userInfo'); @@ -77,7 +78,7 @@ Page({ * 生命周期函数--监听页面显示 */ onShow: function () { - app.getInfo(); + // app.getInfo(); }, /** diff --git a/pages/user/needsManage/index.js b/pages/user/needsManage/index.js index 52f053b..7cc46a5 100644 --- a/pages/user/needsManage/index.js +++ b/pages/user/needsManage/index.js @@ -9,7 +9,6 @@ Page({ tabActive: 1, list: [], resourceType: 2, - resourceState: null, resourceAuditState: null, }, tabClick(e){ @@ -20,25 +19,21 @@ Page({ if(i == 1){ this.setData({ tabActive: i, - resourceState: 1, resourceAuditState: [2], }) } else if(i == 2){ this.setData({ tabActive: i, - resourceState: 0, resourceAuditState: [1], }) } else if(i == 3){ this.setData({ tabActive: i, - resourceState: 0, resourceAuditState: [0,3], }) } else if(i == 4){ this.setData({ tabActive: i, - resourceState: 2, resourceAuditState: [], }) } @@ -61,7 +56,6 @@ Page({ getList(){ app.http('post','Resources/listMyResources',{ resourceType: this.data.resourceType, - resourceState: this.data.resourceState, resourceAuditState : this.data.resourceAuditState }).then((res)=>{ if(res.data.success){ diff --git a/pages/user/needsManage/index.wxml b/pages/user/needsManage/index.wxml index 7896395..6901aa4 100644 --- a/pages/user/needsManage/index.wxml +++ b/pages/user/needsManage/index.wxml @@ -29,7 +29,7 @@ 展示至{{item.resourceEndTime}} - 需求预算{{item.capital}} + 需求预算:{{item.capital}} {{item.detailedDescription}} {{item.resourceStartTime}}申请 diff --git a/pages/user/needsOrder/index.wxss b/pages/user/needsOrder/index.wxss index 0cb09da..7ed74a7 100644 --- a/pages/user/needsOrder/index.wxss +++ b/pages/user/needsOrder/index.wxss @@ -19,11 +19,11 @@ padding: 20rpx 0; } .projectinfo-box{ - font-size: 20rpx; + font-size: 26rpx; margin: 2rpx 0; } .tag-item{ - transform: scale(0.8); + /* transform: scale(0.8); */ margin: 0; } diff --git a/pages/user/resourcesManage/index.js b/pages/user/resourcesManage/index.js index 79ca825..7ca1662 100644 --- a/pages/user/resourcesManage/index.js +++ b/pages/user/resourcesManage/index.js @@ -9,7 +9,6 @@ Page({ tabActive: 1, list: [], resourceType: 1, - resourceState: null, resourceAuditState: null, }, toRelease(){ @@ -25,25 +24,21 @@ Page({ if(i == 1){ this.setData({ tabActive: i, - resourceState: 1, resourceAuditState: [2], }) } else if(i == 2){ this.setData({ tabActive: i, - resourceState: 0, resourceAuditState: [1], }) } else if(i == 3){ this.setData({ tabActive: i, - resourceState: 0, resourceAuditState: [0,3], }) } else if(i == 4){ this.setData({ tabActive: i, - resourceState: 2, resourceAuditState: [], }) } @@ -62,7 +57,6 @@ Page({ getList(){ app.http('post','Resources/listMyResources',{ resourceType: this.data.resourceType, - resourceState: this.data.resourceState, resourceAuditState : this.data.resourceAuditState }).then((res)=>{ if(res.data.success){ diff --git a/pages/user/resourcesManage/index.wxss b/pages/user/resourcesManage/index.wxss index 5ac980d..34d2312 100644 --- a/pages/user/resourcesManage/index.wxss +++ b/pages/user/resourcesManage/index.wxss @@ -75,7 +75,8 @@ font-weight: 400; line-height: 34rpx; color: #666666; - min-height: 112rpx; + height: 110rpx; + overflow: hidden; } .time{ color: #A7A7A7; diff --git a/pages/user/resourcesOrder/index.js b/pages/user/resourcesOrder/index.js index b7986a6..4585e75 100644 --- a/pages/user/resourcesOrder/index.js +++ b/pages/user/resourcesOrder/index.js @@ -105,7 +105,10 @@ Page({ }, // 拨打电话 call(e){ - console.log(e.currentTarget.dataset.item) + let item = e.currentTarget.dataset.item + wx.makePhoneCall({ + phoneNumber: item.phone, + }) }, // 立项 createProject(e){ diff --git a/pages/user/resourcesOrder/index.wxss b/pages/user/resourcesOrder/index.wxss index e4c8065..0d438f7 100644 --- a/pages/user/resourcesOrder/index.wxss +++ b/pages/user/resourcesOrder/index.wxss @@ -1,4 +1,7 @@ /* pages/user/resourcesOrder/index.wxss */ +image{ + border-radius: 8rpx; +} .order-page{ width: 100%; min-height: 100vh; diff --git a/project.config.json b/project.config.json index ea400ec..27d108e 100644 --- a/project.config.json +++ b/project.config.json @@ -21,9 +21,9 @@ "checkSiteMap": true, "uploadWithSourceMap": true, "compileHotReLoad": false, - "useMultiFrameRuntime": true, - "useApiHook": true, - "useApiHostProcess": true, + "useMultiFrameRuntime": false, + "useApiHook": false, + "useApiHostProcess": false, "babelSetting": { "ignore": [], "disablePlugins": [],