wxd / MShopWeApp

Commit 2e65a6d3b0376cfa22bd7aa19de5cde92f69660c

Authored by taiyuan
2 parents 88c4c9b7 1b558969

Merge branch 'dev' of http://git.vipzhuang.cn/wxd/MShopWeApp into dev

Inline Side-by-side
Showing 6 changed files with 175 additions and 57 deletions
packageA/pages/myGift/myGift.wxml
  View file @2e65a6d
... ... @@ -17,18 +17,18 @@
17 17 <view class="flex ai-center">
18 18 <view class="c-red fs28">
19 19 <block wx:if="{{item.lbprice>0 && item.lbintegral}}">
20   - <text class="rmb">{{item.lbprice}}</text>/{{item.lbintegral}}积分
  20 + <text class="rmb">{{filter.toFix(item.lbprice,2)}}</text>/{{item.lbintegral}}积分
21 21 </block>
22 22 <block wx:elif="{{item.lbprice>0 || item.lbintegral}}">
23 23 <block wx:if="{{item.lbprice>0}}" >
24   - <text class="rmb">{{item.lbprice}}</text>
  24 + <text class="rmb">{{filter.toFix(item.lbprice,2) }}</text>
25 25 </block>
26 26 <block wx:if="{{item.lbintegral>0}}">
27 27 {{item.lbintegral}}积分
28 28 </block>
29 29 </block>
30 30 </view>
31   - <view class="fs22 c-a4 line-through mgl10">零售价{{item.oldprice}}</view>
  31 + <view class="fs22 c-a4 line-through mgl10">零售价{{filter.toFix(item.oldprice,2)}}</view>
32 32 </view>
33 33 <view class="fs24 c-a4">已售{{item.salenum}}件</view>
34 34 </view>
... ...
packageA/pages/myGiftDetails/myGiftDetails.js
  View file @2e65a6d
