管理端注释添加完成

manager/src/views/sys/message/noticeMessageTemplate.vue

@@ -6,7 +6,7 @@
           <Tabs value="MESSAGE" @on-click="paneChange">
 
             <TabPane label="站内信列表" name="MESSAGE">
-              <Row v-show="openSearch" @keydown.enter.native="handleSearch">
+              <Row @keydown.enter.native="handleSearch">
                 <Form ref="searchForm" :model="searchMessageForm" inline :label-width="70" class="search-form">
                   <Form-item label="消息标题" prop="title">
                     <Input
@@ -47,7 +47,7 @@
                   @on-selection-change="messageChangeSelect"
                 ></Table>
               </Row>
-              <Row type="flex" justify="end" class="mt_10">
+              <Row type="flex" justify="end" class="mt_10 mb_10">
                 <Page
                   :current="searchMessageForm.pageNumber"
                   :total="messageDataTotal"
@@ -71,9 +71,6 @@
                   :columns="noticeColumns"
                   :data="noticeData"
                   ref="table"
-                  sortable="custom"
-                  @on-sort-change="changeSort"
-                  @on-selection-change="changeSelect"
                 ></Table>
               </Row>
               <Row type="flex" justify="end" class="mt_10">
@@ -110,7 +107,7 @@
       </div>
       <div class="send-setting">
         <div class="left-show">
-          <div v-for="(item, index) in form.variables">
+          <div v-for="(item, index) in form.variables" :key="index">
             #{<span>{{item}}</span>}
           </div>
         </div>
@@ -184,7 +181,7 @@
                   v-if="memberShow">
           <Button type="primary" icon="ios-add" @click="addVip" ghost>选择会员</Button>
           <div style="margin-top:24px;" v-if="messageSendForm.messageClient == 'member'">
-            <Table border :columns="userColumns" :data="this.selectedMember">
+            <Table border :columns="userColumns" :data="selectedMember">
             </Table>
           </div>
         </FormItem>
@@ -303,16 +300,14 @@
   import userList from "@/views/member/list/index";
 
   export default {
-    name: "bill",
+    name: "noticeMessageTemplate",
     components: {
       userList
     },
     data() {
       return {
-        openSearch: true, // 显示搜索
         checkUserList: false, //会员选择器
         selectedMember: [], //选择的会员
-        openTip: true, // 显示提示
         loading: true, // 表单加载状态
         modalVisible: false, // 添加或编辑显示
         modalTitle: "", // 添加或编辑标题
@@ -380,9 +375,6 @@
 
         },
         submitLoading: false, // 添加或编辑提交状态
-        selectList: [], // 多选数据
-        messageSelectList: [], // 消息多选数据
-        messageSelectCount: 0, // 多选计数
         selectCount: 0, // 多选计数
         noticeColumns: [
           {
@@ -688,15 +680,15 @@
             }
           },
         ],
-        memberMessageData: [], // 发送给店铺的消息数据
-        memberMessageDataTotal: 0, // 发送给店铺的消息数据总数
+        memberMessageData: [], // 发送给会员的消息数据
+        memberMessageDataTotal: 0, // 发送给会员的消息数据总数
       };
     },
     methods: {
+      // 初始化数据
       init() {
         this.getMessage();
       },
-
       // 返回已选择的用户
       callbackSelectUser(val) {
         // 每次将返回的数据回调判断
@@ -751,6 +743,7 @@
           this.$refs.memberLayout.selectedMember = true;
         });
       },
+      // tab切换
       paneChange(v) {
         if (v == "SETTING") {
           this.getNoticeMessage()
@@ -759,24 +752,27 @@
           this.getMessage()
         }
       },
+      // 分页 修改页码
       changePage(v) {
         this.searchForm.pageNumber = v;
         this.getNoticeMessage();
-        this.clearSelectAll();
       },
+      // 分页 修改页数
       changePageSize(v) {
+        this.searchForm.pageNumber = 1;
         this.searchForm.pageSize = v;
         this.getNoticeMessage();
       },
+      // 搜索
       handleSearch() {
         this.searchMessageForm.pageNumber = 1;
-        this.searchMessageForm.pageSize = 10;
         this.getMessage();
       },
 
       //消息每页条数发生变化
       messageChangePageSize(v) {
         this.searchMessageForm.pageSize = v;
+        this.searchMessageForm.pageNumber = 1;
         this.getMessage();
       },
       //消息页数变化
@@ -789,6 +785,7 @@
       //会员消息每页条数发生变化
       memberMessageChangePageSize(v) {
         this.searchMemberMessageForm.pageSize = v;
+        this.searchMemberMessageForm.pageNumber = 1;
         this.messageDetail();
       },
       //会员消息页数变化
@@ -821,38 +818,6 @@
         this.searchShopMessageForm.order = e.order;
         this.messageDetail()
       },
