产品化更新

.hbuilderx/launch.json

@@ -1,16 +1,20 @@
-{ // launch.json 配置了启动调试时相关设置，configurations下节点名称可为 app-plus/h5/mp-weixin/mp-baidu/mp-alipay/mp-qq/mp-toutiao/mp-360/
-  // launchtype项可配置值为local或remote, local代表前端连本地云函数，remote代表前端连云端云函数
-    "version": "0.0",
-    "configurations": [{
-     	"default" : 
-     	{
-     		"launchtype" : "local"
-     	},
-     	"mp-weixin" : 
-     	{
-     		"launchtype" : "local"
-     	},
-     	"type" : "uniCloud"
-     }
+{
+    // launch.json 配置了启动调试时相关设置，configurations下节点名称可为 app-plus/h5/mp-weixin/mp-baidu/mp-alipay/mp-qq/mp-toutiao/mp-360/
+    // launchtype项可配置值为local或remote, local代表前端连本地云函数，remote代表前端连云端云函数
+    "version" : "0.0",
+    "configurations" : [
+        {
+            "default" : {
+                "launchtype" : "local"
+            },
+            "mp-weixin" : {
+                "launchtype" : "local"
+            },
+            "type" : "uniCloud"
+        },
+        {
+            "openVueDevtools" : true,
+            "type" : "uni-app:miniProgram"
+        }
     ]
 }

main.js

@@ -11,6 +11,7 @@ import {
 // #ifndef VUE3
 import Vue from 'vue'
 import auth from './js_sdk/auth'
+
 Vue.prototype.$auth = auth
 // import "./vite.config"
 Vue.prototype.$constant = constant
@@ -67,4 +68,4 @@ export function createApp() {
         app
     }
 }
-// #endif
+// #endif

manifest.json

@@ -1,6 +1,6 @@
 {
     "name" : "产品化管理端",
-    "appid" : "__UNI__8C5F0F6",
+    "appid" : "__UNI__E97C301",
     "description" : "应用描述",
     "versionName" : "1.0.0",
     "versionCode" : "100",
@@ -63,7 +63,7 @@
     },
     "mp-weixin" : {
         "libVersion" : "latest",
-        "appid" : "wxf7ff06df2bc1f1f2",
+        "appid" : "wx4e5d5b56936c2ca5",
         "optimization" : {
             "subPackages" : true
         },

pages.json

@@ -30,6 +30,14 @@
             "path": "pages/index/index",
             "style": {
                 "navigationBarTitleText": "首页"
+            },
+            "usingComponents": {
+                "van-button": "/wxcomponents/weapp/dist/button/index",
+                "van-toast": "/wxcomponents/weapp/dist/toast/index",
+                "van-field": "/wxcomponents/weapp/dist/field/index",
+                "van-popup": "/wxcomponents/weapp/dist/popup/index",
+                "van-picker": "/wxcomponents/weapp/dist/picker/index",
+                "van-dialog": "/wxcomponents/weapp/dist/dialog/index"
             }
         },
         {
@@ -1278,6 +1286,43 @@
                         }
                     }
                 },
+                {
+                    "path": "companyHouse/companyHouse",
+                    "style": {
+                        "navigationBarTitleText": "企业库",
+                        "enablePullDownRefresh": true,
+                        "onReachBottomDistance": 100,
+                        "app-plus": {
+                            "bounce": "vertical",
+                            "titleNView": {
+                                "buttons": [
+                                    {
+                                        "text": "\ue534",
+                                        "fontSrc": "/static/uni.ttf",
+                                        "fontSize": "22px",
+                                        "color": "#FFFFFF"
+                                    }
+                                ]
+                            }
+                        },
+                        "component": true,
+                        "usingComponents": {
+                            "van-button": "/wxcomponents/weapp/dist/button/index",
+                            "van-toast": "/wxcomponents/weapp/dist/toast/index",
+                            "van-field": "/wxcomponents/weapp/dist/field/index",
+                            "van-popup": "/wxcomponents/weapp/dist/popup/index",
+                            "van-picker": "/wxcomponents/weapp/dist/picker/index",
+                            "van-dialog": "/wxcomponents/weapp/dist/dialog/index",
+                            "van-icon": "/wxcomponents/weapp/dist/icon/index",
+                            "van-tab": "/wxcomponents/weapp/dist/tab/index",
+                            "van-tabs": "/wxcomponents/weapp/dist/tabs/index",
+                            "van-datetime-picker": "/wxcomponents/weapp/dist/datetime-picker/index",
+                            "van-uploader": "/wxcomponents/weapp/dist/uploader/index",
+                            "van-checkbox": "/wxcomponents/weapp/dist/checkbox/index",
+                            "van-checkbox-group": "/wxcomponents/weapp/dist/checkbox-group/index"
+                        }
+                    }
+                },
                 {
                     "path": "companyreport/components/reportDetails",
                     "style": {
@@ -1315,6 +1360,73 @@
                         }
                     }
                 },
+                {
+                    "path": "merchants/merchants",
+                    "style": {
+                        "navigationBarTitleText": "我的招商",
+                        "enablePullDownRefresh": true,
+                        "onReachBottomDistance": 100,
+                        "app-plus": {
+                            "bounce": "vertical",
+                            "titleNView": {
+                                "buttons": [
+                                    {
+                                        "text": "\ue534",
+                                        "fontSrc": "/static/uni.ttf",
+                                        "fontSize": "22px",
+                                        "color": "#FFFFFF"
+                                    }
+                                ]
+                            }
+                        },
+                        "component": true,
+                        "usingComponents": {
+                            "van-button": "/wxcomponents/weapp/dist/button/index",
+                            "van-toast": "/wxcomponents/weapp/dist/toast/index",
+                            "van-field": "/wxcomponents/weapp/dist/field/index",
+                            "van-popup": "/wxcomponents/weapp/dist/popup/index",
+                            "van-picker": "/wxcomponents/weapp/dist/picker/index",
+                            "van-dialog": "/wxcomponents/weapp/dist/dialog/index",
+                            "van-icon": "/wxcomponents/weapp/dist/icon/index",
+                            "van-tab": "/wxcomponents/weapp/dist/tab/index",
+                            "van-tabs": "/wxcomponents/weapp/dist/tabs/index"
+                        }
+                    }
+                },
+                {
+                    "path": "merchants/components/mymechantsdetails",
+                    "style": {
+                        "navigationBarTitleText": "我的招商-详情",
+                        "enablePullDownRefresh": true,
+                        "onReachBottomDistance": 100,
+                        "app-plus": {
+                            "bounce": "vertical",
+                            "titleNView": {
+                                "buttons": [
+                                    {
+                                        "text": "\ue534",
+                                        "fontSrc": "/static/uni.ttf",
+                                        "fontSize": "22px",
+                                        "color": "#FFFFFF"
+                                    }
+                                ]
+                            }
+                        },
+                        "component": true,
+                        "usingComponents": {
+                            "van-uploader": "/wxcomponents/weapp/dist/uploader/index",
+                            "van-button": "/wxcomponents/weapp/dist/button/index",
+                            "van-toast": "/wxcomponents/weapp/dist/toast/index",
+                            "van-field": "/wxcomponents/weapp/dist/field/index",
+                            "van-popup": "/wxcomponents/weapp/dist/popup/index",
+                            "van-picker": "/wxcomponents/weapp/dist/picker/index",
+                            "van-dialog": "/wxcomponents/weapp/dist/dialog/index",
+                            "van-icon": "/wxcomponents/weapp/dist/icon/index",
+                            "van-tab": "/wxcomponents/weapp/dist/tab/index",
+                            "van-tabs": "/wxcomponents/weapp/dist/tabs/index"
+                        }
+                    }
+                },
                 {
                     "path": "companyreport/companyreport",
                     "style": {
@@ -1364,18 +1476,58 @@
         "backgroundColorTop": "#FFFFFF",
         "backgroundColorBottom": "#F4F5F6",
         "usingComponents": {
-            "van-empty": "/wxcomponents/weapp/dist/empty/index",
+            "van-dropdown-menu": "/wxcomponents/weapp/dist/dropdown-menu/index",
+            "van-dropdown-item": "/wxcomponents/weapp/dist/dropdown-item/index",
+            "van-action-sheet": "/wxcomponents/weapp/dist/action-sheet/index",
+            "van-area": "/wxcomponents/weapp/dist/area/index",
             "van-button": "/wxcomponents/weapp/dist/button/index",
-            "van-toast": "/wxcomponents/weapp/dist/toast/index",
-            "van-field": "/wxcomponents/weapp/dist/field/index",
-            "van-popup": "/wxcomponents/weapp/dist/popup/index",
-            "van-picker": "/wxcomponents/weapp/dist/picker/index",
+            "van-card": "/wxcomponents/weapp/dist/card/index",
+            "van-cell": "/wxcomponents/weapp/dist/cell/index",
+            "van-cell-group": "/wxcomponents/weapp/dist/cell-group/index",
+            "van-checkbox": "/wxcomponents/weapp/dist/checkbox/index",
+            "van-checkbox-group": "/wxcomponents/weapp/dist/checkbox-group/index",
+            "van-col": "/wxcomponents/weapp/dist/col/index",
             "van-dialog": "/wxcomponents/weapp/dist/dialog/index",
+            "van-field": "/wxcomponents/weapp/dist/field/index",
+            "van-goods-action": "/wxcomponents/weapp/dist/goods-action/index",
+            "van-goods-action-icon": "/wxcomponents/weapp/dist/goods-action-icon/index",
+            "van-goods-action-button": "/wxcomponents/weapp/dist/goods-action-button/index",
             "van-icon": "/wxcomponents/weapp/dist/icon/index",
+            "van-loading": "/wxcomponents/weapp/dist/loading/index",
+            "van-nav-bar": "/wxcomponents/weapp/dist/nav-bar/index",
+            "van-notice-bar": "/wxcomponents/weapp/dist/notice-bar/index",
+            "van-notify": "/wxcomponents/weapp/dist/notify/index",
+            "van-panel": "/wxcomponents/weapp/dist/panel/index",
+            "van-popup": "/wxcomponents/weapp/dist/popup/index",
+            "van-progress": "/wxcomponents/weapp/dist/progress/index",
+            "van-radio": "/wxcomponents/weapp/dist/radio/index",
+            "van-radio-group": "/wxcomponents/weapp/dist/radio-group/index",
+            "van-row": "/wxcomponents/weapp/dist/row/index",
+            "van-search": "/wxcomponents/weapp/dist/search/index",
+            "van-slider": "/wxcomponents/weapp/dist/slider/index",
+            "van-stepper": "/wxcomponents/weapp/dist/stepper/index",
+            "van-sticky": "/wxcomponents/weapp/dist/sticky/index",
+            "van-steps": "/wxcomponents/weapp/dist/steps/index",
+            "van-submit-bar": "/wxcomponents/weapp/dist/submit-bar/index",
+            "van-swipe-cell": "/wxcomponents/weapp/dist/swipe-cell/index",
+            "van-switch": "/wxcomponents/weapp/dist/switch/index",
             "van-tab": "/wxcomponents/weapp/dist/tab/index",
             "van-tabs": "/wxcomponents/weapp/dist/tabs/index",
-            "van-row": "/wxcomponents/weapp/dist/row/index",
-            "van-col": "/wxcomponents/weapp/dist/col/index"
+            "van-tabbar": "/wxcomponents/weapp/dist/tabbar/index",
+            "van-tabbar-item": "/wxcomponents/weapp/dist/tabbar-item/index",
+            "van-tag": "/wxcomponents/weapp/dist/tag/index",
+            "van-toast": "/wxcomponents/weapp/dist/toast/index",
+            "van-transition": "/wxcomponents/weapp/dist/transition/index",
+            "van-tree-select": "/wxcomponents/weapp/dist/tree-select/index",
+            "van-datetime-picker": "/wxcomponents/weapp/dist/datetime-picker/index",
+            "van-rate": "/wxcomponents/weapp/dist/rate/index",
+            "van-collapse": "/wxcomponents/weapp/dist/collapse/index",
+            "van-collapse-item": "/wxcomponents/weapp/dist/collapse-item/index",
+            "van-picker": "/wxcomponents/weapp/dist/picker/index",
+            "van-share-sheet": "/wxcomponents/weapp/dist/share-sheet/index",
+            "van-circle": "/wxcomponents/weapp/dist/circle/index",
+            "van-grid": "/wxcomponents/weapp/dist/grid/index",
+            "van-calendar": "/wxcomponents/weapp/dist/calendar/index"
         }
     },
     "tabBar": {
@@ -1406,4 +1558,4 @@
         "enablePullDownRefresh": true
     },
     "lazyCodeLoading": "requiredComponents"
-}
+}

