Merge branch 'feature/1511-goods-type-filter' into new-version

backendEle/src/views/shop/index.vue

@@ -328,6 +328,8 @@ export default {
           for (let j in gift) {
             if (gift[j] % 2 != 0) {
               vueObj.form.reconsumeType = gift[j] - 1
+            } else {
+              vueObj.form.reconsumeType = null
             }
           }
         }