修改

4 years ago · 64b6e51646
7 changed files with 49 additions and 9 deletions
--- a/debug.log
+++ b/debug.log
@ -1,3 +1,5 @@
 [0517/154023.784:ERROR:directory_reader_win.cc(43)] FindFirstFile: 系统找不到指定的路径。 (0x3)
 [0518/172215.096:ERROR:directory_reader_win.cc(43)] FindFirstFile: 系统找不到指定的路径。 (0x3)
 [0519/162903.250:ERROR:directory_reader_win.cc(43)] FindFirstFile: 系统找不到指定的路径。 (0x3)
+[0520/141445.581:ERROR:directory_reader_win.cc(43)] FindFirstFile: 系统找不到指定的路径。 (0x3)
+[0521/162041.196:ERROR:directory_reader_win.cc(43)] FindFirstFile: 系统找不到指定的路径。 (0x3)
--- a/src/components/Activity/ActivityEdit.vue
+++ b/src/components/Activity/ActivityEdit.vue
@ -2,9 +2,9 @@
  <div class="d-flex flex-wrap pb-3">
    <!-- 编辑 -->
    <a-modal
-      :maskClosable="false"
+      :mask-closable="false"
      @cancel="$emit('closeModal')"
-      destroyOnClose
+      destroy-on-close
      footer
      title="修改活动公告"
      v-model="editVisible"
