update: 增加启动页优化

src/App.vue

@@ -1,7 +1,18 @@
 <script setup lang="ts">
 import { onLaunch, onShow, onHide } from "@dcloudio/uni-app";
+const isFirstLaunch = ref(true);
 onLaunch(() => {
-  console.log("App Launch");
+  console.log(uni.getStorageSync("hasLaunched"))
+  // 当应用启动时，检查是否已显示过启动页
+  if (Boolean(uni.getStorageSync("hasLaunched"))) {
+    // 如果已显示过，不再显示启动页
+    isFirstLaunch.value = false;
+    console.log('不再显示启动页')
+  } else {
+    // 如果未显示过，标记为已显示，并保存到存储
+    uni.setStorageSync("hasLaunched", true);
+    uni.redirectTo({url: 'pagesLaunch/index'})
+  }
 });
 onShow(() => {
   console.log("App Show");
@@ -12,9 +23,9 @@ onHide(() => {
 </script>
 
 <style lang="scss">
-	/* 注意要写在第一行，同时给style标签加入lang="scss"属性 */
+/* 注意要写在第一行，同时给style标签加入lang="scss"属性 */
-	@import "uview-plus/index.scss";
+@import "uview-plus/index.scss";
-  body {
+body {
-    font-size: 12px;
+  font-size: 12px;
-  }
+}
 </style>

src/PagesStatistics/receivePanel.vue

@@ -1,19 +1,19 @@
 <template>
   <view class="layout-box">
     <view class="filter">
-      <up-input
+      <u-input
         v-model="state.startTime"
         disabled
         disabledColor=""
         placeholder="请选择开始时间"
-      ></up-input>
+      ></u-input>
       <text>-</text>
-      <up-input
+      <u-input
         v-model="state.endTime"
         disabled
         disabledColor=""
         placeholder="请选择结束时间"
-      ></up-input>
+      ></u-input>
       <u-icon
         name="arrow-down"
         @click="handleDialog('showTime', true)"
@@ -63,7 +63,7 @@
             <view class="num highlight">{{
               formatMoney(state.summary.totalPayment)
             }}</view>
-            <view>结算金额/元</view>
+            <view>付款金额/元</view>
           </view>
         </up-col>
         <up-col span="4">
@@ -71,7 +71,7 @@
             <view class="num">{{
               formatMoney(state.summary.totalPaidPrice)
             }}</view>
-            <view>实收金额</view>
+            <view>实付金额</view>
           </view>
         </up-col>
         <up-col span="4">
@@ -269,7 +269,7 @@ onMounted(() => {
     font-family: Source Han Sans CN;
     font-size: 28rpx;
     color: #000000;
-    ::v-deep .up-input {
+    ::v-deep .u-input {
       padding: 0rpx 16.03rpx !important;
       input {
         font-family: Source Han Sans CN;

src/PagesStatistics/shipmentPanel.vue

@@ -1,19 +1,19 @@
 <template>
   <view class="layout-box">
     <view class="filter">
-      <up-input
+      <u-input
         v-model="state.startTime"
         disabled
         disabledColor=""
         placeholder="请选择开始时间"
-      ></up-input>
+      ></u-input>
       <text>-</text>
-      <up-input
+      <u-input
         v-model="state.endTime"
         disabled
         disabledColor=""
         placeholder="请选择结束时间"
-      ></up-input>
+      ></u-input>
       <u-icon
         name="arrow-down"
         @click="handleDialog('showTime', true)"
@@ -266,7 +266,7 @@ onMounted(() => {
     font-family: Source Han Sans CN;
     font-size: 28rpx;
     color: #000000;
-    ::v-deep .up-input {
+    ::v-deep .u-input {
       padding: 0rpx 16.03rpx !important;
       input {
         font-family: Source Han Sans CN;

src/manifest.json

@@ -1,7 +1,7 @@
 {
-  "name": "",
+  "name": "在生万有",
   // 应用标识 由DCloud 云端分配 （安卓 ios）
-  "appid": "",
+  "appid": "__UNI__898003A",
   "description": "",
   "versionName": "1.0.0",
   "versionCode": "100",

src/pagesApp/receiveDetail.vue

@@ -20,10 +20,24 @@
         ><u-icon name="arrow-down"></u-icon
       ></view>
       <view @click="state.isShowStatus = true"
-        ><text>单据状态</text><u-icon name="arrow-down"></u-icon
+        ><text>{{
+          state.currentScaleStatus === -1
+            ? "单据状态"
+            : getScaleStatus(state.currentScaleStatus)
+        }}</text
+        ><u-icon name="arrow-down"></u-icon
       ></view>
       <view @click="state.isShowSort = true"
-        ><text>排序</text><u-icon name="arrow-down"></u-icon
+        ><text>{{
+          state.currentSortName === undefined
+            ? "排序"
+            : `按${
+                state.currentSortName === "create_time"
+                  ? "创建时间"
+                  : "更新时间"
+              }降序`
+        }}</text
+        ><u-icon name="arrow-down"></u-icon
       ></view>
       <view class="btn" @click="handleDialog('showFilter', true)">筛选</view>
     </view>
@@ -201,6 +215,10 @@ const state = reactive({
   ],
   isShowSort: false,
   sortList: [
+    {
+      name: "全部",
+      key: undefined,
+    },
     {
       name: "按创建时间降序",
       key: "create_time",

src/pagesApp/receiveSpl.vue

@@ -32,7 +32,12 @@
           :customStyle="{}"
           border="none"
           :disabled="item.disabled || item.type === 'select'"
-          :disabledColor="['补单时间','站点磅秤','供应商','收货产品'].indexOf(item.name) > -1?'#ffffff':'#f5f7fa'"
+          :disabledColor="
+            ['补单时间', '站点磅秤', '供应商', '收货产品'].indexOf(item.name) >
+            -1
+              ? '#ffffff'
+              : '#f5f7fa'
+          "
           @change="(e:any) => {handleInput(e, item)}"
           @clear="handleClear(item)"
         >
@@ -47,6 +52,16 @@
         </up-input>
         <!-- @afterRead="afterRead"
           @delete="deletePic" -->
+
+        <!-- <up-upload
+          v-if="item.type === 'upload'"
+          :fileList="model1.order.fileLists"
+          @delete="handleDelete"
+          name="1"
+          multiple
+          :maxCount="10"
+        ></up-upload> -->
+
         <uni-file-picker
           v-if="item.type === 'upload'"
           v-model="model1.order.fileLists"
@@ -131,9 +146,9 @@ import SupplierDialog from "./components/SupplierDialog.vue";
 import ProductDialog from "./components/ProductDialog.vue";
 import valid from "@/utils/validate";
 
-const handleClear = (item:any) => {
+const handleClear = (item: any) => {
-  (model1.order as any)[item.key] = '';
+  (model1.order as any)[item.key] = "";
-}
+};
 // 供应商选择
 const showDialog = <
   {
@@ -226,7 +241,7 @@ const model1 = reactive<any>({
     splTime: "",
     subtractType: 1,
     netWeight: 0,
-    totalPrice: 0
+    totalPrice: 0,
   },
 });
 const rules = reactive({
@@ -436,7 +451,9 @@ watch(
       预估总价： 结算单价*结算重量
       实际收入：实际结算金额-运费-杂费
      */
-    model1.order.netWeight = ((parseFloat(grossWeightNew) || 0) - (parseFloat(tareNew) || 0)).toFixed(2);
+    model1.order.netWeight = (
+      (parseFloat(grossWeightNew) || 0) - (parseFloat(tareNew) || 0)
+    ).toFixed(2);
     if (model1.order.buttonType === 0) {
       if (model1.order.subtractNum) {
         model1.order.netWeight =
@@ -450,7 +467,7 @@ watch(
     }
     model1.order.totalPrice =
       (model1.order.price || 0) * (model1.order.netWeight || 0);
-      // 货款金额默认=预估总价，当系统自动算出预估总价时，值需同步
+    // 货款金额默认=预估总价，当系统自动算出预估总价时，值需同步
     model1.order.balanceTotalPrice = model1.order.totalPrice;
   }
 );
@@ -599,7 +616,7 @@ const startSave = () => {
     if (res.code === 200) {
       model1.order.id = res.data;
       upload();
-      uni.navigateBack()
+      uni.navigateBack();
     }
   });
 };

src/pagesApp/shipmentDetail.vue

@@ -20,10 +20,24 @@
         ><u-icon name="arrow-down"></u-icon
       ></view>
       <view @click="state.isShowStatus = true"
-        ><text>单据状态</text><u-icon name="arrow-down"></u-icon
+        ><text>{{
+          state.currentScaleStatus === -1
+            ? "单据状态"
+            : getScaleStatus(state.currentScaleStatus)
+        }}</text
+        ><u-icon name="arrow-down"></u-icon
       ></view>
       <view @click="state.isShowSort = true"
-        ><text>排序</text><u-icon name="arrow-down"></u-icon
+        ><text>{{
+          state.currentSortName === undefined
+            ? "排序"
+            : `按${
+                state.currentSortName === "create_time"
+                  ? "创建时间"
+                  : "更新时间"
+              }降序`
+        }}</text
+        ><u-icon name="arrow-down"></u-icon
       ></view>
       <view class="btn" @click="handleDialog('showFilter', true)">筛选</view>
     </view>
@@ -92,8 +106,14 @@
               <text v-if="cItem.name">{{ cItem.name }}：</text
               ><text
                 >{{ cItem.isBefore ? cItem.unit : "" }}
-                <text v-if="item[cItem.enName as string] === DeliveryMethod.Deliver">送货</text>
+                <text
-                <text v-if="item[cItem.enName as string] === DeliveryMethod.SelfPickup">自提</text>
+                  v-if="item[cItem.enName as string] === DeliveryMethod.Deliver"
+                  >送货</text
+                >
+                <text
+                  v-if="item[cItem.enName as string] === DeliveryMethod.SelfPickup"
+                  >自提</text
+                >
                 {{ cItem.isBefore ? "" : cItem.unit }}
               </text>
             </block>
@@ -183,7 +203,7 @@ const state = reactive({
   currentSortName: undefined,
   isShowStatus: false,
   statusList: [
-  {
+    {
       name: "全部",
       key: -1,
     },
@@ -210,6 +230,10 @@ const state = reactive({
   ],
   isShowSort: false,
   sortList: [
+    {
+      name: "全部",
+      key: undefined,
+    },
     {
       name: "按创建时间降序",
       key: "create_time",

src/pagesLaunch/index.vue

@@ -10,7 +10,9 @@
   >
     <swiper-item v-for="(item, index) in list" :key="index">
       <view class="image-box">
-        <image :src="`https://backend-common.obs.cn-east-3.myhuaweicloud.com/static/pagesLaunch/${item.imgUrl}`"></image>
+        <image
+          :src="`https://backend-common.obs.cn-east-3.myhuaweicloud.com/static/pagesLaunch/${item.imgUrl}`"
+        ></image>
         <view class="title">
           {{ item.title }}
         </view>
@@ -22,6 +24,9 @@
   </swiper>
 </template>
 <script setup lang="ts">
+import { useMemberStore } from "@/store/index";
+const store = useMemberStore();
+const profile = store.profile;
 const list = [
   {
     title: "智能回收   智慧未来！",
@@ -41,9 +46,16 @@ const list = [
   },
 ];
 const start = () => {
-  uni.navigateTo({
+  // 若当前存在token 直接跳到首页 若不存在则跳转登录页
-    url: "/pagesLogin/login/index", // 要跳转到的页面路径
+  if (profile.token) {
-  });
+    uni.navigateTo({
+      url: "/pagesHome/index", // 要跳转到的页面路径
+    });
+  } else {
+    uni.navigateTo({
+      url: "/pagesLogin/login/index", // 要跳转到的页面路径
+    });
+  }
 };
 </script>
 <style lang="scss" scoped>

src/pagesLogin/login/forgetPwd.vue

@@ -13,68 +13,67 @@
           :key="index"
           :prop="`userInfo.${item.modelName}`"
         >
-          <view v-if="item.type === 'text'">
+          <u-input
-            <up-input
+            v-if="item.type === 'text'"
-              v-model="model1.userInfo[`${item.modelName}`]"
+            v-model="model1.userInfo[`${item.modelName}`]"
-              :placeholder="item.placeholder"
+            :placeholder="item.placeholder"
-              :shape="'circle'"
+            :shape="'circle'"
-              clearable
+            clearable
-              :customStyle="{
+            :customStyle="{
-                'border-color':
+              'border-color':
-                  currentFocus === item.modelName ? '#00dcee !important' : '',
+                currentFocus === item.modelName ? '#00dcee !important' : '',
-              }"
+            }"
-              @focus="handleFocus(item.modelName)"
+            @focus="handleFocus(item.modelName)"
-              @blur="handleFocus('')"
+            @blur="handleFocus('')"
-              @change="(e:any) => {handleInput(e, item.modelName)}"
+            @change="(e:any) => {handleInput(e, item.modelName)}"
-              @clear="handleClear(item)"
+            @clear="handleClear(item)"
-            >
+          >
-              <template #suffix>
+            <template #suffix>
-                <text v-if="item.modelName === 'code'" class="code-btn">
+              <text v-if="item.modelName === 'code'" class="code-btn">
-                  <text
+                <text
-                    v-if="seconds === 0"
+                  v-if="seconds === 0"
-                    @click="handleCode"
+                  @click="handleCode"
-                    class="code-primary"
+                  class="code-primary"
-                    >获取验证码</text
+                  >获取验证码</text
-                  >
+                >
-                  <text v-else
+                <text v-else
-                    >剩余<text class="code-primary">{{ seconds }}秒</text></text
+                  >剩余<text class="code-primary">{{ seconds }}秒</text></text
-                  >
+                >
-                </text>
+              </text>
-              </template>
+            </template>
-            </up-input>
+          </u-input>
-          </view>
+
-          <view v-if="item.type === 'password'">
+          <u-input
-            <up-input
+            v-if="item.type === 'password'"
-              v-model="model1.userInfo[`${item.modelName}`]"
+            v-model="model1.userInfo[`${item.modelName}`]"
-              :placeholder="item.placeholder"
+            :placeholder="item.placeholder"
-              :shape="'circle'"
+            :shape="'circle'"
-              clearable
+            clearable
-              :password="!item.isShowPwd"
+            :password="!item.isShowPwd"
-              :customStyle="{
+            :customStyle="{
-                'border-color':
+              'border-color':
-                  currentFocus === item.modelName ? '#00dcee !important' : '',
+                currentFocus === item.modelName ? '#00dcee !important' : '',
-              }"
+            }"
-              @focus="handleFocus(item.modelName)"
+            @focus="handleFocus(item.modelName)"
-              @blur="handleFocus('')"
+            @blur="handleFocus('')"
-              @change="(e:any) => {handleInput(e, item.modelName)}"
+            @change="(e:any) => {handleInput(e, item.modelName)}"
-              @clear="handleClear(item)"
+            @clear="handleClear(item)"
-            >
+          >
-              <template #suffix>
+            <template #suffix>
-                <image
+              <image
-                  v-if="!item.isShowPwd"
+                v-if="!item.isShowPwd"
-                  :src="`https://backend-common.obs.cn-east-3.myhuaweicloud.com/static/pagesLogin/login/hide.png`"
+                :src="`https://backend-common.obs.cn-east-3.myhuaweicloud.com/static/pagesLogin/login/hide.png`"
-                  class="custom-icon"
+                class="custom-icon"
-                  @click="item.isShowPwd = true"
+                @click="item.isShowPwd = true"
-                ></image>
+              ></image>
-                <image
+              <image
-                  v-else
+                v-else
-                  :src="`https://backend-common.obs.cn-east-3.myhuaweicloud.com/static/pagesLogin/login/show.png`"
+                :src="`https://backend-common.obs.cn-east-3.myhuaweicloud.com/static/pagesLogin/login/show.png`"
-                  class="custom-icon"
+                class="custom-icon"
-                  @click="item.isShowPwd = false"
+                @click="item.isShowPwd = false"
-                ></image>
+              ></image>
-              </template>
+            </template>
-            </up-input>
+          </u-input>
-          </view>
         </u-form-item>
       </u-form>
 
@@ -85,7 +84,7 @@
           :customStyle="{
             'border-radius': '43rpx',
           }"
-          >保存并登录</u-button
+          >保存</u-button
         >
       </view>
     </template>
@@ -96,9 +95,9 @@
 import { ProfileApi } from "@/services/index";
 import LoginLayout from "./components/loginLayout.vue";
 import valid from "@/utils/validate";
-const handleClear = (item:any) => {
+const handleClear = (item: any) => {
-  (model1.userInfo as any)[item.modelName] = '';
+  (model1.userInfo as any)[item.modelName] = "";
-}
+};
 const loginForm = ref(null);
 const model1 = <any>reactive({
   userInfo: {

src/pagesLogin/message/index.vue

@@ -14,6 +14,23 @@
       <view class="u-page">
         <u-list :height="'auto'">
           <u-list-item v-for="(item, index) in pageList.list" :key="index">
+            <!-- #ifdef H5 -->
+            <view class="msg-content">
+              <view class="u-slot-title" @click="handleItem(item)">
+                <view>
+                  <view class="u-cell-text title"
+                    >{{ item.title }}
+                    <text class="title-badge" v-if="item.status === 0"> </text>
+                  </view>
+                  <view class="u-cell-text desc">{{ item.content }}</view>
+                </view>
+              </view>
+              <view>
+                <text class="u-slot-value time">{{ item.createTime }}</text>
+              </view>
+            </view>
+            <!-- #endif -->
+            <!-- #ifdef APP-PLUS || MP-WEIXIN -->
             <u-cell @click="handleItem(item)">
               <view slot="title" class="u-slot-title">
                 <view>
@@ -24,10 +41,12 @@
                   <view class="u-cell-text desc">{{ item.content }}</view>
                 </view>
               </view>
+
               <template #value>
                 <text class="u-slot-value time">{{ item.createTime }}</text>
               </template>
             </u-cell>
+            <!-- #endif -->
           </u-list-item>
         </u-list>
       </view>
@@ -108,11 +127,17 @@ const handleItem = (item: any) => {
           });
           return;
         } else {
-          if (res.data.list[0].scaleStatus === ScaleStatus.ToBePriced &&  MsgType.ToBePriced === item.msgType) {
+          if (
+            res.data.list[0].scaleStatus === ScaleStatus.ToBePriced &&
+            MsgType.ToBePriced === item.msgType
+          ) {
             uni.navigateTo({
               url: "/pagesReceive/pricing?scaleStatus=0", // 要跳转到的页面路径
             });
-          } else if (res.data.list[0].scaleStatus === ScaleStatus.ToBeReview && MsgType.ToBeReview === item.msgType) {
+          } else if (
+            res.data.list[0].scaleStatus === ScaleStatus.ToBeReview &&
+            MsgType.ToBeReview === item.msgType
+          ) {
             uni.navigateTo({
               url: "/pagesReceive/payReview?scaleStatus=2", // 要跳转到的页面路径
             });
@@ -142,12 +167,16 @@ const handleItem = (item: any) => {
           });
           return;
         } else {
-          if (res.data.list[0].scaleStatus === ScaleStatus.ToBeShipment && MsgType.ToBeShipment === item.msgType) {
+          if (
+            res.data.list[0].scaleStatus === ScaleStatus.ToBeShipment &&
+            MsgType.ToBeShipment === item.msgType
+          ) {
             uni.navigateTo({
               url: "/pagesShipment/shipmenting?scaleStatus=0", // 要跳转到的页面路径
             });
           } else if (
-            res.data.list[0].scaleStatus === ScaleStatus.ToBeShipmentReview && MsgType.ToBeShipmentReview === item.msgType
+            res.data.list[0].scaleStatus === ScaleStatus.ToBeShipmentReview &&
+            MsgType.ToBeShipmentReview === item.msgType
           ) {
             uni.navigateTo({
               url: "/pagesShipment/shipmentSettlement?scaleStatus=2", // 要跳转到的页面路径
@@ -202,5 +231,11 @@ onMounted(() => {
     font-weight: 400;
     color: #999999;
   }
+
+  // h5样式
+  .msg-content {
+    padding: 30rpx;
+    border-bottom: 1px solid rgba(0,0,0, 0.2);
+  }
 }
 </style>

src/pagesReceive/review/index.vue

@@ -61,7 +61,9 @@
       </view>
 
       <view class="more">
-        <view v-if="getIsShow()"> 收货单号：{{ state.order.receiptNumber }} </view>
+        <view v-if="getIsShow()">
+          收货单号：{{ state.order.receiptNumber }}
+        </view>
         <view v-if="getIsShow()"></view>
         <view v-for="(item, index) in gridList1" :key="index">
           <text v-if="item.name">{{ item.name }}：</text
@@ -70,7 +72,10 @@
             {{ item.num }}
             {{ item.isBefore ? "" : item.unit }}
             <text
-              v-if="item.name === '货款金额' && ScaleStatus.ToBeReview === state.order.scaleStatus"
+              v-if="
+                item.name === '货款金额' &&
+                ScaleStatus.ToBeReview === state.order.scaleStatus
+              "
               @click="handleEdit()"
               :style="{
                 color: 'rgba(0, 220, 238, 1)',
@@ -78,7 +83,7 @@
                 'border-radius': '20rpx',
                 fontSize: '12px',
                 padding: '1px 10px',
-                marginLeft: '10rpx'
+                marginLeft: '10rpx',
               }"
             >
               编辑
@@ -215,7 +220,7 @@ const state = reactive<{
   [attrName: string]: any;
 }>({
   order: {
-    carNumber: ''
+    carNumber: "",
   },
   sheetList: [
     {
@@ -289,7 +294,9 @@ const handleScenePhoto = (id: any) => {
 };
 // 审核暂不支付 // 更新状态为3
 const handleReviewNoPay = () => {
-  ReceiveApi.updateOne({ ...state.order, scaleStatus: 3 }).then((res) => {
+  ReceiveApi.updateOrderIn({
+    orderInPos: [{ ...state.order, scaleStatus: 3 }],
+  }).then((res) => {
     if (res.code === 200) {
       uni.redirectTo({
         url: "/pagesReceive/payReview?scaleStatus=3", // 要跳转到的页面路径
@@ -327,10 +334,15 @@ const handleSelect = (key: string, v: any) => {
   contrlModalParams[key].isShow = false;
   if (key === "paySelect") {
     // 修改订单状态
-    ReceiveApi.updateOne({
+
-      ...state.order,
+    ReceiveApi.updateOrderIn({
-      scaleStatus: 4,
+      orderInPos: [
-      paymentMethod: v.key,
+        {
+          ...state.order,
+          scaleStatus: 4,
+          paymentMethod: v.key,
+        },
+      ],
     }).then((res) => {
       if (res.code === 200) {
         uni.showToast({
@@ -369,7 +381,11 @@ const handleUpdateOrder = () => {
 };
 // 重新过皮
 const handleReWeight = () => {
-  ReceiveApi.reTare({ id: state.order.id, userId: state.order.userId, deviceId: state.order.deviceId }).then((res) => {
+  ReceiveApi.reTare({
+    id: state.order.id,
+    userId: state.order.userId,
+    deviceId: state.order.deviceId,
+  }).then((res) => {
     if (res.code === 200) {
       uni.redirectTo({
         url: "/pagesReceive/pricing?scaleStatus=1", // 要跳转到的页面路径
@@ -387,7 +403,7 @@ onLoad((option) => {
     ReceiveApi.getDetailById({ id: state.order.id }).then((res) => {
       if (res.code === 200) {
         state.order = res.data;
-        gridList1.map((item:any) => {
+        gridList1.map((item: any) => {
           if (item.name === "扣杂" || item.name === "扣点") {
             if (state.order.buttonType === 0) {
               item.name = "扣杂";
@@ -403,12 +419,11 @@ onLoad((option) => {
             if (state.order[item.enName as string]) {
               item.num = state.order[item.enName as string];
             } else {
-              item.num = state.order['totalPrice'];
+              item.num = state.order["totalPrice"];
             }
           } else {
             item.num = state.order[item.enName as string];
           }
-          
         });
       }
     });

tsconfig.json

@@ -2,7 +2,7 @@
   "extends": "@vue/tsconfig/tsconfig.json",
   "compilerOptions": {
     "ignoreDeprecations": "5.0",
-    "sourceMap": true,
+    "sourceMap": false,
     "baseUrl": "./",
     "paths": {
       "@/*": ["src/*"]