|
|
@@ -318,8 +318,9 @@
|
|
|
},
|
|
|
computed: mapGetters(['isLogin']),
|
|
|
onLoad(options) {
|
|
|
- this.state = options.type ? options.type : 'await';
|
|
|
- this.searchListData.status = options.type ? options.type : 'await';
|
|
|
+ //await
|
|
|
+ this.state = options.type ? options.type : 'all';
|
|
|
+ this.searchListData.status = options.type ? options.type : 'all';
|
|
|
this.searchListData.type = options.orderType ? options.orderType : -1;
|
|
|
},
|
|
|
// created() {
|
|
|
@@ -589,183 +590,183 @@
|
|
|
@import '../style/admin_order.scss';
|
|
|
</style>
|
|
|
<style scoped lang="scss">
|
|
|
- .map {
|
|
|
- text-align: center;
|
|
|
- padding-left: 36rpx;
|
|
|
- position: relative;
|
|
|
- @include main_color(theme);
|
|
|
+ // .map {
|
|
|
+ // text-align: center;
|
|
|
+ // padding-left: 36rpx;
|
|
|
+ // position: relative;
|
|
|
+ // @include main_color(theme);
|
|
|
|
|
|
- &::before {
|
|
|
- content: '';
|
|
|
- display: inline-block;
|
|
|
- width: 2rpx;
|
|
|
- height: 42rpx;
|
|
|
- background-color: #DDDDDD;
|
|
|
- position: absolute;
|
|
|
- left: 0;
|
|
|
- top: 18rpx;
|
|
|
- }
|
|
|
+ // &::before {
|
|
|
+ // content: '';
|
|
|
+ // display: inline-block;
|
|
|
+ // width: 2rpx;
|
|
|
+ // height: 42rpx;
|
|
|
+ // background-color: #DDDDDD;
|
|
|
+ // position: absolute;
|
|
|
+ // left: 0;
|
|
|
+ // top: 18rpx;
|
|
|
+ // }
|
|
|
|
|
|
- .iconfont {
|
|
|
- color: var(--view-theme);
|
|
|
- }
|
|
|
+ // .iconfont {
|
|
|
+ // color: var(--view-theme);
|
|
|
+ // }
|
|
|
|
|
|
- .map_text {
|
|
|
- color: var(--view-theme);
|
|
|
- }
|
|
|
- }
|
|
|
- .order-item {
|
|
|
- background-color: #fff;
|
|
|
- border-radius: 23rpx;
|
|
|
- padding: 19rpx 38rpx;
|
|
|
- }
|
|
|
+ // .map_text {
|
|
|
+ // color: var(--view-theme);
|
|
|
+ // }
|
|
|
+ // }
|
|
|
+ // .order-item {
|
|
|
+ // background-color: #fff;
|
|
|
+ // border-radius: 23rpx;
|
|
|
+ // padding: 19rpx 38rpx;
|
|
|
+ // }
|
|
|
|
|
|
- .order-top {
|
|
|
- display: flex;
|
|
|
- align-items: center;
|
|
|
- justify-content: space-between;
|
|
|
- padding: 17rpx;
|
|
|
- border-bottom: 2rpx dashed #D6D7DC;
|
|
|
- }
|
|
|
+ // .order-top {
|
|
|
+ // display: flex;
|
|
|
+ // align-items: center;
|
|
|
+ // justify-content: space-between;
|
|
|
+ // padding: 17rpx;
|
|
|
+ // border-bottom: 2rpx dashed #D6D7DC;
|
|
|
+ // }
|
|
|
|
|
|
- .bold-size {
|
|
|
- white-space: nowrap;
|
|
|
- overflow: hidden;
|
|
|
- text-overflow: ellipsis;
|
|
|
- font-weight: 500;
|
|
|
- font-size: 27rpx;
|
|
|
- color: #141414;
|
|
|
- z-index: 9999;
|
|
|
- }
|
|
|
+ // .bold-size {
|
|
|
+ // white-space: nowrap;
|
|
|
+ // overflow: hidden;
|
|
|
+ // text-overflow: ellipsis;
|
|
|
+ // font-weight: 500;
|
|
|
+ // font-size: 27rpx;
|
|
|
+ // color: #141414;
|
|
|
+ // z-index: 9999;
|
|
|
+ // }
|
|
|
|
|
|
- .onBold-size {
|
|
|
- font-weight: 400;
|
|
|
- font-size: 23rpx;
|
|
|
- color: #999999;
|
|
|
- }
|
|
|
+ // .onBold-size {
|
|
|
+ // font-weight: 400;
|
|
|
+ // font-size: 23rpx;
|
|
|
+ // color: #999999;
|
|
|
+ // }
|
|
|
|
|
|
- .order-content {
|
|
|
- padding: 10rpx 0 15rpx 0;
|
|
|
+ // .order-content {
|
|
|
+ // padding: 10rpx 0 15rpx 0;
|
|
|
|
|
|
- .box-item {
|
|
|
- display: flex;
|
|
|
- align-items: center;
|
|
|
- justify-content: space-between;
|
|
|
- margin-bottom: 10rpx;
|
|
|
- }
|
|
|
+ // .box-item {
|
|
|
+ // display: flex;
|
|
|
+ // align-items: center;
|
|
|
+ // justify-content: space-between;
|
|
|
+ // margin-bottom: 10rpx;
|
|
|
+ // }
|
|
|
|
|
|
- .order-info {
|
|
|
- width: 100%;
|
|
|
- background: #F8F9FB;
|
|
|
- padding: 19rpx 38rpx 45rpx 19rpx;
|
|
|
+ // .order-info {
|
|
|
+ // width: 100%;
|
|
|
+ // background: #F8F9FB;
|
|
|
+ // padding: 19rpx 38rpx 45rpx 19rpx;
|
|
|
|
|
|
- .store-name {
|
|
|
- font-weight: 600;
|
|
|
- font-size: 27rpx;
|
|
|
- color: #141414;
|
|
|
- }
|
|
|
+ // .store-name {
|
|
|
+ // font-weight: 600;
|
|
|
+ // font-size: 27rpx;
|
|
|
+ // color: #141414;
|
|
|
+ // }
|
|
|
|
|
|
- .scroll-container {
|
|
|
- display: flex;
|
|
|
- flex-wrap: nowrap;
|
|
|
- margin: 20rpx 0;
|
|
|
- overflow-x: auto;
|
|
|
- /* 允许水平滚动 */
|
|
|
- white-space: nowrap;
|
|
|
- /* 防止项目换行 */
|
|
|
- -webkit-overflow-scrolling: touch;
|
|
|
- /* 在iOS上平滑滚动 */
|
|
|
+ // .scroll-container {
|
|
|
+ // display: flex;
|
|
|
+ // flex-wrap: nowrap;
|
|
|
+ // margin: 20rpx 0;
|
|
|
+ // overflow-x: auto;
|
|
|
+ // /* 允许水平滚动 */
|
|
|
+ // white-space: nowrap;
|
|
|
+ // /* 防止项目换行 */
|
|
|
+ // -webkit-overflow-scrolling: touch;
|
|
|
+ // /* 在iOS上平滑滚动 */
|
|
|
|
|
|
- .item {
|
|
|
- display: flex;
|
|
|
- flex-direction: column;
|
|
|
- align-items: center;
|
|
|
- justify-content: center;
|
|
|
- margin-right: 19rpx;
|
|
|
+ // .item {
|
|
|
+ // display: flex;
|
|
|
+ // flex-direction: column;
|
|
|
+ // align-items: center;
|
|
|
+ // justify-content: center;
|
|
|
+ // margin-right: 19rpx;
|
|
|
|
|
|
- image {
|
|
|
- width: 115rpx;
|
|
|
- height: 115rpx;
|
|
|
- }
|
|
|
+ // image {
|
|
|
+ // width: 115rpx;
|
|
|
+ // height: 115rpx;
|
|
|
+ // }
|
|
|
|
|
|
- text {
|
|
|
- font-weight: 400;
|
|
|
- font-size: 21rpx;
|
|
|
- color: #141414;
|
|
|
- margin-top: 9rpx;
|
|
|
- }
|
|
|
- }
|
|
|
- }
|
|
|
+ // text {
|
|
|
+ // font-weight: 400;
|
|
|
+ // font-size: 21rpx;
|
|
|
+ // color: #141414;
|
|
|
+ // margin-top: 9rpx;
|
|
|
+ // }
|
|
|
+ // }
|
|
|
+ // }
|
|
|
|
|
|
- .container2 {
|
|
|
- display: flex;
|
|
|
- justify-content: space-between;
|
|
|
- align-items: center;
|
|
|
- font-weight: 500;
|
|
|
- font-size: 21rpx;
|
|
|
- color: #141414;
|
|
|
+ // .container2 {
|
|
|
+ // display: flex;
|
|
|
+ // justify-content: space-between;
|
|
|
+ // align-items: center;
|
|
|
+ // font-weight: 500;
|
|
|
+ // font-size: 21rpx;
|
|
|
+ // color: #141414;
|
|
|
|
|
|
- view {
|
|
|
- display: flex;
|
|
|
- align-items: center;
|
|
|
- }
|
|
|
+ // view {
|
|
|
+ // display: flex;
|
|
|
+ // align-items: center;
|
|
|
+ // }
|
|
|
|
|
|
- .image2 {
|
|
|
- width: 42rpx;
|
|
|
- height: 42rpx;
|
|
|
- }
|
|
|
- }
|
|
|
- }
|
|
|
- }
|
|
|
+ // .image2 {
|
|
|
+ // width: 42rpx;
|
|
|
+ // height: 42rpx;
|
|
|
+ // }
|
|
|
+ // }
|
|
|
+ // }
|
|
|
+ // }
|
|
|
|
|
|
- .order-dis {
|
|
|
- font-weight: 400;
|
|
|
- font-size: 23rpx;
|
|
|
- color: #141414;
|
|
|
- }
|
|
|
+ // .order-dis {
|
|
|
+ // font-weight: 400;
|
|
|
+ // font-size: 23rpx;
|
|
|
+ // color: #141414;
|
|
|
+ // }
|
|
|
|
|
|
- .order-icon {
|
|
|
- display: inline-block;
|
|
|
- margin-left: 10rpx;
|
|
|
- margin-right: 20rpx;
|
|
|
- padding: 5rpx 10rpx;
|
|
|
- font-weight: 400;
|
|
|
- font-size: 23rpx;
|
|
|
- color: #FFFFFF;
|
|
|
- border-radius: 50%;
|
|
|
- background-color: $bg-color-primary;
|
|
|
- }
|
|
|
+ // .order-icon {
|
|
|
+ // display: inline-block;
|
|
|
+ // margin-left: 10rpx;
|
|
|
+ // margin-right: 20rpx;
|
|
|
+ // padding: 5rpx 10rpx;
|
|
|
+ // font-weight: 400;
|
|
|
+ // font-size: 23rpx;
|
|
|
+ // color: #FFFFFF;
|
|
|
+ // border-radius: 50%;
|
|
|
+ // background-color: $bg-color-primary;
|
|
|
+ // }
|
|
|
|
|
|
- .order-bottom {
|
|
|
- border-top: 2rpx dashed #D6D7DC;
|
|
|
+ // .order-bottom {
|
|
|
+ // border-top: 2rpx dashed #D6D7DC;
|
|
|
|
|
|
- .bottom-but {
|
|
|
- padding: 39rpx 67rpx;
|
|
|
+ // .bottom-but {
|
|
|
+ // padding: 39rpx 67rpx;
|
|
|
|
|
|
- .sub {
|
|
|
- width: 100%;
|
|
|
- background-color: $bg-color-primary;
|
|
|
- font-weight: 500;
|
|
|
- font-size: 31rpx;
|
|
|
- color: #FFFFFF;
|
|
|
- padding: 17rpx 0;
|
|
|
- }
|
|
|
- }
|
|
|
- }
|
|
|
+ // .sub {
|
|
|
+ // width: 100%;
|
|
|
+ // background-color: $bg-color-primary;
|
|
|
+ // font-weight: 500;
|
|
|
+ // font-size: 31rpx;
|
|
|
+ // color: #FFFFFF;
|
|
|
+ // padding: 17rpx 0;
|
|
|
+ // }
|
|
|
+ // }
|
|
|
+ // }
|
|
|
|
|
|
- .icon-info {
|
|
|
- width: 8rpx;
|
|
|
- height: 31rpx;
|
|
|
- background: $bg-color-primary;
|
|
|
- margin-right: 15rpx;
|
|
|
- }
|
|
|
+ // .icon-info {
|
|
|
+ // width: 8rpx;
|
|
|
+ // height: 31rpx;
|
|
|
+ // background: $bg-color-primary;
|
|
|
+ // margin-right: 15rpx;
|
|
|
+ // }
|
|
|
|
|
|
- .line {
|
|
|
- z-index: 1;
|
|
|
- position: absolute;
|
|
|
- left: 28rpx;
|
|
|
- width: 1rpx;
|
|
|
- height: 100%;
|
|
|
- border-left: 1rpx dashed $bg-color-primary;
|
|
|
- }
|
|
|
+ // .line {
|
|
|
+ // z-index: 1;
|
|
|
+ // position: absolute;
|
|
|
+ // left: 28rpx;
|
|
|
+ // width: 1rpx;
|
|
|
+ // height: 100%;
|
|
|
+ // border-left: 1rpx dashed $bg-color-primary;
|
|
|
+ // }
|
|
|
</style>
|
