fix: bug修改

This commit is contained in:
kaizheng(郑凯) 2025-02-26 16:08:45 +08:00
parent 4d2cd4a120
commit 17b57b67ab
7 changed files with 8 additions and 48 deletions

View File

@ -6,7 +6,8 @@
"license": "Apache-2.0", "license": "Apache-2.0",
"scripts": { "scripts": {
"dev": "vue-cli-service serve", "dev": "vue-cli-service serve",
"build:prod": "vue-cli-service build && sh ./build/deploy.sh", "build:test": "vue-cli-service build && sh ./build/deploy.sh",
"build:prod": "sh ./build/deploy_prod.sh",
"build:stage": "vue-cli-service build --mode staging", "build:stage": "vue-cli-service build --mode staging",
"preview": "node build/index.js --preview", "preview": "node build/index.js --preview",
"lint": "eslint --ext .js,.vue src", "lint": "eslint --ext .js,.vue src",

View File

@ -1,5 +1,5 @@
window.config = { window.config = {
qwUserPhotoUrl: "", qwUserPhotoUrl: "",
webAuthUrl: "", // 登录跳转地址 webAuthUrl: "", // 登录跳转地址
openPortraitScreen: true // 创建直播的时候是否允许创建竖屏 openPortraitScreen: false // 创建直播的时候是否允许创建竖屏
}; };

View File

@ -1,5 +1,5 @@
<template> <template>
<div class="batch-create"> <div class="batch-create app-container">
<el-steps :active="stepActive" simple> <el-steps :active="stepActive" simple>
<el-step title="1 基础设置"></el-step> <el-step title="1 基础设置"></el-step>
<el-step title="2 直播设置"></el-step> <el-step title="2 直播设置"></el-step>
@ -887,11 +887,6 @@ export default {
this.ruleForm.productType = null; this.ruleForm.productType = null;
} }
if (this.settingToC && this.ruleForm.isCart === 1) {
this.ruleForm.cartList.forEach((item, index) => {
item.productId = index + 1;
});
}
if (this.settingToC && this.ruleForm.limitType === 1) { if (this.settingToC && this.ruleForm.limitType === 1) {
this.ruleForm.limitType === 2; this.ruleForm.limitType === 2;
} }
@ -1215,8 +1210,6 @@ export default {
<style scoped lang="scss"> <style scoped lang="scss">
.batch-create { .batch-create {
padding: 20px;
.batch-create-container { .batch-create-container {
padding: 20px; padding: 20px;

View File

@ -922,11 +922,6 @@ export default {
this.ruleForm.productType = null; this.ruleForm.productType = null;
} }
if (this.ruleForm.isCart === 1) {
this.ruleForm.cartList.forEach((item, index) => {
item.productId = index + 1;
});
}
if (this.ruleForm.limitType === 1) { if (this.ruleForm.limitType === 1) {
this.ruleForm.limitType === 2; this.ruleForm.limitType === 2;
} }

View File

@ -163,7 +163,6 @@
: item.imgUrl : item.imgUrl
" "
alt="" alt=""
@click="openUserPhoto(item)"
/> />
<span <span
style="margin-right: 5px;" style="margin-right: 5px;"
@ -1291,7 +1290,6 @@
frameborder="0" frameborder="0"
/> />
</el-dialog> </el-dialog>
<clientPortrayalDialog ref="clientPortrayalDialog" />
</div> </div>
</template> </template>
<script> <script>
@ -1348,7 +1346,6 @@ import { timeFormat } from "@/utils/index";
import guestList from "./components/guestList.vue"; import guestList from "./components/guestList.vue";
import rebroadcast from "./components/rebroadcast.vue"; import rebroadcast from "./components/rebroadcast.vue";
import overUniteLive from "./components/overUniteLive.vue"; import overUniteLive from "./components/overUniteLive.vue";
import clientPortrayalDialog from "../components/clientPortrayalDialog.vue";
export default { export default {
components: { components: {
CountDown, CountDown,
@ -1357,8 +1354,7 @@ export default {
createCoupon, createCoupon,
guestList, guestList,
rebroadcast, rebroadcast,
overUniteLive, overUniteLive
clientPortrayalDialog
}, },
data() { data() {
return { return {
@ -3304,13 +3300,6 @@ export default {
} }
}) })
.catch(() => {}); .catch(() => {});
},
openUserPhoto(item) {
if (item.userId) {
// this.qwUserPhoto.url = `${window.config.qwUserPhotoUrl}${item.userId}`
// this.qwUserPhoto.dialogVisible = true
this.$refs.clientPortrayalDialog.openUserPhoto(item);
}
} }
} }
}; };

View File

@ -370,7 +370,7 @@
</el-table-column> </el-table-column>
<el-table-column prop="nickName" label="昵称" width="180"> <el-table-column prop="nickName" label="昵称" width="180">
<template #default="scope"> <template #default="scope">
<el-link type="primary" @click="openUserPhoto(scope.row)">{{ scope.row.nickName | formatPhone }}</el-link> <el-link type="primary">{{ scope.row.nickName | formatPhone }}</el-link>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="userId" :label="settingToC ? '客户账号': '客户手机号'" width="180"> <el-table-column prop="userId" :label="settingToC ? '客户账号': '客户手机号'" width="180">
@ -532,7 +532,6 @@
@current-change="handleCurrentChangeTwo" @current-change="handleCurrentChangeTwo"
/> />
</div> </div>
<clientPortrayalDialog ref="clientPortrayalDialog"/>
</div> </div>
</template> </template>
<script> <script>
@ -552,12 +551,10 @@ import dayjs from 'dayjs'
import { liveFunnelStatistic, liveOperationStatistic } from '@/api/index' import { liveFunnelStatistic, liveOperationStatistic } from '@/api/index'
import { timeFormatTwo } from "@/utils/index" import { timeFormatTwo } from "@/utils/index"
import { mapGetters,mapState } from "vuex"; import { mapGetters,mapState } from "vuex";
import clientPortrayalDialog from "../../components/clientPortrayalDialog.vue"
export default { export default {
components: { components: {
PieChart, PieChart,
PortfolioChart, PortfolioChart
clientPortrayalDialog
}, },
data() { data() {
return { return {
@ -773,11 +770,6 @@ export default {
getTimeToNum, getTimeToNum,
getNumToDate, getNumToDate,
dayjs, dayjs,
openUserPhoto(item) {
if(item.userId) {
this.$refs.clientPortrayalDialog.openUserPhoto(item)
}
},
getColumnList() { getColumnList() {
deptColumnList({ type: 2 }).then(res => { deptColumnList({ type: 2 }).then(res => {
if (res.code === 0) { if (res.code === 0) {

View File

@ -118,7 +118,7 @@
</el-table-column> </el-table-column>
<el-table-column prop="nickName" label="昵称" width="180"> <el-table-column prop="nickName" label="昵称" width="180">
<template #default="scope"> <template #default="scope">
<el-link type="primary" @click="openUserPhoto(scope.row)">{{ <el-link type="primary">{{
scope.row.nickName | formatPhone scope.row.nickName | formatPhone
}}</el-link> }}</el-link>
</template> </template>
@ -199,7 +199,6 @@
@current-change="handleCurrentChange" @current-change="handleCurrentChange"
/> />
</div> </div>
<clientPortrayalDialog ref="clientPortrayalDialog" />
</div> </div>
</template> </template>
<script> <script>
@ -213,11 +212,7 @@ import { string } from "clipboard";
import { mapGetters, mapState } from "vuex"; import { mapGetters, mapState } from "vuex";
import { timeFormat } from "@/utils/index"; import { timeFormat } from "@/utils/index";
import dayjs from "dayjs"; import dayjs from "dayjs";
import clientPortrayalDialog from "../../components/clientPortrayalDialog.vue";
export default { export default {
components: {
clientPortrayalDialog
},
data() { data() {
return { return {
reqData: { reqData: {
@ -347,11 +342,6 @@ export default {
methods: { methods: {
timeFormat, timeFormat,
dayjs, dayjs,
openUserPhoto(item) {
if (item.userId) {
this.$refs.clientPortrayalDialog.openUserPhoto(item);
}
},
getDataOverview() { getDataOverview() {
dataOverview({ videoId: this.id }).then(res => { dataOverview({ videoId: this.id }).then(res => {
if (res.code === 0) { if (res.code === 0) {