Merge branch 'master' of http://139.186.142.91:10010/r/productDev/gtzxingli...

MrShi

2026-05-14 e9a7cddce776382916e975402986144a88899ac5

 admin/src/components/business/OperaShopInfoWindow.vue

@@ -91,10 +91,13 @@
            </template>
          </el-table-column>
          <el-table-column prop="goodsInfo" label="物品信息" min-width="180px" show-overflow-tooltip></el-table-column>
          <el-table-column prop="isUrgent" label="类型" min-width="80px">
            <template slot-scope="{row}"><span>{{ row.type === 1?'异地存取':'就地存取' }}</span></template>
          </el-table-column>
          <el-table-column prop="isUrgent" label="订单级别" min-width="80px">
            <template slot-scope="{row}"><span v-if="row.type ===1">{{ row.isUrgent === 1?'极速达':'标速达' }}</span></template>
          </el-table-column>
          <el-table-column label="物品保费（元）" min-width="120px">
          <!-- <el-table-column label="物品保费（元）" min-width="120px">
            <template slot-scope="{row}">¥{{ (row.declaredFee / 100).toFixed(2) }}</template>
          </el-table-column>
          <el-table-column label="物品保费（元）" min-width="120px">
@@ -102,6 +105,12 @@
          </el-table-column>
          <el-table-column label="基础服务费（元）" min-width="120px">
            <template slot-scope="{row}">¥{{ (row.price / 100).toFixed(2) }}</template>
          </el-table-column> -->

          <el-table-column label="结算金额（元）" min-width="120px">
            <template slot-scope="{row}">
              ¥{{ storeInfo.id == row.depositShopId ? (row.depositShopFee / 100).toFixed(2) : storeInfo.id == row.takeShopId ? (row.takeShopFee / 100).toFixed(2) : '' }}
            </template>
          </el-table-column>
          <el-table-column label="订单总价（元）" min-width="120px">
            <template slot-scope="{row}">¥{{ (row.totalAmount / 100).toFixed(2) }}</template>
@@ -109,18 +118,19 @@
          <el-table-column label="实付现金（元）" min-width="120px">
            <template slot-scope="{row}">¥{{ (row.payAmount / 100).toFixed(2) }}</template>
          </el-table-column>
          <el-table-column label="加急费（元）" min-width="120px">
            <template slot-scope="{row}"><span v-if="row.type ===1 ">¥{{ (row.urgentAmount / 100).toFixed(2) }}</span></template>
          </el-table-column>
          <el-table-column label="退款金额（元）" min-width="120px">
            <template slot-scope="{row}">¥{{ (row.refundAmount / 100).toFixed(2) }}</template>
          </el-table-column>
          <el-table-column prop="createTime" label="创建时间" min-width="150px"> </el-table-column>
          <!-- <el-table-column label="加急费（元）" min-width="120px">
            <template slot-scope="{row}"><span v-if="row.type ===1 ">¥{{ (row.urgentAmount / 100).toFixed(2) }}</span></template>
          </el-table-column>
          <el-table-column label="超时金额" min-width="100px">
            <template slot-scope="{row}">¥{{ (row.overdueAmount / 100).toFixed(2) }}</template>
          </el-table-column>
          <el-table-column label="异常金额" min-width="100px">
            <template slot-scope="{row}">¥{{ (row.exceptionAmount / 100).toFixed(2) }}</template>
          </el-table-column>
          </el-table-column> -->
          <el-table-column  prop="statusDesc"  label="订单状态" min-width="100px">
            <template slot-scope="{row}">
            <span :style="{ color: row.status <7 ? '#e6a23c' :  (row.status ===7 ? '#67c23a' : 'grey' )}">
@@ -136,7 +146,6 @@
            </template>
          </el-table-column>
          <el-table-column prop="payTime" label="支付时间" min-width="150px"> </el-table-column>
          <el-table-column prop="createTime" label="创建时间" min-width="150px"> </el-table-column>
        </el-table>
        <pagination
            @size-change="handleSizeChange"
@@ -164,7 +173,7 @@
              </div>
              <div class="info-row">
                <span class="label">审批状态：</span>
                <span class="value">{{ storeInfo.auditStatus === 0 ? '待审批' : storeInfo.auditStatus === 1 ? '审批通过' : '审批未通过' }}</span>
                <span class="value">{{ storeInfo.auditStatus === 0 ? '待审批' : storeInfo.auditStatus === 1 ? '审批通过' : storeInfo.auditStatus === 2 ? '审批未通过' : '已支付押金' }}</span>
              </div>
              <div class="info-row">
                <span class="label">配送范围：</span>
@@ -243,7 +252,7 @@
            </template>
          </div>

          <div class="qualification-section" v-if="storeInfo.companyType === 1">
          <div class="qualification-section">
            <h4 class="section-title">门店照片及其他材料</h4>
            <div class="image-item-row">
              <span class="label">门店门头照：</span>
@@ -290,9 +299,10 @@
  components: { GlobalWindow, Pagination,OperaOrderDetail },
  data () {
    return {
      title: '',
      activeTab: 'performance',
      storeInfo: {},
      visible:false,
      visible: false,
      searchForm: {
        orderNo: '',
        goodsInfo: '',