merge

src/page/STB/appversion/components/addDialog.vue

@@ -28,10 +28,10 @@
             v-model="formItem.versionInfo"
           ></el-input>
         </el-form-item>
-        <el-form-item label="更新内容：" prop="updateContent">
+        <el-form-item label="更新内容：" prop="updateLog">
           <el-input
             type="textarea"
-            v-model="formItem.updateContent"
+            v-model="formItem.updateLog"
           ></el-input>
         </el-form-item>
         <el-upload
@@ -75,7 +75,7 @@ export default {
         versionInfo: [
           { required: true, message: "请输入版本信息", trigger: "blur" },
         ],
-        updateContent: [
+        updateLog: [
           { required: true, message: "请输入更新内容", trigger: "blur" },
         ],
       },
@@ -128,7 +128,7 @@ export default {
           let param = {
             appVersion: this.formItem.appVersion,
             versionInfo: this.formItem.versionInfo,
-            updateContent: this.formItem.updateContent,
+            updateLog: this.formItem.updateLog,
             apkUrl: this.formItem.apkUrl,
           }
           _this

src/page/STB/appversion/index.vue

@@ -111,6 +111,7 @@ export default {
     // 查询
     onSearch() {
       this.page._index = 1;
+      this.requestForm = JSON.parse(JSON.stringify(this.form))
       this.getTableData();
     },
     // 获得数据接口
@@ -119,8 +120,8 @@ export default {
       let param = {
         _index: this.page._index,
         _size: this.page._size,
-        startDate: this.form.dateRange.length ? this.form.dateRange[0] : "",
-        endDate: this.form.dateRange.length ? this.form.dateRange[1] : "",
+        startDate: this.requestForm.dateRange.length ? this.requestForm.dateRange[0] : "",
+        endDate: this.requestForm.dateRange.length ? this.requestForm.dateRange[1] : "",
       };
       vm.$https(
         {

src/page/STB/base/index.vue

@@ -94,6 +94,7 @@ export default {
     // 查询
     onSearch() {
       this.page._index = 1
+      this.requestForm = JSON.parse(JSON.stringify(this.form))
       this.getTableData()
     },
     // 获得数据接口
@@ -102,8 +103,8 @@ export default {
       let param = {
         _index: this.page._index,
         _size: this.page._size,
-        areaId: this.form.areaId.length ? this.form.areaId[this.form.areaId.length - 1] : '',
-        organId: this.form.orgId
+        areaId: this.requestForm.areaId.length ? this.requestForm.areaId[this.requestForm.areaId.length - 1] : '',
+        organId: this.requestForm.orgId
       };
       vm.$https(
         {

src/page/STB/interactive/index.vue

@@ -54,7 +54,7 @@
           </div>
           <div class="img-box" v-if="!item.images.length">暂无数据</div>
           <div class="author">
-            <div>{{ item.username }}</div>
+            <div>{{ item.name }}</div>
             <div>{{ item.createTime }}</div>
           </div>
         </div>

src/page/STB/operation/index.vue

@@ -138,6 +138,7 @@ export default {
     // 查询
     onSearch() {
       this.page._index = 1;
+      this.requestForm = JSON.parse(JSON.stringify(this.form))
       this.getTableData();
     },
     // 获得数据接口
@@ -146,11 +147,11 @@ export default {
       let param = {
         _index: this.page._index,
         _size: this.page._size,
-        areaId: this.form.areaId.length
-          ? this.form.areaId[this.form.areaId.length - 1]
+        areaId: this.requestForm.areaId.length
+          ? this.requestForm.areaId[this.requestForm.areaId.length - 1]
           : "",
-        organId: this.form.orgId,
-        status: this.form.status,
+        organId: this.requestForm.orgId,
+        status: this.requestForm.status,
       };
       vm.$https(
         {

src/page/STB/pageCustom/index.vue

@@ -108,7 +108,7 @@ export default {
         },
         on: {
           click: function () {
-            console.log(vm);
+            
             if (this.$el[0].parentNode.className.indexOf("top") > 0) {
               vm.radioPage = this.realIndex;
             }
@@ -237,8 +237,8 @@ export default {
     },
     // 修改当前项
     submitForm() {
-      vm.radioPage && this.updateCurrent(this.pageList[vm.radioPage].id, "tAppDirPic/update");
-      vm.radioRun && this.updateCurrent(this.runList[vm.radioRun].id, "tAppRunPic/update");
+      this.updateCurrent(this.pageList[vm.radioPage].id, "tAppDirPic/update");
+      this.updateCurrent(this.runList[vm.radioRun].id, "tAppRunPic/update");
     },
     updateCurrent(id, url) {
       let vm = this;