jiazhizhong/crmeb_java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

12.31开源admin代码更新

Browse Source
This commit is contained in:
hejinfu1026
2021-12-31 15:58:40 +08:00
parent ad99c24532
commit f5a9772176
545 changed files with 9743 additions and 139371 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
admin/src/views/mobile/components/PriceChange.vue
View File

@@ -92,7 +92,7 @@
<script>
import {required, num} from "@/utils/validate";
import {validatorDefaultCatch} from "@/libs/dialog";
import { orderMarkApi, editPriceApi, orderRefundApi } from '@/api/order';
import { orderMarkApi, updatePriceApi, orderRefundApi } from '@/api/order';
export default {
name: "PriceChange",
components: {},
@@ -165,9 +165,9 @@
} catch (e) {
return validatorDefaultCatch(e);
}
data.price = price;
data.payPrice = price;
data.orderNo = opt.orderId;
editPriceApi(data).then(() => {
updatePriceApi(data).then(() => {
// that.change = false;
this.$emit("closechange", false);
that.$dialog.success("改价成功");

1
admin/src/views/mobile/orderStatistics/Statistics.vue
View File

@@ -436,6 +436,7 @@ export default {
.public-wrapper .conter{padding:0 0.3rem;}
.public-wrapper .conter .item{border-bottom:1px solid #f7f7f7;height:0.7rem;font-size:0.24rem;}
.public-wrapper .conter .item .turnover{color:#d84242;}
.statistical-page {margin-top:-50px;}
.statistical-page .navs{width:100%;height:0.96rem;background-color:#fff;overflow:hidden;line-height:0.96rem;position:fixed;top:0;left:0;z-index:9;}
.statistical-page .navs .list{overflow-y:hidden;overflow-x:auto;white-space: nowrap;-webkit-overflow-scrolling: touch;
width: 100%;}

1
admin/src/views/mobile/orderStatistics/index.vue
View File

@@ -124,6 +124,7 @@
<style scoped lang="scss">
.order-index{
background: #f5f5f5;
margin-top: -50px;
}
.order-index .header{background:url("../../../assets/imgs/orderIndex.png") no-repeat;background-size:100% 100%;width:100%;height:3.02rem;padding:0.45rem 0.3rem 0 0.3rem;}
.order-index .header .item{flex:1;-webkit-flex:1;-o-flex:1;-ms-flex:1;text-align:center;font-size:0.24rem;color:#fff;}

2
admin/src/views/mobile/orderStatistics/orderDelivery.vue
View File

@@ -4,7 +4,7 @@
<div class="order-num acea-row row-between-wrapper">
<div class="num line1">订单号：{{ orderId }}</div>
<div class="name line1">
<span class="iconfont icon-yonghu2"></span>{{ delivery.nickname }}
<span class="iconfont iconios-contact"></span>{{ delivery.nikeName }}
</div>
</div>
<div class="address">

25
admin/src/views/mobile/orderStatistics/orderDetail.vue
View File

@@ -13,7 +13,7 @@
class="remarks acea-row row-between-wrapper"
v-if="$route.params.goname != 'looks'"
>
<span class="iconfont icon-zhinengkefu-"></span>
<span class="iconfont iconios-flag"></span>
<input
type="button"
class="line1"
@@ -25,12 +25,11 @@
/>
</div>
<div class="orderingUser acea-row row-middle">
<span class="iconfont icon-yonghu2"></span>{{ orderInfo.realName }}
<span class="iconfont iconmd-contact"></span>{{ orderInfo.realName }}
</div>
<div class="address">
<div class="name">
{{ orderInfo.realName
}}<span class="phone">{{ orderInfo.userPhone }}</span>
{{ orderInfo.realName}}<span class="phone">{{ orderInfo.userPhone }}</span>
</div>
<div>{{ orderInfo.userAddress }}</div>
</div>
@@ -49,7 +48,7 @@
<div class="info line2">
{{ item.info.productName }}
</div>
<div class="attr">{{ item.info.sku }}</div>
<div class="attr overflow">{{ item.info.sku }}</div>
</div>
</div>
<div class="money">
@@ -61,17 +60,13 @@
</div>
<div class="public-total">
共{{ orderInfo.totalNum }}件商品，应支付
<span class="money">￥{{ orderInfo.payPrice }}</span> ( 邮费 ¥{{
orderInfo.payPostage
}}
)
<span class="money">￥{{ orderInfo.payPrice }}</span> ( 邮费 ¥{{orderInfo.payPostage }})
</div>
<div class="wrapper">
<div class="item acea-row row-between">
<div>订单编号：</div>
<div class="conter acea-row row-middle row-right">
{{ orderInfo.orderId
}}
{{ orderInfo.orderId }}
<span
class="copy copy-data"
:data-clipboard-text="orderInfo.orderId"
@@ -86,7 +81,7 @@
<div class="item acea-row row-between">
<div>支付状态：</div>
<div class="conter">
{{ orderInfo.paid == 1 ? "已支付" : "未支付" }}
{{ orderInfo.statusStr.value }}
</div>
</div>
<div class="item acea-row row-between">
@@ -369,13 +364,13 @@ export default {
.pos-order-goods .goods .picTxt .pictrue img{width:100%;height:100%;border-radius:0.06rem;}
.pos-order-goods .goods .picTxt .text{width:3.65rem;height:1.3rem;}
.pos-order-goods .goods .picTxt .text .info{font-size:0.28rem;color:#282828;}
.pos-order-goods .goods .picTxt .text .attr{font-size:0.2rem;color:#999;height: 0.8rem;
line-height: 0.8rem;}
.pos-order-goods .goods .picTxt .text .attr{font-size:0.2rem;color:#999;height: 0.8rem; line-height: 0.8rem;}
.overflow{overflow: hidden;text-overflow: ellipsis; white-space: nowrap;width: 5rem;}
.pos-order-goods .goods .money{width:1.64rem;text-align:right;font-size:0.28rem;}
.pos-order-goods .goods .money .x-money{color:#282828;}
.pos-order-goods .goods .money .num{color:#ff9600;margin:0.05rem 0;}
.pos-order-goods .goods .money .y-money{color:#999;text-decoration:line-through;}
.order-details .header{padding:0 0.3rem;height:1.5rem;}
.order-details .header{padding:0 0.3rem;height:1.5rem;margin-top: -50px;}
.order-details .header.on{background-color:#666!important;}
.order-details .header .pictrue{width:1.1rem;height:1.1rem;}
.order-details .header .pictrue img{width:100%;height:100%;}

13
admin/src/views/mobile/orderStatistics/orderList.vue
View File

@@ -85,11 +85,8 @@
</div>
</template>
<div class="public-total">
共{{ item.totalNum }}件商品，应支付
<span class="money">￥{{ item.payPrice }}</span> ( 邮费 ¥{{
item.totalPostage
}}
)
共{{ item.totalNum ? item.totalNum : 1 }}件商品，应支付
<span class="money">￥{{ item.payPrice }}</span> ( 邮费 ¥{{item.totalPostage ? item.totalPostage : 0}})
</div>
<div class="operation acea-row row-between-wrapper">
<div class="more">
@@ -102,7 +99,7 @@
<!-- </div>-->
</div>
<div class="acea-row row-middle">
<div class="bnt" @click="modify(item, 0)" v-if="where.status === 'unPaid'">
<div class="bnt" @click="modify(item, 0)" v-if="!item.isAlterPrice && item.paid == false">
一键改价
</div>
<div class="bnt" @click="modify(item, 1)">订单备注</div>
@@ -367,12 +364,12 @@
.pos-order-goods .goods .picTxt .text{width:3.65rem;height:1.3rem;}
.pos-order-goods .goods .picTxt .text .info{font-size:0.28rem;color:#282828;}
.pos-order-goods .goods .picTxt .text .attr{font-size:0.2rem;color:#999;height: 0.8rem;
line-height: 0.8rem;}
line-height: 0.8rem;width: 5rem;overflow: hidden;text-overflow: ellipsis; white-space: nowrap;}
.pos-order-goods .goods .money{width:1.64rem;text-align:right;font-size:0.28rem;height: 1.3rem;}
.pos-order-goods .goods .money .x-money{color:#282828;}
.pos-order-goods .goods .money .num{color:#ff9600;margin:0.05rem 0;}
.pos-order-goods .goods .money .y-money{color:#999;text-decoration:line-through;}
.pos-order-list{background: #f5f5f5;}
.pos-order-list{background: #f5f5f5;margin-top: -50px;}
.pos-order-list .nav{width:100%;height:0.96rem;background-color:#fff;font-size:0.3rem;color:#282828;position:fixed;top:0;left:0;z-index: 66;}
.pos-order-list .nav .item.on{color:#2291f8;}
.pos-order-list .list{margin-top:0.2rem;}