产品化更新

pages.json

@@ -336,6 +336,79 @@
                         }
                     }
                 },
+                {
+                    "path": "activityPromulgate/qrCode",
+                    "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-radio": "/wxcomponents/weapp/dist/radio/index",
+                            "van-radio-group": "/wxcomponents/weapp/dist/radio-group/index",
+                            "van-empty": "/wxcomponents/weapp/dist/empty/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": "activityPromulgate/add",
+                    "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-radio": "/wxcomponents/weapp/dist/radio/index",
+                            "van-uploader": "/wxcomponents/weapp/dist/uploader/index",
+                            "van-radio-group": "/wxcomponents/weapp/dist/radio-group/index",
+                            "van-empty": "/wxcomponents/weapp/dist/empty/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": "password/index",
                     "style": {
@@ -2143,6 +2216,78 @@
                             "van-checkbox-group": "/wxcomponents/weapp/dist/checkbox-group/index"
                         }
                     }
+                },
+                {
+                    "path": "resourceReservation_manage/index",
+                    "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-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": "resourceReservation_manage/detail",
+                    "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-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"
+                        }
+                    }
                 }
             ],
             "network": "all"

pages/index/index.vue

@@ -100,8 +100,9 @@ export default {
           path: "/pages/subPackages/companyreport/companyreport",
         },
         {
-          label: "会议室审核",
+          label: "资源预约",
           url: "https://www.idea-co-sf.com/gardenProduct/image/tupian1.png",
+          path: "/pages/subPackages/resourceReservation_manage/index",
         },
         // {
         //   label: "上市跟进",

pages/subPackages/activityPromulgate/list.vue

@@ -1,7 +1,7 @@
 <template>
     <div class="activityPromulgate">
         <div class="activityTop">
-          <div class="addRepair" @tap="newRelease">新增发布 <van-icon name="add" style="margin-left: 8rpx"/></div>
+          <div class="addRepair" @tap="newRelease">新增活动 <van-icon name="add" style="margin-left: 8rpx"/></div>
           <van-tabs :active="active" @change="onChange">
             <van-tab title="全部" :name="0"></van-tab>
             <van-tab title="培训" :name="1"></van-tab>
@@ -35,16 +35,35 @@
              </div>
            </div>
           <div class="listItemInfoBox3">
-            <div class="qrCodeBox">
+            <div class="qrCodeBox" @tap="toQrCode(item)">
               <img src="https://www.idea-co-sf.com/gardenProduct/image/icon01.png" class="qrIcon">
               <span>活动签到码</span>
             </div>
             <div class="listBtnBox">
               <button class="rBtn editBtn">编辑</button>
-              <button class="rBtn" :class="item.typeName==='下架'?'downBtn':'upBtn'">{{item.typeName}}</button>
+              <button class="rBtn" :class="item.typeName==='下架'?'downBtn':'upBtn'" @tap="clickType(item)">{{item.typeName}}</button>
             </div>
           </div>
         </div>
+        <van-dialog
+            use-slot
+            :show="show"
+            show-cancel-button
+            confirm-button-open-type="getUserInfo"
+            @confirm="confirm"
+            confirm-button-text="确定"
+            cancel-button-text="取消"
+            confirm-button-color="rgba(87, 107, 149, 1)"
+            @close="show = false"
+        >
+          <div class="dialogInfo">
+            <van-icon name="warning" style="color:#10aeff;font-size: 128rpx"/>
+            <span style="margin-top: 16rpx" v-if="dialogType==='下架'">下架后小程序端将无法查看</span>
+            <span style="margin-top: 8rpx" v-if="dialogType==='下架'">该活动信息，确认下架吗?</span>
+            <span style="margin-top: 16rpx" v-if="dialogType==='上架'">上架后小程序端将显示该活动信息，</span>
+            <span style="margin-top: 8rpx" v-if="dialogType==='上架'">确认上架吗?</span>
+          </div>
+        </van-dialog>
       </div>
     </div>
 </template>
@@ -54,23 +73,36 @@
 export default {
     data() {
        return{
+         show: false,
          active:0,
          activityList:[
            {name:'互联网私募如何入门？',typeName:'下架',status:'报名中'},
            {name:'公募基金中的大数据挖掘？',typeName:'上架',status:'报名结束'},
            {name:'年度小艾杯篮球赛开始啦？',typeName:'下架',status:'活动结束'},
            {name:'互联网私募如何入门？？',typeName:'下架',status:'未开始'},
-         ]
+         ],
+         dialogType:''
        }
     },
     mounted() {
     },
     methods: {
       newRelease(){
-
+        uni.navigateTo({
+          url:'/pages/subPackages/activityPromulgate/add'
+        })
       },
       onChange(){
 
+      },
+      clickType(item) {
+         this.dialogType = item.typeName
+         this.show = true
+      },
+      toQrCode(item) {
+        uni.navigateTo({
+          url:'/pages/subPackages/activityPromulgate/qrCode'
+        })
       }
     }
 }
