Merge branch 'master' of http://git.izouma.com/xiongzhu/jetour

src/components/GoodsSuk.vue

@@ -28,7 +28,7 @@
 
         <div class="num">
             <div class="text1">购买数量</div>
-            <van-stepper :value="num" @change="changeNum" />
+            <van-stepper :value="num" @change="changeNum" :max="stock" />
         </div>
 
         <div style="flex-grow:1;min-height:10px"></div>
@@ -71,6 +71,9 @@ export default {
         },
         mainImg() {
             return this.info.images ? [...this.info.images].shift() : '';
+        },
+        stock() {
+            return this.info.stock || 0;
         }
     },
     watch: {

src/pages/shoppingDetail.vue

@@ -363,6 +363,14 @@ export default {
                 });
                 return;
             }
+
+            if (this.num > this.info.stock || 0) {
+                wx.showToast({
+                    icon: 'none',
+                    title: '商品库存不足'
+                });
+                return;
+            }
             // if (!this.cityId) {
             //     wx.showToast({
             //         icon: 'none',

src/pages/submit.vue

@@ -184,7 +184,7 @@ export default {
                         { header: { 'Content-Type': 'application/json' } }
                     )
                     .then(res => {
-                        if (res.code === 200) {
+                        if (res.data.result === '0') {
                             return this.$http.post('/applets/appletsPay', {
                                 orderCode: res.data.orderCode,
                                 orderType: 2