Merge remote-tracking branch 'origin/development' into development

src/components/weChat/focusReply.vue

@@ -5,9 +5,10 @@
         <el-button type="success" plain style="float: right" @click="add" v-if="!$store.state.readonly">添加回复</el-button>
       </div>
       <el-tabs v-model="activeName" type="card" @tab-click="handleClick">
-        <el-tab-pane label="新用户" name="focus_reply_new"></el-tab-pane>
-        <el-tab-pane label="无课用户" name="focus_reply_no_course"></el-tab-pane>
-        <el-tab-pane label="有课用户" name="focus_reply_course"></el-tab-pane>
+        <el-tab-pane label="新用户关注" name="focus_reply_new"></el-tab-pane>
+        <el-tab-pane label="无课用户关注" name="focus_reply_no_course"></el-tab-pane>
+        <el-tab-pane label="有课用户关注" name="focus_reply_course"></el-tab-pane>
+        <el-tab-pane label="自动回复" name="auto_reply"></el-tab-pane>
       </el-tabs>
       <el-table
         :data="list"

src/components/weChat/index.vue

@@ -104,7 +104,7 @@
                 </span>
                 <p class="frm_msg fail js_titleEorTips dn" v-if="showErrorTips">字数超过上限</p>
                 <p class="frm_msg fail js_titlenoTips dn" style="display: none;">请输入菜单名称</p>
-                <p class="frm_tips js_titleNolTips">字数不超过4个汉字或8个字母</p>
+                <p class="frm_tips js_titleNolTips">字数不超过8个汉字或16个字母</p>
                 </div>
               </div>
               <div class="frm_control_group" :class="(selectedChildIndex == -1 &&  buttonList[selectedIndex].sub_button.length > 0 )? 'hideMenu' : ''">
@@ -734,7 +734,7 @@
           let chineseLength = value.match(re).length
           sumLength = chineseLength + sumLength
         }
-        this.showErrorTips = sumLength > 8
+        this.showErrorTips = sumLength > 16
       },
       addSubMenu(){
         let item = {

src/util/menuList.js

@@ -192,7 +192,7 @@ export default  [
     icon: 'icon-ai-weixin',
     list: [
       {
-        value:'关注自动回复',
+        value:'自动回复',
         routerName:'focusReply',
         path:'/focusReply',
         cover:'7-1',