diff --git a/common/api.js b/common/api.js
index b541fe6..1fb33e9 100644
--- a/common/api.js
+++ b/common/api.js
@@ -158,6 +158,21 @@ module.exports = (vm) => {
     },
     freightMaRecord: {
       add: params => vm.$u.http.post( freightAPI + '/freightMaRecord/add', params,{custom: {toast:true}}), // 出发到达记录日志
+    },
+    // 货源管理v2版本
+    freightGoodsSourceV2:{
+      page: params => vm.$u.http.get( freightAPI + '/freightGoodsSourceV2/page', {params}),
+      biddingPage: params => vm.$u.http.get( freightAPI + '/freightGoodsSourceV2/biddingPage', {params}),
+      biddingCount: params => vm.$u.http.get( freightAPI + '/freightGoodsSourceV2/biddingCount', {params}),
+      count: params => vm.$u.http.get( freightAPI + '/freightGoodsSourceV2/count', {params}),
+      getDetail: params => vm.$u.http.get( freightAPI + '/freightGoodsSourceV2/getDetail', {params}),
+      add: data => vm.$u.http.post( freightAPI + '/freightGoodsSourceV2/add', data,{custom: {toast:true}}),
+      modify: data => vm.$u.http.post( freightAPI + '/freightGoodsSourceV2/modify', data),
+      complete: data => vm.$u.http.post( freightAPI + '/freightGoodsSourceV2/complete', data),
+      cancel: data => vm.$u.http.post( freightAPI + '/freightGoodsSourceV2/cancel', data),
+      cancelBidding: data => vm.$u.http.post( freightAPI + '/freightGoodsSourceV2/cancelBidding', data),
+      delete: data => vm.$u.http.post( freightAPI + '/freightGoodsSourceV2/delete', data),
+      buildMaQrcode: params => vm.$u.http.get( freightAPI + '/freightGoodsSourceV2/buildMaQrcode', {params}),
     }
   };
 }
