Skip to content

I
integral-mall
Commit eaa40e0e by damodmg
Options

Merge branch 'dev' into 'master' 

数字换行

See merge request !29
parents d6c62859 92ddfe81
Showing with 4 additions and 4 deletions
dist/index.html
<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><link rel=stylesheet type=text/css href=./static/css/iconfont.css><link rel=stylesheet type=text/css href=./static/css/common.css><link rel="shortcut icon" type=image/x-icon href=./static/img/favicon.ico><title>积分商城</title><link href=./static/css/app.66022b35ae52d199707195c30e1ca1d9.css rel=stylesheet></head><body><div id=app></div><script src=//web-1251519181.file.myqcloud.com/lib/vue/2.5.2/vue.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vue-router/3.0.2/vue-router.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vuex/3.1.0/vuex.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/elementUI/index.2.5.4.js></script><script src=//web-1251519181.file.myqcloud.com/components/header.2.0.18.js></script><script src=//web-1251519181.file.myqcloud.com/components/aside-menu.2.0.02.js></script><script src=//web-1251519181.file.myqcloud.com/components/footer.2.0.02.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-linkage.2.0.00.js></script><script src=//web-1251519181.file.myqcloud.com/components/card.2.0.03.js></script><script src=//web-1251519181.file.myqcloud.com/components/export-excel.2.0.02.js></script><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.2a66e15144de1c0f565b.js></script><script type=text/javascript src=./static/js/app.dd34c933f33465be5520.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=stylesheet type=text/css href=./static/css/iconfont.css><link rel=stylesheet type=text/css href=./static/css/common.css><link rel="shortcut icon" type=image/x-icon href=./static/img/favicon.ico><title>积分商城</title><link href=./static/css/app.ab70821e6aad8100fcb7e9b28839948e.css rel=stylesheet></head><body><div id=app></div><script src=//web-1251519181.file.myqcloud.com/lib/vue/2.5.2/vue.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vue-router/3.0.2/vue-router.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vuex/3.1.0/vuex.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/elementUI/index.2.5.4.js></script><script src=//web-1251519181.file.myqcloud.com/components/header.2.0.18.js></script><script src=//web-1251519181.file.myqcloud.com/components/aside-menu.2.0.02.js></script><script src=//web-1251519181.file.myqcloud.com/components/footer.2.0.02.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-linkage.2.0.00.js></script><script src=//web-1251519181.file.myqcloud.com/components/card.2.0.03.js></script><script src=//web-1251519181.file.myqcloud.com/components/export-excel.2.0.02.js></script><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.2a66e15144de1c0f565b.js></script><script type=text/javascript src=./static/js/app.7e9394945db88cf6f4c8.js></script></body></html>
\ No newline at end of file
dist/static/js/app.7e9394945db88cf6f4c8.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.dd34c933f33465be5520.js deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
src/views/order/deliverInfo.vue
......@@ -17,7 +17,7 @@
<span>{{ deliverInfodModal.clerkName ? deliverInfodModal.clerkName : '---' }}</span>
</el-form-item>
<el-form-item v-if="!deliverInfodModal.deliverStatus" label="发货内容" label-width="80px">
<span>{{ deliverInfodModal.deliveryContent ? deliverInfodModal.deliveryContent : '--' }}</span>
<span style="word-break: break-all;">{{ deliverInfodModal.deliveryContent ? deliverInfodModal.deliveryContent : '--' }}</span>
</el-form-item>
<div class="line"></div>
<!-- {{ deliverInfodModal.traces }} -->
......
src/views/order/getCloseDetail.vue
......@@ -17,7 +17,7 @@
<span>{{ closeInfoModal.clerkName ? closeInfoModal.clerkName : '--' }}</span>
</el-form-item>
<el-form-item label="取消原因" label-width="80px">
<span>{{ closeInfoModal.cancelReason ? closeInfoModal.cancelReason : '--' }}</span>
<span style="word-break: break-all;">{{ closeInfoModal.cancelReason ? closeInfoModal.cancelReason : '--' }}</span>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
......
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