Merge branch 'master' of http://gitlab.platform.xinhuaapp.com/pengjiani/groupPurchase-miniapp

src/pages/packageDetails/packageDetails.vue

@@ -202,6 +202,8 @@ function getProdDetailFn(prodId) {
  * 获取收藏
  */
 function getCollectFn(shopId) {
+  getCollect(shopId).then((res) => {
+    if (res.code === 0) {
       if (shopInfo.value.isCollect === 0) {
         shopInfo.value.privateIntFcount++;
         shopInfo.value.isCollect = 1;
@@ -210,18 +212,8 @@ function getCollectFn(shopId) {
         shopInfo.value.isCollect = 0;
       }
       shopInfo.value.console.log('111');
-  // getCollect(shopId).then((res) => {
-  //   if (res.code === 0) {
-  //     if (shopInfo.value.isCollect === 0) {
-  //       shopInfo.value.privateIntFcount++;
-  //       shopInfo.value.isCollect = 1;
-  //     } else {
-  //       shopInfo.value.privateIntFcount--;
-  //       shopInfo.value.isCollect = 0;
-  //     }
-  //     shopInfo.value.console.log('111');
-  //   }
-  // });
+    }
+  });
 }
 function collectionFn() {
   getCollectFn(shopId.value);

src/pages/shop/shop.vue

@@ -533,7 +533,7 @@ const giveTheThumbs = (item, index) => {
  */
 const viewAll = () => {
   getEvaluationPage({
-    current: params.value.current,
+    current: 1,
     size: commentTotal.value,
     shopId: params.value.shopId,
   }).then((res) => {

vite.config.ts

@@ -41,7 +41,7 @@ export default defineConfig({
     // 代理配置
     proxy: {
       '/api': {
-        target: 'http://test.rhhzkj.com:8080',
+        target: 'http://192.168.0.147:9999',
         changeOrigin: true,
         rewrite: (path) => path.replace(/^\/api/, ''),
       },