From 88a7428ed67c164bebcfd947818c10df869e96b1 Mon Sep 17 00:00:00 2001
From: admin <>
Date: Sat, 20 Jul 2024 11:34:51 +0800
Subject: [PATCH] =?UTF-8?q?update:=20=E5=90=84=E4=B8=AA=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E9=AB=98=E5=BA=A6=E9=99=90=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pagesApp/customerMgt.vue          |  2 +-
 src/pagesApp/receiveProduct.vue       |  2 +-
 src/pagesApp/receiveType.vue          |  2 +-
 src/pagesApp/shipmentProduct.vue      |  2 +-
 src/pagesApp/stockCard.vue            |  2 +-
 src/pagesApp/supplierMgt.vue          |  2 +-
 src/pagesApp/supplierType.vue         |  2 +-
 src/pagesApp/user.vue                 |  2 +-
 src/pagesReceive/form/pricingForm.vue | 22 +++++++++++++++++-----
 src/pagesReceive/pricing.vue          |  2 +-
 10 files changed, 26 insertions(+), 14 deletions(-)

diff --git a/src/pagesApp/customerMgt.vue b/src/pagesApp/customerMgt.vue
index b040951..ae9f932 100644
--- a/src/pagesApp/customerMgt.vue
+++ b/src/pagesApp/customerMgt.vue
@@ -1,5 +1,5 @@
 <template>
-  <view class="c-card">
+  <view class="c-card app-container">
     <view class="search">
       <u-search
         placeholder="请输入客户名称"
diff --git a/src/pagesApp/receiveProduct.vue b/src/pagesApp/receiveProduct.vue
index f642631..6a8b127 100644
--- a/src/pagesApp/receiveProduct.vue
+++ b/src/pagesApp/receiveProduct.vue
@@ -1,5 +1,5 @@
 <template>
-  <view class="c-card">
+  <view class="c-card app-container">
     <view class="search">
       <u-search
         placeholder="请输入收货产品名称"
diff --git a/src/pagesApp/receiveType.vue b/src/pagesApp/receiveType.vue
index 8f16f05..007f031 100644
--- a/src/pagesApp/receiveType.vue
+++ b/src/pagesApp/receiveType.vue
@@ -1,5 +1,5 @@
 <template>
-  <view class="c-card">
+  <view class="c-card app-container">
     <view class="search">
       <u-search
         placeholder="请输入收货分类"
diff --git a/src/pagesApp/shipmentProduct.vue b/src/pagesApp/shipmentProduct.vue
index 470aefc..62bfe44 100644
--- a/src/pagesApp/shipmentProduct.vue
+++ b/src/pagesApp/shipmentProduct.vue
@@ -1,5 +1,5 @@
 <template>
-  <view class="c-card">
+  <view class="c-card app-container">
     <view class="search">
       <u-search
         placeholder="请输入出货产品名称"
diff --git a/src/pagesApp/stockCard.vue b/src/pagesApp/stockCard.vue
index 91cb730..59c218b 100644
--- a/src/pagesApp/stockCard.vue
+++ b/src/pagesApp/stockCard.vue
@@ -1,5 +1,5 @@
 <template>
-  <view class="c-card">
+  <view class="c-card app-container">
     <view class="search">
       <u-search
         placeholder="请输入库存卡号"
diff --git a/src/pagesApp/supplierMgt.vue b/src/pagesApp/supplierMgt.vue
index b274322..9dd2b26 100644
--- a/src/pagesApp/supplierMgt.vue
+++ b/src/pagesApp/supplierMgt.vue
@@ -1,5 +1,5 @@
 <template>
-  <view class="c-card">
+  <view class="c-card app-container">
     <view class="search">
       <view class="type" @click="state.isShowType = true"
         >全部分类<u-icon name="arrow-down"></u-icon>
diff --git a/src/pagesApp/supplierType.vue b/src/pagesApp/supplierType.vue
index bdb9e79..4dcae47 100644
--- a/src/pagesApp/supplierType.vue
+++ b/src/pagesApp/supplierType.vue
@@ -1,5 +1,5 @@
 <template>
-  <view class="c-card">
+  <view class="c-card app-container">
     <view class="search">
       <u-search
         placeholder="请输入供应商分类"
diff --git a/src/pagesApp/user.vue b/src/pagesApp/user.vue
index 832a18b..cbec52f 100644
--- a/src/pagesApp/user.vue
+++ b/src/pagesApp/user.vue
@@ -1,5 +1,5 @@
 <template>
-  <view class="c-card">
+  <view class="c-card app-container">
     <view class="search">
       <u-search
         placeholder="请输入人员名称"
diff --git a/src/pagesReceive/form/pricingForm.vue b/src/pagesReceive/form/pricingForm.vue
index 3797b30..c864995 100644
--- a/src/pagesReceive/form/pricingForm.vue
+++ b/src/pagesReceive/form/pricingForm.vue
@@ -111,7 +111,11 @@
   </view>
   <view class="btn-box">
     <u-button text="暂不定价" @click="handleBack()"></u-button>
-    <u-button type="primary" :text="model1.order.scaleStatus === 0 ? '定价' : '保存'" @click="save()"></u-button>
+    <u-button
+      type="primary"
+      :text="title === '定价详情' ? '定价' : '保存'"
+      @click="save()"
+    ></u-button>
   </view>
 
   <!-- 收货产品弹框 -->
@@ -743,20 +747,28 @@ const updateOrder = () => {
         });
       } else {
         // 0：有皮重 1：零皮重
-        uni.navigateBack()
+        uni.navigateBack();
       }
     }
   });
 };
 const prePage = ref("");
-onLoad((option) => {
-  model1.order.id = parseInt((option as any).id);
-  prePage.value = (option as any).prePage;
+const title = ref("")
+onLoad((option: any) => {
+  model1.order.id = parseInt(option.id);
+  prePage.value = option.prePage;
+  title.value = option.title
+
   if (prePage.value) {
     uni.setNavigationBarTitle({
       title: "编辑信息",
     });
   }
+  if (option.title) {
+    uni.setNavigationBarTitle({
+      title: option.title,
+    });
+  }
 
   if (model1.order.id) {
     ReceiveApi.getDetailById({ id: model1.order.id }).then((res) => {
diff --git a/src/pagesReceive/pricing.vue b/src/pagesReceive/pricing.vue
index 250c464..89a7b7a 100644
--- a/src/pagesReceive/pricing.vue
+++ b/src/pagesReceive/pricing.vue
@@ -185,7 +185,7 @@ const pricingDetail = (id: number) => {
         getList();
       } else {
         uni.navigateTo({
-          url: "/pagesReceive/form/pricingForm?id=" + id, // 要跳转到的页面路径
+          url: `/pagesReceive/form/pricingForm?id=${id}&title=${state.scaleStatus === 0 ? '定价' : '编辑'}详情`, // 要跳转到的页面路径
         });
       }
     }