Переглянути джерело

待办事项页面修改/请求地址配置修改

fanghuisheng 2 роки тому
батько
коміт
c843ac80b9
4 змінених файлів з 27 додано та 18 видалено
  1. 1 1
      src/config.js
  2. 13 13
      src/pages/business/mhxf/needMatter/index.vue
  3. 12 3
      src/pages/login.vue
  4. 1 1
      vite.config.js

+ 1 - 1
src/config.js

@@ -1,6 +1,6 @@
 // 应用全局配置
 export default {
-  baseUrl: import.meta.env.MODE === "production" ? "http://"+window.location.host+"/prod-api" : "http://172.16.120.165:13200/prod-api",
+  baseUrl: import.meta.env.MODE === "production" ? "http://" + window.location.host + "/prod-api" : "http://172.16.120.165:13200/prod-api",
   websiteUrl: "https://qhome.usky.cn",
   // NODE_ENV=devlopment
   // 应用信息

+ 13 - 13
src/pages/business/mhxf/needMatter/index.vue

@@ -15,8 +15,8 @@
                 <u--image src="/static/images/needMatter/icon1.png" width="14px" height="15px"></u--image>
               </view>
               <view style="padding: 0 10px; white-space: nowrap; font-size: 16px">
-                <view>整改通知</view>
-                <view>整改期限:</view>
+                <view>待办通知</view>
+                <view>建议完成限期:</view>
                 <view style="font-size: 14px; color: #666666">{{ cl.reformId }}</view>
               </view>
               <view style="width: 100%; text-align: center; font-size: 16px">
@@ -27,7 +27,7 @@
                   }"
                 >
                   {{
-                    cl.reformStatus == 1 ? "已接收" : cl.reformStatus == 2 ? "整改中" : cl.reformStatus == 3 ? "整改完成" : cl.reformStatus == 4 ? "审核不通过" : cl.reformStatus == 5 ? "审核通过" : ""
+                    cl.reformStatus == 1 ? "已接收" : cl.reformStatus == 2 ? "进行中" : cl.reformStatus == 3 ? "待办完成" : cl.reformStatus == 4 ? "审核不通过" : cl.reformStatus == 5 ? "审核通过" : ""
                   }}
                 </view>
                 <view style="text-align: left">{{ cl.limitTime }}</view>
@@ -42,7 +42,7 @@
                   <view>序号</view>
                 </u-col>
                 <u-col span="5.5">
-                  <view>整改项</view>
+                  <view>待办项</view>
                 </u-col>
                 <u-col span="4.5">
                   <view>原因</view>
@@ -64,7 +64,7 @@
             <view v-if="cl.reformStatus == 1">
               <u-steps current="0" dot>
                 <u-steps-item style="text-align: center" title="已接收" :desc="cl.sendTime ? cl.sendTime.replace(' ', '\n') : ''"> </u-steps-item>
-                <u-steps-item style="text-align: center" title="整改中" :desc="cl.reformTime ? cl.reformTime.replace(' ', '\n') : ''"></u-steps-item>
+                <u-steps-item style="text-align: center" title="进行中" :desc="cl.reformTime ? cl.reformTime.replace(' ', '\n') : ''"></u-steps-item>
                 <u-steps-item style="text-align: center" title="待审核" :desc="cl.reviewTime ? cl.reviewTime.replace(' ', '\n') : ''"></u-steps-item>
               </u-steps>
 
@@ -76,7 +76,7 @@
             <view v-if="cl.reformStatus == 2">
               <u-steps current="1" dot>
                 <u-steps-item style="text-align: center" title="已接收" :desc="cl.sendTime ? cl.sendTime.replace(' ', '\n') : ''"> </u-steps-item>
-                <u-steps-item style="text-align: center" title="整改中" :desc="cl.reformTime ? cl.reformTime.replace(' ', '\n') : ''"></u-steps-item>
+                <u-steps-item style="text-align: center" title="进行中" :desc="cl.reformTime ? cl.reformTime.replace(' ', '\n') : ''"></u-steps-item>
                 <u-steps-item style="text-align: center" title="待审核" :desc="cl.reviewTime ? cl.reviewTime.replace(' ', '\n') : ''"></u-steps-item>
               </u-steps>
 
@@ -88,7 +88,7 @@
             <view v-if="cl.reformStatus == 3">
               <u-steps current="1" dot>
                 <u-steps-item style="text-align: center" title="已接收" :desc="cl.sendTime ? cl.sendTime.replace(' ', '\n') : ''"> </u-steps-item>
