wxd / MShopWeApp

Commit 435d8093428dd30ac668512b33cdeb7fefb15f37

Authored by yvan.ni
1 parent bcc735c2

OA单,秒杀多个活动的优化

Inline Side-by-side
Showing 16 changed files with 255 additions and 113 deletions
packageA/pages/goodsInfo/goodsInfo.js
  View file @435d809
... ... @@ -732,7 +732,7 @@ Page({
732 732 // console.log('0xxxxx999999', t.data.data);
733 733 //-----商品详情---
734 734 if(!t.data.data.serviceContent) t.data.data.serviceContent=" ";
735   - a.wxParse("content", "html", t.data.data.serviceContent, ee, 6);
  735 + a.wxParse("content", "html", ut.format_content(t.data.data.serviceContent), ee, 6);
736 736 e.wxParseAddFullImageUrl(ee, "content");
737 737  
738 738 //获取重表
... ...
packageA/pages/jfbuy/jfbuy.js
  View file @435d809
... ... @@ -454,7 +454,7 @@ Page({
454 454 viewItemDetails:function(e){
455 455 var index=e.currentTarget.dataset.index;
456 456 var item=this.data.list2[index];
457   - var url="/pages/goods/goodsInfo/goodsInfo?goods_id="+item.goods_id+"&title="+item.goods_name;
  457 + var url="/pages/goods/goodsInfo/goodsInfo?prom_type=4&prom_id="+item.id+"&goods_id="+item.goods_id+"&title="+item.goods_name;
458 458 getApp().goto(url);
459 459 },
460 460  
... ...
packageA/pages/prom_list/prom_list.js
  View file @435d809
... ... @@ -234,50 +234,22 @@ Page({
234 234 }
235 235 t.data.data.gg = gg;
236 236  
237   - //--看一下有没有开启等级卡---
238   - if (ee.data.rank_switch) {
239   - //---回调卡的列表---
240   - th.getPlusCardType(function (ob) {
241   - var user = getApp().globalData.userInfo;
242   - if (user) {
243   - if (user.card_field && user['card_expiredate']) {
244   - var str = user['card_expiredate'].replace(/-/g, '/');
245   - var end = new Date(str);
246   - end = Date.parse(end) / 1000;
247   - var now = ut.gettimestamp();
248   - //--- 判断是等级会员，且在有效期范围内 ---
249   - if (user.card_field && now < end) {
250   - var card_name = ob.name_map.get(user.card_field);
251   - if (card_name && card_name.length > 5) card_name = card_name.substring(0, 5);
252   - th.setData({
253   - card_field: user.card_field,
254   - card_name: card_name
255   - });
256   - if (t.data.data[user.card_field] > 0) t.data.data.shop_price = t.data.data[user.card_field];
257   - }
258   - }
259   - }
260   - ee.setData({
261   - data: t.data.data,
262   - });
263   - })
264   - } else {
265   - ee.setData({
266   - data: t.data.data,
267   - });
268   - }
  237 +
269 238  
270   - if (!ee.data.collocationList) {
  239 + if (!ee.data.collocationList) {
271 240 var user_id=getApp().globalData.user_id || 0;
272 241 /*---获取活动的重表---*/
273 242 //调用接口判断订单优惠，
274   - getApp().request.promiseGet("/api/weshop/goods/getGoodsPromList/" + os.stoid + "/" + ee.data.gid + "/2"+"/"+user_id, {}).then(res => {
  243 + getApp().request.promiseGet("/api/weshop/goods/getGoodsPromListNew/" + os.stoid + "/" + ee.data.gid + "/2"+"/"+user_id, {}).then(res => {
275 244 if (res.data.code == 0) {
276 245  
277 246 var r_data = res.data.data;
278 247  
279 248 th.data.is_coupon = r_data.collocationPromList.is_coupon;
280 249  
  250 +
  251 + t.data.data.prom_id=r_data.collocationPromList.id;
  252 +
281 253 th.loop_promise(0, r_data.collocationList, function () {
282 254  
283 255 var set_data=JSON.parse(JSON.stringify(r_data.collocationList));
... ... @@ -299,8 +271,43 @@ Page({
299 271 })
300 272 }
301 273  
302   - //获取统一条形码,普通商品和优惠促销的商品
303   - if (t.data.data.prom_type == 5) {
  274 +
  275 + //--看一下有没有开启等级卡---
  276 + if (ee.data.rank_switch) {
  277 + //---回调卡的列表---
  278 + th.getPlusCardType(function (ob) {
  279 + var user = getApp().globalData.userInfo;
  280 + if (user) {
  281 + if (user.card_field && user['card_expiredate']) {
  282 + var str = user['card_expiredate'].replace(/-/g, '/');
  283 + var end = new Date(str);
  284 + end = Date.parse(end) / 1000;
  285 + var now = ut.gettimestamp();
  286 + //--- 判断是等级会员，且在有效期范围内 ---
  287 + if (user.card_field && now < end) {
  288 + var card_name = ob.name_map.get(user.card_field);
  289 + if (card_name && card_name.length > 5) card_name = card_name.substring(0, 5);
  290 + th.setData({
  291 + card_field: user.card_field,
  292 + card_name: card_name
  293 + });
  294 + if (t.data.data[user.card_field] > 0) t.data.data.shop_price = t.data.data[user.card_field];
  295 + }
  296 + }
  297 + }
  298 + ee.setData({
  299 + data: t.data.data,
  300 + });
  301 + })
  302 + } else {
  303 + ee.setData({
  304 + data: t.data.data,
  305 + });
  306 + }
  307 +
  308 +
  309 +
  310 + //获取统一条形码,普通商品和优惠促销的商品
304 311 //默认门店要拿下门店库存
305 312 if (that.data.sales_rules >= 2) {
306 313 //--等待某个值只运行---,这里有可能因为导航的时间太久，而不能计算门店库存
... ... @@ -372,9 +379,7 @@ Page({
372 379 ee.get_sto();
373 380 }
374 381  
375   - } else {
376   - return getApp().my_warnning("商品没有搭配购的活动", 0, th)
377   - }
  382 +
378 383 }
379 384 }
380 385 });
... ... @@ -497,10 +502,11 @@ Page({
497 502  
498 503  
499 504 //-----如果是秒杀，团购，积分购,拼团-----
500   - if (th.data.data.prom_type != 5) {
501   - th.setData({lding:0})
502   - return s.my_warnning("商品不是搭配活动！", 0, th);
503   - }else{
  505 + // if (th.data.data.prom_type != 5) {
  506 + // th.setData({lding:0})
  507 + // return s.my_warnning("商品不是搭配活动！", 0, th);
  508 + // }else{
  509 +
504 510 //---如果是线下门店销售的时候---
505 511 if(th.data.sales_rules>=2){
506 512  
... ... @@ -569,8 +575,9 @@ Page({
569 575 return s.my_warnning("库存不足！", 0, th);
570 576 }
571 577 th.add_cart_next(e,t,a,o,newd); //加入购物车下一步
572   - }
573   - }
  578 + }
  579 +
  580 + // }
574 581 })
575 582 },
576 583  
... ...
packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js
  View file @435d809
... ... @@ -990,7 +990,7 @@ Page({
990 990  
991 991 //-----商品详情---
992 992 if (!t.data.data.goods_content) t.data.data.goods_content = " ";
993   - a.wxParse("content", "html", t.data.data.goods_content, ee, 6);
  993 + a.wxParse("content", "html",ut.format_content(t.data.data.goods_content), ee, 6);
994 994 e.wxParseAddFullImageUrl(ee, "content");
995 995  
996 996 if (ee.data.prom_type) {
... ...
packageC/pages/presell/goodsInfo/goodsInfo.js
  View file @435d809
... ... @@ -784,7 +784,7 @@ Page({
784 784  
785 785 //-----商品详情---
786 786 if (!t.data.data.goods_content) t.data.data.goods_content = " ";
787   - a.wxParse("content", "html", t.data.data.goods_content, ee, 6);
  787 + a.wxParse("content", "html",ut.format_content( t.data.data.goods_content), ee, 6);
788 788 e.wxParseAddFullImageUrl(ee, "content");
789 789  
790 790 ee.setData({
... ...
packageC/pages/presell/pregoodsInfo/goodsInfo.js
  View file @435d809
... ... @@ -772,7 +772,7 @@ Page({
772 772  
773 773 //-----商品详情---
774 774 if (!t.data.data.goods_content) t.data.data.goods_content = " ";
775   - a.wxParse("content", "html", t.data.data.goods_content, ee, 6);
  775 + a.wxParse("content", "html", ut.format_content(t.data.data.goods_content), ee, 6);
776 776 e.wxParseAddFullImageUrl(ee, "content");
777 777  
778 778 ee.setData({
... ...
packageE/pages/cart/cart2/cart2.js
  View file @435d809
... ... @@ -53,6 +53,9 @@ Page({
53 53 bn_pickname: "", //选择的门店名称
54 54 bn_t_exp_t: 0, //判断商品和门店一起决定的物流自提的方式0 都可以 1自提 2物流
55 55  
  56 + bn_is_order_yh:1, //是不是订单优惠
  57 + bn_is_post_temp:1, //是不是进行计算包邮模板
  58 +
56 59 bn_plus_cut_price: 0, //显示等级卡会优惠多少钱
57 60 /*------------------------*/
58 61 user_addr: null,//物流
... ... @@ -695,6 +698,19 @@ Page({
695 698 //如果有购买活动
696 699 item1.promgoodsbuynum = promgoodsbuynum;
697 700  
  701 + //如果是秒杀的时候
  702 + if(item1.prom_type==1){
  703 + var url= "/api/weshop/activitylist/getSJGoodsPriceNew/" + os.stoid
  704 + + "/" + item1.goods_id + "/1/" + item1.prom_id + "/" + app.globalData.user_id;
  705 + await app.request.promiseGet(url,{}).then(res=>{
  706 + if(res.data.code==0){
  707 + console.log(res.data.data,"111");
  708 + item1.is_order_yh=res.data.data.is_order_yh;
  709 + item1.is_post_temp=res.data.data.is_post_temp;
  710 + }
  711 + })
  712 + }
  713 +
698 714 //要把优惠活动加入,prom_goods_map中,赠品不要运算，代发商品不算优惠
699 715 if (item1.prom_type == 3 && item1.is_gift != 1 && !item1.whsle_id) {
700 716 // th.check_is_youhui(item1.goods_id, item1.pick_id);
... ... @@ -1439,6 +1455,17 @@ Page({
1439 1455 t.data.data.thi_rate = tt.data.data.thi_rate;
1440 1456 t.data.data.commission = tt.data.data.commission;
1441 1457  
  1458 + if(tt.data.data.is_order_yh){
  1459 + th.data.bn_is_order_yh=1;
  1460 + }else{
  1461 + th.data.bn_is_order_yh=0;
  1462 + }
  1463 +
  1464 + if(tt.data.data.is_post_temp){
  1465 + th.data.bn_is_post_temp=1;
  1466 + }else{
  1467 + th.data.bn_is_post_temp=0;
  1468 + }
1442 1469  
1443 1470 } else {
1444 1471 t.data.data.prom_id = 0;
... ... @@ -1958,6 +1985,11 @@ Page({
1958 1985 var zh_prom_goods = c_arr[i].zh_prom_goods; //组合购计算的原始数据存储空间
1959 1986 var ladder_prom_goods = c_arr[i].ladder_prom_goods; //组合购计算的原始数据存储空间
1960 1987  
  1988 +
  1989 + var no_order_yh=0; //-- 有些活动不能和订单优惠叠加的金额 --
  1990 + var no_post_temp=0; //-- 有些活动不能和包邮模板的金额 --
  1991 +
  1992 +
1961 1993 if (th.data.using_quan[pickid] != null && th.data.using_quan[pickid] != undefined)
1962 1994 quan_no = th.data.using_quan[pickid].coupon_no;
1963 1995  
... ... @@ -2010,6 +2042,15 @@ Page({
2010 2042 }
2011 2043 o_price += item[j].goods_price * item[j].goods_num;
2012 2044  
  2045 + //-- 秒杀的时候，判断有没有订单优惠和包邮模板的叠加 --
  2046 + if(item[j].prom_type==1 ){
  2047 + if(!item[j].is_order_yh)
  2048 + no_order_yh+=item[j].goods_price * item[j].goods_num;
  2049 + if(!item[j].is_post_temp)
  2050 + no_post_temp+=item[j].goods_price * item[j].goods_num;
  2051 + }
  2052 +
  2053 +
2013 2054 }
2014 2055 //判断是不是有组合购的金额
2015 2056 var f_o_price = o_price;
... ... @@ -2108,15 +2149,15 @@ Page({
2108 2149 })
2109 2150 }
2110 2151  
2111   - var user_addr = th.data.user_addr;
  2152 + var user_addr=th.data.user_addr;
2112 2153 var req_d = {
2113 2154 province: user_addr.province, city: user_addr.city, district: user_addr.district,
2114   - wuliu: parseFloat(o_price - quan_price - whsle_goods_price).toFixed(2), store_id: os.stoid
  2155 + wuliu:parseFloat(o_price - quan_price-whsle_goods_price-no_post_temp).toFixed(2),store_id: os.stoid
2115 2156 }
2116 2157 await getApp().request.promisePost("/api/weshop/order/areaFreight", {
2117 2158 is_json: 1, data: req_d
2118 2159 }).then(rs => {
2119   - if (rs.data.code == 0) back_data = rs.data.data;
  2160 + if (rs.data.code == 0) back_data =rs.data.data;
2120 2161 });
2121 2162  
2122 2163 }
... ... @@ -2288,6 +2329,10 @@ Page({
2288 2329 }
2289 2330  
2290 2331  
  2332 + if(no_order_yh){
  2333 + o_condition=o_condition-no_order_yh;
  2334 + t_o_condition=t_o_condition-no_order_yh;
  2335 + }
2291 2336  
2292 2337 var order_m = 0;
2293 2338 //---判断是不是有订单优惠---
... ... @@ -2735,11 +2780,15 @@ Page({
2735 2780 store_id: os.stoid
2736 2781 }
2737 2782 var back_data = null;
2738   - await getApp().request.promisePost("/api/weshop/order/areaFreight", {
2739   - is_json: 1, data: req_d
2740   - }).then(rs => {
2741   - if (rs.data.code == 0) back_data = rs.data.data;
2742   - });
  2783 +
  2784 + //判断是不是包邮模板
  2785 + if(th.data.bn_is_post_temp){
  2786 + await getApp().request.promisePost("/api/weshop/order/areaFreight", {
  2787 + is_json: 1, data: req_d
  2788 + }).then(rs => {
  2789 + if (rs.data.code == 0) back_data = rs.data.data;
  2790 + });
  2791 + }
2743 2792  
2744 2793 //如果有包邮券的不包邮商品的时候
2745 2794 if (quan_no_goods_arr) {
... ... @@ -2886,7 +2935,7 @@ Page({
2886 2935 o_condition = 0;
2887 2936 }
2888 2937  
2889   -
  2938 +
2890 2939 //预存金额使用参与计算
2891 2940 if(th.data.udata && th.data.udata.Balance>0 && order_m*1>0){
2892 2941 if(!th.data.bn_goods.keyid){
... ... @@ -2984,9 +3033,8 @@ Page({
2984 3033 })
2985 3034 }
2986 3035  
  3036 + if (o_condition > 0 && th.data.bn_is_order_yh) {
2987 3037  
2988   -
2989   - if (o_condition > 0) {
2990 3038 th.check_is_order_prom(o_condition, async function () {
2991 3039 var order_prom_amount = 0;
2992 3040 var order_prom_id = 0;
... ... @@ -3379,11 +3427,12 @@ Page({
3379 3427  
3380 3428 },
3381 3429 async submit_func(){
3382   - let cartlist = this.data.cartlist || []
  3430 + let cartlist = this.data.cartlist || [];
3383 3431 let allarr=[]
3384 3432 let strarr=[]
3385 3433 let cbarr=[]
3386 3434 let cbarr_id=[]
  3435 +
3387 3436 if(cartlist && cartlist.length>0){
3388 3437 for (let index = 0,length=cartlist.length; index < length; index++) {
3389 3438 let item=cartlist[index].goods
... ... @@ -3397,6 +3446,7 @@ Page({
3397 3446 }
3398 3447 }
3399 3448 }
  3449 +
3400 3450 if(strarr.length>0){
3401 3451 if(allarr.length>0){
3402 3452 allarr.map(item=>{
... ... @@ -3475,6 +3525,12 @@ Page({
3475 3525 if (this.data.is_summit_ing) return false;
3476 3526 this.data.is_summit_ing = 1;
3477 3527  
  3528 + function is_ok_wu_arr(index,name){
  3529 + if(!th.data.wu_arr) return '';
  3530 + if(!th.data.wu_arr[index]) return '';
  3531 + return th.data.wu_arr[name];
  3532 + }
  3533 +
3478 3534 var th = this, pdata = new Array();
3479 3535 var ff = true;
3480 3536 //------------立即购买-------------
... ... @@ -3506,8 +3562,8 @@ Page({
3506 3562 //'mobile': th.data.userinfo.mobile,
3507 3563 'mobile': addr == null ? th.data.userinfo.mobile : addr.mobile,
3508 3564 'email': '',
3509   - 'shipping_code': th.data.bn_exp_type == 1 ? 0 : th.data.wu_arr[th.data.index].code,
3510   - 'shipping_name': th.data.bn_exp_type == 1 ? '' : th.data.wu_arr[th.data.index].name,
  3565 + 'shipping_code': th.data.bn_exp_type == 1 ? 0 : is_ok_wu_arr(th.data.index,'code'),
  3566 + 'shipping_name': th.data.bn_exp_type == 1 ? '' : is_ok_wu_arr(th.data.index,'name'),
3511 3567 'invoice_title': '',
3512 3568 'goods_price': parseFloat(th.data.formData.all_price).toFixed(2), //商品总价
3513 3569 'shipping_price': parseFloat(th.data.formData.shipping_price).toFixed(2), //物流金额
... ... @@ -3784,8 +3840,8 @@ Page({
3784 3840 'more_address': addr == null ? "" : addr.more_address,
3785 3841 'mobile': addr == null ? th.data.userinfo.mobile : addr.mobile,
3786 3842 'email': '',
3787   - 'shipping_code': th.data.is_all_zt == 1 ? 0 : th.data.wu_arr[t_item.wind].code,
3788   - 'shipping_name': th.data.is_all_zt == 1 ? '' : th.data.wu_arr[t_item.wind].name,
  3843 + 'shipping_code': th.data.is_all_zt == 1 ? 0 : is_ok_wu_arr(t_item.wind,'code'),
  3844 + 'shipping_name': th.data.is_all_zt == 1 ? '' : is_ok_wu_arr(t_item.wind,'name'),
3789 3845 'invoice_title': '',
3790 3846 'goods_price': parseFloat(t_item.goods_price).toFixed(2), //商品总价
3791 3847 'shipping_price': parseFloat(t_item.shipping_price).toFixed(2), //物流金额
... ...
packageE/pages/user/cardinfo/cardinfo.js
  View file @435d809
... ... @@ -63,7 +63,7 @@ Page({
63 63 getApp().request.promiseGet("/api/weshop/storeconfig/get/" + os.stoid, {
64 64 }).then(res => {
65 65 var is_cardrule = res.data.data.cardrules;
66   - w.wxParse("content", "html", is_cardrule, ee, 6);
  66 + w.wxParse("content", "html", ut.format_content(is_cardrule), ee, 6);
67 67 ee.setData({
68 68 is_card_rule: is_cardrule
69 69 });
... ...
pages/cart/cart2_inte/cart2_inte.js
  View file @435d809
... ... @@ -380,6 +380,12 @@ Page({
380 380 }
381 381 }
382 382  
  383 +
  384 + if(gg.prom_type==4){
  385 + gd.prom_type =4;
  386 + gd.prom_id = gg.prom_id;
  387 + }
  388 +
383 389 switch (gd.prom_type) {
384 390 case 0:
385 391 case 2:
... ...
pages/goods/categoryList/categoryList.wxml
  View file @435d809
... ... @@ -293,38 +293,40 @@
293 293 <!-- 品类-->
294 294 <block wx:if="{{is_show_pl&&select_classify_on!=221&&select_classify_on!=220&&select_classify_on!=223}}">
295 295 <!-- <block wx:if="{{select_classify_on!=221&&select_classify_on!=220&&select_classify_on!=223&&is_level_three!=1}}"> -->
296   - <block>
297   - <!-- <block wx:if="{{select_classify_on == 0&&is_level_three!=1}}"> -->
298   - <view class="my-container">
299   - <view class="classify_name fs28 flex-space-between ai-center" data-pid="0" data-cid="{{cat_id}}" bindtap='select_more'>
300   - <view class="classify_title ellipsis-1">{{classify_name}}</view>
301   - <view class="flex select_more ai-center">
302   - <view class="red-co fs24">更多</view>
303   - <view class="bg_right width_height" style="margin-top: 0;"></view>
304   - </view>
  296 +
  297 + <view class="my-container">
  298 + <view class="classify_name fs28 flex-space-between ai-center" data-pid="0" data-cid="{{cat_id}}" bindtap='select_more'>
  299 + <view class="classify_title ellipsis-1">{{classify_name}}</view>
  300 + <view class="flex select_more ai-center">
  301 + <view class="red-co fs24">更多</view>
  302 + <view class="bg_right width_height" style="margin-top: 0;"></view>
305 303 </view>
306   - <!-- 显示2级列表 -->
307   - <!-- <view class="classify_content-frame flex-wrap">
308   - <block wx:if="{{goodslist && goodslist.length>0}}">
309   - <block wx:for="{{goodslist}}" wx:for-item="goods" wx:for-index="indx">
310   - <view class="type_img_frame t-c ib" data-cid="{{goods.items.id}}" data-pid="{{goods.items.parent_id}}" bindtap="go_cate">
311   - <image class=" type_img" src="{{goods.items.icoimg==null||goods.items.icoimg==''?iurl+'/miniapp/images/no_cate_def.png':goods.items.icoimg}}" binderror="goods_bnerr" data-err="goodslist[{{index}}].logo"></image>
312   - <view class="brand_img_name fs24 ellipsis-1 pdh10">{{goods.items.name}}</view>
313   - </view>
314   - </block>
315   - </block>
316   - <block wx:else>
317   - <view class="no_child_lev fs28">该类别无子级</view>
  304 + </view>
  305 + <!-- 显示2级列表 -->
  306 + <!-- <view class="classify_content-frame flex-wrap">
  307 + <block wx:if="{{goodslist && goodslist.length>0}}">
  308 + <block wx:for="{{goodslist}}" wx:for-item="goods" wx:for-index="indx">
  309 + <view class="type_img_frame t-c ib" data-cid="{{goods.items.id}}" data-pid="{{goods.items.parent_id}}" bindtap="go_cate">
  310 + <image class=" type_img" src="{{goods.items.icoimg==null||goods.items.icoimg==''?iurl+'/miniapp/images/no_cate_def.png':goods.items.icoimg}}" binderror="goods_bnerr" data-err="goodslist[{{index}}].logo"></image>
  311 + <view class="brand_img_name fs24 ellipsis-1 pdh10">{{goods.items.name}}</view>
  312 + </view>
318 313 </block>
319   - </view> -->
  314 + </block>
  315 + <block wx:else>
  316 + <view class="no_child_lev fs28">该类别无子级</view>
  317 + </block>
  318 + </view> -->
320 319  
321   - </view>
322   - </block>
  320 + </view>
  321 +
  322 + <block wx:if="{{is_level_three==1}}">
  323 + <!-- <block wx:if="{{select_classify_on == 0&&is_level_three!=1}}"> -->
323 324  
324   - <!-- 商品 含有3级的-->
325   - <!-- <block wx:if="{{select_classify_on!=220&&select_classify_on!=221&&select_classify_on!=223&&is_level_three==1}}"> -->
326   - <block>
327   - <block wx:for="{{goodslist}}" wx:for-item="goods" wx:for-index="inds">
  325 +
  326 + <!-- 商品 含有3级的-->
  327 + <!-- <block wx:if="{{select_classify_on!=220&&select_classify_on!=221&&select_classify_on!=223&&is_level_three==1}}"> -->
  328 +
  329 + <block wx:for="{{goodslist}}" wx:for-item="goods" wx:for-index="inds">
328 330 <view>
329 331  
330 332 <view class="classify_name fs28 flex-space-between ai-center" data-pid="{{goods.items.parent_id}}" data-cid="{{goods.items.id}}" bindtap='select_more'>
... ... @@ -347,8 +349,19 @@
347 349 </block>
348 350  
349 351 </view>
  352 + </block>
  353 + </block>
  354 +
  355 + <block wx:else>
  356 + <view class="classify_content-frame flex-wrap" style="margin-left: 50rpx;">
  357 + <view class="type_img_frame t-c ib" data-cid="{{item.items.id}}" data-pid="three" wx:for="{{goodslist}}" wx:for-index="index" wx:for-item="item" bindtap="go_cate">
  358 + <image class=" type_img" src="{{item.items.icoimg==null||item.items.icoimg==''?iurl+'/miniapp/images/no_cate_def.png':item.items.icoimg}}" binderror="goods_bnerr" data-err="goodslist[{{index}}].logo"></image>
  359 + <view class="brand_img_name fs24 ellipsis-1 pdh10">{{item.items.name}}</view>
  360 + </view>
  361 + </view>
  362 +
350 363 </block>
351   - </block>
  364 +
352 365 </block>
353 366 </view>
354 367 </view>
... ...
pages/goods/goodsInfo/goodsInfo.js
  View file @435d809
... ... @@ -272,8 +272,8 @@ Page({
272 272 first_leader = t.first_leader,
273 273 room_id = t.room_id,
274 274 room_user_share = t.room_user_share, //如果是会员分享带有room_id的话，那么接下来会员分享就不传room_id
275   - prom_type = t.prom_type,
276   - prom_id = t.prom_id; //活动ID
  275 + prom_type = t.prom_type || 0,
  276 + prom_id = t.prom_id || 0; //活动ID
277 277  
278 278 var share_openid = t.share_openid;
279 279  
... ... @@ -982,7 +982,7 @@ Page({
982 982  
983 983 //-- 把商品的赋值,同时给活动赋值 --
984 984 ee.data.fir_goods = JSON.parse(JSON.stringify(t.data.data));
985   - if (t.data.data.prom_type && t.data.data.prom_id) {
  985 + if (t.data.data.prom_type && t.data.data.prom_id && !ee.data.prom_type) {
986 986 ee.data.prom_type = t.data.data.prom_type;
987 987 ee.data.prom_id = t.data.data.prom_id;
988 988 }
... ... @@ -1014,7 +1014,8 @@ Page({
1014 1014  
1015 1015 //-----商品详情---
1016 1016 if (!t.data.data.goods_content) t.data.data.goods_content = " ";
1017   - a.wxParse("content", "html", t.data.data.goods_content, ee, 6);
  1017 +
  1018 + a.wxParse("content", "html", ut.format_content(t.data.data.goods_content), ee, 6);
1018 1019 e.wxParseAddFullImageUrl(ee, "content");
1019 1020  
1020 1021 if (ee.data.prom_type) {
... ... @@ -1113,10 +1114,25 @@ Page({
1113 1114 }
1114 1115 });
1115 1116 }
  1117 +
  1118 + console.log('bbbbbbbbbbbbbb');
  1119 + console.log(th.data.prom_type);
  1120 +
  1121 +
  1122 + setTimeout(()=> {
  1123 + console.log('cccc');
  1124 + console.log(th.data.prom_type);
  1125 + },500)
  1126 +
  1127 +
  1128 +
1116 1129 }
1117 1130 });
1118 1131 })
1119 1132  
  1133 + console.log('aaaaaaaaaa');
  1134 + console.log(this.data.prom_type);
  1135 +
1120 1136 this.data.enterAddressPage && (this.data.enterAddressPage = !1);
1121 1137  
1122 1138  
... ... @@ -2603,7 +2619,7 @@ Page({
2603 2619 callback();
2604 2620 } else {
2605 2621 //-- 判断有没有优惠活动 --
2606   - getApp().request.promiseGet("/api/weshop/goods/getGoodsPromList/" + os.stoid + "/" + th.data.sele_g.goods_id + "/0" + "/" + usr.user_id, {}).then(res => {
  2622 + getApp().request.promiseGet("/api/weshop/goods/getGoodsPromListNew/" + os.stoid + "/" + th.data.sele_g.goods_id + "/0" + "/" + usr.user_id, {}).then(res => {
2607 2623 if (res.data.code == 0) {
2608 2624 var r_data = res.data.data;
2609 2625 th.data.prom_goods = r_data.promGoodsLists;
... ... @@ -7064,7 +7080,7 @@ Page({
7064 7080  
7065 7081 } else {
7066 7082 //调用接口判断订单优惠，
7067   - getApp().request.get("/api/weshop/goods/getGoodsPromList/" + os.stoid + "/" + gid + "/0" + "/" + user_id, {
  7083 + getApp().request.get("/api/weshop/goods/getGoodsPromListNew/" + os.stoid + "/" + gid + "/0" + "/" + user_id, {
7068 7084 success: function (res) {
7069 7085 if (res.data.code == 0 && res.data.data) {
7070 7086 var r_data = res.data.data;
... ... @@ -7300,9 +7316,13 @@ Page({
7300 7316 getApp().goto("/packageB/pages/zuhegou/index/index?id=" + id);
7301 7317 },
7302 7318  
7303   - check_zh_acting: function (func) {
7304   - var isok = 1,
  7319 + check_zh_acting: function (func,item) {
  7320 + var isok = 1;
  7321 + if(!item){
7305 7322 item = this.data.sele_g;
  7323 + }
  7324 +
  7325 +
7306 7326 //如果有组合购
7307 7327 var url = "/api/weshop/prom/zhbuy/get/" + os.stoid + "/" + item.prom_id + "/" + getApp().globalData.user_id;
7308 7328 getApp().request.promiseGet(url, {}).then(res => {
... ... @@ -7398,10 +7418,10 @@ Page({
7398 7418 new_arr.push(item);
7399 7419 }
7400 7420  
7401   - if (new_arr.length == 1) {
7402   - th.data.prom_id = new_arr[0].act_id;
7403   - th.data.prom_type = new_arr[0].prom_type;
7404   - }
  7421 + // if (new_arr.length == 1) {
  7422 + // th.data.prom_id = new_arr[0].act_id;
  7423 + // th.data.prom_type = new_arr[0].prom_type;
  7424 + // }
7405 7425  
7406 7426 th.setData({
7407 7427 more_flash: new_arr
... ... @@ -7516,7 +7536,11 @@ Page({
7516 7536 var arr2 = arr.filter(function (e) {
7517 7537 return e.s_time < ut.gettimestamp();
7518 7538 })
7519   -
  7539 +
  7540 + var arr3 = arr.filter(function (e) {
  7541 + return e.s_time < ut.gettimestamp() && e.prom_type==7;
  7542 + })
  7543 +
7520 7544 //-- 如果只有一个活动的话 --
7521 7545 if (arr.length == 1) {
7522 7546 th.data.prom_type = arr[0].prom_type;
... ... @@ -7527,6 +7551,30 @@ Page({
7527 7551 th.data.prom_type = arr2[0].prom_type;
7528 7552 th.data.prom_id = arr2[0].act_id;
7529 7553 }
  7554 +
  7555 +
  7556 + if(arr3 && arr3.length>0){
  7557 + //获取活动信息
  7558 + var url = "/api/weshop/prom/zhbuy/get/" + os.stoid + "/" +
  7559 + arr3[0].act_id + "/" + getApp().globalData.user_id;
  7560 + getApp().request.get(url, {
  7561 + success: function (e) {
  7562 + if (e.data.code == 0 && e.data.data) {
  7563 + if (ut.gettimestamp() < e.data.data.start_time) {
  7564 + return false;
  7565 + }
  7566 + if (e.data.data.is_end == 0 && ut.gettimestamp() < e.data.data.end_time) {
  7567 + //-- 获取商品列表 --
  7568 + th.setData({
  7569 + zh_act: e.data.data
  7570 + });
  7571 + }
  7572 +
  7573 + }
  7574 + }
  7575 + });
  7576 + }
  7577 +
7530 7578 }
7531 7579 //-- 调用回调 --
7532 7580 func();
... ...
pages/goods/goodsList/goodsList.js
  View file @435d809
... ... @@ -15,7 +15,7 @@ Page({
15 15 requestData: null,
16 16 allData: null,
17 17 openFilterModal: !1,
18   - baseUrl: "/api/weshop/goods/page?1=1",
  18 + baseUrl: "/api/weshop/goods/page?isnewwhere=1",
19 19 requestUrl: "",
20 20 old_req_url:'',
21 21  
... ...
pages/goods/search/search.js
  View file @435d809
... ... @@ -15,7 +15,7 @@ Page({
15 15 allData: null,
16 16 openFilterModal: !1,
17 17 openSearchModal: !1,
18   - baseUrl: "/api/weshop/goods/page?1=1",
  18 + baseUrl: "/api/weshop/goods/page?isnewwhere=1",
19 19 requestUrl: "",
20 20 old_req_url:'',
21 21 //hotWords: [ [ "手机", "小米", "iphone" ], [ "三星", "华为", "冰箱" ] ]
... ...
pages/user/order_list/order_list.js
  View file @435d809
... ... @@ -680,7 +680,7 @@ Page({
680 680 th.setData({ paying: 0 });
681 681 return false;
682 682 }
683   -
  683 +
684 684 //当是组合优惠的时候
685 685 if (good.prom_type == 7) {
686 686 //如果有组合购
... ... @@ -706,6 +706,7 @@ Page({
706 706 isok = 0;
707 707 }
708 708  
  709 +
709 710 } else {
710 711 //未找到商品的活动
711 712 isok = 0;
... ...
pages/user/plus/plus.js
  View file @435d809
... ... @@ -108,7 +108,7 @@ Page({
108 108 var switch_list = res.data.data.switch_list;
109 109 var swi_arr = JSON.parse(switch_list);
110 110  
111   - w.wxParse("content", "html", is_cardrule, that, 6);
  111 + w.wxParse("content", "html", ut.format_content(is_cardrule), that, 6);
112 112 that.setData({
113 113 is_card_rule: is_cardrule,
114 114 isyaoqingma: parseInt(swi_arr.isyaoqingma),
... ...
utils/util.js
  View file @435d809
... ... @@ -591,6 +591,16 @@ function calculatewuliu(code, o_shipping_price, goods_weight, out_of_weight,
591 591 return rspice;
592 592 }
593 593  
  594 +function format_content(str_con){
  595 + str_con=str_con.replaceAll("display:block;", 'display:none;');
  596 + str_con=str_con.replaceAll("display: block;", 'display:none;');
  597 +
  598 + str_con=str_con.replaceAll("position:absolute;", '');
  599 + str_con=str_con.replaceAll("position: absolute", '');
  600 +
  601 + return str_con;
  602 +}
  603 +
594 604 module.exports = {
595 605 formatTime: function(e, r) {
596 606 var t = e ? new Date(1e3 * e) : new Date(), n = t.getFullYear(), o = t.getMonth() + 1, a = t.getDate(), u = t.getHours(), i = t.getMinutes(), f = t.getSeconds(), s = function(e) {
... ... @@ -772,4 +782,5 @@ module.exports = {
772 782 wx_back:wx_back,
773 783 _debounce,
774 784 calculatewuliu:calculatewuliu, //计算物流的函数进行抽象
  785 + format_content
775 786 };
... ...