... ... @@ -57,7 +57,7 @@ Page({
57 57 // store_id: app.globalData.setting.stoid,
58 58 // user_id: app.globalData.user_id,
59 59 // };
60   -
  60 + //购买的时候是0，购买后是1
61 61 if(this.data.index == 0) {
62 62 // data.lbid = this.data.id;
63 63 // 请求数据
... ... @@ -68,60 +68,100 @@ Page({
68 68 },
69 69 isShowLoading: true,
70 70 }).then(function(res) {
71   - self.setData({
72   - details: res.data.data.pageData[0],
73   - });
74   - });
75   -
76   - app.request.promiseGet('/api/weshop/libao/libaoList/page', {
77   - data: {
78   - store_id: app.globalData.setting.stoid,
79   - lbid: this.data.id,
80   - },
81   - isShowLoading: true,
82   - }).then(function(res) {
83   - self.setData({
84   - list: res.data.data.pageData,
85   - });
  71 +
  72 + if(res.data.code==0 && res.data.data && res.data.data.pageData && res.data.data.pageData.length>0){
  73 + var da= res.data.data.pageData[0]
  74 + self.setData({ details:da, });
  75 +
  76 + //礼包有俩种类型
  77 + if(da.lbtype==1){
  78 + app.request.promiseGet('/api/weshop/libao/libaoList/page', {
  79 + data: {
  80 + store_id: app.globalData.setting.stoid,
  81 + lbid: self.data.id,pageSize:500
  82 + },
  83 + isShowLoading: true,
  84 + }).then(function(res) {
  85 + self.setData({
  86 + list: res.data.data.pageData,
  87 + });
  88 + });
  89 + }else{
  90 + app.request.promiseGet('/api/weshop/libao/libaoList/listLQ', {
  91 + data: {
  92 + store_id: app.globalData.setting.stoid,
  93 + lbid: self.data.id,
  94 + },
  95 + isShowLoading: true,
  96 + }).then(function(res) {
  97 + if(res.data.code==0){
  98 + self.setData({
  99 + list: res.data.data,
  100 + });
  101 + }
  102 + });
  103 + }
  104 +
  105 + }
86 106 });
  107 +
87 108 } else if(this.data.index == 1) {
88 109 app.request.promiseGet('/api/weshop/libao/libaoFormvip/page', {
89 110 data: {
90 111 store_id: app.globalData.setting.stoid,
91 112 user_id: app.globalData.user_id,
92   - id: this.data.id,
  113 + id: this.data.id
93 114 },
94 115 isShowLoading: true,
95 116 }).then(function(res) {
96 117 // console.log('res3-->', res);
97 118 if(res.data.code==0 && res.data.data && res.data.data.pageData && res.data.data.pageData.length>0){
  119 +
  120 + var da= res.data.data.pageData[0]
98 121 self.setData({
99   - details: res.data.data.pageData[0],
  122 + details:da,
100 123 });
101   - }
102   - });
103   -
104   - app.request.promiseGet('/api/weshop/libao/libaoListvip/page', {
105   - data: {
106   - store_id: app.globalData.setting.stoid,
107   - lbvipid: this.data.id,
108   - },
109   - isShowLoading: true,
110   - }).then(function(res) {
111   - // console.log('res4-->', res);
112   - if(res.data.code==0 && res.data.data && res.data.data.pageData && res.data.data.pageData.length>0) {
113   - var list_arr=res.data.data.pageData;
114   - for(var i in list_arr){
115   - list_arr[i].alsonum= list_arr[i]['goods_num'] - list_arr[i]['usenum'];//剩余次数
  124 +
  125 + if(da.lbtype==1){
  126 + app.request.promiseGet('/api/weshop/libao/libaoListvip/page', {
  127 + data: {
  128 + store_id: app.globalData.setting.stoid,
  129 + lbvipid: self.data.id,pageSize:500
  130 + },
  131 + isShowLoading: true,
  132 + }).then(function(res) {
  133 + // console.log('res4-->', res);
  134 + if(res.data.code==0 && res.data.data && res.data.data.pageData && res.data.data.pageData.length>0) {
  135 + var list_arr=res.data.data.pageData;
  136 + for(var i in list_arr){
  137 + list_arr[i].alsonum= list_arr[i]['goods_num'] - list_arr[i]['usenum'];//剩余次数
  138 + }
  139 + self.setData({
  140 + list: res.data.data.pageData,
  141 + });
  142 + }
  143 + });
  144 + }else{
  145 + app.request.promiseGet('/api/weshop/libao/libaoListvip/listLQ', {
  146 + data: {
  147 + store_id: app.globalData.setting.stoid,
  148 + lbvipid: self.data.id,
  149 + user_id:app.globalData.user_id
  150 + },
  151 + isShowLoading: true,
  152 + }).then(function(res) {
  153 + // console.log('res4-->', res);
  154 + if(res.data.code==0 && res.data.data) {
  155 + self.setData({
  156 + list: res.data.data,
  157 + });
  158 + }
  159 + });
116 160 }
117   - self.setData({
118   - list: res.data.data.pageData,
119   - });
  161 +
120 162 }
121 163 });
122 164 };
123   -
124   -
125 165 };
126 166 };
127 167 },
... ... @@ -260,14 +300,38 @@ Page({
260 300 icon: 'none',
261 301 duration: 2000
262 302 })
263   -
264   -
265   -
  303 +
266 304 }
267 305 }
268 306 })
269 307  
270   - }
  308 + },
  309 +
  310 + //一键领取券
  311 + show_get_quan:function (e) {
  312 + var th=this;
  313 + var json = {
  314 + store_id:os.stoid,
  315 + user_id:getApp().globalData.user_id,
  316 + id:this.data.id
  317 + };
  318 + var url = "/api/weshop/libao/libaoFormvip/saveLibaoQuan";
  319 + getApp().request.post(url,{
  320 + data:json,
  321 + success:function(res) {
  322 + if (res.data.code == 0) {
  323 + th.setData({'details.isget':1});
  324 + } else {
  325 + wx.showToast({
  326 + title: res.data.msg,
  327 + icon: 'none',
  328 + duration: 2000
  329 + })
  330 + }
  331 + },
  332 + })
  333 +
  334 + }
271 335  
272 336  
273 337 })
274 338 \ No newline at end of file
... ...
packageA/pages/myGiftDetails/myGiftDetails.wxml
  View file @2e65a6d