-                <u-steps-item style="text-align: center" title="整改完成" :desc="cl.reformTime ? cl.reformTime.replace(' ', '\n') : ''"></u-steps-item>
+                <u-steps-item style="text-align: center" title="待办完成" :desc="cl.reformTime ? cl.reformTime.replace(' ', '\n') : ''"></u-steps-item>
                 <u-steps-item style="text-align: center" title="待审核" :desc="cl.reviewTime ? cl.reviewTime.replace(' ', '\n') : ''"></u-steps-item>
               </u-steps>
             </view>
@@ -96,7 +96,7 @@
             <view v-if="cl.reformStatus == 4">
               <u-steps current="2" dot>
                 <u-steps-item style="text-align: center" title="已接收" :desc="cl.sendTime ? cl.sendTime.replace(' ', '\n') : ''"> </u-steps-item>
-                <u-steps-item style="text-align: center" title="整改完成" :desc="cl.reformTime ? cl.reformTime.replace(' ', '\n') : ''"></u-steps-item>
+                <u-steps-item style="text-align: center" title="待办完成" :desc="cl.reformTime ? cl.reformTime.replace(' ', '\n') : ''"></u-steps-item>
                 <u-steps-item style="text-align: center" title="审核不通过" :desc="cl.reviewTime ? cl.reviewTime.replace(' ', '\n') : ''" error></u-steps-item>
               </u-steps>
 
@@ -112,7 +112,7 @@
             <view v-if="cl.reformStatus == 5">
               <u-steps current="2" dot>
                 <u-steps-item style="text-align: center" title="已接收" :desc="cl.sendTime ? cl.sendTime.replace(' ', '\n') : ''"> </u-steps-item>
-                <u-steps-item style="text-align: center" title="整改完成" :desc="cl.reformTime ? cl.reformTime.replace(' ', '\n') : ''"></u-steps-item>
+                <u-steps-item style="text-align: center" title="待办完成" :desc="cl.reformTime ? cl.reformTime.replace(' ', '\n') : ''"></u-steps-item>
                 <u-steps-item style="text-align: center" title="审核通过" :desc="cl.reviewTime ? cl.reviewTime.replace(' ', '\n') : ''"></u-steps-item>
               </u-steps>
 
@@ -122,9 +122,9 @@
                   <view style="width: 100%">
                     <view style="display: flex" v-for="(i, index) in 5" :key="index">
                       <view>{{ cl["reformPathName" + (index + 1)] }}</view>
-                      <view style="margin: auto 0 auto auto">
+                      <!-- <view style="margin: auto 0 auto auto">
                         <u--image src="/static/images/needMatter/icon2.png" width="15px" height="15px"></u--image>
-                      </view>
+                      </view> -->
                     </view>
                   </view>
                 </view>
@@ -193,7 +193,7 @@ const list = ref([
   },
   {
     id: 2,
-    name: "整改中",
+    name: "进行中",
     badge: {
       // isDot: true,
       // value: 5,
@@ -201,7 +201,7 @@ const list = ref([
   },
   {
     id: 3,
-    name: "整改完成",
+    name: "待办完成",
     badge: {
       // value: 5,
     },

+ 12 - 3
src/pages/login.vue

@@ -73,7 +73,7 @@
 </template>
 
 <script setup>
-import { onLoad, onShow, onHide, onLaunch } from "@dcloudio/uni-app";
+import { onLoad, onShow, onHide, onLaunch, onReady } from "@dcloudio/uni-app";
 import { reactive, getCurrentInstance, toRefs, inject, watchEffect } from "vue";
 import { getToken, setToken, removeToken } from "@/utils/auth";
 import { getCodeImg, getMobileTenantConfig } from "@/api/login";
@@ -180,9 +180,10 @@ function env() {
   // }else{
   // }
 
+  console.log(window.location.host);
+
   //#ifdef H5
-  linkUrl.value =  window.location.host.indexOf("localhost") != -1 ? "localhost:81" : window.location.host
-;
+  linkUrl.value = window.location.host;
   // linkUrl.value = window.location.host;
   // linkUrl.value='ces.cn';
   // linkUrl.value='172.16.120.165:13203'
@@ -327,6 +328,14 @@ onLoad(() => {
     });
   }
 });
+
+// onReady(() => {
+//   //动态修改状态栏的颜色
+//   uni.setNavigationBarColor({
+//     frontColor: "#000000",
+//     backgroundColor: "#ff0000",
+//   });
+// });
 </script>
 
 <style>

+ 1 - 1
vite.config.js

@@ -9,7 +9,7 @@ export default defineConfig(({ mode, command }) => {
       hmr: true, //热更新
       host: true, //指定服务器
       open: true, //自动打开浏览器
-      port: 8080, //启动端口
+      port: 81, //启动端口
       proxy: {
         "/dev-api": {
           target: "http://172.16.120.165:13200",