Commit 091eefefc8a075eec6da2150c6116aa1deac9f84

Authored by yvan.ni
1 parent f8f200f6

每月礼包要钱+积分一起支付

packageE/pages/user/monthgiftbag/giftpackbuy/giftpackbuy.wxml
... ... @@ -34,18 +34,25 @@
34 34 <text>{{items.giftTitle}}</text>
35 35 </view>
36 36 <view class="content_ware_type flex">
37   - <block wx:if="{{items.payMoney>0}}">
38   - <text>{{"¥"+items.payMoney}}</text>
  37 + <block wx:if="{{items.money_type>0}}">
  38 + {{"¥"+items.payMoney}}+{{items.payIntegral}}积分
39 39 </block>
40   - <block wx:if="{{items.payMoney>0&&items.payIntegral>0}}">
41   - <text>/</text>
42   - </block>
43   - <block wx:if="{{items.payIntegral>0}}">
44   - <view class="flex">
45   - <text class="ellipsis-1">{{items.payIntegral}}</text>
46   - <view>积分</view>
47   - </view>
  40 + <block wx:else>
  41 + <block wx:if="{{items.payMoney>0}}">
  42 + <text>{{"¥"+items.payMoney}}</text>
  43 + </block>
  44 + <block wx:if="{{items.payMoney>0&&items.payIntegral>0}}">
  45 + <text>/</text>
  46 + </block>
  47 + <block wx:if="{{items.payIntegral>0}}">
  48 + <view class="flex">
  49 + <text class="ellipsis-1">{{items.payIntegral}}</text>
  50 + <view>积分</view>
  51 + </view>
  52 + </block>
48 53 </block>
  54 +
  55 +
49 56 </view>
50 57 <view class="content_ware_price no_line_c">
51 58 <text class="ellipsis-1">{{"零售价:¥"+items.giftPosPrice}}</text>
... ... @@ -69,17 +76,10 @@
69 76 </view>
70 77 <block wx:if="{{now > items.starTime1}}">
71 78 <view class="flex-vertical">
72   - <block wx:if="{{items.payMoney>0 && items.payIntegral>0}}">
73   - <block wx:if="{{items.payMoney>0}}">
74   - <view class="flex" bindtap="GetBuyPrice" data-index="{{index}}">
  79 + <block wx:if="{{items.money_type>0}}">
  80 + <view class="flex" bindtap="GetBuyPrice" data-index="{{index}}">
