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

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

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