huoran
/
FE_middlePlatform_server
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 14 Wiki Activity

添加websocket（赛事、模型）

Browse Source
fixLog
yujialong 1 year ago
parent 426dd83370
commit f2dc1f8485
9 changed files with 1005 additions and 852 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 104
      src/components/Header.vue
  2. 4
      src/setting.js
  3. 1
      src/utils/api.js
  4. 248
      src/views/match/list/index.vue
  5. 202
      src/views/match/preview/index.vue
  6. 1
      src/views/order/AddOrder.vue
  7. 25
      src/views/serve/backstage/model.vue
  8. 32
      src/views/serve/backstage/sourceModel.vue
  9. 2
      src/views/shop/addProduct/index.vue

104
src/components/Header.vue
Unescape View File

@ -1,55 +1,101 @@
<template> <template>
<div class="header flex-between"> <div class="header flex-between">
<div class="logo"> <div class="logo">
<img class="cursor" @click="goHome" src="../assets/img/logo.png"> <img class="cursor"
@click="goHome"
src="../assets/img/logo.png">
</div> </div>
<div class="header-right"> <div class="header-right">
<div class="header-user-con"> <div class="header-user-con">
<div class="user" @click="toPerson"> <div class="user"
<el-avatar :size="40" :src="$store.state.avatar"></el-avatar> @click="toPerson">
<el-avatar :size="40"
:src="$store.state.avatar"></el-avatar>
<span class="user-avator">{{userName}}</span> <span class="user-avator">{{userName}}</span>
</div> </div>
<el-divider class="ml20" direction="vertical"></el-divider> <el-divider class="ml20"
<el-button type="text" class="ml20" @click="loginout">退出</el-button> direction="vertical"></el-divider>
<el-button type="text"
class="ml20"
@click="loginout">退出</el-button>
</div> </div>
</div> </div>
</div> </div>
</template> </template>
<script> <script>
import Bus from '@/libs/bus'
export default { export default {
data() { data () {
return { return {
userName: '' userName: ''
}; };
}, },
mounted(){ mounted () {
this.userName || this.getUserInfo() this.getUserInfo()
}, },
methods: { methods: {
getUserInfo(){ toPerson () {
this.$get(this.api.queryUserInfoDetails).then(({ result }) => { if (this.$route.path.split('/').pop() !== 'person') {
let userInfo = result.hrUserInfo
if(userInfo.userAvatars) this.$store.commit('userAvatar',{avatar: userInfo.userAvatars})
this.userName = userInfo.userName
const { id } = result.userAccount
id && this.$store.commit('SET_ACCOUNTID', id)
this.$store.commit('SET_USERNAME', this.userName)
}).catch(err => {})
},
toPerson(){
if(this.$route.path.split('/').pop()!=='person'){
this.$router.push('/person') this.$router.push('/person')
} }
}, },
loginout() { loginout () {
localStorage.removeItem('ms_username'); localStorage.removeItem('ms_username');
localStorage.removeItem('token'); localStorage.removeItem('token');
sessionStorage.clear() sessionStorage.clear()
location.reload() location.reload()
}, },
goHome(){ goHome () {
this.$router.push('/customer') this.$router.push('/customer')
} },
// socket连接成功
open () {
console.log("socket连接成功");
},
// socket连接失败
error () {
console.log("连接错误");
},
// 接收消息
getMessage (msg) {
console.log("==websocket接收数据==");
console.log(JSON.parse(msg.data));
const { content } = JSON.parse(msg.data)
// 1赛事、2创业、3考核、4模型。-号拼接携带id
content == 1 && Bus.$emit('matchSocket')
content == 4 && Bus.$emit('modelSocket')
},
// 关闭socket
close () {
console.log("socket已经关闭");
},
initSocket ({ id, account }) {
// 实例化socket
// this.socket = new WebSocket(`ws://${Setting.isDev ? '192.168.31.51' : location.host}:9100/nakadai/websocket/${id}/${account}`)
this.socket = new WebSocket(`ws://121.37.12.51:9100/nakadai/websocket/${id}/${account}`)
// 监听socket连接
this.socket.onopen = this.open;
// 监听socket错误信息
this.socket.onerror = this.error;
// 监听socket消息
this.socket.onmessage = this.getMessage;
},
getUserInfo () {
this.$get(this.api.queryUserInfoDetails).then(({ result }) => {
this.initSocket(result.userAccount)
let userInfo = result.hrUserInfo
if (userInfo.userAvatars) this.$store.commit('userAvatar', { avatar: userInfo.userAvatars })
this.userName = userInfo.userName
const { id } = result.userAccount
id && this.$store.commit('SET_ACCOUNTID', id)
this.$store.commit('SET_USERNAME', this.userName)
}).catch(err => { })
},
}, },
}; };
</script> </script>
@ -68,7 +114,7 @@ export default {
height: 40px; height: 40px;
margin-left: 20px; margin-left: 20px;
} }
.header .logo img{ .header .logo img {
width: 100%; width: 100%;
height: 100%; height: 100%;
} }
@ -81,7 +127,7 @@ export default {
height: 70px; height: 70px;
align-items: center; align-items: center;
} }
.header-user-con .user{ .header-user-con .user {
display: inline-flex; display: inline-flex;
align-items: center; align-items: center;
cursor: pointer; cursor: pointer;
@ -91,7 +137,7 @@ export default {
margin-left: 10px; margin-left: 10px;
font-size: 12px; font-size: 12px;
} }
.ml20{ .ml20 {
margin-left: 20px; margin-left: 20px;
} }
.user-avator img { .user-avator img {
@ -100,17 +146,17 @@ export default {
height: 40px; height: 40px;
border-radius: 50%; border-radius: 50%;
} }
/deep/.header-right .el-button--text{ /deep/.header-right .el-button--text {
color: #333; color: #333;
span { span {
font-size: 12px; font-size: 12px;
} }
} }
.header-right .el-divider--vertical{ .header-right .el-divider--vertical {
width: 2px; width: 2px;
height: 15px; height: 15px;
} }
.header-right .el-divider{ .header-right .el-divider {
background-color: #333; background-color: #333;
} }
</style> </style>

4
src/setting.js
Unescape View File

@ -11,8 +11,8 @@ if (isDev) {
jumpPath = 'http://192.168.31.125:8087/' // 本地调试-需要启动本地判分点系统 jumpPath = 'http://192.168.31.125:8087/' // 本地调试-需要启动本地判分点系统
host = 'http://121.37.12.51/' host = 'http://121.37.12.51/'
// host = 'https://huorantech.cn/' // host = 'https://huorantech.cn/'
host = 'http://192.168.31.152:9000/'// 榕 // host = 'http://192.168.31.152:9000/'// 榕
// host = 'http://192.168.31.53:9000/'// 赓 // host = 'http://192.168.31.51:9000/'// 赓
} else if (isPro) { } else if (isPro) {
jumpPath = 'https://www.huorantech.cn/judgmentPoint/' jumpPath = 'https://www.huorantech.cn/judgmentPoint/'
} }

1
src/utils/api.js
Unescape View File

@ -11,6 +11,7 @@ export default {
sendPhoneOrEmailCode: `users/users/userAccount/sendPhoneOrEmailCode`,// 手机验证码 sendPhoneOrEmailCode: `users/users/userAccount/sendPhoneOrEmailCode`,// 手机验证码
getUserRolesPermissionMenu: `users/users/user-role/getUserRolesPermissionMenu`, getUserRolesPermissionMenu: `users/users/user-role/getUserRolesPermissionMenu`,
deleteProfile : `users/users/userInfo/deleteProfile`, deleteProfile : `users/users/userInfo/deleteProfile`,
refreshPageNotification : `nakadai/message/refreshPageNotification`,
staffTemplate: `http://www.huorantech.cn/template/%E6%89%B9%E9%87%8F%E5%AF%BC%E5%85%A5%E5%91%98%E5%B7%A5%E6%A8%A1%E6%9D%BF.xlsx`, // 后台账号模板 staffTemplate: `http://www.huorantech.cn/template/%E6%89%B9%E9%87%8F%E5%AF%BC%E5%85%A5%E5%91%98%E5%B7%A5%E6%A8%A1%E6%9D%BF.xlsx`, // 后台账号模板

248
src/views/match/list/index.vue
Unescape View File

@ -8,8 +8,12 @@
<div class="single-choice"> <div class="single-choice">
<dl> <dl>
<dd> <dd>
<el-radio-group v-model="form.month" @change="changeType"> <el-radio-group v-model="form.month"
<el-radio v-for="(item,index) in dateList" :key="index" :label="item.id" border>{{ item.name }}</el-radio> @change="changeType">
<el-radio v-for="(item,index) in dateList"
:key="index"
:label="item.id"
border>{{ item.name }}</el-radio>
</el-radio-group> </el-radio-group>
</dd> </dd>
</dl> </dl>
@ -17,10 +21,21 @@
</li> </li>
<li> <li>
<label>创建区间：</label> <label>创建区间：</label>
<el-date-picker v-model="date" align="right" unlink-panels type="daterange" start-placeholder="开始日期" end-placeholder="结束日期" format="yyyy-MM-dd" value-format="yyyy-MM-dd" clearable></el-date-picker> <el-date-picker v-model="date"
align="right"
unlink-panels
type="daterange"
start-placeholder="开始日期"
end-placeholder="结束日期"
format="yyyy-MM-dd"
value-format="yyyy-MM-dd"
clearable></el-date-picker>
</li> </li>
<li> <li>
<el-input placeholder="请输入竞赛名称/创建人" suffix-icon="el-icon-search" v-model="keyword" clearable></el-input> <el-input placeholder="请输入竞赛名称/创建人"
suffix-icon="el-icon-search"
v-model="keyword"
clearable></el-input>
</li> </li>
</ul> </ul>
</div> </div>
@ -28,89 +43,162 @@
<ul class="filter"> <ul class="filter">
<li> <li>
<label>大赛来源：</label> <label>大赛来源：</label>
<el-select v-model="form.platformSource" clearable @change="sourceChange"> <el-select v-model="form.platformSource"
<el-option v-for="(item, i) in sourceList" :key="i" :label="item.name" :value="item.id"></el-option> clearable
@change="sourceChange">
<el-option v-for="(item, i) in sourceList"
:key="i"
:label="item.name"
:value="item.id"></el-option>
</el-select> </el-select>
</li> </li>
<li> <li>
<label>大赛范围：</label> <label>大赛范围：</label>
<el-select v-model="form.competitionScope" clearable @change="initData"> <el-select v-model="form.competitionScope"
<el-option v-for="(item, i) in rangeList" :key="i" :label="item.name" :value="item.id"></el-option> clearable
@change="initData">
<el-option v-for="(item, i) in rangeList"
:key="i"
:label="item.name"
:value="item.id"></el-option>
</el-select> </el-select>
</li> </li>
</ul> </ul>
<div> <div>
<el-button type="primary" round @click="add" v-auth>创建竞赛</el-button> <el-button type="primary"
<el-button type="primary" round @click="delAllSelection" v-auth>批量删除</el-button> round
@click="add"
v-auth>创建竞赛</el-button>
<el-button type="primary"
round
@click="delAllSelection"
v-auth>批量删除</el-button>
</div> </div>
</div> </div>
<el-table ref="table" :data="matchData" class="table" stripe header-align="center" @selection-change="handleSelectionChange" row-key="id"> <el-table ref="table"
<el-table-column type="selection" width="55" align="center" :reserve-selection="true"></el-table-column> :data="matchData"
<el-table-column type="index" width="60" label="序号" align="center"> class="table"
stripe
header-align="center"
@selection-change="handleSelectionChange"
row-key="id">
<el-table-column type="selection"
width="55"
align="center"
:reserve-selection="true"></el-table-column>
<el-table-column type="index"
width="60"
label="序号"
align="center">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.$index + (page - 1) * pageSize + 1 }} {{ scope.$index + (page - 1) * pageSize + 1 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="competitionName" label="竞赛名称" align="center"></el-table-column> <el-table-column prop="competitionName"
<el-table-column prop="founderName" label="创建人" align="center"></el-table-column> label="竞赛名称"
<el-table-column prop="name" label="大赛来源" width="120" align="center"> align="center"></el-table-column>
<el-table-column prop="founderName"
label="创建人"
align="center"></el-table-column>
<el-table-column prop="name"
label="大赛来源"
width="120"
align="center">
<template slot-scope="scope"> <template slot-scope="scope">
{{ sourceList.find(e => e.id === scope.row.platformSource).name }} {{ sourceList.find(e => e.id === scope.row.platformSource).name }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="name" label="大赛范围" align="center"> <el-table-column prop="name"
label="大赛范围"
align="center">
<template slot-scope="scope"> <template slot-scope="scope">
{{ rangeList.find(e => e.id === scope.row.competitionScope).name }} {{ rangeList.find(e => e.id === scope.row.competitionScope).name }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="applicantNum" label="报名人数" align="center" width="100"></el-table-column> <el-table-column prop="applicantNum"
<el-table-column prop="status" label="状态" align="center" width="80"> label="报名人数"
align="center"
width="100"></el-table-column>
<el-table-column prop="status"
label="状态"
align="center"
width="80">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.publishStatus ? '已发布' : '未发布' }} {{ scope.row.publishStatus ? '已发布' : '未发布' }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="time" label="竞赛时间" align="center" width="290"> <el-table-column prop="time"
label="竞赛时间"
align="center"
width="290">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.playStartTime }} ~ {{ scope.row.playEndTime }} {{ scope.row.playStartTime }} ~ {{ scope.row.playEndTime }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="createTime" label="创建时间" align="center" width="160"></el-table-column> <el-table-column prop="createTime"
<el-table-column label="操作" align="center" width="260"> label="创建时间"
align="center"
width="160"></el-table-column>
<el-table-column label="操作"
align="center"
width="260">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button v-if="scope.row.playingStages && scope.row.playingStages.length" type="text" @click="editEndTime(scope.row)" v-auth>修改结束时间</el-button> <el-button v-if="scope.row.playingStages && scope.row.playingStages.length"
<el-button type="text" @click="manage(scope.row)" v-auth>管理</el-button> type="text"
<el-button type="text" @click="delData(scope.row)" v-auth>删除</el-button> @click="editEndTime(scope.row)"
<el-switch v-auth>修改结束时间</el-button>
v-if="scope.row.publishStatus" <el-button type="text"
@click="manage(scope.row)"
v-auth>管理</el-button>
<el-button type="text"
@click="delData(scope.row)"
v-auth>删除</el-button>
<el-switch v-if="scope.row.publishStatus"
v-auth="'/match:启用'" v-auth="'/match:启用'"
v-model="scope.row.ztOpen" v-model="scope.row.ztOpen"
:active-value="0" :active-value="0"
:inactive-value="1" :inactive-value="1"
style="margin: 0 10px 0 5px" style="margin: 0 10px 0 5px"
:active-text="scope.row.ztOpen ? '关' : '开'" :active-text="scope.row.ztOpen ? '关' : '开'"
@change="switchOff($event,scope.row,scope.$index)" @change="switchOff($event,scope.row,scope.$index)"></el-switch>
></el-switch>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<div class="pagination"> <div class="pagination">
<el-pagination background layout="total, prev, pager, next" :total="total" @current-change="handleCurrentChange" :current-page="page"> <el-pagination background
layout="total, prev, pager, next"
:total="total"
@current-change="handleCurrentChange"
:current-page="page">
</el-pagination> </el-pagination>
</div> </div>
<el-dialog title="修改当前阶段结束时间" :visible.sync="modifyVisible" width="900px" :close-on-click-modal="false"> <el-dialog title="修改当前阶段结束时间"
<el-table :data="curRow.playingStages" class="table" ref="table" stripe header-align="center"> :visible.sync="modifyVisible"
<el-table-column prop="stageName" label="阶段名称" min-width="100" align="center"></el-table-column> width="900px"
<el-table-column label="竞赛起止时间" width="300" align="center"> :close-on-click-modal="false">
<el-table :data="curRow.playingStages"
class="table"
ref="table"
stripe
header-align="center">
<el-table-column prop="stageName"
label="阶段名称"
min-width="100"
align="center"></el-table-column>
<el-table-column label="竞赛起止时间"
width="300"
align="center">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.startTime + ' ~ ' + scope.row.endTime }} {{ scope.row.startTime + ' ~ ' + scope.row.endTime }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="结束时间调整为" align="center" width="280"> <el-table-column label="结束时间调整为"
align="center"
width="280">
<template slot-scope="scope"> <template slot-scope="scope">
<el-date-picker <el-date-picker popper-class="no-atTheMoment"
popper-class="no-atTheMoment"
v-model="scope.row.newEndTime" v-model="scope.row.newEndTime"
placeholder="请选择结束时间" placeholder="请选择结束时间"
type="datetime" type="datetime"
@ -119,9 +207,13 @@
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<span slot="footer" class="dialog-footer"> <span slot="footer"
<el-button size="small" @click="modifyVisible = false">取 消</el-button> class="dialog-footer">
<el-button size="small" type="primary" @click="modifySubmit">确 定</el-button> <el-button size="small"
@click="modifyVisible = false">取 消</el-button>
<el-button size="small"
type="primary"
@click="modifySubmit">确 定</el-button>
</span> </span>
</el-dialog> </el-dialog>
</div> </div>
@ -131,9 +223,10 @@
import util from "@/libs/util"; import util from "@/libs/util";
import Setting from "@/setting"; import Setting from "@/setting";
import { Loading } from 'element-ui' import { Loading } from 'element-ui'
import Bus from '@/libs/bus'
export default { export default {
name: "match", name: "match",
data() { data () {
return { return {
timer: null, timer: null,
keyword: "", keyword: "",
@ -201,17 +294,16 @@ export default {
page: +this.$route.query.page || 1, page: +this.$route.query.page || 1,
pageSize: 10, pageSize: 10,
total: 0, total: 0,
transferPublishStatus: [ "未发布", "已发布"], transferPublishStatus: ["未发布", "已发布"],
modifyVisible: false, modifyVisible: false,
curRow: { curRow: {
playingStages: [] playingStages: []
}, },
timer: null, timer: null,
redisTimer: null,
pickerOptions: { pickerOptions: {
shortcuts: [{ shortcuts: [{
text: '此刻', text: '此刻',
onClick(picker) { onClick (picker) {
picker.$emit('pick', new Date(Date.now() + 5000)) picker.$emit('pick', new Date(Date.now() + 5000))
} }
}] }]
@ -219,7 +311,7 @@ export default {
}; };
}, },
watch: { watch: {
"form.month": function(val) { "form.month": function (val) {
if (val) { if (val) {
let unit = 24 * 60 * 60 * 1000; let unit = 24 * 60 * 60 * 1000;
this.date = [util.formatDate("yyyy-MM-dd", new Date(new Date().getTime() - unit * 30 * val)), util.formatDate("yyyy-MM-dd", new Date(new Date().getTime() + unit))]; this.date = [util.formatDate("yyyy-MM-dd", new Date(new Date().getTime() - unit * 30 * val)), util.formatDate("yyyy-MM-dd", new Date(new Date().getTime() + unit))];
@ -227,7 +319,7 @@ export default {
this.date = []; this.date = [];
} }
}, },
date: function(val) { date: function (val) {
if (val) { if (val) {
this.form.startTime = val[0]; this.form.startTime = val[0];
this.form.endTime = val[1]; this.form.endTime = val[1];
@ -237,23 +329,26 @@ export default {
} }
this.initData(); this.initData();
}, },
keyword: function(val) { keyword: function (val) {
clearTimeout(this.searchTimer); clearTimeout(this.searchTimer);
this.searchTimer = setTimeout(() => { this.searchTimer = setTimeout(() => {
this.initData(); this.initData();
}, 500); }, 500);
} }
}, },
mounted() { mounted () {
// websocket实时刷新
Bus.$on('matchSocket', () => {
this.getData() this.getData()
this.$once('hook:beforeDestroy', function() { })
this.getData()
this.$once('hook:beforeDestroy', function () {
clearInterval(this.timer) clearInterval(this.timer)
clearInterval(this.redisTimer)
}) })
}, },
methods: { methods: {
getList() { getData () {
// const load = Loading.service()
const { form } = this const { form } = this
this.$post(this.api.CompetitionPageConditionQueryByNakadai, { this.$post(this.api.CompetitionPageConditionQueryByNakadai, {
pageNum: this.page, pageNum: this.page,
@ -296,38 +391,29 @@ export default {
this.page-- this.page--
this.getData() this.getData()
} }
}).catch(res => { }).catch(res => { })
// load.close()
})
},
getData() {
this.getList()
if (!Setting.isDev) {
clearInterval(this.redisTimer)
this.redisTimer = setInterval(this.getRedis, 1000)
}
}, },
initData() { initData () {
this.page = 1; this.page = 1;
this.getData(); this.getData();
}, },
// 获取redis缓存 // 获取redis缓存
getRedis() { getRedis () {
this.$post(this.api.getRedisCacheCompetition).then(({ data }) => { this.$post(this.api.getRedisCacheCompetition).then(({ data }) => {
data && this.getList() data && this.getList()
}).catch(res => {}) }).catch(res => { })
}, },
add() { add () {
this.$router.push("/addMatch"); this.$router.push("/addMatch");
}, },
// 修改结束时间 // 修改结束时间
editEndTime(row) { editEndTime (row) {
this.modifyVisible = true this.modifyVisible = true
row.newEndTime = '' row.newEndTime = ''
this.curRow = row this.curRow = row
}, },
// 修改结束时间提交 // 修改结束时间提交
modifySubmit() { modifySubmit () {
const row = this.curRow const row = this.curRow
const data = [] const data = []
row.competitionStageList.map(e => { row.competitionStageList.map(e => {
@ -341,19 +427,19 @@ export default {
util.successMsg('修改成功') util.successMsg('修改成功')
this.modifyVisible = false this.modifyVisible = false
this.getData() this.getData()
}).catch(err => {}) }).catch(err => { })
}, },
// 管理 // 管理
manage(row) { manage (row) {
this.$router.push(`/matchManage?id=${row.id}&name=${row.competitionName}`) this.$router.push(`/matchManage?id=${row.id}&name=${row.competitionName}`)
}, },
changeType() { changeType () {
this.$refs.table.clearSelection(); this.$refs.table.clearSelection();
this.initData(); this.initData();
}, },
// 大赛来源回调 // 大赛来源回调
sourceChange(val) { sourceChange (val) {
this.$router.push({ this.$router.push({
path: '/match', path: '/match',
query: { query: {
@ -364,7 +450,7 @@ export default {
this.$store.commit('SET_M_SOURCE', val) this.$store.commit('SET_M_SOURCE', val)
this.initData() this.initData()
}, },
delData(row) { delData (row) {
this.$confirm("此删除操作不可逆，是否确认删除选中项？", "提示", { this.$confirm("此删除操作不可逆，是否确认删除选中项？", "提示", {
type: "warning" type: "warning"
}) })
@ -378,11 +464,11 @@ export default {
.catch(() => { .catch(() => {
}); });
}, },
handleSelectionChange(val) { handleSelectionChange (val) {
this.multipleSelection = val; this.multipleSelection = val;
}, },
// 批量删除 // 批量删除
delAllSelection() { delAllSelection () {
if (this.multipleSelection.length) { if (this.multipleSelection.length) {
this.$confirm("确定要删除吗？", "提示", { this.$confirm("确定要删除吗？", "提示", {
type: "warning" type: "warning"
@ -400,24 +486,26 @@ export default {
this.$message.warning("请先选择赛事 ！"); this.$message.warning("请先选择赛事 ！");
} }
}, },
handleCurrentChange(val) { handleCurrentChange (val) {
this.page = val; this.page = val;
this.$router.push(`match?page=${val}`) this.$router.push(`match?page=${val}`)
this.getData(); this.getData();
this.$store.commit('SET_M_PAGE', val) this.$store.commit('SET_M_PAGE', val)
}, },
transferTime(date, type) { transferTime (date, type) {
if (date == "0000-00-00 00:00:00") return "---"; if (date == "0000-00-00 00:00:00") return "---";
return date; return date;
}, },
switchOff(val, row) { async switchOff (val, row) {
this.$post(this.api.disabledEventsCompetition, { this.$post(this.api.disabledEventsCompetition, {
competitionId: row.id, competitionId: row.id,
isOpen: val, isOpen: val,
type: 0 // 禁用平台来源(0中台，1职站) type: 0 // 禁用平台来源(0中台，1职站)
}).then(res => { }).then(res => {
util.successMsg(val == 1 ? '禁用成功' : '启用成功') util.successMsg(val == 1 ? '禁用成功' : '启用成功')
}).catch(err => {}) }).catch(err => { })
await this.$post(`${this.api.refreshPageNotification}?content=1`)
}, },
} }
}; };
@ -432,7 +520,7 @@ export default {
} }
} }
@media(max-width: 1640px) { @media (max-width: 1640px) {
.page .page-content .tool .filter { .page .page-content .tool .filter {
flex-wrap: wrap; flex-wrap: wrap;
margin-bottom: -15px; margin-bottom: -15px;

202
src/views/match/preview/index.vue
Unescape View File

@ -1,12 +1,19 @@
<template> <template>
<div class="match"> <div class="match">
<div class="banner" :style="{backgroundImage: 'url(' + (form.carouselUrl || 'https://huoran.oss-cn-shenzhen.aliyuncs.com/20220613/png/1536269450851409920.png') + ')'}"></div> <div class="banner"
:style="{backgroundImage: 'url(' + (form.carouselUrl || 'https://huoran.oss-cn-shenzhen.aliyuncs.com/20220613/png/1536269450851409920.png') + ')'}"></div>
<div class="center"> <div class="center">
<breadcrumb ref="breadcrumb" :data="'全部赛事/' + form.name" route="matchPreview"></breadcrumb> <breadcrumb ref="breadcrumb"
:data="'全部赛事/' + form.name"
route="match"></breadcrumb>
<div class="match-inner"> <div class="match-inner">
<div class="flex-between"> <div class="flex-between">
<el-tabs v-model="curType" @tab-click="typeChange"> <el-tabs v-model="curType"
<el-tab-pane v-for="(item, index) in typeList" :key="index" :label="item.name" :name="item.id"></el-tab-pane> @tab-click="typeChange">
<el-tab-pane v-for="(item, index) in typeList"
:key="index"
:label="item.name"
:name="item.id"></el-tab-pane>
</el-tabs> </el-tabs>
<div class="status wait">等待报名</div> <div class="status wait">等待报名</div>
</div> </div>
@ -15,31 +22,46 @@
<div class="meta">最近编辑时间：{{ form.updateTime }}</div> <div class="meta">最近编辑时间：{{ form.updateTime }}</div>
</div> </div>
<div class="l-title" id="part1"><img src="@/assets/img/label.png" alt=""> 竞赛信息</div> <div class="l-title"
<div v-if="form.description" class="texts ql-editor" v-html="form.description"></div> id="part1"><img src="@/assets/img/label.png"
alt=""> 竞赛信息</div>
<div v-if="form.description"
class="texts ql-editor"
v-html="form.description"></div>
<template v-if="form.competitionAnnexList && form.competitionAnnexList.length"> <template v-if="form.competitionAnnexList && form.competitionAnnexList.length">
<h6 class="p-title">附件下载</h6> <h6 class="p-title">附件下载</h6>
<ul class="files"> <ul class="files">
<li v-for="(item, i) in form.competitionAnnexList" :key="i"> <li v-for="(item, i) in form.competitionAnnexList"
<el-link v-if="item.canPreview" class="m-r-10" type="primary" @click="previewFile(item)">{{ item.fileName }}</el-link> :key="i">
<span v-else class="file-name">{{ item.fileName }}</span> <el-link v-if="item.canPreview"
<el-link type="primary" :underline="false" @click="download(item)">下载</el-link> class="m-r-10"
type="primary"
@click="previewFile(item)">{{ item.fileName }}</el-link>
<span v-else
class="file-name">{{ item.fileName }}</span>
<el-link type="primary"
:underline="false"
@click="download(item)">下载</el-link>
</li> </li>
</ul> </ul>
</template> </template>
<template v-if="!form.description && (!form.competitionAnnexList || !form.competitionAnnexList.length )"> <template v-if="!form.description && (!form.competitionAnnexList || !form.competitionAnnexList.length )">
<div class="empty"> <div class="empty">
<div> <div>
<img src="@/assets/img/none.png" alt=""> <img src="@/assets/img/none.png"
alt="">
<p>暂无数据</p> <p>暂无数据</p>
</div> </div>
</div> </div>
</template> </template>
<template v-if="form.releaseType"> <template v-if="form.releaseType">
<div class="l-title"><img src="@/assets/img/label.png" alt=""> 赛程、规则与内容</div> <div class="l-title"><img src="@/assets/img/label.png"
alt=""> 赛程、规则与内容</div>
<h6 class="rule-title">共{{ form.competitionStage.length }}个竞赛阶段，同一个团队每个成员只能参加一个阶段赛项</h6> <h6 class="rule-title">共{{ form.competitionStage.length }}个竞赛阶段，同一个团队每个成员只能参加一个阶段赛项</h6>
<div v-for="(rule, i) in form.competitionStage" :key="i" class="rule"> <div v-for="(rule, i) in form.competitionStage"
:key="i"
class="rule">
<p style="font-size: 16px;color: #333;">{{ rule.stageName }}</p> <p style="font-size: 16px;color: #333;">{{ rule.stageName }}</p>
<p>比赛时间：{{ rule.startTime && rule.startTime + ' ~ ' + rule.endTime }}</p> <p>比赛时间：{{ rule.startTime && rule.startTime + ' ~ ' + rule.endTime }}</p>
<p>比赛方式：{{ methods.find(e => e.id == rule.method) && methods.find(e => e.id == rule.method).name }}</p> <p>比赛方式：{{ methods.find(e => e.id == rule.method) && methods.find(e => e.id == rule.method).name }}</p>
@ -57,7 +79,8 @@
<p>团队成绩计算方式：{{ teamCalculationMethods.find(e => e.id == rule.teamCalculationMethod) && teamCalculationMethods.find(e => e.id == rule.teamCalculationMethod).name }}</p> <p>团队成绩计算方式：{{ teamCalculationMethods.find(e => e.id == rule.teamCalculationMethod) && teamCalculationMethods.find(e => e.id == rule.teamCalculationMethod).name }}</p>
</template> </template>
<p>阶段比赛结束后{{ rule.resultAnnouncementTime }}小时，公布阶段比赛成绩。</p> <p>阶段比赛结束后{{ rule.resultAnnouncementTime }}小时，公布阶段比赛成绩。</p>
<div v-if="form.rule === 1" class="flex"> <div v-if="form.rule === 1"
class="flex">
<p>晋级规则：</p> <p>晋级规则：</p>
<div> <div>
<p v-if="rule.peopleLimit">本阶段成绩排名前{{ rule.peopleLimit }}队，可晋级下一阶段比赛</p> <p v-if="rule.peopleLimit">本阶段成绩排名前{{ rule.peopleLimit }}队，可晋级下一阶段比赛</p>
@ -69,37 +92,52 @@
</template> </template>
<!-- 进展 --> <!-- 进展 -->
<div class="l-title" id="part2"><img src="@/assets/img/label.png" alt=""> 竞赛进展</div> <div class="l-title"
<ul class="progress" v-if="progress.length"> id="part2"><img src="@/assets/img/label.png"
<li v-for="(item,index) in progress" :key="index" :class="item.status == 0 ? 'not' : (item.status == 1 ? 'ing' : 'done')"> alt=""> 竞赛进展</div>
<ul class="progress"
v-if="progress.length">
<li v-for="(item,index) in progress"
:key="index"
:class="item.status == 0 ? 'not' : (item.status == 1 ? 'ing' : 'done')">
<i class="dot"></i> <i class="dot"></i>
<p class="name">{{item.title}}</p> <p class="name">{{item.title}}</p>
<p class="desc">{{item.description}}</p> <p class="desc">{{item.description}}</p>
</li> </li>
<img class="rocket" src="@/assets/img/rocket.png" alt=""> <img class="rocket"
src="@/assets/img/rocket.png"
alt="">
</ul> </ul>
<template v-else> <template v-else>
<div class="empty"> <div class="empty">
<div> <div>
<img src="@/assets/img/none.png" alt=""> <img src="@/assets/img/none.png"
alt="">
<p>暂无数据</p> <p>暂无数据</p>
</div> </div>
</div> </div>
</template> </template>
<!-- 公告 --> <!-- 公告 -->
<div class="l-title" id="part3"><img src="@/assets/img/label.png" alt=""> 通知公告</div> <div class="l-title"
<ul class="notice-list" v-if="notices.length"> id="part3"><img src="@/assets/img/label.png"
<li v-for="(item, i) in notices" :key="i" @click="toNotice(item)"> alt=""> 通知公告</div>
<ul class="notice-list"
v-if="notices.length">
<li v-for="(item, i) in notices"
:key="i"
@click="toNotice(item)">
<h6>{{ item.announcementTitle }}</h6> <h6>{{ item.announcementTitle }}</h6>
<p class="meta">{{ item.updateTime }}</p> <p class="meta">{{ item.updateTime }}</p>
<div class="des" v-html="item.announcementText"></div> <div class="des"
v-html="item.announcementText"></div>
</li> </li>
</ul> </ul>
<template v-else> <template v-else>
<div class="empty"> <div class="empty">
<div> <div>
<img src="@/assets/img/none.png" alt=""> <img src="@/assets/img/none.png"
alt="">
<p>暂无通知公告</p> <p>暂无通知公告</p>
</div> </div>
</div> </div>
@ -115,7 +153,7 @@ import breadcrumb from '@/components/breadcrumb'
import Const from '@/const/match' import Const from '@/const/match'
export default { export default {
name: "match", name: "match",
data() { data () {
return { return {
rules: Const.rules, rules: Const.rules,
methods: Const.methods, methods: Const.methods,
@ -143,7 +181,7 @@ export default {
components: { components: {
breadcrumb breadcrumb
}, },
mounted() { mounted () {
this.handleAnnex() this.handleAnnex()
if (this.form.id) { if (this.form.id) {
this.getProgress() this.getProgress()
@ -152,7 +190,7 @@ export default {
}, },
methods: { methods: {
// 处理附件 // 处理附件
handleAnnex() { handleAnnex () {
const list = this.form.competitionAnnexList const list = this.form.competitionAnnexList
if (list) { if (list) {
list.map(e => { list.map(e => {
@ -162,35 +200,35 @@ export default {
this.$forceUpdate() this.$forceUpdate()
} }
}, },
getProgress() { // 获取竞赛进展 getProgress () { // 获取竞赛进展
this.$get(this.api.getCompetitionProgress, { this.$get(this.api.getCompetitionProgress, {
competitionId: this.form.id competitionId: this.form.id
}).then(res => { }).then(res => {
this.progress = res.competitionProgressList.reverse() this.progress = res.competitionProgressList.reverse()
}).catch(err => {}); }).catch(err => { });
}, },
// 公告列表 // 公告列表
getNotice() { getNotice () {
this.$post(`${this.api.queryAnnouncementByCompetitionId}?pageNum=1&pageSize=1000&competitionId=${this.form.id}`).then(({ data }) => { this.$post(`${this.api.queryAnnouncementByCompetitionId}?pageNum=1&pageSize=1000&competitionId=${this.form.id}`).then(({ data }) => {
const records = data.records.filter(e => e.status) // 只显示已发布的（status 0草稿 1为已发布） const records = data.records.filter(e => e.status) // 只显示已发布的（status 0草稿 1为已发布）
records.map(e => { records.map(e => {
e.announcementText = e.announcementText.replace(/<img.*?(?:>|\/>)/gi, '') e.announcementText = e.announcementText.replace(/<img.*?(?:>|\/>)/gi, '')
}) })
this.notices = records this.notices = records
}).catch(res => {}) }).catch(res => { })
}, },
// 预览附件 // 预览附件
previewFile(item) { previewFile (item) {
const { filePath } = item const { filePath } = item
const suffix = filePath.substr(filePath.lastIndexOf('.') + 1) const suffix = filePath.substr(filePath.lastIndexOf('.') + 1)
window.open((util.isDoc(suffix) || suffix === 'pdf' ? 'https://view.officeapps.live.com/op/view.aspx?src=' : '') + item.filePath) window.open((util.isDoc(suffix) || suffix === 'pdf' ? 'https://view.officeapps.live.com/op/view.aspx?src=' : '') + item.filePath)
}, },
// 下载附件 // 下载附件
download(item) { download (item) {
util.downloadFile(item.fileName, item.filePath) util.downloadFile(item.fileName, item.filePath)
}, },
// tab切换 // tab切换
typeChange() { typeChange () {
document.querySelector(`#part${this.curType}`).scrollIntoView() document.querySelector(`#part${this.curType}`).scrollIntoView()
}, },
} }
@ -200,8 +238,8 @@ export default {
<style lang="scss" scoped> <style lang="scss" scoped>
.match { .match {
padding-bottom: 20px; padding-bottom: 20px;
background-color: #F3F6FA; background-color: #f3f6fa;
.banner{ .banner {
width: 100%; width: 100%;
height: 350px; height: 350px;
color: #fff; color: #fff;
@ -220,23 +258,24 @@ export default {
box-sizing: border-box; box-sizing: border-box;
} }
/deep/.el-tabs { /deep/.el-tabs {
.el-tabs__item.is-active, .el-tabs__item:hover { .el-tabs__item.is-active,
color: #007EFF; .el-tabs__item:hover {
color: #007eff;
} }
.el-tabs__active-bar { .el-tabs__active-bar {
background-color: #007EFF; background-color: #007eff;
} }
} }
.p-title { .p-title {
border-left-color: #007EFF; border-left-color: #007eff;
} }
.l-title{ .l-title {
display: flex; display: flex;
align-items: center; align-items: center;
margin-bottom: 12px; margin-bottom: 12px;
font-size: 18px; font-size: 18px;
color: #333; color: #333;
img{ img {
margin-right: 5px; margin-right: 5px;
} }
} }
@ -246,30 +285,30 @@ export default {
line-height: 34px; line-height: 34px;
font-size: 14px; font-size: 14px;
color: #fff; color: #fff;
background-color: #52C41A; background-color: #52c41a;
border-radius: 4px; border-radius: 4px;
cursor: pointer; cursor: pointer;
&.wait { &.wait {
background-color: #FAAD14; background-color: #faad14;
} }
&.signing { &.signing {
background-color: #007EFF; background-color: #007eff;
} }
&.signed { &.signed {
background-color: #52C41A; background-color: #52c41a;
} }
&.finish { &.finish {
background-color: #ccc; background-color: #ccc;
} }
} }
.title{ .title {
width: 67%; width: 67%;
margin: 0 auto; margin: 0 auto;
font-size: 28px; font-size: 28px;
text-align: center; text-align: center;
color: #0B1D30; color: #0b1d30;
} }
.info .meta{ .info .meta {
padding: 16px 0; padding: 16px 0;
font-size: 12px; font-size: 12px;
color: #999; color: #999;
@ -281,7 +320,7 @@ export default {
line-height: 1.6; line-height: 1.6;
text-indent: 2em; text-indent: 2em;
overflow: hidden; overflow: hidden;
/deep/img{ /deep/img {
max-width: 100%; max-width: 100%;
} }
} }
@ -298,26 +337,26 @@ export default {
} }
} }
.el-link.el-link--primary { .el-link.el-link--primary {
color: #007EFF !important; color: #007eff !important;
&:after { &:after {
border-color: #007EFF; border-color: #007eff;
} }
} }
} }
.progress{ .progress {
position: relative; position: relative;
width: 95%; width: 95%;
padding: 50px 0; padding: 50px 0;
margin: 40px auto 80px; margin: 40px auto 80px;
text-align: left; text-align: left;
&:before{ &:before {
content: ''; content: '';
position: absolute; position: absolute;
top: 0; top: 0;
left: 50%; left: 50%;
width: 2px; width: 2px;
height: 100%; height: 100%;
background-color: #E1E6F2; background-color: #e1e6f2;
} }
&:after { &:after {
content: ''; content: '';
@ -325,27 +364,27 @@ export default {
top: -10px; top: -10px;
left: 430px; left: 430px;
border: 8px solid transparent; border: 8px solid transparent;
border-bottom-color: #E1E6F2; border-bottom-color: #e1e6f2;
} }
.rocket { .rocket {
position: absolute; position: absolute;
bottom: -50px; bottom: -50px;
left: 425px; left: 425px;
} }
li{ li {
position: relative; position: relative;
width: 400px; width: 400px;
margin-bottom: 42px; margin-bottom: 42px;
.dot{ .dot {
position: absolute; position: absolute;
top: 12px; top: 12px;
left: 431px; left: 431px;
width: 15px; width: 15px;
height: 15px; height: 15px;
background-color: #DCDCDC; background-color: #dcdcdc;
border-radius: 50%; border-radius: 50%;
} }
.name{ .name {
display: inline-block; display: inline-block;
padding: 0 19px; padding: 0 19px;
margin-bottom: 16px; margin-bottom: 16px;
@ -354,27 +393,28 @@ export default {
font-size: 16px; font-size: 16px;
color: #fff; color: #fff;
border-radius: 20px; border-radius: 20px;
background-color: #C4C4C4; background-color: #c4c4c4;
} }
.desc{ .desc {
position: relative; position: relative;
color: #333; color: #333;
font-size: 14px; font-size: 14px;
} }
&.ing, &.done { &.ing,
&.done {
.dot { .dot {
top: 8px; top: 8px;
background-color: #007EFF; background-color: #007eff;
} }
.name { .name {
background-color: #007EFF; background-color: #007eff;
} }
} }
&.ing { &.ing {
.dot { .dot {
width: 27px; width: 27px;
height: 27px; height: 27px;
border: 6px solid #E2F1FB; border: 6px solid #e2f1fb;
} }
} }
&:nth-child(odd) { &:nth-child(odd) {
@ -395,16 +435,17 @@ export default {
border: 18px solid transparent; border: 18px solid transparent;
border-top-width: 6px; border-top-width: 6px;
border-bottom-width: 6px; border-bottom-width: 6px;
border-left-color: #C4C4C4; border-left-color: #c4c4c4;
} }
} }
.desc { .desc {
text-align: right; text-align: right;
} }
&.ing, &.done { &.ing,
&.done {
.name { .name {
&:before { &:before {
border-left-color: #007EFF; border-left-color: #007eff;
} }
} }
} }
@ -430,7 +471,7 @@ export default {
border: 18px solid transparent; border: 18px solid transparent;
border-top-width: 6px; border-top-width: 6px;
border-bottom-width: 6px; border-bottom-width: 6px;
border-right-color: #C4C4C4; border-right-color: #c4c4c4;
} }
} }
.desc { .desc {
@ -444,19 +485,20 @@ export default {
left: auto; left: auto;
right: -18px; right: -18px;
border: 9px solid transparent; border: 9px solid transparent;
border-left-color: #E6E6E6; border-left-color: #e6e6e6;
} }
} }
&.ing, &.done { &.ing,
&.done {
.name { .name {
&:after { &:after {
border-right-color: #007EFF; border-right-color: #007eff;
} }
} }
} }
} }
&:last-child{ &:last-child {
margin-bottom: 0; margin-bottom: 0;
} }
} }
@ -478,9 +520,9 @@ export default {
h6 { h6 {
font-size: 20px; font-size: 20px;
font-weight: 500; font-weight: 500;
color: #0B1D30; color: #0b1d30;
&:hover { &:hover {
color: #007EFF; color: #007eff;
} }
} }
.meta { .meta {
@ -493,7 +535,7 @@ export default {
color: #333; color: #333;
line-height: 24px; line-height: 24px;
display: -webkit-box; display: -webkit-box;
display:-moz-box; display: -moz-box;
-webkit-box-orient: vertical; -webkit-box-orient: vertical;
-moz-box-orient: vertical; -moz-box-orient: vertical;
-webkit-line-clamp: 2; -webkit-line-clamp: 2;
@ -502,16 +544,16 @@ export default {
text-overflow: ellipsis; text-overflow: ellipsis;
} }
} }
.empty{ .empty {
display: flex; display: flex;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
padding: 50px 0; padding: 50px 0;
text-align: center; text-align: center;
img{ img {
width: 471px; width: 471px;
} }
p{ p {
margin-top: 40px; margin-top: 40px;
font-size: 18px; font-size: 18px;
color: rgba(0, 0, 0, 0.25); color: rgba(0, 0, 0, 0.25);

1
src/views/order/AddOrder.vue
Unescape View File

@ -2590,6 +2590,7 @@ export default {
e.associatedProduct && productId.push(+e.associatedProduct); e.associatedProduct && productId.push(+e.associatedProduct);
let find = this[name].some(i => e.mallId === i.mallId);// 判断已有的相同的id不进行处理 let find = this[name].some(i => e.mallId === i.mallId);// 判断已有的相同的id不进行处理
if (!find) { if (!find) {
// 查询产品管理设置的平台结算价
this.$post(`${this.api.queryCitySettlementPrice}?mallId=${e.mallId}&provinceId=${this.form.provinceId}&cityId=${this.form.cityId}`).then(res => { this.$post(`${this.api.queryCitySettlementPrice}?mallId=${e.mallId}&provinceId=${this.form.provinceId}&cityId=${this.form.cityId}`).then(res => {
const mall = res.mallPrice const mall = res.mallPrice
if (mall) { if (mall) {

25
src/views/serve/backstage/model.vue
Unescape View File

@ -107,6 +107,7 @@
<script> <script>
import org from "./modelType" import org from "./modelType"
import Setting from '@/setting' import Setting from '@/setting'
import Bus from '@/libs/bus'
export default { export default {
data () { data () {
return { return {
@ -122,7 +123,6 @@ export default {
modelLoading: false, modelLoading: false,
modelData: [], modelData: [],
submiting: false, submiting: false,
timer: null
}; };
}, },
components: { components: {
@ -137,12 +137,13 @@ export default {
} }
}, },
mounted () { mounted () {
this.$once('hook:beforeDestroy', function () { // websocket实时刷新
clearInterval(this.timer) Bus.$on('modelSocket', () => {
this.getData()
}) })
}, },
methods: { methods: {
getList () { getData () {
const curNode = this.$refs.tree.$refs.tree.getCurrentNode() // 获取当前选中的分类 const curNode = this.$refs.tree.$refs.tree.getCurrentNode() // 获取当前选中的分类
this.isTopLevel = !curNode.level this.isTopLevel = !curNode.level
// 如果是首级，要调另一个接口 // 如果是首级，要调另一个接口
@ -170,22 +171,6 @@ export default {
}).catch(res => { }) }).catch(res => { })
} }
}, },
getData () {
clearInterval(this.timer)
this.getList()
if (!Setting.isDev) {
this.timer = setInterval(this.getRedis, 1000)
}
},
// 获取redis缓存
getRedis () {
this.$post(this.api.modelRedis).then(({ data }) => {
if (data) {
localStorage.getItem('modelNakadai') !== data && this.getList() // 本地缓存跟redis返回的不一样，就查询列表
localStorage.setItem('modelNakadai', data)
}
}).catch(res => { })
},
initData () { initData () {
this.page = 1 this.page = 1
this.getData() this.getData()

32
src/views/serve/backstage/sourceModel.vue
Unescape View File

@ -137,6 +137,7 @@
<script> <script>
import org from "./sourceType" import org from "./sourceType"
import Setting from '@/setting' import Setting from '@/setting'
import Bus from '@/libs/bus'
export default { export default {
data () { data () {
return { return {
@ -157,7 +158,6 @@ export default {
label: 'categoryName', label: 'categoryName',
value: 'id' value: 'id'
}, },
timer: null,
isSchool: 0, isSchool: 0,
categories: [] categories: []
}; };
@ -174,13 +174,14 @@ export default {
} }
}, },
mounted () { mounted () {
this.$once('hook:beforeDestroy', function () { // websocket实时刷新
clearInterval(this.timer) Bus.$on('modelSocket', () => {
this.getData()
}) })
}, },
methods: { methods: {
// 获取列表 // 获取列表
async getList () { async getData () {
const curNode = this.$refs.tree.$refs.tree.getCurrentNode() || {}// 获取当前选中的分类 const curNode = this.$refs.tree.$refs.tree.getCurrentNode() || {}// 获取当前选中的分类
this.isTopLevel = !curNode.level this.isTopLevel = !curNode.level
// 如果是首级，要调另一个接口 // 如果是首级，要调另一个接口
@ -194,22 +195,6 @@ export default {
this.listData = data.records this.listData = data.records
this.total = data.total this.total = data.total
}, },
getData () {
clearInterval(this.timer)
this.getList()
if (!Setting.isDev) {
this.timer = setInterval(this.getRedis, 1000)
}
},
// 获取redis缓存
getRedis () {
this.$post(this.api.modelRedis).then(({ data }) => {
if (data) {
localStorage.getItem('modelNakadai') !== data && this.getList() // 本地缓存跟redis返回的不一样，就查询列表
localStorage.setItem('modelNakadai', data)
}
}).catch(res => { })
},
// 分类点击回调 // 分类点击回调
catetoryClick (school) { catetoryClick (school) {
this.isSchool = school this.isSchool = school
@ -301,7 +286,8 @@ export default {
this.$confirm(`确定要${off ? '启用' : '禁用'}吗？`, "提示", { this.$confirm(`确定要${off ? '启用' : '禁用'}吗？`, "提示", {
type: "warning" type: "warning"
}).then(() => { }).then(() => {
this.$post(this.api.disableModelDemo, list).then(res => { this.$post(this.api.disableModelDemo, list).then(async res => {
await this.$post(`${this.api.refreshPageNotification}?content=4`)
this.$message.success(`${off ? '启用' : '禁用'}成功`) this.$message.success(`${off ? '启用' : '禁用'}成功`)
this.getData() this.getData()
}).catch(res => { }) }).catch(res => { })
@ -311,7 +297,7 @@ export default {
} }
}, },
// 禁用 // 禁用
switchOff (val, row, index) { async switchOff (val, row, index) {
this.$post(this.api.disableModelDemo, [{ this.$post(this.api.disableModelDemo, [{
isOpen: val, isOpen: val,
modelId: row.id, modelId: row.id,
@ -319,6 +305,8 @@ export default {
}]).then(res => { }]).then(res => {
this.$message.success(val ? '禁用成功' : '启用成功') this.$message.success(val ? '禁用成功' : '启用成功')
}).catch(res => { }) }).catch(res => { })
await this.$post(`${this.api.refreshPageNotification}?content=4`)
}, },
handleSelectionChange (val) { handleSelectionChange (val) {
this.multipleSelection = val this.multipleSelection = val

2
src/views/shop/addProduct/index.vue
Unescape View File

@ -1003,6 +1003,7 @@ export default {
mall.appletIcon = data.miniProgramPictureAddress mall.appletIcon = data.miniProgramPictureAddress
mall.productIntroduction = data.briefIntroduction mall.productIntroduction = data.briefIntroduction
mall.marketUnitPrice = data.marketPrice mall.marketUnitPrice = data.marketPrice
this.calcAllSettlement()
}).catch(err => { }) }).catch(err => { })
} else { } else {
form.classificationIds = active == 2 ? 5 : 3 form.classificationIds = active == 2 ? 5 : 3
@ -1015,6 +1016,7 @@ export default {
mall.marketUnitPrice = item.market mall.marketUnitPrice = item.market
form.mallPrices.find(e => e.settlementPriceType && e.area === 0).settlementPrice = item.settlementPrice form.mallPrices.find(e => e.settlementPriceType && e.area === 0).settlementPrice = item.settlementPrice
this.isData = true this.isData = true
this.calcAllSettlement()
} }
} }
} }

Write Preview
Loading…
Cancel
Save