Merge remote-tracking branch 'origin/master'

rk

2026-03-11 0e4b49f4bee160790b1830e6a8606e739b32fc3b

 admin/src/components/business/OperaShopInfoWindow.vue

@@ -21,7 +21,7 @@
          <div v-if="info.status ==1" class="header-red">禁用</div>
        </div>
        <div class="info-item">
          <div class="info-item-a">经销商名称：<span>{{info.name || ''}}</span><span class="blue header-blue">{{ info.saleType == 1?'自由采购':'平台铺货'}}</span></div>
          <div class="info-item-a">经销商名称：<span>{{info.name || ''}}</span><span class="blue header-blue">{{ info.saleType == 1?'自主采购':'平台铺货'}}</span></div>
          <div class="info-item-a">门店ID：<span>{{info.code || ''}}</span></div>
          <div class="info-item-a">登录账号：<span>{{info.username || ''}}</span></div>
        </div>
@@ -126,6 +126,7 @@
              <el-option   :key="2" :value="2" label="待收货"  ></el-option>
              <el-option   :key="3" :value="3" label="交易完成"  ></el-option>
              <el-option   :key="4" :value="4" label="已关闭"  ></el-option>
              <el-option   :key="6" :value="6" label="已退款"  ></el-option>
            </el-select>
          </el-form-item>
          <el-form-item label="" prop="receiveType" style="display: inline-block;margin-right: 20px;">
@@ -183,7 +184,7 @@
            >
              <el-table-column prop="code" label="订单编号"  fixed align="center" min-width="120px" show-overflow-tooltip>
                <template slot-scope="{row}">
                <span    style="color: #216EEE; "   @click="$refs.operaGoodsOrderDetail.open('订单详情', row, 'first')">{{row.code}}</span>
                <span    style="color: #216EEE;cursor: pointer; "   @click="$refs.operaGoodsOrderDetail.open('订单详情', row, 'first')">{{row.code}}</span>
                </template>

              </el-table-column>
@@ -198,7 +199,7 @@
              </el-table-column>
              <el-table-column prop="price" label="商品总价(元)" align="center" min-width="100px">
                <template slot-scope="{row}">
                   {{(row.totalPrice || 0) - (row.mailPrice||0)}}
                   {{((row.totalPrice || 0) - (row.mailPrice||0)).toFixed(2)}}
                </template>
              </el-table-column>
              <el-table-column prop="mailPrice" label="运费(元)" align="center" min-width="100px"></el-table-column>