feat(global): 移除无用代码,全局样式调整

This commit is contained in:
woody 2025-05-06 16:17:47 +08:00
parent 55f97f185b
commit 7e8ab31ad5
7 changed files with 139 additions and 247 deletions

View File

@ -25,9 +25,6 @@
<div @click="goMore(3)"> <div @click="goMore(3)">
<i class="el-icon-chat-dot-round"></i> {{ "意见反馈" }} <i class="el-icon-chat-dot-round"></i> {{ "意见反馈" }}
</div> </div>
<div @click="openKf">
<i class="el-icon-s-custom"></i> {{ "在线客服" }}
</div>
</div> </div>
</div> </div>
<div class="page_btm"> <div class="page_btm">

View File

@ -171,9 +171,9 @@ export default {
{ {
name: "活动列表", name: "活动列表",
}, },
{ // {
name: "沙棘公益", // name: "",
}, // },
], ],
treeObj: "", treeObj: "",
treeMin: 0, treeMin: 0,
@ -342,7 +342,7 @@ export default {
background: #ffffff; background: #ffffff;
.acttitle { .acttitle {
font-size: 18px; font-size: 18px;
color: #00417C; color: #00417c;
font-weight: 500; font-weight: 500;
} }
.acttime { .acttime {

View File

@ -118,6 +118,7 @@
title="" title=""
width="200" width="200"
trigger="hover" trigger="hover"
:disabled="!scope.row.remark"
:content="scope.row.remark" :content="scope.row.remark"
> >
<div slot="reference" style="cursor: pointer; color: #3499ff"> <div slot="reference" style="cursor: pointer; color: #3499ff">
@ -137,179 +138,6 @@
</el-table-column> </el-table-column>
</el-table> </el-table>
</div> </div>
<!-- table 可申请订单 -->
<!-- <div class="table">
<div class="tabList">
<div
:class="['tab_i', isTab === item.value ? 'tabAct' : '']"
v-for="item in orderStatusList"
@click="isTab = item.value"
:key="item.value"
>
{{ item.label }}
</div>
</div>
<template v-if="isTab == 0">
<div class="table_tit">
<div class="t_btm_l">
<div class="tab_i1">订单详情</div>
</div>
<div class="t_btm_r table_width">
<div>订单类型</div>
<div>订单金额</div>
<div>报单编号</div>
<div>产品业绩(PV)</div>
<div>产品业绩(BV)</div>
<div>{{'会员编号'}}</div>
<div>订单状态</div>
<div>收货人</div>
<div>联系方式</div>
<div>{{ '收货地址' }}</div>
<div>{{ '操作' }}</div>
</div>
</div>
<div v-for="(item, index) in orderLists" class="order_i" :key="index">
<div class="t_top">
<span>订单编号{{ item.orderCode }}</span>
<span>下单时间{{ item.creationTime }}</span>
<span>{{'支付时间'}}{{ item.payTime }}</span>
</div>
<div class="t_btm_a">
<div class="t_btm_l">
<div
v-for="(ctem, cndex) in item.itemList"
:key="cndex"
class="t_btm"
>
<div class="tab_i1">
<img :src="ctem.cover" alt="" />
<div class="tab_i1_1">
<div class="prot">{{ ctem.productName }}</div>
<div class="prot_i">
<div>{{ ctem.price }}</div>
<div>X{{ ctem.quantity }}</div>
</div>
</div>
</div>
</div>
</div>
<div class="t_btm_r table_width">
<div>{{ item.orderTypeVal }}</div>
<div>
{{ item.orderAmount }}
</div>
<div>
{{ item.creatorCode }}
</div>
<div>{{ item.orderAchieve }}</div>
<div>{{ item.assAchievement }}</div>
<div>{{ item.memberCode }}</div>
<div v-if="item.orderStatus == '1'" style="color: #009b58">
{{ item.orderStatusVal }}
</div>
<div v-if="item.orderStatus == '0'" style="color: var(--primary-color)">
{{ item.orderStatusVal }}
</div>
<div v-if="item.orderStatus == '3'" style="color: #ffad41">
{{ item.orderStatusVal }}
</div>
<div v-if="item.orderStatus == '5'" style="color: #ffad41">
{{ item.orderStatusVal }}
</div>
<div>{{ item.recName }}</div>
<div>{{ item.recPhone }}</div>
<div>{{ item.address }}</div>
<div class="del">
<el-popover
placement="top-start"
title=""
width="200"
trigger="hover"
:content="item.remark"
>
<div slot="reference" style="cursor: pointer">备注</div>
</el-popover>
<div class="del1" @click="pickOrder(item)">修改地址</div>
</div>
</div>
</div>
</div>
</template>
<template v-if="isTab == 1">
<div class="table_tit">
<div class="t_btm_l">
<div class="tab_i1">订单详情</div>
</div>
<div class="t_btm_r table_width">
<div>变更后省/</div>
<div>变更后市</div>
<div>变更后区/</div>
<div>变更后详情地址</div>
<div>审核状态</div>
<div>申请时间</div>
<div>备注</div>
</div>
</div>
<div v-for="(item, index) in selfLists" class="order_i" :key="index">
<div class="t_top">
<span>订单编号{{ item.orderCode }}</span>
<span>下单时间{{ item.creationTime }}</span>
<span>{{'支付时间'}}{{ item.payTime }}</span>
</div>
<div class="t_btm_a">
<div class="t_btm_l">
<div
v-for="(ctem, cndex) in item.itemList"
:key="cndex"
class="t_btm"
>
<div class="tab_i1">
<img :src="ctem.cover" alt="" />
<div class="tab_i1_1">
<div class="prot">{{ ctem.productName }}</div>
<div class="prot_i">
<div>{{ ctem.price }}</div>
<div>X{{ ctem.quantity }}</div>
</div>
</div>
</div>
</div>
</div>
<div class="t_btm_r table_width">
<div>{{ item.recProvinceVal }}</div>
<div>{{ item.recCityVal }}</div>
<div>{{ item.recCountyVal }}</div>
<div>{{ item.newRecAddress }}</div>
<div>
<div v-if="item.approveStatus == '1'" style="color: #009b58">
{{ item.approveStatusVal }}
</div>
<div v-if="item.approveStatus == '0'" style="color: var(--primary-color)">
{{ item.approveStatusVal }}
</div>
</div>
<div>
{{ item.creationTime }}
</div>
<div>{{ item.selfRemark }}</div>
</div>
</div>
</div>
</template>
</div> -->
<pagination <pagination
v-show="total > 0" v-show="total > 0"
@ -381,12 +209,17 @@
</el-form-item> </el-form-item>
<div style="text-align: center"> <div style="text-align: center">
<el-button class="saveBtn1" @click="pickShow = false">{{ <el-button
"取消" class="common-dialog-footer-btn"
}}</el-button> @click="pickShow = false"
<el-button class="saveBtn" @click="savePick('pickForm')">{{ >取消</el-button
"确定" >
}}</el-button> <el-button
class="common-dialog-footer-btn"
type="primary"
@click="savePick('pickForm')"
>确定</el-button
>
</div> </div>
</el-form> </el-form>
</div> </div>
@ -407,9 +240,12 @@
</div> </div>
<!-- <div>{{'售后电话'}}400-111-2818</div> --> <!-- <div>{{'售后电话'}}400-111-2818</div> -->
<div class="word2"> <div class="word2">
<el-button class="saveBtn" @click="successShow = false">{{ <el-button
"确认" class="common-dialog-footer-btn"
}}</el-button> type="primary"
@click="successShow = false"
>确认</el-button
>
</div> </div>
</div> </div>
</el-dialog> </el-dialog>

View File

@ -277,17 +277,17 @@
}}<br /> }}<br />
2{{ "自提时间每日900至1800" }}<br /> 2{{ "自提时间每日900至1800" }}<br />
3{{ 3{{
"自提地址山东省青岛市崂山区金家岭街道金岭广场1号楼13层101前台"
}}<br />
4{{
"获取自提码请尽快在1个工作日内完成自提若未完成自提系统将默认重新发货" "获取自提码请尽快在1个工作日内完成自提若未完成自提系统将默认重新发货"
}}<br /> }}<br />
</div> </div>
</div> </div>
<div style="text-align: center"> <div style="text-align: center; margin-top: 20px">
<el-button class="saveBtn" @click="savePick('pickForm')">{{ <el-button
"确认自提" class="common-dialog-footer-btn"
}}</el-button> type="primary"
@click="savePick('pickForm')"
>确认自提</el-button
>
</div> </div>
</el-form> </el-form>
</div></el-dialog </div></el-dialog
@ -308,13 +308,16 @@
}}</el-button> }}</el-button>
</div> </div>
<div class="word1"> <div class="word1">
{{ "自提地址:山东省青岛市崂山区金家岭街道金岭广场1号楼13层101前台" }} {{ "自提地址:" }}
</div> </div>
<!-- <div> {{'售后电话'}}400-111-2818</div> --> <!-- <div> {{'售后电话'}}400-111-2818</div> -->
<div class="word2"> <div class="word2">
<el-button class="saveBtn" @click="successShow = false">{{ <el-button
"确认" class="common-dialog-footer-btn"
}}</el-button> type="primary"
@click="successShow = false"
>确认</el-button
>
</div> </div>
</div> </div>
</el-dialog> </el-dialog>

