Merge branch 'XK_USER_INDEX_UPDATE20190613' into Development

68c335d9 · 肖康 · f1b37793 · c16f6217 · 68c335d9 · 68c335d9
Commit 68c335d9 authored Jun 13, 2019 by 肖康
Showing with 2 additions and 2 deletions
src/views/car/car.vue
view/0.js
view/1.js
view/10.js
view/11.js
view/12.js
view/13.js
view/14.js
view/15.js
view/16.js
view/17.js
view/18.js
view/19.js
view/20.js
view/21.js
view/22.js
view/23.js
view/24.js
view/25.js
view/26.js
--- a/src/views/car/car.vue
+++ b/src/views/car/car.vue
@@ -309,7 +309,7 @@
                                                库存：<font v-html="item.stock"></font>
                                            </li>
                                            <li class="mui-col-sm-8 mui-col-xs-8">
-                                                <span>封装规格：</span>
+                                                <span>型号：</span>
                                                <p style="padding-left:60px;">{{item.goods_name||'- -'}}</p>
                                            </li>
                                            <li class="mui-col-sm-4 mui-col-xs-4 t-r">
@@ -415,7 +415,7 @@
                                            库存：<font v-html="item.stock"></font>
                                        </li>
                                        <li class="mui-col-sm-8 mui-col-xs-8">
-                                            <span>封装规格：</span>
+                                            <span>型号：</span>
                                            <p style="padding-left:60px;">{{item.goods_name||'- -'}}</p>
                                        </li>
                                        <li class="mui-col-sm-4 mui-col-xs-4 t-r">

--- a/view/0.js
+++ b/view/0.js
--- a/view/1.js
+++ b/view/1.js
--- a/view/10.js
+++ b/view/10.js
--- a/view/11.js
+++ b/view/11.js
--- a/view/12.js
+++ b/view/12.js
--- a/view/13.js
+++ b/view/13.js
--- a/view/14.js
+++ b/view/14.js
--- a/view/15.js
+++ b/view/15.js
--- a/view/16.js
+++ b/view/16.js
--- a/view/17.js
+++ b/view/17.js
--- a/view/18.js
+++ b/view/18.js
--- a/view/19.js
+++ b/view/19.js
--- a/view/20.js
+++ b/view/20.js
--- a/view/21.js
+++ b/view/21.js
--- a/view/22.js
+++ b/view/22.js
--- a/view/23.js
+++ b/view/23.js
--- a/view/24.js
+++ b/view/24.js
--- a/view/25.js
+++ b/view/25.js
--- a/view/26.js
+++ b/view/26.js
--- a/view/27.js
+++ b/view/27.js
--- a/view/28.js
+++ b/view/28.js
--- a/view/29.js
+++ b/view/29.js
--- a/view/3.js
+++ b/view/3.js
--- a/view/30.js
+++ b/view/30.js
--- a/view/31.js
+++ b/view/31.js
--- a/view/32.js
+++ b/view/32.js
--- a/view/33.js
+++ b/view/33.js
--- a/view/34.js
+++ b/view/34.js
--- a/view/35.js
+++ b/view/35.js
--- a/view/36.js
+++ b/view/36.js
--- a/view/37.js
+++ b/view/37.js
--- a/view/4.js
+++ b/view/4.js
--- a/view/5.js
+++ b/view/5.js
--- a/view/6.js
+++ b/view/6.js
--- a/view/7.js
+++ b/view/7.js
--- a/view/8.js
+++ b/view/8.js
--- a/view/9.js
+++ b/view/9.js
--- a/view/app.js
+++ b/view/app.js