@@ -224,5 +256,13 @@ export default {
           }
         }
       }
+      .dialogInfo{
+        padding: 64rpx 32rpx;
+        font-size: 34rpx;
+        color:rgba(51, 51, 51, 1);
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+      }
     }
 </style>

pages/subPackages/activityPromulgate/qrCode.vue

@@ -0,0 +1,139 @@
+<template>
+    <div class="qrCodeBody">
+      <div class="whiteBoard">
+         <div class="qrCodeTitle">互联网私募如何入门？</div>
+         <div class="qrCodeMsg">活动时间：活动开始时间 — 结束时间</div>
+         <div class="qrCodeMsg">活动地址：XXXXXXXXXXXXXXXXXXXX</div>
+         <div class="qrCodeBox">
+             <img src="https://www.idea-co-sf.com/gardenProduct/image/erweima.png" class="qrCode">
+             <span class="qrCodeInfo">扫一扫上面的二维码，完成签到</span>
+         </div>
+         <div class="bottomBtnBox">
+           <button class="btn qdBtn">协助签到</button>
+           <button class="btn commitBtn" @tap="commitImg">保存图片</button>
+         </div>
+      </div>
+    </div>
+</template>
+
+<script>
+export default {
+  name: "qrCode",
+  data(){
+    return{
+
+    }
+  },
+  methods:{
+    commitImg(){
+        // 假设你已经有一个图片链接或者图片路径
+        const imageSrc = 'https://www.idea-co-sf.com/gardenProduct/image/erweima.png';
+
+        // 下载图片
+        uni.downloadFile({
+          url: imageSrc,
+          success: downloadResult => {
+            if (downloadResult.statusCode === 200) {
+              // 获取下载后的图片临时文件路径
+              let tempFilePath = downloadResult.tempFilePath;
+
+              // 保存图片到相册
+              uni.saveImageToPhotosAlbum({
+                filePath: tempFilePath,
+                success: () => {
+                  uni.showToast({
+                    title: '图片保存成功'
+                  });
+                },
+                fail: error => {
+                  uni.showToast({
+                    title: '图片保存失败',
+                    icon: 'none'
+                  });
+                  console.log('saveImageToPhotosAlbum fail', error);
+                }
+              });
+            } else {
+              uni.showToast({
+                title: '图片下载失败',
+                icon: 'none'
+              });
+            }
+          },
+          fail: error => {
+            uni.showToast({
+              title: '图片下载失败',
+              icon: 'none'
+            });
+            console.log('downloadFile fail', error);
+          }
+        });
+      }
+  }
+}
+</script>
+
+<style lang="scss">
+    .qrCodeBody{
+      .whiteBoard{
+        background: white;
+        padding: 32rpx;
+        box-sizing: border-box;
+        margin-top: 24rpx;
+        min-height: 1424rpx;
+        .qrCodeTitle{
+          color: rgba(24, 23, 42, 1);
+          font-size: 32rpx;
+          font-weight: 600;
+          margin-bottom: 32rpx;
+        }
+        .qrCodeMsg{
+          color: rgba(102, 102, 102, 1);
+          font-size: 28rpx;
+          line-height: 42rpx;
+        }
+        .qrCodeBox{
+          display: flex;
+          flex-direction: column;
+          align-items: center;
+          justify-content: center;
+          margin-top: 134rpx;
+          margin-bottom: 200rpx;
+          .qrCode{
+            width: 440rpx;
+            height: 440rpx;
+          }
+          .qrCodeInfo{
+            color: rgba(51, 51, 51, 1);
+            font-size: 28rpx;
+            margin-top: 8rpx;
+          }
+        }
+        .btn{
+          width: 654rpx;
+          height: 96rpx;
+          display: flex;
+          align-items: center;
+          justify-content: center;
+          font-size: 36rpx;
+          color: white;
+          border-radius: 8rpx;
+          &::after{
+            border: none;
+          }
+        }
+        .bottomBtnBox{
+          display: flex;
+          flex-direction: column;
+          align-items: center;
+        }
+        .qdBtn{
+          background: rgba(3, 101, 249, 1);
+        }
+        .commitBtn{
+          background: rgba(34, 181, 101, 1);
+          margin-top: 32rpx;
+        }
+      }
+    }
+</style>