View File

@ -11,3 +11,8 @@
--button-primary-disabled-border-color: #A0CFFF; /* 禁用主按钮边框颜色 (同背景) */ --button-primary-disabled-border-color: #A0CFFF; /* 禁用主按钮边框颜色 (同背景) */
--danger-color: #DC3545; /* 危险色 */ --danger-color: #DC3545; /* 危险色 */
} }
.common-dialog-footer-btn {
min-width: 180px;
}

View File

@ -40,16 +40,23 @@
<div class="progress-wrapper"> <div class="progress-wrapper">
<div class="progress-wrapper__label">昨日业绩</div> <div class="progress-wrapper__label">昨日业绩</div>
<div <div
:class=" :class="[
awards.aNewPv != 0 && awards.bNewPv != 0 'progress-bar-container',
? 'schedule1' awards.aNewPv != 0 || awards.bNewPv != 0
: 'schedule' ? 'has-value'
" : 'no-value',
]"
> >
<div <div
class="current-schedule" class="left-bar"
:style="{ :style="{
width: yesPercent(awards.aNewPv, awards.bNewPv), width: calculatePercent(awards.aNewPv, awards.bNewPv).left,
}"
></div>
<div
class="right-bar"
:style="{
width: calculatePercent(awards.aNewPv, awards.bNewPv).right,
}" }"
></div> ></div>
<div class="cha"> <div class="cha">
@ -60,16 +67,25 @@
<div class="progress-wrapper"> <div class="progress-wrapper">
<div class="progress-wrapper__label">当月业绩</div> <div class="progress-wrapper__label">当月业绩</div>
<div <div
:class=" :class="[
awards.aMonthPv != 0 && awards.bMonthPv != 0 'progress-bar-container',
? 'schedule1' awards.aMonthPv != 0 || awards.bMonthPv != 0
: 'schedule' ? 'has-value'
" : 'no-value',
]"
> >
<div <div
class="current-schedule" class="left-bar"
:style="{ :style="{
width: yesPercent(awards.aMonthPv, awards.bMonthPv), width: calculatePercent(awards.aMonthPv, awards.bMonthPv)
.left,
}"
></div>
<div
class="right-bar"
:style="{
width: calculatePercent(awards.aMonthPv, awards.bMonthPv)
.right,
}" }"
></div> ></div>
<div class="cha"> <div class="cha">
@ -80,16 +96,23 @@
<div class="progress-wrapper"> <div class="progress-wrapper">
<div class="progress-wrapper__label">历史业绩</div> <div class="progress-wrapper__label">历史业绩</div>
<div <div
:class=" :class="[
awards.aSumPv != 0 && awards.bSumPv != 0 'progress-bar-container',
? 'schedule1' awards.aSumPv != 0 || awards.bSumPv != 0
: 'schedule' ? 'has-value'
" : 'no-value',
]"
> >
<div <div
class="current-schedule" class="left-bar"
:style="{ :style="{
width: yesPercent(awards.aSumPv, awards.bSumPv), width: calculatePercent(awards.aSumPv, awards.bSumPv).left,
}"
></div>
<div
class="right-bar"
:style="{
width: calculatePercent(awards.aSumPv, awards.bSumPv).right,
}" }"
></div> ></div>
<div class="cha"> <div class="cha">
@ -142,7 +165,7 @@ export default {
awards: {}, awards: {},
userMin: 0, userMin: 0,
userSec: 0, userSec: 0,
_interval: "", intervalTimer: "",
toLiveBtn: "", toLiveBtn: "",
isHandImg: true, isHandImg: true,
}; };
@ -153,7 +176,7 @@ export default {
}, },
beforeDestroy() { beforeDestroy() {
clearInterval(this._interval); clearInterval(this.intervalTimer);
}, },
methods: { methods: {
clickTap() { clickTap() {
@ -168,21 +191,22 @@ export default {
defaultSrc() { defaultSrc() {
this.isHandImg = false; this.isHandImg = false;
}, },
yesPercent(left, right) { calculatePercent(left, right) {
left = parseFloat(left); left = parseFloat(left);
right = parseFloat(right); right = parseFloat(right);
if (isNaN(left) || isNaN(right)) { const total = left + right;
return "-"; if (isNaN(left) || isNaN(right) || total === 0) {
return { left: "0%", right: "0%" };
} }
return right + left == 0 const leftPercent = Math.round((left / total) * 10000) / 100.0 + "%";
? "0%" const rightPercent = Math.round((right / total) * 10000) / 100.0 + "%";
: Math.round((left / (right + left)) * 10000) / 100.0 + "%"; return { left: leftPercent, right: rightPercent };
}, },
// //
countdown() { countdown() {
const that = this; const that = this;
that._interval = setInterval(() => { that.intervalTimer = setInterval(() => {
let time = new Date(this.userInfo.registerTime).getTime() / 1000; let time = new Date(this.userInfo.registerTime).getTime() / 1000;
let time1 = new Date().getTime() / 1000; let time1 = new Date().getTime() / 1000;
let time2 = parseInt(time1 - time); let time2 = parseInt(time1 - time);
@ -368,31 +392,56 @@ export default {
} }
} }
.user-cards-left { .user-cards-left {
.schedule { .progress-bar-container {
// width: 149px;
flex: 1; flex: 1;
height: 16px; height: 16px;
background: rgba(255, 255, 255, 0.3); border-radius: 10px;
border-radius: 10px 10px 10px 10px;
margin: 5px; margin: 5px;
position: relative; position: relative;
overflow: hidden; // Hide overflowing parts of bars
} }
.progress-bar-container.no-value {
background: rgba(
255,
255,
255,
0.3
); // Transparent background when no values
}
.progress-bar-container.has-value {
background: #fff; // White background when has values
}
.left-bar {
position: absolute;
left: 0;
top: 0;
height: 100%;
background: #fea43c; // Left bar color
border-radius: 10px 0 0 10px; // Rounded left corners
z-index: 1; // Below text
}
.right-bar {
position: absolute;
right: 0; // Align to the right
top: 0;
height: 100%;
background: #409eff; // Right bar color (changed to blue)
border-radius: 0 10px 10px 0; // Rounded right corners
z-index: 1; // Below text
}
// Remove old schedule styles if they exist
.schedule,
.schedule1 { .schedule1 {
// width: 149px; display: none; // Hide old elements if necessary, or remove them fully
flex: 1;
height: 16px;
background: #fff;
border-radius: 10px 10px 10px 10px;
margin: 5px;
position: relative;
} }
.current-schedule { .current-schedule {
position: absolute; display: none; // Hide old elements if necessary, or remove them fully
width: 30%;
background: #fea43c;
height: 16px;
border-radius: 10px 10px 10px 10px;
} }
.progress-wrapper { .progress-wrapper {
display: flex; display: flex;
align-items: center; align-items: center;
@ -413,6 +462,8 @@ export default {
transform: translate(-50%, -50%); transform: translate(-50%, -50%);
font-size: 12px; font-size: 12px;
white-space: nowrap; white-space: nowrap;
color: #fff; // Ensure text is readable (changed to white)
z-index: 2; // Above the bars
} }
.state { .state {
font-size: 10px; font-size: 10px;

View File

@ -221,7 +221,7 @@ export default {
], ],
baseSelfServiceList: [ baseSelfServiceList: [
{ name: "修改地址", id: "1", ifshow: 0 }, { name: "修改地址", id: "1", ifshow: 0 },
{ name: "订单自提", id: "2", ifshow: 0 }, // { name: "", id: "2", ifshow: 0 },
{ name: "户籍变更", id: "3", ifshow: 0 }, { name: "户籍变更", id: "3", ifshow: 0 },
// { name: "", id: "4", ifshow: 0 }, // { name: "", id: "4", ifshow: 0 },
{ name: "自助撤单", id: "8", ifshow: 0 }, { name: "自助撤单", id: "8", ifshow: 0 },