Merge remote-tracking branch 'origin/2.0.1' into 2.0.1

jiangping

2025-02-21 1baed91dd6c4cfc8a230c2857132ef6302cc4f3c

 admin/src/views/combo/components/ComboDetail.vue

@@ -8,31 +8,31 @@
          <div class="title_wrap">
            <div>
              <span class="title">{{ detail.name }}</span>
              <span class="status">{{ detail.status === '1' ? '已启用' : '禁用' }}</span>
              <span class="status">{{ detail.status == '0' ? '已启用' : '禁用' }}</span>
            </div>
            <div class="placeholder9 mt10">每日销售限量：{{ detail.circulationDay }}</div>
            <div class="placeholder9 mt10">每日销售限量：{{ detail.saleDayLimit }}</div>
          </div>
        </div>
        <div class="right">
          <div class="item">
            <div class="key">总发放数量</div>
            <div class="value">{{ detail.circulationAll || '-' }}</div>
            <div class="value">{{ detail.saleLimit || '不限额' }}</div>
          </div>
          <div class="item">
            <div class="key">已销售数量</div>
            <div class="value">{{ detail.sellNum }}</div>
            <div class="value">{{ detail.saleNum }}</div>
          </div>
          <div class="item">
            <div class="key">剩余数量</div>
            <div v-if="detail.circulationAll" class="value">{{ detail.surplusDay }}</div>
            <div v-else class="value">{{ detail.surplusDay || '-' }}</div>
            <div v-if="detail.saleLimit" class="value">{{ detail.saleLimit - detail.saleNum }}</div>
            <div v-else class="value">不限额</div>
          </div>
        </div>
      </div>
      <div class="createTime_wrap">
        <span class="item">创建时间：{{ detail.createTime }}</span>
        <span class="item">创建时间：{{ detail.createDate }}</span>
        <span class="item">创建人：{{ detail.creator }}</span>
        <span class="item">最后更新时间：{{ detail.editTime }}</span>
        <span class="item">最后更新时间：{{ detail.editDate }}</span>
        <span class="item">更新人：{{ detail.editor }}</span>
      </div>
    </div>
@@ -44,52 +44,53 @@
    </div>
    <div class="line">
      <div class="key">套餐类型：</div>
      <div v-if="detail.mealsType == '0'" class="value">期限卡</div>
      <div v-if="detail.type == '0'" class="value">期限卡</div>
    </div>
    <div class="line">
      <div class="key">{{ detail.mealsType == '1' || detail.mealsType == '4' ? '每日骑行限制：' : '套餐次数：' }}</div>
      <div v-if="detail.mealsType == '1' || detail.mealsType == '4'" class="value">
        <span>{{ detail.inOutNum || '不限制' }}</span>
      </div>
      <div v-else class="value"><span>{{ detail.nums }}</span></div>
    </div>
    <div class="line">
      <div class="key">使用说明：</div>
      <div class="key">每日骑行限制：</div>
      <div class="value">
        <div>{{ detail.content }}</div>
        <span>{{ detail.limitType == 0 ? '不限制' : detail.limitTime + '分钟' }}</span>
      </div>
    </div>
    <div class="line">
      <div class="key">套餐简介：</div>
      <div class="value">
        <div>{{ detail.desc }}</div>
      </div>
    </div>

    <div class="property-title">适用规则</div>
    <div class="line">
      <div class="key">销售时间段：</div>
      <div class="value">{{ detail.circulationAll || '不限量' }}</div>
      <div class="value">{{ detail.startDate }} 至 {{ detail.endDate }}</div>
    </div>
    <div class="line">
      <div class="key">使用时间：</div>
      <div class="value">{{ detail.circulationDay }}</div>
      <div class="value" v-if="detail.useType == 0">{{ detail.useStartDate }} 至 {{ detail.useEndDate }}</div>
      <div class="value" v-if="detail.useType == 1">购买后{{ detail.useDays }}天内有效</div>
      <div class="value" v-if="detail.useType == 2">自{{ detail.useStartDate }} 后 {{ detail.useDays }}天内有效</div>
    </div>
    <div class="line">
      <div class="key">适用范围：</div>
      <div class="value">{{ detail.useVenue }}</div>
      <div class="value">{{ detail.useWorkday == 1 && '工作日' }} {{ detail.useWorkday && detail.useHoliday && '|' }} {{ detail.useHoliday == 1 && '节假日' }}</div>
    </div>
    <div class="line">
      <div class="key">适用项目：</div>
      <div class="value">{{ detail.useProject }}</div>
      <div class="value">{{ detail.isbike == 1 && '自行车' }} {{ detail.isbike && detail.iselecbike && '|' }} {{ detail.iselecbike == 1 && '电动车' }}</div>

    </div>
    <div class="line">
      <div class="key">总限额：</div>
      <div class="value">{{ detail.useClassInfo || '不限制' }}</div>
      <div class="value">{{ detail.saleLimit || '不限制' }}</div>
    </div>
    <div class="line">
      <div class="key">每日限额：</div>
      <div class="value">{{ detail.useTeacherInfo || '不限额' }}</div>
      <div class="value">{{ detail.saleDayLimit || '不限额' }}</div>
    </div>
  </GlobalWindow>
</template>
<script>
// import { comboDetailPost, mealsCancelUse } from '@/api'
// import dayjs from 'dayjs'
import { comboDetailPost } from '@/api/business/combo.js'
import GlobalWindow from '@/components/common/GlobalWindow'
export default {
  name: 'ComboDetail',
@@ -136,24 +137,13 @@
        }
      })
    },
    getDetail(detail) {
      const { activeTab, pagination } = this
      const param = {
        listType: activeTab,
        type: detail.type,
        id: detail.id
      }
      this.tableLoading = true
      comboDetailPost({ pagination, param }).then(res => {
        this.tableLoading = false
        this.dataList = res.record.data || []
        this.totalCount = res.record.count || 0
        this.detail = { ...detail, useProject: res.record.useProject }
        this.$nextTick(() => {
          this.$refs.tableo.doLayout()
        })
    getDetail(id) {
      comboDetailPost(id).then(res => {
        console.log('res', res)

        this.detail = res
      }, () => {
        this.tableLoading = false

      })
    },
    tabClick(val) {
@@ -226,6 +216,7 @@
        border: 1px solid $primaryColor;
        color: $primaryColor;
        margin-left: 10px;
        padding: 0 4px;
      }
    }

@@ -275,10 +266,12 @@
  line-height: 1.5;
  color: #333;
}

.property-title{
  margin-bottom: 16px;
  color: $primaryColor;
}

.device-uploader {
  width: 80px;
  height: 80px;