Merge remote-tracking branch 'remotes/origin/zmj' into old

pages.json

@@ -128,26 +128,25 @@
 				"enablePullDownRefresh": false
 			}
 
+		}, {
+			"path": "uni_modules/guyue-updater/pages/updater",
+			"style": {
+				"app-plus": {
+					"animationDuration": 200,
+					"animationType": "fade-in",
+					"background": "transparent",
+					"backgroundColorTop": "transparent",
+					"bounce": "none",
+					"popGesture": "none",
+					"scrollIndicator": false,
+					"titleNView": false
+				},
+				"backgroundColor": "transparent",
+				"disableScroll": true,
+				"navigationStyle": "custom"
+			}
 		}
-	,{
+	],
-    "path": "uni_modules/guyue-updater/pages/updater",
-    "style": {
-        "app-plus": {
-            "animationDuration": 200,
-            "animationType": "fade-in",
-            "background": "transparent",
-            "backgroundColorTop": "transparent",
-            "bounce": "none",
-            "popGesture": "none",
-            "scrollIndicator": false,
-            "titleNView": false
-        },
-        "backgroundColor": "transparent",
-        "disableScroll": true,
-        "navigationStyle": "custom"
-    }
-}
-],
 	"subPackages": [{
 			"root": "pages/goods_cate",
 			"name": "goods_cate",
@@ -1637,7 +1636,7 @@
 				"iconPath": "static/tabbar_icon/c.png",
 				"selectedIconPath": "static/tabbar_icon/c-a.png",
 				"text": "发布"
-			
+
 			},
 			{
 				"pagePath": "pages/supply_chains/supply_chains",
@@ -1653,7 +1652,7 @@
 				"text": "我的"
 			}
 		]
-		
+
 
 
 

pages/nongKe/supply_chain/supplierA.vue

@@ -26,7 +26,7 @@
 							<u-search borderColor="#FF6D20" bgColor="white" :showAction="false" placeholder="搜索店铺名称"
 								v-model="sotreParam.keyword" class="serch_cls"></u-search>
 							<u--image @tap="searchSubmit" class="img_cls" :showLoading="true"
-								src="/static/images/GXSC/SS.png" width="115.65rpx" height="56.82rpx"></u--image>
+								src="/static/images/GXSC/SSBT.png" width="115.65rpx" height="56.82rpx"></u--image>
 						</view>
 
 					</view>