diff --git a/app.json b/app.json
index ed5446d..12c6ef3 100644
--- a/app.json
+++ b/app.json
@@ -1,5 +1,6 @@
 {
   "pages": [
+    "pages/user/Appment_main/Appment_main",
     "pages/user/my_service/my_service",
     "pages/index/index/index",
     "pages/goods/categoryList/categoryList",
@@ -47,16 +48,12 @@
     "pages/team/team_ping/team_ping",
     "pages/cart/cart2_pt/cart2_pt",
     "pages/cart/cart_wk/cart_wk",
-
     "pages/user/member/menber",
     "pages/user/member/bring/bring",
     "pages/user/member/bring/msg/msg",
     "pages/user/member/account/account",
     "pages/user/member/account_unable/account_unable",
     "pages/user/member/cash_record/cash_record",
-    "pages/user/deposit/deposit",
-    "pages/user/deposit/prepaid/prepaid",
-    "pages/user/deposit/prepaid/msg/msg",
     "pages/user/coupons/coupons",
     "pages/user/coupons/qr_code/qr_code",
     "pages/user/coupons/query/index",
@@ -64,21 +61,19 @@
     "pages/user/integral/integral",
     "pages/user/integral/query/index",
     "pages/user/integral/msg/msg",
-   
     "pages/user/userqy/userqy",
     "pages/user/user_spsy/user_spsy",
     "pages/user/user_fw/user_fw",
     "pages/user/user_coupon/user_coupon",
     "pages/user/grow_value/grow_value",
     "pages/payment/pay_success/pay_success"
-
   ],
   "permission": {
     "scope.userLocation": {
       "desc": "获取你的位置信息"
     }
   },
-  "window": { 
+  "window": {
     "backgroundTextStyle": "light",
     "navigationBarTextStyle": "black",
     "navigationBarTitleText": "加载中...",
@@ -91,7 +86,6 @@
     "selectedColor": "#f23030",
     "borderStyle": "white",
     "backgroundColor": "#ffffff",
-    
     "list": [
       {
         "pagePath": "pages/index/index/index",
diff --git a/pages/user/my_service/my_service.js b/pages/user/my_service/my_service.js
index e29f7bd..db5e677 100644
--- a/pages/user/my_service/my_service.js
+++ b/pages/user/my_service/my_service.js
@@ -13,6 +13,7 @@ Page({
       content: "请将二维码展示给核销员，服务更快捷！"
     },
     iurl: a.imghost,
+    defimgurl:"/miniapp/images/yyservice/yyxmdefault.jpg",
     service_List: null, //服务项目列表
     is_service_read: 0,
     curpage: 1,
@@ -50,18 +51,14 @@ Page({
   //查询服务项目列表
   query_service: function() {
     var th = this;
-    var url = "http://localhost:8022/api/weshop/users/grade/wechat/cash/page";
-    // //获取服务项目
-    // getApp().request.promiseGet("/api/weshop/users/grade/wechat/cash/page", {
-
-    // }).then(res => {
-    //        console.log("11111111111"+res);
-    // })
+    var url = "http://172.20.0.13:8085/api/weshop/marketing/reservation/marketing/sm/list";
     wx.request({
-      url: "http://localhost:8022/api/weshop/yy_fuwu_list",
+      url: url,
+      data: {
+        storeId: 1,
+        userId: 5682130
+      },
       success: function(res) {
-
-        console.log("11111111111" + res.data.data.pageData);
         if (res.data.code == 0) {
 
           // th.data.curpage++;
@@ -80,9 +77,8 @@ Page({
           // }), wx.stopPullDownRefresh(); //停止下拉刷新
 
           th.setData({
-            service_List: res.data.data.pageData
+            service_List: res.data.data
           })
-          console.log(th.data.service_List.name + "111");
         }
       }
     })
@@ -93,7 +89,7 @@ Page({
     var ind = e.currentTarget.dataset.ind;
     var item = this.data.service_List[ind];
 
-    var ewm = "^" + this.data.userinfo.erpvipid + "|" + item.id + "|" + item.type_b + "|" + item.time+ "|TY01|";
+    var ewm = "^" + th.data.userinfo.erpvipid + "|" + item.ProjectID + "|" + item.BuyType + "|" + item.Validay + "|TY01|";
     var tt = th.format_time(1);
     ewm = ewm + tt;
     th.data.qr_code_object.val = ewm;
@@ -123,4 +119,9 @@ Page({
       fm = fm + ' ' + [d.getHours(), d.getMinutes(), d.getSeconds()].join(':')
     return fm;
   },
+  //跳转到首页
+  goto:function(e){
+    var url = e.currentTarget.dataset.url;
+    getApp().goto(url);
+  }
 })
\ No newline at end of file
diff --git a/pages/user/my_service/my_service.wxml b/pages/user/my_service/my_service.wxml
index e789d41..6f9ebb4 100644
--- a/pages/user/my_service/my_service.wxml
+++ b/pages/user/my_service/my_service.wxml
@@ -11,49 +11,47 @@
   <view class="rel" wx:for="{{service_List}}">
     <view class="abs">
       <!-- 皇冠log -->
-      <block wx:if="{{item.type_b==0}}">
+      <block wx:if="{{item.BuyType==4}}">
         <image class="equity_money" src="{{iurl}}/miniapp/images//yyservice/equity.png" lazy-load="true"></image>
       </block>
       <!-- 金钱log -->
-      <block wx:if="{{item.type_b==1}}">
+      <block wx:if="{{item.BuyType==1}}">
         <image class="equity_money" src="{{iurl}}/miniapp/images/yyservice/money.png" lazy-load="true"></image>
       </block>
       <!-- 礼包log -->
-      <block wx:if="{{item.type_b==2}}">
+      <block wx:if="{{item.BuyType==3}}">
         <image class="equity_money" src="{{iurl}}/miniapp/images/yyservice/giftpackage.png" lazy-load="true"></image>
       </block>
     </view>
     <view>
       <view class="flex-center">
-        <image class="itemimage" src="{{iurl+item.img}}" lazy-load="true" data-errorimg="service_List[{{index}}].img" binderror="bind_bnerr1" data-img="{{item.img}}"></image>
+        <image class="itemimage" src="{{item.img==undefined?iurl+defimgurl:iurl+item.img}}" lazy-load="true" data-errorimg="service_List[{{index}}].img" binderror="bind_bnerr1" data-img="{{item.img}}"></image>
       </view>
 
       <view class="flex-center itemName">
-        <view class="fs32 Name ellipsis-1">{{item.name}}</view>
+        <view class="fs32 Name ellipsis-1">{{item.ProjectName}}</view>
       </view>
 
       <view class="flex-center fs24 itemCount">
         <view>剩余次数：</view>
-        <view>{{item.chishu}}</view>
+        <view>{{item.ObtainTimes}}</view>
       </view>
 
       <view class="flex-center fs24 itemEffective">
         <view>有效期至</view>
-        <view class="Date">{{item.time}}</view>
+        <view class="Date">{{item.Validay}}</view>
       </view>
 
     </view>
 
     <view class="flex-center fs24 functionMax">
-      <view class="flex-level Use" bindtap="open_fw" data-order_sn="111111111111111111111111111" data-ind="{{index}}">
+      <view class="flex-level Use" bindtap="open_fw" data-ind="{{index}}">
         <view>立即使用</view>
       </view>
       <!-- 可预约 -->
-      <block wx:if="{{item.is_yy}}">
         <navigator class="flex-level appointment" url="/pages/user/Appment_main/Appment_main">
           <view>预约</view>
-        </navigator>
-      </block>
+      </navigator>
     </view>
   </view>
 
@@ -69,7 +67,7 @@
     </view>
     <view class="flex-level fs30 xc-ash">暂无服务项目</view>
     <view class="flex-level">
-      <navigator url="/pages/user/my_service/my_service" bindtap="goto">
+      <navigator data-url="/pages/user/index/index" bindtap="goto">
         <view class="flex-center fs28 white">回到首页</view>
       </navigator>
     </view>