diff --git a/pages.json b/pages.json
index 607031d..0b3ebac 100644
--- a/pages.json
+++ b/pages.json
@@ -28,6 +28,18 @@
 				"navigationBarTitleText": "创建货源"
 			}
 		},{
+			"path": "pages/goodSource/detail",
+			"style": {
+				"navigationBarTitleText": "飞牛货源详情",
+				"enablePullDownRefresh": true
+			}
+		},{
+			"path": "pages/goodSource/grab-record",
+			"style": {
+				"navigationBarTitleText": "飞牛货源抢单记录",
+				"enablePullDownRefresh": true
+			}
+		},{
 			"path": "pages/order/index",
 			"style": {
 				"navigationBarTitleText": "订单",
diff --git a/pages/goodSource/add.vue b/pages/goodSource/add.vue
index 14c1819..4d4ffa8 100644
--- a/pages/goodSource/add.vue
+++ b/pages/goodSource/add.vue
@@ -8,24 +8,24 @@
           </u-form-item>
           <u-form-item label="开始时间" @click="showLoadTime1 = true" required>
             <u-datetime-picker :show="showLoadTime1" :value="loadTimeDef1" @cancel="showLoadTime1 = false" @close="showLoadTime2 = false" @confirm="loadTimeFormat1"></u-datetime-picker>
-            <u-input v-model="form.loadTime" border="none" suffix-icon="arrow-right" placeholder="请选择时间" disabledColor="#ffffff" disabled />
+            <u-input v-model="form.startTime" border="none" suffix-icon="arrow-right" placeholder="请选择时间" disabledColor="#ffffff" disabled />
           </u-form-item>
           <u-form-item label="结束时间" @click="showLoadTime2 = true" required>
             <u-datetime-picker :show="showLoadTime2" :value="loadTimeDef2" @cancel="showLoadTime2 = false" @close="showLoadTime2 = false" @confirm="loadTimeFormat2"></u-datetime-picker>
-            <u-input v-model="form.loadTime" border="none" suffix-icon="arrow-right" placeholder="请选择时间" disabledColor="#ffffff" disabled />
+            <u-input v-model="form.endTime" border="none" suffix-icon="arrow-right" placeholder="请选择时间" disabledColor="#ffffff" disabled />
           </u-form-item>
         </view>
         <view class="card">
           <u-form-item label="装货地址" required @click="() => selectAddress(0)">
-            <u-input :value="form.waypoints[0].address" border="none" suffix-icon="arrow-right" placeholder="请选择" disabledColor="#ffffff" disabled />
+            <u-input :value="waypoints[0].address" border="none" suffix-icon="arrow-right" placeholder="请选择" disabledColor="#ffffff" disabled />
           </u-form-item>
           <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-input v-model="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="choseGoodsType">
-            <u-input :value="form.goodsTypeName" border="none" suffix-icon="arrow-right" placeholder="请选择" disabledColor="#ffffff" disabled />
+          <u-form-item label="货物类型" required @click="choseGoodsName">
+            <u-input :value="form.goodsName" border="none" suffix-icon="arrow-right" placeholder="请选择" disabledColor="#ffffff" disabled />
           </u-form-item>
           <u-form-item label="需求车型" required @click="specificationVisible = true">
             <u-input :value="formatSpecification" border="none" suffix-icon="arrow-right" placeholder="请选择" disabledColor="#ffffff" disabled />
@@ -36,28 +36,32 @@
         </view>
         <view class="card">
           <u-form-item label="计价方式" @click="chosePriceType">
-            <u-input v-model="form.priceType" border="none" suffix-icon="arrow-right" placeholder="请选择" disabledColor="#ffffff" disabled />
-          </u-form-item>
-          <u-form-item 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.goodsValue" border="none" type="digit" placeholder="请输入">
-              <template slot="suffix">元/吨</template>
-            </u-input>
-          </u-form-item>
-          <u-form-item 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.goodsValue" border="none" type="digit" placeholder="请输入">
-              <template slot="suffix">元/吨</template>
-            </u-input>
+            <u-input v-model="form.priceTypeName" border="none" suffix-icon="arrow-right" placeholder="请选择" disabledColor="#ffffff" disabled />
           </u-form-item>
+          <template v-if="form.priceType === 'TON'">
+            <u-form-item label="货物总量" required>
+              <u-input v-model="form.goodsWeight" border="none" type="digit" placeholder="请输入">
+                <template slot="suffix">吨</template>
+              </u-input>
+            </u-form-item>
+            <u-form-item label="运输单价">
+              <u-input v-model="form.weightUnitPrice" border="none" type="digit" placeholder="请输入">
+                <template slot="suffix">元/吨</template>
+              </u-input>
+            </u-form-item>
+          </template>
+          <template v-if="form.priceType === 'VEHICLE'">
+            <u-form-item label="需求车数" required>
+              <u-input v-model="form.vehicleNumber" border="none" type="number" placeholder="请输入">
+                <template slot="suffix">车</template>
+              </u-input>
+            </u-form-item>
+            <u-form-item label="总运费">
+              <u-input v-model="form.vehicleUnitPrice" border="none" type="digit" placeholder="请输入">
+                <template slot="suffix">元/车</template>
+              </u-input>
+            </u-form-item>
+          </template>
         </view>
         <view class="card" @tap="more = !more">
           <view class="more-action">
@@ -70,13 +74,13 @@
         </view>
         <template v-if="more">
           <view class="card">
-            <u-form-item label="订单备注" @click="selectRemark">
-              <u-input v-model="form.remark" border="none" suffix-icon="arrow-right" placeholder="请输入，选填" disabledColor="#ffffff" disabled />
+            <u-form-item label="订单备注">
+              <u-input v-model="form.remark" border="none" suffix-icon="arrow-right" placeholder="请输入，选填" />
             </u-form-item>
           </view>
           <view class="card">
             <u-form-item label="报价联系人">
-              <u-input v-model="form.contactName" border="none" placeholder="请输入，选填" />
+              <u-input v-model="form.contactUser" border="none" placeholder="请输入，选填" />
             </u-form-item>
             <u-form-item label="报价联系电话">
               <u-input v-model="form.contactMobile" border="none" placeholder="请输入，选填" />
@@ -113,6 +117,7 @@
 </template>
 <script>
 import { urlParam } from '@/utils/param';
+import { formatLngLat } from '@/utils/format-value';
 import { mapGetters } from 'vuex';
 import dayjs from 'dayjs';
 export default {
@@ -120,47 +125,42 @@ export default {
   data() {
     return {
       loading: false,
-      showModal: '',
-      showModal2: '',
-      content: '',
-      content2: '',
-      carNumber: '',
       showLoadTime1: false,
       showLoadTime2: false,
       loadTimeDef1: new Date(),
       loadTimeDef2: new Date(),
-      showCar: false,
-      typeCar: '',
       more: false,
-      radioList: [],
+      waypoints: [{}, {}],
       form: {
+        code: '',
         projectCode: '',
-        loadTime: '',
         projectName: '',
-        customerOrderCode: '',
+        startTime: '',
+        endTime: '',
+        startCityCode: '',
+        startAreaCode: '',
+        startAddress: '',
+        startLng: '',
+        startLat: '',
+        endCityCode: '',
+        endAreaCode: '',
+        endAddress: '',
+        endLng: '',
+        endLat: '',
+        distance: '',
+        specification: '',
+        vanType: '',
         goodsName: '',
-        goodsValue: '',
-        goodsPiece: '',
+        priceType: 'VEHICLE', // VEHICLE, TON
+        priceTypeName: '',
         goodsWeight: '',
-        goodsVolume: '',
-        mobile: '',
-        driverId: '',
-        driverName: '',
-        licenseNumber: '',
-        trailerNumber: '',
-        paidAmount: '',
-        oilAmount: '',
-        prepaidAmount: '',
-        deliveryAmount: '',
-        balancePaymentAmount: '',
-        distance: '',
-        allowDriverSeeFreightAmountNode: '',
-        waypoints: [{}, {}],
+        weightUnitPrice: '',
+        vehicleNumber: '',
+        vehicleUnitPrice: '',
+        contactUser: '',
+        contactMobile: '',
         remark: '',
       },
-      payeeModel: {},
-      driverObj: {}, //司机信息
-      currentFreight: {},
       vanTypeVisible: false,
       choseVanTypeList: [],
       specificationVisible: false,
@@ -168,7 +168,7 @@ export default {
     };
   },
   computed: {
-    ...mapGetters(['dictList', 'dictValue']),
+    ...mapGetters(['dictList', 'dictValue', 'userInfo']),
     // 箱型
     vanTypeList() {
       return [...this.dictList('VEHICLE_COMPARTMENT_TYPE'), { valueCode: 'ALL', valueName: '不限' }];
@@ -203,49 +203,54 @@ export default {
   onLoad(option) {
     if (option.code) {
       uni.setNavigationBarTitle({ title: '修改货源' });
+      this.initData(option.code);
+    }
+    this.form = {
+      ...this.form,
+      contactUser: this.userInfo.name,
+      contactMobile: this.userInfo.mobile,
+    };
+    if (this.form.priceType) {
+      this.form.priceTypeName = this.dictValue('FREIGHT_GOODS_SOURCE_PRICE_TYPE', this.form.priceType);
     }
   },
   methods: {
     initData(code) {
-      uni.$u.api.freightOrder.getDetail({ code }).then(res => {
+      uni.$u.api.freightGoodsSourceV2.getDetail({ code }).then(res => {
         let detail = res.result || {};
-        ['goodsName', 'waypoints', 'allowDriverSeeFreightAmountNode', 'projectCode', 'projectName', 'remark', 'goodsPiece', 'goodsWeight', 'goodsVolume'].forEach(key => {
+        Object.keys(this.form).forEach(key => {
           this.form[key] = detail[key];
         });
-        if (detail.vehicleLicenseNum) {
-          this.typeCar = 'licenseNumber';
-          this.form.licenseNumber = detail.vehicleLicenseNum;
-          this.vehicleChange(detail.vehicleLicenseNum);
-        }
-        if (detail.trailerLicenseNum) {
-          setTimeout(() => {
-            this.typeCar = 'trailerNumber';
-            this.form.trailerNumber = detail.trailerLicenseNum;
-            this.vehicleChange(detail.trailerLicenseNum);
-          }, 500);
-        }
-        this.form.mobile = detail.driverMobile;
-        this.form.driverId = detail.driverId;
-        this.form.driverName = detail.driverName;
-        this.form.driverMobile = detail.driverMobile;
-        this.payeeModel = {
-          driverId: detail.payeeId,
-          dueBank: detail.dueBank,
-          openingBank: detail.openingBank,
-          dueBankCardNo: detail.dueBankCardNo,
+        let startAddressObj = {
+          address: detail.startAddress,
+          areaCode: detail.startAreaCode,
+          cityCode: detail.startCityCode,
+          lng: detail.startLng,
+          lat: detail.startLat,
         };
-        this.$refs.payee.setItem(this.payeeModel);
-        this.computedDistance();
-      });
-    },
-    selectRemark() {
-      uni.$once('select-remark', remark => {
-        this.form.remark = remark || '';
-      });
-      uni.navigateTo({
-        url: `/pages/order/select-remark`,
+        let endAddressObj = {
+          address: detail.endAddress,
+          areaCode: detail.endAreaCode,
+          cityCode: detail.endCityCode,
+          lng: detail.endLng,
+          lat: detail.endLat,
+        };
+        this.waypoints = [startAddressObj, endAddressObj];
+        this.choseVanTypeList = detail.vanType.split(',');
+        this.choseSpecificationList = detail.specification.split(',');
+        if (this.form.priceType) {
+          this.form.priceTypeName = this.dictValue('FREIGHT_GOODS_SOURCE_PRICE_TYPE', this.form.priceType);
+        }
       });
     },
+    // selectRemark() {
+    //   uni.$once('select-remark', remark => {
+    //     this.form.remark = remark || '';
+    //   });
+    //   uni.navigateTo({
+    //     url: `/pages/order/select-remark`,
+    //   });
+    // },
     choseProjectCode() {
       uni.$once('select-common', option => {
         this.form.projectCode = option.code;
@@ -274,7 +279,7 @@ export default {
           this.choseVanTypeList.push(code);
         }
       }
-      this.form.vanType = this.choseVanTypeList.join('/');
+      this.form.vanType = this.choseVanTypeList.join(',');
     },
     // 选择车型
     choseSpecification(code) {
@@ -288,7 +293,19 @@ export default {
           this.choseSpecificationList.push(code);
         }
       }
-      this.form.specification = this.choseSpecificationList.join('/');
+      this.form.specification = this.choseSpecificationList.join(',');
+    },
+    chosePriceType() {
+      uni.$once('select-dict', option => {
+        this.form.priceType = option.valueCode;
+        this.form.priceTypeName = option.valueName;
+      });
+      uni.navigateTo({
+        url: `/pages/global/search-dict${urlParam({
+          title: '计价方式',
+          dict: 'FREIGHT_GOODS_SOURCE_PRICE_TYPE',
+        })}`,
+      });
     },
     choseGoodsName() {
       uni.$once('select-common', option => {
@@ -305,75 +322,96 @@ export default {
       });
     },
     selectAddress(index) {
-      uni.$once('select-detail', location => {
-        let station = {
-          lng: location.lng,
-          lat: location.lat,
-          provinceCode: location.provinceCode,
-          provinceName: location.provinceName,
-          cityCode: location.cityCode,
-          cityName: location.cityName,
-          areaCode: location.areaCode,
-          areaName: location.areaName,
-          address: (location.provinceName || '') + (location.cityName || '') + (location.areaName || '') + (location.address || ''),
-        };
-        let waypoints = index === 0 ? [station, this.form.waypoints[1]] : [this.form.waypoints[0], station];
-        this.form = {
-          ...this.form,
-          waypoints,
-        };
-        this.computedDistance();
-      });
-      let type = index === 0 ? 'getStartLatestAddress' : 'getEndLatestAddress';
-      let lat = this.form.waypoints[index].lat ? Number(this.form.waypoints[index].lat) : '';
-      let lng = this.form.waypoints[index].lng ? Number(this.form.waypoints[index].lng) : '';
-      uni.navigateTo({ url: `/pages/global/search-address?type=${type}&lng=${lng}&lat=${lat}` });
+      let lat = this.waypoints[index].lat ? Number(this.waypoints[index].lat) : '';
+      let lng = this.waypoints[index].lng ? Number(this.waypoints[index].lng) : '';
+      wx.chooseLocation({
+        latitude: lat ? Number(lat) : undefined,
+        longitude: lng ? Number(lng) : undefined,
+      })
+        .then(res => {
+          return formatLngLat({ lng: res.longitude, lat: res.latitude });
+        })
+        .then(location => {
+          let station = {
+            lng: location.lng,
+            lat: location.lat,
+            provinceCode: location.provinceCode,
+            provinceName: location.provinceName,
+            cityCode: location.cityCode,
+            cityName: location.cityName,
+            areaCode: location.areaCode,
+            areaName: location.areaName,
+            address: (location.provinceName || '') + (location.cityName || '') + (location.areaName || '') + (location.address || ''),
+          };
+          this.waypoints = index === 0 ? [station, this.waypoints[1]] : [this.waypoints[0], station];
+          this.computedDistance();
+        });
+      // uni.$once('select-detail', location => {
+      //   let station = {
+      //     lng: location.lng,
+      //     lat: location.lat,
+      //     provinceCode: location.provinceCode,
+      //     provinceName: location.provinceName,
+      //     cityCode: location.cityCode,
+      //     cityName: location.cityName,
+      //     areaCode: location.areaCode,
+      //     areaName: location.areaName,
+      //     address: (location.provinceName || '') + (location.cityName || '') + (location.areaName || '') + (location.address || ''),
+      //   };
+      //   this.waypoints = index === 0 ? [station, this.waypoints[1]] : [this.waypoints[0], station];
+      // });
+      // let type = index === 0 ? 'getStartLatestAddress' : 'getEndLatestAddress';
+      // let lat = this.waypoints[index].lat ? Number(this.waypoints[index].lat) : '';
+      // let lng = this.waypoints[index].lng ? Number(this.waypoints[index].lng) : '';
+      // uni.navigateTo({ url: `/pages/global/search-address?type=${type}&lng=${lng}&lat=${lat}` });
+    },
+    computedDistance() {
+      if (this.waypoints[0].lng && this.waypoints[1].lng) {
+        uni.$u.api.freightOrder
+          .getDistance({
+            startLat: this.waypoints[0].lat,
+            startLng: this.waypoints[0].lng,
+            endLat: this.waypoints[1].lat,
+            endLng: this.waypoints[1].lng,
+          })
+          .then(res => {
+            this.form.distance = res.result;
+          });
+      }
     },
-
     loadTimeFormat1({ value }) {
-      this.form.loadTime = dayjs(value).format('YYYY-MM-DD HH:mm:ss');
+      this.form.startTime = dayjs(value).format('YYYY-MM-DD HH:mm:ss');
       this.showLoadTime1 = false;
     },
     loadTimeFormat2({ value }) {
-      this.form.loadTime = dayjs(value).format('YYYY-MM-DD HH:mm:ss');
+      this.form.endTime = dayjs(value).format('YYYY-MM-DD HH:mm:ss');
       this.showLoadTime2 = false;
     },
-    choseGoodsType() {
-      uni.$once('select-dict', option => {
-        this.searchForm.goodsType = option.valueCode;
-        this.searchForm.goodsTypeName = option.valueName;
-      });
-      uni.navigateTo({
-        url: `/pages/global/search-dict${urlParam({
-          title: '货物类型',
-          dict: 'ONLINE_FREIGHT_ORDER_PAY_STATUS',
-        })}`,
-      });
-    },
-    chosePriceType() {
-      uni.$once('select-dict', option => {
-        this.searchForm.goodsType = option.valueCode;
-        this.searchForm.goodsTypeName = option.valueName;
-      });
-      uni.navigateTo({
-        url: `/pages/global/search-dict${urlParam({
-          title: '计价方式',
-          dict: 'ONLINE_FREIGHT_ORDER_PAY_STATUS',
-        })}`,
-      });
-    },
     submitAddFun() {
       if (this.loading) return;
       this.loading = true;
-      let totalAmount = Number(this.form.paidAmount || 0) + Number(this.form.serviceAmount || 0) + Number(this.form.securityServiceAmount || 0);
-      uni.$u.api.freightOrder
-        .add({ ...this.form, totalAmount, payeeId: this.payeeModel.driverId })
+      let startAddressObj = {
+        startCityCode: this.waypoints[0].cityCode,
+        startAreaCode: this.waypoints[0].areaCode,
+        startAddress: this.waypoints[0].address,
+        startLng: this.waypoints[0].lng,
+        startLat: this.waypoints[0].lat,
+      };
+      let endAddressObj = {
+        endCityCode: this.waypoints[1].cityCode,
+        endAreaCode: this.waypoints[1].areaCode,
+        endAddress: this.waypoints[1].address,
+        endLng: this.waypoints[1].lng,
+        endLat: this.waypoints[1].lat,
+      };
+      let opType = this.form.code ? 'modify' : 'add';
+      uni.$u.api.freightGoodsSourceV2[opType]({ ...this.form, ...startAddressObj, ...endAddressObj })
         .then(res => {
           if (res.success) {
             this.form = {};
-            uni.showToast({ title: '下单成功', icon: 'none' });
+            uni.showToast({ title: '成功', icon: 'none' });
             this.getOpenerEventChannel().emit('refreshData');
-            setTimeout(() => uni.navigateBack(), 500);
+            setTimeout(() => uni.navigateBack(), 1000);
           }
           this.loading = false;
         })
diff --git a/pages/goodSource/card.vue b/pages/goodSource/card.vue
index 3634219..7ecbad0 100644
--- a/pages/goodSource/card.vue
+++ b/pages/goodSource/card.vue
@@ -4,13 +4,13 @@
       <view class="title">
         <view class="order-no">
           <field-copy :value="item.code" v-if="item.code">{{ item.code }} </field-copy>
-          <view class="image" @click.stop="qrShow">
+          <view v-if="!onlyShow" class="image" @click.stop="qrShow">
             <image style="height: 30upx; width: 30upx" src="/static/qr.png"></image>
           </view>
         </view>
         <view style="display: flex; align-items: center">
-          <render-dict v-if="item.status" class="status" :style="{ color: colorMap[item.status] }" dict="FREIGHT_ORDER_STATUS" :value="item.status"></render-dict>
-          <u-icon name="arrow-right" size="14"></u-icon>
+          <render-dict v-if="item.status" class="status" :style="{ color: colorMap[item.status] }" dict="FREIGHT_GOODS_SOURCE_STATUS" :value="item.status"></render-dict>
+          <u-icon v-if="!onlyShow" name="arrow-right" size="14"></u-icon>
         </view>
       </view>
     </view>
@@ -24,14 +24,12 @@
             <text>{{ item.customerName }}</text>
           </view>
           <view class="v-t">
-            <text style="white-space: nowrap; overflow: hidden; color: #999; max-width: 50vw; text-overflow: ellipsis">
-              {{ item.lineName }}
-            </text>
+            <text style="white-space: nowrap; overflow: hidden; color: #999; max-width: 50vw; text-overflow: ellipsis"> {{ formatSpecification }}/{{ formatVanType }} </text>
           </view>
         </view>
         <view class="info-line">
           <view class="address">
-            <view class="text">{{ item.startProvinceShortName || '' }}-{{ item.startCityShortName || '' }}</view>
+            <view class="text">{{ item.startProvinceName || '' }}-{{ item.startCityName || '' }}</view>
           </view>
           <view class="way">
             <view class="w-text">{{ item.distance || 0 }}km</view>
@@ -40,7 +38,7 @@
             </view>
           </view>
           <view class="address">
-            <view class="text">{{ item.endProvinceShortName || '' }}-{{ item.endCityShortName || '' }}</view>
+            <view class="text">{{ item.endProvinceName || '' }}-{{ item.endCityName || '' }}</view>
           </view>
         </view>
         <view class="info-task">
@@ -54,27 +52,34 @@
         <view v-if="!onlyShow" class="info-operate">
           <view class="task">
             <text>
-              已抢单<text class="color-blue">{{ item.assignVehicleNumber }}</text> /待确认<text class="color-red">{{ item.waitConfirmNumber }}</text> /待指派<text class="color-red">{{
-                item.waitAssignNumber
+              已抢单<text class="color-blue">{{ item.biddingCount }}</text> /已指派<text class="color-green">{{ item.assignedCount }}</text> /待指派<text class="color-red">{{
+                item.waitAssignCount
               }}</text>
             </text>
           </view>
-          <view class="task-2"> 剩余{{ item.remainTonnage }}吨 </view>
+          <view v-if="item.priceType === 'TON'" class="task-2"> 剩余{{ item.remainGoodsWeight || item.goodsWeight }}吨 </view>
+          <view v-if="item.priceType === 'VEHICLE'" class="task-2"> 还需要{{ item.remainVehicleNumber || item.vehicleNumber }}车 </view>
         </view>
       </view>
       <view v-if="!onlyShow" class="cc-operate">
         <view class="price-box">
-          <text class="com-price">{{ item.unitPrice || 200 }}</text
-          ><text>元/吨</text>
+          <template v-if="item.priceType === 'TON'">
+            <text class="com-price">{{ item.weightUnitPrice }}</text>
+            元/吨
+          </template>
+          <template v-if="item.priceType === 'VEHICLE'">
+            <text class="com-price">{{ item.vehicleUnitPrice }}</text>
+            元
+          </template>
         </view>
         <view class="but-box">
           <zb-tooltip placement="bottom" :visible="visible" @update:visible="e => (visible = e)">
             <template #content>
               <view class="more-action">
-                <view @click="modifyGoodSource"> 修改货源 </view>
-                <view @click="cancelGoodSource"> 取消货源 </view>
-                <view @click="endGoodSource"> 结束找车 </view>
-                <view @click="deleteGoodSource"> 删除货源 </view>
+                <view v-if="['MATCHING'].includes(item.status)" @click="modifyGoodSource"> 修改货源 </view>
+                <view v-if="['MATCHING', 'COMPLETED'].includes(item.status)" @click="cancelGoodSource"> 取消货源 </view>
+                <view v-if="['MATCHING'].includes(item.status)" @click="endGoodSource"> 结束找车 </view>
+                <view v-if="['CANCELLED'].includes(item.status)" @click="deleteGoodSource"> 删除货源 </view>
               </view>
             </template>
             <view class="button">
@@ -91,6 +96,7 @@
   </view>
 </template>
 <script>
+import { mapGetters } from 'vuex';
 import FieldCopy from '@/components/field/field-copy.vue';
 import ZbTooltip from '../../uni_modules/zb-tooltip/components/zb-tooltip/zb-tooltip.vue';
 import page from '@/mixins/page';
@@ -109,13 +115,39 @@ export default {
   },
   data() {
     return {
-      quoteMap: {
-        FINDING: '#2673fb',
-        ENDED: '#2b2a27',
-        CANCEL: '#999999',
+      visible: false,
+      colorMap: {
+        MATCHING: '#2673fb',
+        COMPLETED: '#2b2a27',
+        CANCELLED: '#999999',
       },
     };
   },
+  computed: {
+    ...mapGetters(['dictValue']),
+    formatVanType() {
+      let res = [];
+      for (let v of this.item.vanType.split(',')) {
+        if (v === 'ALL') {
+          res.push('不限');
+        } else {
+          res.push(this.dictValue('VEHICLE_COMPARTMENT_TYPE', v));
+        }
+      }
+      return res.join(',');
+    },
+    formatSpecification() {
+      let res = [];
+      for (let v of this.item.specification.split(',')) {
+        if (v === 'ALL') {
+          res.push('不限');
+        } else {
+          res.push(this.dictValue('VEHICLE_SPECIFICATION', v));
+        }
+      }
+      return res.join(',');
+    },
+  },
   methods: {
     qrShow() {
       this.$emit('qrShow', this.item.code, this.item);
@@ -127,7 +159,7 @@ export default {
     },
     // 抢单记录
     toGrabPage() {
-      uni.navigateTo({ url: `/pages/bulkOrder/bulk-order-grab-record?orderCode=${this.item.code}` });
+      uni.navigateTo({ url: `/pages/goodSource/grab-record?goodsSourceCode=${this.item.code}` });
     },
     modifyGoodSource() {
       this.visible = false;
@@ -170,6 +202,7 @@ export default {
       flex-direction: row;
       align-items: center;
       justify-content: space-between;
+      padding: 0 16rpx;
       .order-no {
         display: flex;
         align-items: center;
diff --git a/pages/goodSource/detail.vue b/pages/goodSource/detail.vue
new file mode 100644
index 0000000..b08b4c9
--- /dev/null
+++ b/pages/goodSource/detail.vue
@@ -0,0 +1,431 @@
+<template>
+  <Page name="good-source-detail" flank>
+    <template #content>
+      <card :item="form" :onlyShow="true"></card>
+      <view class="card">
+        <view class="card__item">
+          <view class="card__item_field">货物名称</view>
+          <view class="card__item_content">{{ form.goodsName || '' }}</view>
+        </view>
+        <view class="card__item" v-if="form.goodsWeight">
+          <view class="card__item_field">货物总量</view>
+          <view class="card__item_content">{{ form.goodsWeight || '' }}</view>
+        </view>
+        <view class="card__item" v-if="form.remainGoodsWeight">
+          <view class="card__item_field">货物剩余</view>
+          <view class="card__item_content">{{ form.remainGoodsWeight || '' }}</view>
+        </view>
+        <view class="card__item">
+          <view class="card__item_field">司机抢单</view>
+          <view class="card__item_content">
+            <text>
+              已抢单<text class="color-blue">{{ form.biddingCount }}</text> /已指派<text class="color-red">{{ form.assignedCount }}</text> /待指派<text class="color-red">{{
+                form.waitAssignCount
+              }}</text>
+            </text>
+          </view>
+        </view>
+        <view class="card__item">
+          <view class="card__item_field">订单备注</view>
+          <view class="card__item_content">{{ form.remark || '' }}</view>
+        </view>
+        <view class="card__item">
+          <view class="card__item_field">货源联系人</view>
+          <view class="card__item_content">
+            <text>{{ form.contactUser || '' }} {{ form.contactMobile || '' }}</text>
+          </view>
+        </view>
+        <view class="card__item">
+          <view class="card__item_field">货源发布时间</view>
+          <view class="card__item_content">
+            <text>{{ form.releaseTime || '' }}</text>
+          </view>
+        </view>
+      </view>
+      <view class="card">
+        <view class="card__item">
+          <view class="card__item_field">需求车型</view>
+          <view class="card__item_content">{{ formatSpecification || '' }}</view>
+        </view>
+        <view class="card__item">
+          <view class="card__item_field">需求箱型</view>
+          <view class="card__item_content">{{ formatVanType || '' }}</view>
+        </view>
+      </view>
+      <view class="card">
+        <view class="card__item">
+          <view class="card__item_field">装货地址</view>
+          <view class="card__item_content"> {{ form.startProvinceName || '' }}{{ form.startCityName || '' }}{{ form.startAreaName || '' }}{{ form.startAddress || '' }} </view>
+        </view>
+        <view class="card__item">
+          <view class="card__item_field">司机抢单</view>
+          <view class="card__item_content">
+            <text>
+              已抢单<text class="color-blue">{{ form.biddingCount }}</text> /已指派<text class="color-red">{{ form.assignedCount }}</text> /待指派<text class="color-red">{{
+                form.waitAssignCount
+              }}</text>
+            </text>
+          </view>
+        </view>
+        <view class="card__item">
+          <view class="card__item_field">订单备注</view>
+          <view class="card__item_content">{{ form.remark || '' }}</view>
+        </view>
+        <view class="card__item">
+          <view class="card__item_field">货源联系人</view>
+          <view class="card__item_content">
+            <text>{{ form.contactUser || '' }} {{ form.contactMobile || '' }}</text>
+          </view>
+        </view>
+        <view class="card__item">
+          <view class="card__item_field">货源发布时间</view>
+          <view class="card__item_content">
+            <text>{{ form.releaseTime || '' }}</text>
+          </view>
+        </view>
+      </view>
+      <view class="card">
+        <view class="card__item">
+          <view class="card__item_field">计价方式</view>
+          <view class="card__item_content">
+            <render-dict dict="FREIGHT_GOODS_SOURCE_PRICE_TYPE" :value="form.priceType"></render-dict>
+          </view>
+        </view>
+        <template v-if="form.priceType === 'VEHICLE'">
+          <view class="card__item">
+            <view class="card__item_field">需求车数</view>
+            <view class="card__item_content">{{ form.vehicleNumber }}车</view>
+          </view>
+          <view class="card__item">
+            <view class="card__item_field">总运费</view>
+            <view class="card__item_content">{{ form.vehicleUnitPrice }}元/车</view>
+          </view>
+        </template>
+        <template v-if="form.priceType === 'TON'">
+          <view class="card__item">
+            <view class="card__item_field">货物总量</view>
+            <view class="card__item_content">{{ form.goodsWeight }}吨</view>
+          </view>
+          <view class="card__item">
+            <view class="card__item_field">运输单价</view>
+            <view class="card__item_content">{{ form.weightUnitPrice }}元/吨</view>
+          </view>
+        </template>
+      </view>
+    </template>
+  </Page>
+</template>
+<script>
+import card from './card.vue';
+import { mapGetters } from 'vuex';
+import FieldCopy from '@/components/field/field-copy.vue';
+export default {
+  name: 'good-source-detail',
+  components: { FieldCopy, card },
+  data() {
+    return {
+      form: {
+        id: '',
+        code: '',
+        customerName: '',
+        goodsName: '',
+        goodsWeight: '',
+        remainGoodsWeight: '',
+        biddingCount: '',
+        assignedCount: '',
+        waitAssignCount: '',
+        contactUser: '',
+        contactMobile: '',
+        releaseTime: '',
+        priceType: '',
+        vanType: '',
+        specification: '',
+        startProvinceShortName: '',
+        startProvinceName: '',
+        startCityShortName: '',
+        startCityName: '',
+        startAreaName: '',
+        startAddress: '',
+        startAddressLat: '',
+        startAddressLng: '',
+        endProvinceName: '',
+        endProvinceShortName: '',
+        endCityName: '',
+        endCityShortName: '',
+        endAreaName: '',
+        endAddress: '',
+        endAddressLat: '',
+        endAddressLng: '',
+        remark: '',
+        status: '',
+        distance: '',
+        vehicleNumber: '',
+        vehicleUnitPrice: '',
+        weightUnitPrice: '',
+        startTime: '',
+        endTime: '',
+      },
+    };
+  },
+  computed: {
+    ...mapGetters(['userInfo', 'dictList', 'dictValue']),
+    formatVanType() {
+      if (!this.form.code) return '';
+      let res = [];
+      for (let v of this.form.vanType.split(',')) {
+        if (v === 'ALL') {
+          res.push('不限');
+        } else {
+          res.push(this.dictValue('VEHICLE_COMPARTMENT_TYPE', v));
+        }
+      }
+      return res.join('/');
+    },
+    formatSpecification() {
+      if (!this.form.code) return '';
+      let res = [];
+      for (let v of this.form.specification.split(',')) {
+        if (v === 'ALL') {
+          res.push('不限');
+        } else {
+          res.push(this.dictValue('VEHICLE_SPECIFICATION', v));
+        }
+      }
+      return res.join('/');
+    },
+  },
+  onLoad(option) {
+    this.initData(option.code);
+  },
+  methods: {
+    initData(code = '') {
+      uni.$u.api.freightGoodsSourceV2
+        .getDetail({
+          code,
+        })
+        .then(res => {
+          this.form = res.result || {};
+        });
+    },
+  },
+};
+</script>
+<style lang="scss">
+.page-good-source-detail {
+  &__content {
+    .card {
+      background-color: $color-white;
+      color: $color-text;
+      padding: $padding-sm;
+      margin-bottom: $padding-sm;
+      border-radius: $radius-md;
+      box-shadow: $shadow-normal;
+      font-size: $font-md;
+      &__header {
+        display: flex;
+        align-items: center;
+        border-bottom: 1px solid $color-border;
+        padding-bottom: $padding-sm;
+        margin-bottom: $padding-sm;
+        justify-content: space-between;
+        .title {
+          width: 100%;
+          display: flex;
+          flex-direction: row;
+          align-items: center;
+          justify-content: space-between;
+          .order-no {
+            display: flex;
+            align-items: center;
+          }
+          .status {
+            font-weight: bold;
+          }
+        }
+      }
+      .count-line {
+        padding-top: $padding-sm;
+        margin-top: $padding-sm;
+        border-top: 1px solid $color-border;
+        display: flex;
+        justify-content: space-between;
+        .field {
+          font-weight: 400;
+          font-size: 28upx;
+          color: #999999;
+          text-align: left;
+        }
+        .number {
+          font-weight: 600;
+          font-size: 28upx;
+          color: #2b2a27;
+          text-align: center;
+          font-style: normal;
+        }
+      }
+      &__item {
+        display: flex;
+        font-size: 26upx;
+        color: #999999;
+        align-content: baseline;
+        &--warning {
+          height: 28rpx;
+          color: #f52723;
+          font-size: 20rpx;
+          margin-left: 20upx;
+          padding-left: 10upx;
+          padding-right: 10upx;
+          border-radius: 8upx;
+          border: 2rpx solid #f52723;
+        }
+        &--paying {
+          height: 28rpx;
+          color: #ff9339;
+          font-size: 20rpx;
+          margin-left: 20upx;
+          padding-left: 10upx;
+          padding-right: 10upx;
+          border-radius: 8upx;
+          border: 2rpx solid #ff9339;
+        }
+        &--success {
+          height: 28rpx;
+          color: #00b87a;
+          font-size: 20rpx;
+          margin-left: 20upx;
+          padding-left: 10upx;
+          padding-right: 10upx;
+          border-radius: 8upx;
+          border: 2rpx solid #00b87a;
+        }
+        &_field {
+          font-weight: 400;
+          font-size: 28upx;
+          color: #999999;
+          width: 170upx;
+          text-align: left;
+        }
+        &_content {
+          flex: 1;
+          font-weight: 400;
+          font-size: 28upx;
+          color: #2b2a27;
+          text-align: left;
+          font-style: normal;
+          display: flex;
+          justify-content: space-between;
+          overflow-wrap: anywhere;
+          &_text {
+            font-weight: 400;
+            font-size: 28upx;
+            text-align: left;
+            font-style: normal;
+          }
+          &_action {
+            font-weight: 400;
+            font-size: 28upx;
+            color: #2673fb;
+            text-align: right;
+            font-style: normal;
+          }
+          text + text {
+            margin-left: 10rpx;
+          }
+          .fee-service {
+            font-size: 26rpx;
+          }
+        }
+      }
+      .card__item + .card__item {
+        margin-top: $padding-sm;
+      }
+      &__steps {
+        margin-top: $padding-md;
+        .step {
+          &-item {
+            display: flex;
+            align-content: space-around;
+            font-size: $font-md;
+            .icon-waypoint {
+              font-size: $font-sm;
+              margin-right: $padding-sm;
+              height: $padding-md * 1.2;
+              width: $padding-md * 1.2;
+              min-width: $padding-md * 1.2;
+            }
+            .city {
+              font-weight: 500;
+              font-size: 32upx;
+              color: #2b2a27;
+              text-align: left;
+              font-style: normal;
+            }
+            .address {
+              margin-top: $padding-xs;
+              font-weight: 400;
+              font-size: 24upx;
+              color: #999999;
+              text-align: left;
+              font-style: normal;
+              text + text {
+                margin-left: 10rpx;
+              }
+            }
+            .address_action {
+              margin-top: $padding-xs;
+              font-weight: 400;
+              font-size: 24upx;
+              color: #2673fb;
+              text-align: left;
+              font-style: normal;
+              display: flex;
+              justify-content: space-between;
+              .u-icon {
+                display: inline-block !important;
+              }
+            }
+            &:not(:first-child) {
+              margin-top: $padding-md;
+            }
+          }
+        }
+      }
+      &_label {
+      }
+      .label {
+        font-weight: 500;
+        font-size: 32rpx;
+        color: #2b2a27;
+      }
+      .action {
+        font-size: 26rpx;
+        color: #007aff;
+      }
+    }
+    .detail-card {
+      margin-bottom: 24rpx;
+      background: $color-white;
+      padding: 24rpx 12rpx;
+      .view-item {
+        display: flex;
+        .view-item__label {
+          padding-left: 26rpx;
+          color: #999999;
+          width: 185rpx;
+        }
+        .view-item__value {
+          flex: 1;
+          color: #2b2a27;
+          padding-left: 32rpx;
+          padding-right: 5rpx;
+          display: flex;
+          flex-wrap: wrap;
+        }
+      }
+      .view-item:not(:last-child) {
+        margin-bottom: 30rpx;
+      }
+    }
+  }
+}
+</style>
diff --git a/pages/goodSource/grab-record.vue b/pages/goodSource/grab-record.vue
new file mode 100644
index 0000000..136e035
--- /dev/null
+++ b/pages/goodSource/grab-record.vue
@@ -0,0 +1,304 @@
+<template>
+  <Page name="grab-record" flank>
+    <template #header>
+      <u-tabs :current="currentTab" :list="navbarList" @click="onScrollCheckChange" :scrollable="false" :disabled="loading" :activeStyle="{ color: '#1E7B6B' }"> </u-tabs>
+      <view class="line"></view>
+      <view class="quick-tag">
+        <view class="quick-tag-group">
+          <view class="quick-tag-item" :class="searchForm.projectCode ? 'active' : ''" @click="selectQuickTag({ key: 'projectCode', value: searchForm.projectCode })">
+            <text>{{ searchForm.projectName || '车牌号' }}</text>
+            <view class="sx-img">
+              <image v-if="searchForm.projectCode" class="sx-image" :src="formatImagePath('active-down')"></image>
+              <image v-else class="sx-image" :src="formatImagePath('down')"></image>
+            </view>
+            <view style="position: absolute; top: 0; right: 0">
+              <u-icon name="close"></u-icon>
+            </view>
+          </view>
+          <view class="quick-tag-item" :class="searchForm.startCityCode ? 'active' : ''" @click="selectQuickTag({ key: 'startCityCode', value: searchForm.startCityCode })">
+            <text>{{ searchForm.startCityName || '司机姓名' }}</text>
+            <view class="sx-img">
+              <image v-if="searchForm.startCityCode" class="sx-image" :src="formatImagePath('active-down')"></image>
+              <image v-else class="sx-image" :src="formatImagePath('down')"></image>
+            </view>
+          </view>
+          <view class="quick-tag-item" :class="searchForm.endCityCode ? 'active' : ''" @click="selectQuickTag({ key: 'endCityCode', value: searchForm.endCityCode })">
+            <text>{{ searchForm.endCityName || '司机手机' }}</text>
+            <view class="sx-img">
+              <image v-if="searchForm.endCityCode" class="sx-image" :src="formatImagePath('active-down')"></image>
+              <image v-else class="sx-image" :src="formatImagePath('down')"></image>
+            </view>
+          </view>
+          <view>抢单时间<zui-icon name="enter"></zui-icon></view>
+        </view>
+      </view>
+    </template>
+    <template #content>
+      <List ref="list" v-model="list" :loading.sync="loading" :api="searchAPI">
+        <view v-for="(form, index) in list" :key="index">
+          <view class="card">
+            <view-item title="订单号" :value="form.code">
+              <view style="flex: 1; display: flex; justify-content: space-between">
+                <view>{{ form.code }}</view>
+                <view :style="{ color: statusMap[form.status], display: 'flex' }">
+                  <render-dict :value="form.status" dict="FREIGHT_GOODS_SOURCE_BIDDING_STATUS"></render-dict>
+                </view>
+              </view>
+            </view-item>
+            <view-item title="抢单司机">
+              <field-call :value="form.driverMobile">
+                <text>{{ form.driverName || '' }}{{ form.driverMobile || '' }}</text>
+              </field-call>
+            </view-item>
+            <view-item title="抢单车辆">
+              <text>
+                <render-dict :value="form.specification" dict="VEHICLE_SPECIFICATION"></render-dict>
+              </text>
+              <text>
+                <render-dict :value="form.vanType" dict="VEHICLE_COMPARTMENT_TYPE"></render-dict>
+              </text>
+              <text>/{{ form.vehicleLicenseNum }}</text>
+              <text v-if="form.trailerLicenseNum">/{{ form.trailerLicenseNum }}</text>
+            </view-item>
+            <view-item title="抢单时间" :value="form.biddingTime"></view-item>
+            <view-item title="装卸吨位">
+              <text>{{ form.biddingWeight || '--' }}吨</text>
+            </view-item>
+            <view class="buts">
+              <view>总运费：{{ form.paidAmount }}</view>
+              <template v-if="form.status === 'WAIT_ASSIGN'">
+                <zui-button class="zui-button" @click="(cancelCode = form.code), (cancelRemark = ''), (cancelShow = true)">取消</zui-button>
+                <zui-button class="zui-button" type="ghost" theme="primary" @click="() => toSubmit(form)">确认</zui-button>
+              </template>
+            </view>
+          </view>
+        </view>
+      </List>
+      <u-modal :show="cancelShow" title="取消原因" @cancel="cancelShow = false" @confirm="confirmCancel" showConfirmButton>
+        <u-input v-model="cancelRemark" placeholder="取消原因"></u-input>
+      </u-modal>
+      <popup-platenumber v-model="platenumberVisible" :plate="searchForm.vehicleCode" @cancel="platenumberVisible = false" @confirm="onPlatenumberSelect" />
+    </template>
+  </Page>
+</template>
+
+<script>
+import MIX_ORIGIN from '@/mixins/origin';
+import { mapGetters } from 'vuex';
+
+export default {
+  mixins: [MIX_ORIGIN],
+  data() {
+    return {
+      cancelShow: false,
+      cancelCode: '',
+      cancelRemark: '',
+      currentTab: 0,
+      loading: false,
+      list: [],
+      countMap: {
+        waitAssignCount: 0,
+        assignedCount: 0,
+        cancelledCount: 0,
+      },
+      orderStatus: 'WAIT_ASSIGN',
+      goodsSourceCode: '',
+      statusMap: {
+        WAIT_ASSIGN: '#F25643',
+        ASSIGNED: '#3296FA',
+        CANCELLED: '#999999',
+      },
+      platenumberVisible: false,
+      searchForm: {
+        vehicleCode: '',
+        loadFlag: '',
+        unloadFlag: '',
+        waybillCode: '',
+        waybillStatus: '',
+      },
+    };
+  },
+  onShow() {
+    this.onSearch({ showLoading: true });
+  },
+  onLoad(options) {
+    this.goodsSourceCode = options.goodsSourceCode;
+  },
+  computed: {
+    ...mapGetters(['dictList']),
+    navbarList() {
+      return [
+        { name: `待指派(${this.countMap.waitAssignCount || 0})`, prop: 'WAIT_ASSIGN' },
+        { name: `已指派(${this.countMap.assignedCount || 0})`, prop: 'ASSIGNED' },
+        { name: `已取消(${this.countMap.cancelledCount || 0})`, prop: 'CANCELLED' },
+      ];
+    },
+  },
+  methods: {
+    // 打开车牌选择
+    onSelectPlate() {
+      this.platenumberVisible = true;
+    },
+    // 选中车牌
+    onPlatenumberSelect(value) {
+      this.platenumberVisible = false;
+      this.searchForm.vehicleCode = value;
+      this.onSearch({ showLoading: true });
+    },
+    // 查询数据
+    searchAPI(params) {
+      this.getCount();
+      return uni.$u.api.freightGoodsSourceV2.biddingPage({
+        ...params,
+        status: this.orderStatus,
+        goodsSourceCode: this.goodsSourceCode,
+      });
+    },
+    // 获取统计数量
+    getCount() {
+      uni.$u.api.freightGoodsSourceV2.biddingCount({ goodsSourceCode: this.goodsSourceCode }).then(res => {
+        let result = res?.result || {};
+        Object.keys(this.countMap).forEach(item => {
+          this.countMap[item] = result[item] ? result[item] : 0;
+        });
+      });
+    },
+    onScrollCheckChange(e) {
+      this.currentTab = e.index;
+      this.orderStatus = this.navbarList[e.index].prop;
+      this.onSearch({ showLoading: true });
+    },
+    // 确认-发布需求
+    toSubmit(item) {
+      uni.navigateTo({
+        url: `/pages/order/add?eventCode=${item.code}`,
+        success(res) {
+          res.eventChannel.emit('get-item', item);
+        },
+      });
+    },
+    // 取消
+    confirmCancel() {
+      if (this.loading) return;
+      uni.$u.api.freightGoodsSourceV2.cancelBidding({ cancelReason: this.cancelRemark, code: this.cancelCode }).then(res => {
+        uni.showToast({ title: '取消成功', icon: 'none' });
+        this.onSearch({ showLoading: true });
+      });
+    },
+  },
+};
+</script>
+
+<style lang="scss">
+.page-grab-record {
+  &__header {
+    padding: 0 !important;
+    .line {
+      height: 1rpx;
+      background: #f6f6f6;
+      position: relative;
+      top: -5rpx;
+    }
+    .quick-tag {
+      display: flex;
+      padding: 15upx 22upx;
+      box-sizing: border-box;
+      position: relative;
+      .quick-tag-group {
+        flex: 1;
+        display: flex;
+        align-items: center;
+        background-color: #fff;
+        padding-left: $padding-xs !important;
+        padding-right: $padding-xs !important;
+        overflow-y: auto;
+
+        .quick-tag-item {
+          flex-shrink: 0;
+          min-width: 158upx;
+          height: 58upx;
+          background: #f6f6f6;
+          border-radius: 8upx;
+          font-size: 28upx;
+          font-weight: 400;
+          color: #2b2a27;
+          display: flex;
+          align-items: center;
+          justify-content: center;
+          padding: 0 10upx;
+          box-sizing: border-box;
+          position: relative;
+          &:not(:last-child) {
+            margin-right: 18upx;
+          }
+
+          &.active {
+            background: #ffffff;
+            border-radius: 8upx;
+            border: 2upx solid #2673fb;
+            font-size: 28upx;
+            font-family:
+              PingFangSC,
+              PingFang SC;
+            font-weight: 400;
+            color: #2673fb;
+          }
+
+          .sx-img {
+            height: 12upx;
+            width: 14upx;
+            position: relative;
+            margin-left: 12upx;
+
+            .sx-image {
+              width: 100%;
+              height: 100%;
+              position: absolute;
+              top: 0;
+              left: 0;
+            }
+          }
+        }
+      }
+    }
+  }
+
+  &__content {
+    padding: 22rpx !important;
+
+    .card {
+      padding: 24rpx 12rpx 24rpx 0;
+      margin-bottom: 20rpx;
+      background: white;
+      border-radius: 20rpx;
+      .view-item {
+        display: flex;
+        .view-item__label {
+          padding-left: 26rpx;
+          color: #999999;
+          width: 185rpx;
+        }
+        .view-item__value {
+          flex: 1;
+          color: #2b2a27;
+          padding-left: 32rpx;
+          padding-right: 5rpx;
+          display: flex;
+          flex-wrap: wrap;
+        }
+      }
+      .view-item:not(:last-child) {
+        margin-bottom: 30rpx;
+      }
+      .buts {
+        display: flex;
+        justify-content: flex-end;
+
+        .zui-button + .zui-button {
+          margin-left: 20rpx;
+        }
+      }
+    }
+  }
+}
+</style>
diff --git a/pages/goodSource/index.vue b/pages/goodSource/index.vue
index 49c9022..3b6c1a5 100644
--- a/pages/goodSource/index.vue
+++ b/pages/goodSource/index.vue
@@ -1,7 +1,7 @@
 <template>
   <Page name="good-source" flank>
     <template #header>
-      <u-tabs :current="activeTab" :list="tabList" @click="onTabChange" :scrollable="true" :disabled="loading" :activeStyle="{ color: '#1E7B6B' }"> </u-tabs>
+      <u-tabs :current="activeTab" :list="tabList" @click="onTabChange" :scrollable="false" :disabled="loading" :activeStyle="{ color: '#1E7B6B' }"> </u-tabs>
       <view class="line"></view>
       <view class="quick-tag">
         <view class="quick-tag-group">
@@ -11,6 +11,9 @@
               <image v-if="searchForm.projectCode" class="sx-image" :src="formatImagePath('active-down')"></image>
               <image v-else class="sx-image" :src="formatImagePath('down')"></image>
             </view>
+            <view style="position: absolute; top: 0; right: 0">
+              <u-icon name="close"></u-icon>
+            </view>
           </view>
           <view class="quick-tag-item" :class="searchForm.startCityCode ? 'active' : ''" @click="selectQuickTag({ key: 'startCityCode', value: searchForm.startCityCode })">
             <text>{{ searchForm.startCityName || '始发地' }}</text>
@@ -26,16 +29,17 @@
               <image v-else class="sx-image" :src="formatImagePath('down')"></image>
             </view>
           </view>
+          <view>发布时间<zui-icon name="enter"></zui-icon></view>
         </view>
-        <view class="quick-screen" @click="openFilter">
-          <image class="search-image" :src="formatImagePath('search')"></image>
-        </view>
+        <!--        <view class="quick-screen" @click="openFilter">-->
+        <!--          <image class="search-image" :src="formatImagePath('search')"></image>-->
+        <!--        </view>-->
       </view>
     </template>
     <template #content>
       <List ref="list" v-model="list" :api="orderAPI" @update:loading="e => (loading = e)" :verify="true">
         <template v-for="(item, index) in list">
-          <card @modify="more" @cancel="cancelOrder" @end="deleteOrder" @delete="deleteOrder" @qrShow="qrCodeShow" :key="index" :item="item" @tap="toDetail(item.code)"></card>
+          <card @modify="modifySource" @cancel="cancelSource" @end="completeSource" @delete="deleteSource" @qrShow="qrCodeShow" :key="index" :item="item" @tap="toDetail(item.code)"></card>
         </template>
         <template #empty>
           <Empty tips="暂无数据" />
@@ -80,7 +84,6 @@ export default {
       popValue: '',
       popConfig: {
         cancel: { fun: '', title: '取消原因', placeholder: '请输入取消原因，必填' },
-        delete: { fun: '', title: '删除原因', placeholder: '请输入删除原因，必填' },
       },
       loading: false,
       popShow: false,
@@ -88,17 +91,11 @@ export default {
       searchForm: {
         projectCode: '',
         projectName: '',
-        code: '', //
-        driverName: '',
-        driverMobile: '', // 客户
-        vehicleLicenseNum: '',
-        unHandledExceptionFlag: '', // 存在异常
         startCityCode: '',
+        startCityName: '',
         endCityCode: '',
+        endCityName: '',
         status: '',
-        receiptFlag: '', // 是否已签单
-        payStatus: '', // 支付状态
-        payStatusName: '', //
       },
       activeTab: 0,
       count: {},
@@ -111,9 +108,9 @@ export default {
   computed: {
     tabList() {
       let list = [
-        { name: '找车中', value: 'TRANSFER', key: 'transfer' },
-        { name: '已结束', value: 'COMPLETED', key: 'completed' },
-        { name: '已取消', value: 'CANCEL', key: 'cancel' },
+        { name: '找车中', value: 'MATCHING', key: 'matchingCount' },
+        { name: '已结束', value: 'COMPLETED', key: 'completedCount' },
+        { name: '已取消', value: 'CANCELLED', key: 'cancelledCount' },
       ];
       return Object.keys(this.count).length > 0
         ? list.map(item => {
@@ -164,19 +161,51 @@ export default {
         });
       }
     },
-    // 再来一单
-    more(code) {
+    // 修改货源
+    modifySource(code) {
       this.currentCode = code;
       this.toAddPage('?code=' + code);
     },
-    // 取消订单
-    cancelOrder(code) {
+    // 取消货源
+    cancelSource(code) {
       this.currentCode = code;
       this.popType = 'cancel';
       this.popValue = '';
       this.popShow = true;
       uni.hideTabBar();
     },
+    // 删除货源
+    deleteSource(code) {
+      uni.showModal({
+        title: '提示',
+        content: '确定删除此货源吗？',
+        success: res => {
+          if (res.confirm) {
+            uni.$u.api.freightGoodsSourceV2.delete([code]).then(res => {
+              if (res.success) {
+                this.onSearch();
+              }
+            });
+          }
+        },
+      });
+    },
+    // 结束货源
+    completeSource(code) {
+      uni.showModal({
+        title: '提示',
+        content: '确定结束此货源吗？',
+        success: res => {
+          if (res.confirm) {
+            uni.$u.api.freightGoodsSourceV2.complete([code]).then(res => {
+              if (res.success) {
+                this.onSearch();
+              }
+            });
+          }
+        },
+      });
+    },
     closePop() {
       setTimeout(() => uni.showTabBar(), 300);
       this.popShow = false;
@@ -186,9 +215,9 @@ export default {
         uni.showToast({ title: '请输入原因', icon: 'none' });
         return;
       }
-      uni.$u.api.freightOrder[this.popType]({
-        codeList: [this.currentCode],
-        reason: this.popValue,
+      uni.$u.api.freightGoodsSourceV2[this.popType]({
+        code: this.currentCode,
+        cancelReason: this.popValue,
       }).then(res => {
         if (res.success) {
           this.closePop();
@@ -196,24 +225,6 @@ export default {
         }
       });
     },
-    // 删除订单
-    deleteOrder(code) {
-      this.currentCode = code;
-      this.popType = 'delete';
-      this.popValue = '';
-      this.popShow = true;
-      uni.hideTabBar();
-    },
-    toUploadReceipt(code) {
-      uni.navigateTo({
-        url: '/pages/order/upload-receipt?code=' + code,
-        events: {
-          refreshData: () => {
-            this.onSearch();
-          },
-        },
-      });
-    },
     toAddPage(param) {
       uni.navigateTo({
         url: '/pages/goodSource/add' + param,
@@ -242,39 +253,19 @@ export default {
         status: this.tabList[this.activeTab].value,
       };
       this.getAggregateType(format);
-      return uni.$u.api.freightOrder.page({
+      return uni.$u.api.freightGoodsSourceV2.page({
         ...format,
         ...params,
       });
     },
     // 获取聚合数量
     getAggregateType(params) {
-      uni.$u.api.freightOrder.count({ ...params, status: '' }).then(res => {
+      uni.$u.api.freightGoodsSourceV2.count({ ...params, status: '' }).then(res => {
         this.count = res?.result || {};
       });
     },
     toDetail(code) {
-      uni.navigateTo({ url: '/pages/order/detail?code=' + code });
-    },
-    toStartCar(code) {
-      uni.navigateTo({
-        url: '/pages/order/start-car?code=' + code,
-        events: {
-          refreshData: () => {
-            this.onSearch();
-          },
-        },
-      });
-    },
-    toArrivalCar(code) {
-      uni.navigateTo({
-        url: '/pages/order/arrival-car?code=' + code,
-        events: {
-          refreshData: () => {
-            this.onSearch();
-          },
-        },
-      });
+      uni.navigateTo({ url: '/pages/goodSource/detail?code=' + code });
     },
     qrCodeShow(code, data) {
       if (this.loading) return;
@@ -308,7 +299,7 @@ export default {
 <style lang="scss">
 .page-good-source {
   &__content {
-    padding-bottom: 100px !important;
+    padding-bottom: 120px !important;
   }
   &__header {
     padding: 0 !important;
@@ -325,32 +316,6 @@ export default {
       padding: 15upx 22upx;
       box-sizing: border-box;
       position: relative;
-
-      .quick-cover {
-        width: 25upx;
-        height: 90upx;
-        position: absolute;
-        right: 122upx;
-        top: 0;
-
-        .cover-image {
-          width: 100%;
-          height: 100%;
-        }
-      }
-
-      .quick-screen {
-        width: 100upx;
-        display: flex;
-        align-items: center;
-        justify-content: center;
-
-        .search-image {
-          width: 42upx;
-          height: 42upx;
-        }
-      }
-
       .quick-tag-group {
         flex: 1;
         display: flex;
@@ -374,7 +339,7 @@ export default {
           justify-content: center;
           padding: 0 10upx;
           box-sizing: border-box;
-
+          position: relative;
           &:not(:last-child) {
             margin-right: 18upx;
           }
diff --git a/pages/order/add.vue b/pages/order/add.vue
index bbe5262..6e63c91 100644
--- a/pages/order/add.vue
+++ b/pages/order/add.vue
@@ -249,9 +249,45 @@ export default {
     if (option.code) {
       this.initData(option.code);
     }
+    // 从抢单来的数据
+    if (option.eventCode) {
+      const eventChannel = this.getOpenerEventChannel();
+      eventChannel.on('get-item', detail => {
+        this.setFormValue(detail);
+      });
+    }
     this.initConfig();
   },
   methods: {
+    setFormValue(detail) {
+      ['goodsName', 'waypoints', 'allowDriverSeeFreightAmountNode', 'projectCode', 'projectName', 'remark', 'goodsPiece', 'goodsWeight', 'goodsVolume'].forEach(key => {
+        this.form[key] = detail[key];
+      });
+      if (detail.vehicleLicenseNum) {
+        this.typeCar = 'licenseNumber';
+        this.form.licenseNumber = detail.vehicleLicenseNum;
+        this.vehicleChange(detail.vehicleLicenseNum);
+      }
+      if (detail.trailerLicenseNum) {
+        setTimeout(() => {
+          this.typeCar = 'trailerNumber';
+          this.form.trailerNumber = detail.trailerLicenseNum;
+          this.vehicleChange(detail.trailerLicenseNum);
+        }, 500);
+      }
+      this.form.mobile = detail.driverMobile;
+      this.form.driverId = detail.driverId;
+      this.form.driverName = detail.driverName;
+      this.form.driverMobile = detail.driverMobile;
+      this.payeeModel = {
+        driverId: detail.payeeId,
+        dueBank: detail.dueBank,
+        openingBank: detail.openingBank,
+        dueBankCardNo: detail.dueBankCardNo,
+      };
+      this.$refs.payee.setItem(this.payeeModel);
+      this.computedDistance();
+    },
     clipboard(data) {
       if (!data) return;
       let { cliMobile = '', cliVehicle = '', cliTrailer = '' } = this.getClipboardInfo(data);
@@ -333,33 +369,7 @@ export default {
     initData(code) {
       uni.$u.api.freightOrder.getDetail({ code }).then(res => {
         let detail = res.result || {};
-        ['goodsName', 'waypoints', 'allowDriverSeeFreightAmountNode', 'projectCode', 'projectName', 'remark', 'goodsPiece', 'goodsWeight', 'goodsVolume'].forEach(key => {
-          this.form[key] = detail[key];
-        });
-        if (detail.vehicleLicenseNum) {
-          this.typeCar = 'licenseNumber';
-          this.form.licenseNumber = detail.vehicleLicenseNum;
-          this.vehicleChange(detail.vehicleLicenseNum);
-        }
-        if (detail.trailerLicenseNum) {
-          setTimeout(() => {
-            this.typeCar = 'trailerNumber';
-            this.form.trailerNumber = detail.trailerLicenseNum;
-            this.vehicleChange(detail.trailerLicenseNum);
-          }, 500);
-        }
-        this.form.mobile = detail.driverMobile;
-        this.form.driverId = detail.driverId;
-        this.form.driverName = detail.driverName;
-        this.form.driverMobile = detail.driverMobile;
-        this.payeeModel = {
-          driverId: detail.payeeId,
-          dueBank: detail.dueBank,
-          openingBank: detail.openingBank,
-          dueBankCardNo: detail.dueBankCardNo,
-        };
-        this.$refs.payee.setItem(this.payeeModel);
-        this.computedDistance();
+        this.setFormValue(detail);
       });
     },
     selectRemark() {
diff --git a/store/index.js b/store/index.js
index ea40f72..17f89b0 100644
--- a/store/index.js
+++ b/store/index.js
@@ -95,6 +95,10 @@ const store = new Vuex.Store({
     SET_AUTHED(state, authed) {
       state.authed = authed;
       uni.$emit('authed', authed);
+      if (!authed) {
+        cache.put('USERINFO', {});
+        state.userInfo = {};
+      }
     },
     // 设置小程序来源的类型
     SET_ORIGIN(state, origin) {
diff --git a/styles/common.scss b/styles/common.scss
index f3b442c..1ecd2c3 100644
--- a/styles/common.scss
+++ b/styles/common.scss
@@ -190,6 +190,12 @@ body {
 .color-red {
 	color: $color-red;
 }
+.color-blue {
+  color: $color-blue;
+}
+.color-green {
+  color: $color-green;
+}
 
 .color-orange {
 	color: $color-zy-orange;
diff --git a/utils/format-value.js b/utils/format-value.js
index 1491592..df42cb4 100644
--- a/utils/format-value.js
+++ b/utils/format-value.js
@@ -1,76 +1,133 @@
 export function formatValueByGapRule(gapRule, value, gap = ' ', range, isAdd = 1) {
-  const arr = value ? value.split('') : []
-  let showValue = ''
-  const rule = []
+  const arr = value ? value.split('') : [];
+  let showValue = '';
+  const rule = [];
   gapRule.split('|').some((n, j) => {
-    rule[j] = +n + (rule[j - 1] ? +rule[j - 1] : 0)
-  })
-  let j = 0
+    rule[j] = +n + (rule[j - 1] ? +rule[j - 1] : 0);
+  });
+  let j = 0;
   arr.some((n, i) => {
     // Remove the excess part
     if (i > rule[rule.length - 1] - 1) {
-      return
+      return;
     }
     if (i > 0 && i === rule[j]) {
-      showValue = showValue + gap + n
-      j++
+      showValue = showValue + gap + n;
+      j++;
     } else {
-      showValue = showValue + '' + n
+      showValue = showValue + '' + n;
     }
-  })
-  let adapt = 0
+  });
+  let adapt = 0;
   rule.some((n, j) => {
     if (range === +n + 1 + j) {
-      adapt = 1 * isAdd
+      adapt = 1 * isAdd;
     }
-  })
-  range = typeof range !== 'undefined' ? (range === 0 ? 0 : range + adapt) : showValue.length
-  return {value: showValue, range: range}
+  });
+  range = typeof range !== 'undefined' ? (range === 0 ? 0 : range + adapt) : showValue.length;
+  return { value: showValue, range: range };
 }
 
 export function formatValueByGapStep(step, value, gap = ' ', direction = 'right', range, isAdd = 1, oldValue = '') {
   if (value.length === 0) {
-    return {value, range}
+    return { value, range };
   }
 
-  const arr = value && value.split('')
-  let _range = range
-  let showValue = ''
+  const arr = value && value.split('');
+  let _range = range;
+  let showValue = '';
 
   if (direction === 'right') {
     for (let j = arr.length - 1, k = 0; j >= 0; j--, k++) {
-      const m = arr[j]
-      showValue = k > 0 && k % step === 0 ? m + gap + showValue : m + '' + showValue
+      const m = arr[j];
+      showValue = k > 0 && k % step === 0 ? m + gap + showValue : m + '' + showValue;
     }
     if (isAdd === 1) {
       // 在添加的情况下，如果添加前字符串的长度减去新的字符串的长度为2，说明多了一个间隔符，需要调整range
       if (oldValue.length - showValue.length === -2) {
-        _range = range + 1
+        _range = range + 1;
       }
     } else {
       // 在删除情况下，如果删除前字符串的长度减去新的字符串的长度为2，说明少了一个间隔符，需要调整range
       if (oldValue.length - showValue.length === 2) {
-        _range = range - 1
+        _range = range - 1;
       }
       // 删除到最开始，range 保持 0
       if (_range <= 0) {
-        _range = 0
+        _range = 0;
       }
     }
   } else {
     arr.some((n, i) => {
-      showValue = i > 0 && i % step === 0 ? showValue + gap + n : showValue + '' + n
-    })
-    const adapt = range % (step + 1) === 0 ? 1 * isAdd : 0
-    _range = typeof range !== 'undefined' ? (range === 0 ? 0 : range + adapt) : showValue.length
+      showValue = i > 0 && i % step === 0 ? showValue + gap + n : showValue + '' + n;
+    });
+    const adapt = range % (step + 1) === 0 ? 1 * isAdd : 0;
+    _range = typeof range !== 'undefined' ? (range === 0 ? 0 : range + adapt) : showValue.length;
   }
 
-  return {value: showValue, range: _range}
+  return { value: showValue, range: _range };
 }
 
 export function trimValue(value, gap = ' ') {
-  value = typeof value === 'undefined' ? '' : value
-  const reg = new RegExp(gap, 'g')
-  value = value.toString().replace(reg, '')
-  return value
+  value = typeof value === 'undefined' ? '' : value;
+  const reg = new RegExp(gap, 'g');
+  value = value.toString().replace(reg, '');
+  return value;
+}
+
+function getAddress(geo) {
+  const { regeocode = {} } = geo || {};
+  const { addressComponent = {} } = regeocode || {};
+  const { province, city, district, township, streetNumber } = addressComponent || {};
+  const { street, number } = streetNumber || {};
+  const formattedAddress = regeocode.formatted_address || regeocode.formattedAddress || '';
+  let amapAddress = formattedAddress.replace(province, '');
+  amapAddress = amapAddress.replace(city, '');
+  amapAddress = amapAddress.replace(district, '');
+  amapAddress = amapAddress.replace(township, '');
+  amapAddress = amapAddress.replace(street, '');
+  amapAddress = amapAddress.replace(number, '');
+  return {
+    formattedAddress,
+    fullAddress: `${province}${city}${district}${township}${street}${number}`,
+    address: `${township}${street}${number}${amapAddress}`,
+    amapAddress,
+    adcode: addressComponent.adcode,
+    township,
+  };
+}
+
+export function formatLngLat({ lat, lng }) {
+  if (!lat || !lng) {
+    return Promise.resolve({});
+  }
+  return new Promise(resolve => {
+    uni.request({
+      url: 'https://restapi.amap.com/v3/geocode/regeo', //逆地理编码接口地址。
+      data: {
+        key: '1b987a62e5685a58cda5933e1bc66044',
+        location: lng + ',' + lat,
+      },
+      success: response => {
+        const regeocode = response?.data?.regeocode || {};
+        const addressComponent = regeocode?.addressComponent || {};
+        const addressInfo = getAddress(response?.data);
+        let location = {
+          lng: lng || '',
+          lat: lat || '',
+          provinceCode: addressComponent.adcode ? addressComponent.adcode.substring(0, 2) + '0000' : '',
+          cityCode: addressComponent.adcode ? addressComponent.adcode.substring(0, 4) + '00' : '',
+          areaCode: addressComponent.adcode,
+          provinceName: addressComponent.province,
+          areaName: addressComponent.district,
+          address: addressInfo.address,
+          formattedAddress: addressInfo.formattedAddress,
+        };
+        resolve(location);
+      },
+      fail() {
+        resolve({});
+      },
+    });
+  });
 }
--
libgit2 0.21.0