Merge branch 'dev' of xiongzhu/9th into master

src/main/nine-space/src/components/Post.vue

@@ -23,8 +23,8 @@
                                 <span>{{ info.price }}</span>
                             </div>
                             <div class="text1" v-if="info.stock && !time">
-                                <span>已售 {{ info.sale }}</span>
-                                <span>剩余 {{ info.stock }}</span>
+                                <span>已售 {{ Math.min(info.sale, info.total) }}</span>
+                                <span>剩余 {{ Math.max(info.stock, 0) }}</span>
                             </div>
                         </div>
 

src/main/nine-space/src/components/product/productInfo.vue

@@ -21,7 +21,7 @@
                 </div>
                 <div class="flex1"></div>
                 <div class="text1" v-if="info.total !== 1">
-                    <span>{{ info.sale }}/</span>
+                    <span>{{ Math.min(info.sale, info.total) }}/</span>
                     <span>{{ info.total }}</span>
                 </div>
             </div>

src/main/nine-space/src/views/product/Detail.vue

@@ -18,8 +18,8 @@
                     <span>{{ info.total }}份</span>
                 </div>
                 <div class="text" v-if="info.salable && !isSold && info.total !== 1">
-                    <span>已售 {{ info.sale }}</span>
-                    <span>剩余 {{ info.stock }}</span>
+                    <span>已售 {{ Math.min(info.sale, info.total) }}</span>
+                    <span>剩余 {{ Math.min(info.stock, 0) }}</span>
                 </div>
             </div>
             <!-- <div class="title">{{ info.name }}</div> -->

src/main/nine-space/src/views/product/DetailPre.vue

@@ -38,8 +38,8 @@
                 </div>
                 <div class="flex1"></div>
                 <div class="text" v-if="info.salable && info.total > 0">
-                    <span>已售 {{ info.sale }}</span>
-                    <span>剩余 {{ info.stock }}</span>
+                    <span>已售 {{ Math.min(info.sale, info.total) }}</span>
+                    <span>剩余 {{ Math.max(info.stock, 0) }}</span>
                 </div>
             </div>
             <div class="title">{{ info.name }}</div>