Merge remote-tracking branch 'origin/main'

collect_information/src/pages/police/mine/index.vue

@@ -1,6 +1,6 @@
 <template>
   <view>
-    警察我的
+    警察我的444
   </view>
 </template>
 

collect_information/src/pages/projectManager/mine/index.scss

@@ -0,0 +1,71 @@
+.mine {
+  height: 100vh;
+  background-color: #fff;
+}
+.mine-container {
+  height: 320rpx;
+  display: flex;
+  align-items: center;
+  background-image: url('../../../assets/images/banner.png');
+  background-repeat: no-repeat;
+  background-position: right;
+  overflow: hidden;
+  padding: 45rpx;
+  box-sizing: border-box;
+  .contacts {
+    height: 75rpx;
+    width: 75rpx;
+    border-radius: 50%;
+    border: solid 1px gray;
+    .image {
+      width: 100%;
+      height: 100%;
+    }
+  }
+  .tips-text {
+    display: flex;
+    font-size: 28rpx;
+    color: #fff;
+    line-height: 50rpx;
+    margin-left: 20rpx;
+    flex-direction: column;
+    justify-content: space-evenly;
+  }
+}
+.exit {
+  height: 100rpx;
+  line-height: 40px;
+  border-bottom: solid 0.5px #ebebf7;
+  box-sizing: border-box;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  color: #7d7d7d;
+  .exitItem {
+    display: flex;
+    align-items: center;
+    margin-left: 30rpx;
+  }
+  .exitItemIndex {
+    height: 40rpx;
+    width: 40rpx;
+    border-radius: 50%;
+    display: block;
+    line-height: 48rpx;
+    image {
+      width: 100%;
+      height: 100%;
+    }
+  }
+  .microscope {
+    width: 8px;
+    height: 8px;
+    display: inline-block;
+    border: solid 2px #ccc;
+    -webkit-transform: rotate(45deg);
+    transform: rotate(45deg);
+    border-bottom: white;
+    border-left: white;
+  }
+}
+

collect_information/src/pages/projectManager/mine/index.vue

@@ -1,9 +1,55 @@
 <template>
-  <view>
-    项目经理我的
+  <view class="mine">
+    <view class="mine-container" >
+      <view class="contacts">
+        <image src="@/assets/logo/avatar1.png" mode="scaleToFill" class="image" />
+      </view>
+      <view class="tips-text">
+        <view style="font-size: 15px;">名字</view>
+        <view style="font-size: 12px;">
+          <text style="margin-right: 5px">教育部门 </text>
+          <text>未选择学校</text>
+        </view>
+      </view>
+    </view>
+    <!-- 用户信息 -->
+    <view class="userIndex">
+      <view class="exit"  v-for="item in datalist" :key="item.value">
+        <view class="exitItem">
+<!--          <view class="exitItemIndex">-->
+<!--            <image :src="item.url" mode="scaleToFill" class="image" />-->
+<!--          </view>-->
+          <text style="margin-left: 30rpx;font-size: 12px;">{{ item.name }}</text>
+        </view>
+        <view style="margin-right: 40rpx">
+          <text class="microscope"></text>
+        </view>
+      </view>
+    </view>
+<!--    退出弹框-->
   </view>
 </template>
 
 <script setup lang="ts">
+import './index.scss'
+import {ref} from "vue";
 
+const datalist = ref([
+  {
+    value: 1,
+    name: '小程序简介',
+  },
+  {
+    value: 0,
+    name: '退出登录',
+  },
+  {
+    value: 2,
+    name: '修改用户信息',
+  },
+  {
+    value: 3,
+    name: '意见收集',
+  },
+])
 </script>

collect_information/src/subPages/police/myEnterprisesUnit/projectDetails/projectDetails.vue

@@ -95,7 +95,6 @@ useLoad(async (options) => {
   await projectDetailsTable()
 })
 const projectDetailsTable = async () => {
-  // if (total.value === projectData.value.length) return
   Taro.showLoading({
     title: '加载中',
   })

collect_information/src/subPages/projectManager/myProject/projectDetails/projectDetails.vue

@@ -5,7 +5,7 @@
         <view style="display: flex;justify-content: space-between">
           <text style="font-size: 18px">{{ enterprisesUnitName }}-----{{ serviceProject?.name }}
           </text>
-          <text>进行中</text>
+<!--          <text>进行中</text>-->
         </view>
         <view>
           <view style="float: left;width: 50%;" class="content">

securityManagement/.env.development

@@ -11,5 +11,5 @@ VITE_APP_PROXY_URL=http://172.10.10.93:8765
 VITE_APP_RSA_PUBLIC_KEY=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDJps/EXxxSpEM1Ix4R0NWIOBciHCr7P7coDT8tNKfelgR7txcJOqHCO/MIWe7T04aHQTcpQxqx9hMca7dbqz8TZpz9jvLzE/6ZonVKxHsoFnNlHMp1/CPAJ9f6D9wYicum2KltJkmQ0g//D9W2zPCYoGOmSRFcZx/KEBa4EM53jQIDAQAB
 
 # minio
-VITE_APP_MINIO_URL=http://118.253.177.137:9000
+VITE_APP_MINIO_URL=https://www.hnjinglian.cn:9000
 VITE_APP_MINIO_BUCKET=police-security-dev