Compare commits

..

No commits in common. "4c89454c3f37aad0dac5f91f9f4dff587de551fc" and "e39f94466089cf62ff3f8c12eb2422d19ff6a124" have entirely different histories.

10 changed files with 25 additions and 66 deletions

View File

@ -48,11 +48,7 @@
</el-form>
</div>
<div class="search-bar-right">
<el-button
class="el-button-gry"
type="primary"
icon="Search"
@click="onSubmit"
<el-button type="primary" icon="Search" @click="onSubmit"
>查询</el-button
>
<el-button

View File

@ -48,11 +48,7 @@
</el-form>
</div>
<div class="search-bar-right">
<el-button
class="el-button-gry"
type="primary"
icon="Search"
@click="onSubmit"
<el-button type="primary" icon="Search" @click="onSubmit"
>查询</el-button
>
<el-button

View File

@ -48,11 +48,7 @@
</el-form>
</div>
<div class="search-bar-right">
<el-button
class="el-button-gry"
type="primary"
icon="Search"
@click="onSubmit"
<el-button type="primary" icon="Search" @click="onSubmit"
>查询</el-button
>
<el-button
@ -556,7 +552,7 @@ onBeforeUnmount(() => {
line-height: 25px;
border-radius: 5px;
font-size: 15px;
color: #25bf82;
color: #409eff;
cursor: pointer;
}
.send-button {

View File

@ -32,9 +32,7 @@
<template #footer>
<span class="dialog-footer">
<el-button @click="dialogVisible = false">取消</el-button>
<el-button class="el-button-gry" type="primary" @click="submit()">
确定
</el-button>
<el-button type="primary" @click="submit()"> 确定 </el-button>
</span>
</template>
</el-dialog>
@ -147,7 +145,7 @@
>
订单详情<text
style="
color: #25bf82;
color: #409eff;
font-size: 20px;
font-weight: bold;
margin-left: 20px;
@ -296,7 +294,7 @@
>
<div
v-if="detailsData.orderStatus == '10'"
class="button-bottom el-button-gry"
class="button-bottom"
@click="agree('同意')"
>
同意退款
@ -542,7 +540,7 @@ const send = async () => {};
line-height: 40px;
font-size: 15px;
font-weight: bold;
// background-color: #409eff;
background-color: #409eff;
}
.button-bottoms {
text-align: center;

View File

@ -48,11 +48,7 @@
</el-form>
</div>
<div class="search-bar-right">
<el-button
class="el-button-gry"
type="primary"
icon="Search"
@click="onSubmit"
<el-button type="primary" icon="Search" @click="onSubmit"
>查询</el-button
>
<el-button
@ -549,7 +545,7 @@ onBeforeUnmount(() => {
line-height: 25px;
border-radius: 5px;
font-size: 15px;
color: #25bf82;
color: #409eff;
cursor: pointer;
}
.send-button {

View File

@ -48,7 +48,7 @@
</el-form>
</div>
<div class="search-bar-right">
<el-button class="el-button-gry" type="primary" icon="Search" @click="onSubmit"
<el-button type="primary" icon="Search" @click="onSubmit"
>查询</el-button
>
<el-button
@ -545,7 +545,7 @@ onBeforeUnmount(() => {
line-height: 25px;
border-radius: 5px;
font-size: 15px;
color: #25bf82;
color: #409eff;
cursor: pointer;
}
.send-button {

View File

@ -48,11 +48,7 @@
</el-form>
</div>
<div class="search-bar-right">
<el-button
class="el-button-gry"
type="primary"
icon="Search"
@click="onSubmit"
<el-button type="primary" icon="Search" @click="onSubmit"
>查询</el-button
>
<el-button
@ -559,7 +555,7 @@ onBeforeUnmount(() => {
border-radius: 5px;
font-size: 15px;
color: #fff;
background-color: #25bf82;
background-color: #409eff;
cursor: pointer;
}
@ -586,7 +582,7 @@ onBeforeUnmount(() => {
line-height: 25px;
border-radius: 5px;
font-size: 15px;
color: #25bf82;
color: #409eff;
cursor: pointer;
}

View File

@ -64,9 +64,7 @@
<template #footer>
<span class="dialog-footer">
<el-button @click="dialogVisible = false">取消</el-button>
<el-button class="el-button-gry" type="primary" @click="submit()">
确定
</el-button>
<el-button type="primary" @click="submit()"> 确定 </el-button>
</span>
</template>
</el-dialog>
@ -118,11 +116,7 @@
</el-form>
</div>
<div class="search-bar-right">
<el-button
class="el-button-gry"
type="primary"
icon="Search"
@click="onSubmit"
<el-button type="primary" icon="Search" @click="onSubmit"
>查询</el-button
>
<el-button
@ -679,7 +673,7 @@ onBeforeUnmount(() => {
line-height: 25px;
border-radius: 5px;
font-size: 15px;
color: #25bf82;
color: #409eff;
cursor: pointer;
}
.send-button {
@ -691,7 +685,7 @@ onBeforeUnmount(() => {
border-radius: 5px;
font-size: 15px;
color: #fff;
background-color: #25bf82;
background-color: #409eff;
cursor: pointer;
}
.tree-goods {

View File

@ -60,9 +60,7 @@
"
>
<div>
<el-button class="el-button-gry" @click="send()" type="primary"
>发货</el-button
>
<el-button @click="send()" type="primary">发货</el-button>
</div>
</div>
<div v-else class="sendGoods">
@ -113,10 +111,7 @@
</div>
<div style="display: flex; align-items: center">
<div v-if="index == 0" style="margin-left: 10px">
<el-button
class="el-button-gry"
type="primary"
@click="addInput()"
<el-button type="primary" @click="addInput()"
>新增包裹</el-button
>
</div>
@ -130,9 +125,7 @@
</div>
<div>共计{{ inputData.length }}个包裹</div>
<div>
<el-button class="el-button-gry" @click="send()" type="primary"
>发货</el-button
>
<el-button @click="send()" type="primary">发货</el-button>
</div>
</div>
</div>

View File

@ -64,9 +64,7 @@
<template #footer>
<span class="dialog-footer">
<el-button @click="dialogVisible = false">取消</el-button>
<el-button class="el-button-gry" type="primary" @click="submit()">
确定
</el-button>
<el-button type="primary" @click="submit()"> 确定 </el-button>
</span>
</template>
</el-dialog>
@ -118,11 +116,7 @@
</el-form>
</div>
<div class="search-bar-right">
<el-button
class="el-button-gry"
type="primary"
icon="Search"
@click="onSubmit"
<el-button type="primary" icon="Search" @click="onSubmit"
>查询</el-button
>
<el-button
@ -656,7 +650,7 @@ onBeforeUnmount(() => {
line-height: 25px;
border-radius: 5px;
font-size: 15px;
color: #25bf82;
color: #409eff;
cursor: pointer;
}
.send-button {