产品化更新

pages.json

@@ -1355,6 +1355,294 @@
                             "van-checkbox-group": "/wxcomponents/weapp/dist/checkbox-group/index"
                         }
                     }
+                },
+                {
+                    "path": "parkActivity/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": "minePages/mineMessage",
+                    "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": "minePages/feedback",
+                    "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": "minePages/feedback_record",
+                    "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": "minePages/feedback_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"
+                        }
+                    }
+                },
+                {
+                    "path": "minePages/myActivities",
+                    "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": "minePages/myCollection",
+                    "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": "minePages/myOrder",
+                    "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/components/activity.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="activity">
-    <div v-for="(item, index) in activityList" class="activityItem">
+    <div v-for="(item, index) in activityList" class="activityItem" @tap="toDetail(item)">
       <img :src="item.img" class="itemBg" />
       <div class="activityItemRight">
         <div class="activityItemRightTop">
@@ -9,7 +9,7 @@
         </div>
         <div class="canyu">36人参与</div>
         <div class="activityItemRightBottom">
-          <div class="shoucang" @click="clickColl(index)">
+          <div class="shoucang" @tap.stop="clickColl(index)">
             <img :src="item.isColl ? heartSel : heart" class="scImg" /> 收藏
           </div>
           <div
@@ -28,6 +28,12 @@
 import { getUserPower, getUserLocalStorageInfo } from "@/js_sdk/http";
 export default {
   name: "activity",
+  props: {
+    faMsg: {
+      type: String,
+      default: ''
+    }
+  },
   data() {
     return {
       heartSel: "https://www.idea-co-sf.com/gardenProduct/image/heartSel.png",
@@ -58,43 +64,52 @@ export default {
     };
   },
   methods: {
-    clickColl(index) {
-      // console.log(index)
-      this.activityList[index].isColl = !this.activityList[index].isColl;
-      // item.isColl = !item.isColl
-    },
-    baoming(item) {
-      if (item.isSign) {
-        if (getUserLocalStorageInfo().userType == 3) {
-          uni.showModal({
-            title: "提示",
-            cancelText: "暂不",
-            confirmText: "去切换",
-            content: "您还不是企业用户，请切换登录身份后再进行相关操作。",
-            success: function (res) {
-              if (res.confirm) {
-                uni.navigateTo({
-                  url: "/pages/login2/login",
-                  success: function (e) {
-                    // uni.$emit('userType', 'OK')
-                  },
-                });
-              } else if (res.cancel) {
-                console.log("用户点击取消");
-              }
-            },
-          });
+      clickColl(index) {
+        // console.log(index)
+        this.activityList[index].isColl = !this.activityList[index].isColl;
+        // item.isColl = !item.isColl
+      },
+      baoming(item) {
+        if (item.isSign) {
+          if (getUserLocalStorageInfo().userType == 3) {
+            uni.showModal({
+              title: "提示",
+              cancelText: "暂不",
+              confirmText: "去切换",
+              content: "您还不是企业用户，请切换登录身份后再进行相关操作。",
+              success: function (res) {
+                if (res.confirm) {
+                  uni.navigateTo({
+                    url: "/pages/login2/login",
+                    success: function (e) {
+                      // uni.$emit('userType', 'OK')
+                    },
+                  });
+                } else if (res.cancel) {
+                  console.log("用户点击取消");
+                }
+              },
+            });
+          }
+        }
+      },
+      toDetail(item){
+        console.log(this.faMsg)
+        if (this.faMsg === 'home'){
+          uni.navigateTo({
+            url:'/pages/subPackages/parkActivity/index'
+          })
         }
       }
-    },
   },
 };
 </script>
 
 <style lang="scss">
 .activity {
+  margin: 0 auto;
   .activityItem {
-    width: 702rpx;
+    width: 686rpx;
     height: 216rpx;
     background: #f5f7fa;
     padding: 0 24rpx;

pages/index/components/enterpriseSide.vue

@@ -52,7 +52,7 @@
           {{ item.name }}
         </div>
       </div>
-      <activity v-show="selectTab === '活动'"></activity>
+      <activity v-show="selectTab === '活动'" :faMsg="faMsg"></activity>
       <dynamic v-show="selectTab === '动态'"></dynamic>
     </div>
     <div class="serviceEvaluation">
@@ -105,6 +105,7 @@ export default {
   name: "enterpriseSide",
   data() {
     return {
+      faMsg:'home',
       locationIcon:
         "https://www.idea-co-sf.com/gardenProduct/image/locationIcon.png",
       dhIcon: "https://www.idea-co-sf.com/gardenProduct/image/dhIcon.png",

pages/index/index.vue

@@ -207,14 +207,15 @@ export default {
   mounted() {
     // demo();
   },
+  onShow() {
+    this.getUserPower();
+  },
   onLoad(e) {
     // uni.$on("userType", (userType) => {
     //   if (userType === "OK") {
     //     this.userType = !this.userType;
     //   }
     // });
-
-    this.getUserPower();
   },
   methods: {
     toMsgPage(e) {
@@ -226,7 +227,7 @@ export default {
     // getUserLocalStorageInfo
     async getUserPower() {
       let that = this;
-      // console.log(getUserLocalStorageInfo());
+      console.log('getUserLocalStorageInfo',getUserLocalStorageInfo());
       that.userType = getUserLocalStorageInfo().userType;
       if (that.userType == 3) {
         uni.showModal({

pages/login2/login.vue

@@ -124,6 +124,11 @@ export default {
     // login()
     this.captchaImageRefresh(this.loginForm);
   },
+  onLoad(options) {
+    if (options.loginType) {
+      this.loginType = options.loginType
+    }
+  },
   methods: {
     changeLoginType(e) {
       console.log(this.loginType);
@@ -134,13 +139,13 @@ export default {
     getPhoneNumber(e) {
       wx.login({
         success(res) {
-          console.log(res);
+          // console.log(res);
           let data = {
             loginCode: res.code,
             phoneCode: e.detail.code,
           };
           loginByWeixin2(data).then((e) => {
-            console.log(e.data.user);
+            // console.log(e.data.user);
             wx.setStorageSync("USERINFO", JSON.stringify(e.data.user));
             uni.switchTab({
               url: "/pages/index/index",

pages/mine/mine.vue

@@ -5,12 +5,42 @@
       <div class="headerandwelcome">
         <img src="../../static/mine/head.png" alt="" class="header" />
         <div class="weltxt">
-          {{ getUserLocalStorageInfo.user.truename }}，欢迎您！
+         <span style="font-size: 48rpx;font-weight: 600">欢迎您！</span>
+         <span style="font-size: 32rpx;margin-top: 5rpx">{{ getUserLocalStorageInfo.username?getUserLocalStorageInfo.username:'游客' }}</span>
+        </div>
+      </div>
+      <div class="cardBox" @tap="toMineMsg">
+        <div class="cardLeft">
+          <span style="color: #FFC97C;font-size: 28rpx">我的消息</span>
+          <span style="color: #FFFFFF;font-size: 40rpx;margin-left: 18rpx">0</span>
+        </div>
+        <img src="./image/rightIcon.png" class="rightIcon">
+      </div>
+      <div class="mineMenuBody">
+        <div v-for="item in menuList" class="mineMenuItem" @tap="toPath(item)">
+          <div class="redDoll" v-show="item.isNew"></div>
+          <img :src="item.img" class="menuImg" />
+          <span class="menuName">{{ item.name }}</span>
         </div>
       </div>
       <div class="labelpage">
-        <div class="labelpage_row">
-          <img height="44rpx" src="../../static/mine/versionicon.png" alt="" />
+        <div
+            class="labelpage_row"
+        >
+          <div class="labelpage_text">
+            <div class="labelpage_name">企业信息</div>
+            <div class="labelpage_value">
+              <img
+                  src="../../static/mine/youjiantou.png"
+                  style="width: 44rpx; height: 44rpx"
+                  alt=""
+              />
+            </div>
+            <div class="border"></div>
+          </div>
+        </div>
+        <div class="labelpage_row"
+             style="margin-top: 48rpx">
           <div class="labelpage_text">
             <div class="labelpage_name">当前版本号</div>
             <div class="labelpage_value">v1.0.1</div>
@@ -22,7 +52,6 @@
           style="margin-top: 48rpx"
           @click="editPassWord()"
         >
-          <img height="44rpx" src="../../static/mine/editpassword.png" alt="" />
           <div class="labelpage_text">
             <div class="labelpage_name">密码修改</div>
             <div class="labelpage_value">
@@ -40,7 +69,6 @@
           style="margin-top: 48rpx"
           @click="changeUserType"
         >
-          <img height="44rpx" src="../../static/mine/editpassword.png" alt="" />
           <div class="labelpage_text">
             <div class="labelpage_name">切换账号</div>
             <div class="labelpage_value">
@@ -58,7 +86,6 @@
           style="margin-top: 48rpx"
           @click="outLogin()"
         >
-          <img height="44rpx" src="../../static/mine/outicon.png" alt="" />
           <div class="labelpage_text">
             <div class="labelpage_name">退出账号</div>
             <div class="labelpage_value">
@@ -72,6 +99,13 @@
         </div>
       </div>
     </div>
+    <van-popup
+        :show="show"
+        position="bottom"
+        custom-style="height: 40%;"
+    >
+      <van-picker :columns="columns" @cancel="onCancel" @confirm="onConfirm" show-toolbar/>
+    </van-popup>
   </view>
 </template>
 <script>
@@ -82,6 +116,34 @@ export default {
       userInfo: {},
       getUserLocalStorageInfo: getUserLocalStorageInfo(),
       userType: true,
+      show:false,
+      columns: ['普通用户', '企业用户', '管理用户'],
+      menuList: [
+        {
+          name: '我的收藏',
+          img: require('./image/sc.png'),
+          isNew: false,
+          path: '/myCollection'
+        },
+        {
+          name: '我的活动',
+          img: require('./image/hd.png'),
+          isNew: false,
+          path: '/myActivities'
+        },
+        {
+          name: '我的订单',
+          img: require('./image/dd.png'),
+          isNew: false,
+          path: '/myOrder'
+        },
+        {
+          name: '我的反馈',
+          img: require('./image/fk.png'),
+          isNew: false,
+          path: '/feedback'
+        }
+      ]
     };
   },
   onLoad() {
@@ -90,13 +152,40 @@ export default {
   },
 
   methods: {
-    changeUserType() {
+    toPath(item) {
+      if (item.path) {
+        uni.navigateTo({
+          url:'/pages/subPackages/minePages' + item.path
+        })
+      }
+    },
+    toMineMsg(){
       uni.navigateTo({
-        url: "/pages/login2/login",
-        success: function (e) {
-          // uni.$emit('userType', 'OK')
-        },
-      });
+        url:'/pages/subPackages/minePages/mineMessage'
+      })
+    },
+    onCancel(){
+      this.show = false
+    },
+    onConfirm(e){
+      if (e.detail.value !== '普通用户'){
+        uni.navigateTo({
+          url: "/pages/login2/login?loginType=" + e.detail.value,
+          success: function (e) {
+            // uni.$emit('userType', 'OK')
+          },
+        });
+      }
+      this.show = false
+    },
+    changeUserType() {
+      this.show = true
+      // uni.navigateTo({
+      //   url: "/pages/login2/login",
+      //   success: function (e) {
+      //     // uni.$emit('userType', 'OK')
+      //   },
+      // });
     },
     outLogin() {
       wx.showModal({
@@ -124,10 +213,10 @@ export default {
   },
 };
 </script>
-<style scoped lang="scss">
+<style lang="scss">
 .banner {
   width: 100%;
-  //height: 424rpx;
+  height: 100%;
   position: absolute;
   z-index: 1;
 }
@@ -135,35 +224,62 @@ export default {
   margin-bottom: 60rpx;
   height: 120rpx;
   width: 100%;
+  padding-left: 60rpx;
 }
 .info {
   position: absolute;
-  width: calc(100% - 64rpx);
-  margin: 60rpx 32rpx 0 32rpx;
+  //width: calc(100% - 64rpx);
+  margin: 60rpx 0 0 0;
   z-index: 2;
 }
 .header {
   height: 120rpx;
   width: 120rpx;
-  margin-left: 15rpx;
+  //margin-left: 15rpx;
   border-radius: 50%;
   float: left;
 }
 .weltxt {
   height: 120rpx;
-  line-height: 120rpx;
   color: #ffffff;
   margin-left: 32rpx;
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
   float: left;
+  color: black;
+}
+.cardBox{
+  width: 686rpx;
+  height: 100rpx;
+  box-sizing: border-box;
+  background: rgba(20, 33, 76, 1);
+  border-radius: 16rpx 16rpx 0 0;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  padding:0 32rpx;
+  margin-left: 32rpx;
+  .rightIcon{
+    width: 36rpx;
+    height: 36rpx;
+  }
+  .cardLeft{
+    display: flex;
+    align-items: center;
+  }
 }
 .labelpage {
-  width: calc(100% - 96rpx);
-  height: 388rpx;
-  padding: 96rpx 48rpx;
+  width: 686rpx;
+  margin-left: 32rpx;
+  box-sizing: border-box;
+  padding: 32rpx;
   border-radius: 12rpx 12rpx 12rpx 12rpx;
   background: #ffffff;
 }
 .labelpage_row {
+  display: flex;
+  align-items: center;
   height: 83rpx;
   width: 100%;
   img {
@@ -173,7 +289,7 @@ export default {
     margin-right: 12rpx;
   }
   .labelpage_text {
-    width: calc(100% - 64rpx);
+    width: 100%;
     height: 44rpx;
     line-height: 44rpx;
     float: left;
@@ -182,7 +298,7 @@ export default {
     height: 44rpx;
     line-height: 44rpx;
     float: left;
-    font-size: 28rpx;
+    font-size: 34rpx;
     color: #081640;
     font-weight: 400;
   }
@@ -190,8 +306,8 @@ export default {
     height: 44rpx;
     line-height: 44rpx;
     float: right;
-    font-size: 28rpx;
-    color: #1d18bc;
+    font-size: 34rpx;
+    color: #666666;
     font-weight: 400;
   }
   .border {
@@ -202,5 +318,40 @@ export default {
     float: left;
   }
 }
+.mineMenuBody {
+  width: 686rpx;
+  box-sizing: border-box;
+  display: flex;
+  justify-content: space-around;
+  background: white;
+  padding: 24rpx 0;
+  margin: 24rpx 32rpx;
+  border-radius: 2vw;
+  .mineMenuItem {
+    position: relative;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    .redDoll {
+      position: absolute;
+      right: 0;
+      top: 0;
+      width: 16rpx;
+      height: 16rpx;
+      background: #f25551;
+      border-radius: 50%;
+    }
+    .menuImg {
+      width: 80rpx;
+      height: 80rpx;
+    }
+    .menuName {
+      color: #333333;
+      font-size: 28rpx;
+      margin-top: 8rpx;
+    }
+  }
+}
+
 </style>
 

pages/subPackages/mine.vue

@@ -1,179 +0,0 @@
-<template>
-  <view>
-    <img src="./mine/banner.png" class="banner" />
-    <div class="info">
-      <div class="headerandwelcome">
-        <img src="./mine/head.png" alt="" class="header" />
-        <div class="weltxt">
-          {{ getUserLocalStorageInfo.user.truename }}，欢迎您！
-        </div>
-      </div>
-      <div class="labelpage">
-        <div class="labelpage_row">
-          <img height="44rpx" src="./mine/versionicon.png" alt="" />
-          <div class="labelpage_text">
-            <div class="labelpage_name">当前版本号</div>
-            <div class="labelpage_value">v1.0.1</div>
-            <div class="border"></div>
-          </div>
-        </div>
-        <div
-          class="labelpage_row"
-          style="margin-top: 48rpx"
-          @click="editPassWord()"
-        >
-          <img height="44rpx" src="./mine/editpassword.png" alt="" />
-          <div class="labelpage_text">
-            <div class="labelpage_name">密码修改</div>
-            <div class="labelpage_value">
-              <img
-                src="./mine/youjiantou.png"
-                style="width: 44rpx; height: 44rpx"
-                alt=""
-              />
-            </div>
-            <div class="border"></div>
-          </div>
-        </div>
-        <div
-          class="labelpage_row"
-          style="margin-top: 48rpx"
-          @click="outLogin()"
-        >
-          <img height="44rpx" src="./mine/outicon.png" alt="" />
-          <div class="labelpage_text">
-            <div class="labelpage_name">退出账号</div>
-            <div class="labelpage_value">
-              <img
-                src="./mine/youjiantou.png"
-                style="width: 44rpx; height: 44rpx"
-                alt=""
-              />
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-  </view>
-</template>
-<script>
-import { getUserInfo, getUserLocalStorageInfo } from "@/js_sdk/http";
-export default {
-  data() {
-    return {
-      userInfo: {},
-      getUserLocalStorageInfo: getUserLocalStorageInfo(),
-    };
-  },
-  onLoad() {
-    //option为object类型，会序列化上个页面传递的参数
-    // this.getUserInfo(); //打印出上个页面传递的参数。
-  },
-
-  methods: {
-    outLogin() {
-      wx.showModal({
-        title: "提示！",
-        content: "是否确认退出登录？",
-        success: function (res) {
-          if (res.confirm) {
-            uni.clearStorageSync();
-            uni.reLaunch({
-              url: "/pages/login/login",
-            });
-          }
-        },
-      });
-    },
-    editPassWord() {
-      uni.navigateTo({
-        url: "/pages/subPackages/password/index",
-      });
-    },
-    async getUserInfo() {
-      let data = await getUserInfo();
-      this.userInfo = data.data;
-    },
-  },
-};
-</script>
-<style scoped lang="scss">
-.banner {
-  width: 100%;
-  //height: 424rpx;
-  position: absolute;
-  z-index: 1;
-}
-.headerandwelcome {
-  margin-bottom: 60rpx;
-  height: 120rpx;
-  width: 100%;
-}
-.info {
-  position: absolute;
-  width: calc(100% - 64rpx);
-  margin: 60rpx 32rpx 0 32rpx;
-  z-index: 2;
-}
-.header {
-  height: 120rpx;
-  width: 120rpx;
-  margin-left: 15rpx;
-  border-radius: 50%;
-  float: left;
-}
-.weltxt {
-  height: 120rpx;
-  line-height: 120rpx;
-  color: #ffffff;
-  margin-left: 32rpx;
-  float: left;
-}
-.labelpage {
-  width: calc(100% - 96rpx);
-  height: 308rpx;
-  padding: 96rpx 48rpx;
-  border-radius: 12rpx 12rpx 12rpx 12rpx;
-  background: #ffffff;
-}
-.labelpage_row {
-  height: 83rpx;
-  width: 100%;
-  img {
-    height: 44rpx;
-    width: 44rpx;
-    float: left;
-    margin-right: 12rpx;
-  }
-  .labelpage_text {
-    width: calc(100% - 64rpx);
-    height: 44rpx;
-    line-height: 44rpx;
-    float: left;
-  }
-  .labelpage_name {
-    height: 44rpx;
-    line-height: 44rpx;
-    float: left;
-    font-size: 28rpx;
-    color: #081640;
-    font-weight: 400;
-  }
-  .labelpage_value {
-    height: 44rpx;
-    line-height: 44rpx;
-    float: right;
-    font-size: 28rpx;
-    color: #1d18bc;
-    font-weight: 400;
-  }
-  .border {
-    margin-top: 48rpx;
-    width: 100%;
-    height: 1rpx;
-    border-bottom: 2rpx solid #e6e6e6;
-    float: left;
-  }
-}
-</style>
-

pages/subPackages/minePages/feedback.vue

@@ -0,0 +1,180 @@
+<template>
+    <div class="feedback">
+        <ul class="detailUl">
+          <div class="record" @click.stop="toRecord">
+            反馈记录 <img src="https://www.idea-co-sf.com/gardenProduct/image/rightIcon.png" class="recordImg">
+          </div>
+          <li class="detailLi2">
+            <div class="detailLi2Box">
+              <van-field
+                  :value="form.contant"
+                  autosize
+                  type="textarea"
+                  placeholder="请输入文字进行报事报修描述"
+                  class="myField"
+                  maxlength="800"
+                  show-word-limit
+              />
+            </div>
+          </li>
+          <li class="detailLi2">
+          <span class="liName">
+            上传照片
+            <span style="color: #B3B3B3;font-size: 28rpx">（支持图片/视频上传限20M内，最多6张）</span>
+          </span>
+            <div class="detailLi2Box" style="margin: 24rpx 0 0 0">
+              <van-uploader
+                  :max-count="6"
+                  @delete="deleteRYXXZP"
+                  :file-list="fileList"
+                  @after-read="uploadRYXXZP"
+                  :show-upload="true"
+              />
+            </div>
+          </li>
+        </ul>
+      <button class="submitBtn">
+        提交
+      </button>
+    </div>
+</template>
+
+<script>
+export default {
+  name: "feedback",
+  data(){
+    return{
+      form:{
+        contant:''
+      },
+      fileList:[]
+    }
+  },
+  methods:{
+    toRecord(){
+      uni.navigateTo({
+        url:'/pages/subPackages/minePages/feedback_record'
+      })
+    },
+    deleteRYXXZP(event) {
+      this.fileList.splice(event.detail.index, 1);
+      this.$forceUpdate();
+    },
+    uploadRYXXZP(event) {
+      console.log(event)
+      let that = this;
+      const { file } = event.detail;
+      uni.uploadFile({
+        url: that.$constant.BASE_URI + "/wx/fileController/upload",
+        filePath: file.url,
+        name: "file",
+        formData: { user: "test" },
+        success(res) {
+          // 上传完成需要更新 fileList
+          let data = JSON.parse(res.data);
+          that.fileList.push({
+            imgUrl: "/FileController/download/" + data.data[0],
+            id: data.data[0],
+            url:
+                that.$constant.BASE_URI +
+                "/FileController/download/" +
+                data.data[0],
+            isImage: true,
+          });
+        },
+        fail(res) {},
+      });
+    },
+  }
+}
+</script>
+
+<style lang="scss">
+    .feedback{
+      .record {
+        display: flex;
+        align-items: center;
+        justify-content: flex-end;
+        color: #0365F9;
+        font-size: 32rpx;
+        padding-top: 24rpx;
+        .recordImg{
+          width: 36rpx;
+          height: 36rpx;
+          padding: 5rpx 0 0 10rpx;
+        }
+      }
+      .detailUl{
+        margin-top: 20rpx;
+        background: white;
+        padding: 0 32rpx;
+        .liName{
+          font-size: 32rpx;
+          color: rgba(51, 51, 51, 1);
+          white-space: nowrap;
+        }
+        .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;
+            .radio{
+              margin-left: 64rpx;
+            }
+          }
+        }
+        .detailLi2{
+          display: flex;
+          flex-direction: column;
+          padding: 32rpx 0;
+          border-bottom: 2rpx solid #E6E6E6;
+          .detailLi2BoxTop{
+            display: flex;
+            flex-wrap: wrap;
+            justify-content: space-between;
+            margin: 12rpx 0;
+            .checkItem{
+              width: 160rpx;
+              height: 64rpx;
+              font-size: 28rpx;
+              color: #666666;
+              display: flex;
+              align-items: center;
+              justify-content: center;
+              background: #F5F7FA;
+              border-radius: 8rpx;
+              margin: 12rpx 0;
+            }
+            .checked{
+              background: #0365F9;
+              color: white;
+            }
+          }
+        }
+        .van-cell {
+          background: #F5F7FA !important;
+          border-radius: 8rpx;
+          font-size: 28rpx;
+        }
+      }
+      .submitBtn{
+        width: 654rpx;
+        height: 96rpx;
+        background: #0365F9;
+        border-radius: 8rpx;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        margin: 64rpx 48rpx;
+        color: white;
+      }
+    }
+</style>

pages/subPackages/minePages/feedback_detail.vue

@@ -0,0 +1,109 @@
+<template>
+    <div class="feedbackDetail">
+      <div class="myRecord">
+        <div class="detailTitle">我的反馈</div>
+        <div class="infoBox">
+          <span class="info">园区道路问题一直没有解决，遇到下雨天就容易造成积水的情形，请园区尽快处理。</span>
+          <span class="infoImgBox">
+            <img src="./image/msgIcon.png" class="infoImg" v-for="item in 5">
+          </span>
+        </div>
+      </div>
+      <div class="myRecord">
+        <div class="detailTitle">回复内容</div>
+        <div class="infoBox">
+          <span class="info">您反映的问题，我们已经受理，并且将想关问题进行了工作安排，预计3个工作日会有具体的工作人员联系您。</span>
+        </div>
+        <div class="handleBox">
+          <div class="handleItem">
+            <span class="handleTitle">受理企业</span>：
+            <span class="handleInfo">受理人所在集团名称</span>
+          </div>
+          <div class="handleItem">
+            <span class="handleTitle">受理人</span>：
+            <span class="handleInfo">王斌-13921168766</span>
+            <img src="./image/phoneIcon.png" class="phoneIcon">
+          </div>
+          <div class="handleItem">
+            <span class="handleTitle">受理时间</span>：
+            <span class="handleInfo">2024-1-13 15:23</span>
+          </div>
+        </div>
+      </div>
+    </div>
+</template>
+
+<script>
+export default {
+  name: "feedbackDetail"
+}
+</script>
+
+<style lang="scss">
+    .feedbackDetail{
+      .myRecord{
+        margin: 24rpx 0 34rpx 0;
+        padding: 32rpx 32rpx;
+        box-sizing: border-box;
+        background: white;
+        .detailTitle{
+          color: #18172A;
+          font-size: 32rpx;
+          font-weight: 600;
+        }
+        .infoBox{
+          width: 686rpx;
+          padding: 24rpx;
+          background: #F5F7FA;
+          border-radius: 8rpx;
+          box-sizing: border-box;
+          margin-top: 16rpx;
+          display: flex;
+          flex-direction: column;
+          .info{
+            color: #666666;
+            font-size: 28rpx;
+            line-height: 44rpx;
+          }
+          .infoImgBox{
+            display: flex;
+            flex-wrap: wrap;
+          }
+          .infoImg{
+            width: 180rpx;
+            height: 180rpx;
+            margin: 16rpx;
+          }
+        }
+        .handleBox{
+          margin-top: 32rpx;
+          display: flex;
+          flex-direction: column;
+          padding: 24rpx 0;
+          border-top: 1px solid #E8EDF5;;
+          .handleItem{
+            margin-bottom: 24rpx;
+            display: flex;
+            align-items: center;
+            .handleTitle{
+              display: inline-block;
+              width: 140rpx;
+              color: #18172A;
+              font-size: 28rpx;
+              text-align: justify;
+              text-align-last: justify;
+            }
+            .handleInfo{
+              color: #666666;
+              font-size: 28rpx;
+            }
+            .phoneIcon{
+              width: 48rpx;
+              height: 48rpx;
+              margin-left: 48rpx;
+            }
+          }
+        }
+      }
+    }
+</style>

pages/subPackages/minePages/feedback_record.vue

@@ -0,0 +1,69 @@
+<template>
+    <div class="feedback_record">
+      <div class="recordItem" v-for="item in recordList" @click="toDetail(item)">
+        <div class="recordTitle">{{item.name}}</div>
+        <div class="recordTime">
+          <span class="time">提交时间：{{item.time}}</span>
+          <span :class="item.type==='待回复'?'dhf':'yhf'">{{item.type}}</span>
+        </div>
+      </div>
+    </div>
+</template>
+
+<script>
+export default {
+  name: "feedback_record",
+  data(){
+    return{
+      recordList:[
+        {name:'园区道路的积水问题还需要尽快处理。否则会影响路面通行的效率。',time:'2021-1-21  13:00',type:'待回复'},
+        {name:'上月水费不太对，怀疑水表有问题，请派人查看。',time:'2021-1-21  13:00',type:'已回复'},
+        {name:'园区道路的积水问题还需要尽快处理。否则会影响路面通行的效率。',time:'2021-1-21  13:00',type:'已回复'},
+      ]
+    }
+  },
+  methods:{
+    toDetail(item){
+      uni.navigateTo({
+        url:'/pages/subPackages/minePages/feedback_detail'
+      })
+    }
+  }
+}
+</script>
+
+<style lang="scss">
+    .feedback_record{
+      padding: 24rpx 32rpx;
+      .recordItem{
+        padding: 32rpx 0 22rpx 0;
+        background: white;
+        border-radius: 16rpx;
+        margin-bottom: 24rpx;
+        .recordTitle{
+          line-height: 36rpx;
+          color: #222222;
+          font-size: 28rpx;
+          padding: 0 32rpx 24rpx 32rpx;
+          border-bottom: 1px solid #E8EDF5;
+        }
+        .recordTime{
+          padding: 24rpx 32rpx 0 32rpx;
+          display: flex;
+          justify-content: space-between;
+          .time{
+            color: #888888;
+            font-size: 28rpx;
+          }
+          .dhf{
+            color: #E25100;
+            font-size: 28rpx;
+          }
+          .yhf{
+            color: #0365F9;
+            font-size: 28rpx;
+          }
+        }
+      }
+    }
+</style>

pages/subPackages/minePages/mineMessage.vue

@@ -0,0 +1,77 @@
+<template>
+    <div class="mineMessage">
+       <div class="msgItem" v-for="item in msgList">
+         <div class="msgItemLeft">
+            <img src="./image/msgIcon.png" class="msgIcon">
+           <div class="redDoll" v-show="item.isNew"></div>
+         </div>
+         <div class="msgItemRight">
+           <div class="msgItemName">您有一条最新政策待查看！</div>
+           <div class="msgItemTime">2024-06-18  19:34:06</div>
+         </div>
+       </div>
+    </div>
+</template>
+
+<script>
+export default {
+  name: "mineMessage",
+  data(){
+    return{
+      msgList:[
+        {name:'您有一条最新政策待查看',isNew:false},
+        {name:'您有一条最新政策待查看',isNew:true},
+        {name:'您有一条最新政策待查看',isNew:false},
+      ]
+    }
+  }
+}
+</script>
+
+<style lang="scss">
+    .mineMessage{
+      padding:32rpx;
+      .msgItem{
+        width: 686rpx;
+        height: 162rpx;
+        background: white;
+        box-sizing: border-box;
+        border-radius: 16rpx;
+        display: flex;
+        align-items: center;
+        padding-left: 32rpx;
+        margin-bottom: 24rpx;
+        .msgItemLeft{
+          position: relative;
+          .msgIcon{
+            width: 80rpx;
+            height: 80rpx;
+          }
+          .redDoll {
+            position: absolute;
+            right: 0;
+            top: 0;
+            width: 16rpx;
+            height: 16rpx;
+            background: #f25551;
+            border-radius: 50%;
+          }
+        }
+       .msgItemRight{
+         display: flex;
+         flex-direction: column;
+         justify-content: center;
+         margin-left: 16rpx;
+         .msgItemTime{
+           color: #888888;
+           font-size: 28rpx;
+           margin-top: 8rpx;
+         }
+         .msgItemName{
+           font-size: 32rpx;
+           color: #222222;
+         }
+       }
+      }
+    }
+</style>

pages/subPackages/minePages/myActivities.vue

@@ -0,0 +1,113 @@
+<template>
+    <div class="myActivities">
+      <div class="actItem" v-for="item in actList" @click="toDetail(item)">
+        <div class="actTop">
+           <img src="https://www.idea-co-sf.com/gardenProduct/image/img1.png" class="actImg">
+          <div class="actRight">
+            <span class="actTitle">{{ item.name }}</span>
+            <span class="actTime2">报名时间：2024/02/01~2024/02/16</span>
+            <span class="actTime2">报名人数：23</span>
+          </div>
+        </div>
+        <div class="actTime">
+          <span class="time">开始时间：<span style="color: #666666">{{item.time}}</span></span>
+          <span :class="item.type==='已结束'?'yjs':'dks'">{{item.type}}</span>
+        </div>
+      </div>
+    </div>
+</template>
+
+<script>
+export default {
+  name: "myActivities",
+  data(){
+    return{
+      actList:[
+        {name:'互联网私募如何入门?',time:'2021-1-21  13:00',type:'待开始'},
+        {name:'公募基金中的大数据挖掘',time:'2021-1-21  13:00',type:'待开始'},
+        {name:'年度小艾杯篮球赛开始啦',time:'2021-1-21  13:00',type:'已结束'},
+      ]
+    }
+  },
+  methods:{
+    toDetail(){
+
+    }
+  }
+}
+</script>
+
+<style lang="scss">
+    .myActivities{
+      padding: 24rpx 32rpx;
+      .actItem{
+        padding: 32rpx 0 22rpx 0;
+        background: white;
+        border-radius: 16rpx;
+        margin-bottom: 24rpx;
+        .actTop{
+          display: flex;
+          align-items: center;
+          padding: 0 24rpx;
+          box-sizing: border-box;
+          .actImg{
+            width: 200rpx;
+            height: 144rpx;
+          }
+        }
+        .actRight{
+          display: flex;
+          flex-direction: column;
+          margin-left: 16rpx;
+          .actTitle{
+            color:#18172A;
+            font-size: 32rpx;
+            margin-bottom: 20rpx;
+            width: 380rpx;
+            overflow: hidden;
+            text-overflow: ellipsis;
+            white-space: nowrap;
+          }
+          .actTime2{
+            font-size: 24rpx;
+            color: #888888;
+            margin: 4rpx 0;
+          }
+        }
+        .actTime{
+          margin-top: 24rpx;
+          padding: 24rpx 32rpx 0 32rpx;
+          display: flex;
+          justify-content: space-between;
+          border-top: 1px solid #E8EDF5;
+          align-items: center;
+          .time{
+            color: #222222;
+            font-size: 28rpx;
+          }
+          .yjs{
+            background: rgba(163, 169, 177, 0.20);
+            color: #888888;
+            font-size: 28rpx;
+            border-radius: 4rpx;
+            width: 112rpx;
+            height: 48rpx;
+            display: flex;
+            align-items: center;
+            justify-content: center;
+          }
+          .dks{
+            background: rgba(3, 101, 249, 0.20);
+            color: rgba(3, 101, 249, 1);
+            font-size: 28rpx;
+            border-radius: 4rpx;
+            width: 112rpx;
+            height: 48rpx;
+            display: flex;
+            align-items: center;
+            justify-content: center;
+          }
+        }
+      }
+    }
+</style>

pages/subPackages/minePages/myCollection.vue

@@ -0,0 +1,47 @@
+<template>
+    <div class="myCollection">
+      <div class="collItem" v-for="item in 5">
+        <span class="collType">【园区通知】</span>
+        <span class="collTheme">主题主题主题主题主题主题主题主题主题主题主题主题主题主题主题主题主题主题主题主题主题主题主题主题主题</span>
+        <span class="collTime">2024-04-25  09:00</span>
+      </div>
+    </div>
+</template>
+
+<script>
+export default {
+  name: "myCollection"
+}
+</script>
+
+<style lang="scss">
+    .myCollection{
+      padding: 12rpx 0 50rpx 0;
+      .collItem{
+        width: 686rpx;
+        margin: 24rpx 32rpx;
+        background: white;
+        border-radius: 16rpx;
+        display: flex;
+        flex-direction: column;
+        padding: 32rpx 32rpx;
+        box-sizing: border-box;
+        .collType{
+          color: rgba(3, 101, 249, 1);
+          font-size: 28rpx;
+        }
+        .collTheme{
+          color: rgba(51, 51, 51, 1);
+          font-size: 28rpx;
+          line-height: 42rpx;
+          display: flex;
+          flex-wrap: wrap;
+          margin: 16rpx 0;
+        }
+        .collTime{
+          color:rgba(102, 102, 102, 1);
+          font-size: 28rpx;
+        }
+      }
+    }
+</style>

pages/subPackages/minePages/myOrder.vue

@@ -0,0 +1,131 @@
+<template>
+    <div class="myOrder">
+        <div class="myOrderItem" v-for="item in orderList">
+            <div class="myOrderItemTop">
+              <span class="myOrderItemTopLeft">
+                <img src="./image/frame.svg" class="frameIcon">
+                共享资源·会议室预约
+              </span>
+              <span :class="item.status==='等待审核'?'orgColor':item.status==='预定成功'?'greColor':'grayColor'">{{item.status}}</span>
+            </div>
+          <div class="orderTheme">{{item.theme}}</div>
+          <div class="myOrderItemBottom">
+            <div class="myOrderItemBottomLeft">
+              <span>订单号：202405061228</span>
+              <span>预约时间：2021-1-21  13:00</span>
+            </div>
+            <button class="cancelBtn" v-if="item.status!=='已取消'">去取消</button>
+          </div>
+          <div class="cancleBox" v-if="item.status==='已取消'">
+            取消原因：取消原因取消原因取消原因取消原因取消原因取消原因取消原因取消原因取消原因取消原因取消原因取消原因取消原因取消原因
+          </div>
+        </div>
+    </div>
+</template>
+
+<script>
+export default {
+  name: "myOrder",
+  data(){
+    return{
+      orderList:[
+        {theme:'会议主题会议主题会议主题会议主题会议主题会议主题会议主题会议主',status:'等待审核'},
+        {theme:'会议主题会议主题会议主题会议主题会议主题会议主题会议主题会议主',status:'预定成功'},
+        {theme:'会议主题会议主题会议主题会议主题会议主题会议主题会议主题会议主',status:'已取消'},
+      ]
+    }
+  }
+}
+</script>
+
+<style lang="scss">
+    .myOrder{
+      padding: 24rpx 32rpx;
+      .myOrderItem{
+        width: 686rpx;
+        padding: 32rpx 0;
+        border-radius: 16rpx;
+        background: white;
+        box-sizing: border-box;
+        margin-bottom: 24rpx;
+        .myOrderItemTop{
+          display: flex;
+          justify-content: space-between;
+          padding:0 32rpx 24rpx 32rpx;
+          border-bottom: 1px solid rgba(232, 237, 245, 1);
+          .myOrderItemTopLeft{
+            display: flex;
+            align-items: center;
+            color: rgba(102, 102, 102, 1);
+            font-size: 28rpx;
+            .frameIcon{
+              width: 28rpx;
+              height: 28rpx;
+              margin-right: 16rpx;
+            }
+          }
+          .orgColor{
+            font-size: 28rpx;
+            color: rgba(226, 81, 0, 1);
+          }
+          .greColor{
+            font-size: 28rpx;
+            color: rgba(34, 181, 101, 1);
+          }
+          .grayColor{
+            font-size: 28rpx;
+            color: rgba(136, 136, 136, 1);
+          }
+        }
+        .orderTheme{
+          padding: 16rpx 32rpx;
+          color: rgba(34, 34, 34, 1);
+          font-size: 32rpx;
+          line-height: 50rpx;
+          display: flex;
+          flex-wrap: wrap;
+          font-weight: 600;
+        }
+        .myOrderItemBottom{
+          display: flex;
+          align-items: center;
+          padding: 0 32rpx;
+          justify-content: space-between;
+          .myOrderItemBottomLeft{
+            display: flex;
+            flex-direction: column;
+            font-size: 28rpx;
+            color:rgba(136, 136, 136, 1);
+            line-height: 44rpx;
+          }
+          .cancelBtn{
+            background: linear-gradient( 316deg, #84AAFF 0%, #0365F9 100%);
+            width: 160rpx;
+            height: 60rpx;
+            border-radius: 32rpx;
+            display: flex;
+            align-items: center;
+            justify-content: center;
+            color: rgba(255, 255, 255, 1);
+            font-size: 28rpx;
+            &::after{
+              border: none;
+            }
+          }
+        }
+        .cancleBox{
+          font-size: 28rpx;
+          color:rgba(242, 25, 18, 1);
+          width: 622rpx;
+          background: rgba(245, 247, 250, 1);
+          padding: 24rpx;
+          box-sizing: border-box;
+          margin-left: 32rpx;
+          display: flex;
+          flex-wrap: wrap;
+          line-height: 40rpx;
+          margin-top: 16rpx;
+        }
+      }
+    }
+</style>

pages/subPackages/parkActivity/index.vue

@@ -0,0 +1,67 @@
+<template>
+   <div>
+     <div class="parkAct">
+       <div class="parkDynamicTab2">
+         <div
+             v-for="(item, index) in tabList"
+             :key="index"
+             class="tabItem"
+             :class="selectTab === item.name ? 'selectTabItem' : ''"
+             @click="clickTab(item)"
+         >
+           {{ item.name }}
+         </div>
+       </div>
+       <activity />
+     </div>
+   </div>
+</template>
+
+<script>
+import activity from "../../index/components/activity.vue";
+
+export default {
+  components: { activity },
+  name: "index",
+  data(){
+    return {
+      selectTab: "全部",
+      tabList: [
+        { name: "全部" },
+        { name: "培训" },
+        { name: "私募" },
+        { name: "法务" },
+        { name: "财税" },
+      ],
+    }
+  },
+  methods:{
+    clickTab(item) {
+      this.selectTab = item.name;
+    },
+  }
+}
+</script>
+
+<style lang="scss">
+.parkAct{
+  background: white;
+  box-sizing: border-box;
+  height: 1424rpx;
+  padding: 0 32rpx;
+  .parkDynamicTab2 {
+    display: flex;
+    padding: 24rpx 0;
+    margin-top: 24rpx;
+    .tabItem {
+      color: #666666;
+      font-size: 28rpx;
+      margin: 0 auto;
+    }
+    .selectTabItem {
+      color: #18172a;
+      border-bottom: 6rpx solid #034df7;
+    }
+  }
+}
+</style>

pages/subPackages/propertyNotice/index.vue

@@ -1,13 +1,13 @@
 <template>
     <div class="propertyNotice">
       <ul class="noticeUl">
-        <li class="noticeLi" v-for="item in noticeList" @click="toDetail(item)">
+        <li class="noticeLi" v-for="item in noticeList" @tap="toDetail(item)">
           <img :src="item.isRead?unReadImg:readImg" class="leftImg"/>
           <div class="rightBox">
             <span class="noticeTitle">{{item.title}}</span>
             <span class="noticeTimeBox">
               <span class="noticeTime">2024-06-18  19:34:06</span>
-              <van-icon name="like" :class="item.isLike?'likeIcon':'unLikeIcon'"/>
+              <van-icon name="like" :class="item.isLike?'likeIcon':'unLikeIcon'" @tap.stop="clickLike(item)"/>
             </span>
           </div>
         </li>
@@ -38,6 +38,9 @@ export default {
       uni.navigateTo({
         url: "/pages/subPackages/propertyNotice/detail?type=" + JSON.stringify(item),
       });
+    },
+    clickLike(item){
+      item.isLike = !item.isLike
     }
   }
 }

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

@@ -44,7 +44,15 @@
         "enterPriseBill/index",
         "enterPriseBill/detail",
         "propertyNotice/index",
-        "propertyNotice/detail"
+        "propertyNotice/detail",
+        "parkActivity/index",
+        "minePages/mineMessage",
+        "minePages/feedback",
+        "minePages/feedback_record",
+        "minePages/feedback_detail",
+        "minePages/myActivities",
+        "minePages/myCollection",
+        "minePages/myOrder"
       ],
       "network": "all"
     }