修改商店优惠劵页面

zxl

1 天以前 4352db77e69535ad829d7ad24efd2d66b4b97d09

修改商店优惠劵页面

 manager/src/views/promotions/coupon/coupon_store.vue

@@ -54,7 +54,7 @@
              style="width: 180px"
            >
              <Option value="ENABLE">启用</Option>
              <Option value="DISABLED">禁用</Option>
              <Option value="DISABLE">禁用</Option>
            </Select>
          </FormItem>
        </Form>
@@ -93,7 +93,7 @@
          <i-switch
            v-model="row.status"
            true-value="ENABLE"
            false-value="DISABLED"
            false-value="DISABLE"
            @on-change="(status) => handleStatusChange(row, status)"
          >
            <span slot="open">启用</span>
@@ -474,13 +474,13 @@
      // 表单验证规则
      formRules: {
        storeId: [
          { required: true, message: '店铺ID不能为空', trigger: 'blur' }
          { required: true, message: '店铺不能为空', trigger: 'blur' }
        ],
        storeName: [
          { required: true, message: '店铺名称不能为空', trigger: 'blur' }
        ],
        couponId: [
          { required: true, message: '优惠券ID不能为空', trigger: 'blur' }
          { required: true, message: '优惠劵不能为空', trigger: 'blur' }
        ],
        couponName: [
          { required: true, message: '优惠券名称不能为空', trigger: 'blur' }

 manager/src/views/promotions/coupon/coupon_store_receive.vue

@@ -197,6 +197,32 @@
          },
        },
        {
          title: "订单状态",
          key: "orderStatus",
          width: 120,
          render: (h, params) => {
            if (params.row.orderStatus === "UNPAID") {
              return h("Tag", { props: { color: "orange" } }, "未付款");
            } else if (params.row.orderStatus === "PAID") {
              return h("Tag", { props: { color: "green" } }, "已付款");
            } else if(params.row.orderStatus === "UNDELIVERED"){
              return h("Tag", { props: { color: "orange" } }, "待发货");
            }else if(params.row.orderStatus === "DELIVERED"){
              return h("Tag", { props: { color: "green" } }, "已发货");
            }else if(params.row.orderStatus === "COMPLETED"){
              return h("Tag", { props: { color: "green" } }, "已完成");
            }else if(params.row.orderStatus === "STAY_PICKED_UP"){
              return h("Tag", { props: { color: "orange" } }, "待自提");
            }else if(params.row.orderStatus === "CANCELLED"){
              return h("Tag", { props: { color: "purple" } }, "已关闭");
            }else if(params.row.orderStatus === "TAKE"){
              return h("Tag", { props: { color: "orange" } }, "待核验");
            }else{
              return h("Tag", { props: { color: "purple" } }, "未知");
            }
          },
        },
        {
          title: "有效时间",
          width: 150,
          render: (h, params) => {

 manager/src/views/statistics/order.vue

@@ -5,85 +5,85 @@
        <affixTime @selected="clickBreadcrumb" />
      </Card>
    </Affix>
    <Card class="card">
        <div class="chart-wrapper">
          <div class="chart-header">
            <h2>PV/UV 趋势图</h2>
          </div>
          <div ref="chartDom" class="chart-container"></div>
        </div>
    </Card>
    <Card class="card">
      <div class="my-chart-container">
        <div class="chart-wrapper" style="height: 800px">
          <div class="chart-header">
            <h2>商品/视频浏览量完播率 趋势图</h2>
          </div>
          <div class="button-group-wrapper">
            <!-- 第一组：商品/视频（靠左） -->
            <ButtonGroup>
              <Button
                :type="currentType === 'goods' ? 'primary' : 'default'"
                @click="handleTypeChange('goods')"
              >
                商品
              </Button>
              <Button
                :type="currentType === 'video' ? 'primary' : 'default'"
                @click="handleTypeChange('video')"
              >
                视频
              </Button>
            </ButtonGroup>

            <!-- 第二组：前10/前20/前30（靠右） -->
            <ButtonGroup>
              <Button
                :type="currentLimit === 10 ? 'success' : 'default'"
                @click="handleLimitChange(10)"
              >
                前10
              </Button>
              <Button
                :type="currentLimit === 20 ? 'success' : 'default'"
                @click="handleLimitChange(20)"
              >
                前20
              </Button>
              <Button
                :type="currentLimit === 30 ? 'success' : 'default'"
                @click="handleLimitChange(30)"
              >
                前30
              </Button>
            </ButtonGroup>
          </div>
          <div ref="viewPrintChartDom" class="view-chart-container"></div>
        </div>
      </div>
    </Card>
    <Card class="card">
      <div class="my-chart-container">
        <div class="chart-wrapper">
          <div class="chart-header">
            <h2>订单增长 趋势图</h2>
          </div>
          <div ref="orderCountChartDom" class="chart-container"></div>
        </div>
      </div>
    </Card>
<!--    <Card class="card">-->
<!--        <div class="chart-wrapper">-->
<!--          <div class="chart-header">-->
<!--            <h2>PV/UV 趋势图</h2>-->
<!--          </div>-->
<!--          <div ref="chartDom" class="chart-container"></div>-->
<!--        </div>-->
<!--    </Card>-->
<!--    <Card class="card">-->
<!--      <div class="my-chart-container">-->
<!--        <div class="chart-wrapper" style="height: 800px">-->
<!--          <div class="chart-header">-->
<!--            <h2>商品/视频浏览量完播率 趋势图</h2>-->
<!--          </div>-->
<!--          <div class="button-group-wrapper">-->
<!--            &lt;!&ndash; 第一组：商品/视频（靠左） &ndash;&gt;-->
<!--            <ButtonGroup>-->
<!--              <Button-->
<!--                :type="currentType === 'goods' ? 'primary' : 'default'"-->
<!--                @click="handleTypeChange('goods')"-->
<!--              >-->
<!--                商品-->
<!--              </Button>-->
<!--              <Button-->
<!--                :type="currentType === 'video' ? 'primary' : 'default'"-->
<!--                @click="handleTypeChange('video')"-->
<!--              >-->
<!--                视频-->
<!--              </Button>-->
<!--            </ButtonGroup>-->

    <Card class="card">
      <div class="my-chart-container">
        <div class="chart-wrapper">
          <div class="chart-header">
            <h2>浏览数据/订单时间段 趋势图</h2>
          </div>
          <div ref="orderTimePeriodChartDom" class="chart-container"></div>
        </div>
      </div>
<!--            &lt;!&ndash; 第二组：前10/前20/前30（靠右） &ndash;&gt;-->
<!--            <ButtonGroup>-->
<!--              <Button-->
<!--                :type="currentLimit === 10 ? 'success' : 'default'"-->
<!--                @click="handleLimitChange(10)"-->
<!--              >-->
<!--                前10-->
<!--              </Button>-->
<!--              <Button-->
<!--                :type="currentLimit === 20 ? 'success' : 'default'"-->
<!--                @click="handleLimitChange(20)"-->
<!--              >-->
<!--                前20-->
<!--              </Button>-->
<!--              <Button-->
<!--                :type="currentLimit === 30 ? 'success' : 'default'"-->
<!--                @click="handleLimitChange(30)"-->
<!--              >-->
<!--                前30-->
<!--              </Button>-->
<!--            </ButtonGroup>-->
<!--          </div>-->
<!--          <div ref="viewPrintChartDom" class="view-chart-container"></div>-->
<!--        </div>-->
<!--      </div>-->
<!--    </Card>-->
<!--    <Card class="card">-->
<!--      <div class="my-chart-container">-->
<!--        <div class="chart-wrapper">-->
<!--          <div class="chart-header">-->
<!--            <h2>订单增长 趋势图</h2>-->
<!--          </div>-->
<!--          <div ref="orderCountChartDom" class="chart-container"></div>-->
<!--        </div>-->
<!--      </div>-->
<!--    </Card>-->
<!--    <Card class="card">-->
<!--      <div class="my-chart-container">-->
<!--        <div class="chart-wrapper">-->
<!--          <div class="chart-header">-->
<!--            <h2>浏览数据/订单时间段 趋势图</h2>-->
<!--          </div>-->
<!--          <div ref="orderTimePeriodChartDom" class="chart-container"></div>-->
<!--        </div>-->
<!--      </div>-->

    </Card>
<!--    </Card>-->


    <Card class="card">
@@ -1310,15 +1310,16 @@
      this.refundParams.pageSize = 10

      //更新表格
      this.updateChartData(this.orderParams)
      this.updateOrderCountChartDate(this.orderParams)

      let form = {...this.orderParams};
      form.currentType = this.currentType;
      form.currentLimit = this.currentLimit;
      this.updateViewAndCompletionRateData(form)

      this.updateOrderTimePeriodData(this.orderParams)
      // this.updateChartData(this.orderParams)
      // this.updateOrderCountChartDate(this.orderParams)
      //
      // let form = {...this.orderParams};
      // form.currentType = this.currentType;
      // form.currentLimit = this.currentLimit;
      // this.updateViewAndCompletionRateData(form)
      //
      // this.updateOrderTimePeriodData(this.orderParams)
    },

    // 实例化订单概览
@@ -1377,7 +1378,7 @@

  mounted() {
    console.log('ECharts 是否存在：', typeof echarts !== 'undefined'); // 应输出 true
    this.initChart();
    // this.initChart();
    this.initBaseParams();
    window.addEventListener('resize', this.handleResize)
  },