Skip to content

C
company_app
提交 ad7c299f 作者: 毛细亚
操作

修复错误日志

上级 935023a5
正在显示 包含 76 行增加 和 92 行删除
company_app/index.html
<!DOCTYPE html> <!doctype html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" href="favicon.ico"><meta http-equiv="pragma" content="no-cache"><meta http-equiv="cache-control" content="no-cache"><meta http-equiv="expires" content="0"><meta http-equiv="X-UA-Compatible" content="IE=EmulateIE9"/><title>company_app</title><script src="https://g.alicdn.com/dingding/dinglogin/0.0.5/ddLogin.js"></script><script defer="defer" src="static/js/chunk-vendors.b6398f5b.js"></script><script defer="defer" src="static/js/app.104c5e9d.js"></script><link href="static/css/chunk-vendors.8e901099.css" rel="stylesheet"><link href="static/css/app.362b158b.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but company_app doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div></body></html>
<html lang=""> \ No newline at end of file
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width,initial-scale=1.0">
<link rel="icon" href="favicon.ico">
<!-- HTTP 1.1 -->
<meta http-equiv="pragma" content="no-cache">
<!-- HTTP 1.0 -->
<meta http-equiv="cache-control" content="no-cache">
<!-- Prevent caching at the proxy server -->
<meta http-equiv="expires" content="0">
<meta http-equiv="X-UA-Compatible" content="IE=EmulateIE9" />
<title>company_app</title>
<!-- <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0,shrink-to-fit=no,user-scalable=no"> -->
<script src="https://g.alicdn.com/dingding/dinglogin/0.0.5/ddLogin.js"></script>
<script defer src="static/js/chunk-vendors.js"></script><script defer src="static/js/app.js"></script></head>
<body>
<noscript>
<strong>We're sorry but company_app doesn't work properly without JavaScript enabled. Please enable it to continue.</strong>
</noscript>
<div id="app"></div>
</body>
</html>
src/views/components/giftRecord/giftDetails/oneDay.vue
...@@ -44,73 +44,75 @@ ...@@ -44,73 +44,75 @@
</div> </div>
</div> </div>
<div class="activeList"> <div class="activeList">
<div v-for="(item,index) in giftInfo.rule.level_attribute" :key="index"> <div v-if=" giftInfo.rule && giftInfo.rule.level_attribute && giftInfo.rule.level_attribute.length > 0">
<div class="activeListItem"> <div v-for="(item,index) in giftInfo.rule.level_attribute" :key="index">
<div class="activeListItemTitle rowFlex spaceBetween columnCenter"> <div class="activeListItem">
<p class="title">{{ item.prize_level_name }}</p> <div class="activeListItemTitle rowFlex spaceBetween columnCenter">
<div class="rowFlex handle columnCenter"> <p class="title">{{ item.prize_level_name }}</p>
<p>{{ item.compare_amount + '积分' }}</p> <div class="rowFlex handle columnCenter">
<el-input-number <p>{{ item.compare_amount + '积分' }}</p>
v-model="item.apply_num" <el-input-number
class="inputNumber" v-model="item.apply_num"
size="mini" class="inputNumber"
:max="activeInfo.exchange_score_status == 2 ? 1 : 999" size="mini"
:min="0" :max="activeInfo.exchange_score_status == 2 ? 1 : 999"
@change="packNumChange(index)" :min="0"
></el-input-number> @change="packNumChange(index)"
></el-input-number>
<i v-if="!item.showContent" class="el-icon-arrow-down icon" @click="openPrizeItem(item,index,true)"></i> <i v-if="!item.showContent" class="el-icon-arrow-down icon" @click="openPrizeItem(item,index,true)"></i>
<i v-else class="el-icon-arrow-right icon" @click="openPrizeItem(item,index,false)"></i> <i v-else class="el-icon-arrow-right icon" @click="openPrizeItem(item,index,false)"></i>
</div>
</div> </div>
</div> <el-collapse-transition>
<el-collapse-transition> <div v-if="!item.showContent" class="activeListItemContent">
<div v-if="!item.showContent" class="activeListItemContent"> <div v-if="item.prize_default.length>0" class="activeListItemTitle">
<div v-if="item.prize_default.length>0" class="activeListItemTitle"> <div class="title">固定奖 * {{ item.apply_num ? item.apply_num : 0 }}</div>
<div class="title">固定奖 * {{ item.apply_num ? item.apply_num : 0 }}</div> <div class="handle">
<div class="handle"> <div
<div v-for="(trem, mark) in item.prize_default"
v-for="(trem, mark) in item.prize_default" :key="mark"
:key="mark" >
> {{ trem.name }}
{{ trem.name }} {{ trem.id }}
{{ trem.id }} </div>
</div> </div>
</div> </div>
</div> <div v-if="item.prize_auto.length > 0" class="activeListItemTitle">
<div v-if="item.prize_auto.length > 0" class="activeListItemTitle"> <div class="title">自选奖 （{{ item.prize_auto.length + '选' + item.prize_auto_num }} ） * {{ item.apply_num ? item.apply_num : 0 * item.prize_auto_num }}</div>
<div class="title">自选奖 （{{ item.prize_auto.length + '选' + item.prize_auto_num }} ） * {{ item.apply_num ? item.apply_num : 0 * item.prize_auto_num }}</div> </div>
</div> <!-- 自选奖 -->
<!-- 自选奖 --> <div v-for="(trem, mark) in item.prize_auto" :key="mark" class="activeListItemTitle rowFlex spaceBetween columnCenter">
<div v-for="(trem, mark) in item.prize_auto" :key="mark" class="activeListItemTitle rowFlex spaceBetween columnCenter"> <div>
<div> <div
<div v-for="(entry, sign) in trem.group"
v-for="(entry, sign) in trem.group" :key="sign"
:key="sign" >
> <div>
<div> {{ entry.name }}
{{ entry.name }} </div>
</div> </div>
</div> </div>
</div>
<div class="rowFlex handle columnCenter" style="margin-right:23px;"> <div class="rowFlex handle columnCenter" style="margin-right:23px;">
<el-input-number <el-input-number
v-model="trem.apply_num" v-model="trem.apply_num"
size="mini" size="mini"
:max="item.exchange_score_status == 2 ? 1 : item.residuePackNum || item.residuePackNum === 0 ? item.residuePackNum + trem.apply_num : 0" :max="item.exchange_score_status == 2 ? 1 : item.residuePackNum || item.residuePackNum === 0 ? item.residuePackNum + trem.apply_num : 0"
:min="0" :min="0"
@change="packAutoNumChange(index, trem)" @change="packAutoNumChange(index, trem)"
></el-input-number> ></el-input-number>
</div>
</div> </div>
<div
v-if="activeInfo.exchange_score_status == 1"
class="consumption-points rowFlex allCenter"
>消耗:{{ item.compare_amount * item.apply_num }}积分</div>
</div> </div>
<div </el-collapse-transition>
v-if="activeInfo.exchange_score_status == 1" </div>
class="consumption-points rowFlex allCenter" <div class="allIcon rowFlex allCenter">合计：{{ allpoints }} 积分</div>
>消耗:{{ item.compare_amount * item.apply_num }}积分</div>
</div>
</el-collapse-transition>
</div> </div>
<div class="allIcon rowFlex allCenter">合计：{{ allpoints }} 积分</div>
</div> </div>
<div class="activeItem rowFlex" style="margin-top:20px;"> <div class="activeItem rowFlex" style="margin-top:20px;">
<div class="activeLabel" style="text-align:right;">备注</div> <div class="activeLabel" style="text-align:right;">备注</div>
......
src/views/components/order/searchUser.vue
...@@ -90,8 +90,13 @@ ...@@ -90,8 +90,13 @@
} }
}, },
selectChange(value) { selectChange(value) {
const valueItem = this.searchUserOption.find(item => item.role_id == value || item.id == value) const valueItem = this.searchUserOption.find(item => {
console.log(valueItem, value) if(item.role_id){
return item.role_id == value
}else{
return item.id == value
}
})
this.$emit('result', value, valueItem) this.$emit('result', value, valueItem)
}, },
requestAccountList() { requestAccountList() {
......
src/views/components/skill/skillCompany.vue
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
</el-popover> </el-popover>
<div class="rowFlex titleFixed columnCenter"> <div class="rowFlex titleFixed columnCenter">
<div class="num">{{ items.message.attachments.length > 1 ? `+${items.message.attachments.length - 1}条` : '' }}</div> <div class="num">{{items.message && items.message.attachments && items.message.attachments.length > 1 ? `+${items.message.attachments.length - 1}条` : '' }}</div>
</div> </div>
<el-collapse-item title="" :name="items._id" class="contentItem"> <el-collapse-item title="" :name="items._id" class="contentItem">
...@@ -291,7 +291,7 @@ export default { ...@@ -291,7 +291,7 @@ export default {
} }
procedure_group(data).then((res) => { procedure_group(data).then((res) => {
this.loading = false this.loading = false
if (res.data.data && res.data.data.length > 0) { if (res.data && res.data.data && res.data.data.length > 0) {
this.groupList = res.data.data.map((item, index) => { this.groupList = res.data.data.map((item, index) => {
item.label = item.group_name item.label = item.group_name
item.value = item._id item.value = item._id
......
src/views/components/taskList/uesrTask.vue
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
v-model="collapseValue" v-model="collapseValue"
@change="handleChange(item,$event)" @change="handleChange(item,$event)"
> >
<el-collapse-item :name="item.order_id"> <el-collapse-item :name="item.order_id || '--'">
<template slot="title"> <template slot="title">
<div class="orderDetailsTitle"> <div class="orderDetailsTitle">
<div class="money rowFlex spaceBetween"> <div class="money rowFlex spaceBetween">
......
src/views/taskList.vue
...@@ -123,7 +123,7 @@ ...@@ -123,7 +123,7 @@
<div v-for="(item, index) in taskList" :key="index" class="chatListItem columnCenter spaceBetween" <div v-for="(item, index) in taskList" :key="index" class="chatListItem columnCenter spaceBetween"
:class="item.id === taskDetails.id ? 'chatListItemActive' : ''" @click="selectTaskItem(item)"> :class="item.id === taskDetails.id ? 'chatListItemActive' : ''" @click="selectTaskItem(item)">
<div class="top rowFlex spaceBetween"> <div class="top rowFlex spaceBetween">
<div v-if="item.username && item.username.split('\n').length > 0" class="value"> <div v-if="item.username && item.username.split('\n') && item.username.split('\n').length > 0" class="value">
<div v-if="item.username.split('\n').length <= 1" class="rowFlex columnCenter"> <div v-if="item.username.split('\n').length <= 1" class="rowFlex columnCenter">
<div v-for="(items, indexs) in item.username.split('\n')" :key="indexs" <div v-for="(items, indexs) in item.username.split('\n')" :key="indexs"
class="rowFlex columnCenter userInfoStyle"> class="rowFlex columnCenter userInfoStyle">
...@@ -139,7 +139,7 @@ ...@@ -139,7 +139,7 @@
<span class="textHidden" style="max-width:150px;">{{ items }}</span> <span class="textHidden" style="max-width:150px;">{{ items }}</span>
</p> </p>
</div> </div>
<el-button slot="reference" type="text">{{ item.username.split("\n").length <el-button slot="reference" type="text">{{ item.username && item.username.split("\n") && item.username.split("\n").length?item.username.split("\n").length : 0
}}个</el-button> }}个</el-button>
</el-popover> </el-popover>
</div> </div>
...@@ -635,14 +635,14 @@ export default { ...@@ -635,14 +635,14 @@ export default {
const res = await taskIndex(data) const res = await taskIndex(data)
this.loading = false this.loading = false
if (this.pageInfo.page == 1) { if (this.pageInfo.page == 1) {
this.taskList = res.data.data this.taskList = res.data.data || []
} else { } else {
this.taskList = removeDp(this.taskList, res.data.data, 'id') this.taskList = removeDp(this.taskList, res.data.data, 'id')
} }
// if (!this.taskDetails.id && this.taskList.length > 0) { // if (!this.taskDetails.id && this.taskList.length > 0) {
// this.set_taskDetails(this.taskList[0]) // this.set_taskDetails(this.taskList[0])
// } // }
if (res.data.data.length < 20) { if (res?.data?.data?.length < 20) {
this.isMoreRecord = false this.isMoreRecord = false
} else { } else {
this.isMoreRecord = true this.isMoreRecord = true
......
src/views/taskRecord.vue
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
v-model="collapseValue" v-model="collapseValue"
@change="handleChange(item,$event)" @change="handleChange(item,$event)"
> >
<el-collapse-item :name="item.order_id"> <el-collapse-item :name="item.order_id || '--'">
<template slot="title"> <template slot="title">
<div class="orderDetailsTitle"> <div class="orderDetailsTitle">
<div class="money rowFlex spaceBetween"> <div class="money rowFlex spaceBetween">
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论