pages/subPackages/resourceReservation_manage/components/appointmentHistory.vue

@@ -0,0 +1,115 @@
+<template>
+    <div class="historyListBody">
+        <div class="historyItem" v-for="item in historyList">
+            <div class="tags">会议室</div>
+            <div class="historyItemTitle">主题主题主题主题主题主题主题主题主题主题主题主题主题</div>
+            <div class="historyItemInfo">使用日期：7月30日</div>
+            <div class="historyItemInfo">资源名称：党建会议室</div>
+            <div class="historyItemInfo">位置：A栋一楼</div>
+            <div class="historyItemInfo">预约时间：2024.07.21  12：30</div>
+            <div class="historyItemBottom">
+              <span class="typeInfo" :class="item.type==='已通过'?'tgType':item.type==='已取消'?'qxType':''">{{item.type}}</span>
+              <button class="btn" :class="item.type==='暂存'?'zcBtn':''" v-if="item.type !=='已取消'">{{item.type==='暂存'?'暂存':'取消'}}</button>
+            </div>
+        </div>
+    </div>
+</template>
+
+<script>
+export default {
+  name: "appointmentHistory",
+  data(){
+    return{
+      historyList:[
+        {type:'审核中'},
+        {type:'已通过'},
+        {type:'已取消'},
+        {type:'暂存'},
+      ]
+    }
+  }
+}
+</script>
+
+<style lang="scss">
+    .historyListBody{
+      margin-top: 24rpx;
+      display: flex;
+      flex-direction: column;
+      align-items: center;
+      padding-bottom: 100rpx;
+      .historyItem{
+        width: 686rpx;
+        padding: 24rpx 0;
+        background: white;
+        box-sizing: border-box;
+        position: relative;
+        border-radius: 16rpx;
+        margin-bottom: 24rpx;
+        .tags{
+          width: 148rpx;
+          height: 56rpx;
+          position: absolute;
+          top: 0;
+          right: 0;
+          display: flex;
+          align-items: center;
+          justify-content: center;
+          font-size: 26rpx;
+          color: rgba(3, 101, 249, 1);
+          background: url('https://www.idea-co-sf.com/gardenProduct/image/bj04.png') no-repeat;
+          background-size: 100%;
+        }
+        .historyItemTitle{
+          padding: 8rpx 32rpx;
+          width: 480rpx;
+          color: rgba(34, 34, 34, 1);
+          font-size: 32rpx;
+          line-height: 40rpx;
+          font-weight: 500;
+        }
+        .historyItemInfo{
+          color: rgba(102, 102, 102, 1);
+          font-size: 28rpx;
+          padding: 10rpx 32rpx;
+        }
+        .historyItemBottom{
+          display: flex;
+          justify-content: space-between;
+          align-items: center;
+          padding: 28rpx 32rpx 0 32rpx;
+          border-top: 1px solid rgba(232, 237, 245, 1);
+          margin-top: 22rpx;
+          .typeInfo{
+            font-size: 28rpx;
+            color: rgba(226, 81, 0, 1);
+          }
+          .tgType{
+            color: rgba(3, 101, 249, 1);
+          }
+          .qxType{
+            color:rgba(242, 25, 18, 1);
+          }
+          .btn{
+            display: flex;
+            align-items: center;
+            justify-content: center;
+            font-size: 28rpx;
+            width: 160rpx;
+            height: 60rpx;
+            border-radius: 32rpx;
+            border: 2rpx solid rgba(255, 107, 24, 1);
+            color:rgba(255, 107, 24, 1);
+            &::after{
+              border: none;
+            }
+          }
+          .zcBtn{
+            background: linear-gradient( 316deg, #84AAFF 0%, #0365F9 100%);
+            color: white;
+            border: none;
+          }
+        }
+      }
+    }
+</style>

pages/subPackages/resourceReservation_manage/components/shareResources.vue

@@ -0,0 +1,89 @@
+<template>
+    <div class="shareResources">
+      <div style="width: 82%">
+        <van-tabs :active="active" @change="onChange">
+          <van-tab title="会议室" :name="0"></van-tab>
+          <van-tab title="打印机" :name="1"></van-tab>
+          <van-tab title="办公桌" :name="2"></van-tab>
+          <van-tab title="其他" :name="3"></van-tab>
+        </van-tabs>
+      </div>
+      <div class="shareListBody">
+        <div class="shareItem" v-for="item in 3" @tap="toDetail(item)">
+          <img src="https://www.idea-co-sf.com/gardenProduct/image/dyImage.png" class="shareItemImg">
+          <div class="shareItemRight">
+             <span class="shareItemTitle">党建会议室XXXXXXX</span>
+             <span class="shareItemInfo">位置：A栋一楼</span>
+            <span class="shareItemInfo">容纳人数：<span style="color: rgba(3, 101, 249, 1)">120人</span></span>
+          </div>
+        </div>
+      </div>
+    </div>
+</template>
+
+<script>
+export default {
+  name: "shareResources",
+  data(){
+    return{
+      active:0
+    }
+  },
+  methods:{
+    onChange(){
+
+    },
+    toDetail(item){
+      uni.navigateTo({
+        url:'/pages/subPackages/resourceReservation_manage/detail'
+      })
+    }
+  }
+}
+</script>
+
+<style lang="scss">
+    .shareResources{
+      margin-top: 24rpx;
+      background: white;
+      min-height: 1344rpx;
+      padding-bottom: 100rpx;
+      .shareListBody{
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+        margin-top: 16rpx;
+        .shareItem{
+          width: 686rpx;
+          height: 224rpx;
+          background:rgba(245, 247, 250, 1) ;
+          box-sizing: border-box;
+          display: flex;
+          align-items: center;
+          padding: 32rpx 24rpx;
+          border-radius: 16rpx;
+          margin-bottom: 24rpx;
+          .shareItemImg{
+            width: 220rpx;
+            height: 160rpx;
+          }
+          .shareItemRight{
+            display: flex;
+            flex-direction: column;
+            margin-left: 24rpx;
+            .shareItemTitle{
+              color:rgba(24, 23, 42, 1);
+              font-size: 32rpx;
+              font-weight: 600;
+              margin-bottom: 16rpx;
+            }
+            .shareItemInfo{
+              color:rgba(102, 102, 102, 1);
+              font-size: 26rpx;
+              line-height: 40rpx;
+            }
+          }
+        }
+      }
+    }
+</style>

pages/subPackages/resourceReservation_manage/detail.vue

@@ -0,0 +1,85 @@
+<template>
+    <div class="resourceDetail">
+      <ul class="detailUl">
+        <li class="detailLi">
+          <span class="liName">当前企业</span>
+          <span class="liInfo">无锡XXXXX有限公司</span>
+        </li>
+        <li class="detailLi">
+          <span class="liName">位置</span>
+          <span class="liInfo">XXXXXXXXXXXXXXXXX</span>
+        </li>
+        <li class="detailLi">
+          <span class="liName">容纳人数</span>
+          <span class="liInfo">120</span>
+        </li>
+        <li class="detailLi">
+          <span class="liName">配套</span>
+          <span class="liInfo">XXXX</span>
+        </li>
+        <li class="detailLi">
+          <span class="liName">说明</span>
+          <span class="liInfo">XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX</span>
+        </li>
+        <li class="detailLi">
+          <span class="liName">
+            <span class="callName">预约电话：</span>
+            <span class="callNumber">0510-680**808</span>
+          </span>
+          <img src="../minePages/image/phoneIcon.png" class="phoneIcon">
+        </li>
+      </ul>
+    </div>
+</template>
+
+<script>
+export default {
+  name: "detail"
+}
+</script>
+
+<style lang="scss">
+.resourceDetail{
+  .detailUl{
+    margin-top: 20rpx;
+    background: white;
+    padding: 24rpx 32rpx;
+    .liName{
+      font-size: 32rpx;
+      color: rgba(51, 51, 51, 1);
+      white-space: nowrap;
+      .callNumber{
+        color: rgba(24, 23, 42, 1);
+        font-size: 36rpx;
+        font-weight: 600;
+      }
+      .callName{
+        color: rgba(102, 102, 102, 1);
+        font-size: 28rpx;
+      }
+    }
+    .phoneIcon{
+      width: 64rpx;
+      height: 64rpx;
+    }
+    .detailLi{
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      padding: 32rpx 0;
+      border-bottom: 2rpx solid #E6E6E6;
+      .liInfo{
+        display: inline-block;
+        text-align: right;
+        max-width: 428rpx;
+        color: rgba(102, 102, 102, 1);
+        font-size: 32rpx;
+        line-height: 38rpx;
+        overflow: hidden;
+        word-wrap: break-word;
+      }
+    }
+  }
+}
+
+</style>

pages/subPackages/resourceReservation_manage/index.vue

@@ -0,0 +1,38 @@
+<template>
+    <div>
+      <van-tabs :active="active" @change="onChange">
+        <van-tab title="共享资源" :name="0">
+          <shareResources/>
+        </van-tab>
+        <van-tab title="预约历史" :name="1">
+          <appointmentHistory />
+        </van-tab>
+      </van-tabs>
+    </div>
+</template>
+
+<script>
+import shareResources from "./components/shareResources.vue";
+import appointmentHistory from "./components/appointmentHistory.vue";
+export default {
+  components:{
+    shareResources,
+    appointmentHistory
+  },
+  name: "index",
+  data(){
+    return{
+      active:0
+    }
+  },
+  methods:{
+    onChange(){
+
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

pages/subPackages/todo/predetermineDetail.vue

@@ -74,6 +74,7 @@
           confirm-button-text="好的"
           cancel-button-text="不用了"
           confirm-button-color="rgba(87, 107, 149, 1)"
+          @close="show = false"
       >
         <div class="dialogInfo">
           <van-icon name="warning" style="color:#10aeff;font-size: 128rpx"/>

unpackage/dist/dev/mp-weixin/app.json

@@ -16,6 +16,8 @@
         "activity/index",
         "activity/code",
         "activityPromulgate/list",
+        "activityPromulgate/qrCode",
+        "activityPromulgate/add",
         "password/index",
         "repairDispatch-app/index",
         "repairDispatch-app/add",
@@ -66,7 +68,9 @@
         "peripheralService/detail",
         "industrialPolicy/index",
         "industrialPolicy/detail",
-        "surroundingReleases/index"
+        "surroundingReleases/index",
+        "resourceReservation_manage/index",
+        "resourceReservation_manage/detail"
       ],
       "network": "all"
     }

unpackage/dist/dev/mp-weixin/pages/index/components/activity.json

@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }

unpackage/dist/dev/mp-weixin/pages/index/components/dynamic.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

unpackage/dist/dev/mp-weixin/pages/index/index.js

@@ -220,7 +220,7 @@ var _http = __webpack_require__(/*! @/js_sdk/http */ 63);
 // import {demo} from "@/js_sdk/http"
 var EnterpriseSide = function EnterpriseSide() {
   __webpack_require__.e(/*! require.ensure | pages/index/components/enterpriseSide */ "pages/index/components/enterpriseSide").then((function () {
-    return resolve(__webpack_require__(/*! ./components/enterpriseSide.vue */ 594));
+    return resolve(__webpack_require__(/*! ./components/enterpriseSide.vue */ 626));
   }).bind(null, __webpack_require__)).catch(__webpack_require__.oe);
 };
 var _default = {
@@ -250,8 +250,9 @@ var _default = {
         url: "https://www.idea-co-sf.com/gardenProduct/image/zfsb.png",
         path: "/pages/subPackages/companyreport/companyreport"
       }, {
-        label: "会议室审核",
-        url: "https://www.idea-co-sf.com/gardenProduct/image/tupian1.png"
+        label: "资源预约",
+        url: "https://www.idea-co-sf.com/gardenProduct/image/tupian1.png",
+        path: "/pages/subPackages/resourceReservation_manage/index"
       },
       // {
       //   label: "上市跟进",

unpackage/dist/dev/mp-weixin/pages/subPackages/activity/index.js

@@ -145,12 +145,12 @@ exports.default = void 0;
 var _http = __webpack_require__(/*! @/js_sdk/http */ 63);
 var TelNum = function TelNum() {
   __webpack_require__.e(/*! require.ensure | pages/subPackages/components/tel-number/index */ "pages/subPackages/components/tel-number/index").then((function () {
-    return resolve(__webpack_require__(/*! ../../subPackages/components/tel-number */ 601));
+    return resolve(__webpack_require__(/*! ../../subPackages/components/tel-number */ 633));
   }).bind(null, __webpack_require__)).catch(__webpack_require__.oe);
 };
 var ApplyPopup = function ApplyPopup() {
   __webpack_require__.e(/*! require.ensure | pages/subPackages/activity/apply-popup */ "pages/subPackages/activity/apply-popup").then((function () {
-    return resolve(__webpack_require__(/*! ./apply-popup.vue */ 608));
+    return resolve(__webpack_require__(/*! ./apply-popup.vue */ 640));
   }).bind(null, __webpack_require__)).catch(__webpack_require__.oe);
 };
 var _default = {

unpackage/dist/dev/mp-weixin/pages/subPackages/activityPromulgate/list.wxss

@@ -323,4 +323,12 @@
   height: 32rpx;
   margin-right: 16rpx;
 }
+.activityPromulgate .dialogInfo {
+  padding: 64rpx 32rpx;
+  font-size: 34rpx;
+  color: #333333;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+}