Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop-uniapp

pages/mine/myCollect.vue

@@ -64,6 +64,7 @@
 <script>
 	import {
 		getGoodsCollection,
+		getStoreCollection,
 		deleteGoodsCollection,
 		deleteStoreCollection,
 	} from "@/api/members.js";
@@ -154,7 +155,7 @@
 			 * 点击店铺左侧取消收藏
 			 */
 			clickStoreSwiperAction(val) {
-				deleteStoreCollection(val.storeId).then((res) => {
+				deleteStoreCollection(val.id).then((res) => {
 					if (res.statusCode == 200) {
 						this.storeList = [];
 						this.getStoreList();
@@ -224,7 +225,7 @@
 				uni.showLoading({
 					title: "加载中",
 				});
-				getGoodsCollection(this.navList[1].params, "store").then((res) => {
+				getStoreCollection(this.navList[1].params, "STORE").then((res) => {
 					 if (this.$store.state.isShowToast){ uni.hideLoading() };
 					uni.stopPullDownRefresh();
 					if (res.data.success) {

pages/product/shopPage.vue

@@ -181,8 +181,8 @@ import { getStoreBaseInfo, getStoreCategory } from "@/api/store.js";
 import {
   receiveCoupons,
   deleteStoreCollection,
-  collectionGoods,
-  getGoodsIsCollect,
+  collectionStore,
+  getStoreIsCollect,
 } from "@/api/members.js";
 import config from "@/config/config";
 
@@ -374,7 +374,7 @@ export default {
     },
     /**是否收藏店铺 */
     async enableGoodsIsCollect() {
-      let res = await getGoodsIsCollect("STORE", this.storeId);
+      let res = await getStoreIsCollect("STORE", this.storeId);
       if (res.data.success) {
         this.isCollection = res.data.result;
       }
@@ -465,7 +465,7 @@ export default {
           }
         });
       } else {
-        collectionGoods("STORE", this.storeId).then((res) => {
+        collectionStore(this.storeId).then((res) => {
           if (res.data.success) {
             this.isCollection = true;
             uni.showToast({