admin/src/views/channel/allSecondChannel.vue

@@ -1,48 +1,31 @@
 <template>
   <div>
-    <el-container>
+    <el-container class="app-container">
       <!--搜索-->
-      <el-header class="searchBox">
-        <el-form
-          :inline="true"
-          :model="searchForm"
-          ref="searchForm"
-          class="demo-form-inline"
-        >
+      <el-header>
+        <el-form :inline="true" :model="searchForm" ref="searchForm" class="demo-form-inline">
           <el-form-item label="渠道名称">
-            <el-input
-              v-model="searchForm.channelName"
-              name="channelName"
-              placeholder="渠道名称"
-            />
+            <el-input v-model="searchForm.channelName" name="channelName" placeholder="渠道名称" size="mini" />
           </el-form-item>
           <el-form-item label="渠道key">
-            <el-input
-              v-model="searchForm.channelKey"
-              name="channelKey"
-              placeholder="渠道Key"
-            />
+            <el-input v-model="searchForm.channelKey" name="channelKey" placeholder="渠道Key" size="mini" />
           </el-form-item>
           <el-form-item label="完整渠道编码">
-            <el-input
-              v-model="searchForm.fullCode"
-              name="fullCode"
-              placeholder="完整渠道编码"
-            />
+            <el-input v-model="searchForm.fullCode" name="fullCode" placeholder="完整渠道编码" size="mini" />
           </el-form-item>
           <el-form-item style="float: right">
-            <el-button type="primary" @click="init()">搜索</el-button>
-            <el-button @click="reset('searchForm')">重置</el-button>
+            <el-button type="primary" @click="init()" size="mini">搜索</el-button>
+            <el-button @click="reset('searchForm')" size="mini">重置</el-button>
           </el-form-item>
         </el-form>
       </el-header>
 
       <!--表格-->
 
-      <el-table :data="tableData" style="width: 100%">
-        <el-table-column prop="channelName" label="二级渠道名称" width="180">
+      <el-table :data="tableData">
+        <el-table-column prop="channelName" label="二级渠道名称">
         </el-table-column>
-        <el-table-column prop="channelCode" label="渠道key" width="180">
+        <el-table-column prop="channelCode" label="渠道key">
         </el-table-column>
         <el-table-column prop="partnerContacts" label="合作方">
         </el-table-column>
@@ -51,40 +34,12 @@
         <el-table-column prop="channelStatus" label="渠道形态">
         </el-table-column>
         <el-table-column prop="onlineTime" label="生效时间"> </el-table-column>
-        <el-table-column
-          label="操作"
-          align="center"
-          class-name="small-padding fixed-width"
-        >
+        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
           <template #default="{ row }">
-            <el-button
-              @click="toEdit(row.id)"
-              size="mini"
-              type="text"
-              icon="el-icon-edit"
-              >修改</el-button
-            >
-            <el-button
-              size="mini"
-              type="text"
-              icon="el-icon-plus"
-              @click="copy(row)"
-              >复制链接</el-button
-            >
-            <el-button
-              @click="giveShort(row)"
-              size="mini"
-              type="text"
-              icon="el-icon-delete"
-              >短链接</el-button
-            >
-            <el-button
-              @click="ewm(row.id)"
-              size="mini"
-              type="text"
-              icon="el-icon-delete"
-              >二维码</el-button
-            >
+            <el-button @click="toEdit(row.id)" size="mini" type="text" icon="el-icon-edit">修改</el-button>
+            <el-button size="mini" type="text" icon="el-icon-plus" @click="copy(row)">复制链接</el-button>
+            <el-button @click="giveShort(row)" size="mini" type="text" icon="el-icon-delete">短链接</el-button>
+            <el-button @click="ewm(row.id)" size="mini" type="text" icon="el-icon-delete">二维码</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -97,18 +52,13 @@
           </div>
         </div>
         <span slot="footer" class="dialog-footer">
-          <el-button @click="dialogVisible = false">取 消</el-button>
+          <el-button @click="dialogVisible = false" size="mini">取 消</el-button>
         </span>
       </el-dialog>
       <!-- 分页 -->
+      <pagination v-show="total > 0" :total="total" :page="pageNo" :limit="pageSizes" @pagination="pagination" />
     </el-container>
-    <pagination
-      v-show="total > 0"
-      :total="total"
-      :page="pageNo"
-      :limit="pageSizes"
-      @pagination="pagination"
-    />
+
   </div>
 </template>
 
