Revert "update: 增加启动页优化"

This reverts commit 5743217148.

src/App.vue

@@ -1,18 +1,7 @@
 <script setup lang="ts">
 import { onLaunch, onShow, onHide } from "@dcloudio/uni-app";
-const isFirstLaunch = ref(true);
 onLaunch(() => {
-  console.log(uni.getStorageSync("hasLaunched"))
+  console.log("App Launch");
-  // 当应用启动时，检查是否已显示过启动页
-  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");
@@ -23,9 +12,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;
-}
+  }
 </style>

src/PagesStatistics/receivePanel.vue

@@ -1,19 +1,19 @@
 <template>
   <view class="layout-box">
     <view class="filter">
-      <u-input
+      <up-input
         v-model="state.startTime"
         disabled
         disabledColor=""
         placeholder="请选择开始时间"
-      ></u-input>
+      ></up-input>
       <text>-</text>
-      <u-input
+      <up-input
         v-model="state.endTime"
         disabled
         disabledColor=""
         placeholder="请选择结束时间"
-      ></u-input>
+      ></up-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 .u-input {
+    ::v-deep .up-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">
-      <u-input
+      <up-input
         v-model="state.startTime"
         disabled
         disabledColor=""
         placeholder="请选择开始时间"
-      ></u-input>
+      ></up-input>
       <text>-</text>
-      <u-input
+      <up-input
         v-model="state.endTime"
         disabled
         disabledColor=""
         placeholder="请选择结束时间"
-      ></u-input>
+      ></up-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 .u-input {
+    ::v-deep .up-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": "__UNI__898003A",
+  "appid": "",
   "description": "",
   "versionName": "1.0.0",
   "versionCode": "100",

src/pagesApp/receiveDetail.vue

@@ -20,24 +20,10 @@
         ><u-icon name="arrow-down"></u-icon
       ></view>
       <view @click="state.isShowStatus = true"
-        ><text>{{
+        ><text>单据状态</text><u-icon name="arrow-down"></u-icon
-          state.currentScaleStatus === -1
-            ? "单据状态"
-            : getScaleStatus(state.currentScaleStatus)
-        }}</text
-        ><u-icon name="arrow-down"></u-icon
       ></view>
       <view @click="state.isShowSort = true"
-        ><text>{{
+        ><text>排序</text><u-icon name="arrow-down"></u-icon
-          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>
@@ -215,10 +201,6 @@ const state = reactive({
   ],
   isShowSort: false,
   sortList: [
-    {
-      name: "全部",
-      key: undefined,
-    },
     {
       name: "按创建时间降序",
       key: "create_time",

src/pagesApp/receiveSpl.vue

@@ -32,12 +32,7 @@
           :customStyle="{}"
           border="none"
           :disabled="item.disabled || item.type === 'select'"
-          :disabledColor="
+          :disabledColor="['补单时间','站点磅秤','供应商','收货产品'].indexOf(item.name) > -1?'#ffffff':'#f5f7fa'"
-            ['补单时间', '站点磅秤', '供应商', '收货产品'].indexOf(item.name) >
-            -1
-              ? '#ffffff'
-              : '#f5f7fa'
-          "
           @change="(e:any) => {handleInput(e, item)}"
           @clear="handleClear(item)"
         >
@@ -52,16 +47,6 @@
         </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"
@@ -146,9 +131,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 = <
   {
@@ -241,7 +226,7 @@ const model1 = reactive<any>({
     splTime: "",
     subtractType: 1,
     netWeight: 0,
-    totalPrice: 0,
+    totalPrice: 0
   },
 });
 const rules = reactive({
@@ -451,9 +436,7 @@ watch(
       预估总价： 结算单价*结算重量
       实际收入：实际结算金额-运费-杂费
      */
-    model1.order.netWeight = (
+    model1.order.netWeight = ((parseFloat(grossWeightNew) || 0) - (parseFloat(tareNew) || 0)).toFixed(2);
-      (parseFloat(grossWeightNew) || 0) - (parseFloat(tareNew) || 0)
-    ).toFixed(2);
     if (model1.order.buttonType === 0) {
       if (model1.order.subtractNum) {
         model1.order.netWeight =
@@ -616,7 +599,7 @@ const startSave = () => {
     if (res.code === 200) {
       model1.order.id = res.data;
       upload();
-      uni.navigateBack();
+      uni.navigateBack()
     }
   });
 };

src/pagesApp/shipmentDetail.vue

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

src/pagesLaunch/index.vue

@@ -10,9 +10,7 @@
   >
     <swiper-item v-for="(item, index) in list" :key="index">
       <view class="image-box">
-        <image
+        <image :src="`https://backend-common.obs.cn-east-3.myhuaweicloud.com/static/pagesLaunch/${item.imgUrl}`"></image>
-          :src="`https://backend-common.obs.cn-east-3.myhuaweicloud.com/static/pagesLaunch/${item.imgUrl}`"
-        ></image>
         <view class="title">
           {{ item.title }}
         </view>
@@ -24,9 +22,6 @@
   </swiper>
 </template>
 <script setup lang="ts">
-import { useMemberStore } from "@/store/index";
-const store = useMemberStore();
-const profile = store.profile;
 const list = [
   {
     title: "智能回收   智慧未来！",
@@ -46,16 +41,9 @@ const list = [
   },
 ];
 const start = () => {
-  // 若当前存在token 直接跳到首页 若不存在则跳转登录页
-  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,8 +13,8 @@
           :key="index"
           :prop="`userInfo.${item.modelName}`"
         >
-          <u-input
+          <view v-if="item.type === 'text'">
-            v-if="item.type === 'text'"
+            <up-input
               v-model="model1.userInfo[`${item.modelName}`]"
               :placeholder="item.placeholder"
               :shape="'circle'"
@@ -41,10 +41,10 @@
                   >
                 </text>
               </template>
-          </u-input>
+            </up-input>
-
+          </view>
-          <u-input
+          <view v-if="item.type === 'password'">
-            v-if="item.type === 'password'"
+            <up-input
               v-model="model1.userInfo[`${item.modelName}`]"
               :placeholder="item.placeholder"
               :shape="'circle'"
@@ -73,7 +73,8 @@
                   @click="item.isShowPwd = false"
                 ></image>
               </template>
-          </u-input>
+            </up-input>
+          </view>
         </u-form-item>
       </u-form>
 
@@ -84,7 +85,7 @@
           :customStyle="{
             'border-radius': '43rpx',
           }"
-          >保存</u-button
+          >保存并登录</u-button
         >
       </view>
     </template>
@@ -95,9 +96,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,23 +14,6 @@
       <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>
@@ -41,12 +24,10 @@
                   <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>
@@ -127,17 +108,11 @@ const handleItem = (item: any) => {
           });
           return;
         } else {
-          if (
+          if (res.data.list[0].scaleStatus === ScaleStatus.ToBePriced &&  MsgType.ToBePriced === item.msgType) {
-            res.data.list[0].scaleStatus === ScaleStatus.ToBePriced &&
-            MsgType.ToBePriced === item.msgType
-          ) {
             uni.navigateTo({
               url: "/pagesReceive/pricing?scaleStatus=0", // 要跳转到的页面路径
             });
-          } else if (
+          } else if (res.data.list[0].scaleStatus === ScaleStatus.ToBeReview && MsgType.ToBeReview === item.msgType) {
-            res.data.list[0].scaleStatus === ScaleStatus.ToBeReview &&
-            MsgType.ToBeReview === item.msgType
-          ) {
             uni.navigateTo({
               url: "/pagesReceive/payReview?scaleStatus=2", // 要跳转到的页面路径
             });
@@ -167,16 +142,12 @@ const handleItem = (item: any) => {
           });
           return;
         } else {
-          if (
+          if (res.data.list[0].scaleStatus === ScaleStatus.ToBeShipment && MsgType.ToBeShipment === item.msgType) {
-            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 &&
+            res.data.list[0].scaleStatus === ScaleStatus.ToBeShipmentReview && MsgType.ToBeShipmentReview === item.msgType
-            MsgType.ToBeShipmentReview === item.msgType
           ) {
             uni.navigateTo({
               url: "/pagesShipment/shipmentSettlement?scaleStatus=2", // 要跳转到的页面路径
@@ -231,11 +202,5 @@ 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,9 +61,7 @@
       </view>
 
       <view class="more">
-        <view v-if="getIsShow()">
+        <view v-if="getIsShow()"> 收货单号：{{ state.order.receiptNumber }} </view>
-          收货单号：{{ 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
@@ -72,10 +70,7 @@
             {{ item.num }}
             {{ item.isBefore ? "" : item.unit }}
             <text
-              v-if="
+              v-if="item.name === '货款金额' && ScaleStatus.ToBeReview === state.order.scaleStatus"
-                item.name === '货款金额' &&
-                ScaleStatus.ToBeReview === state.order.scaleStatus
-              "
               @click="handleEdit()"
               :style="{
                 color: 'rgba(0, 220, 238, 1)',
@@ -83,7 +78,7 @@
                 'border-radius': '20rpx',
                 fontSize: '12px',
                 padding: '1px 10px',
-                marginLeft: '10rpx',
+                marginLeft: '10rpx'
               }"
             >
               编辑
@@ -220,7 +215,7 @@ const state = reactive<{
   [attrName: string]: any;
 }>({
   order: {
-    carNumber: "",
+    carNumber: ''
   },
   sheetList: [
     {
@@ -294,9 +289,7 @@ const handleScenePhoto = (id: any) => {
 };
 // 审核暂不支付 // 更新状态为3
 const handleReviewNoPay = () => {
-  ReceiveApi.updateOrderIn({
+  ReceiveApi.updateOne({ ...state.order, scaleStatus: 3 }).then((res) => {
-    orderInPos: [{ ...state.order, scaleStatus: 3 }],
-  }).then((res) => {
     if (res.code === 200) {
       uni.redirectTo({
         url: "/pagesReceive/payReview?scaleStatus=3", // 要跳转到的页面路径
@@ -334,15 +327,10 @@ const handleSelect = (key: string, v: any) => {
   contrlModalParams[key].isShow = false;
   if (key === "paySelect") {
     // 修改订单状态
-
+    ReceiveApi.updateOne({
-    ReceiveApi.updateOrderIn({
-      orderInPos: [
-        {
       ...state.order,
       scaleStatus: 4,
       paymentMethod: v.key,
-        },
-      ],
     }).then((res) => {
       if (res.code === 200) {
         uni.showToast({
@@ -381,11 +369,7 @@ const handleUpdateOrder = () => {
 };
 // 重新过皮
 const handleReWeight = () => {
-  ReceiveApi.reTare({
+  ReceiveApi.reTare({ id: state.order.id, userId: state.order.userId, deviceId: state.order.deviceId }).then((res) => {
-    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", // 要跳转到的页面路径
@@ -403,7 +387,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 = "扣杂";
@@ -419,11 +403,12 @@ 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": false,
+    "sourceMap": true,
     "baseUrl": "./",
     "paths": {
       "@/*": ["src/*"]