75 81 <button class="box_button_dui">立即购买</button>
76 82 </view>
77   - </block>
78   - <block wx:if="{{items.payIntegral>0}}">
79   - <view class="flex" bindtap="GetBuyIntegral" data-index="{{index}}">
80   - <button class="box_button_dui box_button_buy">立即兑换</button>
81   - </view>
82   - </block>
83 83 </block>
84 84 <block wx:else>
85 85 <block wx:if="{{items.payMoney>0}}">
... ...
packageE/pages/user/monthgiftbag/giftpackinfo/giftpackinfo.js
... ... @@ -99,11 +99,56 @@ Page({
99 99 }
100 100  
101 101  
  102 + var th = this;
  103 + this.setData({
  104 + getUserID: d.user_id,
  105 + getStorageID: a.stoid,
  106 + })
  107 +
  108 + if(!options.lbId && options.scene){
  109 + var gid_str = decodeURIComponent(options.scene);
  110 + gid_str = gid_str.split("_");
  111 + options.lbId=gid_str[0];
  112 + options.id=gid_str[0];
  113 + options.first_leader=gid_str[1];
  114 + options.isBuy=1;
  115 + }
  116 +
102 117 this.setData({
103 118 params: options,
104 119 getGiftID:options.id
105 120 })
106 121  
  122 +
  123 + this.setData({
  124 + isBuy: options.isBuy,
  125 + getGiftID: options.lbId,
  126 + orderSn: options.orderSn,
  127 + flag: options.flag, // 如果从商品详情页的促销处点击专享礼包跳转到此页,则flag为1
  128 + record_list_id:options.record_list_id,
  129 + is_receive:options.is_receive
  130 + })
  131 + if (options.lbId) th.data.lbId = options.lbId;
  132 + //-- 获取分享人的ID --
  133 + var first_leader = options.first_leader || getApp().globalData.first_leader;
  134 + if (first_leader) {
  135 + this.setData({
  136 + first_leader,
  137 + })
  138 + //-- user_id代过来免登录 --
  139 + getApp().globalData.first_leader = first_leader;
  140 + //调用接口判断是不是会员
  141 + getApp().request.promiseGet("/api/weshop/shoppingGuide/get/" + os.stoid + "/" + first_leader, {}).then(res => {
  142 + if (res.data.code == 0) {
  143 + getApp().globalData.guide_id = res.data.data.id;
  144 + getApp().globalData.guide_pick_id= res.data.data.pickup_id
  145 + }
  146 + })
  147 + }
  148 + th.close();
  149 +
  150 +
  151 +
107 152 getApp().getConfig(function (e) {
108 153 th.setData({sto_sele_name_1: e.store_name})
109 154 })
... ... @@ -148,7 +193,7 @@ Page({
148 193 // sele_g:monthgiftbag,
149 194 // def_pick_store:monthgiftba_defpick
150 195 // })
151   -   let scene = wx.getLaunchOptionsSync().scene;
  196 + let scene=wx.getLaunchOptionsSync().scene;
152 197 if (scene==1154) {
153 198 this.setData({
154 199 scene
... ... @@ -157,50 +202,8 @@ Page({
157 202 }
158 203 },
159 204 init() {
160   - let options = this.data?.params; // this.data == null ? undefined:this.data.params
161   - var th = this;
162   - this.setData({
163   - getUserID: d.user_id,
164   - getStorageID: a.stoid,
165   - })
166   -
167   - if(!options.lbId && options.scene){
168   - var gid_str = decodeURIComponent(options.scene);
169   - gid_str = gid_str.split("_");
170   -
171   - options.lbId=gid_str[0];
172   - options.first_leader=gid_str[1];
173   - options.isBuy=1;
174   - }
175   -
176 205  
177   - this.setData({
178   - isBuy: options.isBuy,
179   - getGiftID: options.lbId,
180   - orderSn: options.orderSn,
181   - flag: options.flag, // 如果从商品详情页的促销处点击专享礼包跳转到此页,则flag为1
182   - record_list_id:options.record_list_id,
183   - is_receive:options.is_receive
184   - })
185   - if (options.lbId) th.data.lbId = options.lbId;
186   - //-- 获取分享人的ID --
187   - var first_leader = options.first_leader || getApp().globalData.first_leader;
188   - if (first_leader) {
189   - this.setData({
190   - first_leader,
191   - })
192   - //-- user_id代过来免登录 --
193   - getApp().globalData.first_leader = first_leader;
194   - //调用接口判断是不是会员
195   - getApp().request.promiseGet("/api/weshop/shoppingGuide/get/" + os.stoid + "/" + first_leader, {}).then(res => {
196   - if (res.data.code == 0) {
197   - getApp().globalData.guide_id = res.data.data.id;
198   - getApp().globalData.guide_pick_id= res.data.data.pickup_id
199   - }
200   - })
201   - }
202   - th.close();
203   -
  206 + var th=this;
204 207 //-- 检测一下有没有门店 --
205 208 th.check_guide(function (){
206 209 com.wait_for_store_config(th);
... ... @@ -944,12 +947,16 @@ Page({
944 947 //--- 分享设置 --
945 948 onShareAppMessage: function (e) {
946 949 getApp().globalData.no_clear = 1;
  950 +
  951 + var ee=this;
947 952 var curPage = this;
948 953 var pagePath = curPage.route; //当前页面url
949 954 if (pagePath.indexOf('/') != 0) {
950 955 pagePath = '/' + pagePath;
951 956 }
952   - pagePath += "?isBuy=1" + "&id=" + this.data.options.id + "&first_leader=" + this.data.getUserID;
  957 +
  958 +
  959 + pagePath += "?isBuy=1" + "&id=" + this.data.sele_g.id + "&first_leader=" + this.data.getUserID;
953 960 console.log('分享路径');
954 961 console.log(pagePath);
955 962 // if (this.data.isBuy == 0) {
... ... @@ -958,9 +965,14 @@ Page({
958 965 // pagePath += "&lbId=" + this.data.getGiftID;
959 966 // }
960 967 // console.log('pagePath', pagePath);
  968 +
  969 + var img =ee.data.iurl+(ee.data.sele_g.cover_img ? ee.data.sele_g.cover_img : ee.data.giftImage);
  970 +
  971 +
961 972 return {
962 973 title: "礼包详情",
963 974 path: pagePath,
  975 + imageUrl: img,
964 976 }
965 977 },
966 978  
... ... @@ -970,13 +982,17 @@ Page({
970 982 onShareTimeline() {
971 983 getApp().globalData.no_clear = 1;
972 984  
973   - var pagePath = "&isBuy=1" + "&id=" + this.data.options.id + "&first_leader=" + this.data.getUserID;
  985 + var ee=this;
  986 + var pagePath = "&isBuy=1" + "&id=" + this.data.sele_g.id + "&first_leader=" + this.data.getUserID;
974 987 var user_id = getApp().globalData.user_id;
975 988 if (!user_id) user_id = 0;
976 989  
  990 + var img =ee.data.iurl+(ee.data.sele_g.cover_img ? ee.data.sele_g.cover_img : ee.data.giftImage);
  991 +
977 992 return {
978 993 title: "礼包详情",
979   - query: 'first_leader=' + user_id + pagePath
  994 + query: 'first_leader=' + user_id + pagePath,
  995 + imageUrl: img,
980 996 }
981 997 },
982 998  
... ... @@ -1489,7 +1505,7 @@ Page({
1489 1505  
1490 1506 var app = getApp();
1491 1507 var unit = that.data.screenWidth / 750 * 1.35; //基础单位,
1492   - var scene = th.data.lbId + "";
  1508 + var scene = th.data.sele_g.id + "";
1493 1509  
1494 1510 var user_id = getApp().globalData.user_id ? getApp().globalData.user_id : 0;
1495 1511 if (user_id > 0) {
... ... @@ -1497,7 +1513,7 @@ Page({
1497 1513 }
1498 1514 ///二微码
1499 1515 var path3 = os.url + "/api/wx/open/app/user/getWeAppEwm/" +
1500   - os.stoid + "?sceneValue=" + scene + "&pageValue=pages/giftpack/giftpacklist/giftpacklist";
  1516 + os.stoid + "?sceneValue=" + scene + "&pageValue=packageE/pages/user/monthgiftbag/giftpackinfo/giftpackinfo";
1501 1517  
1502 1518 // 读取文件成功则OK--
1503 1519 wx.getImageInfo({
... ... @@ -1606,7 +1622,7 @@ Page({
1606 1622 let src = '';
1607 1623 context.beginPath();
1608 1624 if (type == 0) { // 普通
1609   - src = '../../../images/share/q_tj.png';
  1625 + src = '/images/share/q_tj.png';
1610 1626 context.drawImage(src, 54 * unit, 648 * unit, 85 * unit, 30 * unit);
1611 1627 context.setFontSize(16 * unit)
1612 1628 context.setFillStyle("white")
... ... @@ -1615,8 +1631,8 @@ Page({
1615 1631 }
1616 1632  
1617 1633  
1618   - let price = this.data.giftPrice;
1619   - let giftIntegral = this.data.giftIntegral;
  1634 + let price = this.data.sele_g.payMoney;
  1635 + let giftIntegral = this.data.sele_g.payIntegral;
1620 1636 context.setFontSize(32 * unit);
1621 1637 context.setFillStyle('#DE1117');
1622 1638  
... ... @@ -1683,7 +1699,8 @@ Page({
1683 1699 tt();
1684 1700 return false;
1685 1701 }
1686   - var img_url = ee.data.giftImageCover ? ee.data.giftImageCover : ee.data.giftImage;
  1702 + var img_url =ee.data.iurl+(ee.data.sele_g.cover_img ? ee.data.sele_g.cover_img : ee.data.giftImage);
  1703 +
1687 1704 //获取商品是分享图信息
1688 1705 wx.getImageInfo({
1689 1706 src: img_url,
... ...
packageE/pages/user/monthgiftbag/giftpackinfo/giftpackinfo.wxml
... ... @@ -10,13 +10,12 @@
10 10 </view>
11 11  
12 12 <view class="top_title data-v-3a5b7e36">
13   - <text class="data-v-3a5b7e36 ellipsis-2" style="width:90%;">{{monthgiftbag.giftTitle}}</text>
14   -
  13 + <text class="data-v-3a5b7e36 ellipsis-2" style="width:90%;">{{monthgiftbag.giftTitle}}</text>
15 14 <!-- 这个是分享按钮 -->
16   - <!-- <view wx:if="{{c_state<2}}" class="xc-share-frame t-c" bindtap="clickShare">
  15 + <view wx:if="{{c_state<2}}" class="xc-share-frame t-c" bindtap="clickShare">
17 16 <view class="iconfont icon-share fs40" ></view>
18 17 <view class="fs22 c-7b">分享</view>
19   - </view> -->
  18 + </view>
20 19  
21 20  
22 21 </view>
... ... @@ -45,16 +44,21 @@
45 44  
46 45 <view class="top_price data-v-3a5b7e36">
47 46  
  47 + <block wx:if="{{monthgiftbag.money_type>0}}">
  48 + {{"¥"+monthgiftbag.lbPrice}}+{{monthgiftbag.payIntegral+"积分"}}
  49 + </block>
  50 + <block wx:else>
  51 + <block wx:if="{{monthgiftbag.lbPrice>0}}">
  52 + <text class="data-v-3a5b7e36">{{"¥"+monthgiftbag.lbPrice}}</text>
  53 + </block>
  54 + <block wx:if="{{monthgiftbag.lbPrice>0 && monthgiftbag.payIntegral>0}}">
  55 + <text class="data-v-3a5b7e36">/</text>
  56 + </block>
  57 + <block wx:if="{{monthgiftbag.payIntegral>0}}">
  58 + <text class="data-v-3a5b7e36">{{monthgiftbag.payIntegral+"积分"}}</text>
  59 + </block>
  60 + </block>
48 61  
49   - <block wx:if="{{monthgiftbag.lbPrice>0}}">
50   - <text class="data-v-3a5b7e36">{{"¥"+monthgiftbag.lbPrice}}</text>
51   - </block>
52   - <block wx:if="{{monthgiftbag.lbPrice>0 && monthgiftbag.payIntegral>0}}">
53   - <text class="data-v-3a5b7e36">/</text>
54   - </block>
55   - <block wx:if="{{monthgiftbag.payIntegral>0}}">
56   - <text class="data-v-3a5b7e36">{{monthgiftbag.payIntegral+"积分"}}</text>
57   - </block>
58 62 <!-- <block wx:if="{{giftType>0}}">
59 63 <text class="data-v-3a5b7e36">{{actTitle}}</text>
60 64 </block> -->
... ... @@ -154,32 +158,34 @@
154 158 <block wx:if="{{getUserID && monthgiftbag.giftTitle}}">
155 159 <block wx:if="{{isStart==1}}">
156 160 <view class="foot_button data-v-3a5b7e36">
157   - <block wx:if="{{monthgiftbag.lbPrice>0 && monthgiftbag.payIntegral>0}}">
158   - <view style="{{scene==1154 ? 'background:#b9b5b5':''}}" class="foot_button_left data-v-3a5b7e36 " data-money="{{monthgiftbag.lbPrice}}" data-id="{{lbId}}" bindtap="GetBuyPrice">
159   - <text class="data-v-3a5b7e36 ">立即购买</text>
160   - </view>
161   - <view class="foot_button_right data-v-3a5b7e36 " bindtap="GetBuyIntegral" data-id="{{lbId}}">
162   - <text class="data-v-3a5b7e36">立即兑换</text>
163   - </view>
164   - </block>
165   - <block wx:if="{{monthgiftbag.lbPrice>0 && monthgiftbag.payIntegral<=0}}">
166   - <view style="{{scene==1154 ? 'background:#b9b5b5':''}}" class="foot_button_buy data-v-3a5b7e36 " data-money="{{monthgiftbag.lbPrice}}" bindtap="GetBuyPrice" data-id="{{lbId}}">
167   - <text class="data-v-3a5b7e36">立即购买</text>
168   - </view>
169   - </block>
170   - <block wx:if="{{monthgiftbag.lbPrice<=0 && monthgiftbag.payIntegral>0}}">
171   - <view style="{{scene==1154 ? 'background:#b9b5b5':''}}" class="foot_button_intalge data-v-3a5b7e36 " bindtap="GetBuyIntegral" data-id="{{lbId}}">
172   - <text class="data-v-3a5b7e36">立即兑换</text>
173   - </view>
174   - </block>
175   - <!-- <block >
176   - <view class="foot_button_intalge data-v-3a5b7e36 " wx:if="{{!is_receive}}" bindtap="getGift" data-id="{{lbId}}">
177   - <text class="data-v-3a5b7e36">领取</text>
178   - </view>
179   - <view class="foot_button_intalge data-v-3a5b7e36 " wx:if="{{is_receive}}" data-id="{{lbId}}">
180   - <text class="data-v-3a5b7e36">已领取</text>
181   - </view>
182   - </block> -->
  161 +
  162 + <block wx:if="{{monthgiftbag.money_type>0}}">
  163 + <view style="{{scene==1154 ? 'background:#b9b5b5':''}}" class="foot_button_left data-v-3a5b7e36" data-money="{{monthgiftbag.lbPrice}}" data-id="{{lbId}}" bindtap="GetBuyPrice">
  164 + <text class="data-v-3a5b7e36 ">立即购买</text>
  165 + </view>
  166 + </block>
  167 + <block wx:else>
  168 + <block wx:if="{{monthgiftbag.lbPrice>0 && monthgiftbag.payIntegral>0}}">
  169 + <view style="{{scene==1154 ? 'background:#b9b5b5':''}}" class="foot_button_left data-v-3a5b7e36 " data-money="{{monthgiftbag.lbPrice}}" data-id="{{lbId}}" bindtap="GetBuyPrice">
  170 + <text class="data-v-3a5b7e36 ">立即购买</text>
  171 + </view>
  172 + <view class="foot_button_right data-v-3a5b7e36 " bindtap="GetBuyIntegral" data-id="{{lbId}}">
  173 + <text class="data-v-3a5b7e36">立即兑换</text>
  174 + </view>
  175 + </block>
  176 + <block wx:if="{{monthgiftbag.lbPrice>0 && monthgiftbag.payIntegral<=0}}">
  177 + <view style="{{scene==1154 ? 'background:#b9b5b5':''}}" class="foot_button_buy data-v-3a5b7e36 " data-money="{{monthgiftbag.lbPrice}}" bindtap="GetBuyPrice" data-id="{{lbId}}">
  178 + <text class="data-v-3a5b7e36">立即购买</text>
  179 + </view>
  180 + </block>
  181 + <block wx:if="{{monthgiftbag.lbPrice<=0 && monthgiftbag.payIntegral>0}}">
  182 + <view style="{{scene==1154 ? 'background:#b9b5b5':''}}" class="foot_button_intalge data-v-3a5b7e36 " bindtap="GetBuyIntegral" data-id="{{lbId}}">
  183 + <text class="data-v-3a5b7e36">立即兑换</text>
  184 + </view>
  185 + </block>
  186 + </block>
  187 +
  188 +
183 189 </view>
184 190 </block>
185 191 <block wx:else>
... ...
packageE/pages/user/monthgiftbag/public/buy_com.js
... ... @@ -244,7 +244,11 @@ module.exports = {
244 244 //-- 分享导购要记录 --
245 245 if (getApp().globalData.guide_id) {
246 246 json.guide_id = getApp().globalData.guide_id;
247   - }
  247 + }
  248 + //-- 如果是且的购买每月礼包的话 --
  249 + if(th.data.sele_g.money_type>0){
  250 + json.exchangeintegral=th.data.sele_g.payIntegral
  251 + }
248 252  
249 253 // var url ="/api/weshop/marketing/buy/receive/gift/record/insert";
250 254 var url ="/api/weshop/marketing/marketingMonthgiftbagRecord/createOrder";
... ...
packageE/pages/user/monthgiftbag/public/buy_com.wxml
... ... @@ -157,19 +157,26 @@
157 157 <view class="spec-goods-name ellipsis-2">{{sele_g.giftTitle}}</view>
158 158 <view class="flex ai_end xc-val-money">
159 159 <view class="spec-goods-price">
160   - <block wx:if="{{sele_g.payMoney>0}}">
161   - <text>{{"¥"+sele_g.payMoney}}</text>
162   - </block>
163   - <block wx:if="{{sele_g.payMoney>0&&sele_g.payIntegral>0}}">
164   - <text>/</text>
  160 +
  161 + <block wx:if="{{sele_g.money_type>0}}">
  162 + {{"¥"+sele_g.payMoney}}+{{sele_g.payIntegral}}积分
165 163 </block>
166   - <block wx:if="{{sele_g.payIntegral>0}}">
167   - <view class="flex">
168   - <text class="ellipsis-1">{{sele_g.payIntegral}}</text>
169   - <view>积分</view>
170   - </view>
  164 + <block wx:else>
  165 + <block wx:if="{{sele_g.payMoney>0}}">
  166 + <text>{{"¥"+sele_g.payMoney}}</text>
  167 + </block>
  168 + <block wx:if="{{sele_g.payMoney>0&&sele_g.payIntegral>0}}">
  169 + <text>/</text>
  170 + </block>
  171 + <block wx:if="{{sele_g.payIntegral>0}}">
  172 + <view class="flex">
  173 + <text class="ellipsis-1">{{sele_g.payIntegral}}</text>
  174 + <view>积分</view>
  175 + </view>
  176 + </block>
171 177 </block>
172 178  
  179 +
173 180 </view>
174 181 </view>
175 182  
... ...