diff --git a/components/diy_pregoods/diy_pregoods.js b/components/diy_pregoods/diy_pregoods.js index 29dfa98..69a55f8 100644 --- a/components/diy_pregoods/diy_pregoods.js +++ b/components/diy_pregoods/diy_pregoods.js @@ -55,7 +55,7 @@ Component({ goodsidlist=ut.sub_last(goodsidlist); var user_id=getApp().globalData.user_id; - var pre_data={store_id:os.stoid,is_end:0,timetype:1,isuse:1}; + var pre_data={store_id:os.stoid,is_end:0,timetype:3,isuse:1}; if(user_id){ pre_data.user_id=user_id; } @@ -89,7 +89,7 @@ Component({ no_gid_set(){ var th=this; var user_id=getApp().globalData.user_id; - var pre_data={store_id:os.stoid,is_end:0,timetype:1,isuse:1,page:1,pageSize:9}; + var pre_data={store_id:os.stoid,is_end:0,timetype:3,isuse:1,page:1,pageSize:9}; if(user_id){ pre_data.user_id=user_id; } diff --git a/components/diy_pregoods/diy_pregoods.wxml b/components/diy_pregoods/diy_pregoods.wxml index da62e69..8177d45 100644 --- a/components/diy_pregoods/diy_pregoods.wxml +++ b/components/diy_pregoods/diy_pregoods.wxml @@ -30,6 +30,13 @@ 火热进行 + + + + 即将开始 + + + 已抢光 @@ -111,6 +118,14 @@ + + + 即将开始 + + + + + diff --git a/components/diy_pregoods/diy_pregoods.wxss b/components/diy_pregoods/diy_pregoods.wxss index 11e5447..b3569b8 100644 --- a/components/diy_pregoods/diy_pregoods.wxss +++ b/components/diy_pregoods/diy_pregoods.wxss @@ -57,6 +57,7 @@ swiper { .sp .sp_top { height: 220rpx; min-width: 30%; + position: relative; } .sp .sp_top .s_img { @@ -76,7 +77,7 @@ swiper { font-size: 24rpx; height: 38rpx; line-height: 38rpx; - left: 6rpx; + left: 2rpx; padding: 4rpx 10rpx; border-radius: 10rpx; z-index: 999; diff --git a/components/diy_searchbox/diy_searchbox.js b/components/diy_searchbox/diy_searchbox.js index ef93b4c..73443ef 100644 --- a/components/diy_searchbox/diy_searchbox.js +++ b/components/diy_searchbox/diy_searchbox.js @@ -17,7 +17,7 @@ Component({ someData: {}, first:1, inputShowed:1, - inputval:'在店铺内搜索', + inputval:'请输入商品关键字', keyword:'', searchRecord: [], diff --git a/components/diy_searchbox/diy_searchbox.wxml b/components/diy_searchbox/diy_searchbox.wxml index e5c506b..2fe1238 100644 --- a/components/diy_searchbox/diy_searchbox.wxml +++ b/components/diy_searchbox/diy_searchbox.wxml @@ -6,7 +6,7 @@ - 在店铺内搜索 + 请输入商品关键字 @@ -39,7 +39,7 @@ - 在店铺内搜索 + 请输入商品关键字 diff --git a/packageA/pages/cardList/cardList.wxml b/packageA/pages/cardList/cardList.wxml index bd3461c..b094f55 100644 --- a/packageA/pages/cardList/cardList.wxml +++ b/packageA/pages/cardList/cardList.wxml @@ -16,7 +16,7 @@ {{item.serviceName}} - 有效天数：{{item.validDays?item.validDays:0}} + 有效天数：{{item.validDays && item.validDays!='0'?item.validDays:'不限'}} {{item.money}} @@ -40,7 +40,7 @@ {{item.serviceName}} - 有效天数：{{item.validDays?item.validDays:'不限'}} + 有效天数：{{item.validDays && item.validDays!='0'?item.validDays:'不限'}} {{item.money}} @@ -73,7 +73,7 @@ {{item.serviceName}} - 有效天数：{{item.validDays?item.validDays:0}} + 有效天数：{{item.validDays && item.validDays!='0'?item.validDays:'不限'}} {{item.money}} diff --git a/packageA/pages/distribution/commision/commision.js b/packageA/pages/distribution/commision/commision.js index 277dc75..c4972c9 100644 --- a/packageA/pages/distribution/commision/commision.js +++ b/packageA/pages/distribution/commision/commision.js @@ -10,7 +10,7 @@ Page({ data: { isHiddenDropdown: true,//控制下拉菜单显隐 dropdownArr: ['综合','未付款','已付款','待分成','已分成','已取消'], - statusArr: ['未付款', '已付款', '等待分成', '已分成', '已取消'], + statusArr: ['未付款', '已付款', '等待分成', '已分成', '已取消','已退款'], currentSelect: '',//记录当前下拉菜单选中项 isInputFocus: false,//记录搜索输入框是否聚焦 inputVal: '',//记录搜索输入框的内容 diff --git a/packageA/pages/distribution/commision/commision.wxml b/packageA/pages/distribution/commision/commision.wxml index 11d99c3..c9b44e6 100644 --- a/packageA/pages/distribution/commision/commision.wxml +++ b/packageA/pages/distribution/commision/commision.wxml @@ -31,7 +31,7 @@ {{filter.format_time(item.create_time, 1)}} - {{filter.status(item.status, statusArr)}} + {{filter.status(item.status, statusArr,item.order_status)}} 订单号：{{item.order_sn}} diff --git a/packageA/pages/distribution/order/order.wxml b/packageA/pages/distribution/order/order.wxml index a199bce..91e1f42 100644 --- a/packageA/pages/distribution/order/order.wxml +++ b/packageA/pages/distribution/order/order.wxml @@ -12,7 +12,7 @@ {{item.nickname}} - {{filter.status(item.status, statusArr)}} + {{filter.status(item.status, statusArr,item.order_status)}} diff --git a/packageA/pages/jfbuy/jfbuy.js b/packageA/pages/jfbuy/jfbuy.js index 90d1341..853f808 100644 --- a/packageA/pages/jfbuy/jfbuy.js +++ b/packageA/pages/jfbuy/jfbuy.js @@ -372,7 +372,10 @@ Page({ // var req_data = { // page:th.data.currentPage2 - // } + // } + if (getApp().globalData.user_id) { + data.user_id=getApp().globalData.user_id + } app.request.promiseGet("/api/weshop/integralbuy/pageIntegralBuyGoodsList", { data: data diff --git a/packageC/pages/goods/search/search.wxml b/packageC/pages/goods/search/search.wxml index 18c65f1..f5be6ea 100644 --- a/packageC/pages/goods/search/search.wxml +++ b/packageC/pages/goods/search/search.wxml @@ -3,7 +3,7 @@
- + diff --git a/packageC/pages/presell/cart/cart.js b/packageC/pages/presell/cart/cart.js index a24f2cd..75812e0 100644 --- a/packageC/pages/presell/cart/cart.js +++ b/packageC/pages/presell/cart/cart.js @@ -2670,7 +2670,7 @@ Page({ if (gg.prom_type == 4) { await getApp().request.promiseGet("/api/weshop/integralbuy/pageIntegralBuyGoodsList?stype=1&stypeup=1", { - data: { store_id: os.stoid, goods_id: gg.goods_id } + data: { store_id: os.stoid, goods_id: gg.goods_id,user_id: getApp().globalData.user_id, } }).then(res => { if (res.data.code == 0 && res.data.data && res.data.data.pageData && res.data.data.pageData.length) { prom = res.data.data.pageData[0]; @@ -2765,7 +2765,7 @@ Page({ if (goodsinfo.prom_type == 4 && !good.is_integral_normal) { await getApp().request.promiseGet("/api/weshop/integralbuy/pageIntegralBuyGoodsList?stype=1&stypeup=1", { - data: { store_id: os.stoid, goods_id: goodsinfo.goods_id } + data: { store_id: os.stoid, goods_id: goodsinfo.goods_id,user_id: getApp().globalData.user_id, } }).then(res => { if (res.data.code == 0 && res.data.data && res.data.data.pageData && res.data.data.pageData.length) { prom = res.data.data.pageData[0]; diff --git a/packageC/pages/presell/goodsInfo/goodsInfo.js b/packageC/pages/presell/goodsInfo/goodsInfo.js index 7e53247..5394814 100644 --- a/packageC/pages/presell/goodsInfo/goodsInfo.js +++ b/packageC/pages/presell/goodsInfo/goodsInfo.js @@ -255,6 +255,8 @@ Page({ pre_arr: null, hiddenCS: true, + + is_retail_price: 0, }, //------初始化加载---------- @@ -391,7 +393,8 @@ Page({ store_config: e, sys_switch: json_d, is_closecoupon: json_d.is_closecoupon, - is_newsales_rules: json_d.is_newsales_rules + is_newsales_rules: json_d.is_newsales_rules, + is_retail_price: json_d.is_retail_price || 0, }); // ee.init(gid); //------几人评价------- diff --git a/packageC/pages/presell/goodsInfo/goodsInfo.wxml b/packageC/pages/presell/goodsInfo/goodsInfo.wxml index f13b41e..7cc56c4 100644 --- a/packageC/pages/presell/goodsInfo/goodsInfo.wxml +++ b/packageC/pages/presell/goodsInfo/goodsInfo.wxml @@ -80,10 +80,10 @@ 预售价 - ￥{{presellList.presell_price}} - - - + ￥{{presellList.presell_price}} + + 零售价￥{{filters.toFix(data.market_price,2)}} + diff --git a/packageD/pages/shop/order_detail/order_detail.js b/packageD/pages/shop/order_detail/order_detail.js index ae1f780..3024a05 100644 --- a/packageD/pages/shop/order_detail/order_detail.js +++ b/packageD/pages/shop/order_detail/order_detail.js @@ -535,7 +535,7 @@ Page({ if(gg.prom_type==4){ await getApp().request.promiseGet("/api/weshop/integralbuy/pageIntegralBuyGoodsList?stype=1&stypeup=1&timetype=2",{ - data:{store_id:os.stoid,goods_id:gg.goods_id} + data:{store_id:os.stoid,goods_id:gg.goods_id,user_id: getApp().globalData.user_id,} }).then(res=>{ if(res.data.code==0 && res.data.data && res.data.data.pageData && res.data.data.pageData.length){ prom=res.data.data.pageData[0]; @@ -659,7 +659,7 @@ Page({ if(goodsinfo.prom_type==4 && !good.is_integral_normal){ await getApp().request.promiseGet("/api/weshop/integralbuy/pageIntegralBuyGoodsList?stype=1&stypeup=1&timetype=2",{ - data:{store_id:os.stoid,goods_id:goodsinfo.goods_id} + data:{store_id:os.stoid,goods_id:goodsinfo.goods_id,user_id: getApp().globalData.user_id,} }).then(res=>{ if(res.data.code==0 && res.data.data && res.data.data.pageData && res.data.data.pageData.length){ prom=res.data.data.pageData[0]; diff --git a/packageE/pages/cart/cart2/cart2.js b/packageE/pages/cart/cart2/cart2.js index 60447e6..6f81160 100644 --- a/packageE/pages/cart/cart2/cart2.js +++ b/packageE/pages/cart/cart2/cart2.js @@ -6797,6 +6797,7 @@ Page({ item.goods_price = item.price; item.is_collocation = 1; item.prom_type = 5; + item.is_post_temp = 1; th.setData({is_coupon:item.is_coupon}) @@ -6914,6 +6915,7 @@ Page({ item.goods_price = item.price; item.prom_type = 5; item.is_collocation = 1; + item.is_post_temp = 1; goods.push(item); @@ -6946,6 +6948,8 @@ Page({ var et = 1; var distr_t = 0; // 配送方式 0=用户自选 1=自提 2=物流 for (var hi in narr) { + + narr[hi].is_post_temp=1; //-- 固定都是参与包邮模板 -- var dis_t = narr[hi].distr_type; if (dis_t == 2) { th.setData({ is_all_zt: 0 }); diff --git a/pages/cart/cart2_inte/cart2_inte.js b/pages/cart/cart2_inte/cart2_inte.js index 2fea0ab..45ec9c9 100644 --- a/pages/cart/cart2_inte/cart2_inte.js +++ b/pages/cart/cart2_inte/cart2_inte.js @@ -540,7 +540,7 @@ Page({ break; case 4: //-- 积分购 -- getApp().request.get("/api/weshop/integralbuy/pageIntegralBuyGoodsList?stype=1&stypeup=1&timetype=2", { - data: { store_id: os.stoid, goods_id: gg.goods_id }, + data: { store_id: os.stoid, goods_id: gg.goods_id, user_id: to.globalData.user_id, }, success: async function (tt) { if (tt.data.code == 0 && tt.data.data && tt.data.data.pageData) { var inte_data = tt.data.data.pageData[0]; diff --git a/pages/goods/categoryList/categoryList.wxml b/pages/goods/categoryList/categoryList.wxml index 0f69613..ef023cf 100644 --- a/pages/goods/categoryList/categoryList.wxml +++ b/pages/goods/categoryList/categoryList.wxml @@ -131,11 +131,11 @@ - + --> - 搜索店铺商品 + 输入商品关键字 @@ -398,7 +398,7 @@ - 搜索店铺商品 + 请输入商品关键字 diff --git a/pages/goods/goodsInfo/goodsInfo.js b/pages/goods/goodsInfo/goodsInfo.js index f3f493a..69da82f 100644 --- a/pages/goods/goodsInfo/goodsInfo.js +++ b/pages/goods/goodsInfo/goodsInfo.js @@ -4428,7 +4428,8 @@ Page({ stype: 1, stypeup: 1, goods_id: gid, - timetype:2 + timetype:2, + user_id:getApp().globalData.user_id, } var integrals = 0; diff --git a/pages/goods/goodsList/goodsList.wxml b/pages/goods/goodsList/goodsList.wxml index 7f9447e..46542dd 100644 --- a/pages/goods/goodsList/goodsList.wxml +++ b/pages/goods/goodsList/goodsList.wxml @@ -21,7 +21,7 @@ - 搜索店铺商品 + 请输入商品关键字 diff --git a/pages/index/index/index.wxml b/pages/index/index/index.wxml index 6244df8..f3ed9fe 100644 --- a/pages/index/index/index.wxml +++ b/pages/index/index/index.wxml @@ -39,7 +39,7 @@ - + diff --git a/pages/user/order_detail/order_detail.js b/pages/user/order_detail/order_detail.js index 76c997a..709d5de 100644 --- a/pages/user/order_detail/order_detail.js +++ b/pages/user/order_detail/order_detail.js @@ -585,7 +585,7 @@ Page({ if(gg.prom_type==4){ await getApp().request.promiseGet("/api/weshop/integralbuy/pageIntegralBuyGoodsList?stype=1&stypeup=1&timetype=2",{ - data:{store_id:os.stoid,goods_id:gg.goods_id} + data:{store_id:os.stoid,goods_id:gg.goods_id,user_id: getApp().globalData.user_id,} }).then(res=>{ if(res.data.code==0 && res.data.data && res.data.data.pageData && res.data.data.pageData.length){ prom=res.data.data.pageData[0]; @@ -709,7 +709,7 @@ Page({ if(goodsinfo.prom_type==4 && !good.is_integral_normal){ await getApp().request.promiseGet("/api/weshop/integralbuy/pageIntegralBuyGoodsList?stype=1&stypeup=1&timetype=2",{ - data:{store_id:os.stoid,goods_id:goodsinfo.goods_id} + data:{store_id:os.stoid,goods_id:goodsinfo.goods_id,user_id: getApp().globalData.user_id,} }).then(res=>{ if(res.data.code==0 && res.data.data && res.data.data.pageData && res.data.data.pageData.length){ prom=res.data.data.pageData[0]; diff --git a/pages/user/order_list/order_list.js b/pages/user/order_list/order_list.js index c896025..f0c3277 100644 --- a/pages/user/order_list/order_list.js +++ b/pages/user/order_list/order_list.js @@ -651,7 +651,7 @@ Page({ var order = e; var order_goods = e.order_goods; var user_id = getApp().globalData.userInfo.user_id; - + //如果使用预存的话，要重新效验下预存金额是否足够 if(order.pre_cut && order.pre_json){ let pickup_id=order.pickup_id @@ -976,7 +976,7 @@ Page({ if (gg.prom_type == 4) { await getApp().request.promiseGet("/api/weshop/integralbuy/pageIntegralBuyGoodsList?stype=1&stypeup=1&timetype=2", { - data: { store_id: os.stoid, goods_id: gg.goods_id } + data: { store_id: os.stoid, goods_id: gg.goods_id,user_id: getApp().globalData.user_id, } }).then(res => { if (res.data.code == 0 && res.data.data && res.data.data.pageData) { prom = res.data.data.pageData[0]; @@ -1097,7 +1097,7 @@ Page({ if (goodsinfo.prom_type == 4 && !good.is_integral_normal) { await getApp().request.promiseGet("/api/weshop/integralbuy/pageIntegralBuyGoodsList?stype=1&stypeup=1&timetype=2", { - data: { store_id: os.stoid, goods_id: goodsinfo.goods_id } + data: { store_id: os.stoid, goods_id: goodsinfo.goods_id,user_id: getApp().globalData.user_id, } }).then(res => { if (res.data.code == 0 && res.data.data && res.data.data.pageData) { prom = res.data.data.pageData[0]; diff --git a/utils/filter.wxs b/utils/filter.wxs index 83c952b..c74dce0 100644 --- a/utils/filter.wxs +++ b/utils/filter.wxs @@ -115,7 +115,7 @@ var filters = { // num:状态数值, // arr: 状态文字数组, // 文字顺序必须跟状态数值对应 - status: function (num, arr) { + status: function (num, arr,order_status) { // var text = ''; // if(num == 0) { // text = '未付款'; @@ -126,6 +126,8 @@ var filters = { // } else if(num == 3) { // text = '已完成'; // }; + + if(order_status==6) return '已退款'; return arr[num]; },