1.我的礼包的功能

2. 首页 3. 批量预约

1.我的礼包的功能
2. 首页 3. 批量预约
yvan.ni
1 parent 5a363051
Showing 5 changed files with 19 additions and 10 deletions
packageA/pages/myGiftDetails/myGiftDetails.js
packageA/pages/myGiftDetails/myGiftDetails.wxml
packageA/pages/myGiftDetails/myGiftDetails.wxss
packageA/pages/my_service2/appment_main.js
pages/index/index/index.wxml
@@ -309,18 +309,24 @@ Page({
  
 	//一键领取券
     show_get_quan:function (e) {
-        this.setData({'details.isget':1});
+		var th=this;
         var json = {
-
+            store_id:os.stoid,
+            user_id:getApp().globalData.user_id,
+			id:this.data.id
         };
-        var url = "";
+        var url = "/api/weshop/libao/libaoFormvip/saveLibaoQuan";
         getApp().request.post(url,{
             data:json,
             success:function(res) {
                 if (res.data.code == 0) {
-
+                    th.setData({'details.isget':1});
                 } else {
-
+                    wx.showToast({
+                        title: res.data.msg,
+                        icon: 'none',
+                        duration: 2000
+                    })
                 }
             },
         })
@@ -2,6 +2,8 @@
 <view class="pdb80">
 	<!-- 图片 -->
 	<view><image src="{{imghost + (details.lburl ? details.lburl:'miniapp/images/default_g_img.gif')}}" class="img" mode="widthFix"/></view>
+
+	<view wx:if="{{index==1}}" class="fs26 exp_title">兑换结束时间：{{filter.format_time(details.expdate,1)}}</view>
 	<!-- 描述-->
 	<view class="desc-container">
 		<!-- 标题 -->
@@ -94,7 +96,7 @@
 			<view wx:if="{{details.isget}}"  data-type="1" class="btn" style="background-color:#aaa;color: #fff">
 				已领取{{list[0].freebh}}
 		    </view>
-			<view wx:else bindtap="show_hxm" data-type="1" class="btn red">立即使用</view>
+			<view wx:elif="{{details.codetype!=1}}" bindtap="show_hxm" data-type="1" class="btn red">立即使用</view>
 		</block>
 	</view>
  
@@ -97,4 +97,5 @@ page {
 }
 .fir_view{
 	justify-content: space-between; height: 98rpx; line-height: 98rpx; padding: 0 8rpx;
-}
 \ No newline at end of file
+}
+.exp_title{text-align: center;height: 60rpx; line-height: 60rpx;background-color: #cccdce;color: #c0283a}
 \ No newline at end of file
@@ -329,7 +329,7 @@ Page({
       is_textea: 0
     })
     var itemId = th.data.itemId; //服务id
-    var url = "/api/weshop/marketing/reservation/storage/pageAll";
+    var url = "/api/weshop/marketing/reservation/service/storage/page";
     var key_word = th.data.key_word;
     key_word = key_word.replace(/\s+/g, "");
     getApp().request.promiseGet(url, {
@@ -344,7 +344,7 @@ Page({
       }
     }).then(res => {
       wx.hideLoading();
-      if (res.data.code == 0) {
+      if (res.data.code == 0 && res.data.data && res.data.data.pageData && res.data.data.pageData.length>0) {
         th.data.curpage++;
         var arr1 = th.data.store_list;
         var arr2 = res.data.data.pageData;
@@ -212,7 +212,7 @@
         <swiper-item wx:for="{{pindGoods}}" wx:key="{{index}}" wx:for-index="pix">
           <view class="teamheight" style='display:block;' wx:for="{{item}}" wx:for-item="aitem" wx:for-index="aind">
             <view class="kill-item">
-              <navigator class="flex navwidth" url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}&title={{aitem.goods_name}}" hover-class="none">
+              <navigator class="flex navwidth" url="/pages/goods/goodsInfo/goodsInfo?goods_id={{aitem.goods_id}}&title={{aitem.goods_name}}" hover-class="none">
                 <view class="kill-pic">
                   <image class="wh100" src="{{url+aitem.original_img}}" data-val="{{aitem.original_img}}" data-errorimg="pindGoods[{{pix}}][{{aind}}].original_img" binderror="bind_bnerr2" lazy-load="true">
                   </image>