选择类型

pages/demandHall/needsContact/index.wxml

@@ -27,7 +27,7 @@
         <view class="info">
           <view class="company-name line1">{{item.title}}</view>
           <view class="tags-box">
-            <view class="tag-item">网站建设</view>
+            <view class="tag-item">{{item.cname}}</view>
           </view>
           <view class="slogan">{{item.enterprise.enterpriseName}}</view>
         </view>

pages/demandHall/resourcesContact/index.wxml

@@ -21,11 +21,11 @@
         <text>发送需求给企业(个人)</text>
       </view>
       <view class="n-title-box acea-row row-between row-middle">
-        <view class="">我需要公司官网设计-网红餐饮网红餐饮</view>
+        <view class="">{{item.title}}</view>
         <view class="colO">发布中</view>
       </view>
       <view class="n-tags acea-row">
-        <view class="n-tag-item">场地租赁</view>
+        <view class="n-tag-item">{{item.cname}}</view>
       </view>
     </view>
     <!-- <view class="need-item">

pages/demandHall/resourcesContact/index.wxss

@@ -125,8 +125,9 @@
   padding: 0 26rpx;
 }
 .n-tag-item{
-  width: 112rpx;
+  width: auto;
   height: 36rpx;
+  padding: 0 8rpx;
   line-height: 34rpx;
   text-align: center;
   border: 1rpx solid #FFAA00;

pages/release/companyAuth/index.js

@@ -69,11 +69,19 @@ Page({
       }
     })
   },
+  resourcesChange(e){
+    // console.log(e)
+    let idx = Number(e.detail.value)
+    this.setData({
+      resourcesIdx: idx,
+      ['form.resourceCagetoryId']: this.data.resourcesList[idx].id
+    })
+  },
   //选择行业
   toProfession(){
-    wx.navigateTo({
+    // wx.navigateTo({
-      url: '/pages/user/profession/index',
+    //   url: '/pages/user/profession/index',
-    })
+    // })
   },
   checkBank(e){
     // console.log(e.detail.value)
@@ -313,7 +321,7 @@ Page({
    * 生命周期函数--监听页面显示
    */
   onShow: function () {
-    console.log('232322')
+    
   },
 
   /**

pages/release/companyAuth/index.wxml

@@ -44,10 +44,12 @@
     </view>
     <view class="form-item acea-row row-between row-middle">
       <view class="label">所在行业</view>
-      <view class="inp-box acea-row row-right row-middle" bindtap="toProfession">
+      <view class="inp-box acea-row row-right row-middle">
         <!-- <input type="text" value="{{form.profession}}" disabled="true" placeholder="请选择" />
         <image src="../../../images/home/arrow-r.png" class="arrorR"></image> -->
-        
+        <picker class="pick-box" bindchange="resourcesChange" value="{{idx}}" range="{{resourcesList}}" range-key="{{'cagetoryName'}}" mode="selector">
+          <view class="picker">{{resourcesList[resourcesIdx].cagetoryName || '请选择'}}</view>
+        </picker>
       </view>
     </view>
     <view class="form-item acea-row row-between row-middle">

pages/release/perfectPersonInfo/index.js

@@ -17,7 +17,8 @@ Page({
       longitude: '',
       enterprisePhone: '',
       imgPaths: [],
-    }
+    },
+    resourcesList:[]
   },
   showMap(){
     let that = this;
@@ -50,6 +51,7 @@ Page({
    */
   onLoad: function (options) {
     this.initValidate()//验证规则函数
+    this.getResourcesCagetory()
   },
   initValidate(){
     const rules = {
@@ -88,6 +90,25 @@ Page({
     }
     this.WxValidate = new WxValidate(rules, messages)
   },
+  //获取供应、需求类型
+  getResourcesCagetory(){
+    app.http('GET','ResourcesCagetory/listResourcesCagetory').then((res)=>{
+      // console.log(res)
+      if(res.data.success){
+        this.setData({
+          resourcesList: res.data.data
+        })
+      }
+    })
+  },
+  resourcesChange(e){
+    // console.log(e)
+    let idx = Number(e.detail.value)
+    this.setData({
+      resourcesIdx: idx,
+      ['form.resourceCagetoryId']: this.data.resourcesList[idx].id
+    })
+  },
   upImgs(){
     util.chooseImages2(img => {
       let imgs = this.data.form.imgPaths

pages/release/perfectPersonInfo/index.wxml

@@ -14,8 +14,11 @@
         <view class="introduction-item acea-row row-between-wrapper">
           <view>主要承接类型<text class="red">*</text></view>
           <view class="acea-row row-middle">
-            <input type="text" placeholder="请填写" valaue="{{form.industryId}}" name="industryId" />
+            <!-- <input type="text" placeholder="请填写" valaue="{{form.industryId}}" name="industryId" />
-            <image src="../../../images/home/arrow-r.png"></image>
+            <image src="../../../images/home/arrow-r.png"></image> -->
+            <picker class="pick-box" bindchange="resourcesChange" value="{{idx}}" range="{{resourcesList}}" range-key="{{'cagetoryName'}}" mode="selector">
+              <view class="picker">{{resourcesList[resourcesIdx].cagetoryName || '请选择'}}</view>
+            </picker>
           </view>
         </view>
         <view class="introduction-item acea-row row-between-wrapper">

pages/user/needsManage/index.js

@@ -67,8 +67,48 @@ Page({
   },
   // 下架
   xiajiaClick(e){
-    let id = e.currentTarget.dataset.id;
+    let id = e.currentTarget.dataset.item.id;
-    console.log(id)
+    let status = e.currentTarget.dataset.item.status;
+    let that = this;
+    if(status == 1){
+      wx.showModal({
+        title: '提示',
+        content: '是否确定下架需求',
+        success(res){
+          if(res.confirm){
+            app.http('GET','Resources/withdrawResource',{id: id}).then((res)=>{
+              if(res.data.success){
+                wx.showToast({
+                  title: '操作成功',
+                })
+                setTimeout(()=>{
+                  that.getList()
+                },1500)
+              }
+            })
+          }
+        }
+      })
+    } else{
+      wx.showModal({
+        title: '提示',
+        content: '是否确定上架需求',
+        success(res){
+          if(res.confirm){
+            app.http('GET','Resources/putOnResource',{id: id}).then((res)=>{
+              if(res.data.success){
+                wx.showToast({
+                  title: '操作成功',
+                })
+                setTimeout(()=>{
+                  that.getList()
+                },1500)
+              }
+            })
+          }
+        }
+      })
+    }
   },
   // 撤回
   withdrawClick(e){

pages/user/needsManage/index.wxml

@@ -34,7 +34,7 @@
       <view class="btn-box acea-row row-between row-middle">
         <view class="time">{{item.resourceStartTime}}申请</view>
         <view class="btns acea-row row-middle">
-          <view class="btn" wx:if="{{tabActive == 1}}" bindtap="xiajiaClick" data-id="{{item.id}}">下架需求</view>
+          <view class="btn" wx:if="{{tabActive == 1}}" bindtap="xiajiaClick" data-item="{{item}}">{{item.status == 1 ? '下架' : '上架' }}需求</view>
           <view class="btn" wx:if="{{tabActive == 2}}" bindtap="withdrawClick" data-id="{{item.id}}">撤回审核</view>
           <view class="btn" wx:if="{{tabActive == 3}}" bindtap="editClick" data-id="{{item.id}}">编辑发布</view>
           <view class="btn default" wx:if="{{tabActive == 3}}" bindtap="delClick" data-id="{{item.id}}">删除需求</view>

pages/user/needsOrder/index.wxml

@@ -21,11 +21,11 @@
         <view class="n-desc">{{item.resourceInfo.content}}</view>
       </view>
       <view class="concat-list-box">
-        <view class="open-btn acea-row row-middle" bindtap="openClick" data-idx="{{index}}">
+        <!-- <view class="open-btn acea-row row-middle" bindtap="openClick" data-idx="{{index}}">
          <text>{{!item.open ? '展开' : '收起'}}</text> 
          <image class="arrow-down {{!item.open ? '' : 'arrow-up'}}" src="../../../images/arrow-d.png"></image>
-        </view>
+        </view> -->
-        <view class="concat-list {{item.open ? 'list-open' : ''}}" >
+        <!-- <view class="concat-list {{item.open ? 'list-open' : ''}}" > -->
           <view class="info-item" wx:for="{{item.partnerInfos}}" wx:for-item="info" wx:key="index">
             <view class=" acea-row row-middle">
               <image src="{{info.logo}}"></image>
@@ -53,7 +53,7 @@
               </view>
             </view>
           </view>
-        </view>
+        <!-- </view> -->
       </view>
     </view>
     <view class="item" wx:if="{{tabActive != 1}}"  wx:for="{{list}}" wx:key="index">

pages/user/needsOrder/index.wxss

@@ -3,7 +3,6 @@
 
 .needs-info-box{
   border: none !important;
-  margin-bottom: 0 !important;
 }
 .info2{
   width: calc(100% - 120rpx);

pages/user/resourcesManage/index.js

@@ -67,9 +67,50 @@ Page({
     })
   },
    // 下架
+   // 下架
   xiajiaClick(e){
-     let id = e.currentTarget.dataset.id;
+    let id = e.currentTarget.dataset.item.id;
-     console.log(id)
+    let status = e.currentTarget.dataset.item.status;
+    let that = this;
+    if(status == 1){
+      wx.showModal({
+        title: '提示',
+        content: '是否确定下架需求',
+        success(res){
+          if(res.confirm){
+            app.http('GET','Resources/withdrawResource',{id: id}).then((res)=>{
+              if(res.data.success){
+                wx.showToast({
+                  title: '操作成功',
+                })
+                setTimeout(()=>{
+                  that.getList()
+                },1500)
+              }
+            })
+          }
+        }
+      })
+    } else{
+      wx.showModal({
+        title: '提示',
+        content: '是否确定上架需求',
+        success(res){
+          if(res.confirm){
+            app.http('GET','Resources/putOnResource',{id: id}).then((res)=>{
+              if(res.data.success){
+                wx.showToast({
+                  title: '操作成功',
+                })
+                setTimeout(()=>{
+                  that.getList()
+                },1500)
+              }
+            })
+          }
+        }
+      })
+    }
   },
    // 撤回
    withdrawClick(e){

pages/user/resourcesManage/index.wxml

@@ -30,7 +30,7 @@
         <view wx:if="{{tabActive == 4}}">赚取 50000元</view>
         <view class="time" wx:if="{{tabActive == 2 || tabActive == 3}}">{{item.createTime}}申请</view>
         <view class="btns acea-row">
-          <view class="btn" wx:if="{{tabActive == 1}}" data-id="{{item.id}}" bindtap="xiajiaClick">下架资源</view>
+          <view class="btn" wx:if="{{tabActive == 1}}" data-item="{{item}}" bindtap="xiajiaClick">下架资源</view>
           <view class="btn" wx:if="{{tabActive == 2}}" data-id="{{item.id}}" bindtap="withdrawClick">撤回审核</view>
           <view class="btn" wx:if="{{tabActive == 3}}" data-id="{{item.id}}" bindtap="editClick">编辑发布</view>
           <view class="btn default" wx:if="{{tabActive == 3}}" data-id="{{item.id}}" bindtap="delClick">删除项目</view>

project.private.config.json

@@ -23,6 +23,12 @@
           "pathName": "pages/release/perfectPersonInfo/index",
           "query": "",
           "scene": null
+        },
+        {
+          "name": "pages/release/companyAuth/index",
+          "pathName": "pages/release/companyAuth/index",
+          "query": "",
+          "scene": null
         }
       ]
     }