... ... @@ -2,6 +2,8 @@
2 2 <view class="pdb80">
3 3 <!-- 图片 -->
4 4 <view><image src="{{imghost + (details.lburl ? details.lburl:'miniapp/images/default_g_img.gif')}}" class="img" mode="widthFix"/></view>
  5 +
  6 + <view wx:if="{{index==1}}" class="fs26 exp_title">兑换结束时间：{{filter.format_time(details.expdate,1)}}</view>
5 7 <!-- 描述-->
6 8 <view class="desc-container">
7 9 <!-- 标题 -->
... ... @@ -11,11 +13,11 @@
11 13 <view class="flex ai-center">
12 14 <view class="c-red fs36">
13 15 <block wx:if="{{details.lbprice>0 && details.lbintegral>0 }}">
14   - <text class="rmb">{{details.lbprice}}</text>/{{details.lbintegral}}积分
  16 + <text class="rmb">{{filter.toFix(details.lbprice,2)}}</text>/{{details.lbintegral}}积分
15 17 </block>
16 18 <block wx:elif="{{details.lbprice>0 || details.lbintegral>0 }}">
17 19 <block wx:if="{{details.lbprice>0}}" >
18   - <text class="rmb">{{details.lbprice}}</text>
  20 + <text class="rmb">{{filter.toFix(details.lbprice,2)}}</text>
19 21 </block>
20 22 <block wx:if="{{details.lbintegral>0}}" >
21 23 {{details.lbintegral}}积分
... ... @@ -23,15 +25,18 @@
23 25 </block>
24 26  
25 27 </view>
26   - <view class="fs22 c-a4 line-through mgl10">零售价{{details.oldprice}}</view>
  28 + <view class="fs22 c-a4 line-through mgl10">零售价{{filter.toFix(details.oldprice,2)}}</view>
27 29 </view>
28 30 <view class="fs24 c-a4">已售{{details.salenum}}件</view>
29 31 </view>
30 32 <!-- 时间 -->
31 33 <view class="date">活动截止日期 {{details.expdate ? filter.format_time(details.expdate):filter.format_time(details.endtime)}}</view>
32 34 </view>
  35 +
  36 +
  37 + <!-- 领券和兑换商品 -->
33 38 <!-- 单品 -->
34   - <view class="goods-container">
  39 + <view class="goods-container" wx:if="{{details.lbtype==1}}">
35 40 <view class="pd20 bold bdb">可到线下门店兑换以下单品</view>
36 41 <view wx:if="{{index==1 && details.codetype==1}}" class="">
37 42 <view class="flex pd20 jc_sb">
... ... @@ -53,7 +58,6 @@
53 58 </view>
54 59 </view>
55 60  
56   -
57 61 <view wx:else class="">
58 62 <view class="flex pd20 jc_sb">
59 63 <view>单品名称</view>
... ... @@ -65,15 +69,48 @@
65 69 </view>
66 70 </view>
67 71 </view>
68   -
  72 +
  73 + <view wx:if="{{details.lbtype==2}}" class="flex" style="flex-wrap: wrap;">
  74 + <block wx:for="{{list}}">
  75 + <block wx:for="{{item.goods_num-0}}" wx:for-item="nitem" wx:for-index="idx">
  76 + <view class="lb_quan" style="background-image: url({{imghost}}/miniapp/images/yhq_{{index%2+1}}.png)">
  77 + <view class="flex fs28 fir_view">
  78 + <view>满1000.00使用</view>
  79 + <view class="fs38" style="text-align: right">￥1000</view>
  80 + </view>
  81 + <view style="font-size: 16rpx; text-align: center">活动结束日期： 2022-06-02 00:00:00 </view>
  82 + </view>
  83 + </block>
  84 + </block>
  85 + </view>
  86 +
  87 + <view style="height: 20rpx"></view>
69 88 <!-- 按钮 -->
70   - <view class="btn-container">
  89 + <view class="btn-container" wx:if="{{details.lbtype==1}}">
71 90 <block wx:if="{{index == 0}}">
72 91 <view wx:if="{{details.lbintegral>0}}" bindtap="GetBuyIntegral" class="btn red">立即兑换</view>
73 92 <view wx:if="{{details.lbprice>0}}" bindtap="GetBuyPrice" class="btn pink">立即购买</view>
74 93 </block>
75   - <view wx:else bindtap="show_hxm" data-type="1" class="btn red">立即使用</view>
  94 +
  95 + <block wx:else>
  96 + <view wx:if="{{details.isget}}" data-type="1" class="btn" style="background-color:#aaa;color: #fff">
  97 + 已领取{{list[0].freebh}}
  98 + </view>
  99 + <view wx:elif="{{details.codetype!=1}}" bindtap="show_hxm" data-type="1" class="btn red">立即使用</view>
  100 + </block>