pages/index/components/activity.vue

@@ -0,0 +1,130 @@
+<template>
+    <div class="activity">
+        <div v-for="(item,index) in activityList" :key="index+100" class="activityItem">
+          <img :src="item.img" class="itemBg">
+          <div class="activityItemRight">
+             <div class="activityItemRightTop">
+               <span class="activityItemRightName">{{item.name}}</span>
+               <span class="activityItemRightType">{{item.type}}</span>
+             </div>
+             <div class="canyu">36人参与</div>
+             <div class="activityItemRightBottom">
+               <div class="shoucang" @click="clickColl(item)"><image :src="item.isColl?heartSel:heart" class="scImg"> 收藏</div>
+               <div :class="item.isSign?'baoming':'baoming2'">{{ item.isSign ? '去报名' : '报名结束' }}</div>
+             </div>
+          </div>
+        </div>
+    </div>
+</template>
+
+<script>
+export default {
+  name: "activity",
+  data(){
+    return{
+      heartSel:require('../image/heartSel.png'),
+      heart:require('../image/heart.png'),
+      activityList:[
+        {name:'互联网私募如何入门？',type:'培训活动',img:require('../image/img1.png'),isColl:true ,isSign:true},
+        {name:'公募基金中的大数据啊啊啊？',type:'活动',img:require('../image/img2.png'),isColl:false,isSign:true},
+        {name:'年度小艾杯篮球赛开...？',type:'体育',img:require('../image/img3.png'),isColl:false,isSign:false},
+      ]
+    }
+  },
+  methods:{
+    clickColl(item){
+      console.log(item)
+      // item.isColl = !item.isColl
+    }
+  }
+}
+</script>
+
+<style lang="scss">
+    .activity{
+         .activityItem{
+           width: 702rpx;
+           height: 216rpx;
+           background: #F5F7FA;
+           padding: 0 24rpx;
+           display: flex;
+           align-items: center;
+           box-sizing: border-box;
+           border-radius: 16rpx;
+           .itemBg{
+             width: 220rpx;
+             height: 160rpx;
+           }
+           .activityItemRight{
+             display: flex;
+             flex-direction: column;
+             margin-left: 24rpx;
+             .activityItemRightTop{
+               width: 420rpx;
+               display: flex;
+               justify-content: space-between;
+               .activityItemRightName{
+                 width: 280rpx;
+                 white-space: nowrap;
+                 overflow: hidden;
+                 text-overflow: ellipsis;
+                 color: #18172A;
+                 font-size: 28rpx;
+               }
+               .activityItemRightType{
+                 padding: 2rpx 12rpx;
+                 background: rgba(3, 101, 249, 0.20);
+                 color: rgba(3, 101, 249, 1);
+                 border-radius: 4rpx;
+                 font-size: 24rpx;
+               }
+             }
+             .canyu{
+               font-size: 28rpx;
+               color: rgba(102, 102, 102, 1);
+               margin: 14rpx 0;
+             }
+             .activityItemRightBottom{
+               display: flex;
+               justify-content: space-between;
+               align-items: center;
+               .shoucang{
+                 display: flex;
+                 align-items: center;
+                 font-size: 28rpx;
+                 color: rgba(141, 146, 155, 1);
+                 .scImg{
+                   width: 32rpx;
+                   height: 28rpx;
+                   margin-right: 8rpx;
+                 }
+               }
+               .baoming{
+                 width: 160rpx;
+                 height: 60rpx;
+                 display: flex;
+                 align-items: center;
+                 justify-content: center;
+                 font-size: 28rpx;
+                 background: linear-gradient( 316deg, #84AAFF 0%, #0365F9 100%);
+                 border-radius: 32rpx;
+                 font-size: 28rpx;
+                 color: white;
+               }
+               .baoming2{
+                 width: 160rpx;
+                 height: 60rpx;
+                 display: flex;
+                 align-items: center;
+                 justify-content: center;
+                 font-size: 28rpx;
+                 background: rgba(226, 232, 239, 1);
+                 border-radius: 32rpx;
+                 font-size: 28rpx;
+                 color: rgba(141, 146, 155, 1);
+               }
+             }
+           }
+         }
+    }
+</style>

pages/index/components/enterpriseSide.vue

@@ -0,0 +1,314 @@
+<template>
+    <div class="enterpriseSide">
+      <div style="padding:0 24rpx;background: white">
+      <div class="searchTop">
+        <image :src="locationIcon" class="locationIcon"></image>
+        <picker @change="bindPickerChange" :value="index" :range="array">
+          <input v-model="searchArea" class="searchArea" disabled >
+        </picker>
+        <image :src="dhIcon" class="dhIcon"></image>
+        <image :src="vector" class="vector"></image>
+      </div>
+      <div class="parkBgBox" :style="{'background-image':`url(${parkBg})`}">
+        <div class="parkNameBox">这里是园区名称</div>
+      </div>
+      <div class="map2">
+        <div
+            class="mapdom2"
+            style="float: left"
+            v-for="(item, index) in mapList"
+            :key="index"
+            @click="jumpPage(item.path)"
+        >
+          <img class="mapIcon2" :src="item.url" />
+          <div class="maptxt">{{ item.label }}</div>
+        </div>
+      </div>
+      </div>
+      <div class="noticeBody">
+        <image :src="tongzhi" class="tongzhiImg"></image>
+        <div class="columLine"></div>
+        <div class="noticeBox">
+          <div class="noticeItem" v-for="item in 2">
+            <div class="noticeTag">物业</div>
+            <div class="noticeInfo">新年伊始，PAER招商开始啦啦啦啦啦啦</div>
+            <div class="noticeTime">1小时前</div>
+          </div>
+        </div>
+      </div>
+      <div class="parkDynamic">
+        <div class="parkDynamicTitle">
+          <div class="columLineBlue"></div>
+          <div class="titleName">园区动态</div>
+        </div>
+        <div class="parkDynamicTab">
+           <div v-for="(item,index) in tabList" :key="index" class="tabItem" :class="selectTab===item.name?'selectTabItem':''" @click="clickTab(item)">
+             {{item.name}}
+           </div>
+        </div>
+        <activity v-show="selectTab==='活动'"></activity>
+      </div>
+    </div>
+</template>
+
+<script>
+import vanPopup from "../../../wxcomponents/weapp/dist/popup/index";
+import Activity from "./activity.vue";
+export default {
+  components: {
+    Activity,
+    vanPopup
+  },
+  name: "enterpriseSide",
+  data(){
+    return{
+      locationIcon:require('../image/locationIcon.png'),
+      dhIcon:require('../image/dhIcon.png'),
+      vector:require('../image/Vector.png'),
+      tongzhi:require('../image/tongzhi.png'),
+      searchArea: '当前园区名称',
+      index: 0,
+      array:['中国', '美国', '巴西', '日本'],
+      parkBg:require('../image/parkBg.png'),
+      tabList:[
+        {name:'活动' },
+        {name:'周边' },
+        {name:'房源' },
+        {name:'动态' },
+      ],
+      selectTab:'活动',
+      mapList: [
+        {
+          label: "待办提醒",
+          url: require("../image/dbtxIcon.png"),
+          path: "/pages/subPackages/companyHouse/companyHouse",
+        },
+        {
+          label: "企业账单",
+          url: require("../image/qyzdIcon.png"),
+          path: "/pages/subPackages/companyHouse/companyHouse",
+        },
+        {
+          label: "经发填报",
+          url: require("../image/jftbIcon.png"),
+          path: "/pages/subPackages/companyHouse/companyHouse",
+        },
+        {
+          label: "园区周边",
+          url: require("../image/yqzb.png"),
+          path: "/pages/subPackages/companyHouse/companyHouse",
+        },
+        {
+          label: "报事报修",
+          url: require("../image/bsbxIcon.png"),
+          path: "/pages/subPackages/companyHouse/companyHouse",
+        },
+        {
+          label: "活动报名",
+          url: require("../image/hdbmIcon.png"),
+          path: "/pages/subPackages/companyHouse/companyHouse",
+        },
+        {
+          label: "入驻申请",
+          url: require("../image/rzsqIcon.png"),
+          path: "/pages/subPackages/companyHouse/companyHouse",
+        },
+        {
+          label: "退租申请",
+          url: require("../image/tzsqIcon.png"),
+          path: "/pages/subPackages/companyHouse/companyHouse",
+        },
+        {
+          label: "关于园区",
+          url: require("../image/gyyqIcon.png"),
+          path: "/pages/subPackages/companyHouse/companyHouse",
+        },
+      ],
+    }
+  },
+  methods:{
+    bindPickerChange(e){
+      console.log(e)
+      this.searchArea = this.array[e.detail.value]
+    },
+    jumpPage(path) {
+      uni.navigateTo({
+        url: path,
+        fail: (fail) => {},
+      });
+    },
+    clickTab(item){
+      this.selectTab = item.name
+    }
+  }
+}
+</script>
+
+<style lang="scss">
+    .enterpriseSide{
+      background: #F5F7FA;
+      .searchTop{
+        //margin: 24rpx;
+        background: white;
+        position: relative;
+        display: flex;
+        align-items: center;
+        .searchArea{
+          position: relative;
+          width: 532rpx;
+          height: 64rpx;
+          background: #F5F7FA;
+          border-radius: 32rpx;
+          padding-left: 68rpx;
+          font-size: 28rpx;
+        }
+        .locationIcon{
+          position: absolute;
+          width: 28rpx;
+          height: 28rpx;
+          left: 24rpx;
+          z-index: 10;
+        }
+        .dhIcon{
+          width: 48rpx;
+          height: 48rpx;
+          margin-left: 16rpx;
+        }
+        .vector{
+          position: absolute;
+          width: 16rpx;
+          height: 8rpx;
+          left: 552rpx;
+        }
+      }
+      .parkBgBox{
+        position: relative;
+        background-repeat: no-repeat;
+        background-size: 100%;
+        width: 702rpx;
+        height: 320rpx;
+        margin-top: 24rpx;
+        .parkNameBox{
+          position: absolute;
+          box-sizing: border-box;
+          width: 100%;
+          height: 64rpx;
+          background: rgba(3, 19, 41, 0.60);
+          display: flex;
+          align-items: center;
+          padding-left: 24rpx;
+          bottom: 0;
+          color: white;
+          font-size: 28rpx;
+          border-radius: 0 0 16rpx 16rpx;
+        }
+      }
+      .map2 {
+        box-sizing: border-box;
+        //position: absolute;
+        z-index: 2;
+        width: 100%;
+        //height: 770rpx;
+        //border-radius: 48rpx 48rpx 0rpx 0rpx;
+        background: white;
+        //margin-top: 402rpx;
+        padding: 36rpx 0 0 0;
+        overflow-y: auto;
+        display: grid;
+        grid-template-columns: repeat(5,1fr);
+      }
+      .mapIcon2{
+        width: 92rpx;
+        height: 92rpx;
+        display: block;
+        margin: auto;
+      }
+      .mapdom2{
+        height: 184rpx;
+      }
+      .noticeBody{
+        padding: 24rpx 28rpx;
+        background: white;
+        display: flex;
+        align-items: center;
+        margin: 24rpx 0;
+        .tongzhiImg{
+          width: 86rpx;
+          height: 96rpx;
+        }
+        .columLine{
+          width: 2rpx;
+          height: 80rpx;
+          background: #E7EAF0;
+          margin: 0 16rpx;
+
+        }
+        .noticeBox{
+          display: flex;
+          flex-direction: column;
+          .noticeItem{
+            display: flex;
+            align-items: center;
+            margin: 8rpx 0;
+            .noticeTag{
+              width: 56rpx;
+              height: 30rpx;
+              background: #FFFFFF;
+              border-radius: 4rpx 4rpx 4rpx 4rpx;
+              border: 2rpx solid #0365F9;
+              color: #0365F9;
+              font-size: 22rpx;
+              text-align: center;
+            }
+            .noticeInfo{
+              width: 326rpx;
+              font-size: 24rpx;
+              color: #18172A;
+              overflow: hidden;
+              white-space: nowrap;
+              text-overflow: ellipsis;
+              margin: 0 24rpx;
+            }
+            .noticeTime{
+              color: #666666;
+              font-size: 24rpx;
+            }
+          }
+        }
+      }
+      .parkDynamic{
+        width: 100%;
+        background: white;
+        padding: 24rpx;
+        .parkDynamicTitle{
+          display:flex;
+          align-items: center;
+        }
+        .parkDynamicTab{
+          display: flex;
+          padding: 26px 0;
+          .tabItem{
+            color: #666666;
+            font-size: 28rpx;
+            margin: 0 32rpx;
+          }
+          .selectTabItem{
+            color:#18172A;
+            border-bottom:6rpx solid #034DF7;
+          }
+        }
+      }
+      .columLineBlue{
+        width: 10rpx;
+        height: 32rpx;
+        background: linear-gradient( 180deg, #509FFF 0%, #034DF7 100%);
+        border-radius: 1px 1px 1px 1px;
+        margin-right: 16rpx;
+      }
+      .titleName{
+        color: #18172A;
+        font-size: 36rpx;
+        font-weight: 500;
+      }
+    }
+</style>

pages/index/index.vue

@@ -1,6 +1,27 @@
 <template>
   <view>
+    <div class="managementBody" v-show="false">
     <image src="../../static/index/banner.png" class="banner"></image>
+      <div class="needBox">
+        <div class="needLeft">
+          <div class="needLeftLeft" @click="toMsgPage('/pages/subPackages/todo/index')">
+            <span style="color: #18172A;font-size: 4.5vw;margin-bottom: 1vw">我的待办</span>
+            <span style="color: #666666;font-size: 3.5vw">需处理待办<span style="color: #0365F9;font-weight: 600;margin-left: 0.5vw">3</span></span>
+          </div>
+          <img src="../../static/index/dbImage.png" class="needImg">
+        </div>
+        <div class="needRight" @click="toMsgPage('/pages/subPackages/toread/index')">
+          <div class="needLeftLeft">
+            <span style="color: #18172A;font-size: 4.5vw;margin-bottom: 1vw">我的待阅</span>
+            <span style="color: #666666;font-size: 3.5vw">需处理待阅<span style="color: #22B565;font-weight: 600;margin-left: 0.5vw">12</span></span>
+          </div>
+          <img src="../../static/index/dyImage.png" class="needImg">
+        </div>
+      </div>
+      <div class="titleTips">
+        <div class="myLine"></div>
+        <div>服务入口</div>
+      </div>
     <div class="map">
       <div
         class="mapdom"
@@ -13,12 +34,18 @@
         <div class="maptxt">{{ item.label }}</div>
       </div>
     </div>
+    </div>
+    <div class="enterpriseBody">
+      <enterprise-side></enterprise-side>
+    </div>
   </view>
 </template>
 <script>
 // import {demo} from "@/js_sdk/http"
 import { getUserPower, getUserLocalStorageInfo } from "@/js_sdk/http";
+import EnterpriseSide from "./components/enterpriseSide.vue";
 export default {
+  components: {EnterpriseSide},
   data() {
     return {
       mapList: [
@@ -32,52 +59,51 @@ export default {
         //   url: "https://hswkxc.idea-sf.com/fileService/static/slices/1@2x.png",
         //   path: "/pages/subPackages/companyHouse/companyHouse",
         // },
+        {
+          label: "企业库",
+          url: require("./indexIcon/qyk.png"),
+          path: "/pages/subPackages/companyHouse/companyHouse",
+        },
+        {
+          label: "走访上报",
+          url: require("./indexIcon/zfsb.png"),
+          path: "/pages/subPackages/companyreport/companyreport",
+        },
+        {
+          label: "上市跟进",
+          url:  require("./indexIcon/ssgj.png"),
+        },
+        {
+          label: "招商管理",
+          url: require("./indexIcon/zsgl.png"),
+          path: "/pages/subPackages/merchants/merchants",
+        },
         // {
-        //   label: "企业库",
-        //   url: "https://hswkxc.idea-sf.com/fileService/static/slices/2@2x.png",
-        //   path: "/pages/subPackages/companyHouse/companyHouse",
+        //   label: "我的待办",
+        //   url: require("./indexIcon/zsgl.png"),
+        //   path: "/pages/subPackages/todo/index",
         // },
         // {
-        //   label: "走访上报",
-        //   url: "https://hswkxc.idea-sf.com/fileService/static/slices/3@2x.png",
-        //   path: "/pages/subPackages/companyreport/companyreport",
+        //   label: "我的待阅",
+        //   url: "https://hswkxc.idea-sf.com/fileService/static/slices/6@2x.png",
+        //   path: "/pages/subPackages/toread/index",
         // },
         // {
-        //   label: "上市跟进",
-        //   url: "https://hswkxc.idea-sf.com/fileService/static/slices/4@2x.png",
+        //   label: "会议室审核",
+        //   url: "https://hswkxc.idea-sf.com/fileService/static/slices/12@2x.png",
+        //   path: "/pages/subPackages/meetingroom/meetingroom",
         // },
-
         // {
-        //   label: "招商管理",
-        //   url: "https://hswkxc.idea-sf.com/fileService/static/slices/5@2x.png",
-        //   path: "/pages/subPackages/merchants/merchants",
+        //   label: "周边发布",
+        //   url: "https://hswkxc.idea-sf.com/fileService/static/slices/3@2x.png",
+        //   path: "/pages/subPackages/peripheralService/index",
         // },
         // {
-        //   label: "我的待办",
-        //   url: "https://hswkxc.idea-sf.com/fileService/static/slices/7@2x.png",
-        //   path: "/pages/subPackages/todo/index",
+        //   label: "活动发布",
+        //   url: "https://hswkxc.idea-sf.com/fileService/static/slices/3@2x.png",
+        //   path: "/pages/subPackages/eventRelease/index",
         // },
         // {
-        //   label: "我的待阅",
-        //   url: "https://hswkxc.idea-sf.com/fileService/static/slices/6@2x.png",
-        //   path: "/pages/subPackages/toread/index",
-        // },
-        {
-          label: "会议室审核",
-          url: "https://hswkxc.idea-sf.com/fileService/static/slices/12@2x.png",
-          path: "/pages/subPackages/meetingroom/meetingroom",
-        },
-        {
-          label: "周边发布",
-          url: "https://hswkxc.idea-sf.com/fileService/static/slices/3@2x.png",
-          path: "/pages/subPackages/peripheralService/index",
-        },
-        {
-          label: "活动发布",
-          url: "https://hswkxc.idea-sf.com/fileService/static/slices/3@2x.png",
-          path: "/pages/subPackages/eventRelease/index",
-        },
-        // {
         //   label: "安全管理自检",
         //   url: "https://hswkxc.idea-sf.com/fileService/static/slices/8@2x.png",
         //   path: "/pages/subPackages/secureselftest2/index",
@@ -95,12 +121,32 @@ export default {
 
         {
           label: "报修派单",
-          url: "https://hswkxc.idea-sf.com/fileService/static/slices/11@2x.png",
+          url: require("./indexIcon/bxpd.png"),
           path: "/pages/subPackages/repairDispatch-app/index",
         },
         {
           label: "报修处理",
-          url: "https://hswkxc.idea-sf.com/fileService/static/slices/10@2x.png",
+          url: require("./indexIcon/bxcl.png"),
+          path: "/pages/subPackages/repairprocessing-app/index",
+        },
+        {
+          label: "房间管理",
+          url: require("./indexIcon/fjgl.png"),
+          path: "/pages/subPackages/repairprocessing-app/index",
+        },
+        {
+          label: "通知发布",
+          url: require("./indexIcon/tzfb.png"),
+          path: "/pages/subPackages/repairprocessing-app/index",
+        },
+        {
+          label: "活动发布",
+          url: require("./indexIcon/hdfb.png"),
+          path: "/pages/subPackages/repairprocessing-app/index",
+        },
+        {
+          label: "周边发布",
+          url: require("./indexIcon/zbfb.png"),
           path: "/pages/subPackages/repairprocessing-app/index",
         },
 
@@ -145,6 +191,12 @@ export default {
     this.getUserPower();
   },
   methods: {
+    toMsgPage(e){
+      uni.navigateTo({
+        url: e,
+        fail: (fail) => {},
+      });
+    },
     // getUserLocalStorageInfo
     async getUserPower() {
       if (getUserLocalStorageInfo().user.id == 1) return;
@@ -173,10 +225,13 @@ export default {
 page {
   background: white;
 }
+.managementBody{
+  padding: 4vw;
+}
 .banner {
-  width: 100%;
-  height: 450rpx;
-  position: absolute;
+  width: 92vw;
+  height: 250rpx;
+  //position: absolute;
   z-index: 1;
 }
 .mapdom {
@@ -189,25 +244,72 @@ page {
   font-size: 24rpx;
   font-family: PingFang SC-Medium, PingFang SC;
   font-weight: 500;
-  color: #333333;
+  color: #18172A;
   text-align: center;
+  margin-top: 8rpx;
 }
 .mapIcon {
-  width: 160rpx;
-  height: 160rpx;
+  width: 65rpx;
+  height: 80rpx;
   //background: linear-gradient(141deg, #89BCFF 0%, #2782FA 100%);
   display: block;
   margin: auto;
 }
 .map {
-  position: absolute;
+  //position: absolute;
   z-index: 2;
-  width: calc(100% - 64rpx);
-  height: 770rpx;
+  width: calc(100% - 24rpx);
+  //height: 770rpx;
   border-radius: 48rpx 48rpx 0rpx 0rpx;
   background: white;
-  margin-top: 402rpx;
-  padding: 48rpx 32rpx;
+  //margin-top: 402rpx;
+  padding: 24rpx 12rpx;
   overflow-y: auto;
 }
+.needBox{
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  margin: 2vw 0;
+  .needLeft{
+    display: flex;
+    justify-content: space-around;
+    background: rgba(238, 244, 255, 1);
+    border-radius: 8rpx;
+    align-items: center;
+    width: 45vw;
+    height: 23vw;
+  }
+  .needRight{
+    display: flex;
+    justify-content: space-around;
+    background: #DEF6F8;
+    border-radius: 8rpx;
+    align-items: center;
+    width: 45vw;
+    height: 23vw;
+  }
+  .needLeftLeft{
+    display: flex;
+    flex-direction: column;
+  }
+  .needImg{
+    width: 100rpx;
+    height: 100rpx;
+  }
+}
+.titleTips{
+  display: flex;
+  align-items: center;
+  font-size: 4.7vw;
+  font-weight: 600;
+  color:#18172A;
+  margin:4vw 0 2vw 0;
+  .myLine{
+    width: 13rpx;
+    height: 40rpx;
+    background: linear-gradient( 180deg, #509FFF 0%, #034DF7 100%);
+    margin-right: 20rpx;
+  }
+}
 </style>

pages/mine/mine.vue

@@ -100,7 +100,7 @@ export default {
 <style scoped lang="scss">
 .banner {
   width: 100%;
-  height: 424rpx;
+  //height: 424rpx;
   position: absolute;
   z-index: 1;
 }

pages/subPackages/companyHouse/companyHouse.vue

@@ -0,0 +1,234 @@
+<template>
+  <div class="companyhouse">
+    <div class="searchbox">
+      <van-row>
+        <van-col :span="22">
+          <uni-search-bar
+            placeholder="请输入公司名称"
+            @confirm="confirm"
+            clearButton="none"
+            cancelButton="none"
+            v-model="search.qymc"
+          ></uni-search-bar>
+        </van-col>
+        <van-col :span="2">
+          <img
+            @click="jumpAddCompanyPage()"
+            src="../../../static/add_company.png"
+            style="height: 50rpx; width: 50rpx; margin-top: 25rpx"
+            alt=""
+          />
+        </van-col>
+      </van-row>
+    </div>
+    <van-tabs :active="active" @change="onChange">
+      <van-tab title="全部" :name="null"></van-tab>
+      <van-tab title="在园" :name="1"></van-tab>
+      <van-tab title="挂靠" :name="2"></van-tab>
+      <van-tab title="异地生产" :name="3"></van-tab>
+      <van-tab title="飞地" :name="4"></van-tab>
+    </van-tabs>
+    <div style="display: flex; background: white; padding: 0rpx 16rpx">
+      <uni-data-checkbox
+        v-model="entryArray"
+        mode="tag"
+        :multiple="true"
+        :localdata="dic_SelectList.SETTLE_IN_STATUS"
+        selectedTextColor="#1D18BC"
+        selectedColor="rgba(29,24,188,0.05);"
+        @change="getCompanyList"
+      >
+      </uni-data-checkbox>
+    </div>
+    <div class="list">
+      <div v-if="companyList.length != 0">
+        <div class="list-row" v-for="(item, index) in companyList" :key="index">
+          <div class="cell_1 width90">
+            <div class="width70 height44rpx mb8rpx float_left">
+              <div class="first_title chaochuyincang">{{ item.qymc }}</div>
+            </div>
+            <div class="width30 height44rpx mb8rpx float_left">
+              <div class="roomstatus1 txt_center" style="font-size: 24rpx">
+                {{ getDicType(item.settleInType) }}
+              </div>
+            </div>
+            <div class="width100 height40rpx mb8rpx clear_both">
+              <div class="second_title width50 height40rpx float_left">
+                所属楼盘：{{
+                  item.area == null || !item.area ? "未知" : item.area
+                }}
+              </div>
+              <div class="second_title_1 width50 height40rpx float_left">
+                注册资本：{{ !item.zczj ? "暂无" : item.zczj + "万" }}
+              </div>
+            </div>
+            <div
+              class="width100 height28rpx font24rpx fontcolor251FCA chaochuyincang"
+            >
+              {{ item.qybq == null || !item.qybq ? "暂无标签" : item.qybq }}
+            </div>
+          </div>
+          <div class="cell_3 width10" @click="jumpPage(item.id)">
+            <img src="../../../static/mine/youjiantou.png" alt="" />
+          </div>
+        </div>
+      </div>
+      <div v-else>
+        <van-empty
+          class="disblock marginauto"
+          style="background: white"
+          description="暂无数据"
+        />
+      </div>
+    </div>
+  </div>
+</template>
+  
+  <script>
+import { listVo, getByCodes } from "@/js_sdk/http";
+import vanEmpty from "../../../wxcomponents/weapp/dist/empty/index";
+
+export default {
+  components: {
+    vanEmpty,
+  },
+  data() {
+    return {
+      entryArray: [],
+      dic_key: ["MNP_BUILDING_TYPE", "SETTLE_IN_STATUS"],
+      dic_SelectList: {},
+      active: 0,
+      form: {
+        entryStatus: [],
+      },
+      statusList: [
+        { label: "全部", value: null },
+        { label: "在园", value: "1" },
+        { label: "挂靠", value: "2" },
+        { label: "异地生产", value: "3" },
+        { label: "飞地", value: "4" },
+      ],
+      companyList: [],
+      search: {
+        pageSize: 10,
+        pageNum: 1,
+      },
+    };
+  },
+  onShow() {
+    this.getByCodes();
+    this.getCompanyList();
+  },
+  methods: {
+    async getMoreListData() {
+      let that = this;
+
+      that.search.pageNum = that.search.pageNum + 1;
+      let list = await listVo(that.search);
+
+      if (list.rows == 0) {
+        that.$showToast("没有更多数据了");
+      } else {
+        list.rows.forEach((e) => {
+          that.companyList.push(e);
+        });
+      }
+    },
+    onReachBottom() {
+      this.getMoreListData();
+    }, //下拉执行的时候触发 （下拉刷新）
+    onChange(e) {
+      this.search.settleInType = e.detail.name == null ? "" : e.detail.name;
+      this.getCompanyList();
+    },
+    getDicType(value) {
+      if (this.dic_SelectList.MNP_BUILDING_TYPE) {
+        let MNP_BUILDING_TYPE = this.dic_SelectList.MNP_BUILDING_TYPE;
+        let index = MNP_BUILDING_TYPE.findIndex((e) => e.value == value);
+
+        if (index != -1) return MNP_BUILDING_TYPE[index].label;
+        else return "暂无";
+      }
+    },
+    async getByCodes() {
+      this.search.pageNum = 1;
+      let data = await getByCodes(JSON.stringify(this.dic_key));
+      this.dic_SelectList = this.$common.handleDicList(data);
+      this.dic_SelectList.SETTLE_IN_STATUS =
+        this.dic_SelectList.SETTLE_IN_STATUS.map((e) => {
+          return {
+            text: e.label,
+            value: e.value,
+          };
+        });
+    },
+    async getCompanyList() {
+      this.search.entryStatus = this.entryArray.toString();
+      this.search.pageSize = 10;
+      this.search.pageNum = 1;
+      let list = await listVo(this.search);
+
+      this.companyList = list.rows;
+    },
+    jumpAddCompanyPage() {
+      uni.navigateTo({
+        url: "/pages/subPackages/addCompany/addCompany",
+      });
+    },
+    blur(e) {},
+    focus(e) {
+      //   pages / subPackages / merchants / merchants;
+    },
+    input(e) {},
+    cancel(e) {},
+    change(e) {},
+    clear(e) {},
+    confirm(e) {
+      this.getCompanyList();
+    },
+    jumpPage(e) {
+      uni.navigateTo({
+        url: "/pages/subPackages/companyDetails/companyDetails?id=" + e,
+      });
+    },
+  },
+};
+</script>
+  
+  
+  <style lang="scss">
+.searchbox {
+  display: block;
+  background: white;
+}
+.chaochuyincang {
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+.labelcolmt26 {
+  input {
+    font-size: 24rpx;
+    border-radius: 8rpx 8rpx 8rpx 8rpx;
+    border: 2rpx solid #cccccc;
+    text-align: center;
+  }
+  .van-col {
+    margin-top: 26rpx !important;
+  }
+
+  label {
+    color: #333333;
+    font-size: 30rpx;
+    margin: 0;
+    margin-top: 0 !important;
+  }
+
+  .uni-data-checklist {
+    margin-top: -10rpx !important;
+  }
+}
+</style>
+  
+  
+  

pages/subPackages/merchants/components/chooseTime.vue

@@ -0,0 +1,82 @@
+<template>
+  <van-popup
+    :show="show"
+    @close="onClose"
+    position="bottom"
+    round
+    closeable
+    :close-on-click-overlay="false"
+  >
+    <van-datetime-picker
+      type="date"
+      :value="currentDate"
+      bind:change="onInput"
+      @confirm="confirm1"
+      @cancel="cancel"
+      :min-date="minDate"
+      :formatter="formatter"
+    />
+  </van-popup>
+</template>
+
+<script>
+import vanPopup from "../../../../wxcomponents/weapp/dist/popup/index";
+import vanDatetimePicker from "../../../../wxcomponents/weapp/dist/datetime-picker/index";
+export default {
+  components: {
+    vanPopup,
+    vanDatetimePicker,
+  },
+  data() {
+    return {
+      show: false,
+      chooseIndex: null,
+      currentDate: new Date().getTime(),
+      minDate: new Date().getTime(),
+      type: null,
+      formatter(type, value) {
+        if (type === "year") {
+          return `${value}年`;
+        }
+        if (type === "month") {
+          return `${value}月`;
+        }
+        return value;
+      },
+    };
+  },
+  methods: {
+    cancel() {
+      this.show = false;
+    },
+    onOpen(i, type) {
+      this.chooseIndex = i;
+      this.type = type;
+      this.show = true;
+    },
+    formatTime(date) {
+      date = new Date(date);
+      var year = date.getFullYear();
+      var month = date.getMonth() + 1;
+      var day = date.getDate();
+      return [year, month, day].map(this.formatNumber).join("/");
+    },
+
+    onClose() {
+      this.$emit(
+        "getEndTime",
+        this.chooseIndex,
+        this.$common.transDate(this.currentDate),
+        this.type
+      );
+      this.show = false;
+    },
+    confirm1(value) {
+      //   this.currentDate = event.detail;
+    },
+  },
+};
+</script>
+
+<style>
+</style>

pages/subPackages/merchants/components/housemanger.vue

@@ -0,0 +1,786 @@
+<template>
+  <div class="housemange">
+    <div class="form">
+      <div
+        class="closIcon"
+        @click="searchStatus = false"
+        v-if="searchStatus == true"
+      >
+        <van-icon name="arrow-up" />
+      </div>
+      <div
+        class="openIcon"
+        @click="searchStatus = true"
+        v-if="searchStatus == false"
+      >
+        <van-icon name="arrow-down" />
+      </div>
+      <!-- <van-row>
+        <van-col :span="4">
+          <div class="yuanqu_label">园区</div>
+        </van-col>
+        <van-col :span="20" class="labelcolmt26">
+          <uni-data-checkbox
+            v-model="form.groupIds"
+            mode="tag"
+            :localdata="yuanqu_loacldata"
+            selectedTextColor="#1D18BC"
+            selectedColor="rgba(29,24,188,0.05);"
+            @change="getSelectedYuanqu"
+          >
+          </uni-data-checkbox>
+        </van-col>
+      </van-row> -->
+      <van-row v-if="form.groupIds != null">
+        <van-col :span="4">
+          <div>楼盘</div>
+        </van-col>
+        <van-col class="labelcolmt26" :span="20">
+          <uni-data-checkbox
+            v-model="form.parkFloorDiscIds"
+            mode="tag"
+            :localdata="loupan_loacldata"
+            selectedTextColor="#1D18BC"
+            selectedColor="rgba(29,24,188,0.05);"
+            @change="getSelectedLoupan"
+          >
+          </uni-data-checkbox>
+        </van-col>
+      </van-row>
+      <van-row>
+        <van-col class="labelcolmt26" :span="4">
+          <div style="height: 37rpx; line-height: 37rpx">状态</div>
+        </van-col>
+        <van-col class="labelcolmt26 status" :span="20">
+          <uni-data-checkbox
+            :map="{ text: 'label', value: 'value' }"
+            v-model="form.statusArray"
+            :localdata="dic_SelectList.INVESTMENT_STATUS"
+            :multiple="true"
+            selectedTextColor="#1D18BC"
+            selectedColor="#1D18BC"
+            @change="getSelectedStatus"
+          >
+          </uni-data-checkbox>
+        </van-col>
+      </van-row>
+      <van-row v-if="searchStatus">
+        <van-col class="labelcolmt26" :span="4">
+          <div class="yuanqu_label" style="height: 37rpx; line-height: 37rpx">
+            朝向
+          </div>
+        </van-col>
+        <van-col class="labelcolmt26 status" :span="20">
+          <uni-data-checkbox
+            v-model="form.chaoxiangArray"
+            :localdata="fangxiangList"
+            :multiple="true"
+            selectedTextColor="#1D18BC"
+            selectedColor="#1D18BC"
+            @change="getChaoxiang"
+          >
+          </uni-data-checkbox>
+        </van-col>
+      </van-row>
+      <van-row v-if="searchStatus">
+        <van-col class="labelcolmt26" :span="4">
+          <div class="yuanqu_label">性质</div>
+        </van-col>
+        <van-col class="labelcolmt26" :span="16">
+          <uni-data-checkbox
+            v-model="form.zaitiTypeArray"
+            mode="tag"
+            :localdata="xinzhiList"
+            selectedTextColor="#1D18BC"
+            selectedColor="rgba(29,24,188,0.05);"
+            @change="getSelectedXingZhi"
+          >
+          </uni-data-checkbox>
+        </van-col>
+      </van-row>
+      <van-row v-if="searchStatus">
+        <van-col class="labelcolmt26" :span="4">
+          <div class="yuanqu_label">指导价</div>
+        </van-col>
+        <van-col class="labelcolmt26" :span="9">
+          <input
+            v-model="form.guidePrice1"
+            type="number"
+            placeholder="元/㎡/月"
+          />
+        </van-col>
+        <van-col :span="1">
+          <div class="width100 txt_center">-</div>
+        </van-col>
+        <van-col class="labelcolmt26" :span="9">
+          <input
+            v-model="form.guidePrice2"
+            type="number"
+            placeholder="元/㎡/月"
+          />
+        </van-col>
+      </van-row>
+      <van-row v-if="searchStatus">
+        <van-col class="labelcolmt26" :span="4">
+          <div class="yuanqu_label">面积</div>
+        </van-col>
+        <van-col class="labelcolmt26" :span="9">
+          <input v-model="form.roomSize1" type="number" placeholder="㎡" />
+        </van-col>
+        <van-col :span="1">
+          <div class="width100 txt_center">-</div>
+        </van-col>
+        <van-col class="labelcolmt26" :span="9">
+          <input v-model="form.roomSize2" type="number" placeholder="㎡" />
+        </van-col>
+      </van-row>
+      <div style="margin-top: 16rpx">
+        <van-row>
+          <van-col class="labelcolmt26" :span="6">
+            <van-button
+              color="#F1F2F9"
+              custom-class="reset_btn"
+              @click="reast()"
+              >重置</van-button
+            >
+          </van-col>
+          <van-col class="labelcolmt26" :span="18">
+            <van-button
+              style="margin-top: 16rpx"
+              color="#2527AA"
+              custom-class="search_btn"
+              @click="search()"
+            >
+              <van-icon name="search" />
+              搜索
+            </van-button>
+          </van-col>
+        </van-row>
+      </div>
+    </div>
+    <div class="list">
+      <div v-if="vamTabStatus">
+        <van-tabs
+          id="resizeID"
+          ref="vantTabs"
+          :active="form.mnpBuildingIds"
+          @change="getSelectedLoudong"
+          line-width="80rpx"
+          title-active-color="#1D18BC"
+        >
+          <van-tab
+            v-for="(item, index) in loudongList"
+            :title="item.ldmc"
+            :name="item.id"
+            :key="index"
+          >
+          </van-tab>
+        </van-tabs>
+      </div>
+      <div class="total" v-if="roomList.length != 0">
+        共
+        <span style="color: #1d18bc">{{ form.total }}</span>
+        间
+      </div>
+
+      <div
+        class="list-row"
+        v-if="roomList.length != 0"
+        v-for="(item, index) in roomList"
+        :key="index"
+        @click="jumpPage(item.id, item.currentState)"
+      >
+        <div class="statusTag">
+          <div class="tagText">
+            {{ getCurrentState(item.currentState) }}
+          </div>
+        </div>
+        <div class="cell_1">
+          <div class="width100 height44rpx mb8rpx">
+            <div class="first_title">
+              {{
+                item.yuanquName + item.quyuName + item.loudongName + item.roomNo
+              }}
+            </div>
+          </div>
+          <div class="width100 height40rpx mb8rpx">
+            <div class="second_title">
+              用途：{{
+                getDicType("roomUse", item.roomUse) == undefined
+                  ? "未知"
+                  : getDicType("roomUse", item.roomUse)
+              }}
+            </div>
+            <div class="second_title_1 width50 chaochuyincang">
+              装修情况：
+              {{
+                !item.decorationSituation && item.decorationSituation != "暂无"
+                  ? "未知"
+                  : dic_SelectList.DECORATION_SITUATION[
+                      item.decorationSituation - 1
+                    ].label
+              }}
+            </div>
+          </div>
+          <div class="width100 height36rpx mb14rpx">
+            <div class="third_title" v-if="item.roomSize">
+              面积(㎡)：{{ item.roomSize }}平米
+            </div>
+            <div class="third_title" v-if="!item.roomSize">面积(㎡)：未知</div>
+
+            <div class="third_title_1">
+              朝向：{{ item.roomDirection ? item.roomDirection : "未知" }}
+            </div>
+          </div>
+          <div class="width100 height36rpx">
+            <div class="float_left chuzu_label">出租指导价（元/㎡/月）：</div>
+            <span class="float_left chuzu_vlaue">{{
+              !item.guidePrice ? "未知" : item.guidePrice
+            }}</span>
+          </div>
+        </div>
+        <div class="cell_2" findDeptList>
+          <img src="../../../../static/mine/youjiantou.png" alt="" />
+        </div>
+      </div>
+      <div class="list-row" v-if="roomList.length == 0">
+        <van-empty
+          class="disblock marginauto"
+          style="background: white"
+          description="暂无数据"
+        />
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import vanTab from "../../../../wxcomponents/weapp/dist/tab/index";
+import vanTabs from "../../../../wxcomponents/weapp/dist/tabs/index";
+import common from "../../../utils/common";
+import vanEmpty from "../../../../wxcomponents/weapp/dist/empty/index";
+import {
+  findYuanQuList,
+  findLongPanList,
+  findLouDongList,
+  findRoomByCondition,
+  getByCodes,
+} from "@/js_sdk/http.js";
+const form = {
+  status: [],
+  chaoxiang: [],
+  statusArray: ["1"],
+  chaoxiangArray: [],
+  zaitiTypeArray: [],
+  zaitiType: "",
+  roomSize1: "",
+  roomSize2: "",
+  guidePrice1: "",
+  guidePrice2: "",
+  parkFloorDiscIds: null,
+  groupIds: null,
+  pageNum: 1,
+  pageSize: 10,
+  total: 0,
+  currentState: "1",
+  mnpBuildingIds: "",
+};
+
+export default {
+  components: {
+    vanTab,
+    vanTabs,
+    vanEmpty,
+  },
+  name: "housemanger.vue",
+  data() {
+    return {
+      searchStatus: false,
+      tabsStatus: true,
+      dic_key: [
+        "PROPERTY_NATURE",
+        "HOUSE_USAGE",
+        "project_status",
+        "INVESTMENT_STATUS",
+        "DECORATION_SITUATION",
+      ],
+      dic_SelectList: {},
+      loudongList: [],
+      activezhaoshang: "0",
+      form: {
+        ...form,
+      },
+      active: 0,
+      formData: {},
+      value: 0,
+      vamTabStatus: false,
+      yuanqu_loacldata: [],
+      loupan_loacldata: [],
+      range: [
+        {
+          value: 0,
+          text: "科教产业园",
+        },
+        {
+          value: 1,
+          text: "红沙湾",
+        },
+        {
+          value: 2,
+          text: "胡埭",
+        },
+      ],
+      loupanList: [
+        {
+          value: 0,
+          text: "一期",
+        },
+        {
+          value: 1,
+          text: "二期",
+        },
+        {
+          value: 2,
+          text: "三期",
+        },
+        {
+          value: 3,
+          text: "四期",
+        },
+        {
+          value: 4,
+          text: "五期",
+        },
+        {
+          value: 5,
+          text: "六期",
+        },
+        {
+          value: 6,
+          text: "七期",
+        },
+        {
+          value: 7,
+          text: "八期",
+        },
+        {
+          value: 8,
+          text: "九期",
+        },
+      ],
+      statusList: [
+        {
+          value: 1,
+          text: "空置",
+        },
+        {
+          value: 2,
+          text: "预约",
+        },
+        // {
+        //   value: 3,
+        //   text: "预约",
+        // },
+        {
+          value: 4,
+          text: "临期",
+        },
+        {
+          value: 5,
+          text: "已租",
+        },
+        {
+          value: 6,
+          text: "到期",
+        },
+      ],
+      roomList: [],
+      fangxiangList: [
+        {
+          value: "朝东",
+          text: "东",
+        },
+        {
+          value: "朝南",
+          text: "南",
+        },
+        {
+          value: "朝西",
+          text: "西",
+        },
+        {
+          value: "朝北",
+          text: "北",
+        },
+      ],
+      xinzhiList: [
+        {
+          value: 1,
+          text: "自有物业",
+        },
+        {
+          value: 2,
+          text: "社会物业",
+        },
+      ],
+    };
+  },
+  mounted() {
+    this.findYuanQuList();
+    this.getByCodes1();
+  },
+  methods: {
+    getCurrentState(currentState) {
+      if (
+        this.dic_SelectList.INVESTMENT_STATUS &&
+        this.dic_SelectList.INVESTMENT_STATUS.length > 0
+      ) {
+        let data = this.dic_SelectList.INVESTMENT_STATUS.find(
+          (e) => e.value == currentState
+        );
+        // console.log("datadatadatadatadatadata", data);
+        return data.label;
+      }
+    },
+    reast() {
+      this.loudongList = [];
+      this.roomList = [];
+      this.form = { ...form };
+      this.findYuanQuList();
+      this.getByCodes1();
+    },
+    async search() {
+      if (!this.form.groupIds && !this.form.parkFloorDiscIds) {
+        return this.$showToast("请选择园区和楼盘后重试");
+      }
+      if (!this.form.groupIds) {
+        return this.$showToast("请选择园区后重试");
+      }
+      if (!this.form.parkFloorDiscIds) {
+        return this.$showToast("请选择楼盘后重试");
+      }
+      this.form.pageNum = 1;
+      this.form.pageSize = 10;
+      this.form.total = 0;
+      let data = await findRoomByCondition(this.form);
+      this.roomList = data.rows;
+      this.form.total = data.total;
+    },
+
+    onReachBottom() {
+      console.log("滑动到距离底部100px的时候触发,可以放 。。业务逻辑");
+    }, //下拉执行的时候触发 （下拉刷新）
+
+    getDicType(type, value) {
+      if (!value) return;
+      if (type == "zaiti") {
+        let PROPERTY_NATURE = this.dic_SelectList.PROPERTY_NATURE;
+
+        let index = PROPERTY_NATURE.findIndex((e) => e.value == value);
+        return PROPERTY_NATURE[index].label;
+      }
+      if (type == "roomUse") {
+        let HOUSE_USAGE = this.dic_SelectList.HOUSE_USAGE;
+        let index = HOUSE_USAGE.findIndex((e) => e.value == value);
+        return HOUSE_USAGE[index].label;
+      }
+    },
+    async getByCodes1() {
+      let data = await getByCodes(
+        JSON.stringify([
+          "PROPERTY_NATURE",
+          "HOUSE_USAGE",
+          "project_status",
+          "INVESTMENT_STATUS",
+          "DECORATION_SITUATION",
+        ])
+      );
+      console.log("1111111111111111", data);
+      this.dic_SelectList = this.$common.handleDicList(data);
+      console.log("this.dic_SelectList", this.dic_SelectList);
+    },
+    async getSelectedLoudong(event) {
+      console.log(event);
+      this.form.mnpBuildingIds =
+        event.detail.title == "全部" ? "" : event.detail.name;
+      let data = await findRoomByCondition(this.form);
+      console.log(data);
+      this.roomList = data.rows;
+      this.form.total = data.total;
+    },
+    async getSelectedYuanqu() {
+      let data = await findLongPanList(this.form.groupIds);
+      this.roomList = [];
+      this.loudongList = [];
+      if (data.length > 0) {
+        this.loupan_loacldata = data.map((e) => {
+          return {
+            value: e.id,
+            text: e.name,
+          };
+        });
+        this.form.parkFloorDiscIds = this.loupan_loacldata[0].value;
+      } else {
+        this.loupan_loacldata = [{ value: null, text: "暂无" }];
+      }
+      this.getSelectedLoupan();
+    },
+    async getSelectedLoupan() {
+      try {
+        let data = await findLouDongList(this.form.parkFloorDiscIds);
+        this.vamTabStatus = false;
+        console.log(data);
+        if (data.length == 0) {
+          this.loudongList = [];
+          this.roomList = [];
+          this.tabsStatus = !this.tabsStatus;
+          return;
+        } else {
+          this.loudongList = [{ ldmc: "全部", id: "" }, ...data];
+          this.roomList = [];
+          this.form.mnpBuildingIds = "";
+        }
+        let row = await findRoomByCondition(this.form);
+        console.log("我是row", row);
+        this.roomList = row.rows;
+        this.form.total = row.total;
+        this.vamTabStatus = true;
+        console.log(row);
+      } catch (e) {
+        console.log("e这天真热", e);
+      }
+    },
+    findYuanQuList() {
+      findYuanQuList().then((data) => {
+        let yuanqu_list = [...data];
+        let yuanqu_loacldata = yuanqu_list.map((e) => {
+          return {
+            value: e.id,
+            text: e.groupName,
+          };
+        });
+        this.yuanqu_loacldata = yuanqu_loacldata;
+        this.form.groupIds = this.yuanqu_loacldata[0].value;
+        this.getSelectedYuanqu();
+      });
+
+      // console.log(yuanqu_loacldata)
+    },
+    jumpPage(id, currentState) {
+      console.log(id);
+      uni.navigateTo({
+        url:
+          "/pages/subPackages/housedetails/housedetails?id=" +
+          id +
+          "&currentState=" +
+          currentState,
+      });
+    },
+    onLoadMore() {},
+    getChaoxiang() {
+      this.form.roomDirection = this.form.chaoxiangArray.join(",");
+    },
+    getSelectedStatus(e) {
+      console.log(this.form.statusArray.join(","));
+      this.form.currentState = this.form.statusArray.join(",");
+    },
+    getSelectedXingZhi() {
+      console.log(this.form.zaitiTypeArray);
+      this.form.zaitiType = this.form.zaitiTypeArray;
+    },
+    onChange() {},
+    getMoreList() {
+      let that = this;
+      that.form.pageNum += 1;
+      findRoomByCondition(that.form).then((e) => {
+        console.log(that.roomList);
+        if (that.roomList.length == e.total) {
+          this.$showToast("没有更多数据");
+        }
+        that.roomList = [...that.roomList, ...e.rows];
+
+        console.log(that.roomList);
+        that.$forceUpdate();
+      });
+    },
+  },
+
+  onPullDownRefresh: function () {
+    // 加载数据
+  },
+  onReachBottom() {
+    console.log("滑动到距离底部100px的时候触发,可以放 。。业务逻辑");
+  }, //下拉执行的时候触发 （下拉刷新）
+};
+</script>
+
+<style lang="scss">
+.chaochuyincang {
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+.statusTag {
+  position: absolute;
+  background: #2527aa;
+  text-align: center;
+  color: white;
+  // clip-path: polygon(100% 100%, 100% 0%, 0% 0%);
+  // height: 100rpx;
+  right: 0rpx;
+  font-size: 20rpx;
+  top: 0rpx;
+  padding: 5rpx 20rpx;
+  .tagText {
+    // transform: rotate(38deg);
+    // position: absolute;
+    // right: 10rpx;
+    // top: 25rpx;
+    font-size: 24rpx;
+  }
+}
+.closIcon {
+  width: 40px;
+  height: 40px;
+  background: white;
+  position: absolute;
+  bottom: -40rpx;
+  z-index: 100;
+  right: 0;
+  left: 0;
+  margin: auto;
+  border-radius: 50%;
+  text-align: center;
+  line-height: 40px;
+}
+.openIcon {
+  width: 40px;
+  height: 40px;
+  background: white;
+  position: absolute;
+  bottom: -40rpx;
+  z-index: 100;
+  right: 0;
+  left: 0;
+  margin: auto;
+  border-radius: 50%;
+  text-align: center;
+  line-height: 40px;
+}
+/deep/.van-cell {
+  padding: 0 0 0 28rpx !important;
+}
+.inputClass {
+  padding: 0 0 0 28rpx !important;
+}
+.yuanqu_label {
+  height: 55rpx;
+  line-height: 55rpx;
+}
+.loupan_label {
+  padding: 0rpx 10rpx;
+}
+.housemange {
+  /deep/.checklist-box {
+    margin: 0 !important;
+    margin-right: 16rpx !important;
+  }
+  .search_btn {
+    margin-left: 18rpx;
+    width: calc(100% - 18rpx);
+    height: 60rpx;
+  }
+  .reset_btn {
+    color: #2628a9 !important;
+    width: 100%;
+    height: 60rpx;
+  }
+  .list-row {
+    width: calc(100% - 64rpx);
+    padding: 16rpx 32rpx 18rpx 32rpx;
+    background: #ffffff;
+    margin-bottom: 16rpx;
+    display: flex;
+    //height: 278rpx;
+    border-radius: 8rpx 8rpx 8rpx 8rpx;
+    align-items: center;
+    position: relative;
+  }
+  .second_title {
+    float: left;
+    width: 50%;
+
+    font-size: 28rpx;
+    font-family: PingFang SC-Medium, PingFang SC;
+    font-weight: 500;
+    color: #777777;
+  }
+
+  .cell_1 {
+    float: left;
+    width: 90%;
+  }
+  .cell_2 {
+    float: left;
+    width: 10%;
+    img {
+      height: 60rpx;
+      width: 60rpx;
+      float: right;
+      margin: 0;
+    }
+  }
+  .list {
+    width: calc(100% - 64rpx);
+
+    margin: 32rpx;
+  }
+
+  .form {
+    width: calc(100% - 128rpx);
+    margin: 32rpx;
+    background: #ffffff;
+    padding: 32rpx;
+    position: relative;
+    .label {
+      height: 53rpx;
+      line-height: 53rpx;
+    }
+  }
+
+  .labelcolmt26 {
+    input {
+      font-size: 24rpx;
+      border-radius: 8rpx 8rpx 8rpx 8rpx;
+      border: 2rpx solid #cccccc;
+      text-align: center;
+    }
+    .van-col {
+      margin-top: 26rpx !important;
+    }
+
+    label {
+      color: #333333;
+      font-size: 30rpx;
+      margin: 0;
+      margin-top: 0 !important;
+    }
+
+    .uni-data-checklist {
+      margin-top: -10rpx !important;
+    }
+  }
+
+  .status {
+    .uni-data-checklist {
+      margin-top: 0rpx !important;
+    }
+
+    label {
+      color: #333333;
+      font-size: 30rpx;
+      padding-right: 0rpx !important;
+    }
+  }
+}
+</style>

pages/subPackages/merchants/components/mymechants.vue

@@ -0,0 +1,615 @@
+<template>
+  <div class="mymechants">
+    <div style="display: flex; padding-top: 20rpx; padding-bottom: 20rpx">
+      <div
+        style="margin-left: auto; margin-right: 40rpx"
+        class="addyixiang"
+        @click="addyixiang()"
+      >
+        +&nbsp;&nbsp;新增项目
+      </div>
+    </div>
+    <div class="form">
+      <div style="display: flex; align-items: center">
+        <div class="yuanqu_label">项目/企业名称</div>
+        <input
+          confirm-type="search"
+          @confirm="firstfindCompanyInfoList"
+          type="text"
+          v-model="form.projectName"
+          placeholder="请输入"
+          style="
+            display: block;
+            border: 1px solid #ccc;
+            padding: 5rpx 2rpx;
+
+            width: 420rpx;
+            font-size: 24rpx;
+          "
+        />
+      </div>
+      <div style="display: flex; align-items: center; margin-top: 5rpx">
+        <div class="yuanqu_label">招商负责人</div>
+        <input
+          confirm-type="search"
+          @confirm="firstfindCompanyInfoList"
+          type="text"
+          v-model="form.truename"
+          placeholder="请输入"
+          style="
+            display: block;
+
+            border: 1px solid #ccc;
+            padding: 5rpx 2rpx;
+
+            width: 420rpx;
+            font-size: 24rpx;
+          "
+        />
+      </div>
+    </div>
+    <div class="list">
+      <van-tabs
+        v-if="loudongTabsStatus"
+        :active="acitvy"
+        @change="onChange"
+        refs="tabsloudong"
+        title-active-color="#1D18BC"
+      >
+        <van-tab title="全部" name="全部"></van-tab>
+        <van-tab
+          v-for="item in dic_SelectList.project_status"
+          :title="item.label"
+          :name="item.value"
+        ></van-tab>
+      </van-tabs>
+
+      <div
+        class="list-row"
+        v-if="companyList.length != 0"
+        v-for="(item, index) in companyList"
+        :key="index"
+      >
+        <div class="cell_1">
+          <div class="width100 height44rpx" style="margin-bottom: 14rpx">
+            <div class="first_title" @click="junmpMyMechantsDetails(item)">
+              {{ item.projectName }}
+            </div>
+          </div>
+          <div
+            class="width100 height40rpx"
+            style="display: flex; align-items: center"
+          >
+            <div class="second_title" @click="junmpMyMechantsDetails(item)">
+              企业联系人：{{ item.projectManager }}
+            </div>
+          </div>
+          <div class="second_title_1" @click="fuckCall(item.managerPhone)">
+            联系电话：{{ item.managerPhone }}
+          </div>
+          <div class="call_icon" @click="fuckCall(item.managerPhone)">
+            <van-icon
+              name="phone"
+              color="#2527AA"
+              size="40rpx"
+              style="line-height: 40rpx"
+            />
+          </div>
+          <div
+            style="
+              width: 100%;
+              display: flex;
+              justify-content: flex-end;
+              align-items: center;
+            "
+          >
+            <div class="width100" style="display: flex; align-items: center">
+              <div class="second_title" @click="junmpMyMechantsDetails(item)">
+                招商负责人：{{ item.truename }}
+              </div>
+            </div>
+
+            <div class="second_title_2"></div>
+          </div>
+          <div>
+            <picker
+              @change="bindPickerChange"
+              :range="dic_SelectList.project_status"
+              range-key="label"
+            >
+              <!-- {{ created_by + "," + item.created_by }} -->
+              <div
+                v-if="created_by == 1 || created_by == item.created_by"
+                @click="changeProjecStatus(item)"
+                style="
+                  border: 1px solid #2527aa;
+                  height: 28px;
+                  width: 120rpx;
+                  font-size: 24rpx;
+                  text-align: center;
+                  line-height: 28px;
+                  background: #2527aa;
+                  color: white;
+                  border-radius: 0.5rem;
+                "
+              >
+                项目状态
+              </div>
+
+              <div
+                v-else
+                style="
+                  border: 1px solid #cccccc;
+                  height: 28px;
+                  width: 120rpx;
+                  font-size: 24rpx;
+                  text-align: center;
+                  line-height: 28px;
+                  background: #cccccc;
+                  color: white;
+                  border-radius: 0.5rem;
+                "
+              >
+                项目状态
+              </div>
+            </picker>
+          </div>
+        </div>
+        <div class="cell_2" @click="junmpMyMechantsDetails(item)">
+          <img src="../../../../static/mine/youjiantou.png" alt="" />
+        </div>
+      </div>
+      <div class="list-row" v-if="companyList.length == 0">
+        <van-empty
+          class="disblock marginauto"
+          style="background: white"
+          description="暂无数据"
+        />
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import vanTab from "../../../../wxcomponents/weapp/dist/tab/index";
+import vanTabs from "../../../../wxcomponents/weapp/dist/tabs/index";
+import vanEmpty from "../../../../wxcomponents/weapp/dist/empty/index";
+import {
+  findLongPanList,
+  findYuanQuList,
+  findCompanyInfoList,
+  changeProjectStatus,
+  getByCodes,
+  findRoomByCondition,
+  getUserLocalStorageInfo,
+} from "@/js_sdk/http";
+
+const form = {
+  pageNum: 1,
+  pageSize: 10,
+  total: 0,
+  projectStatus: "",
+};
+export default {
+  components: {
+    vanTab,
+    vanTabs,
+  },
+
+  data() {
+    return {
+      dic_key: ["project_status"],
+      dic_SelectList: {},
+      rowId: "",
+      created_by: getUserLocalStorageInfo().user.id,
+      projectStatusList: [
+        { name: "跟进中", value: 1 },
+        { name: "已确认", value: 2 },
+        { name: "已签约", value: 3 },
+        { name: "关闭", value: 4 },
+      ],
+      yuanqu_loacldata: [],
+      loudongTabsStatus: false,
+      acitvy: 0,
+      form: {
+        ...form,
+        truename: getUserLocalStorageInfo().user.truename,
+      },
+      active: 0,
+      formData: {},
+      value: 0,
+      companyList: [],
+      range: [
+        {
+          value: 0,
+          text: "全部",
+        },
+        {
+          value: 1,
+          text: "科教园",
+        },
+        {
+          value: 2,
+          text: "红沙湾",
+        },
+        {
+          value: 3,
+          text: "胡埭",
+        },
+      ],
+      loupanList: [
+        {
+          value: 0,
+          text: "一期",
+        },
+        {
+          value: 1,
+          text: "二期",
+        },
+        {
+          value: 2,
+          text: "三期",
+        },
+        {
+          value: 3,
+          text: "四期",
+        },
+        {
+          value: 4,
+          text: "五期",
+        },
+        {
+          value: 5,
+          text: "六期",
+        },
+        {
+          value: 6,
+          text: "七期",
+        },
+        {
+          value: 7,
+          text: "八期",
+        },
+        {
+          value: 8,
+          text: "九期",
+        },
+      ],
+      statusList: [
+        {
+          value: 0,
+          text: "空置",
+        },
+        {
+          value: 1,
+          text: "锁定",
+        },
+        {
+          value: 2,
+          text: "办公",
+        },
+        {
+          value: 3,
+          text: "已租",
+        },
+        {
+          value: 4,
+          text: "司法",
+        },
+        {
+          value: 5,
+          text: "维修",
+        },
+      ],
+      fangxiangList: [
+        {
+          value: 0,
+          text: "东",
+        },
+        {
+          value: 1,
+          text: "南",
+        },
+        {
+          value: 2,
+          text: "西",
+        },
+        {
+          value: 3,
+          text: "北",
+        },
+      ],
+      xinzhiList: [
+        {
+          value: 1,
+          text: "自有物业",
+        },
+        {
+          value: 2,
+          text: "社会物业",
+        },
+      ],
+    };
+  },
+  onLoad() {},
+  mounted() {
+    this.form.truename = getUserLocalStorageInfo().user.truename;
+    this.findYuanQuList();
+    this.getByCodes();
+    this.firstfindCompanyInfoList();
+  },
+  methods: {
+    async getByCodes() {
+      let data = await getByCodes(JSON.stringify(this.dic_key));
+      console.log(data);
+      this.dic_SelectList = this.$common.handleDicList(data);
+      console.log("this.dic_SelectList.project_status", this.dic_SelectList);
+      this.projectStatusList = this.$common.handleDicList(data).map((e) => {
+        return {
+          name: e.label,
+          value: e.value,
+        };
+      });
+    },
+    async bindPickerChange(e) {
+      console.log(e);
+      console.log(this.projectStatusList[e.detail.value].value);
+      let data = await changeProjectStatus({
+        id: this.rowId,
+        projectStatus: this.projectStatusList[e.detail.value].value,
+      });
+      console.log("你改好了吗", data);
+      if (data.code == 200) {
+        this.$showToast("状态修改成功");
+        this.firstfindCompanyInfoList();
+      }
+      console.log(data);
+    },
+    changeProjecStatus(item) {
+      this.rowId = item.id;
+      console.log(item);
+    },
+    junmpMyMechantsDetails(item) {
+      uni.navigateTo({
+        url:
+          "/pages/subPackages/merchants/components/mymechantsdetails?id=" +
+          item.id,
+      });
+    },
+    fuckCall(phoneNumber) {
+      uni.makePhoneCall({
+        phoneNumber: phoneNumber, //仅为示例
+      });
+    },
+    onChange(e) {
+      console.log(e);
+      this.form.projectStatus = e.detail.name == "全部" ? "" : e.detail.index;
+      this.firstfindCompanyInfoList();
+    },
+    getSelectedYuanqu() {
+      this.firstfindCompanyInfoList();
+    },
+    async firstfindCompanyInfoList() {
+      this.form.pageNum = 1;
+      let data = await findCompanyInfoList({
+        ...this.form,
+      });
+
+      this.companyList = data.rows;
+    },
+    async findCompanyInfoList() {
+      let data = await findCompanyInfoList(this.form);
+      this.companyList = data.rows;
+    },
+    getasd() {},
+    async getMoreList() {
+      this.form.pageNum += 1;
+      let data = await findCompanyInfoList(this.form);
+      if (this.companyList.length == data.total) {
+        this.$showToast("没有更多数据");
+        return;
+      }
+      this.companyList = [...this.companyList, ...data.rows];
+      this.$forceUpdate();
+      console.log(this.companyList.length);
+    },
+    async findYuanQuList() {
+      findYuanQuList().then((data) => {
+        let all = {
+          id: "",
+          groupName: "全部",
+        };
+        let yuanqu_list = [all, ...data];
+        let yuanqu_loacldata = yuanqu_list.map((e) => {
+          return {
+            value: e.id,
+            text: e.groupName,
+          };
+        });
+        this.yuanqu_loacldata = yuanqu_loacldata;
+      });
+
+      // console.log(yuanqu_loacldata)
+    },
+    addyixiang() {
+      uni.navigateTo({
+        url: "/pages/subPackages/addintention/addintention",
+      });
+    },
+    resize() {
+      this.loudongTabsStatus = true;
+    },
+
+    onLoadMore() {},
+    getChaoxiang() {},
+    getStatus() {},
+  },
+  onPullDownRefresh: function () {
+    // 加载数据
+  },
+  onReachBottom() {
+    console.log("滑动到距离底部100px的时候触发,可以放 。。业务逻辑");
+  }, //下拉执行的时候触发 （下拉刷新）
+};
+</script>
+
+<style lang="scss">
+.yuanqu-checkbox {
+  label {
+    margin-right: 20rpx !important;
+    margin-top: 0 !important;
+    padding: 6rpx 16rpx !important;
+  }
+}
+.mymechants {
+  .yuanqu_label {
+    font-size: 28rpx;
+    width: 200rpx;
+  }
+  .uni-data-checklist {
+    margin-top: 0rpx !important;
+  }
+
+  .addyixiang {
+    color: #3f3fb4;
+    background: #eaeaf2;
+    width: 170rpx;
+    height: 50rpx;
+    text-align: center;
+    line-height: 50rpx;
+    font-size: 26rpx;
+    border: 2rpx #a6a6a9 dashed;
+  }
+  .list-row {
+    width: calc(100% - 64rpx);
+    padding: 16rpx 32rpx 18rpx 32rpx;
+    background: #ffffff;
+    margin-bottom: 16rpx;
+    display: flex;
+    //height: 278rpx;
+    border-radius: 8rpx 8rpx 8rpx 8rpx;
+  }
+  .icon_phone {
+  }
+  .list-row {
+    width: calc(100% - 64rpx);
+    padding: 32rpx 32rpx 38rpx 32rpx;
+    background: #ffffff;
+    margin-bottom: 16rpx;
+    display: flex;
+    //height: 278rpx;
+    border-radius: 8rpx 8rpx 8rpx 8rpx;
+  }
+  .mb32rpx {
+    margin-bottom: 32rpx;
+  }
+  .second_title {
+    float: left;
+    width: 100%;
+    font-size: 28rpx;
+    font-family: PingFang SC-Medium, PingFang SC;
+    font-weight: 500;
+    overflow: hidden;
+    margin-bottom: 14rpx;
+    color: #777777;
+  }
+  .second_title_1 {
+    float: left;
+    width: 66%;
+    font-size: 28rpx;
+    margin-bottom: 14rpx;
+    font-family: PingFang SC-Medium, PingFang SC;
+    font-weight: 500;
+    color: #777777;
+  }
+  .call_icon {
+    height: 40rpx;
+    width: 40rpx;
+    margin-top: -5rpx;
+    margin-left: 15rpx;
+    float: left;
+  }
+  .second_title_2 {
+    float: left;
+    width: 35%;
+    font-size: 28rpx;
+    font-family: PingFang SC-Medium, PingFang SC;
+    font-weight: 500;
+    text-align: right;
+    color: #777777;
+  }
+  .cell_1 {
+    float: left;
+    width: 100%;
+  }
+  .cell_2 {
+    float: left;
+    width: 20%;
+    img {
+      height: 60rpx;
+      width: 60rpx;
+      float: right;
+      margin: 96rpx 0rpx 94rpx 0;
+    }
+  }
+  .list {
+    width: calc(100% - 64rpx);
+
+    margin: 32rpx;
+  }
+
+  .form {
+    width: calc(100% - 128rpx);
+    margin: 32rpx;
+    margin-top: 0px;
+    background: #ffffff;
+    padding: 32rpx;
+    .uni-data-checklist {
+      margin: 0rpx !important;
+    }
+
+    .label {
+      height: 53rpx;
+      line-height: 53rpx;
+    }
+  }
+
+  .checklist-box {
+    margin: 0 !important;
+    margin-right: 16rpx !important;
+  }
+
+  .labelcolmt26 {
+    .van-cell {
+      padding: 0 0 0 28rpx !important;
+    }
+
+    .van-col {
+      margin-top: 26rpx !important;
+    }
+
+    label {
+      color: #333333;
+      font-size: 30rpx;
+      margin-top: 10rpx !important;
+    }
+
+    .uni-data-checklist {
+      margin-top: -10rpx !important;
+      margin-top: 0rpx !important;
+    }
+  }
+
+  .status {
+    .uni-data-checklist {
+      margin-top: 0rpx !important;
+    }
+
+    label {
+      color: #333333;
+      font-size: 30rpx;
+      padding-right: 0rpx !important;
+    }
+  }
+}
+</style>

pages/subPackages/merchants/merchants.vue

@@ -0,0 +1,66 @@
+<template>
+  <div>
+    <van-tabs
+      class="merchants"
+      :active="active"
+      @change="onChange"
+      title-active-color="#1D18BC"
+    >
+      <van-tab title="房源查询" class="housemange">
+        <housemanger ref="housemanger" />
+      </van-tab>
+      <van-tab title="我的招商">
+        <my-mechants ref="mymechants" />
+      </van-tab>
+    </van-tabs>
+  </div>
+</template>
+
+<script>
+import housemanger from "./components/housemanger.vue";
+import myMechants from "./components/mymechants.vue";
+import { findYuanQuList } from "@/js_sdk/http.js";
+const form = {
+  status: [],
+  chaoxiang: [],
+};
+export default {
+  components: {
+    housemanger,
+    myMechants,
+  },
+  data() {
+    return {
+      active: 0,
+    };
+  },
+  onShow() {
+    this.$refs.mymechants.firstfindCompanyInfoList();
+  },
+
+  methods: {
+    onLoadMore() {},
+    getChaoxiang() {},
+    getStatus() {},
+    onChange(e) {
+      this.active = e.detail.name;
+      this.$refs.mymechants.resize();
+    },
+  },
+  onPullDownRefresh: function () {
+    // 加载数据
+  },
+  onReachBottom() {
+    console.log(this.active);
+    if (this.active == 0) {
+      console.log(this.$refs.housemanger);
+      this.$refs.housemanger.getMoreList();
+    }
+    if (this.active == 1) {
+      console.log(this.$refs.mymechants);
+      this.$refs.mymechants.getMoreList();
+    }
+    console.log("滑动到距离底部100px的时候触发,可以放 。。业务逻辑");
+  }, //下拉执行的时候触发 （下拉刷新）
+};
+</script>

pages/subPackages/mine.vue

@@ -100,7 +100,7 @@ export default {
 <style scoped lang="scss">
 .banner {
   width: 100%;
-  height: 424rpx;
+  //height: 424rpx;
   position: absolute;
   z-index: 1;
 }