-      //消息
-      messageChangeSort(e) {
-        this.searchMessageForm.sort = e.key;
-        this.searchMessageForm.order = e.order;
-        this.getMessage();
-      },
-      changeSort(e) {
-        this.searchForm.sort = e.key;
-        this.searchForm.order = e.order;
-        if (e.order === "normal") {
-          this.searchForm.order = "";
-        }
-        this.getNoticeMessage();
-      },
-      clearSelectAll() {
-        this.$refs.table.selectAll(false);
-      },
-      //消息
-      messageChangeSelect(e) {
-        this.messageSelectList = e;
-        this.messageSelectCount = e.length;
-      },
-      changeSelect(e) {
-        this.selectList = e;
-        this.selectCount = e.length;
-      },
-      selectDateRange(v) {
-        if (v) {
-          this.searchForm.startDate = v[0];
-          this.searchForm.endDate = v[1];
-        }
-      },
       //获取发送段铺的名称
       getName(value) {
         this.messageSendForm.userNames = new Array()
@@ -965,7 +930,7 @@
         });
         this.loading = false;
       },
-
+      // 获取通知数据
       getNoticeMessage() {
         this.loading = true;
         API_Setting.getNoticeMessageData(this.searchForm).then((res) => {
@@ -1029,6 +994,7 @@
         this.messageDetailModalVisible = true;
         this.modalTitle = "消息详情"
       },
+      // 编辑通知
       edit(v) {
         API_Setting.getNoticeMessageDetail(v.id).then((res) => {
           if (res.success) {

manager/src/views/sys/message/sms.vue

@@ -6,7 +6,7 @@
             <Row class="operation" style="margin-bottom: 10px">
               <Button @click="sendBatchSmsModal" type="primary">发送短信</Button>
             </Row>
-            <Table :loading="loading" border :columns="smsColumns" :data="smsData" ref="table" sortable="custom" @on-sort-change="templateChangeSort">
+            <Table :loading="loading" border :columns="smsColumns" :data="smsData" ref="table">
             </Table>
 
             <Row type="flex" justify="end" class="mt_10">
@@ -19,7 +19,7 @@
               <Button @click="addTemplate" type="primary">添加短信模板</Button>
               <Button @click="syncTemplate" type="info">同步</Button>
             </Row>
-            <Table :loading="loading" border :columns="templateColumns" :data="templateData" ref="table" sortable="custom" @on-sort-change="smsChangeSort">
+            <Table :loading="loading" border :columns="templateColumns" :data="templateData" ref="table">
             </Table>
             <Row type="flex" justify="end" class="mt_10">
               <Page :current="templateSearchForm.pageNumber" :total="templateTotal" :page-size="templateSearchForm.pageSize" @on-change="templateChangePage"
@@ -31,7 +31,7 @@
               <Button @click="addSign" type="primary">添加短信签名</Button>
               <Button @click="syncSign" type="info">同步</Button>
             </Row>
-            <Table :loading="loading" border :columns="signColumns" :data="signData" ref="table" sortable="custom" @on-sort-change="signChangeSort">
+            <Table :loading="loading" border :columns="signColumns" :data="signData" ref="table">
               <template slot="signStatus" slot-scope="scope">
                 <div v-if="scope.row.signStatus ==2 ">
                   审核拒绝
@@ -45,7 +45,6 @@
                 <div v-if="scope.row.signStatus ==1 ">
                   审核通过
                 </div>
-
               </template>
             </Table>
             <Row type="flex" justify="end" class="mt_10">
@@ -168,7 +167,6 @@ export default {
       members: [], //所有会员
       smsTemplateContent: "", //短信模板内容
       memberNum: 0, //会员总数
-      smsNum: 0, //预计发送短信条数
       smsContent: "<div class='sms'>效果预览</div>", //短信内容
       smsTemplates: [], //短信模板
       smsSigns: [], //短信签名
@@ -179,15 +177,6 @@ export default {
       templateModalTitle: "", //添加短信模板弹出框标题
       templateForm: {}, //短信模板添加form
       submitLoading: false, // 提交加载状态
-      selected: "", // 已选数据
-      settingData: "", // 设置数据
-      modalTitle: "设置", // modal标题
-      modalVisible: false, // modal显隐
-      searchForm: {
-        // 搜索框初始化对象
-        pageNumber: 1, // 当前页数
-        pageSize: 10, // 页面大小
-      },
       signSearchForm: {
         // 搜索框初始化对象
         pageNumber: 1, // 当前页数
@@ -357,8 +346,7 @@ export default {
                 {
                   props: {
                     type: "info",
-                    size: "small",
-                    icon: "ios-create-outline",
+                    size: "small"
                   },
                   style: {
                     marginRight: "5px",
@@ -477,8 +465,8 @@ export default {
       signTotal: 0, // 表单数据总数
     };
   },
-  filters: {},
   methods: {
+    // 初始化数据
     init() {
       this.getSms();
       //查询会员总数
@@ -498,16 +486,11 @@ export default {
     alreadyCheckClose(val,index) {
       this.alreadyCheck.splice(index, 1);
       this.alreadyCheckShow.splice(index, 1);
-
-
       this.members.forEach((item,index)=>{
         if(item.____selected && item.mobile == val.mobile){
           item.____selected = false
         }
       })
-
-
-
       this.smsForm.num--;
       this.memberNum--;
     },
@@ -515,7 +498,6 @@ export default {
     detail(){
 
     },
-
     //选择接收人事件
     smsRangeChange(v) {
       this.memberNum = 0;
@@ -589,7 +571,6 @@ export default {
         }
       });
     },
-
     //弹出发送短信模态框
     sendBatchSmsModal() {
       this.templateSearchForm.templateStatus = 1;
@@ -604,7 +585,6 @@ export default {
           this.smsSigns = res.result.records;
         }
       });
-
       this.smsContent = "<div class='sms'>效果预览</div>";
       //添加的时候将已经选过的手机号码置为空
       this.alreadyCheck = [];
@@ -623,9 +603,6 @@ export default {
       this.loading = false;
       this.sendSmsModal = true;
     },
-    setting() {
-      this.modalVisible = true;
-    },
     //pane切换事件
     paneChange(v) {
       if (v == "TEMPLATE") {
@@ -673,8 +650,6 @@ export default {
       }
       this.smsForm.context = this.smsTemplateContent;
     },
-    //查询方法
-    handleSearch() {},
     //删除短信模板
     deleteSmsTemplate(v) {
       let params = {
@@ -721,7 +696,7 @@ export default {
       this.templateModalTitle = "添加短信模板";
       this.templateForm = {};
     },
-    //新增短信模板
+    //修改短信模板
     editTemplate(v) {
       this.templateModalVisible = true;
       this.templateModalTitle = "修改短信模板";
@@ -813,6 +788,7 @@ export default {
     },
     //短信记录页数变化
     smsChangePageSize(v) {
+      this.smsSearchForm.pageNumber = 1;
       this.smsSearchForm.pageSize = v;
       this.getSms();
     },
@@ -823,19 +799,10 @@ export default {
     },
     //短信模板页数变化
     templateChangePageSize(v) {
+      this.templateSearchForm.pageNumber =1;
       this.templateSearchForm.pageSize = v;
       this.getSmsTemplate();
     },
-    templateChangeSort(e) {
-      this.templateSearchForm.sort = e.key;
-      this.templateSearchForm.order = e.order;
-      this.getSmsTemplate();
-    },
-    smsChangeSort(e) {
-      this.smsSearchForm.sort = e.key;
-      this.smsSearchForm.order = e.order;
-      this.getSms();
-    },
     //分页获取短信模板数据
     getSmsTemplate() {
       this.loading = true;
@@ -867,14 +834,10 @@ export default {
     },
     //短信模板页数变化
     signChangePageSize(v) {
+      this.signSearchForm.pageNumber = 1;
       this.signSearchForm.pageSize = v;
       this.getSmsSign();
     },
-    signChangeSort(e) {
-      this.signSearchForm.sort = e.key;
-      this.signSearchForm.order = e.order;
-      this.getSmsSign();
-    },
     //修改短信签名
     editSign(v) {
       this.$router.push({ name: "add-sms-sign", query: { id: v.id } });
@@ -894,8 +857,7 @@ export default {
   },
   mounted() {
     this.init();
-  },
-  watch: {},
+  }
 };
 </script>
 

manager/src/views/sys/message/smsSign.vue

@@ -1,11 +1,8 @@
 <template>
   <Card>
     <div style="margin-top: 0px">
-      <div class="sign-name" v-if="id == undefined">
-        新增签名
-      </div>
-      <div class="sign-name" v-else>
-        修改签名
+      <div class="sign-name">
+        {{id ? '修改签名' : '新增签名'}}
       </div>
       <Form ref="form" :model="form" :label-width="100" :rules="formValidate">
         <FormItem label="签名" prop="signName">
@@ -53,18 +50,14 @@
         </div>
         <FormItem label="申请说明" prop="remark">
           <Input v-model="form.remark" clearable type="textarea" style="width: 50%" maxlength="100"
-                 :autosize="{maxRows:4,minRows: 4}" show-word-limit
-                 placeholder="请描述您的业务使用场景，不超过100字符；如：验证码、双十一大促营销"/>
+            :autosize="{maxRows:4,minRows: 4}" show-word-limit
+            placeholder="请描述您的业务使用场景，不超过100字符；如：验证码、双十一大促营销"/>
         </FormItem>
       </Form>
       <div class="footer">
-        <Button type="primary" :loading="submitLoading" @click="addSignSubmit">提交
-        </Button
-        >
+        <Button type="primary" :loading="submitLoading" @click="addSignSubmit">提交</Button>
       </div>
     </div>
-
-
   </Card>
 </template>
 
@@ -77,7 +70,6 @@
     components: {
       uploadPicThumb
     },
-
     data() {
       return {
         id: 0, // 签名id
@@ -96,14 +88,13 @@
       }
 
     },
-    filters: {},
     methods: {
+      // 初始化数据
       init() {
         this.id = this.$route.query.id;
         if (this.id != undefined) {
           this.getSmsSignDetail();
         }
-
       },
       //添加短信模板
       addSignSubmit() {
@@ -159,12 +150,9 @@
     mounted() {
       this.init();
     },
-
   };
 </script>
-
 <style lang="scss" scoped>
-
    .sign-name {
     margin-top: 5px;
     margin-left: 20px;