76 101 </view>
  102 +
  103 + <view class="btn-container" wx:if="{{details.lbtype==2}}">
  104 + <block wx:if="{{index == 0}}">
  105 + <view wx:if="{{details.lbintegral>0}}" bindtap="GetBuyIntegral" class="btn red">立即兑换</view>
  106 + <view wx:if="{{details.lbprice>0}}" bindtap="GetBuyPrice" class="btn pink">立即购买</view>
  107 + </block>
  108 + <block wx:else>
  109 + <view wx:if="{{details.isget}}" data-type="1" class="btn" style="background-color:#aaa;color: #fff">已领</view>
  110 + <view wx:else bindtap="show_get_quan" data-type="1" class="btn red">一键领取优惠券→</view>
  111 + </block>
  112 + </view>
  113 +
77 114 </view>
78 115  
79 116 <!-- 引入提示组件 -->
... ...
packageA/pages/myGiftDetails/myGiftDetails.wxss
  View file @2e65a6d
... ... @@ -81,4 +81,21 @@ page {
81 81 .ling_btn{ background: #c0283a; color: #fff; width: 100rpx; height: 50rpx;
82 82 display: inline-block; line-height: 50rpx; border-radius: 10rpx}
83 83  
84   -.ling_btn.c_a{ background: darkgrey}
85 84 \ No newline at end of file
  85 +.ling_btn.c_a{ background: darkgrey}
  86 +
  87 +.lb_quan{
  88 + width: 48%;
  89 + height: 120rpx;
  90 + background-size: 100% 100%;
  91 + background-position: center;
  92 + background-repeat: no-repeat;
  93 + color: #fff;
  94 + font-size: 22rpx;
  95 + text-align: center;
  96 + margin-top:20rpx;
  97 + margin-left:10rpx;
  98 +}
  99 +.fir_view{
  100 + justify-content: space-between; height: 98rpx; line-height: 98rpx; padding: 0 8rpx;
  101 +}
  102 +.exp_title{text-align: center;height: 60rpx; line-height: 60rpx;background-color: #cccdce;color: #c0283a}
86 103 \ No newline at end of file
... ...
packageA/pages/my_service2/appment_main.js
  View file @2e65a6d
... ... @@ -329,7 +329,7 @@ Page({
329 329 is_textea: 0
330 330 })
331 331 var itemId = th.data.itemId; //服务id
332   - var url = "/api/weshop/marketing/reservation/storage/pageAll";
  332 + var url = "/api/weshop/marketing/reservation/service/storage/page";
333 333 var key_word = th.data.key_word;
334 334 key_word = key_word.replace(/\s+/g, "");
335 335 getApp().request.promiseGet(url, {
... ... @@ -344,7 +344,7 @@ Page({
344 344 }
345 345 }).then(res => {
346 346 wx.hideLoading();
347   - if (res.data.code == 0) {
  347 + if (res.data.code == 0 && res.data.data && res.data.data.pageData && res.data.data.pageData.length>0) {
348 348 th.data.curpage++;
349 349 var arr1 = th.data.store_list;
350 350 var arr2 = res.data.data.pageData;
... ...
pages/index/index/index.wxml
  View file @2e65a6d
... ... @@ -212,7 +212,7 @@
212 212 <swiper-item wx:for="{{pindGoods}}" wx:key="{{index}}" wx:for-index="pix">
213 213 <view class="teamheight" style='display:block;' wx:for="{{item}}" wx:for-item="aitem" wx:for-index="aind">
214 214 <view class="kill-item">
215   - <navigator class="flex navwidth" url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}&title={{aitem.goods_name}}" hover-class="none">
  215 + <navigator class="flex navwidth" url="/pages/goods/goodsInfo/goodsInfo?goods_id={{aitem.goods_id}}&title={{aitem.goods_name}}" hover-class="none">
216 216 <view class="kill-pic">
217 217 <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">
218 218 </image>
... ...