Merge branch 'master' of http://8.140.253.224:3000/root/school_uni

13 hours ago · 80569fdf2a
2 changed files with 2 additions and 2 deletions
--- a/package2/shop/afterService.vue
+++ b/package2/shop/afterService.vue
@ -7,7 +7,7 @@
 						<uni-icons type="left" size="28"></uni-icons>
 					</view>
 					<view class="title-name" :style="{'padding-top': menuButtonInfo.top +'px'}">
-						{{pageTitle}}{{returnCount}}
+						{{pageTitle}}（{{returnCount}}条）
 					</view>
 				</view>
 			</view>
--- a/pages.json
+++ b/pages.json
@ -457,7 +457,7 @@
 		},{
 			"path": "shop/shopInfo",
 			"style": {
-				"navigationBarTitleText": "营业信息"
+				"navigationBarTitleText": "商家信息"
 			}
 		},{
 			"path": "shop/orderDetail",