提交 e9cc933e authored 作者: huaxinzhu's avatar huaxinzhu

云仓优化

上级 ecab2c72
...@@ -387,9 +387,9 @@ ...@@ -387,9 +387,9 @@
import {indexInfo, newsList, companyCounsel, webSite, getdomain, getallCloudList} from '@/api/webSite' import {indexInfo, newsList, companyCounsel, webSite, getdomain, getallCloudList} from '@/api/webSite'
/** HACK /** HACK
* 解决 swiper 轮播图不自动轮播问题 * 解决 swiper 轮播图不自动轮播问题
* */ * 从6.x.x版本降级到5.4.5稳定版本后,没有此问题了
*/
// import Swiper2, {Autoplay} from 'swiper'; // import Swiper2, {Autoplay} from 'swiper';
//
// Swiper2.use([Autoplay]); // Swiper2.use([Autoplay]);
/** 仅对官网进行 所有适配 /** 仅对官网进行 所有适配
...@@ -397,9 +397,7 @@ ...@@ -397,9 +397,7 @@
* 对 html 根目录 的font-size 进行设置 * 对 html 根目录 的font-size 进行设置
* */ * */
//是否是移动端 //是否是移动端
; ;(function () {
(function () {
// 获取屏幕区域的宽度 // 获取屏幕区域的宽度
let w = document.documentElement.clientWidth let w = document.documentElement.clientWidth
if (w < 961) { if (w < 961) {
...@@ -498,21 +496,6 @@ ...@@ -498,21 +496,6 @@
el: '.swiper-pagination', el: '.swiper-pagination',
clickable: true, clickable: true,
type: 'bullets' type: 'bullets'
// type: 'custom',
// renderCustom: function(swiper, current,total) {
// let customPaginationHtml = "";
// for (let i = 0; i < total; i++) {
// //判断哪个分页器此刻应该被激活
// if (i == current - 1) {
// customPaginationHtml +=
// '<span class="swiper-pagination-customs swiper-pagination-customs-active"></span>';
// } else {
// customPaginationHtml +=
// '<span class="swiper-pagination-customs"></span>';
// }
// }
// return '<span class="swiperPag">'+customPaginationHtml+'</span>';
// }
}, },
autoplay: { autoplay: {
delay: 4000, delay: 4000,
...@@ -529,10 +512,6 @@ ...@@ -529,10 +512,6 @@
}, },
swiperBrandOptions: { swiperBrandOptions: {
loop: false, // 循环模式选项 loop: false, // 循环模式选项
// autoplay: {
// delay: 4000,
// disableOnInteraction: false
// },
autoplay: false, autoplay: false,
// 设定初始化时slide的索引 // 设定初始化时slide的索引
initialSlide: 0, initialSlide: 0,
...@@ -542,7 +521,6 @@ ...@@ -542,7 +521,6 @@
slidesPerView: 1, slidesPerView: 1,
observer: true, observer: true,
observeParents: true, observeParents: true,
//activeLoopIndex: 0,
on: { on: {
slideChange: function() { slideChange: function() {
_this.isLight = this.activeIndex; _this.isLight = this.activeIndex;
...@@ -892,7 +870,6 @@ ...@@ -892,7 +870,6 @@
} }
} }
/* 公用 */ /* 公用 */
header, section, footer, ul, li, p, dl, dt, dd { header, section, footer, ul, li, p, dl, dt, dd {
margin: 0; margin: 0;
...@@ -939,10 +916,6 @@ ...@@ -939,10 +916,6 @@
align-items: center; align-items: center;
} }
.nav {
}
.register-login-btn { .register-login-btn {
font-size :16px; font-size :16px;
} }
......
...@@ -24,8 +24,8 @@ ...@@ -24,8 +24,8 @@
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" icon="el-icon-search" @click="getList">搜索</el-button> <el-button size="mini" type="primary" icon="el-icon-search" @click="getList">搜索</el-button>
<el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button> <el-button size="mini" icon="el-icon-refresh" @click="resetQuery">重置</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
</div> </div>
...@@ -57,15 +57,6 @@ ...@@ -57,15 +57,6 @@
<el-button type="text" @click="viewDetails(scope.row)">详情</el-button> <el-button type="text" @click="viewDetails(scope.row)">详情</el-button>
</template> </template>
</el-table-column> </el-table-column>
<!-- <el-table-column label="提现账号" align="center" prop="BankName">-->
<!-- <template slot-scope="scope">-->
<!-- <div>-->
<!-- {{ scope.row.BankAccountNo }}-->
<!-- </div>-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column label="提现审核说明" align="center" prop="Des"/>-->
</el-table> </el-table>
<!-- 分页 --> <!-- 分页 -->
<div class="footer_pagination"> <div class="footer_pagination">
......
...@@ -734,7 +734,7 @@ ...@@ -734,7 +734,7 @@
// this.excelList = item[0].sheet // this.excelList = item[0].sheet
item[0].sheet.map((item, index) => { item[0].sheet.map((item, index) => {
this.excelList.push({ this.excelList.push({
goods_order_sn: item['订单号'], goods_order_sn: item['商品订单号'],
express_name: item['快递公司'], express_name: item['快递公司'],
express_sn: item['快递单号'] express_sn: item['快递单号']
}) })
...@@ -784,9 +784,7 @@ ...@@ -784,9 +784,7 @@
}, },
/** 提交导入数据 */ /** 提交导入数据 */
subDelivery() { subDelivery() {
this.failDeliveryList = [ this.failDeliveryList = [];
{"goods_order_sn":1},
];
if (this.excelList.length === 0) { if (this.excelList.length === 0) {
this.$message({type: 'warning', message: '请先上传填写好的表格数据'}); this.$message({type: 'warning', message: '请先上传填写好的表格数据'});
......
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
<span>售后状态:</span> <span>售后状态:</span>
<span>{{ refundStatusText }}</span> <span>{{ refundStatusText }}</span>
<span>退款金额:</span> <span>退款金额:</span>
<span>{{ asOrderDetail.apply_price / 100 }}</span> <span>{{ asOrderDetail.apply_price }}</span>
</p> </p>
</el-card> </el-card>
...@@ -591,7 +591,7 @@ ...@@ -591,7 +591,7 @@
}else { }else {
this.asApplyList = []; this.asApplyList = [];
} }
console.log(111,this.asOrderType,this.goodsOrderDetail.goods_status,this.asOrderDetail.status) //console.log(111,this.asOrderType,this.goodsOrderDetail.goods_status,this.asOrderDetail.status)
this.refundTypeStatus(this.asOrderType,this.goodsOrderDetail.goods_status,this.asOrderDetail.status) this.refundTypeStatus(this.asOrderType,this.goodsOrderDetail.goods_status,this.asOrderDetail.status)
} }
}); });
...@@ -746,15 +746,9 @@ ...@@ -746,15 +746,9 @@
this.getDetail(); this.getDetail();
}); });
} // type 4 end } // type 4 end
//
}, },
/** */
/** 取消 售后对话框 */ /** 取消 售后对话框 */
cancelAfterSale(type) { cancelAfterSale(type) {
//console.log("拒绝类型",type);
this.isASTypeDialog = false; this.isASTypeDialog = false;
}, },
/** 售后 退货退款 地址 */ /** 售后 退货退款 地址 */
......
...@@ -102,7 +102,7 @@ ...@@ -102,7 +102,7 @@
</div> </div>
<!-- 列表 --> <!-- 列表 -->
<div class="table-all-body-con"> <div class="table-all-body-con">
<el-card v-for="(item, index) in afterSaleList" :key="index" class="card1"> <el-card v-for="(item, index) in afterSaleList" :key="index" class="order-card">
<div slot="header" class="el-card-header-spe"> <div slot="header" class="el-card-header-spe">
<div style="float:left;"> <div style="float:left;">
<span>总订单号:</span> <span>总订单号:</span>
...@@ -526,8 +526,21 @@ ...@@ -526,8 +526,21 @@
} }
/* 列表table 样式 */ /* 列表table 样式 */
.card1 { .order-card {
margin-bottom: 20px; margin: 10px 0 12px;
}
.order-card /deep/ .el-card__header {
padding: 0;
min-height: fit-content;
}
.el-card-header-spe {
overflow: hidden; /* 此为父元素,子元素都浮动了,所以,这样处理,撑开自己的高度 */
font-size: 14px;
padding: 10px 12px;
background-color: #eee;
/*background-color: #909399;*/
} }
.table-header-spe { .table-header-spe {
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论