浏览代码

我的快递模块完成/BUG修复

fanghuisheng 1 年之前
父节点
当前提交
bf5346294f

+ 10 - 0
src/api/business/fastMail.js

@@ -0,0 +1,10 @@
+import { request } from "@/utils/request";
+
+// 快递列表查询
+export function pageQuery(param) {
+    return request({
+        url: "/service-park/dataStHistory/pageQuery",
+        method: "GET",
+        data: param,
+    });
+}

+ 1 - 1
src/components/oa-calendar/uni-calendar.vue

@@ -26,7 +26,7 @@
 
         <view style="display: flex">
           <view style="margin: 0px 10px">
-            <span style="margin-right: 5px">合格</span>
+            <span style="margin-right: 5px">巡检</span>
             <span style="color: #00cdac">{{ JSON.stringify(currentDateList) === "{}" ? 0 : currentDateList.patrolledCount }}</span>
           </view>
           <view class="margin-left-xs">

+ 2 - 2
src/config.js

@@ -15,7 +15,7 @@ export default {
     // 应用名称
     name: "usky-app-mobile",
     // 应用版本
-    version: "2.0.0",
+    version: uni.getSystemInfoSync().appVersion,
     // 应用logo
     logo: "/static/logo.png",
     // 官网邮箱
@@ -25,7 +25,7 @@ export default {
     // 官方网站
     site_url: "http://www.usky.cn/",
     // 版权
-    copyright:"Copyright © 2021- 2025 Usky. All Rights Reserved. 永天股份 版权所有",
+    copyright: "Copyright © 2021- 2025 Usky. All Rights Reserved. 永天股份 版权所有",
     // 政策协议
     agreements: [
       {

+ 13 - 0
src/pages.json

@@ -599,6 +599,19 @@
           }
         }
       ]
+    },
+    // 业务模块
+    {
+      "root": "pages/business",
+      "pages": [
+        {
+          "path": "fastMail/index",
+          "style": {
+            "navigationBarTitleText": "我的快递",
+            "enablePullDownRefresh": false
+          }
+        }
+      ]
     }
   ],
   "globalStyle": {

+ 220 - 0
src/pages/business/fastMail/index.vue

@@ -0,0 +1,220 @@
+<template>
+  <u-sticky class="shadow-default" bgColor="#fff" style="top: 0">
+    <u-tabs :list="tabsList" :current="tabsCurrent" @click="tabsClick" lineColor="#333" :activeStyle="{ color: '#333' }" :inactiveStyle="{ color: '#909399' }" :scrollable="false"></u-tabs>
+  </u-sticky>
+
+  <oa-scroll
+    customClass="fastMail-container scroll-height"
+    :pageSize="pageSize"
+    :total="total"
+    :refresherLoad="true"
+    :refresherEnabled="true"
+    :refresherDefaultStyle="'none'"
+    :refresherThreshold="44"
+    :refresherBackground="'#f5f6f7'"
+    @load="load"
+    @refresh="refresh"
+    :data-theme="'theme-' + proxy.$settingStore.themeColor.name"
+  >
+    <view v-show="tabsCurrent == 0">
+      <view class="content-area menu-list mlr0" v-for="data in dataList" :key="data">
+        <view class="list-cell" style="color: #666666; line-height: 30px">
+          <view class="content-area-top menu-item-box"> </view>
+          <view class="content-area-row_wrap menu-item-box">
+            <view class="content-area-row_wrap-view" style="margin-right: auto">
+              <view class="mr5" style="font-weight: 600">{{ data.pickupCode }}</view>
+              <view class="iconfont ucicon-a-copy menu-icon" @click="copy(data.pickupCode)"> </view>
+            </view>
+            <view class="content-area-row_wrap-view" style="min-width: auto; max-width: 50%">
+              {{ data.pickupAddress }}
+            </view>
+            <view class="content-area-row_wrap-view" style="margin-right: auto">
+              <image class="mr5" style="width: 15px; height: 15px; margin: auto 0" mode="widthFix" src="@/static/images/common/ydkd.png" />
+              韵达快递:{{ data.packNo }}
+            </view>
+            <view class="content-area-row_wrap-view" style="min-width: auto">
+              <view class="iconfont ucicon-dial menu-icon mr0" @click="proxy.$common.makePhoneCall(data.contactPhone)"> </view>
+            </view>
+            <view class="content-area-row_wrap-view">{{ data.dataTime ? data.dataTime.replace("T", " ") : "" }}</view>
+          </view>
+        </view>
+      </view>
+    </view>
+
+    <view v-show="tabsCurrent == 1">
+      <view class="content-area menu-list mlr0" v-for="data in dataList" :key="data">
+        <view class="list-cell" style="color: #666666; line-height: 30px">
+          <view class="content-area-top menu-item-box"> </view>
+          <view class="content-area-row_wrap menu-item-box">
+            <view class="content-area-row_wrap-view" style="margin-right: auto">
+              <view class="mr5" style="font-weight: 600">{{ data.pickupCode }}</view>
+              <view class="iconfont ucicon-a-copy menu-icon" @click="copy(data.pickupCode)"> </view>
+            </view>
+            <view class="content-area-row_wrap-view" style="min-width: auto; max-width: 50%">
+              {{ data.pickupAddress }}
+            </view>
+            <view class="content-area-row_wrap-view" style="margin-right: auto">
+              <image class="mr5" style="width: 15px; height: 15px; margin: auto 0" mode="widthFix" src="@/static/images/common/ydkd.png" />
+              韵达快递:{{ data.packNo }}
+            </view>
+            <view class="content-area-row_wrap-view" style="min-width: auto">
+              <view class="iconfont ucicon-dial menu-icon mr0" @click="proxy.$common.makePhoneCall(data.contactPhone)"> </view>
+            </view>
+            <view class="content-area-row_wrap-view">{{ data.dataTime ? data.dataTime.replace("T", " ") : "" }}</view>
+          </view>
+        </view>
+      </view>
+    </view>
+  </oa-scroll>
+</template>
+
+<script setup>
+import config from "@/config";
+import storage from "@/utils/storage";
+import { onLoad, onShow, onReady, onHide, onLaunch, onNavigationBarButtonTap, onPageScroll } from "@dcloudio/uni-app";
+import { ref, reactive, computed, getCurrentInstance, toRefs, inject } from "vue";
+import { useStores, commonStores } from "@/store/modules/index";
+
+import { pageQuery } from "@/api/business/fastMail.js";
+
+const { proxy } = getCurrentInstance();
+const commonStore = commonStores();
+
+const dataList = ref([]);
+const pageSize = ref(20);
+const current = ref(1);
+const total = ref(0);
+
+const data = reactive({
+  tabsList: [
+    {
+      name: "待取件",
+    },
+    {
+      name: "已取件",
+    },
+  ],
+  tabsCurrent: 0,
+});
+
+const { tabsList, tabsCurrent } = toRefs(data);
+
+/**
+ * @页面初始化
+ */
+function init() {
+  pageQueryApi();
+}
+
+function pageQueryApi() {
+  pageQuery({
+    pageNum: current.value,
+    pageSize: pageSize.value,
+    pickupStatus: tabsCurrent.value,
+  }).then((res) => {
+    if (res.data.records.length > 0) {
+      dataList.value = res.data.records;
+      total.value = res.data.total;
+    }
+  });
+}
+
+/**
+ * @复制粘贴板
+ */
+function copy(value) {
+  // 触发方法
+  proxy.$common.uniCopy({
+    content: value,
+    success: (res) => {
+      uni.showToast({
+        title: res,
+        icon: "none",
+      });
+    },
+    error: (e) => {
+      uni.showToast({
+        title: e,
+        icon: "none",
+        duration: 3000,
+      });
+    },
+  });
+}
+
+/**
+ * @tabs点击事件
+ */
+function tabsClick(e) {
+  tabsCurrent.value = e.index;
+  pageQueryApi();
+}
+
+/**
+ * @scrollView加载数据
+ */
+function load() {
+  pageSize.value += 10;
+  init();
+}
+
+/**
+ * @scrollView刷新数据
+ */
+function refresh() {
+  pageSize.value = 20;
+  total.value = 0;
+  init();
+}
+
+onLoad((options) => {
+  init();
+});
+
+onReady(() => {});
+
+onShow(() => {
+  //调用系统主题颜色
+  proxy.$settingStore.systemThemeColor([1]);
+});
+
+// 自定义导航事件
+onNavigationBarButtonTap((e) => {
+  if (e.float == "right") {
+  }
+});
+</script>
+
+<style lang="scss" scoped>
+:deep(.uni-page-head__title) {
+  opacity: 1 !important;
+}
+
+.fastMail-container {
+  .content-area {
+    &-top {
+      font-size: 16px;
+      font-weight: 600;
+      color: #000000;
+    }
+
+    &-row_wrap {
+      font-size: 13px;
+      flex-flow: row wrap;
+
+      &-view {
+        display: flex;
+        min-width: 50%;
+        white-space: nowrap;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        > .iconfont {
+          font-size: 14px;
+          color: #909399;
+          margin-left: 5px;
+        }
+      }
+    }
+  }
+}
+</style>

+ 3 - 6
src/pages/business/mhxf/xunJian/plan/components/content.vue

@@ -61,6 +61,9 @@
         </view>
       </view>
     </view>
+
+    <view style="margin-bottom: 125px" v-if="xunJianStore.inspectionStatus == 1"></view>
+
     <view class="app-button-fixed" v-if="xunJianStore.inspectionStatus == 1">
       <view class="app-flex">
         <u-button class="app-buttom" style="margin-right: 15px" shape="circle" @click="buttonClick(1)"> 上一步 </u-button>
@@ -225,9 +228,3 @@ onShow(() => {
 
 onMounted(() => {});
 </script>
-
-<style lang="scss">
-.xunjian-plan-content {
-  padding-bottom: 125px;
-}
-</style>

+ 5 - 0
src/pages/business/mhxf/xunJian/plan/index.vue

@@ -326,6 +326,11 @@ function tabPositionChange(index) {
 }
 
 onLoad((options) => {
+  if (options.planTabs) {
+    xunJianStore.planTabs = parseInt(options.planTabs);
+    tabPosition.value = parseInt(options.planTabs);
+  }
+
   currentApi();
   activitiesApi();
 

+ 2 - 2
src/pages/index.vue

@@ -83,7 +83,7 @@
               <!-- <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: 12px">{{ item.meta.title }}</text>
+              <text style="font-size: 12px">{{ item.meta.aliasTitle ? item.meta.aliasTitle : item.meta.title }}</text>
             </view>
           </view>
         </view>
@@ -97,7 +97,7 @@
               <!-- <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: 12px">{{ item.meta.title }}</text>
+              <text style="font-size: 12px">{{ item.meta.aliasTitle ? item.meta.aliasTitle : item.meta.title }}</text>
             </view>
           </view>
         </view>

二进制
src/static/images/common/ydkd.png


+ 1 - 1
src/uni_modules/c-progress-circle/components/c-progress-circle/c-progress-circle.vue

@@ -9,7 +9,7 @@
 		</view>
 		<view class="cneter-box">
 			<slot>
-				{{progress*100}}%
+				{{(progress*100).toFixed(2)}}%
 			</slot>
 		</view>
 	</view>