Merge branch 'feature/文案修改' of http://115.159.76.241/memberTag/memberTag-web into dev

src/components/tag/tag-config-options.vue

@@ -1295,7 +1295,7 @@ export default {
              * 会员分层
              */
             if (data.templateCode == 'tag021') {
-              this.axios.get(`${this.baseUrl}/gic-member-tag-web/memberTagGrade/gradeList?requestProject=gic-member-tag-web`).then(res => {
+              this.axios.get(`${this.baseUrl}/gic-member-tag-web/memberTagGrade/gradeList?requestProject=gic-member-tag-web&type=1`).then(res => {
                 if (res.data.errorCode === 1) {
                   this.templateData[0].options = res.data.result;
                 }

src/view/memberGroup/memberGroupEdit.vue

@@ -41,7 +41,7 @@
             >
               <div class="effective label-title">
                 分组有效期
-                <el-tooltip content="分组有效期需早于所用标签的最早有效期，且最长不超过365天">
+                <el-tooltip content="分组有效期需早于所用标签的最早有效期，且最长不超过730天">
                   <i class="form-tip-icon">i</i>
                 </el-tooltip>
               </div>
@@ -304,7 +304,7 @@ export default {
       pickerOptions: {
         disabledDate(time) {
           let curDate = new Date().getTime();
-          let oneYear = 365 * 24 * 3600 * 1000;
+          let oneYear = 2 * 365 * 24 * 3600 * 1000;
           let y = curDate + oneYear;
           return time.getTime() < Date.now() - 8.64e7 || time.getTime() > y;
         }

src/view/platformTag/member-tag.vue

@@ -86,7 +86,7 @@
             <div class="form-item" :class="{ 'margin-60': marginSixty }">
               <label for="">
                 分组有效期
-                <el-tooltip content="分组有效期需早于所用标签的最早有效期，且最长不超过365天">
+                <el-tooltip content="分组有效期需早于所用标签的最早有效期，且最长不超过730天">
                   <i class="form-tip-icon">i</i>
                 </el-tooltip>
               </label>
@@ -204,7 +204,7 @@ export default {
       pickerOptions: {
         disabledDate(time) {
           let curDate = new Date().getTime();
-          let oneYear = 365 * 24 * 3600 * 1000;
+          let oneYear = 2 * 365 * 24 * 3600 * 1000;
           let y = curDate + oneYear;
           return time.getTime() < Date.now() - 8.64e7 || time.getTime() > y;
         }