second commit

api.js

@@ -303,6 +303,7 @@ export default {
 			method:"post",
 			timeout:5000 //超时设置为5s
 		})
+<<<<<<< HEAD
 	},
 	//个人中心服务项目查询
 	getUserStoreMyServe:(data)=>{
@@ -352,6 +353,8 @@ export default {
 			method:"post",
 			timeout:5000 //超时设置为5s
 		})
+=======
+>>>>>>> 423f0a45c4e9465228d34ed3232a7cf6cb520526
 	}
 	
 }

pages.json

@@ -229,6 +229,7 @@
 				"navigationBarTitleText": "店铺管理"
 			}
         }
+<<<<<<< HEAD
         ,{
             "path" : "pages/packageOne/service/user/store_manage/my_serve/my_serve",
             "style" : {
@@ -265,6 +266,8 @@
 				
 			}
         }
+=======
+>>>>>>> 423f0a45c4e9465228d34ed3232a7cf6cb520526
     ],
 	"globalStyle": {
 		"navigationBarTextStyle": "black",

pages/packageOne/service/user/store_manage/message/message.vue

@@ -4,12 +4,20 @@
 		<view class="shore_business">
 			<view class="store_message">店铺业务<view class="shu_line"></view></view>
 			<view class="message_list">
+<<<<<<< HEAD
 				<navigator class="message_list_item clear" hover-class="none" url="../my_serve/my_serve">
+=======
+				<navigator class="message_list_item clear" hover-class="none" url="">
+>>>>>>> 423f0a45c4e9465228d34ed3232a7cf6cb520526
 				    <view class="photo_lf">服务项目</view>
 				    <view class="photo_middle">服务内容、价格明细</view>
 				    <view class="photo_rg">{{allData.serviceItem}}<text class="iconfont more"></text></view>
 				</navigator>
+<<<<<<< HEAD
 				<navigator v-if="allData.paramType != 3"  class="message_list_item clear" hover-class="none" url="../add_message/add_message">
+=======
+				<navigator v-if="allData.paramType != 3"  class="message_list_item clear" hover-class="none" url="">
+>>>>>>> 423f0a45c4e9465228d34ed3232a7cf6cb520526
 				    <view class="photo_lf">业务范围</view>
 				    <view class="photo_rg"><view class="main_add">{{allData.pMainBusiness}}</view><text class="iconfont more"></text></view>
 				</navigator>
@@ -17,7 +25,11 @@
 				    <view class="photo_lf">业务范围</view>
 				    <view class="photo_rg"><view class="main_add">{{allData.pMainBusiness}}</view><text class="iconfont more"></text></view>
 				</navigator>
+<<<<<<< HEAD
 				<navigator class="message_list_item clear" hover-class="none" :url="'../introduce/introduce?name='+ allData.name">
+=======
+				<navigator class="message_list_item clear" hover-class="none" url="">
+>>>>>>> 423f0a45c4e9465228d34ed3232a7cf6cb520526
 				    <view class="photo_lf">公司介绍</view>
 				    <view class="photo_rg"><text class="iconfont more"></text></view>
 				</navigator>

unpackage/dist/dev/mp-weixin/app.json

@@ -39,6 +39,7 @@
     "pages/packageOne/user/share_friend/list/list",
     "pages/packageOne/user/about/about",
     "pages/packageOne/user/help/help",
+<<<<<<< HEAD
     "pages/packageOne/service/user/store_manage/message/message",
     "pages/packageOne/service/user/store_manage/my_serve/my_serve",
     "pages/packageOne/service/user/store_manage/add_my_serve/add_my_serve",
@@ -46,6 +47,9 @@
     "pages/packageOne/service/user/store_manage/write_serve/write_serve",
     "pages/packageOne/service/user/store_manage/add_message/add_message",
     "pages/packageOne/service/user/store_manage/introduce/introduce"
+=======
+    "pages/packageOne/service/user/store_manage/message/message"
+>>>>>>> 423f0a45c4e9465228d34ed3232a7cf6cb520526
   ],
   "subPackages": [],
   "window": {

unpackage/dist/dev/mp-weixin/project.config.json

@@ -38,10 +38,17 @@
 			"current": -1,
 			"list": [
 				{
+<<<<<<< HEAD
 					"id": 0,
 					"name": "pages/packageOne/service/user/store_manage/message/message",
 					"pathName": "pages/packageOne/service/user/store_manage/message/message",
 					"query": "",
+=======
+					"id": -1,
+					"name": "pages/packageOne/service/user/store_manage/message/message",
+					"pathName": "pages/packageOne/service/user/store_manage/message/message",
+					"query": "id=1758",
+>>>>>>> 423f0a45c4e9465228d34ed3232a7cf6cb520526
 					"scene": null
 				}
 			]