@ -247,8 +247,8 @@ const tailItemLayout = { wrapperCol: { span: 16, offset: 6 } };

 export default {
  name: 'ActivityEdit',
-  props: { editVisible: { type: Boolean, default: false }, editItem: { type: Object, default: () => {} } },
  components: { QuillEditor },
+  props: { editVisible: { type: Boolean, default: false }, editItem: { type: Object, default: () => {} } },
  data() {
    return {
      formItemLayout,
--- a/src/components/Banner/BannerAdd.vue
+++ b/src/components/Banner/BannerAdd.vue
@ -56,7 +56,7 @@
          label="设备"
        >
          <a-select
-            @change="getUse($event, 'divice')"
+            @change="getUse($event, 'showPosition')"
            class="ml-3"
            default-value="PC"
            style="width: 150px"
@ -129,7 +129,7 @@ export default {
      form: this.$form.createForm(this, { name: 'r-d-add' }),
      enable: ['启用', '禁用'],
      enable1: ['不跳转', 'H5'],
-      enable3: ['pc','mobile'],
+      enable3: ['全部','pc','小程序'],
      enable2: [
        {
          name: '首页',
@ -196,7 +196,7 @@ export default {
        url: '',
        recStatus: 0,
        showPage: 0,
-        divice: ''
+        showPosition: 0
      },
      fileList: [],
      //限制文件上传的格式和大小
--- a/src/components/Banner/BannerDate.vue
+++ b/src/components/Banner/BannerDate.vue
@ -26,12 +26,17 @@
          <span v-if="record.jumpUrl">{{ jumpUrl }}</span>
          <span v-else>无</span>
        </template>
+        <!-- 显示展示的位置 -->
+         <template slot="showPosition" slot-scope="text, record">
+          <span v-if="record.showPosition">{{ showPosition }}</span>
+          <span v-else>无</span>
+        </template>
        <template slot="edit" slot-scope="text, record">
          <a-icon @click="showEditModal(record)" class="pointer" theme="twoTone" type="edit" />
          <a-popconfirm @confirm="() => onDelete(record.id)" title="确定要删除这一条?" v-if="lists.list">
            <a-icon class="ml-4 pointer" theme="twoTone" two-tone-color="#ff0000" type="delete" />
          </a-popconfirm>
-          <a-switch checked-children="启用" class="ml-4" default-checked un-checked-children="禁用" />
+          <a-switch checked-children="启用" class="ml-4" :checked="!Boolean(record.recStatus)" un-checked-children="禁用" />
        </template>
      </a-table>
    </div>
@ -83,6 +88,14 @@ const columns = [
    key: 'jumpUrl',
    scopedSlots: { customRender: 'jumpUrl' },
  },
+  
+  {
+    title: '展示位置',
+    align: 'center',
+    dataIndex: 'showPosition',
+    key: 'showPosition',
+    scopedSlots: { customRender: 'showPosition' },
+  },
  {
    title: '图片参数',
    align: 'center',
--- a/src/components/Banner/BannerEdit.vue
+++ b/src/components/Banner/BannerEdit.vue
@ -1,13 +1,14 @@
 <template>
  <div class="d-flex flex-wrap pb-3">
-    <!-- 编辑 -->
+    <!-- 编辑    v-model="editVisible"-->
    <a-modal
      :mask-closable="false"
      @cancel="$emit('closeModal')"
      destroy-on-close
      footer
      title="修改轮播图"
-      v-model="editVisible"
+      :visible="editVisible"
+    
      width="700px"
    >
      <a-form :form="form" @submit="handleSubmit" v-if="editItem">
@ -43,6 +44,20 @@
          >
            <a-select-option :key="item" :value="index" v-for="(item, index) in enable">{{ item }}</a-select-option>
          </a-select>
+        </a-form-item>
+         <a-form-item
+          :label-col="formItemLayout.labelCol"
+          :wrapper-col="formItemLayout.wrapperCol"
+          label="设备"
+        >
+          <a-select
+            @change="getUse($event, 'showPosition')"
+            class="ml-3"
+            default-value="PC"
+            style="width: 150px"
+          >
+            <a-select-option :key="item" :value="index" v-for="(item, index) in enable3">{{ item }}</a-select-option>
+          </a-select>
        </a-form-item>
        <!-- 页面显示位置 -->
        <a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol" label="页面显示位置">
@ -95,6 +110,7 @@ export default {
      form: this.$form.createForm(this, { name: 'r-d-add' }),
      enable: ['启用', '禁用'],
      enable1: ['不跳转', 'H5'],
+      enable3: ['全部','pc','小程序'],
      enable2: [
        {
          name: '首页',
@ -169,6 +185,7 @@ export default {
        recStatus: '',
        showPage: '',
        url: '',
+        showPosition: ''
      },
      jumpType: '',
      recStatus: '',
@ -200,6 +217,7 @@ export default {
    // 改变搜索条件
    getUse(e, str) {
      this.editData[str] = e;
+      console.log(this.editData[str])
      if (str === 'jumpType' && e === 0) {
        console.log("=")
        this.editData.jumpUrl = '';
@ -247,6 +265,7 @@ export default {
                recStatus: this.editData.recStatus,
                showPage: this.editData.showPage,
                url: this.editData.url,
+                showPosition: this.editData.showPosition,
              },
            };
            const res = await updateCarousel(params);
--- a/src/views/BannerManage/BannerManage.vue
+++ b/src/views/BannerManage/BannerManage.vue
@ -29,6 +29,7 @@ export default {
        jumpType: 0,
        recStatus: 0,
      },
+      device: 0
    };
  },

@ -48,6 +49,8 @@ export default {
        }
        const params = {
          param: {
+            //to do 增加一个关于device的参数
+            device: this.device,
            showPage: this.paramData.showPage,
            jumpType: this.paramData.jumpType,
            recStatus: this.paramData.recStatus,
--- a/src/views/BannerManage/BannerManageM.vue
+++ b/src/views/BannerManage/BannerManageM.vue
@ -29,6 +29,7 @@ export default {
        jumpType: 0,
        recStatus: 0,
      },
+      device: 1
    };
  },

@ -48,6 +49,8 @@ export default {
        }
        const params = {
          param: {
+            //to do 增加一个关于device的参数
+            device: this.device,
            showPage: this.paramData.showPage,
            jumpType: this.paramData.jumpType,
            recStatus: this.paramData.recStatus,