@@ -119,7 +69,7 @@ import XEUtils from "xe-utils";
 
 export default {
   name: "SchemeEdit",
-  data() {
+  data () {
     return {
       searchForm: {
         channelName: "",
@@ -169,7 +119,7 @@ export default {
     };
   },
   watch: {
-    value5(val) {
+    value5 (val) {
       if (val) {
         get("/channelInfo/channelogpage", this.channelogParam).then((res) => {
           this.channelog = res.data.list;
@@ -183,18 +133,18 @@ export default {
     },
   },
 
-  created() {
+  created () {
     this.getSeconList();
   },
 
   methods: {
     //获取列表
-    getSeconList() {
+    getSeconList () {
       get("/channel/info/listChannels", {
         pageNo: this.pageNo,
         pageSize: this.pageSize,
       }).then((res) => {
-        console.log(res, "所有二级");
+
         // 筛选出二级列表
         let sesondlist = res.data.list;
         this.total = res.data.total;
@@ -202,12 +152,12 @@ export default {
       });
     },
 
-    onSubmit() {
+    onSubmit () {
       post(
         "/channelInfo/pushdata?beginTime=" +
-          this.pushdataDate[0] +
-          "&endTime=" +
-          this.pushdataDate[1],
+        this.pushdataDate[0] +
+        "&endTime=" +
+        this.pushdataDate[1],
         {}
       ).then((res) => {
         this.$message({
@@ -217,12 +167,11 @@ export default {
         this.pushdata = false;
       });
     },
-    reset(formName) {
+    reset (formName) {
       // 重置
       this.searchForm = {};
-     
     },
-    checkpushdata(e) {
+    checkpushdata (e) {
       get("/channelInfo/checkpushdata", { fullCode: e }).then((res) => {
         let data = JSON.parse(res.data)[0];
         if (data.resdesc == "ok") {
@@ -238,22 +187,22 @@ export default {
         }
       });
     },
-    init() {
-      // console.log(this.searchForm);
+    init () {
+
       get("/channel/info/page", this.searchForm).then((res) => {
-        console.log(res);
+
         this.tableData = res.data.list;
         this.searchForm.totalResult = res.data.total;
       });
     },
 
     // 改变页码触发
-    pagination(page) {
+    pagination (page) {
       this.pageNo = page.page;
       // 重新获取列表数据
       this.getSeconList();
     },
-    editClosedEvent({ row, column }) {
+    editClosedEvent ({ row, column }) {
       const $table = this.$refs.xTable;
       const prop = column.property;
       const cellValue = row[prop];
@@ -273,10 +222,10 @@ export default {
         }, 300);
       }
     },
-    toEdit(id) {
+    toEdit (id) {
       this.$router.push("/channel/channelEdit?ids=" + id);
     },
-    copy(row) {
+    copy (row) {
       let oInput = document.createElement("input");
       oInput.value = `https://operation.mige.tv/a/#/${row.channelKey}`;
       document.body.appendChild(oInput);
@@ -288,11 +237,11 @@ export default {
       });
       oInput.remove();
     },
-    giveShort(row) {
+    giveShort (row) {
       let stUrl = row.shortUrl;
-      console.log(row);
+
       if (stUrl) {
-        console.log(111);
+
         let oInput = document.createElement("input");
         oInput.value = `http://v.mige.tv/${stUrl}`;
         document.body.appendChild(oInput);
@@ -304,13 +253,13 @@ export default {
         });
         oInput.remove();
       } else {
-        console.log(222);
+
         let data = {
           channel: row.channelKey,
           longUrl: `https://operation.mige.tv/a/#/${row.channelKey}`,
         };
         post("/channel/info/shorturl", data).then((res) => {
-          console.log(res);
+
           let resUrl = res.data.shortCode;
           let oInput = document.createElement("input");
           oInput.value = `http://v.mige.tv/${resUrl}`;
@@ -325,7 +274,7 @@ export default {
         });
       }
     },
-    ewm(row) {
+    ewm (row) {
       this.dialogVisible = true;
       this.$nextTick(function () {
         document.getElementById("qrcode").innerHTML = "";
@@ -336,12 +285,12 @@ export default {
         });
       });
     },
-    handlePageChange({ currentPage, pageSize }) {
+    handlePageChange ({ currentPage, pageSize }) {
       this.searchForm.pageNum = currentPage;
       this.searchForm.pageSize = pageSize;
       this.init();
     },
-    handlePageChangeChannelog({ currentPage, pageSize }) {
+    handlePageChangeChannelog ({ currentPage, pageSize }) {
       this.channelogParam.pageNum = currentPage;
       this.channelogParam.pageSize = pageSize;
       get("/channelInfo/channelogpage", this.channelogParam).then((res) => {
@@ -349,7 +298,7 @@ export default {
         this.channelogParam.totalResult = res.data.total;
       });
     },
-    searchEvent() {
+    searchEvent () {
       get("/channelInfo/channelogpage", this.channelogParam).then((res) => {
         this.channelog = res.data.list;
         this.channelogParam.totalResult = res.data.total;

admin/src/views/channel/channelEdit.vue

@@ -10,7 +10,7 @@
               <!-- @change="changeInputer" -->
             </el-form-item>
             <el-form-item label="一级渠道">
-              <el-select v-model="formm.parentId" filterable remote reserve-keyword placeholder="请输入关键词" :remote-method="remoteMethod" :loading="loading">
+              <el-select v-model="formm.parentId" remote reserve-keyword placeholder="请输入关键词" :loading="loading">
                 <el-option v-for="item in options" :key="item.id" :label="item.channelName" :value="item.id">
                 </el-option>
               </el-select>
@@ -38,7 +38,7 @@
             </el-form-item>
 
             <el-form-item label="绑定策略" prop="strategyId">
-              <el-select v-model="formm.strategyId" filterable remote reserve-keyword placeholder="请输入关键词" :remote-method="remoteMethodstrategyId" :loading="loading">
+              <el-select v-model="formm.strategyId" filterable remote reserve-keyword placeholder="请输入关键词" :loading="loading">
                 <el-option v-for="item in celueList" :key="item.id" :label="item.strategyName" :value="item.id">
                 </el-option>
               </el-select>
@@ -131,12 +131,12 @@ export default {
     return {
       form: {
         channelPattern: "1",
-        channelStatus: 1,
+        channelStatus: "",
         parentId: 0,
       },
       formm: {
-        channelPattern: "1",
-        channelStatus: 1,
+        channelPattern: "",
+        channelStatus: "",
         parentId: this.$route.query.id,
         onlineTime: "",
         strategyId: ""
@@ -219,7 +219,6 @@ export default {
       pageSize: 100,
       pageNum: 1,
     }).then(res => {
-      console.log(res)
       this.celueList = res.data.list
 
     })
@@ -227,7 +226,6 @@ export default {
 
     // 数据回显
     if (this.$route.query.ids) {
-      // console.log(this.$route.query.ids);
       document.title = "修改渠道";
       this.id = this.$route.query.ids;
       get("/channel/info/list", {
@@ -236,7 +234,6 @@ export default {
         this.form = res.data[0];
         this.formm = res.data[0];
         this.oldform = JSON.parse(JSON.stringify(res.data[0]));
-        // } else {
       });
     }
     document.title = "新增渠道";
@@ -259,20 +256,18 @@ export default {
         notes: text,
         channelId: channelId,
       }).then((res) => {
-        console.log(res, "新增历史记录", text);
+        // console.log(res, "新增历史记录", text);
       });
     },
 
     ontwo () {
       var array1 = this.oldform;
       var array2 = this.formm;
-      // console.log(array1, "array1", array2, "array2");
       XEUtils.objectEach(array2, (item, key) => {
         if (item != array1[key]) {
           text1 += `\n${key}:${array1[key]} 改为 ${item}`;
         }
       });
-      // console.log(text1, "text");
 
       let type = 2;
       let channelId = this.formm.parentId;
@@ -280,7 +275,7 @@ export default {
       this.addHistory(type, channelId, text); //新增历史记录
 
       if (this.$route.query.ids) {
-        console.log("二级编辑", this.formm);
+        // console.log("二级编辑", this.formm);
         delete this.form.createTime;
         this.parentId = 370;
         this.id = this.id;
@@ -299,13 +294,13 @@ export default {
           }
         });
       } else {
-        console.log("二级创建");
+        // console.log("二级创建");
         if (
           !this.formm.channelName ||
-          !this.formm.channelType
-          // !this.formm.strategyId
+          !this.formm.channelType ||
+          !this.formm.strategyId
         ) {
-          console.log("无内容");
+
           this.$message({
             message: "请输入内容",
             type: "error",
@@ -328,7 +323,7 @@ export default {
 
     //   点击提交
     onSubmit () {
-      // console.log(this.from.parentId);
+
       this.$confirm("此操作将永久改变数据, 是否继续?", "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
@@ -348,7 +343,7 @@ export default {
           this.id = this.id;
           //  一级编辑
           if (this.form.parentId == 0) {
-            console.log("一级编辑");
+            // console.log("一级编辑");
             put("/channel/info/update", this.form).then((res) => {
               //   编辑成功
               if (res.data) {
@@ -367,7 +362,7 @@ export default {
         } else {
           console.log("新增");
           if (!this.form.channelName) {
-            console.log("无内容");
+
             this.$message({
               message: "请输入内容",
               type: "error",
@@ -419,7 +414,7 @@ export default {
     },
 
     toEdit (id) {
-      console.log(id)
+
 
       this.$router.push("/schemeV2/schemeAdd?ids=" + id)
     },
@@ -435,38 +430,7 @@ export default {
         this.celueList = res.data.list
       })
     },
-    remoteMethod (query) {
-      // let that = this;
-      // if (query !== "") {
-      //   this.loading = true;
-      //   get("/channelInfo/page", {
-      //     // parentId: 0,
-      //     channelName: query,
-      //   }).then((res) => {
-      //     this.loading = false;
-      //     that.options = res.data.list;
-      //   });
-      // } else {
-      //   this.options = [];
-      // }
-    },
-    remoteMethodstrategyId (query) {
-      // let that = this;
-      // if (query !== "") {
-      //   this.loading = true;
-      //   get("/strategy/strategy-info/page", {
-      //     strategyName: query,
-      //     pageSize: 100,
-      //     pageNum: 1,
-      //     strategyType: 0,
-      //   }).then((res) => {
-      //     this.loading = false;
-      //     that.celueList = res.data.list;
-      //   });
-      // } else {
-      //   this.options = [];
-      // }
-    },
+
     // 渠道名称输入框失焦事件
     changeName () {
       if (!this.num && !this.$route.query.ids)

admin/src/views/channel/firstChannelList.vue

@@ -32,7 +32,11 @@
       </el-table-column>
       <el-table-column prop="channelPartner" label="合作方"> </el-table-column>
       <el-table-column prop="channelCode" label="渠道编码"> </el-table-column>
-      <el-table-column prop="channelStatus" label="状态"> </el-table-column>
+      <el-table-column prop="channelStatus" label="状态">
+        <template slot-scope="scope">
+          <el-switch :value="scope.row.channelStatus" :active-value="1" :inactive-value="0"></el-switch>
+        </template>
+      </el-table-column>
       <el-table-column prop="onlineTime" label="生效时间"> </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
@@ -47,9 +51,7 @@
 </template>
 
 <script>
-import { post, get, del, put } from "@/api/common";
-
-
+import { get, del } from "@/api/common";
 export default {
   data () {
     return {
@@ -57,12 +59,12 @@ export default {
         channelName: "",
         channelPartner: "",
         pageNo: 1,
-        pageSizes: 20,
+        pageSizes: 10,
       },
 
       pageNo: 1,
       total: 100,
-      pageSizes: 20,
+      pageSizes: 10,
       channelName: "",
       channelPartner: "",
       unicomContacts: "",
@@ -85,12 +87,12 @@ export default {
       }
     },
     query (id) {
-      console.log(id);
+
       this.$router.push("/channel/secondChannelList?id=" + id);
     },
     //刷新
     Refresh () {
-      console.log(11111111111);
+
       this.getChannerList();
     },
     // 搜索
@@ -101,6 +103,7 @@ export default {
         get("/channel/info/page", this.searchForm).then((res) => {
           this.tableData = res.data.list;
           this.total = res.data.total;
+
           // 清空
           this.searchForm = {
             channelName: "",
@@ -117,6 +120,7 @@ export default {
       // 重新获取列表数据
       this.getChannerList();
     },
+
     // 获取订购页列表方法
     getChannerList () {
       get("/channel/info/page", {
@@ -124,7 +128,7 @@ export default {
         pageSize: this.pageSize,
         parentId: 0,
       }).then((res) => {
-        console.log(res);
+
 
         // 一级列表的数组长度=total
         this.total = res.data.total;
@@ -137,14 +141,14 @@ export default {
     },
     //删除
     del (id) {
-      console.log(id);
+
       this.$confirm("此操作将永久删除该文件, 是否继续?", "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning",
       })
         .then(() => {
-          console.log(id);
+
           del("/channel/info/delete", { id }).then((res) => {
             // 判断是否成功，成功刷新列表
             if (res.data) {
@@ -157,11 +161,8 @@ export default {
                   message: "删除成功!",
                 });
               }, 200);
-
               // 判断该页是否还存在数据
-              console.log(this.tableData);
               if (this.tableData.length == 0) {
-                console.log(this.tableData.length == 0);
                 // 没有数据
                 this.pageNo - 1;
                 // 刷新

admin/src/views/channel/secondChannelList.vue

@@ -1,106 +1,103 @@
 <template>
-  <div>
-    <el-container style="padding: 30px">
-      <el-descriptions class="margin-top" title="一级渠道信息" :column="4">
-        <template slot="extra">
-          <el-button type="primary" size="small" @click="oneTOEdit(id)">编辑</el-button>
-          <el-button type="primary" @click="value5 = true" size="small">历史记录</el-button>
-        </template>
-        <el-descriptions-item label="渠道名称">
-          <template slot="label"> 渠道名称 </template>
-          {{ content.channelName }}
-        </el-descriptions-item>
-        <el-descriptions-item label="渠道编码">
-          <template slot="label"> 渠道编码 </template>
-          {{ content.channelCode }}
-        </el-descriptions-item>
-        <el-descriptions-item label="渠道类别">
-          <template slot="label"> 渠道类别 </template>
-          {{ content.channelType }}
-        </el-descriptions-item>
-        <el-descriptions-item label="生效日期">
-          <template slot="label"> 生效日期 </template>
-          {{ content.onlineTime }}
-        </el-descriptions-item>
-
-        <el-descriptions-item label="联系人">
-          <template slot="label"> 联系人 </template>
-          {{ content.partnerContacts }}
-        </el-descriptions-item>
-        <el-descriptions-item label="联系人电话">
-          <template slot="label"> 联系人电话 </template>
-          {{ content.partnerPhone }}
-        </el-descriptions-item>
-        <el-descriptions-item label="负责人">
-          <template slot="label"> 负责人 </template>
-          {{ content.unicomContacts }}
-        </el-descriptions-item>
-        <el-descriptions-item label="联系方式">
-          <template slot="label"> 联系方式 </template>
-          {{ content.partnerPhone }}
-        </el-descriptions-item>
-      </el-descriptions>
-
-      <el-header>
-        <el-form :inline="true" :model="searchForm" ref="searchForm" class="demo-form-inline">
-          <el-form-item label="渠道名称">
-            <el-input v-model="searchForm.channelName" name="searchForm.channelName" placeholder="策略名称" />
-          </el-form-item>
-          <el-form-item label="合作方">
-            <el-input v-model="searchForm.channelPartner" placeholder="合作方" />
-          </el-form-item>
-          <el-form-item style="float: right">
-            <el-button type="primary" size="mini" @click="search()">搜索</el-button>
-            <el-button type="danger" size="mini" @click="pushdata = true">同步科创</el-button>
-            <el-button size="mini" @click="reset('searchForm')">重置</el-button>
-            <el-button size="mini" type="warning" @click="download()">导出</el-button>
-          </el-form-item>
+  <div class="app-container">
+    <el-descriptions class="margin-top" title="一级渠道信息" :column="4">
+      <template slot="extra">
+        <el-button type="primary" size="mini" @click="oneTOEdit(id)">编辑</el-button>
+        <el-button type="primary" @click="value5 = true" size="mini">历史记录</el-button>
+      </template>
+      <el-descriptions-item label="渠道名称">
+        <template slot="label"> 渠道名称 </template>
+        {{ content.channelName }}
+      </el-descriptions-item>
+      <el-descriptions-item label="渠道编码">
+        <template slot="label"> 渠道编码 </template>
+        {{ content.channelCode }}
+      </el-descriptions-item>
+      <el-descriptions-item label="渠道类别">
+        <template slot="label"> 渠道类别 </template>
+        {{ content.channelType }}
+      </el-descriptions-item>
+      <el-descriptions-item label="生效日期">
+        <template slot="label"> 生效日期 </template>
+        {{ content.onlineTime }}
+      </el-descriptions-item>
 
-          <el-row :gutter="10" class="mb8">
-            <el-col :span="1.5">
-              <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="add({ id: content.id }, 'erji', content.channelName)">新增</el-button>
-            </el-col>
-            <el-col :span="1.5">
-              <el-button type="info" icon="el-icon-upload2" size="mini" @click="init()">刷新</el-button>
-            </el-col>
-          </el-row>
+      <el-descriptions-item label="联系人">
+        <template slot="label"> 联系人 </template>
+        {{ content.partnerContacts }}
+      </el-descriptions-item>
+      <el-descriptions-item label="联系人电话">
+        <template slot="label"> 联系人电话 </template>
+        {{ content.partnerPhone }}
+      </el-descriptions-item>
+      <el-descriptions-item label="负责人">
+        <template slot="label"> 负责人 </template>
+        {{ content.unicomContacts }}
+      </el-descriptions-item>
+      <el-descriptions-item label="联系方式">
+        <template slot="label"> 联系方式 </template>
+        {{ content.partnerPhone }}
+      </el-descriptions-item>
+    </el-descriptions>
 
-        </el-form>
-      </el-header>
-      <el-divider></el-divider>
-
-      <el-dialog title="二维码下载" :visible.sync="dialogVisible">
-        <div style="text-align: center">
-          <div id="qrcode"></div>
-          <div style="height: 25px; line-height: 25px; margin-top: 30px">
-            鼠标右键图片另存为
-          </div>
+    <el-header>
+      <el-form :inline="true" :model="searchForm" ref="searchForm" class="demo-form-inline">
+        <el-form-item label="渠道名称">
+          <el-input v-model="searchForm.channelName" name="searchForm.channelName" placeholder="策略名称" size="mini" />
+        </el-form-item>
+        <el-form-item label="合作方">
+          <el-input v-model="searchForm.channelPartner" placeholder="合作方" size="mini" />
+        </el-form-item>
+        <el-form-item style="float: right">
+          <el-button type="primary" size="mini" @click="search()">搜索</el-button>
+          <el-button type="danger" size="mini" @click="pushdata = true">同步科创</el-button>
+          <el-button size="mini" @click="reset('searchForm')">重置</el-button>
+          <el-button size="mini" type="warning" @click="download()">导出</el-button>
+        </el-form-item>
+      </el-form>
+    </el-header>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="add({ id: content.id }, 'erji', content.channelName)">新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="info" icon="el-icon-upload2" size="mini" @click="init()">刷新</el-button>
+      </el-col>
+    </el-row>
+
+    <el-dialog title="二维码下载" :visible.sync="dialogVisible">
+      <div style="text-align: center">
+        <div id="qrcode"></div>
+        <div style="height: 25px; line-height: 25px; margin-top: 30px">
+          鼠标右键图片另存为
         </div>
-        <span slot="footer" class="dialog-footer">
-          <el-button @click="dialogVisible = false">取 消</el-button>
-        </span>
-      </el-dialog>
-
-      <vxe-modal v-model="value5" width="60%" title="历史记录">
-        <template #default>
-          <vxe-toolbar>
-            <template #buttons>
-              <vxe-input v-model="channelogParam.notes" type="search" clearable placeholder="搜索操作记录"></vxe-input>
-              <vxe-input v-model="channelogParam.userName" type="search" clearable placeholder="搜索操作人"></vxe-input>
-              <vxe-button @click="searchEvent" content="搜索"></vxe-button>
+      </div>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="dialogVisible = false">取 消</el-button>
+      </span>
+    </el-dialog>
+
+    <vxe-modal v-model="value5" width="60%" title="历史记录">
+      <template #default>
+        <vxe-toolbar>
+          <template #buttons>
+            <vxe-input v-model="channelogParam.notes" type="search" clearable placeholder="搜索操作记录"></vxe-input>
+            <vxe-input v-model="channelogParam.userName" type="search" clearable placeholder="搜索操作人"></vxe-input>
+            <vxe-button @click="searchEvent" content="搜索"></vxe-button>
+          </template>
+        </vxe-toolbar>
+
+        <vxe-table auto-resize height="600" :data="channelog">
+          <vxe-table-column field="createTime" title="时间"></vxe-table-column>
+          <vxe-table-column field="notes" title="操作记录">
+            <template slot-scope="props">
+              <div v-html="props.row.notes"></div>
             </template>
-          </vxe-toolbar>
-
-          <vxe-table auto-resize height="600" :data="channelog">
-            <vxe-table-column field="createTime" title="时间"></vxe-table-column>
-            <vxe-table-column field="notes" title="操作记录">
-              <template slot-scope="props">
-                <div v-html="props.row.notes"></div>
-              </template>
-            </vxe-table-column>
-            <vxe-table-column field="userName" title="操作人"></vxe-table-column>
-          </vxe-table>
-          <vxe-pager :loading="loading" :current-page="channelogParam.pageNum" :page-size="channelogParam.pageSize" :total="channelogParam.totalResult" :layouts="[
+          </vxe-table-column>
+          <vxe-table-column field="userName" title="操作人"></vxe-table-column>
+        </vxe-table>
+        <vxe-pager :loading="loading" :current-page="channelogParam.pageNo" :page-size="channelogParam.pageSize" :total="channelogParam.totalResult" :layouts="[
               'PrevPage',
               'JumpNumber',
               'NextPage',
@@ -108,64 +105,63 @@
               'Sizes',
               'Total',
             ]" @page-change="handlePageChangeChannelog" />
+      </template>
+    </vxe-modal>
+    <!-- 同步 -->
+    <vxe-modal title="同步" v-model="pushdata" width="600">
+      <template #default>
+        <el-form ref="form" label-width="80px">
+          <el-form-item label="选择时间">
+            <el-date-picker v-model="pushdataDate" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" format="yyyy 年 MM 月 dd 日" value-format="yyyy-MM-dd">
+            </el-date-picker>
+          </el-form-item>
+          <el-form-item>
+            <el-button type="primary" mini @click="onSubmit">立即同步</el-button>
+            <el-button @click="pushdata = false" mini>取消</el-button>
+          </el-form-item>
+        </el-form>
+      </template>
+    </vxe-modal>
+
+    <!-- 表格 -->
+    <el-table :data="tableData" style="width: 100%">
+      <el-table-column prop="channelName" label="渠道名称" width="180">
+      </el-table-column>
+      <el-table-column prop="channelKey" label="渠道key" width="180">
+      </el-table-column>
+      <el-table-column prop="fullCode" label="完整渠道编码">
+      </el-table-column>
+      <el-table-column prop="address" label="渠道类别"> </el-table-column>
+      <el-table-column prop="channelStatus" label="渠道形态">
+      </el-table-column>
+      <el-table-column prop="channelStatus" label="状态">
+        <template slot-scope="scope">
+          <el-switch :value="scope.row.channelStatus" :active-value="1" :inactive-value="0"></el-switch>
         </template>
-      </vxe-modal>
-      <!-- 同步 -->
-      <vxe-modal title="同步" v-model="pushdata" width="600">
-        <template #default>
-          <el-form ref="form" label-width="80px">
-            <el-form-item label="选择时间">
-              <el-date-picker v-model="pushdataDate" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" format="yyyy 年 MM 月 dd 日" value-format="yyyy-MM-dd">
-              </el-date-picker>
-            </el-form-item>
-            <el-form-item>
-              <el-button type="primary" @click="onSubmit">立即同步</el-button>
-              <el-button @click="pushdata = false">取消</el-button>
-            </el-form-item>
-          </el-form>
+      </el-table-column>
+
+      <el-table-column prop="onlineTime" label="生效时间"> </el-table-column>
+      <el-table-column prop="channelCode" label="操作">
+        <template #default="{ row }">
+          <el-button @click="toEdit(row.id, 'erji')" size="mini" type="text" icon="el-icon-edit">编辑</el-button>
+          <el-button @click="checkpushdata(row)" size="mini" type="text" icon="el-icon-edit">查询同步</el-button>
+          <el-button size="mini" type="text" icon="el-icon-plus" @click="copy(row)">复制链接</el-button>
+          <el-button @click="giveShort(row)" size="mini" type="text" icon="el-icon-share">短链接</el-button>
+          <el-button @click="ewm(row)" size="mini" type="text" icon="el-icon-mobile-phone">二维码</el-button>
         </template>
-      </vxe-modal>
-
-      <!-- 表格 -->
-      <el-table :data="tableData" style="width: 100%">
-        <el-table-column prop="channelName" label="渠道名称" width="180">
-        </el-table-column>
-        <el-table-column prop="channelKey" label="渠道key" width="180">
-        </el-table-column>
-        <el-table-column prop="fullCode" label="完整渠道编码">
-        </el-table-column>
-        <el-table-column prop="address" label="渠道类别"> </el-table-column>
-        <el-table-column prop="channelStatus" label="渠道形态">
-        </el-table-column>
-        <el-table-column prop="channelStatus" label="状态"> </el-table-column>
-
-        <el-table-column prop="onlineTime" label="生效时间"> </el-table-column>
-        <el-table-column prop="channelCode" label="操作">
-          <template #default="{ row }">
-            <el-button @click="toEdit(row.id, 'erji')" size="mini" type="text" icon="el-icon-edit">编辑</el-button>
-            <el-button @click="checkpushdata(row)" size="mini" type="text" icon="el-icon-edit">查询同步</el-button>
-            <el-button size="mini" type="text" icon="el-icon-plus" @click="copy(row)">复制链接</el-button>
-            <el-button @click="giveShort(row)" size="mini" type="text" icon="el-icon-share">短链接</el-button>
-            <el-button @click="ewm(row)" size="mini" type="text" icon="el-icon-mobile-phone">二维码</el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-    </el-container>、
+      </el-table-column>
+    </el-table>
+    <pagination v-show="total>0" :total="total" :page.sync="tableData.pageNo" :limit.sync="tableData.pageSize" @pagination="pagination" />
+    </el-container>
 
-    <pagination v-show="total>0" :total="total" :page.sync="tableData.pageNo" :limit.sync="tableData.pageSize" @pagination="search" />
   </div>
 </template>
 
 <script>
 import { exportChannel } from './api'
-import {
-  post,
-  get,
-
-} from "@/api/common";
+import { post, get, } from "@/api/common";
 import QRCode from "qrcodejs2";
 
-
 export default {
   name: "SchemeEdit",
   data () {
@@ -175,14 +171,13 @@ export default {
         channelName: "",
         channelPartner: "",
         parentId: 0,
-        pageNum: 1,
         pageNo: 1,
         pageSize: 10,
         totalResult: 0,
       },
       pageNo: 1,
       total: 100,
-      pageSizes: 20,
+      pageSizes: 10,
       initfrom: {
         channelName: "",
         pageNo: 1,
@@ -238,7 +233,6 @@ export default {
       ],
 
       dialogVisible: false,
-
       value5: false,
       pushdata: false,
       pushdataDate: "",
@@ -256,10 +250,8 @@ export default {
   watch: {
     value5 (val) {
       if (val) {
-        console.log(val, "val");
+
         get("/channel/log/page", this.channelogParam).then((res) => {
-          // console.log(this.channelogParam, "历史记录");
-          // console.log(res, "历史记录");
           this.channelog = res.data.list;
           this.channelogParam.totalResult = res.data.total;
         });
@@ -271,14 +263,19 @@ export default {
     },
   },
   created () {
-    // console.log(this.initfrom);
-    // 在哪呢？
     this.getSecondList();
   },
   methods: {
+    // 改变页码触发
+    pagination (page) {
+      this.pageNo = page.page;
+      // 重新获取列表数据
+      this.init();
+    },
+
     //重置
     reset () {
-
+      this.searchForm = {}
     },
 
     //获取列表
@@ -288,13 +285,11 @@ export default {
       get("/channel/info/get", {
         id: this.$route.query.id,
       }).then((res) => {
-        // console.log(res, "一级列表详情");
         this.content = res.data;
-        this.total = res.data.list.length;
+        this.total = res.data.total;
 
       });
       this.init();
-      // console.log(this.$route.query.id);
     },
 
     pagination (page) {
@@ -302,14 +297,20 @@ export default {
       // 重新获取列表数据
       this.getSecondList();
     },
+    //搜索按钮
     search () {
-      get("/channel/info/listChannels", this.searchForm).then((res) => {
-        console.log(res);
-        this.tableData = res.data.list
-        this.total = res.data.list.length;
-        console.log(res);
+      if (!this.searchForm.channelName || !this.searchForm.channelPartner) {
+        this.$message.error("请输入内容")
+      } else {
+        get("/channel/info/listChannels", this.searchForm).then((res) => {
+
+          this.tableData = res.data.list
+          this.total = res.data.list.length;
+
+
+        });
+      }
 
-      });
     },
 
     // 一级编辑
@@ -342,9 +343,7 @@ export default {
     //短链接
     giveShort (row) {
       let stUrl = row.shortUrl;
-      // console.log(row);
       if (stUrl) {
-        // console.log(111);
         let oInput = document.createElement("input");
         oInput.value = `http://v.mige.tv/${stUrl}`;
         document.body.appendChild(oInput);
@@ -356,14 +355,11 @@ export default {
         });
         oInput.remove();
       } else {
-        // console.log(222);
         let data = {
           channel: row.channelKey,
           longUrl: `https://operation.mige.tv/a/#/${row.channelKey}`,
         };
-        // console.log(data);
         post("/channel/info/shorturl", data).then((res) => {
-          // console.log(res);
           let resUrl = res.data.shortCode;
           let oInput = document.createElement("input");
           oInput.value = `http://v.mige.tv/${resUrl}`;
@@ -388,43 +384,33 @@ export default {
         this.$download.excel(response, '渠道数据.xlsx');
       })
     },
-    handlePageChange ({ currentPage, pageSize }) {
-      this.searchForm.pageNum = currentPage;
-      this.searchForm.pageSize = pageSize;
-      this.init();
-    },
-    handlePageChange ({
-      currentPage,
-      pageSize
-    }) {
-      this.searchForm.pageNum = currentPage;
-      this.searchForm.pageSize = pageSize;
-      this.init();
-    },
+
+    //历史记录分页
     handlePageChangeChannelog ({
       currentPage,
       pageSize
     }) {
-      this.channelogParam.pageNum = currentPage;
+      this.channelogParam.pageNo = currentPage;
       this.channelogParam.pageSize = pageSize;
       get("/channelInfo/channelogpage", this.channelogParam).then((res) => {
+
         this.channelog = res.data.list;
         this.channelogParam.totalResult = res.data.total;
       });
     },
+    //获取二级列表
     init () {
       get("/channel/info/listChannels", this.initfrom).then((res) => {
-        // console.log(this.$route.query.id);
         let secondList = res.data.list.filter((item) => {
           return item.parentId == this.$route.query.id;
         });
+
         this.tableData = secondList;
-        this.total = res.data.total;
+        this.total = secondList.length;
         this.oldform = secondList;
-        // console.log(this.tableData, "一级下的二级");
       });
     },
-
+    //历史记录搜索
     searchEvent () {
       get("/channelInfo/channelogpage", this.channelogParam).then((res) => {
         this.channelog = res.data.list;
@@ -442,21 +428,7 @@ export default {
         });
       });
     },
-    // onSubmit() {
-    //   post(
-    //     "/channelInfo/pushdata?beginTime=" +
-    //       this.pushdataDate[0] +
-    //       "&endTime=" +
-    //       this.pushdataDate[1],
-    //     {}
-    //   ).then((res) => {
-    //     this.$message({
-    //       message: res.message,
-    //       type: "success",
-    //     });
-    //     this.pushdata = false;
-    //   });
-    // },
+
     checkpushdata (e) {
       get("/channelInfo/detail", {
         id: e.id,
@@ -482,53 +454,15 @@ export default {
               "&endTime=" +
               this.pushdataDate[1], {}
             ).then((res) => {
-              // console.log(res);
               this.$message({
                 message: channel.channelName + "同步成功",
                 type: "success",
               });
-              // console.log("success");
             });
           }
         });
       });
     },
-    // dateNew(timestamp) {
-    //   var date = new Date(timestamp); //时间戳为10位需*1000，时间戳为13位的话不需乘1000
-    //   var Y = date.getFullYear() + "-";
-    //   var M =
-    //     (date.getMonth() + 1 < 10
-    //       ? "0" + (date.getMonth() + 1)
-    //       : date.getMonth() + 1) + "-";
-    //   // var D = date.getDate() + ' ';
-    //   var D =
-    //     (date.getDate() < 10 ? "0" + date.getDate() : date.getDate()) + " ";
-    //   var h = date.getHours() + ":";
-    //   var m = date.getMinutes() + ":";
-    //   var s = date.getSeconds();
-    //   return Y + M + D + h + m + s;
-    // },
-
-    // editClosedEvent({ row, column }) {
-    //   const $table = this.$refs.xTable;
-    //   const field = column.property;
-    //   const cellValue = row[field];
-    //   // 判断单元格值是否被修改
-    //   if ($table.isUpdateByRow(row, field)) {
-    //     setTimeout(() => {
-    //       let param = {};
-    //       param[field] = cellValue;
-    //       post("/channelInfo/update/" + row.id, row).then((res) => {
-    //         this.$message({
-    //           message: res.message,
-    //           type: "success",
-    //         });
-    //       });
-    //       // 局部更新单元格为已保存状态
-    //       $table.reloadRow(row, null, field);
-    //     }, 300);
-    //   }
-    // },
 
     add (e, type, channelName) {
       this.$router.push(

admin/src/views/produce/api.js

@@ -0,0 +1,31 @@
+import request from '@/utils/request'
+
+//获取产品分类列表
+export function listProduct(query) {
+  return request({
+    url: '/product/cpid-info/page',
+    method: 'get',
+    params: query
+  })
+}
+
+//新增商品分类
+export function  addProduct (data){
+return request({
+  url:"product/cpid-info/create",
+  method:'post',
+  data:data
+})
+}
+
+
+
+
+ 
+
+
+
+
+
+
+

admin/src/views/produce/produceClass/index.vue

@@ -38,7 +38,7 @@
 
     </el-table>
 
-    <pagination v-show="total > 0" :total="total" :page="pageNo" :limit="pageSizes" @pagination="pagination" />
+    <pagination v-show="total > 0" :total="total" :page="searchForm.pageNo" :limit="searchForm.pageSizes" @pagination="pagination" />
 
     <!--新增抽屉-->
     <el-drawer ref="addDrawer" title="编辑产品分类" size="50%" :before-close="addHandleClose" :with-header="false" :visible.sync="addDialog" direction="rtl" custom-class="demo-drawer">
@@ -93,10 +93,11 @@
 </template>
 
 <script>
+import { listProduct, addProduct } from "../api.js";
 import { post, get, del, put } from "@/api/common";
 import getTime from "@/utils/getTime.js";
 export default {
-  name: "ProduceClass",
+
   data () {
     return {
       loading: false,
@@ -127,8 +128,8 @@ export default {
   },
 
   created () {
-    var that = this;
-    that.search();
+    this.search()
+    // this.getList();
   },
   methods: {
     // 改变页码触发
@@ -145,14 +146,25 @@ export default {
         d = ("0" + now.getDate()).slice(-2);
       return y + "-" + m + "-" + d + " " + now.toTimeString().substr(0, 8);
     },
+    //获取列表
+    getList () {
+      listProduct(this.searchForm).then(response => {
+        this.tableData = response.data.list;
+        this.tableData.forEach((item) => {
+          item.createTime = getTime(item.createTime);
+        });
+
+        this.total = response.data.total;
+      })
+    },
 
-    async search () {
-      // 同步搜索
 
+    async search () {
+      //获取列表
       await get("/product/cpid-info/page", this.searchForm)
         .then((res) => {
           this.tableData = res.data.list;
-          console.log(this.tableData, "商品分类");
+
           this.tableData.forEach((item) => {
             item.createTime = getTime(item.createTime);
           });
@@ -173,8 +185,7 @@ export default {
 
     },
     reset () {
-      //   // 重置
-      console.log("重置")
+      // 重置
       this.searchForm = {};
       this.editForm = {
         cpid: "",
@@ -194,6 +205,11 @@ export default {
 
       this.search();
     },
+    // addProduct (this.addForm).then(response=>{
+    //       this.$modal.msgSuccess("新增成功");
+    // }),
+
+
     addHandleClose (done) {
       // 新增数据
       if (this.loading) return;
@@ -206,7 +222,7 @@ export default {
               if (res.code == 0) {
                 this.search();
                 this.reset()
-                console.log(res.code);
+
               }
               setTimeout(() => {
                 this.addDialog = false;
@@ -235,7 +251,7 @@ export default {
           this.editDialog = true;
           put("/product/cpid-info/update", this.editForm)
             .then((res) => {
-              console.log(res);
+
               if (res.code === 0) this.search(); this.reset();
               setTimeout(() => {
                 this.editDialog = false;
@@ -259,7 +275,7 @@ export default {
     },
     cancelForm () {
       // 关闭抽屉
-      console.log(123);
+
       this.loading = false;
       this.editDialog = false;
       this.addDialog = false;

admin/src/views/produce/productV2/addProduct.vue

@@ -2,100 +2,51 @@
   <div class="addProduct">
     <el-form :model="form" label-width="100px">
       <el-form-item label="产品名称">
-        <el-input
-          style="width: 300px"
-          v-model="form.productName"
-          placeholder="产品名称"
-        ></el-input>
+        <el-input style="width: 300px" v-model="form.productName" placeholder="产品名称"></el-input>
       </el-form-item>
       <el-form-item label="spid">
-        <el-input
-          style="width: 300px"
-          v-model="form.spid"
-          placeholder="spid"
-        ></el-input>
+        <el-input style="width: 300px" v-model="form.spid" placeholder="spid"></el-input>
       </el-form-item>
       <el-form-item label="cpid">
         <el-select v-model="form.cpid" placeholder="cpid" style="width: 300px">
-          <el-option
-            v-for="item in cpidList"
-            :key="item.cpid"
-            :label="item.cpid"
-            :value="item.cpid"
-          >
+          <el-option v-for="item in cpidList" :key="item.cpid" :label="item.cpid" :value="item.cpid">
           </el-option>
         </el-select>
       </el-form-item>
       <el-form-item label="activeType">
-        <el-input
-          style="width: 300px"
-          v-model="form.activeType"
-          placeholder="科创定义activeType，根据对照表填写"
-        ></el-input>
+        <el-input style="width: 300px" v-model="form.activeType" placeholder="科创定义activeType，根据对照表填写"></el-input>
       </el-form-item>
       <el-form-item label="直冲阈值">
-        <el-input
-          style="width: 300px"
-          v-model="form.threshold"
-          placeholder="如无阈值设置，则填0"
-        ></el-input>
+        <el-input style="width: 300px" v-model="form.threshold" placeholder="如无阈值设置，则填0"></el-input>
         <div style="color: red">
           直冲阈值>0，开启订购自动领取会员，当日订购成功数满足阈值则开始自动领取该产品会员
         </div>
       </el-form-item>
       <el-form-item label="产品形态">
-        <el-select
-          v-model="form.isCompositeProduct"
-          placeholder="请选择"
-          style="width: 300px"
-        >
+        <el-select v-model="form.isCompositeProduct" placeholder="请选择" style="width: 300px">
           <el-option label="单产品" :value="0" />
           <el-option label="复合产品" :value="1" />
           <el-option label="多选一" :value="2" />
         </el-select>
       </el-form-item>
       <el-form-item label="产品原价">
-        <el-input
-          style="width: 300px"
-          v-model="form.originalPrice"
-          placeholder="产品原价"
-        ></el-input>
+        <el-input style="width: 300px" v-model="form.originalPrice" placeholder="产品原价"></el-input>
       </el-form-item>
       <el-form-item label="产品备注">
-        <el-input
-          style="width: 300px"
-          placeholder="产品备注"
-          v-model="form.remark"
-        ></el-input>
+        <el-input style="width: 300px" placeholder="产品备注" v-model="form.remark"></el-input>
       </el-form-item>
       <el-form-item label="会员信息">
-        <el-input
-          style="width: 300px"
-          placeholder="若无，则留空"
-          v-model="form.memberName"
-        ></el-input>
+        <el-input style="width: 300px" placeholder="若无，则留空" v-model="form.memberName"></el-input>
       </el-form-item>
       <el-form-item label="会员领取链接">
-        <el-input
-          style="width: 300px"
-          placeholder="会员领取链接"
-          v-model="productJson[0].memberUrl"
-        ></el-input>
+        <el-input style="width: 300px" placeholder="会员领取链接" v-model="productJson[0].memberUrl"></el-input>
       </el-form-item>
       <el-form-item label="激活指引">
-        <el-input
-          style="width: 500px"
-          placeholder="激活指引"
-          v-model="form.flowJumpUrl"
-        ></el-input>
+        <el-input style="width: 500px" placeholder="激活指引" v-model="form.flowJumpUrl"></el-input>
       </el-form-item>
 
       <el-form-item label="分享文案">
-        <el-input
-          style="width: 500px"
-          v-model="form.remark3"
-          placeholder="微信分享副标题"
-        ></el-input>
+        <el-input style="width: 500px" v-model="form.remark3" placeholder="微信分享副标题"></el-input>
       </el-form-item>
       <el-form-item label="页面背景配色">
         <el-row :gutter="10">
@@ -238,46 +189,21 @@
         >
       </el-form-item> -->
       <el-form-item label="炫彩UI">
-        <el-radio
-          v-model="productJson[0].productV"
-          label="1"
-          @change="radioChange"
-          >V1</el-radio
-        >
-        <el-radio
-          v-model="productJson[0].productV"
-          label="2"
-          @change="radioChange"
-          >V2</el-radio
-        >
+        <el-radio v-model="productJson[0].productV" label="1" @change="radioChange">V1</el-radio>
+        <el-radio v-model="productJson[0].productV" label="2" @change="radioChange">V2</el-radio>
       </el-form-item>
       <!-- 富文本编辑 -->
       <!-- 富文本编辑 -->
       <el-form-item>
         <el-tabs type="border-card" style="margin-top: 20px">
           <el-tab-pane label="产品订购说明">
-            <quill-editor
-              ref="text"
-              class="myQuillEditor"
-              v-model="form.orderingInfo"
-              :options="editorOption"
-            />
+            <quill-editor ref="text" class="myQuillEditor" v-model="form.orderingInfo" :options="editorOption" />
           </el-tab-pane>
           <el-tab-pane label="赠送话费说明">
-            <quill-editor
-              ref="text"
-              v-model="form.givePhoneInfo"
-              class="myQuillEditor"
-              :options="editorOption"
-            />
+            <quill-editor ref="text" v-model="form.givePhoneInfo" class="myQuillEditor" :options="editorOption" />
           </el-tab-pane>
           <el-tab-pane label="活动说明">
-            <quill-editor
-              ref="text"
-              v-model="form.manualInfo"
-              class="myQuillEditor"
-              :options="editorOption"
-            />
+            <quill-editor ref="text" v-model="form.manualInfo" class="myQuillEditor" :options="editorOption" />
           </el-tab-pane>
         </el-tabs>
       </el-form-item>
@@ -287,8 +213,7 @@
             <el-button style="width: 100%" @click="close()">取消</el-button>
           </el-col>
           <el-col :span="12">
-            <el-button type="primary" style="width: 100%" @click="addClick"
-              >确定
+            <el-button type="primary" style="width: 100%" @click="addClick">确定
             </el-button>
           </el-col>
         </el-row>
@@ -308,7 +233,7 @@ export default {
   components: {
     quillEditor,
   },
-  data() {
+  data () {
     return {
       imgapi: process.env.VUE_APP_BASE_IMG_API,
       addColors: {
@@ -437,7 +362,7 @@ export default {
       },
     };
   },
-  created() {
+  created () {
     document.title = "产品新增";
     let copyId = this.$route.query.copyId;
     if (copyId) {
@@ -484,7 +409,7 @@ export default {
       });
     }
   },
-  mounted() {
+  mounted () {
     get("/product/cpid-info/page", {
       pageSize: 100,
       pageNum: 1,
@@ -494,7 +419,7 @@ export default {
   },
   methods: {
     // 确认新增
-    addClick() {
+    addClick () {
       this.form.themeColor = JSON.stringify([
         this.addColors.thc.s,
         this.addColors.thc.e,
@@ -505,16 +430,16 @@ export default {
         this.addColors.bgc.ss ? this.addColors.bgc.ss : "",
         this.addColors.bgc.ee ? this.addColors.bgc.ee : "",
       ]);
-      console.log(this.form.themeColor, this.form.bgColor, "颜色");
+
       this.form.cacheSeatOne = JSON.stringify(this.productJson);
       this.form.guidancePic = JSON.stringify(this.guidancePic);
       this.$confirm("确定要提交吗？").then((_) => {
         if (!this.form.threshold) this.form.threshold = 0;
         post("/product/info/create", this.form).then((res) => {
-          // console.log(this.addColors.bgc, this.addColors.thc, "颜色");
+
           if (res.code === 0) {
             this.$message.success("新增成功");
-            console.log(this.addColors, "颜色");
+
             setTimeout(() => {
               this.$router.back();
             }, 1200);
@@ -522,31 +447,31 @@ export default {
         });
       });
     },
-    close() {
+    close () {
       this.$router.back()();
     },
-    bannerSuccess(file, fileList) {
+    bannerSuccess (file, fileList) {
       this.bannerUrl = process.env.VUE_APP_BASE_IMG_URL + file.data;
       let arr = [];
       arr.push(file.data);
       this.form.bannerPics = JSON.stringify(arr);
     },
-    logoSuccess(file) {
+    logoSuccess (file) {
       this.logoUrl = process.env.VUE_APP_BASE_IMG_URL + file.data;
       this.form.logoPic = file.data;
     },
-    guideSuccessP(file) {
+    guideSuccessP (file) {
       this.guideUrlP = process.env.VUE_APP_BASE_IMG_URL + file.data;
       this.guidancePic.p = file.data;
     },
-    guideSuccessC(file) {
+    guideSuccessC (file) {
       this.guideUrlC = process.env.VUE_APP_BASE_IMG_URL + file.data;
       this.guidancePic.c = file.data;
     },
-    btnSuccess(file) {
+    btnSuccess (file) {
       this.productJson[0].btnUrl = process.env.VUE_APP_BASE_IMG_URL + file.data;
     },
-    radioChange() {
+    radioChange () {
       if (this.productJson[0].productV === "2") {
         this.form.givePhoneInfo =
           "<p><strong>产品</strong> xxxx流量会员合约包</p><p><strong>资费</strong> <strong>首月xx元,次月起xx元/月</strong></p><p><strong>内容</strong> xxGB定向流量+xxxx会员</p><p><strong>合约</strong> <strong>本产品合约期为6个月,第六个月方可退订,用户在合约期内解除合约时,需补足首月优惠金额,切在原合约期结束后方能再次退订</strong></p>";

admin/src/views/produce/productV2/editProduct.vue

@@ -2,102 +2,53 @@
   <div class="edit">
     <el-form :model="form" label-width="100px">
       <el-form-item label="产品名称">
-        <el-input
-          style="width: 300px"
-          v-model="form.productName"
-          placeholder="产品名称"
-        ></el-input>
+        <el-input style="width: 300px" v-model="form.productName" placeholder="产品名称"></el-input>
       </el-form-item>
       <el-form-item label="spid">
-        <el-input
-          style="width: 300px"
-          v-model="form.spid"
-          placeholder="spid"
-        ></el-input>
+        <el-input style="width: 300px" v-model="form.spid" placeholder="spid"></el-input>
       </el-form-item>
       <el-form-item label="cpid">
         <el-select v-model="form.cpid" placeholder="cpid" style="width: 300px">
-          <el-option
-            v-for="item in cpidList"
-            :key="item.cpid"
-            :label="item.cpid"
-            :value="item.cpid"
-          >
+          <el-option v-for="item in cpidList" :key="item.cpid" :label="item.cpid" :value="item.cpid">
           </el-option>
         </el-select>
       </el-form-item>
       <el-form-item label="activeType">
-        <el-input
-          style="width: 300px"
-          v-model="form.activeType"
-          placeholder="科创定义activeType，根据对照表填写"
-        ></el-input>
+        <el-input style="width: 300px" v-model="form.activeType" placeholder="科创定义activeType，根据对照表填写"></el-input>
       </el-form-item>
       <el-form-item label="直冲阈值">
-        <el-input
-          style="width: 300px"
-          v-model="form.threshold"
-          placeholder="如无阈值设置，则填0"
-        ></el-input>
+        <el-input style="width: 300px" v-model="form.threshold" placeholder="如无阈值设置，则填0"></el-input>
         <div style="color: red">
           直冲阈值>0，开启订购自动领取会员，当日订购成功数满足阈值则开始自动领取该产品会员
         </div>
       </el-form-item>
       <el-form-item label="产品形态">
-        <el-select
-          v-model="form.isCompositeProduct"
-          placeholder="请选择"
-          style="width: 300px"
-        >
+        <el-select v-model="form.isCompositeProduct" placeholder="请选择" style="width: 300px">
           <el-option label="单产品" :value="0" />
           <el-option label="复合产品" :value="1" />
           <el-option label="多选一" :value="2" />
         </el-select>
       </el-form-item>
       <el-form-item label="产品原价">
-        <el-input
-          style="width: 300px"
-          v-model="form.originalPrice"
-          placeholder="产品原价"
-        ></el-input>
+        <el-input style="width: 300px" v-model="form.originalPrice" placeholder="产品原价"></el-input>
       </el-form-item>
       <el-form-item label="产品备注">
-        <el-input
-          style="width: 300px"
-          placeholder="产品备注"
-          v-model="form.remark"
-        ></el-input>
+        <el-input style="width: 300px" placeholder="产品备注" v-model="form.remark"></el-input>
       </el-form-item>
       <el-form-item label="会员信息">
-        <el-input
-          style="width: 300px"
-          placeholder="若无，则留空"
-          v-model="form.memberName"
-        ></el-input>
+        <el-input style="width: 300px" placeholder="若无，则留空" v-model="form.memberName"></el-input>
       </el-form-item>
       <el-form-item label="会员领取链接">
-        <el-input
-          style="width: 300px"
-          placeholder="会员领取链接"
-          v-model="productJson[0].memberUrl"
-        ></el-input>
+        <el-input style="width: 300px" placeholder="会员领取链接" v-model="productJson[0].memberUrl"></el-input>
       </el-form-item>
       <el-form-item label="激活指引">
-        <el-input
-          style="width: 500px"
-          placeholder="激活指引"
-          v-model="form.flowJumpUrl"
-        ></el-input>
+        <el-input style="width: 500px" placeholder="激活指引" v-model="form.flowJumpUrl"></el-input>
       </el-form-item>
       <!-- <el-form-item label="分享标题">
                     <el-input style="width: 500px" v-model="form.pageTitle"></el-input>
                   </el-form-item> -->
       <el-form-item label="分享文案">
-        <el-input
-          style="width: 500px"
-          v-model="form.remark3"
-          placeholder="微信分享副标题"
-        ></el-input>
+        <el-input style="width: 500px" v-model="form.remark3" placeholder="微信分享副标题"></el-input>
       </el-form-item>
       <el-form-item label="页面背景配色">
         <el-row :gutter="10">
@@ -250,28 +201,13 @@
       <el-form-item>
         <el-tabs type="border-card" style="margin-top: 20px">
           <el-tab-pane label="产品订购说明">
-            <quill-editor
-              ref="text"
-              class="myQuillEditor"
-              v-model="form.orderingInfo"
-              :options="editorOption"
-            />
+            <quill-editor ref="text" class="myQuillEditor" v-model="form.orderingInfo" :options="editorOption" />
           </el-tab-pane>
           <el-tab-pane label="赠送话费说明">
-            <quill-editor
-              ref="text"
-              v-model="form.givePhoneInfo"
-              class="myQuillEditor"
-              :options="editorOption"
-            />
+            <quill-editor ref="text" v-model="form.givePhoneInfo" class="myQuillEditor" :options="editorOption" />
           </el-tab-pane>
           <el-tab-pane label="活动说明">
-            <quill-editor
-              ref="text"
-              v-model="form.manualInfo"
-              class="myQuillEditor"
-              :options="editorOption"
-            />
+            <quill-editor ref="text" v-model="form.manualInfo" class="myQuillEditor" :options="editorOption" />
           </el-tab-pane>
         </el-tabs>
       </el-form-item>
@@ -281,8 +217,7 @@
             <el-button style="width: 100%" @click="close()">取消</el-button>
           </el-col>
           <el-col :span="12">
-            <el-button type="primary" style="width: 100%" @click="sureClick"
-              >确定
+            <el-button type="primary" style="width: 100%" @click="sureClick">确定
             </el-button>
           </el-col>
         </el-row>
@@ -292,9 +227,8 @@
 </template>
 
 <script>
-import { post, get, del, put } from "@/api/common";
+import { get, put } from "@/api/common";
 import { quillEditor } from "vue-quill-editor";
-import Quill from "quill";
 import "quill/dist/quill.core.css";
 import "quill/dist/quill.snow.css";
 import "quill/dist/quill.bubble.css";
@@ -303,7 +237,7 @@ export default {
   components: {
     quillEditor,
   },
-  data() {
+  data () {
     return {
       id: "",
       imgapi: process.env.VUE_APP_BASE_IMG_API,
@@ -432,7 +366,7 @@ export default {
       },
     };
   },
-  created() {
+  created () {
     document.title = "产品修改";
     get("/product/info/get", {
       id: this.$route.query.ids,
@@ -440,23 +374,21 @@ export default {
     }).then((res) => {
       let row = res.data;
       row.threshold = row.threshold ? row.threshold : 0;
-      // this.form = row;
 
-      // console.log(res, "一条数据");
       this.form = row;
-      // console.log(res.data, "row");
+
       this.addColors.thc = {
         s: JSON.parse(row.themeColor)[0],
         e: JSON.parse(row.themeColor)[1],
       };
-      console.log(row);
+
       this.addColors.bgc = {
         s: JSON.parse(row.bgColor)[0],
         e: JSON.parse(row.bgColor)[1],
         ss: JSON.parse(row.bgColor)[2],
         ee: JSON.parse(row.bgColor)[3],
       };
-      console.log(this.form.bgColor, this.form.themeColor, "颜色");
+
 
       // row.threshold = row.threshold ? row.threshold : 0;
       // this.form = row;
@@ -486,7 +418,7 @@ export default {
       }
     });
   },
-  mounted() {
+  mounted () {
     get("/product/cpid-info/page", {
       pageSize: 100,
       pageNum: 1,
@@ -495,7 +427,7 @@ export default {
     });
   },
   methods: {
-    sureClick() {
+    sureClick () {
       this.$confirm("确定要修改吗？")
         .then((_) => {
           this.form.themeColor = JSON.stringify([
@@ -513,8 +445,7 @@ export default {
           this.form.cacheSeatOne = JSON.stringify(this.productJson);
           put("/product/info/update", this.form).then((res) => {
             if (res.code === 0) this.$message.success("修改成功");
-            // this.reset();
-            console.log("返回");
+
             setTimeout(() => {
               this.$router.back();
               this.editDialog = false;
@@ -525,28 +456,28 @@ export default {
           this.editDialog = false;
         });
     },
-    close() {
+    close () {
       this.$router.back()();
     },
-    bannerSuccess(file) {
+    bannerSuccess (file) {
       this.bannerUrl = process.env.VUE_APP_BASE_IMG_URL + file.data;
       let arr = [];
       arr.push(file.data);
       this.form.bannerPics = JSON.stringify(arr);
     },
-    logoSuccess(file) {
+    logoSuccess (file) {
       this.logoUrl = process.env.VUE_APP_BASE_IMG_URL + file.data;
       this.form.logoPic = file.data;
     },
-    guideSuccessP(file) {
+    guideSuccessP (file) {
       this.guideUrlP = process.env.VUE_APP_BASE_IMG_URL + file.data;
       this.guidancePic.p = file.data;
     },
-    guideSuccessC(file) {
+    guideSuccessC (file) {
       this.guideUrlC = process.env.VUE_APP_BASE_IMG_URL + file.data;
       this.guidancePic.c = file.data;
     },
-    btnSuccess(file) {
+    btnSuccess (file) {
       this.productJson[0].btnUrl = process.env.VUE_APP_BASE_IMG_URL + file.data;
     },
   },

admin/src/views/produce/productV2/productManagement.vue

@@ -8,17 +8,17 @@
       </el-col>
       <el-col :span="5">
         <span style="font-size: 14px; color: #606266; font-weight: bold">spid:</span>
-        <el-input style="width: 70%; margin-left: 15px" type="text" v-model="spid" placeholder="科创spid"></el-input>
+        <el-input style="width: 70%; margin-left: 15px" type="text" v-model="spid" placeholder="科创spid" size="mini"></el-input>
       </el-col>
       <el-col :offset="9" :span="3">
-        <el-button style="margin-left: 10px" type="primary" @click="search">搜索</el-button>
-        <el-button style="margin-left: 10px" @click="reset">重置</el-button>
+        <el-button style="margin-left: 10px" type="primary" @click="search" size="mini">搜索</el-button>
+        <el-button style="margin-left: 10px" @click="reset" size="mini">重置</el-button>
       </el-col>
     </el-row>
     <el-form class="formBorder" :model="productFrom" label-width="0px" style="margin-top: 20px">
       <el-form-item>
-        <el-button style="float: left" @click="addPush"> 新增 </el-button>
-        <el-button style="float: left" @click="init"> 刷新 </el-button>
+        <el-button style="float: left" @click="addPush" size="mini"> 新增 </el-button>
+        <el-button style="float: left" @click="init" size="mini"> 刷新 </el-button>
       </el-form-item>
       <el-form-item>
 
@@ -40,7 +40,7 @@
 
       </el-form-item>
       <el-form-item>
-        <el-pagination style="float: right" @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="productFrom.currenttPage" :page-sizes="[10, 20, 30, 40, 50]" layout="total, sizes, prev, pager, next, jumper" :total="productFrom.total" :page-size="productFrom.pageSize">
+        <el-pagination style="float: right" background @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="productFrom.currenttPage" :page-sizes="[10, 20, 30, 40, 50]" layout="total, sizes, prev, pager, next, jumper" :total="productFrom.total" :page-size="productFrom.pageSize">
         </el-pagination>
       </el-form-item>
     </el-form>
@@ -112,12 +112,12 @@ export default {
     // 新增/复制
     addPush (row) {
       let id = row.id;
-      console.log(id);
+      // console.log(id);
       if (row.id) {
-        console.log("复制");
+        // console.log("复制");
         this.$router.push("/produce/productV2/addProduct?copyId=" + id);
       } else {
-        console.log("添加");
+        // console.log("添加");
         this.$router.push("/produce/productV2/addProduct");
       }
     },
@@ -146,9 +146,8 @@ export default {
         this.$message.error("请输入内容")
       } else {
         get("/product/info/page", data).then((res) => {
-          console.log(res, "搜索");
-          // this.productFrom=res.data.list
-          // console.log(this.form,"搜索");
+
+
           this.productFrom.productData = res.data.list;
           this.productFrom.total = res.data.total;
           this.productFrom.pageSize = res.data.pageSize;

admin/src/views/schemeV2/index.vue

@@ -46,11 +46,11 @@
           </template>
         </el-table-column>
         <el-table-column prop="strategyStatus" label="状态" align="center">
-
           <template slot-scope="scope">
-            <dict-tag :type="DICT_TYPE.COMMON_STATUS" :value="scope.row.status" />
+            <el-switch :value="scope.row.strategyStatus" :active-value="1" :inactive-value="0"></el-switch>
           </template>
         </el-table-column>
+
         <el-table-column prop="templateId" label="使用模板" align="center">
           <template slot-scope="scope">
             {{ scope.row.templateName }}
@@ -59,25 +59,15 @@
         <el-table-column prop="createTime" label="创建时间" align="center"></el-table-column>
         <el-table-column label="操作" align="center">
           <template slot-scope="scope">
-            <template>
-              <!--  v-if="$refs.xTable.isActiveByRow(scope.row)"-->
-              <el-button @click="saveRowEvent(scope.row)" size="mini">保存</el-button>
-              <el-button @click="cancelRowEvent(scope.row)" size="mini">取消</el-button>
-            </template>
-            <template>
-              <el-button @click="toEdit(scope.row.id)" size="mini">编辑</el-button>
-              <el-button @click="toCopy(scope.row.id)" size="mini">复制</el-button>
-              <el-button @click="del(scope.row.id)" size="mini">删除</el-button>
-            </template>
+
+            <el-button @click="toEdit(scope.row.id)" size="mini">编辑</el-button>
+            <el-button @click="toCopy(scope.row.id)" size="mini">复制</el-button>
+            <el-button @click="del(scope.row.id)" size="mini">删除</el-button>
+
           </template>
         </el-table-column>
       </el-table>
 
-      <!--<vxe-table border resizable keep-source show-overflow highlight-hover-row ref="xTable" :data="tableData" :edit-config="{ trigger: 'click', mode: 'cell', showStatus: true }" @edit-closed="editClosedEvent">
-       </vxe-table>-->
-
-      <!-- <pagination v-show="total > 0" :total="total" :page="pageNo" :limit="pageSizes" @pagination="pagination" />-->
-
       <!-- 历史记录 -->
       <vxe-modal v-model="value5" width="60%" title="历史记录">
         <template #default>
@@ -173,7 +163,6 @@ export default {
     };
   },
   mounted () {
-    // console.log(this.$refs.xTable)
     this.init();
   },
   methods: {
@@ -187,7 +176,7 @@ export default {
     toEdit (id) {
       this.$router.push("/schemeV2/schemeAdd?ids=" + id);
     },
-
+    //转时间
     getTimeStr (timeStamp) {
       var now = new Date(timeStamp),
         y = now.getFullYear(),
@@ -195,22 +184,25 @@ export default {
         d = ("0" + now.getDate()).slice(-2);
       return y + "-" + m + "-" + d + " " + now.toTimeString().substr(0, 8);
     },
+
     init () {
       get("/strategy/strategy-info/page", {
         pageSize: 100,
         pageNo: 1,
       }).then((res) => {
+        console.log(res)
         res.data.list.map((res) => {
           res.templatePhoto =
             process.env.VUE_APP_BASE_IMG_URL + res.templatePhoto;
-          res.label = res.templateName;
+          // res.label = res.templateName;
           res.value = res.id;
         });
         this.total = res.data.total;
         this.tableData = res.data.list;
-        // this.tableData.forEach((item) => {
-        //   item.createTime = getTime(item.createTime);
-        // });
+        // console.log(tableData)
+        this.tableData.forEach((item) => {
+          item.createTime = getTime(item.createTime);
+        });
       });
     },
     editClosedEvent ({ row, column }) {
@@ -235,7 +227,7 @@ export default {
     },
     reset (formName) {
       // 重置
-      // this.searchForm = {}
+      this.searchForm = {}
       // get('/strategyInfoNew/page', {}).then(res => {
       //   this.tableData = res.data.list
       // })

admin/src/views/schemeV2/product.vue

@@ -1,198 +0,0 @@
-<template>
-  <div>
-    <el-container>
-      <!--搜索-->
-      <!--      <el-header class="searchBox">-->
-      <!--        <el-form :inline="true" :model="searchForm" class="demo-form-inline">-->
-      <!--          <el-form-item label="策略名称">-->
-      <!--            <el-input v-model="searchForm.strategyName" placeholder="策略名称" />-->
-      <!--          </el-form-item>-->
-      <!--          <el-form-item label="key">-->
-      <!--            <el-input v-model="searchForm.channelKey" placeholder="key" />-->
-      <!--          </el-form-item>-->
-      <!--          <el-form-item label="策略类型">-->
-      <!--            <el-select v-model="searchForm.strategyType" filterable placeholder="请选择">-->
-      <!--              <el-option label="基本" :value="0" />-->
-      <!--              <el-option label="活动" :value="1" />-->
-      <!--            </el-select>-->
-      <!--          </el-form-item>-->
-      <!--          <el-form-item label="生效状态">-->
-      <!--            <el-select v-model="searchForm.strategyStatus" filterable placeholder="请选择">-->
-      <!--              <el-option label="生效" :value="0" />-->
-      <!--              <el-option label="未生效" :value="1" />-->
-      <!--            </el-select>-->
-      <!--          </el-form-item>-->
-
-      <!--          <el-form-item style="float: right">-->
-      <!--            <el-button type="primary" @click="searchBtn">搜索</el-button>-->
-      <!--            <el-button @click="reset">刷新</el-button>-->
-      <!--          </el-form-item>-->
-      <!--        </el-form>-->
-      <!--      </el-header>-->
-      <!--表格-->
-      <el-main class="tableBox">
-        <vxe-toolbar>
-          <template #buttons>
-            <vxe-button icon="fa fa-plus" @click="value9 = true">新增</vxe-button>
-          </template>
-        </vxe-toolbar>
-        <vxe-table
-          ref="xTable"
-          border
-          resizable
-          show-overflow
-          :data="tableData"
-          :edit-config="{trigger: 'manual', mode: 'row'}"
-        >
-          <vxe-table-column
-            field="strategyName"
-            title="策略名称"
-            :edit-render="{name: 'input', attrs: {type: 'text'}}"
-          />
-          <vxe-table-column
-            field="strategyType"
-            title="策略类型"
-            :edit-render="{name: 'input', attrs: {type: 'text', placeholder: '请输入昵称'}}"
-          />
-          <vxe-table-column
-            field="strategyStatus"
-            title="状态"
-            :edit-render="{name: '$select', options: [0]}"
-          />
-          <vxe-table-column
-            field="channelKey"
-            title="key"
-            :edit-render="{name: 'input', attrs: {type: 'text', placeholder: '请输入昵称'}}"
-          />
-          <vxe-table-column
-            field="fullCode"
-            title="渠道编码"
-            :edit-render="{name: '$input', props: {type: 'float', digits: 2}}"
-          />
-          <vxe-table-column
-            field="createTime"
-            title="创建时间"
-            :edit-render="{name: '$input', props: {type: 'date', placeholder: '请选择日期'}}"
-          />
-          <vxe-table-column title="操作" width="160">
-            <template #default="{ row }">
-              <template v-if="$refs.xTable.isActiveByRow(row)">
-                <vxe-button @click="saveRowEvent(row)">保存</vxe-button>
-                <vxe-button @click="cancelRowEvent(row)">取消</vxe-button>
-              </template>
-              <template v-else>
-                <vxe-button @click="editRowEvent(row)">编辑</vxe-button>
-              </template>
-            </template>
-          </vxe-table-column>
-        </vxe-table>
-        <vxe-pager
-          :loading="loading"
-          :current-page="tablePage.currentPage"
-          :page-size="tablePage.pageSize"
-          :total="tablePage.totalResult"
-          :layouts="['PrevPage', 'JumpNumber', 'NextPage', 'FullJump', 'Sizes', 'Total']"
-          @page-change="handlePageChange1"
-        />
-      </el-main>
-    </el-container>
-    <vxe-modal v-model="value8" title="记忆功能的窗口" width="600" height="400" show-zoom resize remember>
-      <template #default>
-        <vxe-form :data="formData3" :rules="formRules3" title-align="right" title-width="60">
-          <vxe-form-item title="基本信息" span="24" title-align="left" title-width="200px" :title-prefix="{icon: 'fa fa-address-card-o'}" />
-          <vxe-form-item title="名称" field="name" span="12" :item-render="{name: 'input', attrs: {placeholder: '请输入名称'}}" />
-          <vxe-form-item title="昵称" field="nickname" span="12" :item-render="{name: 'input', attrs: {placeholder: '请输入昵称'}}" />
-          <vxe-form-item title="性别" field="sex" span="12" :item-render="{name: '$select', options: sexList}" />
-          <vxe-form-item title="年龄" field="age" span="12" :item-render="{name: 'input', attrs: {type: 'number', placeholder: '请输入年龄'}}" />
-          <vxe-form-item title="其他信息" span="24" title-align="left" title-width="200px" :title-prefix="{icon: 'fa fa-info-circle'}" />
-          <vxe-form-item title="地址" field="address" span="24" :item-render="{name: 'textarea', attrs: {placeholder: '请输入地址'}}" />
-          <vxe-form-item align="center" span="24">
-            <template #default>
-              <vxe-button type="submit" status="primary">提交</vxe-button>
-              <vxe-button type="reset">重置</vxe-button>
-            </template>
-          </vxe-form-item>
-        </vxe-form>
-      </template>
-    </vxe-modal>
-  </div>
-</template>
-
-<script>
-import { post, get } from '@/api/common'
-
-export default {
-  name: 'Index',
-  data() {
-    return {
-      //  搜索相关内容
-      searchForm: {
-        channelKey: '',
-        strategyName: '',
-        strategyType: '',
-        strategyStatus: '',
-        pageSize: 10,
-        pageNum: 1
-      },
-      value9: false,
-      // 分页相关
-      total: 0,
-      // 表格数据
-      loading: false,
-      tableData: [],
-      tablePage: {
-        currentPage: 1,
-        pageSize: 10,
-        totalResult: 0
-      }
-    }
-  },
-  methods: {
-    async insertEvent(row) {
-      const $table = this.$refs.xTable
-      const record = {
-        sex: '1',
-        date12: '2021-01-01'
-      }
-      const { row: newRow } = await $table.insertAt(record, row)
-      await $table.setActiveCell(newRow, 'sex')
-    },
-    handlePageChange1({ currentPage, pageSize }) {
-      this.tablePage.currentPage = currentPage
-      this.tablePage.pageSize = pageSize
-    }
-  }
-}
-</script>
-
-<style lang="scss">
-  .searchBox {
-    background-color: #fff;
-    border-radius: 4px;
-    box-shadow: #bfbfbf 0 0 2px;
-    height: unset !important;
-    padding: 10px 10px;
-
-    form {
-      margin: auto;
-
-      .el-form-item {
-        margin: 5px 5px;
-      }
-    }
-  }
-
-  .tableBox {
-    margin-top: 10px;
-    background-color: #fff;
-    border-radius: 4px;
-    box-shadow: #bfbfbf 0 0 2px;
-
-    .block {
-      .el-pagination {
-        margin-top: 30px;
-        float: right;
-      }
-    }
-  }
-</style>

admin/src/views/schemeV2/schemeAdd.vue

@@ -143,7 +143,7 @@
                   </el-form-item>
                 </el-col>
               </el-row>
-              <el-row :gutter="20">
+              <!--  <el-row :gutter="20">
                 <el-col :span="6">
                   <el-form-item label="启用走马灯">
                     <el-switch style="width: 300px" v-model="extJson.isZoetrope" active-text="启用" inactive-text="不启用" active-value="1" inactive-value="0" />
@@ -154,7 +154,8 @@
                     <el-input type="textarea" :autosize="{ minRows: 2, maxRows: 4 }" v-model="extJson.zoetropeText" />
                   </el-form-item>
                 </el-col>
-              </el-row>
+              </el-row>-->
+
               <el-row :gutter="20">
                 <el-col :span="6">
                   <el-form-item label="订购记录">
@@ -449,7 +450,6 @@ function getArrayClassification (params) {
   return tree;
 }
 
-const XEUtils = require("xe-utils");
 const weekOptions = ["周日", "周一", "周二 ", "周三", "周四", "周五", "周六"];
 export default {
   name: "SchemeAdd",
@@ -612,7 +612,7 @@ export default {
     },
 
     checkedWeeks (val) {
-      console.log(val);
+
       this.rulesform.weeks = val
         .map((i) => weekOptions.findIndex((j) => j == i))
         .sort()
@@ -626,12 +626,11 @@ export default {
     //判断是否是编辑
     if (this.$route.query.ids) {
 
-
       //数据回显
       get("/strategy/strategy-info/list", {
         ids: this.$route.query.ids,
       }).then((res) => {
-        console.log(res)
+
         res = res.data[0];
         this.oldform = JSON.parse(JSON.stringify(res));
         this.datetimerange = [res.activeEndDate, res.activeStartDate]
@@ -661,7 +660,7 @@ export default {
         };
 
         if (res.weeks) {
-          console.log(res.weeks);
+          // console.log(res.weeks);
           let checkedWeeks = res.weeks.split(",");
 
           let weekList = checkedWeeks.map((item) => {
@@ -679,9 +678,9 @@ export default {
                         ? "周六"
                         : "周日";
           });
-          console.log(weekList);
+
           this.weeks = weekList
-          console.log(this.weeks);
+          // console.log(this.weeks);
           // checkedWeeks.forEach((item) => {
           //   this.checkedWeeks.push(weekOptions[item]);
           // });
@@ -697,15 +696,13 @@ export default {
           firstChannelId: res.firstChannelId,
           secondChannelIds: res.secondChannelIds,
         };
-        console.log(this.rulesform)
+
         res.channelInfoDatas.forEach((item) => {
           checkedchannel.push([item.firstChannelId, item.secondChannelId]);
         });
         this.checkedchannel = checkedchannel;
 
 
-
-
         if (res.extJson) {
           this.extJson = JSON.parse(res.extJson);
           if (this.extJson.dispose) {
@@ -757,7 +754,7 @@ export default {
           this.form.datetimerange = [res.activeStartDate, res.activeEndDate];
         }
         if (res.weeks) {
-          console.log(res.weeks)
+          // console.log(res.weeks)
           let checkedWeeks = res.weeks.split(",");
           checkedWeeks.forEach((item) => {
             this.checkedWeeks.push(weekOptions[item]);
@@ -823,6 +820,18 @@ export default {
     });
   },
   methods: {
+    //新增历史记录
+    addHistory (type, strategyId, text, strategyName) {
+      post("/record/strategy-record/create", {
+        type: type,
+        notes: text,
+        strategyId: strategyId,
+        strategyName: strategyName
+      }).then((res) => {
+        console.log(res, "新增历史记录", notes);
+      });
+    },
+
     onSubmit: function (formName) {
       this.$confirm(
         "您确定编辑该策略？当前操作会影响所有上线该策略的渠道",
@@ -834,52 +843,70 @@ export default {
       )
         .then(() => {
           this.$refs[formName].validate((valid) => {
-            console.log(valid);
+            // console.log(valid);
             if (valid) {
-              let ids = this.form.unsubscribeStrategyIds[0];
-              this.form.unsubscribeStrategyIds =
-                ids !== "" && ids !== [] && ids ? [ids] : [];
-              let template = this.templateList.find((n) => {
-                return n.id === this.form.templateId;
-              });
-              this.extJson.templateCode = template.templateCode;
-              if (
-                this.extJson.isMask === "1" &&
-                (!this.extJson.maskText || this.extJson.maskText === "")
-              ) {
-                this.$message.error("遮罩文案未填写");
-                return false;
-              }
-              if (this.extJson.isZoetrope === '1' && (!this.extJson.zoetropeText || this.extJson
-                .zoetropeText === "")) {
-                this.$message.error('走马灯文案未填写');
-                return false
-              }
+              // let ids = this.form.unsubscribeStrategyIds[0];
+              // this.form.unsubscribeStrategyIds =
+              //   ids !== "" && ids !== [] && ids ? [ids] : [];
+              // let template = this.templateList.find((n) => {
+              //   return n.id === this.form.templateId;
+              // });
+              // this.extJson.templateCode = template.templateCode;
+              // if (
+              //   this.extJson.isMask === "1" &&
+              //   (!this.extJson.maskText || this.extJson.maskText === "")
+              // ) {
+              //   this.$message.error("遮罩文案未填写");
+              //   return false;
+              // }
+              // if (this.extJson.isZoetrope === '1' && (!this.extJson.zoetropeText || this.extJson
+              //   .zoetropeText === "")) {
+              //   this.$message.error('走马灯文案未填写');
+              //   return false
+              // }
 
               this.form.extJson = JSON.stringify(this.extJson);
               this.form.weeks = this.checkedWeeks
                 .map((i) => weekOptions.findIndex((j) => j == i))
                 .sort()
                 .toString();
+
+
+              // var array1 = JSON.parse(JSON.stringify(this.oldform));
+              // var array2 = JSON.parse(JSON.stringify(this.form));
+              // XEUtils.objectEach(array2, (item, key) => {
+              //   if (item != array1[key]) {
+              //     text += `\n${key}:${array1[key]} 改为 ${item}`;
+              //   }
+              // });
+
+
+
+
+
               //编辑操作记录
               if (this.$route.query.ids) {
-                // post("/strategyInfoNew/savelog", {
-                //   type: array2.activityType ? array2.activityType : 0,
-                //   notes: text,
-                //   strategyId: array2.id, 
-                //   strategyName: array2.strategyName,
-                // });
+
+
                 this.id = this.$route.ids;
-                console.log(this.form);
+
 
                 //修改
                 put("/strategy/strategy-info/update", this.form).then((res) => {
+
                   get("/strategy/strategy-info/page", {
                     pageSize: 100,
                     pageNum: 1,
                   }).then((res) => {
                     this.strategyInfoNewList = res.data.list;
                   });
+                  // console.log(this.form)
+                  let type = this.form.strategyType;
+                  let strategyId = this.$route.query.ids;
+                  let text = "策略:" + this.form.strategyName;
+                  let strategyName = this.form.strategyName
+                  this.addHistory(type, strategyId, text, strategyName); //新增历史记录
+
                   let checkedchannel = [];
                   this.checkedchannel.forEach((res) => {
                     checkedchannel.push({
@@ -889,12 +916,11 @@ export default {
                   });
                   this.rulesform.channelInfoDatas = checkedchannel;
                   // 修改更新策略匹配信息
-                  console.log(this.rulesform)
                   put(
                     "/strategy/strategy-info/updaterule",
                     this.rulesform
                   ).then((res) => {
-                    console.log("修改更新策略匹配信息", res)
+                    // console.log("修改更新策略匹配信息", res)
                   });
                   this.$message({
                     message: "操作成功",
@@ -910,24 +936,21 @@ export default {
                 //创建
                 post(
                   "/strategy/strategy-info/create", this.form).then((res) => {
-                    // console.log(this.form, this.rulesform, this.datetimerange);
-                    // console.log(this.form);
-                    let params = {
-                      channelInfoDatas: [
-                        {
-                          firstChannelId: "",
-                          secondChannelId: "",
-                        },
-                      ],
-                      strategyId: "",
-                      weeks: "",
-                    };
-                    console.log(res);
-                    put("/strategy/strategy-info/updaterule", params).then(
-                      (res) => {
-                        // this.close()
-                      }
-                    );
+
+                    // let params = {
+                    //   channelInfoDatas: [
+                    //     {
+                    //       firstChannelId: "",
+                    //       secondChannelId: "",
+                    //     },
+                    //   ],
+                    //   strategyId: "",
+                    //   weeks: "",
+                    // };
+                    // put("/strategy/strategy-info/updaterule", params).then(
+                    //   (res) => {
+                    //   }
+                    // );
                     this.$message({
                       message: "操作成功",
                       type: "success",