diff --git a/components/diy_advertising/diy_advertising.js b/components/diy_advertising/diy_advertising.js index 17bda28..91c128d 100644 --- a/components/diy_advertising/diy_advertising.js +++ b/components/diy_advertising/diy_advertising.js @@ -16,7 +16,7 @@ Component({ interval:3000, duration:1000, someData: {}, - max_sw_height:260, + max_sw_height:100, }, ready: function () { diff --git a/components/diy_goodsGroup/diy_goodsGroup.wxml b/components/diy_goodsGroup/diy_goodsGroup.wxml index a2a5e5d..fe8db0e 100644 --- a/components/diy_goodsGroup/diy_goodsGroup.wxml +++ b/components/diy_goodsGroup/diy_goodsGroup.wxml @@ -67,7 +67,7 @@ + ￥{{item.prom_price}} - ￥{{item.market_price}} + @@ -89,10 +89,10 @@ - - ￥ - {{item.market_price}} - + + + + @@ -105,10 +105,10 @@ - - ￥ - {{item.market_price}} - + + + + @@ -122,10 +122,10 @@ {{filter.toFix(item.shop_price,2)}} - - ￥ - {{item.market_price}} - + + + + @@ -150,10 +150,10 @@ - - ￥ - {{item.market_price}} - + + + + @@ -161,7 +161,7 @@ ￥{{item.shop_price}} - ￥{{item.market_price}} + @@ -237,7 +237,7 @@ + ￥{{item.prom_price}} - ￥{{item.market_price}} + @@ -258,10 +258,10 @@ - - ￥ - {{item.market_price}} - + + + + @@ -274,10 +274,10 @@ - - ￥ - {{item.market_price}} - + + + + @@ -291,10 +291,10 @@ {{filter.toFix(item.shop_price,2)}} - - ￥ - {{item.market_price}} - + + + + @@ -319,17 +319,17 @@ - - ￥ - {{item.market_price}} - + + + + ￥{{item.shop_price}} - ￥{{item.market_price}} + @@ -406,7 +406,7 @@ + ￥{{item.prom_price}} - ￥{{item.market_price}} + @@ -427,10 +427,10 @@ - - ￥ - {{item.market_price}} - + + + + @@ -443,10 +443,10 @@ - - ￥ - {{item.market_price}} - + + + + @@ -460,10 +460,10 @@ {{filter.toFix(item.shop_price,2)}} - - ￥ - {{item.market_price}} - + + + + @@ -488,17 +488,17 @@ - - ￥ - {{item.market_price}} - + + + + ￥{{item.shop_price}} - ￥{{item.market_price}} + @@ -577,7 +577,7 @@ + ￥{{item.prom_price}} - ￥{{item.market_price}} + @@ -600,10 +600,10 @@ - - ￥ - {{item.market_price}} - + + + + @@ -616,10 +616,10 @@ - - ￥ - {{item.market_price}} - + + + + @@ -633,10 +633,10 @@ {{filter.toFix(item.shop_price,2)}} - - ￥ - {{item.market_price}} - + + + + @@ -660,10 +660,10 @@ - - ￥ - {{item.market_price}} - + + + + @@ -671,7 +671,7 @@ ￥{{item.shop_price}} - ￥{{item.market_price}} + @@ -717,7 +717,7 @@ - -- 没有更多 -- + @@ -772,7 +772,7 @@ + ￥{{aitem.prom_price}} - ￥{{aitem.market_price}} + @@ -793,10 +793,10 @@ - - ￥ - {{aitem.market_price}} - + + + + @@ -809,10 +809,10 @@ - - ￥ - {{aitem.market_price}} - + + + + @@ -826,10 +826,10 @@ {{filter.toFix(aitem.shop_price,2)}} - - ￥ - {{aitem.market_price}} - + + + + @@ -854,17 +854,17 @@ - - ￥ - {{aitem.market_price}} - + + + + ￥{{aitem.shop_price}} - ￥{{aitem.market_price}} + diff --git a/components/diy_groupbuy/diy_groupbuy.wxml b/components/diy_groupbuy/diy_groupbuy.wxml index c370b2b..796d0f7 100644 --- a/components/diy_groupbuy/diy_groupbuy.wxml +++ b/components/diy_groupbuy/diy_groupbuy.wxml @@ -39,7 +39,7 @@ {{aitem.goods_name}} ￥{{aitem.price}} - ￥{{aitem.market_price}} + diff --git a/components/diy_luckyGo/diy_luckyGo.wxml b/components/diy_luckyGo/diy_luckyGo.wxml index c16f74e..1ed81e2 100644 --- a/components/diy_luckyGo/diy_luckyGo.wxml +++ b/components/diy_luckyGo/diy_luckyGo.wxml @@ -29,7 +29,7 @@ {{filters.price(aitem.group_price)}} - {{aitem.market_price}} + @@ -63,7 +63,7 @@ {{filters.price(aitem.group_price)}} - 零售价:{{aitem.market_price}} + ￥{{aitem.price}} - ￥{{aitem.market_price}} + diff --git a/components/diy_pregoods/diy_pregoods.wxml b/components/diy_pregoods/diy_pregoods.wxml index 8dfdd9d..7fb32e3 100644 --- a/components/diy_pregoods/diy_pregoods.wxml +++ b/components/diy_pregoods/diy_pregoods.wxml @@ -57,7 +57,7 @@ {{aitem.act_name}} ￥{{aitem.presell_price}} - ￥{{aitem.market_price}} + diff --git a/components/diy_seckill/diy_seckill.wxml b/components/diy_seckill/diy_seckill.wxml index 0a14ad8..48c4a72 100644 --- a/components/diy_seckill/diy_seckill.wxml +++ b/components/diy_seckill/diy_seckill.wxml @@ -82,7 +82,7 @@ {{aitem.goods_name}} ￥{{aitem.price}} - ￥{{aitem.market_price}} + @@ -116,7 +116,7 @@ ￥{{aitem.price}} - ￥{{aitem.market_price}} + diff --git a/components/goods_list/goods_list.wxml b/components/goods_list/goods_list.wxml index a04bef6..27a7ab7 100644 --- a/components/goods_list/goods_list.wxml +++ b/components/goods_list/goods_list.wxml @@ -26,13 +26,13 @@ {{item.prom_price}} - - - - ￥ - {{item.market_price}} - - + + + + + + + @@ -54,13 +54,13 @@ - - - - ￥ - {{item.market_price}} - - + + + + + + + @@ -70,13 +70,13 @@ {{filter.toFix(item.shop_price,2)}} - - - - ￥ - {{item.market_price}} - - + + + + + + + @@ -89,10 +89,10 @@ {{filter.toFix(item.shop_price,2)}} - - ￥ - {{item.market_price}} - + + + + @@ -114,13 +114,13 @@ {{filter.toFix(item.shop_price,2)}} - - - - ￥ - {{item.market_price}} - - + + + + + + + @@ -133,13 +133,13 @@ {{filter.toFix(item.shop_price,2)}} - - - - ￥ - {{item.market_price}} - - + + + + + + + diff --git a/packageA/pages/activity_share/activity_share.js b/packageA/pages/activity_share/activity_share.js index 7599850..4e72101 100644 --- a/packageA/pages/activity_share/activity_share.js +++ b/packageA/pages/activity_share/activity_share.js @@ -66,8 +66,10 @@ Page({ //设置分享会员和导购id和归属门店ID this.setData({first_leader:first_leader,StaffId:StaffId,StorageId:StorageId}); } - - this.requestGoodsList(); + + console.log("11111111"); + this.requestGoodsList(); + console.log("22222"); //-- 自定义海报 -- getApp().request.promiseGet("/api/weshop/goods/poster/page",{ data:{store_id:os.stoid, type:1, is_use:1 } @@ -395,9 +397,11 @@ Page({ }, get_colloction: async function(){ + + var list=null; //-- 获取搭配购的从商品的信息 -- - await app.request.promiseGet("/api/weshop/goods/getGoodsPromList/"+oo.stoid+"/"+this.data.hui_active.main_goods_id+"/2"+"/"+getApp().globalData.user_id,{}).then(res=>{ + await app.request.promiseGet("/api/weshop/goods/getGoodsPromList/"+oo.stoid+"/"+this.data.hui_active.main_goods_id+"/2"+"/"+(getApp().globalData.user_id || 0) ,{}).then(res=>{ if(res.data.code==0){ list=res.data.data.collocationList; } @@ -559,8 +563,14 @@ Page({ var str=this.data.key_str.trim(); req_data.key_str=str; } + //-- ---调用接口---- - app.request.promiseGet(url,{data:req_data,isShowLoading:1}).then(res=>{ + app.request.promiseGet(url,{data:req_data,isShowLoading:1}).then(res=>{ + + console.log("2222"); + console.log(url); + console.log(res); + th.data.is_load=0; if(res.data.code==0 && res.data.data.pageData && res.data.data.pageData.length>0){ th.data.currentPage++; diff --git a/packageA/pages/cart2_ser/cart2_ser.js b/packageA/pages/cart2_ser/cart2_ser.js index 0c085b7..fcd416e 100644 --- a/packageA/pages/cart2_ser/cart2_ser.js +++ b/packageA/pages/cart2_ser/cart2_ser.js @@ -241,7 +241,12 @@ Page({ var th = this, a = getApp().request; var gg = th.data.postdata; - var url = "/api/weshop/serviceCard/get/" + oo.stoid + "/" + gg.id + var url = "/api/weshop/serviceCard/get/" + oo.stoid + "/" + gg.id; + + + console.log('get_buy_goods', gg); + + //调用商品 a.get(url, { success: function(t) { diff --git a/packageA/pages/distribution/goods/goods.wxml b/packageA/pages/distribution/goods/goods.wxml index 61c2412..ab59e8f 100644 --- a/packageA/pages/distribution/goods/goods.wxml +++ b/packageA/pages/distribution/goods/goods.wxml @@ -93,13 +93,13 @@ {{item.prom_price}} - - - - - {{item.market_price}} - - + + + + + + + @@ -119,13 +119,13 @@ - - - - - {{item.market_price}} - - + + + + + + + @@ -135,13 +135,13 @@ {{filter.toFix(item.shop_price,2)}} - - - - - {{item.market_price}} - - + + + + + + + @@ -154,10 +154,10 @@ {{filter.toFix(item.shop_price,2)}} - - - {{item.market_price}} - + + + + @@ -180,13 +180,13 @@ {{filter.toFix(item.shop_price,2)}} - - - - - {{item.market_price}} - - + + + + + + + @@ -199,13 +199,13 @@ {{filter.toFix(item.shop_price,2)}} - - - - - {{item.market_price}} - - + + + + + + + @@ -235,13 +235,13 @@ {{item.prom_price}} - - - - - {{item.market_price}} - - + + + + + + + @@ -261,13 +261,13 @@ - - - - - {{item.market_price}} - - + + + + + + + @@ -277,13 +277,13 @@ {{filter.toFix(item.shop_price,2)}} - - - - - {{item.market_price}} - - + + + + + + + @@ -296,10 +296,10 @@ {{filter.toFix(item.shop_price,2)}} - - - {{item.market_price}} - + + + + @@ -322,13 +322,13 @@ {{filter.toFix(item.shop_price,2)}} - - - - - {{item.market_price}} - - + + + + + + + @@ -341,13 +341,13 @@ {{filter.toFix(item.shop_price,2)}} - - - - - {{item.market_price}} - - + + + + + + + diff --git a/packageA/pages/distribution/shop/shop.wxml b/packageA/pages/distribution/shop/shop.wxml index e790000..9ce235d 100644 --- a/packageA/pages/distribution/shop/shop.wxml +++ b/packageA/pages/distribution/shop/shop.wxml @@ -89,13 +89,13 @@ {{item.prom_price}} - - - - - {{item.market_price}} - - + + + + + + + @@ -115,13 +115,13 @@ - - - - - {{item.market_price}} - - + + + + + + + @@ -131,13 +131,13 @@ {{filter.toFix(item.shop_price,2)}} - - - - - {{item.market_price}} - - + + + + + + + @@ -150,10 +150,10 @@ {{filter.toFix(item.shop_price,2)}} - - - {{item.market_price}} - + + + + @@ -175,13 +175,13 @@ {{filter.toFix(item.shop_price,2)}} - - - - - {{item.market_price}} - - + + + + + + + @@ -194,13 +194,13 @@ {{filter.toFix(item.shop_price,2)}} - - - - - {{item.market_price}} - - + + + + + + + @@ -233,13 +233,13 @@ {{item.prom_price}} - - - - - {{item.market_price}} - - + + + + + + + @@ -259,13 +259,13 @@ - - - - - {{item.market_price}} - - + + + + + + + @@ -275,13 +275,13 @@ {{filter.toFix(item.shop_price,2)}} - - - - - {{item.market_price}} - - + + + + + + + @@ -294,10 +294,10 @@ {{filter.toFix(item.shop_price,2)}} - - - {{item.market_price}} - + + + + @@ -321,13 +321,13 @@ {{filter.toFix(item.shop_price,2)}} - - - - - {{item.market_price}} - - + + + + + + + @@ -340,13 +340,13 @@ {{filter.toFix(item.shop_price,2)}} - - - - - {{item.market_price}} - - + + + + + + + diff --git a/packageA/pages/goodsInfo/goodsInfo.js b/packageA/pages/goodsInfo/goodsInfo.js index 7c424ba..18531cf 100644 --- a/packageA/pages/goodsInfo/goodsInfo.js +++ b/packageA/pages/goodsInfo/goodsInfo.js @@ -217,6 +217,10 @@ Page({ //------初始化加载---------- onLoad: function(t) { + + + console.log("11111111"); + self = this; this.setData({ @@ -353,14 +357,24 @@ Page({ //获取用户的默认门店 getApp().get_user_store(function(e) { + console.log('get_user_store'); + console.log("999999999"); + + if(!e) { th.data.fir_def_store={}; //赋值空对象 return false; } + console.log("000000"); + if(getApp().globalData.is_dj_pk) th.setData({has_def:1}) var ee=JSON.parse(JSON.stringify(e)); + + + console.log(e); + //--定时器推迟一下-- setTimeout(function () { if(!th.data.data){ @@ -402,6 +416,10 @@ Page({ e.is_no_dis=ee.is_no_dis; appd.pk_store=e; that.data.fir_def_store=e; + + console.log('get_user_store--2'); + console.log(e); + that.setData({ def_pick_store: e, sto_sele_name: e.pickup_name, @@ -421,6 +439,11 @@ Page({ } else { if (e) { + + + console.log('get_user_store3---'); + console.log(e); + e.distance = null; that.data.fir_def_store=e; that.setData({ @@ -956,7 +979,7 @@ Page({ newd['prom_price'] = this.data.data.shop_price; }; - // console.log('newd++++++++', newd); + console.log('newd++++++++', newd); th.buyNow(newd); } else { @@ -1607,7 +1630,8 @@ Page({ def_pick_store:e.data.data.pageData[0], sto_sele_name: e.data.data.pageData[0].pickup_name, sto_sele_id: e.data.data.pageData[0].pickup_id, - sto_sele_distr: e.data.data.pageData[0].distr_type + sto_sele_distr: e.data.data.pageData[0].distr_type, + sto_sele_keyid: e.data.data.pageData[0].keyid, }); th.data.fir_def_store=e.data.data.pageData[0]; } @@ -1814,7 +1838,8 @@ Page({ def_pick_store:e.data.data.pageData[0], sto_sele_name: e.data.data.pageData[0].pickup_name, sto_sele_id: e.data.data.pageData[0].pickup_id, - sto_sele_distr: e.data.data.pageData[0].distr_type + sto_sele_distr: e.data.data.pageData[0].distr_type, + sto_sele_keyid:e.data.data.pageData[0].keyid, }) } diff --git a/packageA/pages/jfbuy/jfbuy.wxml b/packageA/pages/jfbuy/jfbuy.wxml index 3c10909..74a3acb 100644 --- a/packageA/pages/jfbuy/jfbuy.wxml +++ b/packageA/pages/jfbuy/jfbuy.wxml @@ -51,7 +51,7 @@ {{item.integral}}积分 + ￥{{item.addmoney}} - 零售价：￥{{item.market_price}} + ￥{{item.shop_price}} 销量：{{item.buy_num+item.virtual}} diff --git a/packageA/pages/myGift/myGift.js b/packageA/pages/myGift/myGift.js index c1e8126..0d0c2af 100644 --- a/packageA/pages/myGift/myGift.js +++ b/packageA/pages/myGift/myGift.js @@ -16,6 +16,7 @@ Page({ isLoading: false, // 检测是否已经发送请求,防止重复发送请求 noMore: false, // 检测是否有更多数据,true为没有更多数据,false为还有数据 pageNum: 1, // 当前页数 + iurl: os.imghost, //图片前缀网址 }, clickTab(e) { @@ -40,7 +41,8 @@ Page({ url = '/api/weshop/libao/libaoFormvip/page'; }; - this.getData(true, url, data); + this.getData(true, url, data); + }, /** @@ -56,6 +58,23 @@ Page({ userInfo: data, }); }); + + getApp().request.promiseGet("/api/weshop/ad/page?pid=901&store_id=" + os.stoid, { + data: { + enabled: 1 + } + }).then(res => { + if (res.data.code == 0 && res.data.data && res.data.data.pageData && res.data.data.pageData.length > 0) { + var a = res.data.data.pageData; + var tt = { + 'ad_code': os.imghost + a[0].ad_code, + 'media_link': '', + 'ad_weapplink': a[0].ad_weapplink, + 'bgcolor': a[0].bgcolor, + }; + self.setData({ ad_data: tt }); + } + }) }, /** diff --git a/packageA/pages/myGift/myGift.wxml b/packageA/pages/myGift/myGift.wxml index 731944e..6d78e37 100644 --- a/packageA/pages/myGift/myGift.wxml +++ b/packageA/pages/myGift/myGift.wxml @@ -1,5 +1,20 @@ + + + + + + + + + + + + + + {{item}} @@ -31,7 +46,7 @@ - 零售价{{filter.toFix(item.oldprice,2)}} + {{filter.toFix(item.oldprice,2)}} 已售{{item.salenum+item.virtualsales}}件 diff --git a/packageA/pages/myGift/myGift.wxss b/packageA/pages/myGift/myGift.wxss index 05f5d37..673f376 100644 --- a/packageA/pages/myGift/myGift.wxss +++ b/packageA/pages/myGift/myGift.wxss @@ -1,4 +1,7 @@ @charset "utf-8"; +.top_img image { + width: 100%; +} .c-a4 { color: #a4a4a4; diff --git a/packageA/pages/myGiftDetails/myGiftDetails.wxml b/packageA/pages/myGiftDetails/myGiftDetails.wxml index fe643fe..b87ba86 100644 --- a/packageA/pages/myGiftDetails/myGiftDetails.wxml +++ b/packageA/pages/myGiftDetails/myGiftDetails.wxml @@ -36,7 +36,7 @@ - 零售价{{filter.toFix(details.oldprice,2)}} + {{filter.toFix(details.oldprice,2)}} 已售{{details.salenum+details.virtualsales}}件 diff --git a/packageA/pages/prom_list/prom_list.js b/packageA/pages/prom_list/prom_list.js index ea36031..7a2ea79 100644 --- a/packageA/pages/prom_list/prom_list.js +++ b/packageA/pages/prom_list/prom_list.js @@ -270,7 +270,7 @@ Page({ if (!ee.data.collocationList) { /*---获取活动的重表---*/ //调用接口判断订单优惠， - getApp().request.promiseGet("/api/weshop/goods/getGoodsPromList/" + os.stoid + "/" + ee.data.gid + "/2"+"/"+oo.user_id, {}).then(res => { + getApp().request.promiseGet("/api/weshop/goods/getGoodsPromList/" + os.stoid + "/" + ee.data.gid + "/2"+"/"+getApp().globalData.user_id, {}).then(res => { if (res.data.code == 0) { var r_data = res.data.data; diff --git a/packageB/pages/user/collect_list/collect_list.wxml b/packageB/pages/user/collect_list/collect_list.wxml index 5f756a5..d5dfeec 100644 --- a/packageB/pages/user/collect_list/collect_list.wxml +++ b/packageB/pages/user/collect_list/collect_list.wxml @@ -49,10 +49,10 @@ {{item.prom_price?item.prom_price:item.final_price}} - - 零售价: - ￥{{item.market_price}} - + + + + diff --git a/packageB/pages/zuhegou/index/index.js b/packageB/pages/zuhegou/index/index.js index 0ec52e5..3ef5fe2 100644 --- a/packageB/pages/zuhegou/index/index.js +++ b/packageB/pages/zuhegou/index/index.js @@ -1099,6 +1099,7 @@ Page({ goods_price: newd.goods_price, member_goods_price: newd.goods_price, store_id: os.stoid, + state:0 }; if (th.data.s_cart_num) { updata.goods_num = th.data.s_cart_num; @@ -1889,6 +1890,7 @@ Page({ goods_price: cur_price, prom_id: th.data.act.id, store_id: os.stoid, + state:0 }; if (getApp().globalData.guide_id) { updata['guide_id'] = getApp().globalData.guide_id; diff --git a/packageB/pages/zuhegou/index/index.wxml b/packageB/pages/zuhegou/index/index.wxml index 194fcc6..732cedf 100644 --- a/packageB/pages/zuhegou/index/index.wxml +++ b/packageB/pages/zuhegou/index/index.wxml @@ -56,7 +56,7 @@ {{filters.toFix(item.shop_price,2)}} - {{filters.toFix(item.market_price,2)}} + diff --git a/packageB/pages/zuhegou/preindex/index.wxml b/packageB/pages/zuhegou/preindex/index.wxml index 6a7929e..3acc834 100644 --- a/packageB/pages/zuhegou/preindex/index.wxml +++ b/packageB/pages/zuhegou/preindex/index.wxml @@ -49,7 +49,7 @@ {{filters.toFix(item.shop_price,2)}} - {{filters.toFix(item.market_price,2)}} + diff --git a/packageC/pages/goods/distributionCategoryList/index.wxml b/packageC/pages/goods/distributionCategoryList/index.wxml index 0e31077..ad0d7cb 100644 --- a/packageC/pages/goods/distributionCategoryList/index.wxml +++ b/packageC/pages/goods/distributionCategoryList/index.wxml @@ -113,9 +113,9 @@ + ￥{{item.prom_price}} - - ￥{{item.market_price}} - + + + 分成金额：{{filter.toFix(item.commission,2)}} 评论{{item.comment_count}} @@ -135,9 +135,9 @@ {{card_name}} - - ￥{{item.market_price}} - + + + 分成金额：{{filter.toFix(item.commission,2)}} 评论{{item.comment_count}} @@ -145,9 +145,9 @@ ￥{{item.shop_price}} - - ￥{{item.market_price}} - + + + 分成金额：{{filter.toFix(item.commission,2)}} 评论{{item.comment_count}} @@ -158,7 +158,7 @@ ￥{{item.shop_price}} - ￥{{item.market_price}} + @@ -178,9 +178,9 @@ ￥{{item.shop_price}} - - ￥{{item.market_price}} - + + + 分成金额：{{filter.toFix(item.commission,2)}} @@ -192,9 +192,9 @@ ￥{{item.shop_price}} - - ￥{{item.market_price}} - + + + 分成金额：{{filter.toFix(item.commission,2)}} 评论{{item.comment_count}} diff --git a/packageC/pages/goods/goodsList/goodsList.wxml b/packageC/pages/goods/goodsList/goodsList.wxml index 784b74b..821faf5 100644 --- a/packageC/pages/goods/goodsList/goodsList.wxml +++ b/packageC/pages/goods/goodsList/goodsList.wxml @@ -71,7 +71,7 @@ + ￥{{item.prom_price}} - {{item.market_price}} + @@ -98,7 +98,7 @@ - ￥{{item.market_price}} + 评论{{item.comment_count}} 已售{{item.sales_sum}} @@ -108,7 +108,7 @@ ￥{{item.shop_price}} - ￥{{item.market_price}} + 评论{{item.comment_count}} 已售{{item.sales_sum}} @@ -120,7 +120,7 @@ {{item.shop_price}} - {{item.market_price}} + @@ -139,7 +139,7 @@ ￥{{item.shop_price}} - ￥{{item.market_price}} + @@ -154,7 +154,7 @@ {{item.shop_price}} - {{item.market_price}} + @@ -186,7 +186,7 @@ + ￥{{item.prom_price}} - {{item.market_price}} + @@ -213,7 +213,7 @@ - ￥{{item.market_price}} + 评论{{item.comment_count}} 已售{{item.sales_sum}} @@ -223,7 +223,7 @@ ￥{{item.shop_price}} - ￥{{item.market_price}} + 评论{{item.comment_count}} 已售{{item.sales_sum}} @@ -235,7 +235,7 @@ {{item.shop_price}} - {{item.market_price}} + @@ -254,7 +254,7 @@ ￥{{item.shop_price}} - ￥{{item.market_price}} + @@ -269,7 +269,7 @@ {{item.shop_price}} - {{item.market_price}} + diff --git a/packageC/pages/group_list/group_list.wxml b/packageC/pages/group_list/group_list.wxml index 1e04a00..92526d1 100644 --- a/packageC/pages/group_list/group_list.wxml +++ b/packageC/pages/group_list/group_list.wxml @@ -16,7 +16,7 @@ {{item.price}} {{item.price}} - {{item.market_price}} + diff --git a/packageC/pages/luckyGo/luckyGo_activityList/luckyGo_activityList.wxml b/packageC/pages/luckyGo/luckyGo_activityList/luckyGo_activityList.wxml index d91b02b..7f5aafa 100644 --- a/packageC/pages/luckyGo/luckyGo_activityList/luckyGo_activityList.wxml +++ b/packageC/pages/luckyGo/luckyGo_activityList/luckyGo_activityList.wxml @@ -22,7 +22,7 @@ {{filters.price(item.group_price)}} - 零售价:{{item.market_price}} + diff --git a/packageC/pages/luckyGo/luckyGo_cart/luckyGo_cart.js b/packageC/pages/luckyGo/luckyGo_cart/luckyGo_cart.js index 9d2e658..532f3d8 100644 --- a/packageC/pages/luckyGo/luckyGo_cart/luckyGo_cart.js +++ b/packageC/pages/luckyGo/luckyGo_cart/luckyGo_cart.js @@ -751,7 +751,29 @@ Page({ t.data.data.original_img = oo.imghost + t.data.data.original_img; t.data.data['buynum'] = gg.goods_num; - var distr_t = 0, et = 0 + var distr_t = 0, et = 0; + + if(t.data.data.is_minishop==1 && getApp().is_sp_hao()){ + + if(t.data.data.distr_type==1 || gg.pick_dis==1) { + wx.showToast({ + title: "视频号仅支持物流", + icon: 'none', + duration: 2000 + }) + + setTimeout(function(){ + wx.navigateBack({delta: 1}) + },1000) + + return false + } + + t.data.data.distr_type=2; + th.setData({show_same_city:0}) + + } + if (t.data.data.distr_type == 0) { distr_t = gg.pick_dis; } else { diff --git a/packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.js b/packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.js index 4e0986b..6800d59 100644 --- a/packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.js +++ b/packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.js @@ -260,7 +260,27 @@ Page({ t.data.data['buynum'] = gg.goods_num; // console.log(t.data.data); var distr_t = 0, - et = 0 + et = 0; + + if(t.data.data.is_minishop==1 && getApp().is_sp_hao()){ + + if(t.data.data.distr_type==1 || gg.pick_dis==1) { + wx.showToast({ + title: "视频号仅支持物流", + icon: 'none', + duration: 2000 + }) + + wx.navigateBack({delta: 1}) + + return false + } + + t.data.data.distr_type=2; + th.setData({show_same_city:0}) + + } + if (t.data.data.distr_type == 0) { distr_t = gg.pick_dis; } else { diff --git a/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxml b/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxml index c009fa0..ba1fc77 100644 --- a/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxml +++ b/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxml @@ -114,7 +114,7 @@ {{filters.toFix(luckGoInfo.group_price/100,2)}} - 手店价 + {{sele_g[card_field]}} {{sele_g.shop_price}} diff --git a/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxss b/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxss index c0ea42b..76eb995 100644 --- a/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxss +++ b/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxss @@ -2319,8 +2319,7 @@ left:25rpx; color: #fff; } .xc-qt-price .xc-qtunit-price{ - margin-left:6rpx; -margin-top:-4rpx; + margin-left:-96rpx; } .xc-nanber{ top:-25rpx; diff --git a/packageC/pages/luckyGo/luckyGo_list/luckyGo_list.wxml b/packageC/pages/luckyGo/luckyGo_list/luckyGo_list.wxml index eacf839..8c557d1 100644 --- a/packageC/pages/luckyGo/luckyGo_list/luckyGo_list.wxml +++ b/packageC/pages/luckyGo/luckyGo_list/luckyGo_list.wxml @@ -23,7 +23,7 @@ {{item.goods_name}} {{filters.price(item.group_price)}} - 零售价{{item.market_price}} + 未团中可获得帮团奖励 diff --git a/packageC/pages/payForAnother/payForAnother.js b/packageC/pages/payForAnother/payForAnother.js index f7deb93..ede814a 100644 --- a/packageC/pages/payForAnother/payForAnother.js +++ b/packageC/pages/payForAnother/payForAnother.js @@ -719,7 +719,29 @@ Page({ t.data.data.original_img = oo.imghost + t.data.data.original_img; t.data.data['buynum'] = gg.goods_num; - var distr_t = 0, et = 0 + var distr_t = 0, et = 0; + + if(t.data.data.is_minishop==1 && getApp().is_sp_hao()){ + + if(t.data.data.distr_type==1 || gg.pick_dis==1) { + wx.showToast({ + title: "视频号仅支持物流", + icon: 'none', + duration: 2000 + }) + + setTimeout(function(){ + wx.navigateBack({delta: 1}) + },1000) + + return false + } + + t.data.data.distr_type=2; + th.setData({show_same_city:0}) + + } + if (t.data.data.distr_type == 0) { distr_t = gg.pick_dis; } else { diff --git a/packageC/pages/presell/cart/cart.js b/packageC/pages/presell/cart/cart.js index 89164c0..8e9a674 100644 --- a/packageC/pages/presell/cart/cart.js +++ b/packageC/pages/presell/cart/cart.js @@ -586,6 +586,28 @@ Page({ var price = presell.presell_price; if (!goods) return false; + + if(goods.is_minishop==1 && getApp().is_sp_hao()){ + + if(goods.distr_type==1 || pickup.distr_type==1) { + wx.showToast({ + title: "视频号仅支持物流", + icon: 'none', + duration: 2000 + }) + + setTimeout(function(){ + wx.navigateBack({delta: 1}) + },1000) + + return false + } + + goods.distr_type=2; + th.setData({show_same_city:0}) + + } + //--判断物流-- if (goods.distr_type) distr_type = goods.distr_type; diff --git a/packageC/pages/presell/cart/cart2.js b/packageC/pages/presell/cart/cart2.js index 20474ca..495095e 100644 --- a/packageC/pages/presell/cart/cart2.js +++ b/packageC/pages/presell/cart/cart2.js @@ -401,7 +401,29 @@ Page({ t.data.data.original_img = oo.imghost + t.data.data.original_img; t.data.data['buynum'] = th.data.gg.goods_num; - var distr_t = 0, et = 0 + var distr_t = 0, et = 0; + + if(t.data.data.is_minishop==1 && getApp().is_sp_hao()){ + + if(t.data.data.distr_type==1 || gg.pick_dis==1) { + wx.showToast({ + title: "视频号仅支持物流", + icon: 'none', + duration: 2000 + }) + + setTimeout(function(){ + wx.navigateBack({delta: 1}) + },1000) + + return false + } + + t.data.data.distr_type=2; + th.setData({show_same_city:0}) + + } + if (t.data.data.distr_type == 0) { distr_t = th.data.gg.pick_dis; } else { diff --git a/packageC/pages/presell/cart/cart2_pre.js b/packageC/pages/presell/cart/cart2_pre.js index 8772484..8c92d21 100644 --- a/packageC/pages/presell/cart/cart2_pre.js +++ b/packageC/pages/presell/cart/cart2_pre.js @@ -186,6 +186,29 @@ Page({ t.data.data['buynum'] = gg.goods_num; var distr_t = 0, et = 0; + + if(t.data.data.is_minishop==1 && getApp().is_sp_hao()){ + + if(t.data.data.distr_type==1 || gg.pick_dis==1) { + wx.showToast({ + title: "视频号仅支持物流", + icon: 'none', + duration: 2000 + }) + + setTimeout(function(){ + wx.navigateBack({delta: 1}) + },1000) + + return false + } + + t.data.data.distr_type=2; + th.setData({show_same_city:0}) + + } + + if (t.data.data.distr_type == 0) { distr_t = gg.pick_dis; } else { diff --git a/packageC/pages/presell/goodsInfo/goodsInfo.js b/packageC/pages/presell/goodsInfo/goodsInfo.js index 27c85c1..2d38450 100644 --- a/packageC/pages/presell/goodsInfo/goodsInfo.js +++ b/packageC/pages/presell/goodsInfo/goodsInfo.js @@ -2858,12 +2858,12 @@ Page({ var wd2 = th.data.screenWidth - ut.measureText(pri0, 22 * unit) - 25; if(th.data.presellForm.presell_type==1){ - context.setStrokeStyle('gray'); - context.fillText(pri0, wd2, 213 * unit); - context.setLineWidth(1 * unit); - context.moveTo(wd2 - 5, 206 * unit); - context.lineTo(wd2 + ut.measureText(pri0, 22 * unit) + 5, 206 * unit); - context.stroke(); + // context.setStrokeStyle('gray'); + // context.fillText(pri0, wd2, 213 * unit); + // context.setLineWidth(1 * unit); + // context.moveTo(wd2 - 5, 206 * unit); + // context.lineTo(wd2 + ut.measureText(pri0, 22 * unit) + 5, 206 * unit); + // context.stroke(); }else{ context.fillText('定金', wd2, 213 * unit); } @@ -3198,7 +3198,7 @@ Page({ data: req_data, }) .then(res => { - if (t.ajax_ok(res)) { + if (ut.ajax_ok(res)) { _this.setData({ historyBuyInfo: res.data.data.pageData, }) diff --git a/packageC/pages/presell/goodsInfo/goodsInfo.wxml b/packageC/pages/presell/goodsInfo/goodsInfo.wxml index 3ba4a2f..c0d7388 100644 --- a/packageC/pages/presell/goodsInfo/goodsInfo.wxml +++ b/packageC/pages/presell/goodsInfo/goodsInfo.wxml @@ -80,9 +80,9 @@ 预售价 ￥{{presellList.presell_price}} - - 零售价￥{{filters.toFix(data.market_price,2)}} - + + + diff --git a/packageC/pages/presell/list/list.wxml b/packageC/pages/presell/list/list.wxml index 30665c7..87c3556 100644 --- a/packageC/pages/presell/list/list.wxml +++ b/packageC/pages/presell/list/list.wxml @@ -59,7 +59,8 @@ ￥{{item.presell_price}} {{item.price}} - 零售价￥{{item.market_price}} + + 去抢购 diff --git a/pages/activity/pind_list/pind_list.wxml b/pages/activity/pind_list/pind_list.wxml index 5f7b5ce..2c4e617 100644 --- a/pages/activity/pind_list/pind_list.wxml +++ b/pages/activity/pind_list/pind_list.wxml @@ -69,7 +69,7 @@ ￥ {{item.price}} - 零售价￥{{item.market_price}} + diff --git a/pages/activity/seckill_list/seckill_list.wxml b/pages/activity/seckill_list/seckill_list.wxml index 2681e2b..fbf6a19 100644 --- a/pages/activity/seckill_list/seckill_list.wxml +++ b/pages/activity/seckill_list/seckill_list.wxml @@ -69,8 +69,9 @@ ￥ {{item.price}} - 零售价￥{{item.market_price}} - + + + - + @@ -79,7 +79,7 @@ - {{"零售价:￥"+item.giftPosPrice}} + {{"￥"+item.giftPosPrice}} diff --git a/pages/goods/categoryList/categoryList.js b/pages/goods/categoryList/categoryList.js index 45246d2..55f8ed5 100644 --- a/pages/goods/categoryList/categoryList.js +++ b/pages/goods/categoryList/categoryList.js @@ -376,15 +376,21 @@ Page({ var item=arr[0]; var name = item.items.name; - var cid = item.items.cid; + var cid = item.items.id; var arr = item.array; + console.log("11111",item); + if (arr.length == 0) { t.setData({ - select_classify_on: indexs, index: indexs, classify_name: name, cat_id: cid, + select_classify_on: 0, index: 0, classify_name: name, cat_id: cid, goodslist: null, is_level_three: 0 }); + + if(t.data.is_used_share == 2) + t.style(t.data.stylePage, cid) + return false; } if (arr.length != 0) { diff --git a/pages/goods/categoryList/categoryList.wxml b/pages/goods/categoryList/categoryList.wxml index 9ca6dc5..4db77d3 100644 --- a/pages/goods/categoryList/categoryList.wxml +++ b/pages/goods/categoryList/categoryList.wxml @@ -546,7 +546,7 @@ + {{item.prom_price}} - {{item.market_price}} + @@ -575,7 +575,7 @@ - {{item.market_price}} + 评论{{item.comment_count}} 已售{{item.sales_sum}} @@ -585,7 +585,7 @@ {{item.shop_price}} - {{item.market_price}} + @@ -601,7 +601,7 @@ {{item.shop_price}} - {{item.market_price}} + @@ -623,7 +623,7 @@ {{item.shop_price}} - {{item.market_price}} + @@ -639,7 +639,7 @@ {{item.shop_price}} - {{item.market_price}} + diff --git a/pages/goods/goodsInfo/goodsInfo.js b/pages/goods/goodsInfo/goodsInfo.js index 5240d8d..0a13f41 100644 --- a/pages/goods/goodsInfo/goodsInfo.js +++ b/pages/goods/goodsInfo/goodsInfo.js @@ -5014,6 +5014,7 @@ Page({ }; //---市场价划掉--- + /*--- context.setFillStyle("gray") context.setFontSize(22 * unit) var pri0 = "￥" + this.data.data.market_price.toFixed(2); @@ -5024,7 +5025,7 @@ Page({ context.setLineWidth(1 * unit); context.moveTo(54 * unit, 763 * unit); context.lineTo(ut.measureText(pri0, 22 * unit) + 50, 763 * unit); - context.stroke(); + context.stroke();--*/ // 8.商品标题 context.setFontSize(20 * unit); @@ -5205,6 +5206,7 @@ Page({ context.fillText(pri0, wd1, 185 * unit); //---市场价划掉--- + /*-- context.setFillStyle("gray") context.setFontSize(22 * unit) pri0 = "￥" + th.data.data.market_price.toFixed(2); @@ -5215,7 +5217,7 @@ Page({ context.setLineWidth(1 * unit); context.moveTo(wd2 - 5, 206 * unit); context.lineTo(wd2 + ut.measureText(pri0, 22 * unit) + 5, 206 * unit); - context.stroke(); + context.stroke();--*/ } else if (type == 4 && type != 0 && type != 1 && type != 2 && type != 3) { context.setFillStyle("black"); diff --git a/pages/goods/goodsInfo/goodsInfo.wxml b/pages/goods/goodsInfo/goodsInfo.wxml index 49eff38..82e49f0 100644 --- a/pages/goods/goodsInfo/goodsInfo.wxml +++ b/pages/goods/goodsInfo/goodsInfo.wxml @@ -98,7 +98,7 @@ ￥{{prom_price}} - 零售价￥{{filters.toFix(data.market_price,2)}} + ￥{{filters.toFix(data.shop_price,2)}} @@ -125,7 +125,7 @@ {{prom_price}} - 零售价￥{{filters.toFix(data.market_price,2)}} + ￥{{filters.toFix(data.shop_price,2)}} @@ -261,7 +261,7 @@ {{filters.toFix(prom_price,2)}}元 0积分 -    零售价:￥{{filters.toFix(data.market_price,2)}} +    ￥{{filters.toFix(data.shop_price,2)}} @@ -302,18 +302,18 @@ ￥ {{filters.toFix(data[card_field],2)}} - - 零售价:￥{{filters.toFix(data.market_price,2)}} - + + + ￥ {{filters.toFix(data.shop_price,2)}} - - 零售价:￥{{filters.toFix(data.market_price,2)}} - + + + @@ -410,7 +410,7 @@ ￥ {{prom_price}} - 零售价￥{{filters.toFix(data.market_price,2)}} + ￥{{filters.toFix(data.shop_price,2)}} diff --git a/pages/goods/goodsList/goodsList.wxml b/pages/goods/goodsList/goodsList.wxml index 82e562a..47cbf8a 100644 --- a/pages/goods/goodsList/goodsList.wxml +++ b/pages/goods/goodsList/goodsList.wxml @@ -74,7 +74,7 @@ + {{item.prom_price}} - {{item.market_price}} + @@ -101,7 +101,7 @@ - {{item.market_price}} + 评论{{item.comment_count}} 已售{{item.sales_sum}} @@ -111,7 +111,7 @@ {{item.shop_price}} - {{item.market_price}} + 评论{{item.comment_count}} 已售{{item.sales_sum}} @@ -123,7 +123,7 @@ {{item.shop_price}} - {{item.market_price}} + @@ -142,7 +142,7 @@ {{item.shop_price}} - {{item.market_price}} + @@ -157,7 +157,7 @@ {{item.shop_price}} - {{item.market_price}} + @@ -189,7 +189,7 @@ + {{item.prom_price}} - {{item.market_price}} + @@ -216,7 +216,7 @@ - {{item.market_price}} + 评论{{item.comment_count}} 已售{{item.sales_sum}} @@ -226,7 +226,7 @@ {{item.shop_price}} - {{item.market_price}} + 评论{{item.comment_count}} 已售{{item.sales_sum}} @@ -238,7 +238,7 @@ {{item.shop_price}} - {{item.market_price}} + @@ -257,7 +257,7 @@ {{item.shop_price}} - {{item.market_price}} + @@ -272,7 +272,7 @@ {{item.shop_price}} - {{item.market_price}} + diff --git a/pages/goods/search/search.wxml b/pages/goods/search/search.wxml index 34b8305..8c71192 100644 --- a/pages/goods/search/search.wxml +++ b/pages/goods/search/search.wxml @@ -91,7 +91,7 @@ ￥{{item.prom_price}} - ￥{{item.market_price}} + 评论{{item.comment_count}} 已售{{item.sales_sum}} @@ -111,14 +111,14 @@ - ￥{{item.market_price}} + 评论{{item.comment_count}} 已售{{item.sales_sum}} ￥{{item.shop_price}} - ￥{{item.market_price}} + 评论{{item.comment_count}} 已售{{item.sales_sum}} @@ -127,7 +127,7 @@ ￥{{item.shop_price}} - ￥{{item.market_price}} + @@ -145,7 +145,7 @@ ￥{{item.shop_price}} - ￥{{item.market_price}} + 评论{{item.comment_count}} 已售{{item.sales_sum}} @@ -154,7 +154,7 @@ ￥{{item.shop_price}} - ￥{{item.market_price}} + 评论{{item.comment_count}} 已售{{item.sales_sum}} diff --git a/pages/index/index/index.wxml b/pages/index/index/index.wxml index 9220eef..1cb2746 100644 --- a/pages/index/index/index.wxml +++ b/pages/index/index/index.wxml @@ -185,7 +185,7 @@ ￥{{aitem.price}} - ￥{{aitem.market_price}} + @@ -227,7 +227,7 @@ ￥{{aitem.presell_price}} - ￥{{aitem.market_price}} + 去抢购 @@ -264,7 +264,7 @@ {{filter.price(item.group_price)}} - 零售价:{{item.market_price}} + @@ -350,7 +350,7 @@ ￥ {{aitem.price}} - 零售价￥{{aitem.market_price}} + diff --git a/pages/index/index/index.wxss b/pages/index/index/index.wxss index f71e927..dedb960 100644 --- a/pages/index/index/index.wxss +++ b/pages/index/index/index.wxss @@ -1,16 +1,17 @@ /* 基本样式 */ page { width: 100%; - height: 100%; - overflow: hidden; + /*height: 100%;*/ + /*overflow: hidden;*/ box-sizing: border-box; position: relative; } /* 超出滚动 */ .container { width: 100%; - height: 100%; - overflow-y: auto; + height: auto; + /*overflow-y: auto;*/ + overflow-x: hidden; } .pink-b { diff --git a/pages/team/team_ping/team_ping.wxml b/pages/team/team_ping/team_ping.wxml index 8700061..a2df4ec 100644 --- a/pages/team/team_ping/team_ping.wxml +++ b/pages/team/team_ping/team_ping.wxml @@ -33,7 +33,7 @@ ￥ {{item.order_goods[0].goods_price}} - 零售价:￥{{item.order_goods[0].market_price}} + ￥{{item.order_goods[0].shop_price}} diff --git a/pages/team/team_show/team_show.wxml b/pages/team/team_show/team_show.wxml index c6ef77c..2adbc63 100644 --- a/pages/team/team_show/team_show.wxml +++ b/pages/team/team_show/team_show.wxml @@ -19,7 +19,7 @@ ￥{{teamlist.price}} - 零售价￥{{goods.market_price}} + ￥{{goods.shop_price}} diff --git a/pages/team/team_success/team_success.wxml b/pages/team/team_success/team_success.wxml index 14ae682..ca21c62 100644 --- a/pages/team/team_success/team_success.wxml +++ b/pages/team/team_success/team_success.wxml @@ -18,7 +18,7 @@ ￥{{teamlist.price}} - 零售价￥{{goods.market_price}} + ￥{{goods.shop_price}} diff --git a/pages/user/address_list/address_list.wxml b/pages/user/address_list/address_list.wxml index 5e667d8..619915a 100644 --- a/pages/user/address_list/address_list.wxml +++ b/pages/user/address_list/address_list.wxml @@ -1,78 +1,78 @@ - - - - + + + + + + 暂无收货地址 + + + - - 暂无收货地址 - + + + + 获取微信地址 + - - - - + - 获取微信地址 - - - - + - 新建收货地址 - + + + + 新建收货地址 + - + - + - - + + - - - - - - - - - - {{item.consignee}} - - {{item.mobile}} - 默认地址 - + + + - - {{item.more_address}} {{item.address}} - + + + + + + {{item.consignee}} + + {{item.mobile}} + 默认地址 + - - - - - + + {{item.more_address}} {{item.address}} + + + + + + + - + + - + - - + - 获取微信地址 - - - - + - 新建收货地址 - + + + + 获取微信地址 + + + + + + 新建收货地址 + \ No newline at end of file