单位信息采集/页面BUG修复/打包配置BUG修复

src/components/calendar/calendar.vue

@@ -3,13 +3,7 @@
     <view class="ul">
       <view class="li">
         <view class="flex1">
-          <picker
-            mode="date"
-            :value="start_date"
-            :start="start_date"
-            :end="other"
-            @change="bindDateChange"
-          >
+          <picker mode="date" :value="start_date" :start="start_date" :end="other" @change="bindDateChange">
             <view class="date">{{ start_date }}</view>
           </picker>
         </view>
@@ -17,12 +11,7 @@
       ~
       <view class="li">
         <view class="flex1">
-          <picker
-            mode="date"
-            :value="start_date"
-            :start="start_date"
-            @change="bindDateChange2"
-          >
+          <picker mode="date" :value="start_date" :start="start_date" @change="bindDateChange2">
             <view class="date">{{ end_date }}</view>
           </picker>
         </view>
@@ -32,46 +21,47 @@
   </view>
 </template>
 
-<script>
-export default {
-  data() {
-    const currentDate = this.getDate({
-      format: true,
-    });
-    return {
-      start_date: "请选择开始日期",
-      end_date: "请选择结束日期",
-      other: "请输入",
-    };
-  },
-  computed: {},
-  methods: {
-    // 选择日期
-    bindDateChange: function (e) {
-      this.start_date = e.target.value;
-    },
-    bindDateChange2: function (e) {
-      this.end_date = e.target.value;
-      this.other = this.end_date;
-    },
-    // 获取当前时间
-    getDate(type) {
-      const date = new Date();
-      let year = date.getFullYear();
-      let month = date.getMonth() + 1;
-      let day = date.getDate();
+<script setup>
+import { onLoad, onShow, onHide, onLaunch } from "@dcloudio/uni-app";
+import { ref, onMounted, inject, shallowRef, reactive, toRefs } from "vue";
+
+const currentDate = getDate({
+  format: true,
+});
+
+const data = reactive({
+  start_date: "请选择开始日期",
+  end_date: "请选择结束日期",
+  other: "请输入",
+});
+
+const { start_date, end_date, other } = toRefs(data);
+
+// 选择日期
+function bindDateChange(e) {
+  start_date.value = e.target.value;
+}
+function bindDateChange2(e) {
+  end_date.value = e.target.value;
+  other.value = end_date.value;
+}
+// 获取当前时间
+function getDate(type) {
+  const date = new Date();
+  let year = date.getFullYear();
+  let month = date.getMonth() + 1;
+  let day = date.getDate();
+
+  if (type === "start") {
+    year = year - 60;
+  } else if (type === "end") {
+    year = year + 2;
+  }
+  month = month > 9 ? month : "0" + month;
+  day = day > 9 ? day : "0" + day;
+  return `${year}-${month}-${day}`;
+}
 
-      if (type === "start") {
-        year = year - 60;
-      } else if (type === "end") {
-        year = year + 2;
-      }
-      month = month > 9 ? month : "0" + month;
-      day = day > 9 ? day : "0" + day;
-      return `${year}-${month}-${day}`;
-    },
-  },
-};
 </script>
 
 <style>

src/config.js

@@ -9,7 +9,7 @@ export default {
     // 应用名称
     name: "usky-app-mobile",
     // 应用版本
-    version: "1.0.0",
+    version: "2.0.0",
     // 应用logo
     logo: "/static/logo.png",
     // 官方网站

src/manifest.json

@@ -1,6 +1,6 @@
 {
     "name" : "智慧消防",
-    "appid" : "__UNI__D9E08B3",
+    "appid" : "__UNI__36DE3A0",
     "description" : "智慧消防",
     "versionName" : "2.0",
     "versionCode" : 2,
@@ -179,4 +179,4 @@
     },
     "vueVersion" : "3",
     "locale" : "zh-Hans"
-}
+}

src/pages.json

