Merge branch 'dev' of https://gitee.com/fengyuze178/xdd-uniapp-new into dev

# Conflicts:
#	pkg_product/views/famousQianxianVillageShop.vue

pkg_product/views/famousQianxian.vue

@@ -140,11 +140,12 @@ export default {
 .county-index {
   position: relative;
   min-height: 100vh;
-  background-color: #fff;
+  background-color: #f0f0f0;
   .top-img {
     position: relative;
     z-index: 5;
     padding: 21rpx;
+    background-color: #fff;
     .img {
       display: block;
       width: 100%;
@@ -175,7 +176,6 @@ export default {
     }
   }
   .list-wrap {
-    background-color: #F0F0F0;
     .loadend {
       width: 100%;
     }