wxd / MShopWeApp

Commit f1d1d0b5c909a3a1dfebc94ff7021f1574741aac

Authored by season
2 parents 23c1724b ae0ce075

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

Inline Side-by-side
Showing 30 changed files with 524 additions and 308 deletions
components/diy_advertising/diy_advertising.wxml
  View file @f1d1d0b
... ... @@ -129,11 +129,11 @@
129 129 </view>
130 130 <view class="clear"></view>
131 131 <!--2行三列-->
132   -<view class="{{object.aline ? 's4':''}}" wx:if='{{object.style==3}}' style="padding:0 {{object.two_side}}rpx;display: flex;{{object.aline ? ('flex-wrap: wrap;justify-content: space-between;') :''}} background-color:{{object.bg_color?object.bg_color:'none'}}">
  132 +<view class="{{object.aline>0 ? 's4':''}}" wx:if='{{object.style==3}}' style="padding:0 {{object.two_side}}rpx;display: flex;{{object.aline>0 ? ('flex-wrap: wrap;justify-content: space-between;') :''}} background-color:{{object.bg_color?object.bg_color:'none'}}">
133 133  
134 134 <block wx:for="{{object.data}}" wx:key="{{index}}">
135 135  
136   - <view class='s4_gk' wx:if="{{index==0}}" style="{{object.aline ? ('width:'+(750-2*object.two_side-2*object.jian_ge)/3+'rpx;') : 'flex:1;float:none;'}} ">
  136 + <view class='s4_gk' wx:if="{{index==0}}" style="{{object.aline>0 ? ('width:'+(750-2*object.two_side-2*object.jian_ge)/3+'rpx;') : 'flex:1;float:none;'}} ">
137 137 <block wx:if="{{item.src==''}}">
138 138 <text>200*200</text>
139 139 </block>
... ... @@ -169,7 +169,7 @@
169 169 </block>
170 170 </view>
171 171  
172   - <view class='s4_gk' wx:else style="{{object.aline ? ('width:'+(750-2*object.two_side-2*object.jian_ge)/3+'rpx;') : ('flex:1;float:none;margin-left:'+object.jian_ge+'rpx')}} ">
  172 + <view class='s4_gk' wx:else style="{{object.aline>0 ? ('width:'+(750-2*object.two_side-2*object.jian_ge)/3+'rpx;') : ('flex:1;float:none;margin-left:'+object.jian_ge+'rpx')}} ">
173 173 <block wx:if="{{item.src==''}}">
174 174 <text>200*200</text>
175 175 </block>
... ... @@ -206,7 +206,7 @@
206 206 </block>
207 207 </view>
208 208 </block>
209   - <view class="s4_gk" wx:if="{{object.aline && (object.data.length % 3)>0}}" style="{{('width:'+(750-2*object.two_side-2*object.jian_ge)/3+'rpx;height:0;')}}"></view>
  209 + <view class="s4_gk" wx:if="{{object.aline>0 && (object.data.length % 3)>0}}" style="{{('width:'+(750-2*object.two_side-2*object.jian_ge)/3+'rpx;height:0;')}}"></view>
210 210 </view>
211 211 <view class="clear"></view>
212 212  
... ...
components/diy_goodsGroup/diy_goodsGroup.js
  View file @f1d1d0b
