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

src/pages.json

@@ -64,7 +64,8 @@
 		{
 			"path": "pages/index/listFood",
 			"style": {
-				"navigationBarTitleText": ""
+				"navigationBarTitleText": "",
+				"enablePullDownRefresh": true
 			}
 		},
 		{
@@ -184,7 +185,8 @@
 		{
 			"path": "pages/assistingAgriculture/commentList/index",
 			"style": {
-				"navigationBarTitleText": "评价列表"
+				"navigationBarTitleText": "评价列表",
+				"enablePullDownRefresh": true
 			}
 		},
 		{

src/pages/assistingAgriculture/RuralTravel/RuralTravel.vue

@@ -277,6 +277,8 @@ onMounted(async () => {
 });
 onPullDownRefresh(() => {
   keyword.value = '';
+  currentPage.value = 1;
+  hasMoreData.value = true;
   getProd();
   setTimeout(() => {
     uni.stopPullDownRefresh();

src/pages/assistingAgriculture/cart/cart.vue

@@ -191,6 +191,7 @@ const toStore = (item) => {
     display: flex;
     align-items: center;
     justify-content: center;
+    flex-shrink: 0;
     &.is-checked {
       border-color: #f12a2a;
       background: #f12a2a;

src/pages/assistingAgriculture/commentList/index.vue

@@ -159,6 +159,7 @@ const getCommentListFn = () => {
   });
   getCommentList(commentParameters).then((res) => {
     xma.hideLoading();
+    xma.stopPullDownRefresh();
     total = res.data.total;
     res.data.records.forEach((v) => {
       v.avatar = imgUrl + v.avatar;
@@ -183,6 +184,11 @@ const choice = (i, type) => {
   commentParameters.type = type;
   getCommentListFn();
 };
+onPullDownRefresh(() => {
+  reset();
+  getEvalStatisFn();
+  getCommentListFn();
+});
 </script>
 
 <style lang="scss" scoped>

src/pages/index/coupon.vue

@@ -114,6 +114,7 @@ const getShop = async () => {
   params.lng = lon;
   params.lat = lat;
   getShopAndProdPage(params).then((res) => {
+    xma.stopPullDownRefresh();
     xma.hideLoading();
     total = res.data.total;
     res.data.records.forEach((item) => {
@@ -126,6 +127,7 @@ const getShop = async () => {
 };
 
 onPullDownRefresh(() => {
+  reset();
   getCoupons();
   getShop();
 });

src/pages/index/listFood.vue

@@ -203,8 +203,8 @@ const getMerchantList = async () => {
   listParams.lat = lat;
   merchantList(listParams).then((res) => {
     xma.hideLoading();
+    xma.stopPullDownRefresh();
     total = res.data.totalElements;
-    xma.hideLoading();
     console.log('商家列表', res);
     res.data.content.forEach((item) => {
       item.shopLogo = import.meta.env.VITE_APP_IMG_URL + item.shopLogo;
@@ -262,6 +262,10 @@ onPageScroll((e) => {
     title.value = '';
   }
 });
+onPullDownRefresh(() => {
+  reset();
+  getMerchantList();
+});
 </script>
 
 <style lang="scss" scoped>