Skip to content

I
integral-mall
Commit 68dddc54 by damodmg
Options

调整样式

parent 6e2e11a4
Showing with 66 additions and 44 deletions
dist/index.html
<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><link rel="shortcut icon" href=./static/img/favicon.ico><title>GIC后台</title><link rel=stylesheet type=text/css href=static/css/iconfont.css><link rel=stylesheet type=text/css href=static/css/common.css><link href=/integral-mall/static/css/app.bdce448252ebc299b9adf868a076b6a0.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/integral-mall/static/js/manifest.003beacb9c9ae622c7f2.js></script><script type=text/javascript src=/integral-mall/static/js/vendor.dbbbfd2f879f6e7b00f5.js></script><script type=text/javascript src=/integral-mall/static/js/app.c0c7abbd1ba67e6847c7.js></script></body></html>
\ No newline at end of file
<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><link rel="shortcut icon" href=./static/img/favicon.ico><title>GIC后台</title><link rel=stylesheet type=text/css href=static/css/iconfont.css><link rel=stylesheet type=text/css href=static/css/common.css><link href=/integral-mall/static/css/app.b36dafaad247fc43f4ac4932020fec43.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/integral-mall/static/js/manifest.003beacb9c9ae622c7f2.js></script><script type=text/javascript src=/integral-mall/static/js/vendor.18cfc34dddb593b2154e.js></script><script type=text/javascript src=/integral-mall/static/js/app.7fa91de1ba0ae5652799.js></script></body></html>
\ No newline at end of file
dist/static/js/app.7fa91de1ba0ae5652799.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/app.c0c7abbd1ba67e6847c7.js deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/vendor.18cfc34dddb593b2154e.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/vendor.dbbbfd2f879f6e7b00f5.js deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/tinymce/skins/lightgray/content.inline.min.css 0 → 100644
.word-wrap{word-wrap:break-word;-ms-word-break:break-all;word-break:break-all;word-break:break-word;-ms-hyphens:auto;-moz-hyphens:auto;-webkit-hyphens:auto;hyphens:auto}.mce-content-body .mce-reset{margin:0;padding:0;border:0;outline:0;vertical-align:top;background:transparent;text-decoration:none;color:black;font-family:Arial;font-size:11px;text-shadow:none;float:none;position:static;width:auto;height:auto;white-space:nowrap;cursor:inherit;line-height:normal;font-weight:normal;text-align:left;-webkit-tap-highlight-color:transparent;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;box-sizing:content-box;direction:ltr;max-width:none}.mce-object{border:1px dotted #3A3A3A;background:#D5D5D5 url(img/object.gif) no-repeat center}.mce-preview-object{display:inline-block;position:relative;margin:0 2px 0 2px;line-height:0;border:1px solid gray}.mce-preview-object[data-mce-selected="2"] .mce-shim{display:none}.mce-preview-object .mce-shim{position:absolute;top:0;left:0;width:100%;height:100%;background:url(data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7)}figure.align-left{float:left}figure.align-right{float:right}figure.image.align-center{display:table;margin-left:auto;margin-right:auto}figure.image{display:inline-block;border:1px solid gray;margin:0 2px 0 1px;background:#f5f2f0}figure.image img{margin:8px 8px 0 8px}figure.image figcaption{margin:6px 8px 6px 8px;text-align:center}.mce-toc{border:1px solid gray}.mce-toc h2{margin:4px}.mce-toc li{list-style-type:none}.mce-pagebreak{cursor:default;display:block;border:0;width:100%;height:5px;border:1px dashed #666;margin-top:15px;page-break-before:always}@media print{.mce-pagebreak{border:0}}.mce-item-anchor{cursor:default;display:inline-block;-webkit-user-select:all;-webkit-user-modify:read-only;-moz-user-select:all;-moz-user-modify:read-only;user-select:all;user-modify:read-only;width:9px !important;height:9px !important;border:1px dotted #3A3A3A;background:#D5D5D5 url(img/anchor.gif) no-repeat center}.mce-nbsp,.mce-shy{background:#AAA}.mce-shy::after{content:'-'}.mce-match-marker{background:#AAA;color:#fff}.mce-match-marker-selected{background:#3399ff;color:#fff}.mce-spellchecker-word{border-bottom:2px solid rgba(208,2,27,0.5);cursor:default}.mce-spellchecker-grammar{border-bottom:2px solid #008000;cursor:default}.mce-item-table,.mce-item-table td,.mce-item-table th,.mce-item-table caption{border:1px dashed #BBB}td[data-mce-selected],th[data-mce-selected]{background-color:#2276d2 !important}.mce-edit-focus{outline:1px dotted #333}.mce-content-body *[contentEditable=false] *[contentEditable=true]:focus{outline:2px solid #2276d2}.mce-content-body *[contentEditable=false] *[contentEditable=true]:hover{outline:2px solid #2276d2}.mce-content-body *[contentEditable=false][data-mce-selected]{outline:2px solid #2276d2}.mce-content-body.mce-content-readonly *[contentEditable=true]:focus,.mce-content-body.mce-content-readonly *[contentEditable=true]:hover{outline:none}.mce-content-body *[data-mce-selected="inline-boundary"]{background:#bfe6ff}.mce-content-body .mce-item-anchor[data-mce-selected]{background:#D5D5D5 url(img/anchor.gif) no-repeat center}.mce-content-body hr{cursor:default}.mce-content-body table{-webkit-nbsp-mode:normal}.ephox-snooker-resizer-bar{background-color:#2276d2;opacity:0}.ephox-snooker-resizer-cols{cursor:col-resize}.ephox-snooker-resizer-rows{cursor:row-resize}.ephox-snooker-resizer-bar.ephox-snooker-resizer-bar-dragging{opacity:.2}.mce-content-body{line-height:1.3}
\ No newline at end of file
dist/static/tinymce/skins/lightgray/content.min.css 0 → 100644
body{background-color:#FFFFFF;color:#000000;font-family:Verdana,Arial,Helvetica,sans-serif;font-size:14px;line-height:1.3;scrollbar-3dlight-color:#F0F0EE;scrollbar-arrow-color:#676662;scrollbar-base-color:#F0F0EE;scrollbar-darkshadow-color:#DDDDDD;scrollbar-face-color:#E0E0DD;scrollbar-highlight-color:#F0F0EE;scrollbar-shadow-color:#F0F0EE;scrollbar-track-color:#F5F5F5}td,th{font-family:Verdana,Arial,Helvetica,sans-serif;font-size:14px}.word-wrap{word-wrap:break-word;-ms-word-break:break-all;word-break:break-all;word-break:break-word;-ms-hyphens:auto;-moz-hyphens:auto;-webkit-hyphens:auto;hyphens:auto}.mce-content-body .mce-reset{margin:0;padding:0;border:0;outline:0;vertical-align:top;background:transparent;text-decoration:none;color:black;font-family:Arial;font-size:11px;text-shadow:none;float:none;position:static;width:auto;height:auto;white-space:nowrap;cursor:inherit;line-height:normal;font-weight:normal;text-align:left;-webkit-tap-highlight-color:transparent;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;box-sizing:content-box;direction:ltr;max-width:none}.mce-object{border:1px dotted #3A3A3A;background:#D5D5D5 url(img/object.gif) no-repeat center}.mce-preview-object{display:inline-block;position:relative;margin:0 2px 0 2px;line-height:0;border:1px solid gray}.mce-preview-object[data-mce-selected="2"] .mce-shim{display:none}.mce-preview-object .mce-shim{position:absolute;top:0;left:0;width:100%;height:100%;background:url(data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7)}figure.align-left{float:left}figure.align-right{float:right}figure.image.align-center{display:table;margin-left:auto;margin-right:auto}figure.image{display:inline-block;border:1px solid gray;margin:0 2px 0 1px;background:#f5f2f0}figure.image img{margin:8px 8px 0 8px}figure.image figcaption{margin:6px 8px 6px 8px;text-align:center}.mce-toc{border:1px solid gray}.mce-toc h2{margin:4px}.mce-toc li{list-style-type:none}.mce-pagebreak{cursor:default;display:block;border:0;width:100%;height:5px;border:1px dashed #666;margin-top:15px;page-break-before:always}@media print{.mce-pagebreak{border:0}}.mce-item-anchor{cursor:default;display:inline-block;-webkit-user-select:all;-webkit-user-modify:read-only;-moz-user-select:all;-moz-user-modify:read-only;user-select:all;user-modify:read-only;width:9px !important;height:9px !important;border:1px dotted #3A3A3A;background:#D5D5D5 url(img/anchor.gif) no-repeat center}.mce-nbsp,.mce-shy{background:#AAA}.mce-shy::after{content:'-'}.mce-match-marker{background:#AAA;color:#fff}.mce-match-marker-selected{background:#3399ff;color:#fff}.mce-spellchecker-word{border-bottom:2px solid rgba(208,2,27,0.5);cursor:default}.mce-spellchecker-grammar{border-bottom:2px solid #008000;cursor:default}.mce-item-table,.mce-item-table td,.mce-item-table th,.mce-item-table caption{border:1px dashed #BBB}td[data-mce-selected],th[data-mce-selected]{background-color:#2276d2 !important}.mce-edit-focus{outline:1px dotted #333}.mce-content-body *[contentEditable=false] *[contentEditable=true]:focus{outline:2px solid #2276d2}.mce-content-body *[contentEditable=false] *[contentEditable=true]:hover{outline:2px solid #2276d2}.mce-content-body *[contentEditable=false][data-mce-selected]{outline:2px solid #2276d2}.mce-content-body.mce-content-readonly *[contentEditable=true]:focus,.mce-content-body.mce-content-readonly *[contentEditable=true]:hover{outline:none}.mce-content-body *[data-mce-selected="inline-boundary"]{background:#bfe6ff}.mce-content-body .mce-item-anchor[data-mce-selected]{background:#D5D5D5 url(img/anchor.gif) no-repeat center}.mce-content-body hr{cursor:default}.mce-content-body table{-webkit-nbsp-mode:normal}.ephox-snooker-resizer-bar{background-color:#2276d2;opacity:0}.ephox-snooker-resizer-cols{cursor:col-resize}.ephox-snooker-resizer-rows{cursor:row-resize}.ephox-snooker-resizer-bar.ephox-snooker-resizer-bar-dragging{opacity:.2}
\ No newline at end of file
dist/static/tinymce/skins/lightgray/content.mobile.min.css 0 → 100644
.tinymce-mobile-unfocused-selections .tinymce-mobile-unfocused-selection{position:absolute;display:inline-block;background-color:green;opacity:.5}body{-webkit-text-size-adjust:none}body img{max-width:96vw}body table img{max-width:95%}
\ No newline at end of file
src/assets/style/base/index.scss
......@@ -129,9 +129,9 @@
width: 44px;
height: 44px;
border-radius: 4px;
margin-right: 8px;
margin-right: 4px;
display: inline-block;
padding: 8px;
padding: 4px;
border: 1px solid #dcdfe6;
}
......@@ -175,7 +175,7 @@
}
.table-name--ellipsis {
width: 90px;
width: 126px;
overflow: hidden;
text-overflow: ellipsis;
display: -webkit-box;
......@@ -299,4 +299,20 @@
}
// 带删除的下拉框
.delete-select .delete-icon{
display:none;
}
.delete-icon{
color:#dcdfe6;
}
.delete-icon:focus{
color:#dcdfe6;
}
.delete-icon:hover{
color:#f5222d;
}
src/views/mall/common/card-temp.vue
......@@ -19,7 +19,7 @@
<el-table-column :show-overflow-tooltip="false" align="left" prop="cardLimit" label="兑换限制"></el-table-column>
<el-table-column :show-overflow-tooltip="false" align="left" prop="couponStock" label="库存"></el-table-column>
</el-table>
<el-pagination background class="dm-pagination" @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="listParams.currentPage" :page-sizes="[10, 20, 30, 40]" :page-size="listParams.pageSize" layout="total, prev, pager, next" :total="total"></el-pagination>
<el-pagination v-show='tableList.length>0' background class="dm-pagination" @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="listParams.currentPage" :page-sizes="[10, 20, 30, 40]" :page-size="listParams.pageSize" layout="total, prev, pager, next" :total="total"></el-pagination>
</section>
</template>
......
src/views/mall/common/express.vue
<template>
<el-dialog class="express dialog__body__nopadding" title="查看物流信息" :visible.sync="show" width="60%" :before-close="close">
<div class="express--info">
<p>收件人：{{info.consignee || '--'}}</p>
<p>联系方式：{{info.consigneePhone || '--'}}</p>
<p>收货地址：{{info.receivingAddress || '--'}}</p>
<p>收件人：<span style="color:#606266">{{info.consignee || '--'}}</span></p>
<p>联系方式：<span style="color:#606266">{{info.consigneePhone || '--'}}</span></p>
<p>收货地址：<span style="color:#606266">{{info.receivingAddress || '--'}}</span></p>
</div>
<div class="express--order">
<div class="clearfix express--order__info" v-if="!editShow">
<div class="fl pr20">快递公司：{{info.logisticsCompanyName || '--'}}</div>
<div class="fl">运单号码：{{info.courierNumber || '--'}}</div>
<div class="fl pr20"><span style="color:#303133">快递公司</span>：{{info.logisticsCompanyName || '--'}}</div>
<div class="fl"><span style="color:#303133">运单号码</span>：{{info.courierNumber || '--'}}</div>
<el-button class="fr express--order__info--btn" type="text" v-if="!isInfo" @click="editExpress">修改运单信息</el-button>
</div>
<div class="express--order__info" v-else>
......
src/views/mall/coupon/info.vue
......@@ -37,7 +37,7 @@
<el-radio :label="3">每月</el-radio>
<el-radio :label="4">每周</el-radio>
</el-radio-group>
<div class="pt10">
<div class="">
<el-date-picker class="w300" v-model="form.exchangeFixDate" v-if="form.exchangeDateType === 2" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
<el-select class="w300" size="small" v-model="form.exchangeDateDayArr" v-if="form.exchangeDateType === 3" multiple placeholder="请选择">
<el-option v-for="item in monthOptions" :key="item" :label="item" :value="item"></el-option>
......@@ -53,7 +53,7 @@
<el-radio :label="1">全部时段</el-radio>
<el-radio :label="2" class="vertical-middle">部分时段</el-radio>
</el-radio-group>
<div v-show="form.exchangeTimeType === 2" class="pt10">
<div v-show="form.exchangeTimeType === 2" class="">
<p v-for="(v,i) in timeRangeList" :key="i" class="pb10">
<el-time-picker :disabled="form.exchangeTimeType === 1" class="vertical-middle w300" is-range v-model="v.timeRange" value-format="HH:mm" format="HH:mm" range-separator="至" start-placeholder="开始时间" end-placeholder="结束时间" placeholder="选择时间范围"></el-time-picker>
<el-button v-if="i" class="vertical-middle" type="text" @click="delTimeRange(i)">删除</el-button>
......@@ -74,7 +74,7 @@
<el-radio :label="1">立即发布</el-radio>
<el-radio :label="2">定时发布</el-radio>
</el-radio-group>
<div class="pt10">
<div class="">
<el-date-picker v-if="form.releaseType ===2" v-model="form.limitTimeBegin" type="datetime" placeholder="选择日期时间"></el-date-picker>
</div>
</el-form-item>
......
src/views/mall/coupon/list.vue
......@@ -15,37 +15,37 @@
</div>
</template>
</el-table-column>
<el-table-column label="积分费用" align="left" prop="integralCost" width="100">
<el-table-column label="积分费用" align="left" prop="integralCost">
<template slot-scope="scope">
<updateCount :model="scope.row" theType="integralCost" typeName="积分" @refresh="getPageCardsList"></updateCount>
</template>
</el-table-column>
<el-table-column label="现金费用" align="left" prop="cashCost" width="100">
<el-table-column label="现金费用" align="left" prop="cashCost">
<template slot-scope="scope">
<updateCount :model="scope.row" theType="cashCost" :precision="2" typeName="元" @refresh="getPageCardsList"></updateCount>
</template>
</el-table-column>
<el-table-column label="库存" align="left" prop="virtualStock" width="100">
<el-table-column label="库存" align="left" prop="virtualStock">
<template slot-scope="scope">
<updateCount :model="scope.row" theType="virtualStock" @refresh="getPageCardsList"></updateCount>
</template>
</el-table-column>
<el-table-column label="兑换次数" align="left" prop="allExchangeNumber" width="80">
<el-table-column label="兑换次数" align="left" prop="allExchangeNumber">
<template slot-scope="scope">
<span @click="$router.push('/coupon/exchange/'+scope.row.integralMallProId)" class="blue">{{scope.row.allExchangeNumber}}</span>
</template>
</el-table-column>
<el-table-column label="状态" align="left" prop="status" width="140px">
<el-table-column label="状态" align="left" prop="status">
<template slot-scope="scope" >
<span v-html="renderStatus(scope.row).html"></span>
</template>
</el-table-column>
<el-table-column label="显示状态" align="center" prop="proShowStatus" width="120">
<el-table-column label="显示状态" align="center" prop="proShowStatus">
<template slot-scope="scope" >
{{renderShowStatus(scope.row)}}
</template>
</el-table-column>
<el-table-column label="操作" align="left" width="140px">
<el-table-column label="操作" align="left">
<template slot-scope="scope">
<el-button type="text" @click="$router.push('/coupon/info/'+scope.row.integralMallProId)">编辑</el-button>
<dm-delete @confirm="delData(scope.row)" tips="是否删除该优惠券?">
......
src/views/mall/gift/info.vue
......@@ -25,10 +25,10 @@
</div>
</el-form-item>
<el-form-item prop="proCategoryId" label="礼品分类">
<el-select v-model="form.proCategoryId" placeholder="请选择" class="w300">
<el-select v-model="form.proCategoryId" placeholder="请选择" class="w300 delete-select">
<el-option v-for="(v,i) in categoryOptions" :key="i" :label="v.categoryName" :value="v.integralMallCategoryId">
<span class="fl">{{v.categoryName}}</span>
<el-button class="fr" type="text" @click.stop="deleteCategory(v.integralMallCategoryId)">x</el-button>
<el-button class="fr delete-icon" type="text" @click.stop="deleteCategory(v.integralMallCategoryId)" style="line-height:34px" ><i class="el-icon-error el-icon--right"></i></el-button>
</el-option>
</el-select>
<el-button type="text" @click="createCategory">新建分类</el-button>
......
src/views/mall/gift/list.vue
......@@ -35,50 +35,50 @@
<img class="vertical-middle table__avatar--gift" :src="scope.row.mainImageUrl || defaultAvatar" width="60" height="60" />
<div class="inline-block vertical-middle">
<p class="table-name--ellipsis">{{scope.row.proName || '--'}}</p>
<p class="fz13 gray">{{scope.row.giftCategoryName || '--'}}</p>
<p class="fz13 gray table-name--ellipsis">{{scope.row.giftCategoryName || '--'}}</p>
</div>
</div>
</template>
</el-table-column>
<el-table-column label="积分费用" align="left" prop="integralCost" width="100">
<el-table-column label="积分费用" align="left" prop="integralCost">
<template slot-scope="scope">
<updateCount :model="scope.row" theType="integralCost" typeName="积分" @refresh="getPageGiftList"></updateCount>
</template>
</el-table-column>
<el-table-column label="现金费用" align="left" prop="cashCost" width="100">
<el-table-column label="现金费用" align="left" prop="cashCost">
<template slot-scope="scope">
<updateCount :model="scope.row" :precision="2" theType="cashCost" typeName="元" @refresh="getPageGiftList"></updateCount>
</template>
</el-table-column>
<el-table-column label="库存" align="left" prop="sortCost" width="100" sortable="custom">
<el-table-column label="库存" align="left" prop="sortCost" sortable="custom">
<template slot-scope="scope">
<updateCount :model="scope.row" theType="virtualStock" @refresh="getPageGiftList"></updateCount>
</template>
</el-table-column>
<el-table-column label="兑换次数" align="left" prop="sortTimes" width="100" sortable="custom">
<el-table-column label="兑换次数" align="left" prop="sortTimes" sortable="custom">
<template slot-scope="scope">
<span v-if="scope.row.changeType == 1" @click="$router.push('/gift/wxexchange/'+scope.row.integralMallProId)" class="blue">{{scope.row.allExchangeNumber}}</span>
<span v-else @click="$router.push('/gift/exchange/'+scope.row.integralMallProId)" class="blue">{{scope.row.allExchangeNumber}}</span>
</template>
</el-table-column>
<el-table-column label="兑换方式" align="left" prop="changeType" width="80">
<el-table-column label="兑换方式" align="left" prop="changeType">
<template slot-scope="scope" >
<span v-if="scope.row.changeType == 1">微信兑换</span>
<span v-if="scope.row.changeType == 2">快递发货</span>
<span v-if="scope.row.changeType == 3">在线发货</span>
</template>
</el-table-column>
<el-table-column label="兑换状态" align="left" prop="status" width="140px">
<el-table-column label="兑换状态" align="left" prop="status">
<template slot-scope="scope" >
<span v-html="renderStatus(scope.row).html"></span>
</template>
</el-table-column>
<el-table-column label="显示状态" align="center" prop="proShowStatus" width="120">
<el-table-column label="显示状态" align="center" prop="proShowStatus">
<template slot-scope="scope" >
{{renderShowStatus(scope.row)}}
</template>
</el-table-column>
<el-table-column label="操作" align="left" width="140px" fixed="right">
<el-table-column label="操作" align="left" fixed="right">
<template slot-scope="scope">
<el-button type="text" @click="$router.push('/gift/info/'+scope.row.integralMallProId)">编辑</el-button>
<dm-delete @confirm="delData(scope.row)" tips="是否删除该优惠券?">
......
src/views/mall/goods/list.vue
......@@ -25,13 +25,13 @@
</template>
</el-table-column>
<el-table-column label="兑换时间" align="left" prop="createTime" width="170px">
<el-table-column label="兑换时间" align="left" prop="createTime">
<template slot-scope="scope" >
<span>{{formateDateTimeByType(scope.row.createTime,'yyyy-MM-dd-HH-mm-ss')}}</span>
</template>
</el-table-column>
<el-table-column label="流水号" align="left" prop="definedCode" width="150px"></el-table-column>
<el-table-column label="发货类型" align="left" prop="changeType" width="80">
<el-table-column label="流水号" align="left" prop="definedCode"></el-table-column>
<el-table-column label="发货类型" align="left" prop="changeType">
<template slot-scope="scope" >
<span v-if="scope.row.changeType == 2">快递发货</span>
<span v-else-if="scope.row.changeType == 3">在线发货</span>
......@@ -43,18 +43,18 @@
<memberInfoCom :row="scope.row"></memberInfoCom>
</template>
</el-table-column>
<el-table-column label="消耗积分" align="left" prop="status" width="100px">
<el-table-column label="消耗积分" align="left" prop="status">
<template slot-scope="scope" >
<p>{{scope.row.unitCostIntegral}}</p>
<p>{{scope.row.payCost}}</p>
</template>
</el-table-column>
<el-table-column label="微信支付流水号" align="left" prop="proShowStatus" width="150">
<el-table-column label="微信支付流水号" align="left" prop="proShowStatus">
<template slot-scope="scope" >
<span>{{scope.row.definedCode || '--'}}</span>
</template>
</el-table-column>
<el-table-column label="操作" align="left" width="140px" fixed="right">
<el-table-column label="操作" align="left" fixed="right">
<template slot-scope="scope">
<p>
<el-button type="text" v-if="scope.row.status === 1" @click="sendOrder(scope.row)">发货</el-button>
......
src/views/mall/goods/order-info.vue
......@@ -2,9 +2,9 @@
<el-dialog class="express dialog__body__nopadding" title="查看详情" :visible.sync="show" width="40%" :before-close="close">
<div class="express--info">
<div v-if="infoStatus === 3">
<p>收件人：{{info.consignee || '--'}}</p>
<p>联系方式：{{info.consigneePhone || '--'}}</p>
<p>收货地址：{{info.receivingAddress || '--'}}</p>
<p>收件人：<span style="color:#606266">{{info.consignee || '--'}}</span></p>
<p>联系方式：<span style="color:#606266">{{info.consigneePhone || '--'}}</span></p>
<p>收货地址：<span style="color:#606266">{{info.receivingAddress || '--'}}</span></p>
</div>
<div v-if="infoStatus === 1">
<p>发货时间：{{formateDateTimeByType(info.deliveryTime,'yyyy-MM-dd-HH-mm') || '--'}}</p>
......
src/views/mall/goods/send-goods.vue
<template>
<el-dialog class="express dialog__body__nopadding" title="查看物流信息" :visible.sync="show" width="40%" :before-close="close">
<div class="express--info">
<p>收件人：{{info.consignee || '--'}}</p>
<p>联系方式：{{info.consigneePhone || '--'}}</p>
<p>收货地址：{{info.receivingAddress || '--'}}</p>
<p>收件人：<span style="color:#606266">{{info.consignee || '--'}}</span></p>
<p>联系方式：<span style="color:#606266">{{info.consigneePhone || '--'}}</span></p>
<p>收货地址：<span style="color:#606266">{{info.receivingAddress || '--'}}</span></p>
<p class="pb10">快递公司：<el-select class="vertical-middle w300" v-model="params.logisticsCompanyId" placeholder="选择快递">
<el-option v-for="v in logisticsOptions" :key="v.logisticsCompanyCode" :label="v.logisticsCompanyName" :value="v.logisticsCompanyId"></el-option>
</el-select>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment