Parcourir la source

fix: 一些小更改

furffico il y a 1 an
Parent
commit
01ba895a8b

+ 4 - 0
src/avue/form/liveroominfo.ts

@@ -82,21 +82,25 @@ export default (isnew: boolean = false) => {
         prop: "livePushUrl",
         span: 16,
         row: true,
+        display: !isnew,
       }, {
         label: "livePullRtmpUrl",
         prop: "livePullRtmpUrl",
         span: 16,
         row: true,
+        display: !isnew,
       }, {
         label: "livePullHlsUrl",
         prop: "livePullHlsUrl",
         span: 16,
         row: true,
+        display: !isnew,
       }, {
         label: "回放视频地址",
         prop: "replayVideoUrl",
         span: 16,
         row: true,
+        display: !isnew,
       }, {
         label: '描述',
         prop: 'desc',

+ 2 - 1
src/avue/form/prodinfo.ts

@@ -103,7 +103,8 @@ export default {
         required: true,
         message: "第三方链接 为必填项",
         trigger: 'blur'
-      }]
+      }],
+      display: false,
     }, {
       label: '需要地址',
       prop: 'needAddr',

+ 20 - 0
src/element-ui.ts

@@ -82,6 +82,24 @@ import {
   DescriptionsItem,
   Empty,
 } from 'element-ui'
+import { ElMessageComponent, ElMessageOptions } from 'element-ui/types/message';
+
+const original_success = Message.success
+
+// overloads
+function successMessage(): ElMessageComponent;
+function successMessage(message: string): ElMessageComponent;
+function successMessage(options: ElMessageOptions): ElMessageComponent;
+
+function successMessage(msg?: string | ElMessageOptions): ElMessageComponent {
+  if (!msg) {
+    return original_success('操作成功')
+  } else if (typeof msg === 'string') {
+    return original_success(msg)
+  } else {
+    return original_success(msg)
+  }
+}
 
 export default {
   install(Vue: any, options: any) {
@@ -163,6 +181,8 @@ export default {
     Vue.prototype.$notify = Notification
     Vue.prototype.$message = Message
 
+    Message.success = successMessage
+
     Vue.prototype.$ELEMENT = { size: 'medium' }
   }
 }

+ 1 - 1
src/main.ts

@@ -16,7 +16,7 @@ Vue.prototype.$shortcut = {
   notFound() {
     return router.replace({ name: "404" })
   }
-}
+} as Record<string, Function>
 
 // 保存整站vuex本地储存初始状态
 // process.env.VUE_APP_RESOURCES_URL['storeState'] = cloneDeep(store.state)

+ 2 - 5
src/views/modules/liveroom/liveroomEdit.vue

@@ -107,11 +107,8 @@ export default Vue.extend({
 
       httpx.post(path, postdata).then((data) => {
         console.log(data)
-        this.$message({
-          message: '操作成功',
-          type: 'success',
-          duration: 1500
-        })
+        //@ts-ignore
+        this.$message.success()
         this.$router.back()
       })
       done()

+ 4 - 10
src/views/modules/liveroom/liveroomList.vue

@@ -72,11 +72,8 @@ export default Vue.extend({
     updateShowStatus(id: number, status: boolean) {
       httpx.post("/rooms/updateRoomShowStatus", { id, showInList: status }).then((data) => {
         this.getDataList()
-        this.$message({
-          message: '操作成功',
-          type: 'success',
-          duration: 1500,
-        })
+        //@ts-ignore
+        this.$message.success()
       })
     },
     startLiveRoom({ id }: { id: number }) {
@@ -96,11 +93,8 @@ export default Vue.extend({
         httpx.post("/rooms/deleteRoom", { id }
         ).then(({ data }) => {
           this.getDataList()
-          this.$message({
-            message: '操作成功',
-            type: 'success',
-            duration: 1500,
-          })
+          //@ts-ignore
+          this.$message.success()
         })
       })
     }

+ 2 - 5
src/views/modules/liveroom/liveroomProd-select.vue

@@ -74,11 +74,8 @@ export default Vue.extend({
         httpx.makeurl('/rooms/updateRoomGoods'),
         { id: this.prodId, goodsIdList: this.selected }
       ).then(({ data }) => {
-        this.$message({
-          message: '操作成功',
-          type: 'success',
-          duration: 1500
-        })
+        //@ts-ignore
+        this.$message.success()
         this.$emit("submit", this.selected)
       })
     },

+ 4 - 10
src/views/modules/prod/category.vue

@@ -75,11 +75,8 @@ export default Vue.extend({
       }
       return request.then(({ data }) => {
         this.getDataList(newpage)
-        this.$message({
-          message: '操作成功',
-          type: 'success',
-          duration: 1000,
-        })
+        //@ts-ignore
+        this.$message.success()
         if (done) { done() }
         if (loading) { loading() }
       })
@@ -97,11 +94,8 @@ export default Vue.extend({
       }).then(() => {
         httpx.post("/goodsTypes/deleteGoodsType", { id }).then(({ data }) => {
           this.getDataList()
-          this.$message({
-            message: '操作成功',
-            type: 'success',
-            duration: 1000
-          })
+          //@ts-ignore
+          this.$message.success()
         })
       })
     }

+ 2 - 5
src/views/modules/prod/prodInfo.vue

@@ -142,11 +142,8 @@ export default Vue.extend({
       delete data.title;
 
       httpx.post(path, data).then((data) => {
-        this.$message({
-          message: '操作成功',
-          type: 'success',
-          duration: 1500
-        })
+        //@ts-ignore
+        this.$message.success()
         this.$router.back()
       }).finally(() => done())
     }

+ 3 - 14
src/views/modules/prod/prodList.vue

@@ -31,9 +31,6 @@ export default Vue.extend({
       dataForm: {
         prodName: ''
       },
-      // permission: {
-      //   delBtn: this.isAuth('prod:prod:delete')
-      // },
       dataList: [],
       page: {
         total: 0, // 总页数
@@ -43,9 +40,6 @@ export default Vue.extend({
       dataListSelections: [],
       dataListLoading: false,
       tableOption: tableOption,
-      resourcesUrl: process.env.VUE_APP_RESOURCES_URL,
-
-      row: { id: 0 }, // 为了让ts类型检查器不报错(好像不支持 slot-scope 属性)
     }
   },
   methods: {
@@ -76,14 +70,9 @@ export default Vue.extend({
         console.log(id)
         httpx.post("/goods/deleteGood", { id }
         ).then(({ data }) => {
-          this.$message({
-            message: '操作成功',
-            type: 'success',
-            duration: 1500,
-            onClose: () => {
-              this.getDataList()
-            }
-          })
+          this.getDataList()
+          //@ts-ignore
+          this.$message.success()
         })
       })
     },

+ 14 - 20
src/views/modules/user/user.vue

@@ -1,6 +1,6 @@
 <template>
-  <avue-crud ref="crud" :page="page" :data="dataList" :option="tableOption" 
-    @search-change="searchChange" @on-load="getDataList" @row-del="deleteUser">
+  <avue-crud ref="crud" :page="page" :data="dataList" :option="tableOption" @search-change="searchChange"
+    @on-load="getDataList" @row-del="deleteUser">
   </avue-crud>
   <!-- 弹窗, 新增 / 修改 -->
   <!--add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update-->
@@ -9,7 +9,7 @@
 <script lang="ts" >
 import { tableOption } from '@/avue/crud/user'
 import Axios from 'axios'
-import {IUser, IPage} from "@/utils/vo"
+import { IUser, IPage } from "@/utils/vo"
 import Vue from "vue"
 
 export default Vue.extend({
@@ -31,12 +31,12 @@ export default Vue.extend({
     // 获取数据列表
     getDataList(page?: IPage, params?: Partial<IUser>, done?: Function) {
       this.dataListLoading = true
-      Axios.post('/user/queryUserList',{
-          phone: params?.phone || "",
-          nickName: params?.nickname || "",
-          limit: page == null ? this.page.pageSize : page.pageSize,
-          page: page == null ? this.page.currentPage : page.currentPage,
-      }).then(({data})=>{
+      Axios.post('/user/queryUserList', {
+        phone: params?.phone || "",
+        nickName: params?.nickname || "",
+        limit: page == null ? this.page.pageSize : page.pageSize,
+        page: page == null ? this.page.currentPage : page.currentPage,
+      }).then(({ data }) => {
         this.dataList = data.data.userList
         this.page.total = data.data.total
         this.dataListLoading = false
@@ -48,24 +48,18 @@ export default Vue.extend({
       this.getDataList(this.page, params, done)
     },
 
-    deleteUser(user: IUser){
+    deleteUser(user: IUser) {
       this.$confirm(`确定进行删除操作?`, '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'
       }).then(() => {
         console.log(user.id)
-        Axios.post("/user/deleteUser", {id: user.id}
+        Axios.post("/user/deleteUser", { id: user.id }
         ).then(({ data }) => {
-          console.log(data)
-          this.$message({
-            message: '操作成功',
-            type: 'success',
-            duration: 1500,
-            onClose: () => {
-              this.getDataList()
-            }
-          })
+          this.getDataList()
+          //@ts-ignore
+          this.$message.success()
         })
       })
     },