MrShi
3 天以前 e07b79bc313a35d01d150c6a99f5254b026d92db
管理端bug修改
已修改5个文件
55 ■■■■■ 文件已修改
admin/.env.development 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin/src/components/business/OperaOrderDetail.vue 45 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin/src/components/business/OperaShopApprovalWindow.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin/src/components/business/OperaShopInfoSeeWindow.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin/src/components/business/OperaShopInfoWindow.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin/.env.development
@@ -1,4 +1,4 @@
# 开发环境配置
NODE_ENV = 'development'
VUE_APP_API_URL  = 'http://192.168.1.4:10010'
#VUE_APP_API_URL = 'https://llfc.lmpro.cn/nyx_admin'
# VUE_APP_API_URL  = 'http://192.168.1.4:10010'
VUE_APP_API_URL = 'https://llfc.lmpro.cn/nyx_admin'
admin/src/components/business/OperaOrderDetail.vue
@@ -50,9 +50,9 @@
            </span>
          </div>
          <div class="info-item" v-if="detailInfo.type ===1">
          <div class="info-item" v-if="detailInfo.order.type ===1">
            <span class="label">订单级别:</span>
            <span class="value">{{ detailInfo.isUrgent === 1?'极速达':'标速达' }}</span>
            <span class="value">{{ detailInfo.order.isUrgent === 1?'极速达':'标速达' }}</span>
          </div>
          <div class="info-item">
            <span class="label">预计到店时间:</span>
@@ -75,8 +75,9 @@
            <span class="value">¥{{ (detailInfo.order.declaredFee / 100).toFixed(2) }}</span>
          </div>
          <div class="info-item">
            <span class="label">预计寄存天数/配送里程:</span>
            <span class="value">{{ detailInfo.order.estimatedDepositDays || '-' }}天/{{ detailInfo.order.distance || '-' }}公里</span>
            <span class="label">{{detailInfo.order.type === 0 ? '预计寄存天数' : '配送里程'}}:</span>
            <span class="value" v-if="detailInfo.order.type === 0">{{ detailInfo.order.estimatedDepositDays || '-' }}天</span>
            <span class="value" v-if="detailInfo.order.type === 1">{{ detailInfo.order.distance || '-' }}公里</span>
          </div>
          <div class="info-item full-width">
            <span class="label">客户备注:</span>
@@ -84,13 +85,13 @@
          </div>
          <div class="info-item full-width">
            <span class="label">物品拍照:</span>
            <div v-if="detailInfo.depositImages && detailInfo.depositImages.length" class="image-list">
            <div v-if="detailInfo.orderFiles && detailInfo.orderFiles.length" class="image-list">
              <el-image
                v-for="(img, index) in detailInfo.depositImages"
                v-for="(img, index) in detailInfo.orderFiles"
                :key="index"
                style="width: 80px; height: 80px; margin-right: 10px"
                :src="img"
                :preview-src-list="detailInfo.depositImages"
                :preview-src-list="detailInfo.orderFiles"
                fit="cover"
              ></el-image>
            </div>
@@ -130,11 +131,11 @@
          </div>
          <div class="info-item">
            <span class="label">寄件地址:</span>
            <span class="value">{{ detailInfo.order.depositLocation || '' }}{{ detailInfo.order.depositLocationRemark || '' }}</span>
            <span class="value">{{ detailInfo.order.depositLocationRemark || '' }}</span>
          </div>
          <div class="info-item">
            <span class="label">收件地址:</span>
            <span class="value">{{ detailInfo.order.takeLocation || '' }}{{ detailInfo.order.takeLocationRemark || '' }}</span>
            <span class="value">{{ detailInfo.order.takeLocationRemark || '' }}</span>
          </div>
          <div class="info-item">
            <span class="label">是否收件服务点:</span>
@@ -146,13 +147,13 @@
          </div>
          <div class="info-item full-width">
            <span class="label">门店收件拍照:</span>
            <div v-if="detailInfo.storeInImages && detailInfo.storeInImages.length" class="image-list">
            <div v-if="detailInfo.depositImages && detailInfo.depositImages.length" class="image-list">
              <el-image
                v-for="(img, index) in detailInfo.storeInImages"
                v-for="(img, index) in detailInfo.depositImages"
                :key="index"
                style="width: 80px; height: 80px; margin-right: 10px"
                :src="img"
                :preview-src-list="detailInfo.storeInImages"
                :preview-src-list="detailInfo.depositImages"
                fit="cover"
              ></el-image>
            </div>
@@ -172,8 +173,22 @@
            </div>
            <span v-else>-</span>
          </div>
          <div class="info-item full-width" v-if="detailInfo.order && detailInfo.order.type===1">
            <span class="label">司机送达拍照/门店入库拍照:</span>
          <div class="info-item full-width" v-if="detailInfo.order && detailInfo.order.type===1 && detailInfo.order.takeShopId">
            <span class="label">门店入库拍照:</span>
            <div v-if="detailInfo.storeInImages && detailInfo.storeInImages.length" class="image-list">
              <el-image
                v-for="(img, index) in detailInfo.storeInImages"
                :key="index"
                style="width: 80px; height: 80px; margin-right: 10px"
                :src="img"
                :preview-src-list="detailInfo.storeInImages"
                fit="cover"
              ></el-image>
            </div>
            <span v-else>-</span>
          </div>
          <div class="info-item full-width" v-if="detailInfo.order && detailInfo.order.type===1 && !detailInfo.order.takeShopId">
            <span class="label">司机送达拍照:</span>
            <div v-if="detailInfo.driverDoneImages && detailInfo.driverDoneImages.length" class="image-list">
              <el-image
                v-for="(img, index) in detailInfo.driverDoneImages"
@@ -203,7 +218,7 @@
        </div>
      </div>
      <div class="section">
      <div class="section" v-if="detailInfo.order.cancelTime">
        <div class="section-header">
          <span class="section-title">取消信息</span>
        </div>
admin/src/components/business/OperaShopApprovalWindow.vue
@@ -130,7 +130,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>
admin/src/components/business/OperaShopInfoSeeWindow.vue
@@ -159,7 +159,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>
admin/src/components/business/OperaShopInfoWindow.vue
@@ -164,7 +164,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>