From 1b55896919bce3352f1e9a9d90f3da2e326350aa Mon Sep 17 00:00:00 2001
From: yvan.ni <yvan.ni@youlipai.com>
Date: Sat, 24 Jul 2021 09:13:43 +0800
Subject: [PATCH] 1.我的礼包的功能 2. 首页 3. 批量预约

---
 packageA/pages/myGiftDetails/myGiftDetails.js   | 16 +++++++++++-----
 packageA/pages/myGiftDetails/myGiftDetails.wxml |  4 +++-
 packageA/pages/myGiftDetails/myGiftDetails.wxss |  3 ++-
 packageA/pages/my_service2/appment_main.js      |  4 ++--
 pages/index/index/index.wxml                    |  2 +-
 5 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/packageA/pages/myGiftDetails/myGiftDetails.js b/packageA/pages/myGiftDetails/myGiftDetails.js
index 64e4105..7fd7754 100644
--- a/packageA/pages/myGiftDetails/myGiftDetails.js
+++ b/packageA/pages/myGiftDetails/myGiftDetails.js
@@ -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
+                    })
                 }
             },
         })
diff --git a/packageA/pages/myGiftDetails/myGiftDetails.wxml b/packageA/pages/myGiftDetails/myGiftDetails.wxml
index 561c7dc..bd8ba1d 100644
--- a/packageA/pages/myGiftDetails/myGiftDetails.wxml
+++ b/packageA/pages/myGiftDetails/myGiftDetails.wxml
@@ -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>
 
diff --git a/packageA/pages/myGiftDetails/myGiftDetails.wxss b/packageA/pages/myGiftDetails/myGiftDetails.wxss
index efeb1a4..db13e1a 100644
--- a/packageA/pages/myGiftDetails/myGiftDetails.wxss
+++ b/packageA/pages/myGiftDetails/myGiftDetails.wxss
@@ -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
diff --git a/packageA/pages/my_service2/appment_main.js b/packageA/pages/my_service2/appment_main.js
index 413a898..06f63c9 100644
--- a/packageA/pages/my_service2/appment_main.js
+++ b/packageA/pages/my_service2/appment_main.js
@@ -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;
diff --git a/pages/index/index/index.wxml b/pages/index/index/index.wxml
index 5dab34e..40f4ce9 100644
--- a/pages/index/index/index.wxml
+++ b/pages/index/index/index.wxml
@@ -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>
--
libgit2 0.21.4