会员中心添加首页按钮，pclogo改为阿里云地址，编辑折扣券没有传折扣值，

2025-12-20 09:55:53 +08:00 · 2021-07-21 15:27:39 +08:00
parent f512caa81d
commit 75bff1edc4
30 changed files with 490 additions and 903 deletions
--- a/seller/src/views/my-components/lili/upload-pic-input.vue
+++ b/seller/src/views/my-components/lili/upload-pic-input.vue
@@ -11,15 +11,15 @@
        :readonly="readonly"
        :maxlength="maxlength"
      >
-        <Button slot="append" icon="md-eye"></Button>
+          <Poptip slot="append" transfer trigger="hover" title="图片预览" placement="right">
+            <Icon type="md-eye" class="see-icon" />
+            <div slot="content">
+              <img :src="currentValue" alt="该资源不存在" style="width: 100%;margin: 0 auto;display: block;" />
+              <a @click="viewImage=true" style="margin-top:5px;text-align:right;display:block">查看大图</a>
+            </div>
+          </Poptip>
      </Input>
-      <Poptip transfer trigger="hover" title="图片预览" placement="right" width="350">
-        <Icon type="md-eye" class="see-icon" />
-        <div slot="content">
-          <img :src="currentValue" alt="该资源不存在" style="width: 100%;margin: 0 auto;display: block;" />
-          <a @click="viewImage=true" style="margin-top:5px;text-align:right;display:block">查看大图</a>
-        </div>
-      </Poptip>
+      
      <Upload
        :action="uploadFileUrl"
        :headers="accessToken"
@@ -35,7 +35,7 @@
        ref="up"
        class="upload"
      >
-        <Button :loading="loading" :size="size" :disabled="disabled" :icon="icon">上传图片</Button>
+        <Button :loading="loading" :size="size" :disabled="disabled">上传图片</Button>
      </Upload>
    </div>

@@ -166,9 +166,6 @@ export default {
 <style lang="scss" scoped>
 .see-icon {
  font-size: 16px;
-  margin-left: -32px;
-  margin-top: 3px;
-  padding: 7px;
  cursor: pointer;
 }

--- a/seller/src/views/promotion/coupon/couponPublish.vue
+++ b/seller/src/views/promotion/coupon/couponPublish.vue
@@ -351,7 +351,6 @@ export default {
          } else {
            // 编辑
            delete params.consumeLimit;
-            delete params.couponDiscount;
            delete params.updateTime;

            editShopCoupon(params).then((res) => {
--- a/seller/src/views/promotion/fullCut/fullCut.vue
+++ b/seller/src/views/promotion/fullCut/fullCut.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="full-cut">
+  <div class="search">
    <Card>
      <Form
        ref="searchForm"
@@ -73,25 +73,38 @@
              v-if="row.promotionStatus == 'NEW'"
              size="small"
              @click="edit(row)"
-              >编辑</Button
-            >&nbsp;
-            <Button type="success" v-else size="small" @click="edit(row)"
-              >查看</Button
-            >&nbsp;
+              >编辑</Button>
+            <Button type="info" v-else size="small" @click="edit(row)">查看</Button>
+            <Button
+              type="success"
+              v-if="row.promotionStatus === 'START'"
+              ghost
+              style="margin-left:5px"
+              size="small"
+              @click="openOrClose(row)"
+              >关闭</Button>
+            <Button
+              type="success"
+              v-if="row.promotionStatus === 'CLOSE' || row.promotionStatus === 'NEW'"
+              ghost
+              style="margin-left:5px"
+              size="small"
+              @click="openOrClose(row)"
+              >开启</Button>
            <Button
              type="error"
              :disabled="row.promotionStatus == 'START'"
              ghost
+              style="margin-left:5px"
              size="small"
              @click="del(row)"
-              >删除</Button
-            >
+              >删除</Button>
          </div>
        </template>
      </Table>
      <Row type="flex" justify="end" class="page operation">
        <Page
-          :current="searchForm.pageNumber + 1"
+          :current="searchForm.pageNumber"
          :total="total"
          :page-size="searchForm.pageSize"
          @on-change="changePage"
@@ -107,14 +120,14 @@
  </div>
 </template>
 <script>
-import { getFullDiscountList, delFullDiscount } from "@/api/promotion.js";
+import { getFullDiscountList, delFullDiscount, updateFullDiscount } from "@/api/promotion.js";
 export default {
  name: 'full-cut',
  data() {
    return {
      loading: false, // 表单加载状态
      searchForm: { // 列表请求参数
-        pageNumber: 0,
+        pageNumber: 1,
        pageSize: 10,
        sort: "startTime",
        order: "desc",
@@ -194,7 +207,7 @@ export default {
    },
    // 改变页数
    changePage(v) {
-      this.searchForm.pageNumber = v - 1;
+      this.searchForm.pageNumber = v;
      this.getDataList();
    },
    // 改变页码
@@ -204,7 +217,7 @@ export default {
    },
    // 搜索
    handleSearch() {
-      this.searchForm.pageNumber = 0;
+      this.searchForm.pageNumber = 1;
      this.searchForm.pageSize = 10;
      this.getDataList();
    },
@@ -212,7 +225,7 @@ export default {
    handleReset() {
      this.selectDate = ''
      this.searchForm = {}
-      this.searchForm.pageNumber = 0;
+      this.searchForm.pageNumber = 1;
      this.searchForm.pageSize = 10;
      this.getDataList();
    },
@@ -239,6 +252,31 @@ export default {
        },
      });
    },
+    // 开启或关闭活动
+    openOrClose (row) {
+      let name = '开启'
+      let status = 'START'
+      if (row.promotionStatus === 'START') {
+        name = '关闭'
+        status = 'CLOSE'
+      }
+      this.$Modal.confirm({
+        title: "提示",
+        // 记得确认修改此处
+        content: `确认${name}此活动吗?需要一定时间才能生效，请耐心等待`,
+        loading: true,
+        onOk: () => {
+          // 删除
+          updateFullDiscount(row.id, status).then((res) => {
+            this.$Modal.remove();
+            if (res.success) {
+              this.$Message.success(`${name}成功`);
+              this.getDataList();
+            }
+          });
+        },
+      });
+    },
    // 获取列表数据
    getDataList() {
      this.loading = true;
--- a/seller/src/views/promotion/fullCut/newFullCut.vue
+++ b/seller/src/views/promotion/fullCut/newFullCut.vue
@@ -1,7 +1,7 @@
 <template>
  <div>
    <Card>
-      <Form ref="form" :model="form" :label-width="120" :rules="formRule">
+      <Form ref="form" :model="form" :label-width="120" :rules="formRule" class="search-form">
        <div class="base-info-item">
          <h4>基本信息</h4>
          <div class="form-item-view">
@@ -100,17 +100,17 @@
                :disabled="form.promotionStatus != 'NEW'"
                v-model="form.isFreeFreight"
                >免邮费</Checkbox
-              >&nbsp;
+              > 
              <Checkbox
                :disabled="form.promotionStatus != 'NEW'"
                v-model="form.isCoupon"
                >送优惠券</Checkbox
-              >&nbsp;
+              > 
              <Checkbox
                :disabled="form.promotionStatus != 'NEW'"
                v-model="form.isGift"
                >送赠品</Checkbox
-              >&nbsp;
+              > 
              <Checkbox
                :disabled="form.promotionStatus != 'NEW'"
                v-if="JSON.parse(getStore('userInfo')).selfOperated"