上传代码

pages/demandHall/companyDetail/index.wxml

@@ -50,7 +50,7 @@
         </view>
         <view class="info-item acea-row-nowrap">
           <view class="">所属类型</view>
-          <view class="colG">企业</view>
+          <view class="colG">{{detail.enterpriseType == 1? '企业' : '个人团队' }}</view>
         </view>
         <view class="info-item acea-row-nowrap">
           <view class="">法定代表</view>

pages/demandHall/resourcesDetail/index.wxml

@@ -5,7 +5,7 @@
   </view>
   <view class="detail-box">
     <view class="r-name">{{detail.title}}</view>
-    <view class="tag">IT开发·网站建设</view>
+    <view class="tag">{{detail.cname}}</view>
     <view class="title-box acea-row row-middle">
       <view class="col-line"></view>
       <text>基本信息</text>

pages/index/index.wxml

@@ -107,7 +107,7 @@
       <view class="item" wx:for="{{resourcesList}}" wx:key="index">
         <view class="item-top">
           <view class="project-name line1">{{item.title}}</view>
-          <view class="tag">IT软件·网站建设</view>
+          <view class="tag">{{item.cname}}</view>
           <view class="desc">{{item.detailedDescription}}</view>
           <view class="buy-btn" bindtap="toResourcesDetail" data-id="{{item.id}}">了解详情</view>
        </view>

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')
   },
 
   /**

pages/release/companyAuth/index.wxml

@@ -44,8 +44,10 @@
     </view>
     <view class="form-item acea-row row-between row-middle">
       <view class="label">所在行业</view>
-      <view class="inp-box">
+      <view class="inp-box acea-row row-right row-middle" bindtap="toProfession">
-        <input type="text" value="" placeholder="请选择" />
+        <!-- <input type="text" value="{{form.profession}}" disabled="true" placeholder="请选择" />
+        <image src="../../../images/home/arrow-r.png" class="arrorR"></image> -->
+        
       </view>
     </view>
     <view class="form-item acea-row row-between row-middle">

pages/release/companyAuth/index.wxss

@@ -73,3 +73,8 @@
   text-align: center;
   margin:40rpx auto;
 }
+.arrorR{
+  width: 14rpx;
+  height: 24rpx;
+  margin-left: 10rpx;
+}

pages/release/perfectCompanyInfo/index.wxml

@@ -35,7 +35,7 @@
         <view>企业经营范围<text class="red">*</text></view>
       </view>
       <view class="inp-box">
-        <input type="text" placeholder="请填写企业经营范围，可用','分开" value="{{form.businessNature}}" name="businessNature" />
+        <input type="text" placeholder="请填写企业经营范围" value="{{form.businessNature}}" name="businessNature" />
       </view>
     </view>
     <view class="form-item">

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');

pages/user/index.wxml

@@ -24,15 +24,15 @@
       </view>
       <view class="my-reminds-box acea-row row-around ">
         <view class="remind-item" bindtap="toResourcesOrder">
-          <view class="count">0</view>
+          <view class="count">{{demandCounts}}</view>
           <view>资源订单</view>
         </view>
-        <view class="remind-item">
+        <!-- <view class="remind-item">
           <view class="count">0</view>
           <view>我的审核</view>
-        </view>
+        </view> -->
         <view class="remind-item" bindtap="toNeedsOrder">
-          <view class="count">0</view>
+          <view class="count">{{supplyCounts}}</view>
           <view>需求订单</view>
         </view>
       </view>

pages/user/needsOrder/index.json

@@ -1,4 +1,4 @@
 {
   "usingComponents": {},
-  "navigationBarTitleText": "需求订单"
+  "navigationBarTitleText": "我发出的需求"
 }

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,

pages/user/resourcesOrder/index.json

@@ -1,4 +1,4 @@
 {
   "usingComponents": {},
-  "navigationBarTitleText": "资源订单"
+  "navigationBarTitleText": "我收到的需求"
 }

pages/user/resourcesOrder/index.wxml

@@ -53,7 +53,7 @@
               <view class="desc line1">{{c.content}}</view>
             </view>
             <image src="../../../images/home/call.png" class="call" catchtap="call" data-item="{{c}}"></image>
-            <view class="create-btn" wx:if="{{c.comminuteState == 1}}" catchtap="createProject" data-item="{{item}}" data-id="{{c.communicateId}}">立项</view>
+            <view class="create-btn" wx:if="{{c.comminuteState == 1 && c.haveRight == 1}}" catchtap="createProject" data-item="{{item}}" data-id="{{c.communicateId}}">立项</view>
             <view class="create-btn default" wx:if="{{c.comminuteState == 2}}" data-item="{{item}}" data-id="{{c.communicateId}}">等待立项</view>
             <view class="create-btn default" wx:if="{{c.comminuteState == 3}}" data-item="{{item}}" data-id="{{c.communicateId}}">已立项</view>
             <view class="create-btn default" wx:if="{{c.comminuteState == 4}}" data-item="{{item}}" data-id="{{c.communicateId}}">项目流标</view>

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
         }
       ]
     }