merge

package.json

@@ -12,6 +12,7 @@
   "dependencies": {
     "animate.css": "^4.1.1",
     "axios": "^0.18.0",
+    "crypto-js": "^4.0.0",
     "echarts": "^4.2.0-rc.2",
     "element-ui": "^2.7.2",
     "file-saver": "^2.0.0-rc.3",

src/components/end/login.vue

@@ -14,6 +14,7 @@
               placeholder="请输入用户名"
               autofocus
               clearable
+              ininput="value = value.trim()"
             >
               <i class="icon-username icon-prefix" slot="prefix"> </i>
             </el-input>
@@ -25,6 +26,7 @@
               placeholder="请输入密码"
               autofocus
               clearable
+              ininput="value = value.trim()"
             >
               <i class="icon-pwd icon-prefix" slot="prefix"> </i>
             </el-input>
@@ -47,6 +49,7 @@
 
 <script>
 import { loginOut } from "@/config/loginOut";
+import util from "@/utils/util.js";
 export default {
   data() {
     return {
@@ -76,7 +79,7 @@ export default {
           _this.flag = true;
           let requestParams = {};
           requestParams.username = _this.form.username;
-          requestParams.password = _this.form.password;
+          requestParams.password = util.encrypt(_this.form.password);
           let params = this.$qs.stringify(requestParams);
           _this
             .$https(
@@ -95,21 +98,31 @@ export default {
                     type: "success",
                     message: resData.message,
                   });
-                  localStorage.setItem("userType",resData.user.type)
+                  localStorage.setItem("userType", resData.user.type);
                   localStorage.setItem("user", resData.user.userName);
-                  localStorage.setItem("userId",resData.user.id)
+                  localStorage.setItem("userId", resData.user.id);
                   localStorage.setItem("backToken", resData.token);
-                  localStorage.setItem("roleList",resData.user.roleList)
+                  localStorage.setItem("roleList", resData.user.roleList);
                   localStorage.setItem(
                     "menuList",
                     JSON.stringify(resData.menuList)
                   );
-                  if(_this.$route.query.redirect){
+                  if (resData.isDefault) {
+                    this.$alert("登录成功,为了安全，建议修改密码", "", {
+                      confirmButtonText: "确定",
+                      callback: (action) => {
+                        // this.$message({
+                        //   type: "info",
+                        //   message: `action: ${action}`,
+                        // });
+                      },
+                    });
+                  }
+                  if (_this.$route.query.redirect) {
                     _this.$router.push(_this.$route.query.redirect);
-                  }else{
-                     _this.$router.push("index");
+                  } else {
+                    _this.$router.push("index");
                   }
-                 
                 } else {
                   _this.$message.error(res.data.message);
                 }

src/page/STB/interactive/index.vue

@@ -59,7 +59,7 @@
           </div>
         </div>
       </div>
-      <party-pagination v-show="tableData.length" :page="page" @changePage="handleCurrentChange"/>
+      <party-pagination style="margin-right:20px;" v-show="tableData.length" :page="page" @changePage="handleCurrentChange"/>
     </el-card>
   </div>
 </template>
@@ -220,6 +220,17 @@ export default {
     width: calc(100% - 440px);
     margin-left: 20px;
   }
+  @media screen and (max-width: 1024px) {
+    .tree-box {
+        width: 320px;
+    }
+    .detail-box {
+      width: calc(100% - 340px);
+    }
+    .page-tip {
+      display: none !important;
+    }
+}
   .scrollBox {
     height: calc(100% - 160px);
     overflow-y: auto;
@@ -273,6 +284,8 @@ export default {
     p {
       padding-bottom: 20px;
       border-bottom: 1px solid #bbb;
+      white-space: normal;
+      word-wrap: break-word;
     }
     .img-box {
       padding: 20px;

src/page/content/components/dialog/addCopyright.vue

@@ -42,7 +42,7 @@
             <el-option v-for="item in videoContentCat" :label="item.name" :value="item.id" :key="item.id"></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="备注">
+        <el-form-item label="备注" class="w100">
           <el-input type="textarea" v-model="ruleForm.remarks"></el-input>
         </el-form-item>
       </el-form>

src/page/content/learn/content/index.vue

@@ -585,4 +585,9 @@ export default {
 // @import "../../style/list";
 @import "../../../../style/table.less";
 @import "../../../../style/pagination.less";
+@media screen and (max-width: 1024px) {
+    .page-tip {
+      display: none !important;
+    }
+}
 </style>

src/page/content/video/content/add.vue

@@ -34,6 +34,7 @@
               ></el-option>
             </el-select>
           </el-form-item>
+          <add-copyright ref="addCopyright"></add-copyright>
           <!-- <el-form-item class="addTip">
              <add-copyright ref="addCopyright"></add-copyright>
             <span>若没有相应的视频版权方，请点击</span>
@@ -61,7 +62,7 @@
            <el-form-item >
              <br>
             <span style="color:red">若没有相应的视频分类，请点击</span>
-            <el-button type="text" @click="addVideoClass">新建视频版权方</el-button>
+            <el-button type="text" @click="addVideoClass">新建视频版分类</el-button>
           </el-form-item>
           <!-- <el-form-item class="addTip">
             <span>若没有相应的视频分类，请点击</span>
@@ -96,7 +97,7 @@
               <el-form-item label="视频分类名称" prop="name">
                 <el-input v-model="classForm.name"></el-input>
               </el-form-item>
-              <el-form-item label="备注">
+              <el-form-item label="备注" class="w100">
                 <el-input type="textarea" v-model="classForm.remarks"></el-input>
               </el-form-item>
             </el-form>

src/page/system/changePwd.vue

@@ -19,6 +19,7 @@
               v-model="form.oldPassWord"
               placeholder="请输入当前密码"
               type="password"
+              oninput="value = value.trim()"
             ></el-input>
           </el-form-item>
           <el-form-item label="请输入新密码" prop="password">
@@ -26,6 +27,7 @@
               v-model="form.password"
               placeholder="请输入新密码"
               type="password"
+              oninput="value = value.trim()"
             >
             </el-input>
           </el-form-item>
@@ -34,6 +36,7 @@
               v-model="form.checkPass"
               placeholder="请再次输入新密码"
               type="password"
+              oninput="value = value.trim()"
             >
             </el-input>
           </el-form-item>
@@ -50,6 +53,7 @@
 </template>
 <script>
 import { loginOut } from "@/config/loginOut.js";
+import util from "@/utils/util.js";
 export default {
   data() {
     var validatePass = (rule, value, callback) => {
@@ -78,9 +82,17 @@ export default {
       rules: {
         oldPassWord: [
           { required: true, message: "请输入原密码", trigger: "blur" },
+          {
+            max:8,
+            message: "请输入8位密码",
+          },
         ],
         password: [
           { required: true, validator: validatePass, trigger: "blur" },
+          {
+            pattern: /(?=.*([a-zA-Z].*))(?=.*[0-9].*)[a-zA-Z0-9-_@*]{8}$/,
+            message: "密码至少包括数字和字母，可以有-_@特殊字符，长度8位",
+          },
         ],
         checkPass: [
           { required: true, validator: validatePass2, trigger: "blur" },
@@ -96,15 +108,15 @@ export default {
         password: "",
         checkPass: "",
       };
-      this.$router.go(-1)
+      this.$router.go(-1);
     },
     handleSubmit() {
       let _this = this;
       this.$refs.form.validate((valid) => {
         if (valid) {
           let requestParams = {};
-          requestParams.oldPassWord = _this.form.oldPassWord;
-          requestParams.password = _this.form.password;
+          requestParams.oldPassWord = util.encrypt(_this.form.oldPassWord);
+          requestParams.password = util.encrypt(_this.form.password);
           _this
             .$https(
               {

src/page/system/orgDialog/add.vue

@@ -25,6 +25,7 @@
               v-model="form.name"
               placeholder="请填写"
               clearable
+              oninput="value = value.trim()"
             ></el-input>
           </el-form-item>
           <el-form-item label="机构地理位置:" prop="areaId">

src/page/system/orgDialog/edit.vue

@@ -25,6 +25,7 @@
               v-model="form.name"
               placeholder="请填写"
               clearable
+              oninput="value = value.trim()"
             ></el-input>
           </el-form-item>
           <el-form-item label="机构地理位置:" prop="areaId">

src/utils/util.js

+const CryptoJS = require('crypto-js')
+
+let util = {};
+let key = 'guobomimajiamics'
+let cryptKey = CryptoJS.enc.Utf8.parse(key);
+
+// 加密
+util.encrypt = function (str) {
+  if (!str) return null
+  let srcs = CryptoJS.enc.Utf8.parse(str);
+  const cryptInfo = CryptoJS.AES.encrypt(srcs, cryptKey, {
+    iv: cryptKey,
+    mode: CryptoJS.mode.CBC,
+    padding: CryptoJS.pad.Pkcs7
+  })
+  return cryptInfo.toString()
+}
+
+export default util