新增营销系统、分销系统、会员功能、门店、提现功能

pages/goodsList/goodsList.vue

@@ -16,7 +16,6 @@
             @custom="onSearch"
             @clear="onSearch"
             @search="onSearch"
-            @cancel="onCancel"
         >
         </uv-search>
       </view>
@@ -42,7 +41,11 @@
                   :data="item"
                   :storeName="item.storeName"
                   :price="item.price"
-                  :stock="true"
+                  :stock="!item.campaignType"
+                  :groupBuy="item.campaignType === 1"
+                  :original="item.campaignType === 1"
+                  :buyProgress="[2,3].includes(item.campaignType)"
+                  :total="[2,3].includes(item.campaignType)"
               >
               </goods>
             </card>
@@ -62,7 +65,7 @@
     </container>
 
   </layout>
-  <ReturnTop :scroll-top="scrollTop" />
+  <ReturnTop :scrollTop="scrollTop" />
 
 </template>
 
@@ -93,18 +96,9 @@ onLoad((options) => {
 })
 
 const onSearch = () => {
-  console.log('点击搜索')
   refresh()
 }
 
-const onClickLeft = () => {
-
-}
-
-const onCancel = () => {
-
-}
-
 
 </script>