diff --git a/pages.json b/pages.json
index 315edc7..437a05f 100644
--- a/pages.json
+++ b/pages.json
@@ -118,6 +118,12 @@
 			"style": {
 				"navigationBarTitleText": "填写备注"
 			}
+		},
+		{
+			"path": "pages/order/goods-info",
+			"style": {
+				"navigationBarTitleText": "货物信息"
+			}
 		},{
 			"path": "pages/order/insurance",
 			"style": {
diff --git a/pages/global/search-common.vue b/pages/global/search-common.vue
index 49f3544..be7f1f7 100644
--- a/pages/global/search-common.vue
+++ b/pages/global/search-common.vue
@@ -81,3 +81,10 @@ export default {
   },
 };
 </script>
+<style lang="scss">
+.page-search {
+  &__header {
+    padding: 15rpx 22rpx !important;
+  }
+}
+</style>
diff --git a/pages/order/add.vue b/pages/order/add.vue
index 1bcca87..77789db 100644
--- a/pages/order/add.vue
+++ b/pages/order/add.vue
@@ -24,26 +24,29 @@
           <u-form-item label="卸货地址" required @click="() => selectAddress(1)">
             <u-input v-model="form.waypoints[1].address" border="none" suffix-icon="arrow-right" placeholder="请选择" disabledColor="#ffffff" disabled />
           </u-form-item>
-        </view>
-        <view class="card">
-          <u-form-item label="货物名称" required @click="choseGoodsName">
-            <u-input v-model="form.goodsName" border="none" suffix-icon="arrow-right" placeholder="请选择" disabledColor="#ffffff" disabled />
-          </u-form-item>
-          <u-form-item v-if="showGoodsValue" label="货物价值" required>
-            <u-input v-model="form.goodsValue" border="none" type="digit" placeholder="请输入" @change="computedService">
-              <template slot="suffix">元</template>
-            </u-input>
-          </u-form-item>
-          <u-form-item label="货物件数">
-            <u-input v-model="form.goodsPiece" border="none" type="digit" placeholder="请输入，选填" />
-          </u-form-item>
-          <u-form-item label="货物吨数" required>
-            <u-input v-model="form.goodsWeight" border="none" type="digit" placeholder="请输入" @change="computedPaid" />
-          </u-form-item>
-          <u-form-item label="货物方数">
-            <u-input v-model="form.goodsVolume" border="none" type="digit" placeholder="请输入，选填" />
+          <u-form-item label="货物信息" required @click="selectGoodsInfo">
+            <u-input v-model="form.goodsInfo" border="none" suffix-icon="arrow-right" placeholder="请输入" disabledColor="#ffffff" disabled />
           </u-form-item>
         </view>
+        <!--        <view class="card">-->
+        <!--          <u-form-item label="货物名称" required @click="choseGoodsName">-->
+        <!--            <u-input v-model="form.goodsName" border="none" suffix-icon="arrow-right" placeholder="请选择" disabledColor="#ffffff" disabled />-->
+        <!--          </u-form-item>-->
+        <!--          <u-form-item v-if="showGoodsValue" label="货物价值" required>-->
+        <!--            <u-input v-model="form.goodsValue" border="none" type="digit" placeholder="请输入" @change="computedService">-->
+        <!--              <template slot="suffix">元</template>-->
+        <!--            </u-input>-->
+        <!--          </u-form-item>-->
+        <!--          <u-form-item label="货物件数">-->
+        <!--            <u-input v-model="form.goodsPiece" border="none" type="digit" placeholder="请输入，选填" />-->
+        <!--          </u-form-item>-->
+        <!--          <u-form-item label="货物吨数" required>-->
+        <!--            <u-input v-model="form.goodsWeight" border="none" type="digit" placeholder="请输入" @change="computedPaid" />-->
+        <!--          </u-form-item>-->
+        <!--          <u-form-item label="货物方数">-->
+        <!--            <u-input v-model="form.goodsVolume" border="none" type="digit" placeholder="请输入，选填" />-->
+        <!--          </u-form-item>-->
+        <!--        </view>-->
         <view class="card" v-if="form.priceType === 'TON'">
           <u-form-item label="计价方式">
             <render-dict style="color: #2b2a27" :value="form.priceType" dict="FREIGHT_GOODS_SOURCE_PRICE_TYPE"></render-dict>
@@ -206,6 +209,7 @@
 </template>
 <script>
 import { urlParam } from '@/utils/param';
+import { mapGetters } from 'vuex';
 import dayjs from 'dayjs';
 import payee from '../../components/card/payee.vue';
 import PopupPlatenumber from '../../components/popup/popup-platenumber.vue';
@@ -237,6 +241,7 @@ export default {
         loadTime: '',
         projectName: '',
         customerOrderCode: '',
+        goodsInfo: '',
         goodsName: '',
         goodsValue: '',
         goodsPiece: '',
@@ -271,6 +276,7 @@ export default {
     };
   },
   computed: {
+    ...mapGetters(['freightInfo']),
     isCollect() {
       return this.currentFreight.collectByOtherFlag || false;
     },
@@ -287,6 +293,9 @@ export default {
     showGoodsValue() {
       return this.currentFreight ? this.currentFreight.driverSecurityServiceFlag || this.currentFreight.securityServiceFlag : false;
     },
+    ningXiaYouZhengFlag() {
+      return this.freightInfo.enterpriseName === '中国邮政速递物流股份有限公司宁夏物流运营分公司' && this.form.projectName === 'JYYJ';
+    },
   },
   onLoad(option) {
     // 从抢单来的数据
@@ -468,6 +477,39 @@ export default {
         this.setFormValue(detail);
       });
     },
+    selectGoodsInfo() {
+      uni.navigateTo({
+        url: `/pages/order/goods-info`,
+        events: {
+          submitData: option => {
+            this.form = {
+              ...this.form,
+              ...option,
+            };
+            this.computedPaid();
+            this.computedService();
+            let goodsInfo = [];
+            if (this.form.goodsName) {
+              goodsInfo.push(this.form.goodsName);
+            }
+            if (this.form.goodsPiece) {
+              goodsInfo.push(this.form.goodsPiece + '件');
+            }
+            if (this.form.goodsWeight) {
+              goodsInfo.push(this.form.goodsWeight + '吨');
+            }
+            if (this.form.goodsVolume) {
+              goodsInfo.push(this.form.goodsVolume + '方');
+            }
+            this.form.goodsInfo = goodsInfo.join('，');
+            uni.navigateBack();
+          },
+        },
+        success: res => {
+          res.eventChannel.emit('data', { form: this.form, showGoodsValue: this.showGoodsValue, ningXiaYouZhengFlag: this.ningXiaYouZhengFlag });
+        },
+      });
+    },
     selectRemark() {
       uni.$once('select-remark', remark => {
         this.form.remark = remark || '';
diff --git a/pages/order/detail.vue b/pages/order/detail.vue
index 9381896..f81606b 100644
--- a/pages/order/detail.vue
+++ b/pages/order/detail.vue
@@ -324,6 +324,7 @@
   </Page>
 </template>
 <script>
+import { mapGetters } from 'vuex';
 import FieldCopy from '../../components/field/field-copy.vue';
 import Payee from '../../components/card/payee.vue';
 import USteps from '../../uni_modules/uview-ui/components/u-steps/u-steps.vue';
@@ -367,6 +368,7 @@ export default {
     };
   },
   computed: {
+    ...mapGetters(['freightInfo']),
     amountList() {
       let list = this.item.orderFeePayPlanList;
       if (!list || list.length === 0) return [];
@@ -401,6 +403,13 @@ export default {
       // 自动计算货到
       return 'OUT_INVITE_ARRIVAL' === this.currentFreight?.autoComputeFeeType;
     },
+    // 获取价值
+    showGoodsValue() {
+      return this.currentFreight ? this.currentFreight.driverSecurityServiceFlag || this.currentFreight.securityServiceFlag : false;
+    },
+    ningXiaYouZhengFlag() {
+      return this.freightInfo.enterpriseName === '中国邮政速递物流股份有限公司宁夏物流运营分公司' && this.item.projectName === 'JYYJ';
+    },
   },
   onLoad(options) {
     if (options.code) {
@@ -472,11 +481,24 @@ export default {
     },
     toChangeGoods() {
       uni.navigateTo({
-        url: '/pages/order/change-goods?code=' + this.item.code,
+        url: '/pages/order/goods-info',
         events: {
           refreshData: () => {
             this.initData(this.item.code);
           },
+          submitData: form => {
+            uni.$u.api.freightOrder.modifyGoods({ code: this.item.code, ...form }).then(res => {
+              if (res.success) {
+                uni.showToast({ title: '操作成功', icon: 'none' });
+                this.initData(this.item.code);
+                // this.getOpenerEventChannel().emit('refreshData');
+                setTimeout(() => uni.navigateBack(), 500);
+              }
+            });
+          },
+        },
+        success: res => {
+          res.eventChannel.emit('data', { form: this.item, showGoodsValue: this.showGoodsValue, ningXiaYouZhengFlag: this.ningXiaYouZhengFlag });
         },
       });
     },
diff --git a/pages/order/goods-info.vue b/pages/order/goods-info.vue
new file mode 100644
index 0000000..7e8d3c0
--- /dev/null
+++ b/pages/order/goods-info.vue
@@ -0,0 +1,120 @@
+<template>
+  <Page name="goods-info" flank>
+    <template #content>
+      <u-form :model="form" ref="uForm" labelWidth="100">
+        <view class="card">
+          <u-form-item label="货物名称" required @click="choseGoodsName">
+            <u-input v-model="form.goodsName" border="none" suffix-icon="arrow-right" placeholder="请选择" disabledColor="#ffffff" disabled />
+          </u-form-item>
+          <u-form-item v-if="showGoodsValue" label="货物价值" required>
+            <u-input v-model="form.goodsValue" border="none" type="digit" placeholder="请输入">
+              <template slot="suffix">元</template>
+            </u-input>
+          </u-form-item>
+          <u-form-item label="货物件数">
+            <u-input v-model="form.goodsPiece" border="none" type="digit" placeholder="请输入，选填" />
+          </u-form-item>
+          <u-form-item label="货物吨数" required>
+            <u-input v-model="form.goodsWeight" border="none" type="digit" placeholder="请输入" />
+          </u-form-item>
+          <u-form-item label="货物方数">
+            <u-input v-model="form.goodsVolume" border="none" type="digit" placeholder="请输入，选填" />
+          </u-form-item>
+          <u-form-item label="发货单位" :required="ningXiaYouZhengFlag">
+            <u-input v-model="form.dispatchUnit" border="none" placeholder="请输入" />
+          </u-form-item>
+          <u-form-item label="合同号" :required="ningXiaYouZhengFlag">
+            <u-input v-model="form.customerContractNo" border="none" placeholder="请输入" />
+          </u-form-item>
+          <u-form-item label="运输班次号" :required="ningXiaYouZhengFlag">
+            <u-input v-model="form.transportShiftNo" border="none" placeholder="请输入" />
+          </u-form-item>
+        </view>
+      </u-form>
+    </template>
+    <template #footer>
+      <u-button type="primary" @click="onSubmit">确定</u-button>
+    </template>
+  </Page>
+</template>
+<script>
+import { urlParam } from '@/utils/param';
+
+export default {
+  name: 'goods-info',
+  data() {
+    return {
+      showGoodsValue: '',
+      ningXiaYouZhengFlag: '',
+      projectCode: '',
+      form: {
+        goodsName: '',
+        goodsValue: '',
+        goodsPiece: '',
+        goodsWeight: '',
+        goodsVolume: '',
+        dispatchUnit: '',
+        customerContractNo: '',
+        transportShiftNo: '',
+      },
+    };
+  },
+  onLoad(option) {
+    const eventChannel = this.getOpenerEventChannel();
+    eventChannel.on('data', data => {
+      this.showGoodsValue = data.showGoodsValue || false;
+      this.ningXiaYouZhengFlag = data.ningXiaYouZhengFlag || false;
+      this.setHisData(data.form);
+      this.projectCode = data.form.projectCode || '';
+    });
+  },
+  methods: {
+    setHisData(v) {
+      Object.keys(this.form).forEach(k => {
+        this.form[k] = v[k] || '';
+      });
+    },
+    choseGoodsName() {
+      uni.$off('select-common');
+      uni.$once('select-common', option => {
+        this.form.goodsName = option.name;
+      });
+      uni.navigateTo({
+        url: `/pages/global/search-common${urlParam({
+          mode: 'select',
+          url: 'goodsName',
+          title: '货物名称',
+          label: 'name',
+          value: '',
+          params: `{"projectCode":"${this.projectCode}"}`,
+        })}`,
+      });
+    },
+    onSubmit() {
+      this.getOpenerEventChannel().emit('submitData', this.form);
+      // setTimeout(() => uni.navigateBack(), 500);
+    },
+  },
+};
+</script>
+
+<style lang="scss">
+.page-goods-info {
+  &__footer {
+    background: $color-white;
+  }
+  .card {
+    color: #999999;
+    background-color: $color-white;
+    border-radius: $radius-md;
+    box-shadow: $shadow-normal;
+    .u-form-item {
+      padding-left: $padding-md !important;
+      padding-right: $padding-sm !important;
+    }
+    .u-form-item + .u-form-item {
+      border-top: 1px solid #f6f6f6;
+    }
+  }
+}
+</style>
--
libgit2 0.21.0