... ... @@ -444,8 +444,10 @@ Component({
444 444 for (var i in goods) {
445 445 var val = goods[i];
446 446 var item = {};
447   - var prom_id = null;
448   -
  447 + var prom_id = null;
  448 +
  449 + item.prom_type = 0;
  450 + item.prom_id = 0;
449 451 var url = "/api/weshop/activitylist/getGoodActInfo";
450 452 var req_data = {
451 453 store_id: os.stoid, goodsidlist: val.goods_id, is_detail: 1, user_id: user_id
... ... @@ -479,7 +481,6 @@ Component({
479 481 prom_id = item.prom_id;
480 482  
481 483 var prom_type = item.prom_type; //0普通商品 1秒杀 6拼单 2团购 4积分购
482   -
483 484 var url = "";
484 485  
485 486 switch (prom_type) {
... ... @@ -489,7 +490,7 @@ Component({
489 490 url = "/api/ms/flash_sale/getNew/" + os.stoid + "/" + user_id + "/" + prom_id;
490 491 break;
491 492 case 2:
492   - url = "/api/weshop/goods/groupBuy/getActInfo/" + os.stoid + "/" + val.goods_id + "/" + prom_id
  493 + url = "/api/weshop/goods/groupBuy/getNewActInfo/" + os.stoid + "/" + val.goods_id + "/" + prom_id+"/"+user_id;
493 494 break;
494 495 case 4:
495 496 url = "/api/weshop/integralbuy/get/" + os.stoid + "/" + prom_id;
... ... @@ -541,6 +542,9 @@ Component({
541 542 th.data.requestData.push(item);
542 543 })
543 544 } else {
  545 + item.prom_type = 0;
  546 + item.prom_id = 0;
  547 + item.prom_price = null;
544 548 th.data.requestData.push(item);
545 549 }
546 550 }
... ...
components/diy_serviceCard/diy_serviceCard.js
  View file @f1d1d0b
... ... @@ -508,6 +508,9 @@ Component({
508 508 case 1:
509 509 url+="&prom_type=1&prom_id="+arr[0].act_id;
510 510 break;
  511 + case 2:
  512 + url="/packageG/pages/group_buy/goodsInfo/goodsInfo?goods_id="+gid+"&prom_id="+arr2[0].act_id;
  513 + break;
511 514 case 6:
512 515 url = `/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo?goods_id=${gid}&prom_type=${arr2[0].prom_type}&prom_id=${arr[0].act_id}`;
513 516 break;
... ...
components/show_encourage/show_encourage.js 0 → 100644
  View file @f1d1d0b
  1 +// components/show_encourage/show_encourage.js
  2 +var setting = getApp().globalData.setting
  3 +
  4 +Component({
  5 + /**
  6 + * 组件的属性列表
  7 + */
  8 + properties: {
  9 +
  10 + },
  11 +
  12 + /**
  13 + * 组件的初始数据
  14 + */
  15 + data: {
  16 + url: setting.imghost,
  17 + show:false,
  18 + itemobj:null,
  19 + },
  20 + pageLifetimes: {
  21 + show: function() {
  22 + // console.error('show');
  23 + // this.get_encourage()
  24 + // 页面被展示
  25 + },
  26 + hide: function() {
  27 + // 页面被隐藏
  28 + },
  29 + resize: function(size) {
  30 + // 页面尺寸变化
  31 + }
  32 + },
  33 + /**
  34 + * 组件的方法列表
  35 + */
  36 + methods: {
  37 + async get_encourage(){
  38 + let user_id = getApp().globalData.user_id;
  39 + let store_id= getApp().globalData.setting.stoid
  40 + console.error('获取大转盘');
  41 + if (!user_id) {
  42 + return
  43 + }
  44 + await getApp().request.promiseGet(`/api/weshop/marketing/marketingLuckForm/getPayTopLuckInfo/${store_id}/${user_id}`, {}).then(res => {
  45 + if (res.data.code==0 && res.data.data) {
  46 + let gd_category = res.data.data;
  47 + this.setData({
  48 + itemobj: gd_category,
  49 + show:true,
  50 + });
  51 + }
  52 + })
  53 + },
  54 + close_disgraceful(){
  55 + this.setData({
  56 + show:false
  57 + })
  58 + },
  59 + goto(){
  60 + let item = this.data.itemobj
  61 + let id = item.id;
  62 + let title = item.act_name;
  63 + if (!id) {
  64 + this.setData({
  65 + show:false
  66 + })
  67 + return
  68 + }
  69 + let url = `/packageB/pages/luckactivity/luckinfo/luckinfo?id=${id}&title=${title}`;
  70 + getApp().goto(url);
  71 + }
  72 + }
  73 +})
... ...
components/show_encourage/show_encourage.json 0 → 100644
  View file @f1d1d0b
  1 +{
  2 + "component": true,
  3 + "usingComponents": {}
  4 +}
0 5 \ No newline at end of file
... ...
components/show_encourage/show_encourage.wxml 0 → 100644
  View file @f1d1d0b
  1 +<!--components/show_encourage/show_encourage.wxml-->
  2 +<view class="encourage" wx:if="{{show}}">
  3 + <image catchtap="goto" src="{{url}}/miniapp/images/pay/encourage.gif" style="width: 600rpx;height: 575rpx;"></image>
  4 + <image class="close" src="{{url}}/miniapp/images/plus/Close.png" catchtap="close_disgraceful" mode="" />
  5 +</view>
... ...
components/show_encourage/show_encourage.wxss 0 → 100644
  View file @f1d1d0b
  1 +/* components/show_encourage/show_encourage.wxss */
  2 +
  3 +.encourage{
  4 + position: fixed;
  5 + top: 0;
  6 + left: 0;
  7 + width: 100vw;
  8 + height: 100vh;
  9 + z-index: 99999;
  10 + display: flex;
  11 + flex-direction: column;
  12 + align-items: center;
  13 + justify-content: center;
  14 + background-color: rgba(0, 0, 0, .3);
  15 +}
  16 +.close {
  17 + width: 60rpx;
  18 + height: 60rpx;
  19 +
  20 +}
0 21 \ No newline at end of file
... ...
packageA/pages/cardList/cardList.js
  View file @f1d1d0b
... ... @@ -57,6 +57,9 @@ Page({
57 57 let url = '/api/weshop/serviceCard/page';
58 58 let currentQuery = this.data.currentQuery;
59 59 if(app.globalData.userInfo) {
  60 +
  61 + currentQuery.user_id=app.globalData.user_id || 0;
  62 +
60 63 if(!this.data.isLogin) {
61 64 this.setData({
62 65 userInfo: app.globalData.userInfo,
... ... @@ -223,7 +226,7 @@ Page({
223 226 var req_d = {
224 227 "store_id": app.globalData.setting.stoid,
225 228 "goods_id": gid,
226   - "user_id": getApp().globalData.user_id,
  229 + "user_id": getApp().globalData.user_id || 0,
227 230 "goods_type":1
228 231 }
229 232 var res= await getApp().request.promiseGet(rurl, {data: req_d});
... ...
packageA/pages/distribution/goods/goods.wxml
  View file @f1d1d0b
... ... @@ -70,6 +70,7 @@
70 70  
71 71 <view class="content {{(options.index == 1 && currentTabIndex ==1) ? 'pdb0':''}}">
72 72 <checkbox-group class="fs26" wx:if="{{isShowRow}}" bindchange="checkboxChange">
  73 +
73 74 <view class="item bg-white flex ai-center pd16" wx:for="{{list.pageData}}">
74 75 <!-- <label>
75 76  
... ... @@ -225,7 +226,7 @@
225 226 <checkbox value="{{item.goods_id}}" checked="{{item.checked}}" data-name="checkbox" wx:if="{{!(options.index == 1 && currentTabIndex ==1)}}" />
226 227 <view>
227 228 <!-- 判断是否有活动价 -->
228   - <block wx:if="{{(item.prom_price>0 || item.prom_integral>0) && item.prom_type!=2 && item.prom_id>0 }}">
  229 + <block wx:if="{{(item.prom_price>0 || item.prom_integral>0) && item.prom_id>0 && item.prom_type!=7 && item.prom_type!=10 }}">
229 230 <view class="flex xc-wc ai-center">
230 231 <text wx:if="{{item.prom_integral}}"><text class="fs30">{{item.prom_integral}}</text>积分</text>
231 232 <text wx:if="{{item.prom_integral && item.prom_price}}">+</text>
... ...
packageA/pages/distribution/shop/shop.js
  View file @f1d1d0b
... ... @@ -134,6 +134,7 @@ Page({
134 134 currentQuery: {
135 135 store_id: app.globalData.setting.stoid,
136 136 user_id: app.globalData.user_id,
  137 + isnewwhere:1
137 138 },
138 139 });
139 140 !this.data.is_router&&this.initData();
... ...
packageA/pages/distribution/shop/shop.wxml
  View file @f1d1d0b
... ... @@ -235,7 +235,7 @@
235 235 <view class="pd20 fs26">
236 236 <view class="ellipsis-2 h68 mgb20">{{item.goods_name}}</view>
237 237 <!-- 判断是否有活动价 -->
238   - <block wx:if="{{(item.prom_price>0 || item.prom_integral>0) && item.prom_type!=2 && item.prom_id>0}}">
  238 + <block wx:if="{{(item.prom_price>0 || item.prom_integral>0) && item.prom_id>0 && item.prom_type!=7 && item.prom_type!=10}}">
239 239 <view class="flex xc-wc">
240 240 <text wx:if="{{item.prom_integral}}">
241 241 <text class="fs30" style="font-weight: bold;">{{item.prom_integral}}</text>
... ...
packageC/pages/group_list/group_list.js
  View file @f1d1d0b
... ... @@ -73,13 +73,16 @@ Page({
73 73 isLogin: true,
74 74 });
75 75  
  76 + let user_id=getApp().globalData.user_id || 0;
  77 +
76 78 let typeVal = this.data.type;
77 79 let url = '/api/weshop/goods/groupBuy/page';
78 80 let data = {
79 81 store_id: app.globalData.setting.stoid,
80 82 is_show: 1,
81 83 is_end: 0,
82   - timetype: typeVal
  84 + timetype: typeVal,
  85 + user_id:user_id
83 86 };
84 87  
85 88 this.setData({
... ...
packageC/pages/group_list/group_list.wxml
  View file @f1d1d0b
... ... @@ -46,6 +46,6 @@
46 46 <view style="height:60rpx"></view>
47 47 </view>
48 48  
49   -<view class="no-more" hidden="{{!noMore}}" wx:if="{{list.length >= 0 && noMore }}">—— 已经到底啦 ——</view>
  49 +<view class="no-more" hidden="{{!noMore}}" wx:if="{{list.length > 0 && noMore }}">—— 已经到底啦 ——</view>
50 50 <nodata nodataContainer="t-c" wx:if="{{list.length == 0 && is_get}}"></nodata>
51 51  
... ...
packageE/pages/togoin/togoin.js
  View file @f1d1d0b
... ... @@ -90,6 +90,8 @@ Page({
90 90 return app.my_warnning("登录需要授权手机号码！", 0, this);
91 91 return false;
92 92 }
  93 + if(this.data.sub) return false;
  94 + this.setData({ sub: 1 });
93 95 var sessionKey = getApp().globalData.sessionKey;
94 96 var openid = getApp().globalData.openid;
95 97 var r = getApp().globalData.getu;
... ... @@ -389,13 +391,16 @@ Page({
389 391  
390 392  
391 393 } else {
  394 + th.setData({ sub: 0 });
392 395 return app.my_warnning("授权登入失败,请稍后再试!", 0, that);
393 396 }
394 397 },
395 398 failStatus: function (t) {
  399 + th.setData({ sub: 0 });
396 400 return app.my_warnning("授权登入失败,请稍后再试!", 0, that);
397 401 },
398 402 fail: function (t) {
  403 + th.setData({ sub: 0 });
399 404 return i.clearAuth(), i.alertLoginErrorAndGoHome(), !1;
400 405 }
401 406 });
... ...
packageE/pages/user/monthgiftbag/payment/payment.js
  View file @f1d1d0b
... ... @@ -21,8 +21,22 @@ Page({
21 21 });
22 22 var money = parseFloat(options.money).toFixed(2), order_sn = options.order_sn;
23 23 this.setData({allmoney:money,order_sn:order_sn})
  24 + // if (money*1 > 0) {
  25 + // var encourage = this.selectComponent("#encourage"); //组件的id
  26 + // if (encourage){
  27 + // encourage.get_encourage();
  28 + // }
  29 + // }
  30 + },
  31 + onReady(){
  32 + // console.error(6666);
  33 + if (this.data.allmoney*1 > 0) {
  34 + var encourage = this.selectComponent("#encourage"); //组件的id
  35 + if (encourage){
  36 + encourage.get_encourage();
  37 + }
  38 + }
24 39 },
25   -
26 40 goto: function () {
27 41 var url = '/pages/index/index/index';
28 42 getApp().goto(url)
... ...
packageE/pages/user/monthgiftbag/payment/payment.json
  View file @f1d1d0b
1 1 {
2 2 "navigationBarTitleText": "支付成功",
3   - "usingComponents": {}
  3 + "usingComponents": {
  4 + "show_encourage": "/components/show_encourage/show_encourage"
  5 + }
4 6 }
5 7 \ No newline at end of file
... ...
packageE/pages/user/monthgiftbag/payment/payment.wxml
  View file @f1d1d0b
... ... @@ -53,4 +53,8 @@
53 53 </view>
54 54 </view>
55 55 </view>
56   -</view>
57 56 \ No newline at end of file
  57 +</view>
  58 +
  59 +
  60 +<!-- 满足抽奖提醒 -->
  61 +<show_encourage id="encourage"></show_encourage>
58 62 \ No newline at end of file
... ...
packageG/pages/goods/search/search.js
  View file @f1d1d0b
... ... @@ -241,7 +241,7 @@ Page({
241 241 url = "/api/ms/flash_sale/getNew/" + oo.stoid + "/" + user_id + "/" + prom_id;
242 242 break;
243 243 case 2:
244   - url = "/api/weshop/goods/groupBuy/getActInfo/" + oo.stoid + "/" + item.goods_id + "/" + prom_id
  244 + url = "/api/weshop/goods/groupBuy/getNewActInfo/" + oo.stoid + "/" + item.goods_id + "/" + prom_id+"/"+user_id;
245 245 break;
246 246 case 4:
247 247 url = "/api/weshop/integralbuy/get/" + oo.stoid + "/" + prom_id;
... ... @@ -298,24 +298,24 @@ Page({
298 298 var prom = null;
299 299 if (res.data.code == 0 && res.data.data) {
300 300 prom = res.data.data;
301   -
302   - if (prom != null && prom.is_end == 0 && prom.end_time > now && (prom.start_time < now || (prom_type!=2 && prom.show_time && prom.show_time < now))) {
303   - item.prom_price = res.data.data.price;
304   - if(prom_type==4){
305   - item.prom_price= res.data.data.addmoney;
306   - }
307   -
308   - if (res.data.data.user_price) item.prom_price = res.data.data.user_price;
309   - var vNum = prom.virtual_num ? prom.virtual_num : 0;
310   - var vNum1 = prom.virtualNum ? prom.virtualNum : 0;
311   - var vNum2 = prom.virtual ? prom.virtual : 0;
312   - item.sales_sum = prom.buy_num + (vNum + vNum1 + vNum2);
313   - } else {
314   - item.prom_type = 0;
315   - item.prom_id = 0;
316   - item.prom_price = null;
  301 + }
  302 + if (prom != null && prom.is_end == 0 && prom.end_time > now && (prom.start_time < now || (prom_type!=2 && prom.show_time && prom.show_time < now))) {
  303 + item.prom_price = res.data.data.price;
  304 + if(prom_type==4){
  305 + item.prom_price= res.data.data.addmoney;
317 306 }
  307 +
  308 + if (res.data.data.user_price) item.prom_price = res.data.data.user_price;
  309 + var vNum = prom.virtual_num ? prom.virtual_num : 0;
  310 + var vNum1 = prom.virtualNum ? prom.virtualNum : 0;
  311 + var vNum2 = prom.virtual ? prom.virtual : 0;
  312 + item.sales_sum = prom.buy_num + (vNum + vNum1 + vNum2);
  313 + } else {
  314 + item.prom_type = 0;
  315 + item.prom_id = 0;
  316 + item.prom_price = null;
318 317 }
  318 +
319 319 })
320 320 };
321 321 if (!th.data.requestData) th.data.requestData = [];
... ...
packageG/pages/group_buy/goodsInfo/goodsInfo.js
  View file @f1d1d0b
... ... @@ -871,60 +871,63 @@ Page({
871 871 var boughtNum = 0;
872 872 var is_ok = 1;
873 873  
874   - // 获取redis当前可以购买的数量
875   - // 如果数量为0，设置和显示已抢光
876   - // 否则，进一步判断是否超出限购或超出库存
877   - await this.getactLen().then(async function (res) {
878   - redisNums = res;
879   - let curNum = th.data.goodsInputNum;
880   - // res: redis可购买数量
881   - console.log('当前可以购买的数量:', res);
882   - if (res <= 0) {
883   - // 可购买数量<=0, 设置和显示已抢光
884   - th.setData({
885   - prom_r_null: 1,
886   - });
887   - getApp().my_warnning('超出活动库存', 0, self);
888   - is_ok = 0;
889   - return false;
890   - } else {
891   -
892   - if(curNum>redisNums){
  874 + if(this.data.prom_type == 2) {
  875 +
  876 + // 获取redis当前可以购买的数量
  877 + // 如果数量为0，设置和显示已抢光
  878 + // 否则，进一步判断是否超出限购或超出库存
  879 + await this.getactLen().then(async function (res) {
  880 + redisNums = res;
  881 + let curNum = th.data.goodsInputNum;
  882 + // res: redis可购买数量
  883 + console.log('当前可以购买的数量:', res);
  884 + if (res <= 0) {
  885 + // 可购买数量<=0, 设置和显示已抢光
  886 + th.setData({
  887 + prom_r_null: 1,
  888 + });
893 889 getApp().my_warnning('超出活动库存', 0, self);
894 890 is_ok = 0;
895 891 return false;
896   - }
897   - // 可购买数量>0
898   - // 计算自己还可以购买的数量
899   - // 自己还可购买的数量c = 每人活动限购数量a - 自己已经购买的数量b
900   - // 如果限购数量a>redis可购买数量d，当增加数量t>d, 提示超出库存
901   - // 如果限购数量a<=redis可购买数量d, 当增加数量t>a，提示超出限购
902   - let actInfo = th.data.sele_g;
903   - if(actInfo.buy_limit>0){
904   - await th.get_buy_num2().then(function (data) {
905   - let limited = actInfo.buy_limit; // 限购数量a
906   - let promcardbuynum = data.data.data.promcardbuynum;
907   - let canBuyNum = limited - promcardbuynum; // 自己还可购买的数量c
908   -
909   - limitNum = limited;
910   - boughtNum = promcardbuynum;
  892 + } else {
911 893  
912   - if (canBuyNum <= 0) {
913   - canBuyNum = 0;
914   - }
  894 + if (curNum > redisNums) {
  895 + getApp().my_warnning('超出活动库存', 0, self);
  896 + is_ok = 0;
  897 + return false;
  898 + }
  899 + // 可购买数量>0
  900 + // 计算自己还可以购买的数量
  901 + // 自己还可购买的数量c = 每人活动限购数量a - 自己已经购买的数量b
  902 + // 如果限购数量a>redis可购买数量d，当增加数量t>d, 提示超出库存
  903 + // 如果限购数量a<=redis可购买数量d, 当增加数量t>a，提示超出限购
  904 + let actInfo = th.data.sele_g;
  905 + if (actInfo.buy_limit > 0) {
  906 + await th.get_buy_num2().then(function (data) {
  907 + let limited = actInfo.buy_limit; // 限购数量a
  908 + let promcardbuynum = data.data.data.promcardbuynum;
  909 + let canBuyNum = limited - promcardbuynum; // 自己还可购买的数量c
  910 +
  911 + limitNum = limited;
  912 + boughtNum = promcardbuynum;
  913 +
  914 + if (canBuyNum <= 0) {
  915 + canBuyNum = 0;
  916 + }
915 917  
916   - if (curNum > canBuyNum) {
917   - getApp().my_warnning('超出限购数量', 0, self);
918   - th.setData({
919   - goodsInputNum: canBuyNum || 1,
920   - });
921   - is_ok = 0;
922   - return false;
923   - }
924   - })
  918 + if (curNum > canBuyNum) {
  919 + getApp().my_warnning('超出限购数量', 0, self);
  920 + th.setData({
  921 + goodsInputNum: canBuyNum || 1,
  922 + });
  923 + is_ok = 0;
  924 + return false;
  925 + }
  926 + })
  927 + }
925 928 }
926   - }
927   - })
  929 + })
  930 + }
928 931  
929 932 if (!is_ok) return false;
930 933  
... ... @@ -2929,7 +2932,7 @@ Page({
2929 2932 prom_r_null: 1
2930 2933 });
2931 2934 //拿取价格并且判断时间--
2932   - getApp().request.get("/api/weshop/goods/groupBuy/getActInfo/" + os.stoid + "/" + gid + "/" + prom_id, {
  2935 + getApp().request.get("/api/weshop/goods/groupBuy/getNewActInfo/" + os.stoid + "/" + gid + "/" + prom_id+"/"+user_id, {
2933 2936 success: function (t) {
2934 2937 if (t.data.code != 0) {
2935 2938 ee.get_normal(gid);
... ...
packageG/pages/payment/pay_success/pay_success.js
  View file @f1d1d0b
... ... @@ -133,9 +133,13 @@ Page({
133 133 };
134 134  
135 135  
136   -
137 136 },
138   -
  137 + onReady(){
  138 + var encourage = this.selectComponent("#encourage"); //组件的id
  139 + if (encourage){
  140 + encourage.get_encourage();
  141 + }
  142 + },
139 143 goto: function() {
140 144 var url= '/pages/index/index/index';
141 145 getApp().goto(url)
... ...
packageG/pages/payment/pay_success/pay_success.json
  View file @f1d1d0b
1 1 {
2   - "navigationBarTitleText": "支付成功"
  2 + "navigationBarTitleText": "支付成功",
  3 + "usingComponents": {
  4 + "show_encourage": "/components/show_encourage/show_encourage"
  5 + }
3 6 }
4 7 \ No newline at end of file
... ...
packageG/pages/payment/pay_success/pay_success.wxml
  View file @f1d1d0b
... ... @@ -148,4 +148,8 @@
148 148  
149 149 <view class="shequn" style="margin-top:20rpx；" bindtap="gotoshequn" wx:if="{{banner}}" data-url="{{banner[0].ad_weapplink}}">
150 150 <image src="{{banner[0].ad_code}}" mode="widthFix" style="width: 100%;border-radius: 15rpx;" />
151   -</view>
152 151 \ No newline at end of file
  152 +</view>
  153 +
  154 +
  155 +<!-- 满足抽奖提醒 -->
  156 +<show_encourage id="encourage"></show_encourage>
153 157 \ No newline at end of file
... ...
pages/giftpack/payment/payment.js
  View file @f1d1d0b
... ... @@ -21,6 +21,18 @@ Page({
21 21 });
22 22 var money = parseFloat(options.money), order_sn = options.order_sn;
23 23 this.setData({allmoney:money,order_sn:order_sn})
  24 +
  25 +
  26 +
  27 + },
  28 + onReady(){
  29 + // console.error(6666);
  30 + if (this.data.allmoney*1 > 0) {
  31 + var encourage = this.selectComponent("#encourage"); //组件的id
  32 + if (encourage){
  33 + encourage.get_encourage();
  34 + }
  35 + }
24 36 },
25 37  
26 38 goto: function () {
... ...
pages/giftpack/payment/payment.json
  View file @f1d1d0b
1 1 {
2 2 "navigationBarTitleText": "支付成功",
3   - "usingComponents": {}
  3 + "usingComponents": {
  4 + "show_encourage": "/components/show_encourage/show_encourage"
  5 + }
4 6 }
5 7 \ No newline at end of file
... ...
pages/giftpack/payment/payment.wxml
  View file @f1d1d0b
... ... @@ -54,4 +54,8 @@
54 54 </view>
55 55 </view>
56 56 </view>
57   -</view>
58 57 \ No newline at end of file
  58 +</view>
  59 +
  60 +
  61 +<!-- 满足抽奖提醒 -->
  62 +<show_encourage id="encourage"></show_encourage>
59 63 \ No newline at end of file
... ...
pages/goods/categoryList/categoryList.js
  View file @f1d1d0b
... ... @@ -1068,10 +1068,11 @@ Page({
1068 1068  
1069 1069 requestGoodsList: function (t) {
1070 1070 var that = this;
  1071 + var user=getApp().globalData.user_id || 0;
1071 1072 that.data.requestUrl = t;
1072 1073 console.error(666666);
1073   - e.get("/api/weshop/goods/page?1=1", {
1074   - data: { page: that.data.stylePage, cat_id: that.data.cat_id, parent_id: 0, orderField: 'sort', orderType: 'asc', is_mainshow: 1, isonsale: 1, store_id: oo.stoid, is_recommend: 1 },
  1074 + e.get("/api/weshop/goods/page?1=1&isnewwhere=1", {
  1075 + data: { page: that.data.stylePage, cat_id: that.data.cat_id, parent_id: 0, orderField: 'sort', orderType: 'asc', is_mainshow: 1, isonsale: 1, store_id: oo.stoid, is_recommend: 1,user_id:user_id },
1075 1076 success: function (data) {
1076 1077 console.log(data.data.data.pageData)
1077 1078 that.setData({
... ... @@ -1173,8 +1174,9 @@ Page({
1173 1174 console.log("cid:=" + cid)
1174 1175 console.log("cid:=" + this.data.cat_id);
1175 1176 var s = this
1176   - e.get("/api/weshop/goods/page?1=1", {
1177   - data: { page: page, cat_id: cid, parent_id: 0, orderField: 'sort', orderType: 'asc', is_mainshow: 1, isonsale: 1, store_id: oo.stoid, is_recommend: 1 },
  1177 + var user_id=getApp().globalData.user_id || 0;
  1178 + e.get("/api/weshop/goods/page?1=1&isnewwhere=1", {
  1179 + data: { page: page, cat_id: cid, parent_id: 0, orderField: 'sort', orderType: 'asc', is_mainshow: 1, isonsale: 1, store_id: oo.stoid, is_recommend: 1,user_id:user_id },
1178 1180 success: function (e) {
1179 1181 console.log('上拉加载。。。。。。。。。');
1180 1182 console.log(e.data.data.pageData)
... ...
pages/goods/goodsInfo/goodsInfo.js
  View file @f1d1d0b
... ... @@ -1048,79 +1048,64 @@ Page({
1048 1048  
1049 1049  
1050 1050 this.wait_for_store_config();
1051   - //先检验一下商品的活动情况
1052   - this.check_gd_prom_new(function () {
1053 1051  
1054   - //-- 8是预售 --
1055   - if (ee.data.prom_type == 8) {
1056   - getApp().goto("/packageC/pages/presell/goodsInfo/goodsInfo?goods_id=" + ee.data.gid + "&prom_id=" + ee.data.prom_id);
1057   - return false;
1058   - }
  1052 + setTimeout(()=>{
  1053 + //先检验一下商品的活动情况
  1054 + this.check_gd_prom_new(function () {
1059 1055  
1060   - //-- 9是幸运购 --
1061   - if (ee.data.prom_type == 9) {
1062   - var lk_url = "/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo?goods_id=" + ee.data.gid + "&group_id=" + ee.data.prom_id + "&prom_type=9";
1063   - getApp().goto(lk_url);
1064   - return false;
1065   - }
  1056 + //-- 8是预售 --
  1057 + if (ee.data.prom_type == 8) {
  1058 + getApp().goto("/packageC/pages/presell/goodsInfo/goodsInfo?goods_id=" + ee.data.gid + "&prom_id=" + ee.data.prom_id);
  1059 + return false;
  1060 + }
1066 1061  
1067   - i.get("/api/weshop/goods/get/" + o.stoid + "/" + ee.data.gid, {
1068   - failRollback: !0,
1069   - success: function (t) {
1070   - console.log(t);
1071   - // t.data.data.prom_type=0
1072   - if (t.data.code == 0) {
1073   - if (t.data.data && t.data.data.prom_type == 4) {
1074   - if (ee.data.prom_type4 == 1) {
1075   - t.data.data.prom_type = 0
  1062 + //-- 9是幸运购 --
  1063 + if (ee.data.prom_type == 9) {
  1064 + var lk_url = "/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo?goods_id=" + ee.data.gid + "&group_id=" + ee.data.prom_id + "&prom_type=9";
  1065 + getApp().goto(lk_url);
  1066 + return false;
  1067 + }
  1068 +
  1069 + i.get("/api/weshop/goods/get/" + o.stoid + "/" + ee.data.gid, {
  1070 + failRollback: !0,
  1071 + success: function (t) {
  1072 + console.log(t);
  1073 + // t.data.data.prom_type=0
  1074 + if (t.data.code == 0) {
  1075 + if (t.data.data && t.data.data.prom_type == 4) {
  1076 + if (ee.data.prom_type4 == 1) {
  1077 + t.data.data.prom_type = 0
  1078 + }
1076 1079 }
1077   - }
1078 1080  
1079   - var p_fail=0;
  1081 + var p_fail=0;
1080 1082  
1081   - if (t.data.data.is_on_sale != 1 ) {
1082   - p_fail=1;
1083   - wx.showModal({
1084   - title: '商品已经下架',
1085   - showCancel: !1,
1086   - complete: function () {
  1083 + if (t.data.data.is_on_sale != 1 ) {
  1084 + p_fail=1;
  1085 + wx.showModal({
  1086 + title: '商品已经下架',
  1087 + showCancel: !1,
  1088 + complete: function () {
1087 1089 let pages = getCurrentPages();
1088 1090 if (pages[pages.length - 2]) {
1089 1091 wx.navigateBack();
1090 1092 } else {
1091 1093 getApp().goto('/pages/index/index/index')
1092 1094 }
1093   - }
1094   - });
1095   -
1096   - }
  1095 + }
  1096 + });
1097 1097  
1098   - ee.init(gid);
  1098 + }
1099 1099  
1100   - var timestamp = Date.parse(new Date());
1101   - timestamp = timestamp / 1000;
1102   - if (t.data.data.on_time > timestamp && !p_fail) {
1103   - wx.showModal({
1104   - title: '商品还未上架',
1105   - showCancel: !1,
1106   - complete: function () {
1107   - let pages = getCurrentPages();
1108   - if (pages[pages.length - 2]) {
1109   - wx.navigateBack();
1110   - } else {
1111   - getApp().goto('/pages/index/index/index')
1112   - }
1113   - }
1114   - });
1115   - }
  1100 + ee.init(gid);
1116 1101  
1117   - if (t.data.data.down_time > 0 && !p_fail) {
1118   - if (t.data.data.down_time < timestamp ) {
  1102 + var timestamp = Date.parse(new Date());
  1103 + timestamp = timestamp / 1000;
  1104 + if (t.data.data.on_time > timestamp && !p_fail) {
1119 1105 wx.showModal({
1120   - title: '商品已经到期下架',
  1106 + title: '商品还未上架',
1121 1107 showCancel: !1,
1122 1108 complete: function () {
1123   -
1124 1109 let pages = getCurrentPages();
1125 1110 if (pages[pages.length - 2]) {
1126 1111 wx.navigateBack();
... ... @@ -1130,198 +1115,217 @@ Page({
1130 1115 }
1131 1116 });
1132 1117 }
1133   - }
1134 1118  
  1119 + if (t.data.data.down_time > 0 && !p_fail) {
  1120 + if (t.data.data.down_time < timestamp ) {
  1121 + wx.showModal({
  1122 + title: '商品已经到期下架',
  1123 + showCancel: !1,
  1124 + complete: function () {
1135 1125  
1136   - //动态获取商品名称
1137   - // wx.setNavigationBarTitle({
1138   - // title: t.data.data.goods_name,
1139   - // });
  1126 + let pages = getCurrentPages();
  1127 + if (pages[pages.length - 2]) {
  1128 + wx.navigateBack();
  1129 + } else {
  1130 + getApp().goto('/pages/index/index/index')
  1131 + }
  1132 + }
  1133 + });
  1134 + }
  1135 + }
1140 1136  
1141   - ee.setData({gtitle:t.data.data.goods_name})
1142 1137  
  1138 + //动态获取商品名称
  1139 + // wx.setNavigationBarTitle({
  1140 + // title: t.data.data.goods_name,
  1141 + // });
1143 1142  
1144   - var p_type = parseInt(ee.data.prom_type ? ee.data.prom_type : 0);
  1143 + ee.setData({gtitle:t.data.data.goods_name})
1145 1144  
1146   - //-- 判断是不是组合购活动,必须要登录后才能判断 --
1147   - if (getApp().globalData.userInfo && t.data.data.prom_type == 7 && [1, 2, 4, 6, 8, 9].indexOf(p_type) == -1) {
1148   - //获取活动信息
1149   - var url = "/api/weshop/prom/zhbuy/get/" + os.stoid + "/" +
1150   - t.data.data.prom_id + "/" + getApp().globalData.user_id;
1151   - getApp().request.get(url, {
1152   - success: function (e) {
1153   - if (e.data.code == 0 && e.data.data) {
1154   - if (ut.gettimestamp() < e.data.data.start_time) {
1155   - return false;
1156   - }
1157   - if (e.data.data.is_end == 0 && ut.gettimestamp() < e.data.data.end_time) {
1158   - //-- 获取商品列表 --
1159   - th.setData({
1160   - zh_act: e.data.data
1161   - });
1162   - th.getUserBuyPromNum(e.data.data.id)
1163   - }
1164 1145  
  1146 + var p_type = parseInt(ee.data.prom_type ? ee.data.prom_type : 0);
  1147 +
  1148 + //-- 判断是不是组合购活动,必须要登录后才能判断 --
  1149 + if (getApp().globalData.userInfo && t.data.data.prom_type == 7 && [1, 2, 4, 6, 8, 9].indexOf(p_type) == -1) {
  1150 + //获取活动信息
  1151 + var url = "/api/weshop/prom/zhbuy/get/" + os.stoid + "/" +
  1152 + t.data.data.prom_id + "/" + getApp().globalData.user_id;
  1153 + getApp().request.get(url, {
  1154 + success: function (e) {
  1155 + if (e.data.code == 0 && e.data.data) {
  1156 + if (ut.gettimestamp() < e.data.data.start_time) {
  1157 + return false;
  1158 + }
  1159 + if (e.data.data.is_end == 0 && ut.gettimestamp() < e.data.data.end_time) {
  1160 + //-- 获取商品列表 --
  1161 + th.setData({
  1162 + zh_act: e.data.data
  1163 + });
  1164 + th.getUserBuyPromNum(e.data.data.id)
  1165 + }
  1166 +
  1167 + }
1165 1168 }
1166   - }
1167   - });
1168   - }
  1169 + });
  1170 + }
1169 1171  
1170   - //-- 把商品的赋值,同时给活动赋值 --
1171   - ee.data.fir_goods = JSON.parse(JSON.stringify(t.data.data));
1172   - // if (t.data.data.prom_type && t.data.data.prom_id && !ee.data.prom_type) {
1173   - // ee.data.prom_type = t.data.data.prom_type;
1174   - // ee.data.prom_id = t.data.data.prom_id;
1175   - // }
  1172 + //-- 把商品的赋值,同时给活动赋值 --
  1173 + ee.data.fir_goods = JSON.parse(JSON.stringify(t.data.data));
  1174 + // if (t.data.data.prom_type && t.data.data.prom_id && !ee.data.prom_type) {
  1175 + // ee.data.prom_type = t.data.data.prom_type;
  1176 + // ee.data.prom_id = t.data.data.prom_id;
  1177 + // }
1176 1178  
1177 1179  
1178   -
1179   - t.data.data.on_time = ut.formatTime(t.data.data.on_time, 'yyyy-MM-dd hh:mm:ss');
1180 1180  
1181   - var cur_price = t.data.data.shop_price;
1182   - if (getApp().globalData.userInfo && getApp().globalData.userInfo.card_field) {
1183   - var cfile = getApp().globalData.userInfo.card_field;
1184   - if (t.data.data[cfile]) {
1185   - cur_price = t.data.data[cfile];
  1181 + t.data.data.on_time = ut.formatTime(t.data.data.on_time, 'yyyy-MM-dd hh:mm:ss');
  1182 +
  1183 + var cur_price = t.data.data.shop_price;
  1184 + if (getApp().globalData.userInfo && getApp().globalData.userInfo.card_field) {
  1185 + var cfile = getApp().globalData.userInfo.card_field;
  1186 + if (t.data.data[cfile]) {
  1187 + cur_price = t.data.data[cfile];
  1188 + }
1186 1189 }
1187   - }
1188   - var txt = (cur_price / t.data.data.market_price * 10).toFixed(2).toString();
1189   - txt = parseFloat(txt);
  1190 + var txt = (cur_price / t.data.data.market_price * 10).toFixed(2).toString();
  1191 + txt = parseFloat(txt);
1190 1192  
1191   - t.data.data['disc'] = txt;
  1193 + t.data.data['disc'] = txt;
1192 1194  
1193   - if (t.data.data.original_img.indexOf(o.imghost) == -1)
1194   - t.data.data.original_img = o.imghost + t.data.data.original_img;
  1195 + if (t.data.data.original_img.indexOf(o.imghost) == -1)
  1196 + t.data.data.original_img = o.imghost + t.data.data.original_img;
1195 1197  
1196   - /* -----商品详情---
1197   - if (t.data.data.goods_content == null) t.data.data.goods_content = "";
1198   - if (!t.data.data.goods_content) t.data.data.goods_content = " ";
1199   - a.wxParse("content", "html", ut.format_content(t.data.data.goods_content), ee, 6);
1200   - e.wxParseAddFullImageUrl(ee, "content");--*/
  1198 + /* -----商品详情---
  1199 + if (t.data.data.goods_content == null) t.data.data.goods_content = "";
  1200 + if (!t.data.data.goods_content) t.data.data.goods_content = " ";
  1201 + a.wxParse("content", "html", ut.format_content(t.data.data.goods_content), ee, 6);
  1202 + e.wxParseAddFullImageUrl(ee, "content");--*/
1201 1203  
1202   - getApp().deal_iframe(a,e,'content',t.data.data.goods_content,ee);
  1204 + getApp().deal_iframe(a,e,'content',t.data.data.goods_content,ee);
1203 1205  
1204   - //if (ee.data.prom_type) {
1205   - t.data.data.prom_type = ee.data.prom_type;
1206   - t.data.data.prom_id = ee.data.prom_id;
  1206 + //if (ee.data.prom_type) {
  1207 + t.data.data.prom_type = ee.data.prom_type;
  1208 + t.data.data.prom_id = ee.data.prom_id;
1207 1209  
1208   - //只有是普通商品的时候，才要给商品赋值指定门店
1209   - if ([1, 2, 4, 6, 8, 9].indexOf(parseInt(ee.data.prom_type))<0 && t.data.data.pick_up_lists && t.data.data.pick_up_lists.length) {
1210   - t.data.data.pickup_ids = t.data.data.pick_up_lists;
1211   - }
1212   - //}
1213   - ee.setData({
1214   - data: t.data.data,
1215   - sele_g: t.data.data,
1216   - userInfo: getApp().globalData.userInfo,
1217   - front_g: ut.deep_cp(t.data.data),
1218   - });
  1210 + //只有是普通商品的时候，才要给商品赋值指定门店
  1211 + if ([1, 2, 4, 6, 8, 9].indexOf(parseInt(ee.data.prom_type))<0 && t.data.data.pick_up_lists && t.data.data.pick_up_lists.length) {
  1212 + t.data.data.pickup_ids = t.data.data.pick_up_lists;
  1213 + }
  1214 + //}
  1215 + ee.setData({
  1216 + data: t.data.data,
  1217 + sele_g: t.data.data,
  1218 + userInfo: getApp().globalData.userInfo,
  1219 + front_g: ut.deep_cp(t.data.data),
  1220 + });
1219 1221  
1220   - //一件代发商品不去计算优惠
1221   - //if (!ee.data.fir_goods.whsle_id && ee.data.prom_type != 1 && ee.data.prom_type != 4 && ee.data.prom_type != 6 && ee.data.prom_type != 2) {
1222   - if (!ee.data.fir_goods.whsle_id && ee.data.prom_type != 1 && ee.data.prom_type != 4 && ee.data.prom_type != 6 && ee.data.prom_type != 2) {
  1222 + //一件代发商品不去计算优惠
  1223 + //if (!ee.data.fir_goods.whsle_id && ee.data.prom_type != 1 && ee.data.prom_type != 4 && ee.data.prom_type != 6 && ee.data.prom_type != 2) {
  1224 + if (!ee.data.fir_goods.whsle_id && ee.data.prom_type != 1 && ee.data.prom_type != 4 && ee.data.prom_type != 6 && ee.data.prom_type != 2) {
1223 1225 ee.check_is_youhui(ee.data.gid);
1224   - }
1225   -
1226   - //获取统一条形码,普通商品和优惠促销的商品
1227   - if (ee.data.data.prom_type == 0 || ee.data.data.prom_type == 3 || ee.data.data.prom_type == 5 || ee.data.data.prom_type == 7 || ee.data.data.prom_type == 9 || ee.data.data.prom_type == 10) {
1228   - ee.get_sto();
1229   - ee.get_sku(o.stoid, t.data.data, gid);
1230   - ee.check_has_flash();
1231   -
1232   - } else {
1233   - var gg = "",
1234   - item = t.data.data;
  1226 + }
1235 1227  
1236   - if (item.goods_spec == "null" || item.goods_spec == null) item.goods_spec = "";
1237   - if (item.goods_color == "null" || item.goods_color == null) item.goods_color = "";
  1228 + //获取统一条形码,普通商品和优惠促销的商品
  1229 + if (ee.data.data.prom_type == 0 || ee.data.data.prom_type == 3 || ee.data.data.prom_type == 5 || ee.data.data.prom_type == 7 || ee.data.data.prom_type == 9 || ee.data.data.prom_type == 10) {
  1230 + ee.get_sto();
  1231 + ee.get_sku(o.stoid, t.data.data, gid);
  1232 + ee.check_has_flash();
1238 1233  
1239   - if (item.goods_spec != "" && item.goods_color != "") {
1240   - gg = item.goods_spec + "/" + item.goods_color;
1241   - } else if (item.goods_spec != "" || item.goods_color != "") {
1242   - gg = item.goods_spec + item.goods_color;
1243 1234 } else {
1244   - gg = "规格1";
  1235 + var gg = "",
  1236 + item = t.data.data;
  1237 +
  1238 + if (item.goods_spec == "null" || item.goods_spec == null) item.goods_spec = "";
  1239 + if (item.goods_color == "null" || item.goods_color == null) item.goods_color = "";
  1240 +
  1241 + if (item.goods_spec != "" && item.goods_color != "") {
  1242 + gg = item.goods_spec + "/" + item.goods_color;
  1243 + } else if (item.goods_spec != "" || item.goods_color != "") {
  1244 + gg = item.goods_spec + item.goods_color;
  1245 + } else {
  1246 + gg = "规格1";
  1247 + }
  1248 + t.data.data.gg = gg;
  1249 + var uu = [];
  1250 + uu.push(t.data.data);
  1251 + ee.setData({
  1252 + sku_g: uu,
  1253 + });
1245 1254 }
1246   - t.data.data.gg = gg;
1247   - var uu = [];
1248   - uu.push(t.data.data);
1249   - ee.setData({
1250   - sku_g: uu,
1251   - });
1252   - }
1253   - ee.data.g_buy_num = new Map();
  1255 + ee.data.g_buy_num = new Map();
1254 1256  
1255 1257  
1256   - //再返回的时候，prom_id要以f_prom_act为准
1257   - var c_prom_id=ee.data.data.prom_id;
1258   - if(ee.data.f_prom_act) c_prom_id=ee.data.f_prom_act.id;
  1258 + //再返回的时候，prom_id要以f_prom_act为准
  1259 + var c_prom_id=ee.data.data.prom_id;
  1260 + if(ee.data.f_prom_act) c_prom_id=ee.data.f_prom_act.id;
1259 1261  
1260   - //-- 增加相同的活动 --
1261   - ee.check_prom(gid, ee.data.data.prom_type, c_prom_id);
  1262 + //-- 增加相同的活动 --
  1263 + ee.check_prom(gid, ee.data.data.prom_type, c_prom_id);
1262 1264  
1263   - var th = ee;
1264   - if (ee.data.cat_name == '') {
1265   - //过去国别，分类，品牌的名称
1266   - i.get("/api/weshop/goodscategory/get/" + o.stoid + "/" + th.data.data.cat_id, {
1267   - success: function (t) {
1268   - var dd = t.data.data;
1269   - if (t.data.code == 0) {
1270   - th.setData({
1271   - cat_name: dd.name
1272   - });
  1265 + var th = ee;
  1266 + if (ee.data.cat_name == '') {
  1267 + //过去国别，分类，品牌的名称
  1268 + i.get("/api/weshop/goodscategory/get/" + o.stoid + "/" + th.data.data.cat_id, {
  1269 + success: function (t) {
  1270 + var dd = t.data.data;
  1271 + if (t.data.code == 0) {
  1272 + th.setData({
  1273 + cat_name: dd.name
  1274 + });
  1275 + }
1273 1276 }
1274   - }
1275   - });
1276   - //过去国别，分类，品牌的名称
1277   - i.get("/api/weshop/brand/get/" + o.stoid + "/" + th.data.data.brand_id, {
1278   - success: function (t) {
1279   - var dd = t.data.data;
1280   - if (t.data.code == 0) {
1281   - th.setData({
1282   - brand_name: dd.name
1283   - });
  1277 + });
  1278 + //过去国别，分类，品牌的名称
  1279 + i.get("/api/weshop/brand/get/" + o.stoid + "/" + th.data.data.brand_id, {
  1280 + success: function (t) {
  1281 + var dd = t.data.data;
  1282 + if (t.data.code == 0) {
  1283 + th.setData({
  1284 + brand_name: dd.name
  1285 + });
  1286 + }
1284 1287 }
1285   - }
1286   - });
1287   - //过去国别，分类，品牌的名称
1288   - i.get("/api/weshop/nation/get/" + o.stoid + "/" + th.data.data.nation_id, {
1289   - success: function (t) {
1290   - var dd = t.data.data;
1291   - if (t.data.code == 0) {
1292   - th.setData({
1293   - nation_name: dd.name
1294   - });
  1288 + });
  1289 + //过去国别，分类，品牌的名称
  1290 + i.get("/api/weshop/nation/get/" + o.stoid + "/" + th.data.data.nation_id, {
  1291 + success: function (t) {
  1292 + var dd = t.data.data;
  1293 + if (t.data.code == 0) {
  1294 + th.setData({
  1295 + nation_name: dd.name
  1296 + });
  1297 + }
1295 1298 }
  1299 + });
  1300 + }
  1301 +
  1302 + } else {
  1303 + wx.showModal({
  1304 + title: t.data.msg,
  1305 + showCancel: !1,
  1306 + complete: function () {
  1307 + wx.navigateBack();
1296 1308 }
1297 1309 });
1298 1310 }
1299 1311  
1300   - } else {
1301   - wx.showModal({
1302   - title: t.data.msg,
1303   - showCancel: !1,
1304   - complete: function () {
1305   - wx.navigateBack();
1306   - }
1307   - });
1308   - }
1309   -
1310   - console.log('bbbbbbbbbbbbbb');
1311   - console.log(th.data.prom_type);
  1312 + console.log('bbbbbbbbbbbbbb');
  1313 + console.log(th.data.prom_type);
1312 1314  
1313 1315  
1314   - setTimeout(() => {
1315   - console.log('cccc');
1316   - console.log(th.data.prom_type);
  1316 + setTimeout(() => {
  1317 + console.log('cccc');
  1318 + console.log(th.data.prom_type);
  1319 + console.log(th.data.sele_g);
1317 1320  
1318   - }, 500)
  1321 + }, 1500)
1319 1322  
1320 1323  
1321 1324  
1322   - }
1323   - });
1324   - })
  1325 + }
  1326 + });
  1327 + })
  1328 + },1500)
1325 1329  
1326 1330 console.log('aaaaaaaaaa');
1327 1331 console.log(this.data.prom_type);
... ... @@ -3295,9 +3299,15 @@ Page({
3295 3299 var goodsinfo = arrdata[i],
3296 3300 prom = null;
3297 3301  
  3302 +
  3303 +
3298 3304 if (goodsinfo.goods_id != g_id) {
3299 3305  
3300 3306  
  3307 + goodsinfo.prom_type=0;
  3308 + goodsinfo.prom_id=0;
  3309 +
  3310 +
3301 3311 //要判断一下商品的活动是不是多活动，确定一下商品的prom_type
3302 3312 var url = '/api/weshop/activitylist/listGoodActInfo2New';
3303 3313 var req_d = {
... ... @@ -3355,6 +3365,9 @@ Page({
3355 3365  
3356 3366 }else{
3357 3367  
  3368 + goodsinfo.prom_type=tt.data.prom_type;
  3369 + goodsinfo.prom_id=tt.data.prom_id;
  3370 +
3358 3371 //只有是普通商品的时候，才要给商品赋值指定门店
3359 3372 if ([1, 2, 4, 6, 8, 9].indexOf(parseInt(this.data.prom_type)) <0 || is_normal) {
3360 3373 //如果商品有设置分组
... ... @@ -4761,7 +4774,7 @@ Page({
4761 4774 prom_r_null: 1
4762 4775 });
4763 4776 //拿取价格并且判断时间--
4764   - getApp().request.get("/api/weshop/goods/groupBuy/getActInfo/" + os.stoid + "/" + gid + "/" + prom_id, {
  4777 + getApp().request.get("/api/weshop/goods/groupBuy/getNewActInfo/" + os.stoid + "/" + gid + "/" + prom_id+"/"+user_id, {
4765 4778 success: function (t) {
4766 4779 if (t.data.code != 0) {
4767 4780 ee.get_normal(gid);
... ... @@ -5451,7 +5464,7 @@ Page({
5451 5464 user_id: user_id,
5452 5465 goods_id: gd.goods_id,
5453 5466 prom_type: gd.prom_type,
5454   - prom_id: gd.prom_id, isnew:1
  5467 + prom_id: gd.prom_id, isnew:1,
5455 5468 },
5456 5469 //-----获取-----
5457 5470 success: function (tt) {
... ... @@ -8324,8 +8337,9 @@ Page({
8324 8337 user_id: user_id,
8325 8338 goods_id: gid,
8326 8339 prom_type: 3,
8327   - prom_id: fir_act.prom_id, isnew:1
  8340 + prom_id: fir_act.prom_id, isnew:1,
8328 8341 };
  8342 +
8329 8343 var gd_limit_rs=await getApp().promiseGet('/api/weshop/ordergoods/getUserBuyGoodsNum',{data:lrs});
8330 8344 var pro_by_num=0;
8331 8345 if(gd_limit_rs && gd_limit_rs.data.code==0){
... ... @@ -9015,12 +9029,26 @@ Page({
9015 9029 con_weixin: function () {
9016 9030 getApp().con_wx(this);
9017 9031 },
  9032 + customer_chat: function () {
  9033 + var goods_id=this.data.front_g.goods_id;
  9034 + getApp().customer_chat(goods_id);
  9035 + },
9018 9036  
9019 9037 get_normal(gid) {
9020   - this.setData({
9021   - prom_type: 0,
9022   - isshow: 1,
9023   - });
  9038 +
  9039 + var set_ob={};
  9040 + if (this.data.data.pick_up_lists && this.data.data.pick_up_lists.length) {
  9041 + set_ob={
  9042 + ['data.pickup_ids']:this.data.data.pick_up_lists,
  9043 + ['sele_g.pickup_ids']:this.data.data.pick_up_lists,
  9044 + ['front_g.pickup_ids']:this.data.data.pick_up_lists,
  9045 + }
  9046 + }
  9047 + set_ob.prom_type= 0;
  9048 + set_ob.isshow=1;
  9049 + this.setData(set_ob);
  9050 +
  9051 +
9024 9052 this.get_sku(os.stoid, this.data.data, gid);
9025 9053 this.get_sto();
9026 9054 if (!this.data.data.whsle_id)
... ... @@ -9073,6 +9101,9 @@ Page({
9073 9101 })
9074 9102 },
9075 9103  
  9104 +
  9105 +
  9106 +
9076 9107 //-- 检验商品的活动情况 --
9077 9108 check_gd_prom_new: async function (func) {
9078 9109  
... ... @@ -9266,6 +9297,7 @@ Page({
9266 9297 // 0关闭（如果有设置热线电话，则显示拨打热线电话）、
9267 9298 // 1小程序客服、
9268 9299 // 2企业微信客服
  9300 + // 3商城聊天系统
9269 9301 if (this.data.sys_switch) {
9270 9302 let csType = this.data.sys_switch.weapp_customertype;
9271 9303 if (csType == 0) {
... ...
pages/goods/goodsList/goodsList.js
  View file @f1d1d0b
... ... @@ -420,14 +420,15 @@ Page({
420 420 var prom_id=item.prom_id;
421 421 var now=ut.gettimestamp();
422 422 var url = "";
  423 + var user_id=getApp().globalData.user_id;
  424 + if(!user_id) user_id=0;
  425 +
423 426 switch (prom_type){
424 427 case 1:
425   - var user_id=getApp().globalData.user_id;
426   - if(!user_id) user_id=0;
427 428 url = "/api/ms/flash_sale/getNew/" +oo.stoid + "/" +user_id+"/"+ prom_id;
428 429 break;
429 430 case 2:
430   - url ="/api/weshop/goods/groupBuy/getActInfo/" +oo.stoid + "/" +item.goods_id+"/"+ prom_id
  431 + url ="/api/weshop/goods/groupBuy/getNewActInfo/" +oo.stoid + "/" +item.goods_id+"/"+ prom_id+"/"+user_id;
431 432 break;
432 433 case 4:
433 434 url ="/api/weshop/integralbuy/get/"+oo.stoid +"/"+prom_id;
... ...
pages/template/index.json
  View file @f1d1d0b
... ... @@ -27,7 +27,8 @@
27 27 "floatingWindow": "/components/diy_floatingWindow/diy_floatingWindow",
28 28 "floatingBox": "/components/diy_floatingBox/diy_floatingBox",
29 29 "div_tab_bar": "/custom-tab-bar/index",
30   - "presell": "/components/diy_pregoods/diy_pregoods"
  30 + "presell": "/components/diy_pregoods/diy_pregoods",
  31 + "serviceCard": "/components/diy_serviceCard/diy_serviceCard"
31 32 },
32 33 "enablePullDownRefresh": false,
33 34 "onReachBottomDistance":300,
... ...
pages/template/index.wxml
  View file @f1d1d0b
... ... @@ -177,6 +177,12 @@
177 177 <!-- <luckyGo object="{{item.content}}"></luckyGo> -->
178 178 <diy_public object="{{item.content}}" prom_type="9"></diy_public>
179 179 </block>
  180 +
  181 + <!-- 服务卡项 -->
  182 + <block wx:if="{{item.ename=='servicecategory'}}">
  183 + <serviceCard object="{{item.content}}" sticky="{{template_arr[0].content.is_top}}"></serviceCard>
  184 + </block>
  185 +
180 186 </view>
181 187  
182 188 </block>
... ...