From e9cc933e9ac910e8e2652bdc8a095decf74f52be Mon Sep 17 00:00:00 2001
From: huaxinzhu <15565133664@163.com>
Date: Fri, 29 Oct 2021 13:40:27 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=91=E4=BB=93=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/entry/newyuncang.vue | 33 ++------------------
src/views/system/asset/withdrawlog/index.vue | 13 ++------
src/views/system/order/index.vue | 6 ++--
src/views/system/retreat/edit.vue | 10 ++----
src/views/system/retreat/retreat/index.vue | 19 +++++++++--
5 files changed, 25 insertions(+), 56 deletions(-)
diff --git a/src/views/entry/newyuncang.vue b/src/views/entry/newyuncang.vue
index dfc3a09..1756ae2 100644
--- a/src/views/entry/newyuncang.vue
+++ b/src/views/entry/newyuncang.vue
@@ -387,9 +387,9 @@
import {indexInfo, newsList, companyCounsel, webSite, getdomain, getallCloudList} from '@/api/webSite'
/** HACK
* 解决 swiper è½®æ’图ä¸è‡ªåŠ¨è½®æ’问题
- * */
+ * 从6.x.x版本é™çº§åˆ°5.4.5稳定版本åŽï¼Œæ²¡æœ‰æ¤é—®é¢˜äº†
+ */
// import Swiper2, {Autoplay} from 'swiper';
- //
// Swiper2.use([Autoplay]);
/** 仅对官网进行 所有适é…
@@ -397,9 +397,7 @@
* 对 html æ ¹ç›®å½• çš„font-size 进行设置
* */
//是å¦æ˜¯ç§»åŠ¨ç«¯
- ;
-
- (function () {
+ ;(function () {
// 获å–å±å¹•åŒºåŸŸçš„宽度
let w = document.documentElement.clientWidth
if (w < 961) {
@@ -498,21 +496,6 @@
el: '.swiper-pagination',
clickable: true,
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: {
delay: 4000,
@@ -529,10 +512,6 @@
},
swiperBrandOptions: {
loop: false, // 循环模å¼é€‰é¡¹
- // autoplay: {
- // delay: 4000,
- // disableOnInteraction: false
- // },
autoplay: false,
// 设定åˆå§‹åŒ–æ—¶slide的索引
initialSlide: 0,
@@ -542,7 +521,6 @@
slidesPerView: 1,
observer: true,
observeParents: true,
- //activeLoopIndex: 0,
on: {
slideChange: function() {
_this.isLight = this.activeIndex;
@@ -892,7 +870,6 @@
}
}
-
/* 公用 */
header, section, footer, ul, li, p, dl, dt, dd {
margin: 0;
@@ -939,10 +916,6 @@
align-items: center;
}
- .nav {
-
- }
-
.register-login-btn {
font-size :16px;
}
diff --git a/src/views/system/asset/withdrawlog/index.vue b/src/views/system/asset/withdrawlog/index.vue
index c36cca5..10f7dd4 100644
--- a/src/views/system/asset/withdrawlog/index.vue
+++ b/src/views/system/asset/withdrawlog/index.vue
@@ -24,8 +24,8 @@
</el-form-item>
<el-form-item>
- <el-button type="primary" icon="el-icon-search" @click="getList">æœç´¢</el-button>
- <el-button icon="el-icon-refresh" @click="resetQuery">é‡ç½®</el-button>
+ <el-button size="mini" type="primary" icon="el-icon-search" @click="getList">æœç´¢</el-button>
+ <el-button size="mini" icon="el-icon-refresh" @click="resetQuery">é‡ç½®</el-button>
</el-form-item>
</el-form>
</div>
@@ -57,15 +57,6 @@
<el-button type="text" @click="viewDetails(scope.row)">详情</el-button>
</template>
</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>
<!-- 分页 -->
<div class="footer_pagination">
diff --git a/src/views/system/order/index.vue b/src/views/system/order/index.vue
index 350c22b..0296a0c 100644
--- a/src/views/system/order/index.vue
+++ b/src/views/system/order/index.vue
@@ -734,7 +734,7 @@
// this.excelList = item[0].sheet
item[0].sheet.map((item, index) => {
this.excelList.push({
- goods_order_sn: item['订å•å·'],
+ goods_order_sn: item['商å“订å•å·'],
express_name: item['快递公å¸'],
express_sn: item['快递å•å·']
})
@@ -784,9 +784,7 @@
},
/** æäº¤å¯¼å…¥æ•°æ® */
subDelivery() {
- this.failDeliveryList = [
- {"goods_order_sn":1},
- ];
+ this.failDeliveryList = [];
if (this.excelList.length === 0) {
this.$message({type: 'warning', message: 'è¯·å…ˆä¸Šä¼ å¡«å†™å¥½çš„è¡¨æ ¼æ•°æ®'});
diff --git a/src/views/system/retreat/edit.vue b/src/views/system/retreat/edit.vue
index d10431d..67e6a78 100644
--- a/src/views/system/retreat/edit.vue
+++ b/src/views/system/retreat/edit.vue
@@ -26,7 +26,7 @@
<span>å”®åŽçŠ¶æ€ï¼š</span>
<span>{{ refundStatusText }}</span>
<span>退款金é¢ï¼š</span>
- <span>{{ asOrderDetail.apply_price / 100 }}</span>
+ <span>{{ asOrderDetail.apply_price }}</span>
</p>
</el-card>
@@ -591,7 +591,7 @@
}else {
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)
}
});
@@ -746,15 +746,9 @@
this.getDetail();
});
} // type 4 end
-
- //
-
},
- /** */
-
/** å–消 å”®åŽå¯¹è¯æ¡† */
cancelAfterSale(type) {
- //console.log("æ‹’ç»ç±»åž‹",type);
this.isASTypeDialog = false;
},
/** å”®åŽ é€€è´§é€€æ¬¾ åœ°å€ */
diff --git a/src/views/system/retreat/retreat/index.vue b/src/views/system/retreat/retreat/index.vue
index 98113bd..17a5674 100644
--- a/src/views/system/retreat/retreat/index.vue
+++ b/src/views/system/retreat/retreat/index.vue
@@ -102,7 +102,7 @@
</div>
<!-- 列表 -->
<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 style="float:left;">
<span>总订å•å·ï¼š</span>
@@ -526,8 +526,21 @@
}
/* 列表table æ ·å¼ */
- .card1 {
- margin-bottom: 20px;
+ .order-card {
+ 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 {
--
2.18.1