@@ -390,7 +390,7 @@
     "list": [
       {
         "name": "", //模式名称
-        "path": "pages/index/index", //启动页面，必选
+        "path": "pages/index", //启动页面，必选
         "query": "" //启动参数，在页面的onLoad函数里面得到
       }
     ]

src/pages/analyse/analyse.vue

@@ -1,5 +1,5 @@
 <template>
-  <view class="analyse-wrapper" style="height: 100%; background-color: #f5f6f7">
+  <view class="analyse-wrapper" style="height: 100%">
     <view class="justify-center align-center text-center">
       <u-image src="@/static/images/analyse/analyse-bg.png" width="100%" height="273rpx" :showLoading="false" :fade="false"></u-image>
     </view>
@@ -54,9 +54,10 @@ export default {
 };
 </script>
 
-<style>
-body {
-  background: #fff;
+<style scoped>
+uni-page-body,
+uni-page-refresh {
+  background-color: #f5f6f7;
 }
 </style>
 

src/pages/business/mhxf/coordination/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <web-view ref="amapView" src="/../static/amap/1.html" bindmessage="receiveMessage"></web-view>
+  <web-view ref="amapView" src="/static/amap/1.html" bindmessage="receiveMessage"></web-view>
 </template>
 
 <script setup>

src/pages/business/mhxf/informationSelect/index.vue

@@ -655,7 +655,7 @@ body {
 }
 
 .informationSelect {
-  height: calc(100% - 45px);
+  height: calc(100vh - 45px);
   background-color: #ffffff;
   .content1 {
     .u-row {

src/pages/business/mhxf/unitInfoCollection/index.vue

@@ -1,76 +1,230 @@
 <template>
-  <view style="padding: 10px">
-    <view class="" style="padding: 10px; background: #ffffff">
-      <u--form :model="form" ref="uForm" :rules="rules" labelWidth="130" labelAlign="right">
-        <u-form-item label="组织机构代码:" prop="name" required>
-          <u-input v-model="form.name" />
-        </u-form-item>
-        <u-form-item label="单位名称:" prop="name" required>
-          <u-input v-model="form.name" />
-        </u-form-item>
-        <u-form-item label="法人代表:" prop="name" required>
-          <u-input v-model="form.name" />
-        </u-form-item>
-        <u-form-item label="单位地址:" prop="name" required>
-          <u-input v-model="form.name" />
-        </u-form-item>
-        <u-form-item label="详细地址:" prop="name" required>
-          <u-input v-model="form.name" />
-        </u-form-item>
-        <u-form-item label="消防管理人电话:" prop="name" required>
-          <u-input v-model="form.name" />
-        </u-form-item>
-        <u-form-item label="成立时间:" prop="name" required>
-          <u-input v-model="form.name" />
-        </u-form-item>
-        <u-form-item label="消防安全责任人:" prop="name">
-          <u-input v-model="form.name" />
-        </u-form-item>
-        <u-form-item label="消防安全管理人:" prop="name">
-          <u-input v-model="form.name" />
-        </u-form-item>
-        <u-form-item label="职工人数:" prop="name">
-          <u-input v-model="form.name" />
-        </u-form-item>
-        <u-form-item label="固定资产(万元）:" prop="name">
-          <u-input v-model="form.name" />
-        </u-form-item>
-        <u-form-item label="占地面积:" prop="name">
-          <u-input v-model="form.name" />
-        </u-form-item>
-        <u-form-item label="建筑面积:" prop="name">
-          <u-input v-model="form.name" />
-        </u-form-item>
-      </u--form>
-      <u-button @click="submit">提交</u-button>
+  <view id="unitInfoCollection">
+    <view>
+      <u-notice-bar :text="noticeBarText" :duration="7000" color="#FF0000" bgColor="#FFFFFF"></u-notice-bar>
     </view>
+
+    <view class="centerOne" v-if="pagingBool">
+      <view style="color: #333333; text-align: center; margin-top: 10px"> 单位基本信息（1/2） </view>
+
+      <view style="padding: 10px 0">
+        <view class="" style="padding: 10px 10px 20px 10px; background: #ffffff">
+          <u--form :model="form" ref="uForm" :rules="rules" labelWidth="130" style="padding-left: 9px">
+            <u-form-item label="组织机构代码" prop="name1" required :borderBottom="true">
+              <u-input v-model="form.name1" placeholder="请输入组织机构代码" border="none" />
+            </u-form-item>
+            <u-form-item label="单位名称" prop="name2" required :borderBottom="true">
+              <u-input v-model="form.name2" placeholder="请输入单位名称" border="none" />
+            </u-form-item>
+            <u-form-item label="法人代表" prop="name3" required :borderBottom="true">
+              <u-input v-model="form.name3" placeholder="请输入法人代表" border="none" />
+            </u-form-item>
+            <u-form-item label="单位地址" prop="name4" required :borderBottom="true" @click="handleAction('单位地址')">
+              <u-input
+                v-model="form.name4"
+                placeholder="请选择单位地址"
+                border="none"
+                suffixIcon="arrow-right"
+                :suffixIconStyle="addDisabled ? 'color: #c0c4cc' : 'color: #909399'"
+                :color="addDisabled ? '#c0c4cc' : ''"
+                :disabled="addDisabled"
+              />
+            </u-form-item>
+            <u-form-item label="详细地址" prop="name5" required :borderBottom="true">
+              <u-input v-model="form.name5" placeholder="请输入详细地址" border="none" />
+            </u-form-item>
+            <u-form-item label="消防管理人电话" prop="name6" required :borderBottom="true">
+              <u-input v-model="form.name6" placeholder="请输入消防管理人电话" border="none" />
+            </u-form-item>
+            <u-form-item label="成立时间" prop="name7" required :borderBottom="true" @click="showTime = true">
+              <u-input v-model="form.name7" placeholder="请选择成立时间" border="none" suffixIcon="calendar" suffixIconStyle="color: #909399;font-size:22px" />
+            </u-form-item>
+            <u-form-item label="消防安全责任人" prop="name8" :borderBottom="true">
+              <u-input v-model="form.name8" placeholder="请输入消防安全责任人" border="none" />
+            </u-form-item>
+            <u-form-item label="消防安全管理人" prop="name9" :borderBottom="true">
+              <u-input v-model="form.name9" placeholder="请输入消防安全管理人" border="none" />
+            </u-form-item>
+            <u-form-item label="职工人数" prop="name10" :borderBottom="true">
+              <u-input type="digit" v-model="form.name10" placeholder="请输入职工人数" suffixIcon="人" suffixIconStyle="color:#999999;font-size:15px" border="none" />
+            </u-form-item>
+            <u-form-item label="固定资产(万元）" prop="name11" :borderBottom="true">
+              <u-input type="number" v-model="form.name11" placeholder="请输入固定资产(万元）" suffixIcon="万元" suffixIconStyle="color:#999999;font-size:15px" border="none" />
+            </u-form-item>
+            <u-form-item label="占地面积" prop="name12" :borderBottom="true">
+              <u-input type="number" v-model="form.name12" placeholder="请输入占地面积" suffixIcon="平方米" suffixIconStyle="color:#999999;font-size:15px" border="none" />
+            </u-form-item>
+            <u-form-item label="总建筑面积" prop="name13" :borderBottom="true">
+              <u-input type="number" v-model="form.name13" placeholder="请输入总建筑面积" suffixIcon="平方米" suffixIconStyle="color:#999999;font-size:15px" border="none" />
+            </u-form-item>
+          </u--form>
+
+          <view style="position: fixed; left: 0; right: 0; bottom: 0; padding: 15px">
+            <view>
+              <u-button type="primary" style="width: 100%; height: 40px; font-size: 14px" @click="nextSubmit" shape="circle"> 下一步 </u-button>
+            </view>
+          </view>
+        </view>
+      </view>
+    </view>
+
+    <view class="centerTwo" v-else>
+      <view style="color: #333333; text-align: center; margin-top: 10px"> 所在建筑信息（2/2） </view>
+
+      <view style="padding: 10px 0" v-for="(li, index) in form.list" :key="index">
+        <view class="" style="padding: 10px 10px 20px 10px; background: #ffffff">
+          <view style="overflow: hidden"><u-icon name="trash" color="#FF0000" size="20" style="float: right"></u-icon></view>
+
+          <u--form :model="li" ref="uForm" :rules="rules" labelWidth="130" style="padding-left: 9px">
+            <u-form-item label="建筑地址" prop="li.name1" required :borderBottom="true">
+              <u-input v-model="li.name1" placeholder="请输入建筑地址" border="none" />
+            </u-form-item>
+            <u-form-item label="建筑结构" prop="li.name2" required :borderBottom="true" @click="handleAction('建筑结构', index)">
+              <u-input v-model="li.name2" placeholder="请选择建筑结构" border="none" suffixIcon="arrow-right" :suffixIconStyle="'color: #909399'" />
+            </u-form-item>
+            <u-form-item label="地上层数" prop="li.name3" required :borderBottom="true">
+              <u-input v-model="li.name3" placeholder="请输入地上层数" border="none" />
+            </u-form-item>
+            <u-form-item label="地下层数" prop="li.name4" required :borderBottom="true">
+              <u-input v-model="li.name4" placeholder="请输入地下层数" border="none" />
+            </u-form-item>
+            <u-form-item label="建筑面积" prop="li.name5" required :borderBottom="true">
+              <u-input v-model="li.name5" placeholder="请输入建筑面积" suffixIcon="平方米" suffixIconStyle="color:#999999;font-size:15px" border="none" />
+            </u-form-item>
+            <u-form-item label="地下空间" prop="li.name6" required :borderBottom="true">
+              <u-input v-model="li.name6" placeholder="请输入地下空间面积" suffixIcon="平方米" suffixIconStyle="color:#999999;font-size:15px" border="none" />
+            </u-form-item>
+            <u-form-item label="使用性质" prop="li.name7" required :borderBottom="true" @click="handleAction('使用性质', index)">
+              <u-input v-model="li.name7" placeholder="请选择使用性质" border="none" suffixIcon="arrow-right" :suffixIconStyle="'color: #909399'" />
+            </u-form-item>
+            <u-form-item label="建成年份" prop="li.name8" required :borderBottom="true" @click="showTime = true">
+              <u-input v-model="li.name8" placeholder="请选择建成年份" border="none" suffixIcon="calendar" suffixIconStyle="color: #909399;font-size:22px" />
+            </u-form-item>
+            <u-form-item label="建筑高度" prop="li.name9" required :borderBottom="true">
+              <u-input v-model="li.name9" placeholder="请输入建筑高度" border="none" />
+            </u-form-item>
+          </u--form>
+        </view>
+      </view>
+
+      <view style="padding-bottom: 125px">
+        <u-button type="primary" style="width: 25%; height: 25px; margin-top: 10px" @click="addSubmit" shape="circle" icon="plus" size="mini"> 添加建筑 </u-button>
+      </view>
+
+      <view style="position: fixed; left: 0; right: 0; bottom: 0; padding: 15px; background-color: #f1f1f1">
+        <view>
+          <u-button type="primary" style="width: 100%; height: 40px; font-size: 14px; margin-bottom: 15px" @click="backSubmit" shape="circle"> 上一步 </u-button>
+
+          <u-button type="primary" style="width: 100%; height: 40px; font-size: 14px" @click="submit" shape="circle"> 提交 </u-button>
+        </view>
+      </view>
+    </view>
+
+    <u-action-sheet :show="actionShow" :actions="actionsList" :title="'请选择' + actionTitle" @close="actionShow = false" @select="selectAction"> </u-action-sheet>
+
+    <u-datetime-picker :show="showTime" v-model="Timevalue" mode="date" @close="showTime = false" @cancel="showTime = false" @confirm="timeSubmit" :closeOnClickOverlay="true"></u-datetime-picker>
   </view>
 </template>
 
 <script setup>
-import { onLoad, onShow, onHide, onLaunch } from "@dcloudio/uni-app";
+import { onLoad, onShow, onHide, onLaunch, onReady } from "@dcloudio/uni-app";
 import { ref, onMounted, inject, shallowRef, reactive, toRefs } from "vue";
 
+import publicStore from "@/store/modules/public.js";
+
+const newPublicStore = publicStore();
+
 const dataList = reactive({
   form: {
-    name: "",
+    name1: "",
+    name2: "",
+    name3: "",
+    name4: "上海市闵行区",
+    name5: "",
+    name6: "",
+    name7: "",
+    name8: "",
+    name9: "",
+    name10: "",
+    name11: "",
+    name12: "",
+    name13: "",
+
+    list: [
+      {
+        name1: "",
+        name2: "砖混结构",
+        name3: "",
+        name4: "",
+        name5: "",
+        name6: "",
+        name7: "",
+        name8: "",
+        name9: "",
+      },
+      {
+        name1: "",
+        name2: "砖混结构",
+        name3: "",
+        name4: "",
+        name5: "",
+        name6: "",
+        name7: "",
+        name8: "",
+        name9: "",
+      },
+    ],
   },
   rules: {
-    name: [
+    name1: [
       {
         required: true,
-        message: "请输入姓名",
+        message: "请输入组织机构代码",
         trigger: ["blur", "change"],
       },
+      {
+        type: "string",
+        min: 18,
+        required: true,
+        message: "请输入18位组织机构代码",
+        trigger: ["change"],
+      },
     ],
+
+    name4: [],
+
+    name7: [],
   },
+  noticeBarText: "注：信息提交后不可修改，提交前请核对填写是否有误",
+  pagingBool: false,
+  addDisabled: true,
+
+  actionIndex: 0,
+  actionTitle: "",
+  actionShow: false,
+  actionsList: [],
+  showTime: false,
+  Timevalue: Number(new Date()),
 });
 
-const { form, rules } = toRefs(dataList);
+const { form, rules, noticeBarText, pagingBool, addDisabled, actionTitle, actionIndex, actionsList, actionShow, showTime, Timevalue } = toRefs(dataList);
 
 const uForm = ref(null);
 
-function submit() {
+/**
+ * @添加建筑
+ * @按钮点击事件
+ */
+function addSubmit() {}
+
+/**
+ * @下一步
+ * @按钮点击事件
+ */
+function nextSubmit() {
+  console.log(form.value);
+  pagingBool.value = false;
+
   uForm.value
     .validate()
     .then((res) => {
@@ -80,6 +234,122 @@ function submit() {
       uni.$u.toast("校验失败");
     });
 }
+
+/**
+ * @上一步
+ * @按钮点击事件
+ */
+function backSubmit() {
+  pagingBool.value = true;
+}
+
+/**
+ * @提交
+ * @按钮点击事件
+ */
+function submit() {}
+
+/**
+ * @action弹出框点击事件
+ */
+function handleAction(value, index) {
+  console.log(value)
+
+  if (value == "单位地址") {
+    if (!addDisabled.value) {
+      actionShow.value = true;
+      actionsList.value = [
+        {
+          name: "上海市闵行区",
+        },
+      ];
+      actionTitle.value = "单位地址";
+    }
+  } else if (value == "建筑结构") {
+    actionShow.value = true;
+    actionsList.value = [
+      {
+        value: 1,
+        name: "砖混结构",
+      },
+      {
+        value: 2,
+        name: "钢筋混凝土",
+      },
+      {
+        value: 3,
+        name: "钢结构",
+      },
+      {
+        value: 4,
+        name: "大型钢筋混凝土",
+      },
+      {
+        value: 5,
+        name: "木质结构",
+      },
+      {
+        value: 6,
+        name: "砖木结构",
+      },
+    ];
+    actionTitle.value = "建筑结构";
+    actionIndex.value = index;
+  } else if (value == "使用性质") {
+    actionShow.value = true;
+    actionsList.value = [
+      {
+        value: 1,
+        name: "砖混结构",
+      },
+      {
+        value: 2,
+        name: "钢筋混凝土",
+      },
+      {
+        value: 3,
+        name: "钢结构",
+      },
+      {
+        value: 4,
+        name: "大型钢筋混凝土",
+      },
+      {
+        value: 5,
+        name: "木质结构",
+      },
+      {
+        value: 6,
+        name: "砖木结构",
+      },
+    ];
+    actionTitle.value = "使用性质";
+    actionIndex.value = index;
+  }
+}
+
+/**
+ * @action弹出框选择事件
+ */
+function selectAction(e) {
+  console.log(e);
+
+  form.value.name4 = e.name;
+}
+
+/**
+ * @时间选择器
+ * @确定按钮事件
+ */
+function timeSubmit(data) {
+  let time = newPublicStore.formatterDate(data.value);
+  let timeData = time.split(" ")[0];
+  form.value.name7 = timeData;
+  showTime.value = false;
+}
 </script>
 
-<style lang="scss"></style>
+<style lang="scss">
+#unitInfoCollection {
+}
+</style>

src/pages/business/mhxf/xunJian/record/record.vue

@@ -25,7 +25,7 @@
 </template>
 
 <script setup>
-import json from "@/data/json.js";
+import json from "@/static/js/json.js";
 
 import { onReady, onLoad, onShow, onNavigationBarButtonTap } from "@dcloudio/uni-app";
 import { ref, onMounted, inject, shallowRef, reactive } from "vue";

src/pages/index.vue

@@ -117,14 +117,14 @@
 
       <!-- 宫格列表 -->
       <view class="section2 section bg-white" style="margin-bottom: 10px" v-if="arrayList.recentlyUsed.length > 0">
-        <view style="color: #000000; font-size: 16px; padding: 10px 10px 5px 10px">最近使用</view>
+        <view style="color: #000000; font-size: 14px; padding: 10px 10px 5px 10px">最近使用</view>
         <view class="cu-list grid col-5 no-border">
           <view class="cu-item justify-center align-center" @tap="navItemClick(item)" v-for="(item, index) in arrayList.recentlyUsed" :key="index">
             <image :src="item.imgUrl" style="width: 40px; height: 40px"></image>
             <view class="cu-tag badge" v-if="item.badge != 0">
               <block v-if="item.badge != 0">{{ item.badge > 99 ? "99+" : item.badge }}</block>
             </view>
-            <text style="font-size: 14px">{{ item.name }}</text>
+            <text style="font-size: 13px">{{ item.name }}</text>
           </view>
         </view>
       </view>
@@ -132,14 +132,14 @@
 
       <!-- 宫格列表 -->
       <view class="section2 section bg-white">
-        <view style="color: #000000; font-size: 16px; padding: 10px 10px 5px 10px">常用功能</view>
+        <view style="color: #000000; font-size: 14px; padding: 10px 10px 5px 10px">常用功能</view>
         <view class="cu-list grid col-5 no-border">
           <view class="cu-item justify-center align-center" @tap="navItemClick(item)" v-for="(item, index) in arrayList.cuIconList" :key="index">
             <image :src="item.imgUrl" style="width: 40px; height: 40px"></image>
             <view class="cu-tag badge" v-if="item.badge != 0">
               <block v-if="item.badge != 0">{{ item.badge > 99 ? "99+" : item.badge }}</block>
             </view>
-            <text style="font-size: 14px">{{ item.name }}</text>
+            <text style="font-size: 13px">{{ item.name }}</text>
           </view>
         </view>
       </view>
@@ -155,11 +155,12 @@ import json from "@/static/js/json.js"; //引入api请求封装方法
 import * as jwx from "@/utils/jssdk.js"; //引入js sdk的封装
 
 import { onReady, onLoad, onShow, onNavigationBarButtonTap } from "@dcloudio/uni-app";
-import { ref, onMounted, inject, shallowRef, reactive } from "vue";
+import { ref, onMounted, inject, shallowRef, reactive, getCurrentInstance } from "vue";
 import useXunJianStore from "@/store/modules/xunJian.js";
 
 import { scan_push, getHomePageData, getFunctionalModuleStatistics } from "@/api/index";
 
+
 const settingsStore = useXunJianStore(); //全局变量值Store
 const BASE_URL = inject("$BASE_URL");
 
@@ -426,7 +427,11 @@ onNavigationBarButtonTap((e) => {
 });
 </script>
 
-<style>
+<style lang="scss">
+page {
+  background-color: #f5f6f7;
+}
+
 .select-items {
   overflow: auto;
   height: 80vh;
@@ -494,11 +499,4 @@ li {
   margin: 0;
   list-style: none;
 }
-</style>
-
-<style scoped>
-uni-page-body,
-uni-page-refresh {
-  background: rgb(241, 241, 241);
-}
-</style>
+</style>

src/pages/info/info.vue

@@ -1,10 +1,10 @@
 <template>
-  <view class="info-wrapper" style="height: 100%; background-color: #f5f6f7">
+  <view class="info-wrapper" style="height: 100%">
     <view class="justify-center align-center text-center">
-      <u-image src="@/static/images/info/info-bg.png" width="100%" height="273rpx" :showLoading="false" :fade="false"></u-image>
+      <u-image src="@/static/images/info/info-bg.png" width="100%" height="292rpx" :showLoading="false" :fade="false"></u-image>
     </view>
 
-    <scroll-view scroll-y style="height: calc(100% - 273rpx)">
+    <scroll-view scroll-y style="height: calc(100% - 292rpx)">
       <view class="cu-list menu-avatar padding-lr-sm padding-top-sm">
         <view class="cu-item margin-bottom-sm" @tap="goFireBase()">
           <view class="cu-avatar">
@@ -66,13 +66,11 @@ function goPushList() {
 }
 </script>
 
-<style>
-body {
-  background: #fff;
+<style lang="scss">
+page {
+  background-color: #f5f6f7;
 }
-</style>
 
-<style lang="scss">
 //消息页面
 .image-bg {
   width: 100%;

src/pages/info/pushList/pushList.vue

@@ -56,7 +56,7 @@
 </template>
 
 <script setup>
-import json from "../../../data/json.js";
+import json from "@/static/js/json.js";
 import { onLoad, onShow, onHide, onLaunch } from "@dcloudio/uni-app";
 import { ref, onMounted, inject, shallowRef, reactive, toRefs } from "vue";
 

src/pages/setting/funReport/funReport.vue

@@ -74,7 +74,7 @@
 </template>
 
 <script setup>
-import json from "../../../data/json.js";
+import json from "@/static/js/json.js";
 import { onLoad, onShow, onHide, onLaunch, onReachBottom, onNavigationBarButtonTap } from "@dcloudio/uni-app";
 import { ref, onMounted, inject, shallowRef, reactive, toRefs, watchEffect } from "vue";
 

src/store/modules/public.js

@@ -139,7 +139,21 @@ const publicStore = defineStore("public", {
       console.log("After" + context);
     },
   },
-  actions: {},
+  actions: {
+    formatterDate(time3) {
+      var date = new Date(time3);
+      var Y = date.getFullYear() + "-";
+      var M = (date.getMonth() + 1 < 10 ? "0" + (date.getMonth() + 1) : date.getMonth() + 1) + "-";
+      var D = (date.getDate() < 10 ? "0" + date.getDate() : date.getDate()) + " ";
+
+      var h = (date.getHours() < 10 ? "0" + date.getHours() : date.getHours()) + ":";
+      var m = (date.getMinutes() < 10 ? "0" + date.getMinutes() : date.getMinutes()) + ":";
+      var s = date.getSeconds() < 10 ? "0" + date.getSeconds() : date.getSeconds();
+      var strDate = Y + M + D + h + m + s;
+
+      return strDate;
+    },
+  },
 });
 
 export default publicStore;