Merge branch 'XK_zy_huoqi20200403'

# Conflicts: # view/index.html

Merge branch 'XK_zy_huoqi20200403'
# Conflicts: # view/index.html
1b4fb74d · 肖康 · 9042c028 · 8437d9ad · 1b4fb74d · 1b4fb74d
Commit 1b4fb74d authored Apr 21, 2020 by 肖康
Showing with 9 additions and 0 deletions
src/views/common/zyDetail.vue
view/0.js
view/00b53bb63f32cc7cd8b0.hot-update.json
view/01e84e4725e1ed13ff4b.hot-update.json
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/2.js
view/20.js
view/21.js
view/22.js
view/23.01e84e4725e1ed13ff4b.hot-update.js
--- a/src/views/common/zyDetail.vue
+++ b/src/views/common/zyDetail.vue
@@ -190,6 +190,7 @@
          </dt>
          <dd class="totalPrice">¥{{total}}</dd>
        </dl>
+        <div class="f-orange" v-show="isYushou">因下单客户较多，库存情况以订单最终确认为准</div>
      </div>
    </div>
    <div class="details-foot">

--- a/view/0.js
+++ b/view/0.js
--- a/view/00b53bb63f32cc7cd8b0.hot-update.json
+++ b/view/00b53bb63f32cc7cd8b0.hot-update.json
+{"h":"7537356d71fdaa6903f6","c":{"1":false}}
\ No newline at end of file
--- a/view/01e84e4725e1ed13ff4b.hot-update.json
+++ b/view/01e84e4725e1ed13ff4b.hot-update.json
+{"h":"e611d205c1a87878f2e3","c":{"23":true}}
\ No newline at end of file
--- 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/2.js
+++ b/view/2.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.01e84e4725e1ed13ff4b.hot-update.js
+++ b/view/23.01e84e4725e1ed13ff4b.hot-update.js
--- a/view/23.e611d205c1a87878f2e3.hot-update.js
+++ b/view/23.e611d205c1a87878f2e3.hot-update.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/38.js
+++ b/view/38.js
--- a/view/39.js
+++ b/view/39.js
--- a/view/4.js
+++ b/view/4.js
--- a/view/40.js
+++ b/view/40.js
--- a/view/41.js
+++ b/view/41.js
--- a/view/42.js
+++ b/view/42.js
--- a/view/43.js
+++ b/view/43.js
--- a/view/44.js
+++ b/view/44.js
--- a/view/45.js
+++ b/view/45.js
--- a/view/46.js
+++ b/view/46.js
--- a/view/47.js
+++ b/view/47.js
--- a/view/48.js
+++ b/view/48.js
--- a/view/49.js
+++ b/view/49.js
--- a/view/5.js
+++ b/view/5.js
--- a/view/50.js
+++ b/view/50.js
--- a/view/535c092169fc2c907905.hot-update.json
+++ b/view/535c092169fc2c907905.hot-update.json
+{"h":"00b53bb63f32cc7cd8b0","c":{"0":false}}
\ No newline at end of file
--- 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
--- a/view/e611d205c1a87878f2e3.hot-update.json
+++ b/view/e611d205c1a87878f2e3.hot-update.json
+{"h":"cada4d358079ee11d22a","c":{"23":true}}
\ No newline at end of file