diff --git a/app.js b/app.js index 723e1d7..95a978e 100644 --- a/app.js +++ b/app.js @@ -178,7 +178,7 @@ App({ success: function (o) { console.log('getwuliu'); console.log(o); - if (o.data.code == 0) { + if (o.data.code == 0 && o.data.data && o.data.data.pageData && o.data.data.pageData.length>0) { var arr = o.data.data.pageData; console.log(arr); arr.forEach(function(item,index){ diff --git a/app.json b/app.json index df73c2d..1407bb2 100644 --- a/app.json +++ b/app.json @@ -1,7 +1,6 @@ { "pages": [ "pages/index/index/index", - "pages/justTest/justTest", "pages/goods/categoryList/categoryList", "pages/cart/cart/cart", "pages/cart/cart2/cart2", @@ -86,11 +85,18 @@ "pages/video/index", "pages/template/index", "pages/store/index", - "pages/user/choice_guide/choice_guide" + "pages/user/choice_guide/choice_guide", + "pages/cart/cart2_inte/cart2_inte", + "pages/giftpack/festival/festival", + "pages/team/team_more/team_more", + "pages/user/collect_list/collect_list", + "pages/user/deposit/deposit", + "pages/user/deposit/prepaid/msg/msg", + "pages/user/deposit/prepaid/prepaid" ], "plugins": { "live-player-plugin": { - "version": "1.1.1", + "version": "1.2.1", "provider": "wx2b03c6e691cd7370" } }, diff --git a/components/diy_goodsGroup/diy_goodsGroup.js b/components/diy_goodsGroup/diy_goodsGroup.js index 889a03c..5072fd3 100644 --- a/components/diy_goodsGroup/diy_goodsGroup.js +++ b/components/diy_goodsGroup/diy_goodsGroup.js @@ -112,7 +112,7 @@ Component({ }, pageLifetimes: { - //游客登陆后，只要更新卡的情况 + //游客登录后，只要更新卡的情况 show: function () { //--初始化卡类-- this.card_init(); diff --git a/components/diy_pingd_buy/diy_pingd_buy.js b/components/diy_pingd_buy/diy_pingd_buy.js index 31975e9..3150a37 100644 --- a/components/diy_pingd_buy/diy_pingd_buy.js +++ b/components/diy_pingd_buy/diy_pingd_buy.js @@ -69,7 +69,7 @@ Component({ //如果拼单的数组为空的时候 var goodslist=res.data.data; - if(goodslist.length==0) return false; + if(!goodslist || goodslist.length==0) return false; /*--商品队列按照添加的顺序排列--*/ g_id.forEach(function(val, ind) { diff --git a/components/diy_seckill/diy_seckill.js b/components/diy_seckill/diy_seckill.js index 0e858a4..069c855 100644 --- a/components/diy_seckill/diy_seckill.js +++ b/components/diy_seckill/diy_seckill.js @@ -65,7 +65,7 @@ Component({ //如果秒杀的数组为空的时候 var goodslist=res.data.data; - if(goodslist.length==0) return false; + if(!goodslist || goodslist.length==0) return false; // 判断火热，预热 var newTime = ut.gettimestamp(); diff --git a/components/diy_service/diy_service.wxml b/components/diy_service/diy_service.wxml index 73fe0dc..f2c6c0a 100644 --- a/components/diy_service/diy_service.wxml +++ b/components/diy_service/diy_service.wxml @@ -1,6 +1,6 @@ - + diff --git a/components/diy_shopname/diy_shopname.js b/components/diy_shopname/diy_shopname.js index f794add..370d43f 100644 --- a/components/diy_shopname/diy_shopname.js +++ b/components/diy_shopname/diy_shopname.js @@ -27,15 +27,21 @@ Component({ //--所有商品-- getApp().request.promiseGet("/api/weshop/goods/page/", {data:{ isonsale: 1, store_id: o.stoid,page:1,pageSize:1}}).then(res => { - var total=res.data.data.total; - th.setData({total:total}) + + if(res.data.code==0 && res.data.data){ + var total=res.data.data.total; + th.setData({total:total}) + } }) //--所有新品-- getApp().request.promiseGet("/api/weshop/goods/page/", {data:{is_new:1,isonsale: 1, store_id: o.stoid,page:1,pageSize:1}}).then(res => { - var total=res.data.data.total; - th.setData({new_total:total}) + if(res.data.code==0 && res.data.data) + { + var total = res.data.data.total; + th.setData({new_total: total}) + } }) }, diff --git a/components/diy_shopname/diy_shopname.wxml b/components/diy_shopname/diy_shopname.wxml index 78de886..537b0f7 100644 --- a/components/diy_shopname/diy_shopname.wxml +++ b/components/diy_shopname/diy_shopname.wxml @@ -3,18 +3,20 @@ - + - + + - + {{store_name}} + @@ -36,8 +38,7 @@ - - + @@ -48,35 +49,38 @@ {{store_name}} - - - - - {{total}} - 全部商品 - - - - - | - - {{new_total}} - 上新商品 - - - - - | - - - - - 个人中心 - - - - + + + + + + + {{total}} + 全部商品 + + + + + | + + {{new_total}} + 上新商品 + + + + + | + + + + + 个人中心 + + + + + diff --git a/components/diy_shopname/diy_shopname.wxss b/components/diy_shopname/diy_shopname.wxss index 56e858c..7654f73 100644 --- a/components/diy_shopname/diy_shopname.wxss +++ b/components/diy_shopname/diy_shopname.wxss @@ -4,7 +4,7 @@ text-align:center; margin:0 auto; position: relative; - height: 500rpx; + /* height: 500rpx; */ } .s1_gk_a1{ @@ -15,11 +15,9 @@ /* 圆形小图片 */ .wxd_ww { - width: 126rpx; - height: 126rpx; + width: 100%; + height: 100%; /* justify-content: center; */ - margin-top: 20rpx; - margin-left: 6rpx; } /* 小图片圆边框 */ @@ -43,8 +41,8 @@ /* 设置小图片外面的view的宽高 */ .circle_tow .border { - width: 140rpx; - height: 140rpx; + width: 100%; + height: 100%; } /* 小图片最大外边框 */ @@ -52,7 +50,7 @@ .big_border { width: 192rpx; height: 214rpx; - position: relative; + position: absolute; top: -82rpx; left: 10px; } @@ -69,7 +67,7 @@ .big_picture_border { width: 100%; - height: 320rpx; + /* height: 320rpx; */ } @@ -140,9 +138,10 @@ left:-116rpx; .big_border_two { width: 100%; height: 260rpx; - position: relative; - top: -274rpx; + position: absolute; + top: -130rpx; text-align: center; + margin-top: 50%; } /* 小图片2圆边框 */ @@ -189,7 +188,6 @@ left:-116rpx; width: 100%; height: 120rpx; position: relative; - top: -250rpx; } /* 使里面的view纵向排列 */ .arrange{ @@ -223,11 +221,11 @@ left:-116rpx; } .wai_zwp{ background-color: white; - height: 500rpx; + /* height: 500rpx; */ } .shopname_title_size{ font-size: 34rpx} -.big .all_view{display: flex; width: 500rpx; position:absolute; bottom:90rpx;right: 0 } +.big .all_view{display: flex; width: 500rpx; position:absolute; bottom:rpx;right: 0 } .big .all_view .v_item{width:33%; } .big_border_two .title_center{ display: flex; justify-content: center;} diff --git a/components/goods_list/goods_list.js b/components/goods_list/goods_list.js index fd484ac..5284d4c 100644 --- a/components/goods_list/goods_list.js +++ b/components/goods_list/goods_list.js @@ -24,7 +24,7 @@ Component({ ready: function () { }, pageLifetimes:{ - //要处理一下，游客登陆后的界面的变化,主要还该是改变会员 + //要处理一下，游客登录后的界面的变化,主要还该是改变会员 show: function () { this.init(); } @@ -151,6 +151,16 @@ Component({ var th = this; getApp().request.promiseGet("/api/weshop/plus/vip/mem/bership/list?" + "storeId=" + storid, {}).then(res => { + + if(res.data.code!=0 || !res.data.data){ + var ob = { + "card_list": [], + "name_map": "" + }; + func(ob); + return false; + } + var plusCard = res.data.data; var arr = [1219, 2089, 3031]; var new_arr = new Array(); diff --git a/images/share/miao_share.png b/images/share/miao_share.png index f788197..45f6493 100644 --- a/images/share/miao_share.png +++ b/images/share/miao_share.png diff --git a/packageA/pages/activity_share/activity_share.js b/packageA/pages/activity_share/activity_share.js index 2c7e35a..70f5da7 100644 --- a/packageA/pages/activity_share/activity_share.js +++ b/packageA/pages/activity_share/activity_share.js @@ -59,7 +59,7 @@ Page({ var StaffId=options.StaffId; var StorageId=options.StorageId; if(first_leader){ - //-- user_id代过来免登陆 -- + //-- user_id代过来免登录 -- getApp().globalData.user_id=first_leader; getApp().getUserFir(); @@ -466,6 +466,13 @@ Page({ var storid = oo.stoid; var th = this; getApp().request.promiseGet("/api/weshop/plus/vip/mem/bership/list?" + "storeId=" + storid, {}).then(res => { + + if(res.data.code!=0 || !res.data.data){ + var ob={"card_list":[],"name_map":''}; + func(ob); + return false; + } + var plusCard = res.data.data; var arr = [1219, 2089, 3031]; var new_arr = new Array(); diff --git a/packageA/pages/goods_share/goods_share.js b/packageA/pages/goods_share/goods_share.js index 313d6da..8305457 100644 --- a/packageA/pages/goods_share/goods_share.js +++ b/packageA/pages/goods_share/goods_share.js @@ -36,7 +36,7 @@ Page({ var StaffId=options.StaffId; var StorageId=options.StorageId; if(first_leader){ - //-- user_id代过来免登陆 -- + //-- user_id代过来免登录 -- getApp().globalData.user_id=first_leader; getApp().getUserFir(); @@ -281,6 +281,13 @@ Page({ var storid = oo.stoid; var th = this; getApp().request.promiseGet("/api/weshop/plus/vip/mem/bership/list?" + "storeId=" + storid, {}).then(res => { + + if(res.data.code!=0 || !res.data.data){ + var ob={"card_list":[],"name_map":''}; + func(ob); + return false; + } + var plusCard = res.data.data; var arr = [1219, 2089, 3031]; var new_arr = new Array(); diff --git a/packageA/pages/jfbuy/jfbuy.js b/packageA/pages/jfbuy/jfbuy.js index 8edae35..fb503a7 100644 --- a/packageA/pages/jfbuy/jfbuy.js +++ b/packageA/pages/jfbuy/jfbuy.js @@ -80,7 +80,7 @@ Page({ // //接受有没有导购的参数 // var first_leader=options.first_leader; // if(first_leader){ - // //-- user_id代过来免登陆 -- + // //-- user_id代过来免登录 -- // getApp().globalData.user_id=first_leader; // getApp().getUserFir(); // } @@ -297,7 +297,7 @@ Page({ // 关闭加载状态 th.data.is_load2=0; // 请求成功 - if(res.data.code==0) { + if(res.data.code==0 && res.data.data && res.data.data.pageData) { if(res.data.data.pageData.length>0) { th.data.currentPage2++; var data = res.data.data.pageData; diff --git a/packageA/pages/liveStreamDetails/liveStreamDetails.js b/packageA/pages/liveStreamDetails/liveStreamDetails.js index 24b87c4..a62fe51 100644 --- a/packageA/pages/liveStreamDetails/liveStreamDetails.js +++ b/packageA/pages/liveStreamDetails/liveStreamDetails.js @@ -403,7 +403,7 @@ drawText: function(ctx, str, leftWidth, initHeight, titleHeight, canvasWidth, un var storageId=options.storageId; if(first_leader){ - //-- user_id代过来免登陆 -- + //-- user_id代过来免登录 -- getApp().globalData.first_leader=first_leader; //调用接口判断是不是会员 getApp().request.promiseGet("/api/weshop/shoppingGuide/get/"+o.stoid+"/"+first_leader,{}).then(res=>{ diff --git a/packageA/pages/live_share/live_share.js b/packageA/pages/live_share/live_share.js index c2d1c9c..7d3f742 100644 --- a/packageA/pages/live_share/live_share.js +++ b/packageA/pages/live_share/live_share.js @@ -31,7 +31,7 @@ Page({ var StaffId=options.StaffId; var StorageId=options.StorageId; if(first_leader){ - //-- user_id代过来免登陆 -- + //-- user_id代过来免登录 -- getApp().globalData.user_id=first_leader; getApp().getUserFir(); //设置分享会员和导购id和归属门店ID diff --git a/packageA/pages/prom_list/prom_list.js b/packageA/pages/prom_list/prom_list.js index 1b57580..9ca84cc 100644 --- a/packageA/pages/prom_list/prom_list.js +++ b/packageA/pages/prom_list/prom_list.js @@ -39,6 +39,7 @@ Page({ goodsInputNum:1, g_buy_num: null, sele_collocation:null, + }, //------初始化加载---------- @@ -108,7 +109,7 @@ Page({ getApp().request.promiseGet("/api/weshop/pickup/list",{ data:{store_id:os.stoid,pickup_id:e.pickup_id,lat:th.data.lat,lon: th.data.lon}, }).then(res=>{ - if(res.data.code==0){ + if(res.data.code==0 && res.data.data && res.data.data.pageData){ e=res.data.data.pageData[0]; if (e){ appd.pk_store=e; @@ -240,20 +241,22 @@ Page({ }else{ ee.setData({ data: t.data.data, }); } - - /*---获取活动的重表---*/ - //调用接口判断订单优惠， - getApp().request.promiseGet("/api/weshop/goods/getGoodsPromList/" + os.stoid+"/"+ee.data.gid+"/2", {}).then(res => { - if(res.data.code==0){ - var r_data=res.data.data; - th.loop_promise(0,r_data.collocationList,function(){ - ee.setData({ - collocationGoods:r_data.collocationPromList, - collocationList:r_data.collocationList, - }) - }) - } - }) + + if(!ee.data.collocationList){ + /*---获取活动的重表---*/ + //调用接口判断订单优惠， + getApp().request.promiseGet("/api/weshop/goods/getGoodsPromList/" + os.stoid+"/"+ee.data.gid+"/2", {}).then(res => { + if(res.data.code==0){ + var r_data=res.data.data; + th.loop_promise(0,r_data.collocationList,function(){ + ee.setData({ + collocationGoods:r_data.collocationPromList, + collocationList:r_data.collocationList, + }) + }) + } + }) + } //获取统一条形码,普通商品和优惠促销的商品 if ( t.data.data.prom_type == 5){ @@ -273,7 +276,7 @@ Page({ } //---通过接口获取门店的线下库存信息-- return getApp().request.promiseGet("/api/weshop/goods/getWareStorages",{ - data:{storageNos:that.data.fir_def_store.pickup_no,wareIds:encodeURIComponent(th.data.data.erpwareid),storeId:os.stoid} + data:{storageNos:that.data.fir_def_store.pickup_no,wareIds:encodeURIComponent(th.data.data.erpwareid),storeId:os.stoid,pageSize:2000} }) }).then(res=>{ if(res.data.code==0 && res.data.data.total>0){ @@ -413,7 +416,7 @@ Page({ var pick=th.get_pick_from_list(th.data.sto_sele_id) //---通过接口获取门店的线下库存信息-- getApp().request.get("/api/weshop/goods/getWareStorages",{ - data:{storageNos:pick.pickup_no,wareIds:encodeURIComponent(th.data.data.erpwareid),storeId:os.stoid}, + data:{storageNos:pick.pickup_no,wareIds:encodeURIComponent(th.data.data.erpwareid),storeId:os.stoid,pageSize:2000}, success:function(res){ if(res.data.code==0){ if(res.data.data.pageData.length>0){ @@ -722,7 +725,7 @@ Page({ if (e.data.code == 0) { //如果有开启距离的功能，没有设置默认门店，要用最近的门店作为默认门店 - if(dd.lat && !th.data.def_pick_store && th.data.bconfig.is_sort_storage){ + if(dd.lat && !th.data.def_pick_store && th.data.bconfig && th.data.bconfig.is_sort_storage){ th.setData({ def_pick_store:e.data.data.pageData[0], sto_sele_name: e.data.data.pageData[0].pickup_name, @@ -905,7 +908,7 @@ Page({ only_pk: e.data.data.pageData }); //-----如果没有默认门店，要取第一个门店作为默认店------ - if (!th.data.def_pick_store && th.data.bconfig.is_sort_storage) { + if (!th.data.def_pick_store && th.data.bconfig && th.data.bconfig.is_sort_storage) { th.setData({ def_pick_store:e.data.data.pageData[0], sto_sele_name: e.data.data.pageData[0].pickup_name, @@ -942,7 +945,7 @@ Page({ } //---通过接口获取门店的线下库存信息-- return getApp().request.promiseGet("/api/weshop/goods/getWareStorages",{ - data:{storageNos:pkno_str,wareIds:encodeURIComponent(th.data.data.erpwareid),storeId:os.stoid} + data:{storageNos:pkno_str,wareIds:encodeURIComponent(th.data.data.erpwareid),storeId:os.stoid,pageSize:2000} }) }).then(res=>{ if(res.data.code==0){ @@ -1149,7 +1152,7 @@ Page({ } - if (bconfig.is_sort_storage) { + if (bconfig && bconfig.is_sort_storage) { wx.getLocation({ type: 'gcj02', success: function(res) { @@ -1300,7 +1303,7 @@ Page({ }) //读取线下的门店库存 await getApp().request.promiseGet("/api/weshop/goods/getWareStorages",{ - data:{storageNos:item.pickup_no,wareIds:encodeURIComponent(erpwareid),storeId:os.stoid} + data:{storageNos:item.pickup_no,wareIds:encodeURIComponent(erpwareid),storeId:os.stoid,pageSize:2000} }).then(res=>{ if(res.data.code==0 && res.data.data.total>0){ plist=res.data.data.pageData[0]; @@ -1478,7 +1481,7 @@ Page({ th.data.t_time = setInterval(function() { if (th.data.bconfig == null) false; var e = th.data.bconfig; - if (e.is_sort_storage) { + if (e && e.is_sort_storage) { wx.getLocation({ type: 'gcj02', success: function(res) { @@ -1526,6 +1529,13 @@ Page({ var storid = os.stoid; var th = this; getApp().request.promiseGet("/api/weshop/plus/vip/mem/bership/list?" + "storeId=" + storid, {}).then(res => { + + if(res.data.code!=0 || !res.data.data){ + var ob={"card_list":[],"name_map":''}; + func(ob); + return false; + } + var plusCard = res.data.data; var arr = [1219, 2089, 3031]; var new_arr = new Array(); diff --git a/packageA/pages/quan/quan.js b/packageA/pages/quan/quan.js index 0336b3d..b53a556 100644 --- a/packageA/pages/quan/quan.js +++ b/packageA/pages/quan/quan.js @@ -29,7 +29,7 @@ Page({ var StaffId=options.StaffId; var StorageId=options.StorageId; if(first_leader){ - //-- user_id代过来免登陆 -- + //-- user_id代过来免登录 -- getApp().globalData.user_id=first_leader; getApp().getUserFir(); //设置分享会员和导购id和归属门店ID diff --git a/packageA/pages/quan_pro/quan_pro.js b/packageA/pages/quan_pro/quan_pro.js index e5c6b48..370eced 100644 --- a/packageA/pages/quan_pro/quan_pro.js +++ b/packageA/pages/quan_pro/quan_pro.js @@ -23,7 +23,7 @@ Page({ var th = this; var first_leader=t.first_leader; if(first_leader){ - //-- user_id代过来免登陆 -- + //-- user_id代过来免登录 -- getApp().globalData.first_leader=first_leader; //调用接口判断是不是会员 getApp().request.promiseGet("/api/weshop/shoppingGuide/get/"+os.stoid+"/"+first_leader,{}).then(res=>{ diff --git a/pages/cart/cart/cart.js b/pages/cart/cart/cart.js index ec3ce0b..ab25a7e 100644 --- a/pages/cart/cart/cart.js +++ b/pages/cart/cart/cart.js @@ -44,7 +44,7 @@ Page({ title: "购物车", }) - //判断是否有登陆 + //判断是否有登录 t.auth.hadAuth() && t.getUserInfo(function() { a.getCardList(); }); diff --git a/pages/cart/cart2/cart2.js b/pages/cart/cart2/cart2.js index 7043117..f13d81e 100644 --- a/pages/cart/cart2/cart2.js +++ b/pages/cart/cart2/cart2.js @@ -668,7 +668,10 @@ Page({ th.setData({collocation_goods:gg.collocation_goods}); var cart_arr=new Array(); - var narr=gg.collocation_goods; + //var narr=gg.collocation_goods; + //修改成深拷贝，确保返回是数据正确 + var narr=JSON.parse(JSON.stringify(gg.collocation_goods)); + narr.push(t.data.data); var ie = { pickup_id: gg.pick_id, pname: gg.pick_name, goods: narr, exp_type: et, wind: m_wind, distr_t: distr_t, @@ -1007,7 +1010,7 @@ Page({ WareIds: cart_item.check_quan_ware_list } }).then(res => { - if (res.data.code == 0 && res.data.data.length > 0) { + if (res.data.code == 0 && res.data.data && res.data.data.length > 0) { var q_data = res.data.data; //--存储商品优惠的内容-- cart_item.quan_youhui_list = q_data; @@ -1337,6 +1340,9 @@ Page({ //---------计算立即购买---------- calculatePrice2: function () { var th = this, good = this.data.bn_goods; + + if(!good) return false; + //搭配的计算要用购物的车计算方法 if(good.prom_type==5){ th.calculatePrice(); @@ -1378,7 +1384,7 @@ Page({ await getApp().request.promiseGet("/api/weshop/couponList/getUseCouponPrice",{ data:{storeId:oo.stoid,CashRepNo:quan_no, WaresSum:th.data.ckeck_quan_price, WareIds:th.data.check_quan_ware_list} }).then(res=>{ - if(res.data.code==0){ + if(res.data.code==0 && res.data.data && res.data.data.length>0 ){ quan_price=res.data.data[0].WareCashSum; } }) @@ -2027,7 +2033,7 @@ Page({ },// 设置请求的 header success: function (res) { - th.data.is_summit_ing=0; //是否提交中 + wx.hideLoading(); if (res.statusCode == 200) { var data=res.data; @@ -2110,6 +2116,7 @@ Page({ return; }else if(res.confirm){ th.data.is_continue=1; + th.data.is_summit_ing=0; //是否提交中 th.submitForm(sub_value); } } @@ -2120,8 +2127,10 @@ Page({ msg=msg.slice(0, 13) + "\r\n"+ msg.slice(13); } getApp().confirmBox(msg); + th.data.is_summit_ing=0; //是否提交中 } }else{ + th.data.is_summit_ing=0; //是否提交中 console.log("index.js wx.request CheckCallUser statusCode" + res.statusCode); } }, @@ -2164,7 +2173,7 @@ Page({ }) //读取线下的门店库存 await getApp().request.promiseGet("/api/weshop/goods/getWareStorages",{ - data:{storageNos:pick_no,wareIds:encodeURIComponent(erpwareid),storeId:os.stoid} + data:{storageNos:pick_no,wareIds:encodeURIComponent(erpwareid),storeId:os.stoid,pageSize:2000} }).then(res=>{ if(res.data.code==0){ plist=res.data.data.pageData[0]; @@ -2839,8 +2848,10 @@ Page({ //getApp().waitfor2(this,"g_cart_q_time","order_prom_list_cart",async function () { //var arr=th.data.order_prom_list_cart; var arr=order_prom_list_cart; + if(!arr) arr=[]; //如果系统有限制使用优惠券 if(th.data.is_close_quan) return false; + //------------开始计算使用优惠券相关------------ for(var ind in arr){ var ep=arr[ind]; diff --git a/pages/cart/cart2_pt/cart2_pt.js b/pages/cart/cart2_pt/cart2_pt.js index ed7c615..141e043 100644 --- a/pages/cart/cart2_pt/cart2_pt.js +++ b/pages/cart/cart2_pt/cart2_pt.js @@ -585,7 +585,7 @@ Page({ 'content-type': 'application/json' },// 设置请求的 header success: function (res) { - th.data.is_summit_ing=0; //是否提交中 + wx.hideLoading(); if (res.statusCode == 200) { var data=res.data; @@ -613,15 +613,18 @@ Page({ // }, 1); util_pay.pay(data.data, function() { setTimeout(function () { - wx.navigateTo({ + wx.reLaunch({ //url: "/pages/payment/pay_success/pay_success?type=1&order_sn="+data.data, - url: "/pages/team/team_success/team_success?ordersn=" + data.data, + url: "/pages/team/team_success/team_success?ordersn=" + data.data, }) },1000) }, function () { //支付失败 setTimeout(function () { - wx.navigateBack({ delta: 1 }) + //wx.navigateBack({ delta: 1 }) + wx.reLaunch({ + url: "/pages/user/order_list/order_list", + }) },1000) },oo.stoid,1); @@ -647,9 +650,12 @@ Page({ url: "/pages/user/order_list/order_list", })--*/ var url="/pages/payment/pay_success/pay_success?type=1&order_sn="+data.data; - getApp().goto(url); + wx.reLaunch({ + url: url + }) + }else{ - wx.navigateTo({ + wx.reLaunch({ url: "/pages/team/team_success/team_success?ordersn=" + data.data, }) } @@ -661,13 +667,16 @@ Page({ } } else{ + th.data.is_summit_ing=0; //是否提交中 getApp().confirmBox(data.msg); } } else { + th.data.is_summit_ing=0; //是否提交中 console.log("index.js wx.request CheckCallUser statusCode" + res.statusCode); } }, fail: function () { + th.data.is_summit_ing=0; //是否提交中 wx.hideLoading(); console.log("index.js wx.request CheckCallUser fail"); }, diff --git a/pages/cart/cart4/cart4.js b/pages/cart/cart4/cart4.js index 871fdfc..befb038 100644 --- a/pages/cart/cart4/cart4.js +++ b/pages/cart/cart4/cart4.js @@ -27,7 +27,7 @@ Page({ data:data, success:function(rs){ - if(rs.data.code==0){ + if(rs.data.code==0 && rs.data.data && rs.data.data.pageData && rs.data.data.pageData.length>0){ //支付的金额 rs.data.data.pageData.forEach(function(ie,ind){ order_m+=ie.order_amount; diff --git a/pages/giftpack/giftpacklist/giftpacklist.js b/pages/giftpack/giftpacklist/giftpacklist.js index b641929..eebada5 100644 --- a/pages/giftpack/giftpacklist/giftpacklist.js +++ b/pages/giftpack/giftpacklist/giftpacklist.js @@ -41,7 +41,7 @@ Page({ //-- 获取分享人的ID -- var first_leader=options.first_leader; if(first_leader){ - //-- user_id代过来免登陆 -- + //-- user_id代过来免登录 -- getApp().globalData.first_leader=first_leader; //调用接口判断是不是会员 getApp().request.promiseGet("/api/weshop/shoppingGuide/get/"+os.stoid+"/"+first_leader,{}).then(res=>{ diff --git a/pages/goods/goodsInfo/goodsInfo.js b/pages/goods/goodsInfo/goodsInfo.js index b5a6041..0f8474c 100644 --- a/pages/goods/goodsInfo/goodsInfo.js +++ b/pages/goods/goodsInfo/goodsInfo.js @@ -860,7 +860,11 @@ Page({ url: "/pages/user/address_list/address_list?operate=selectAddress" }); }, - onUnload: function() {}, + onUnload: function() { + for(var i = 1; i < 100; i++) { + clearInterval(i); + } + }, onHide: function() { this.data.is_timer = 0; for(var i = 1; i < 100; i++) { @@ -2111,7 +2115,7 @@ Page({ if (e.data.code == 0) { //如果有开启距离的功能，没有设置默认门店，要用最近的门店作为默认门店 - if(dd.lat && (!th.data.def_pick_store || JSON.stringify(th.data.def_pick_store)=='{}') && th.data.bconfig.is_sort_storage){ + if(dd.lat && (!th.data.def_pick_store || JSON.stringify(th.data.def_pick_store)=='{}') && th.data.bconfig && th.data.bconfig.is_sort_storage){ th.setData({ def_pick_store:e.data.data.pageData[0], sto_sele_name: e.data.data.pageData[0].pickup_name, @@ -2300,7 +2304,7 @@ Page({ only_pk: e.data.data.pageData }); //-----如果没有默认门店，要取第一个门店作为默认店------ - if (!th.data.def_pick_store && th.data.bconfig.is_sort_storage) { + if (!th.data.def_pick_store && th.data.bconfig && th.data.bconfig.is_sort_storage) { th.setData({ def_pick_store:e.data.data.pageData[0], sto_sele_name: e.data.data.pageData[0].pickup_name, @@ -2782,15 +2786,17 @@ Page({ } }).then(res => { var now = ut.gettimestamp(); - var tgr = res.data.data.pageData[0]; - //如果团的时间已经到了 - if (now >= tgr.kt_end_time) { - th.update_jiti(tgr.id); - } else { - th.setData({ - user_order_pt_state: 2 - }); - } + if(res.data.code==0 && res.data.data && res.data.data.pageData && res.data.data.pageData.length>0){ + var tgr = res.data.data.pageData[0]; + //如果团的时间已经到了 + if (now >= tgr.kt_end_time) { + th.update_jiti(tgr.id); + } else { + th.setData({ + user_order_pt_state: 2 + }); + } + } }) } else { @@ -3127,7 +3133,12 @@ Page({ } }); } else if (odr.pt_status == 1 && odr.order_status == 1) { - wx.navigateTo({ + + if(this.data.is_go_to_team_show) return false; + this.data.is_go_to_team_show=1; + wx.showLoading(); + + wx.redirectTo({ url: "/pages/team/team_success/team_success?ordersn=" + odr.order_sn, }); } else { @@ -3335,17 +3346,24 @@ Page({ //-------跳转pt商品------- go_to_nopay: function() { - var th = this; - wx.navigateTo({ - url: "/pages/user/order_detail/order_detail?order_id=" + th.data.buy_order.order_id, - }); + var th = this; + url="/pages/user/order_detail/order_detail?order_id=" + th.data.buy_order.order_id; + getApp().goto(url); + }, //-------跳转pt teamshow------- go_to_team_show: function() { - var th = this; - wx.navigateTo({ - url: "/pages/team/team_success/team_success?ordersn=" + th.data.buy_order.order_sn, - }); + + if(this.data.is_go_to_team_show) return false; + this.data.is_go_to_team_show=1; + wx.showLoading(); + + var th = this; + var url="/pages/team/team_success/team_success?ordersn=" + th.data.buy_order.order_sn; + wx.redirectTo({ + url:url, + }) + }, //---拼团倒计时--- @@ -3425,9 +3443,14 @@ Page({ } }); } else if (odr.pt_status == 1 && odr.order_status == 1) { - wx.navigateTo({ - url: "/pages/team/team_success/team_success?ordersn=" + odr.order_sn, - }); + + if(this.data.is_go_to_team_show) return false; + this.data.is_go_to_team_show=1; + wx.showLoading(); + + wx.redirectTo({ + url: "/pages/team/team_success/team_success?ordersn=" + odr.order_sn, + }); } else { wx.navigateTo({ url: "/pages/team/team_show/team_show?tg_id=" + id, @@ -4295,7 +4318,7 @@ Page({ } - if (bconfig.is_sort_storage) { + if (bconfig && bconfig.is_sort_storage) { wx.getLocation({ type: 'gcj02', success: function(res) { @@ -4636,7 +4659,7 @@ Page({ var t_time = setInterval(function() { if (th.data.bconfig == null) false; var e = th.data.bconfig; - if (e.is_sort_storage) { + if (e && e.is_sort_storage) { wx.getLocation({ type: 'gcj02', success: function(res) { diff --git a/pages/goods/goodsList/goodsList.js b/pages/goods/goodsList/goodsList.js index 3f11805..4786d3d 100644 --- a/pages/goods/goodsList/goodsList.js +++ b/pages/goods/goodsList/goodsList.js @@ -128,7 +128,7 @@ Page({ //-- 获取 -- await getApp().request.promiseGet("/api/weshop/libao/libaoForm/page?id="+content.libao+"&store_id="+oo.stoid, { }).then(res => { - if(res.data.code==0) + if(res.data.code==0 && res.data.data && res.data.data.pageData && res.data.data.pageData.length>0) arr[i].content.lb_name=res.data.data.pageData[0].lbtitle; }) } diff --git a/pages/index/index/index.js b/pages/index/index/index.js index 811ce34..bc6f8b6 100644 --- a/pages/index/index/index.js +++ b/pages/index/index/index.js @@ -85,7 +85,7 @@ Page({ } if(first_leader){ - //-- user_id代过来免登陆 -- + //-- user_id代过来免登录 -- getApp().globalData.first_leader=first_leader; //调用接口判断是不是会员 getApp().request.promiseGet("/api/weshop/shoppingGuide/get/"+os.stoid+"/"+first_leader,{}).then(res=>{ @@ -478,6 +478,9 @@ Page({ this.data.recommend = null, this.data.currentPage = 1, n.resetConfig(), this.requestHomePage(), this.requestRecommend(); }, + requestRecommend(){}, + requestHomePage(){}, + onUnload: function() { this.destroyActivityTimer(); }, diff --git a/pages/justTest/justTest.js b/pages/justTest/justTest.js deleted file mode 100644 index c36aff5..0000000 --- a/pages/justTest/justTest.js +++ /dev/null @@ -1,177 +0,0 @@ -// pages/justTest/justTest.js -// let livePlayer = requirePlugin('live-player-plugin'); - - -var t = require("../../utils/util.js"), - ut = t, - e = require("../../utils/common.js"), - a = require("../../utils/wxParse/wxParse.js"), - s = getApp(), - i = s.request, - rq = i, - oo = s.globalData, - o = s.globalData.setting, - os = o; -var utils = require('../../utils/util.js'),ut=utils; -var regeneratorRuntime = require('../../utils/runtime.js'); - -Page({ - - /** - * 页面的初始数据 - */ - data: { - gid: "", - stoid: o.stoid, - url: o.url, - resourceUrl: o.resourceUrl, - iurl: o.imghost, - defaultAvatar: o.resourceUrl + "/static/images/user68.jpg", - data: null, - openSpecModal: !1, - openPromModal: !1, - supportPageScroll: !1, - - //联系电话 - mobile: '', - bconfig:null, - sales_rules:1, - - t_time:null, - card_field:"", - dp_price:0, - cut_price:0, - open_ind_store:1, - goodsInputNum:1, - g_buy_num: null, - sele_collocation:null, - - - - photoUrl: "https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=1003256280,1176261798&fm=26&gp=0.jpg", - //（用来控制显示哪个按钮） false表示还没首次进行弹框授权，或者已经授权了；true表示在首次授权弹框时拒绝授权，或者在设置页面还是拒绝了授权 - isAuthSavePhoto: false - }, - - - - - - sendRequest: function () { - - - - //调用接口判断是不是会员 - getApp().request.promiseGet("/api/weshop/wx/livelist/page",{ - data:{store_id: 1} - }).then(res=>{ - console.log(res); - // if(res.data.code==0){ - // getApp().globalData.guide_id=res.data.data.id; - // } - }) - - }, - // nav: function () { - // wx.redirectTo({ - // url: '/packageA/pages/liveStream/liveStream' - // }) - // }, - /** - * 生命周期函数--监听页面加载 - */ - onLoad: function (options) { - - }, - - /** - * 生命周期函数--监听页面初次渲染完成 - */ - onReady: function () { - - }, - - /** - * 生命周期函数--监听页面显示 - */ - onShow: function () { - - }, - - /** - * 生命周期函数--监听页面隐藏 - */ - onHide: function () { - - }, - - /** - * 生命周期函数--监听页面卸载 - */ - onUnload: function () { - - }, - - /** - * 页面相关事件处理函数--监听用户下拉动作 - */ - onPullDownRefresh: function () { - - }, - - /** - * 页面上拉触底事件的处理函数 - */ - onReachBottom: function () { - - }, - - /** - * 用户点击右上角分享 - */ - onShareAppMessage: function () { - - }, - - - - - saveImage() { - wx.showLoading({ - title: '保存中...', - mask: true, - }); - wx.downloadFile({ - url: - 'http://upload.jianshu.io/admin_banners/web_images/4435/c1d3ca63353c8bd527f0d781605516cb5b266d02.jpg?imageMogr2/auto-orient/strip|imageView2/1/w/1250/h/540', - success: function(res) { - if (res.statusCode === 200) { - let img = res.tempFilePath; - wx.saveImageToPhotosAlbum({ - filePath: img, - success(res) { - wx.showToast({ - title: '保存成功', - icon: 'success', - duration: 2000 - }); - }, - fail(res) { - wx.showToast({ - title: '保存失败', - icon: 'success', - duration: 2000 - }); - } - }); - } - } - }); - }, - - - - live() {} - - -}) \ No newline at end of file diff --git a/pages/justTest/justTest.json b/pages/justTest/justTest.json deleted file mode 100644 index 8835af0..0000000 --- a/pages/justTest/justTest.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "usingComponents": {} -} \ No newline at end of file diff --git a/pages/justTest/justTest.wxml b/pages/justTest/justTest.wxml deleted file mode 100644 index de66879..0000000 --- a/pages/justTest/justTest.wxml +++ /dev/null @@ -1,19 +0,0 @@ - -pages/justTest/justTest.wxml -进入直播 -进入直播详情页 - - - - - - - - - - - - - diff --git a/pages/justTest/justTest.wxss b/pages/justTest/justTest.wxss deleted file mode 100644 index 3c29dd4..0000000 --- a/pages/justTest/justTest.wxss +++ /dev/null @@ -1,29 +0,0 @@ -/* pages/justTest/justTest.wxss */ -page { - background: #fff; - text-align: center; -} - -.box { - padding: 30rpx 80rpx; -} - -.img { - width: 430rpx; - height: 430rpx; - margin: 20rpx 0; -} -button { - width: 100%; - background: #ffffff; - border: none; - border-radius: 0rpx; - padding: 0; - margin: 0; -} - -.btn { - background: green; - color: #ffffff; - border-radius: 0; -} \ No newline at end of file diff --git a/pages/team/team_more/team_more.js b/pages/team/team_more/team_more.js index 826b83a..22b7c4d 100644 --- a/pages/team/team_more/team_more.js +++ b/pages/team/team_more/team_more.js @@ -112,6 +112,8 @@ Page({ // 获取当前时间，同时得到活动结束时间数组 var newTime = ut.gettimestamp(); var List = this.data.teamgroup; + if(!List || List.length<=0) return false; + for (var j = 0; j < List.length; j++) { // 对结束时间进行处理渲染到页面 var endTime = List[j].kt_end_time; diff --git a/pages/team/team_show/team_show.js b/pages/team/team_show/team_show.js index 2a8e884..8a6598b 100644 --- a/pages/team/team_show/team_show.js +++ b/pages/team/team_show/team_show.js @@ -363,24 +363,31 @@ Page({ //获取活动从表信息team_id,listno团编号（券号） await getApp().request.promiseGet("/api/weshop/teamgroup/get/"+os.stoid+"/"+tg_id, { }).then(res => { - teamgroup = res.data.data; - //获取当前时间,并且判断剩余时间 - var nt = ut.gettimestamp(); - var buy_start_date = ut.formatTime(teamgroup.buy_start_date, "yyyy-MM-dd hh:mm:ss"); - ee.setData({ - pindGoods: teamgroup, - buy_start_date: buy_start_date - }); - - if(nt>teamgroup.kt_end_time) { - th.setData({is_group_end:1,end_text:"团期已经结束"}) - } - if(teamgroup.state==1) { - th.setData({is_group_end:1,end_text:"团期已经结束"}) - } - if(teamgroup.state==3 || teamgroup.state==4 || teamgroup.state==5 ) { - th.setData({is_group_end:2,end_text:"团期已满"}) - } + + + if(res.data.code==0 && res.data && res.data.data ) { + + teamgroup = res.data.data; + + //获取当前时间,并且判断剩余时间 + var nt = ut.gettimestamp(); + var buy_start_date = ut.formatTime(teamgroup.buy_start_date, "yyyy-MM-dd hh:mm:ss"); + ee.setData({ + pindGoods: teamgroup, + buy_start_date: buy_start_date + }); + + if(nt>teamgroup.kt_end_time) { + th.setData({is_group_end:1,end_text:"团期已经结束"}) + } + if(teamgroup.state==1) { + th.setData({is_group_end:1,end_text:"团期已经结束"}) + } + if(teamgroup.state==3 || teamgroup.state==4 || teamgroup.state==5 ) { + th.setData({is_group_end:2,end_text:"团期已满"}) + } + + } }) @@ -969,7 +976,7 @@ Page({ return false; } - if (bconfig.is_sort_storage) { + if ( bconfig && bconfig.is_sort_storage) { wx.getLocation({ type: 'gcj02', success: function(res) { @@ -1034,7 +1041,7 @@ Page({ var t_time = setInterval(function() { if (th.data.bconfig == null) false; var e = th.data.bconfig; - if (e.is_sort_storage) { + if (e && e.is_sort_storage) { wx.getLocation({ type: 'gcj02', success: function(res) { @@ -1109,7 +1116,7 @@ Page({ if (e.data.code == 0) { //如果有开启距离的功能，没有设置默认门店，要用最近的门店作为默认门店 - if(dd.lat && !th.data.def_pick_store && th.data.bconfig.is_sort_storage){ + if(dd.lat && !th.data.def_pick_store && th.data.bconfig && th.data.bconfig.is_sort_storage){ th.setData({ def_pick_store:e.data.data.pageData[0], sto_sele_name: e.data.data.pageData[0].pickup_name, @@ -1289,7 +1296,7 @@ Page({ only_pk: e.data.data.pageData }); //-----如果没有默认门店，要取第一个门店作为默认店------ - if (!th.data.def_pick_store && th.data.bconfig.is_sort_storage) { + if (!th.data.def_pick_store && th.data.bconfig && th.data.bconfig.is_sort_storage) { th.setData({ def_pick_store:e.data.data.pageData[0], sto_sele_name: e.data.data.pageData[0].pickup_name, diff --git a/pages/team/team_success/team_success.js b/pages/team/team_success/team_success.js index 7fdc137..ac488dc 100644 --- a/pages/team/team_success/team_success.js +++ b/pages/team/team_success/team_success.js @@ -47,6 +47,7 @@ Page({ }, onLoad: function (t) { wx.setNavigationBarTitle({ title: "拼团订单",}) + var that=this; var th=this; //获取用户设备信息，屏幕宽度 @@ -56,7 +57,7 @@ Page({ } }) var pay_f = t.payf, order_sn = t.ordersn; - this.setData({ pay_f: pay_f, order_sn: order_sn}), + this.setData({ pay_f: pay_f, order_sn: order_sn}); this.init(order_sn); //-- 自定义海报 -- @@ -209,6 +210,19 @@ Page({ min_price=pri; } + + + //获取商品信息 + getApp().request.promiseGet("/api/weshop/goods/get/" + os.stoid + "/" + goods_id, { + }).then(res => { + //商品地址 + original_img = ee.data.imageurl+ res.data.data.original_img, + goods = res.data.data + + ee.setData({goods: goods,image: original_img,}) + + }) + } }) @@ -233,13 +247,7 @@ Page({ } - //获取商品信息 - await getApp().request.promiseGet("/api/weshop/goods/get/" + os.stoid + "/" + goods_id, { - }).then(res => { - //商品地址 - original_img = ee.data.imageurl+ res.data.data.original_img, - goods = res.data.data - }) + //获取活动从表信息team_id:305暂时 await getApp().request.promiseGet("/api/weshop/teamgroup/page" , { @@ -266,10 +274,14 @@ Page({ } //获取大家都在团信息 - await getApp().request.promiseGet("/api/weshop/teamlist/pageteam/1?store_id="+ os.stoid +"&is_end=0&is_show=1" , { + getApp().request.promiseGet("/api/weshop/teamlist/pageteam/1?store_id="+ os.stoid +"&is_end=0&is_show=1" , { data:{page:1,pageSize:2} }).then(res => { - pageteam = res.data.data.pageData; + if(res.data.code==0 && res.data.data && res.data.data.pageData && res.data.data.pageData.length>0){ + pageteam = res.data.data.pageData; + ee.setData({pageteam: pageteam,}) + } + }) //--当是成团的时候的操作-- @@ -277,8 +289,8 @@ Page({ //设置值 ee.setData({ - ordertx2: ordertx2, ordertx: ordertx, teamlist: teamlist, teamgroup: teamgroup, goods: goods, pageteam: pageteam, min_price: min_price, - order: order, image: original_img, share_img: share_img,max_num:max_num, + ordertx2: ordertx2, ordertx: ordertx, teamlist: teamlist, teamgroup: teamgroup, min_price: min_price, + order: order, share_img: share_img,max_num:max_num, pindGoods: teamlist,is_show:1, zk:false, hiddenName: false, ct_price:ct_price,p_status:p_status,sf_arr:sf_arr}); @@ -290,8 +302,8 @@ Page({ console.log("239什么鬼", teamlist); //设置值 ee.setData({ - ordertx2: ordertx2, ordertx: ordertx, teamlist: teamlist, teamgroup: teamgroup, goods: goods, pageteam: pageteam, - order: order, image: original_img, p_status: p_status, min_price:min_price, + ordertx2: ordertx2, ordertx: ordertx, teamlist: teamlist, teamgroup: teamgroup, + order: order, p_status: p_status, min_price:min_price, share_img: share_img, max_num: max_num, pindGoods: teamlist, is_show: 1, ct_price: ct_price, p_status: p_status,sf_arr:sf_arr}); } @@ -328,6 +340,8 @@ Page({ // 获取当前时间，同时得到活动结束时间数组 var newTime = ut.gettimestamp(); var o = this.data.teamgroup; + if(!o) return false; + var endTime = o.kt_end_time; if (o.status == 0) endTime = o.start_time; diff --git a/pages/togoin/togoin.js b/pages/togoin/togoin.js index 5fa8b65..ec03e0a 100644 --- a/pages/togoin/togoin.js +++ b/pages/togoin/togoin.js @@ -67,7 +67,7 @@ Page({ that.setData({user:user}) //如果有会员的话,没有sessionKey if(!e.data.data.sessionKey){ - getApp().showWarning("登陆成功"); + getApp().showWarning("登录成功"); getApp().globalData.userInfo=e.data.data; getApp().globalData.user_id=e.data.data.user_id; getApp().globalData.openid = e.data.data.weapp_openid; @@ -89,7 +89,7 @@ Page({ }) }, - //暂不登陆，返回上一页 + //暂不登录，返回上一页 cancle_bind:function () { wx.navigateBack({ delta: 1}) }, diff --git a/pages/togoin/togoin.wxml b/pages/togoin/togoin.wxml index 0330745..81a94df 100644 --- a/pages/togoin/togoin.wxml +++ b/pages/togoin/togoin.wxml @@ -16,20 +16,20 @@ - 暂不登陆 + 暂不登录 @@ -41,7 +41,7 @@ - 请授权绑定手机号完成注册，拒绝将登陆失败 + 请授权绑定手机号完成注册，拒绝将登录失败 拒绝 diff --git a/pages/user/assistance/task_assistance.js b/pages/user/assistance/task_assistance.js index 960f422..76eaf67 100644 --- a/pages/user/assistance/task_assistance.js +++ b/pages/user/assistance/task_assistance.js @@ -203,7 +203,7 @@ Page({ getApp().my_warnning(data.msg, 0, th); return false; } - if (data.code == 0) { + if (data.code == 0 && data.data && data.data.pageData && data.data.pageData.length>0) { //轮播图的数据 var data_aissa = data.data.pageData; //当前时间戳 diff --git a/pages/user/coupons/coupons.js b/pages/user/coupons/coupons.js index 6ec46ff..e1e7a04 100644 --- a/pages/user/coupons/coupons.js +++ b/pages/user/coupons/coupons.js @@ -229,16 +229,20 @@ Page({ getApp().request.promiseGet("/api/weshop/users/listQuan", { data:get_data }).then(res=>{ - var a = res.data,val = a.data.total; - var details = a.data.pageData; - if (details.length == 0){ - if(th.data.b_out_arr) th.setData({ number: th.data.b_out_arr.length}); - return false; - } - - var all_length=val+th.data.b_out_arr.length; - th.setData({ number: all_length}); - + + if(res.data.code==0 && res.data){ + var a = res.data,val = a.data.total; + var details = a.data.pageData; + if (details.length == 0){ + if(th.data.b_out_arr) th.setData({ number: th.data.b_out_arr.length}); + return false; + } + var all_length=val; + if(th.data.b_out_arr) all_length+=th.data.b_out_arr.length; + th.setData({ number: all_length}); + } + + }) }, diff --git a/pages/user/coupons/coupons.wxml b/pages/user/coupons/coupons.wxml index 10b3e82..9d3cbd9 100644 --- a/pages/user/coupons/coupons.wxml +++ b/pages/user/coupons/coupons.wxml @@ -63,7 +63,8 @@ 有效期:不限 - 使用说明: {{filter.getNum(detail.Sum)}}元优惠券,{{(detail.UseObjectID==null || detail.UseObjectID=='')?"全场通用":"仅限"+(detail.UseObjectName)+"使用"}},满 {{detail.BuySum==null || detail.BuySum==''?filter.getNum(0):filter.getNum(detail.BuySum)}}元使用 {{detail.region_list_name==null || detail.region_list_name==''?"":",不包邮地区:"+region_list_name}} + {{detail.Remark}} + 使用说明: {{filter.getNum(detail.Sum)}}元优惠券,{{(detail.UseObjectID==null || detail.UseObjectID=='')?"全场通用":"仅限"+(detail.UseObjectName)+"使用"}},满 {{detail.BuySum==null || detail.BuySum==''?filter.getNum(0):filter.getNum(detail.BuySum)}}元使用 {{detail.region_list_name==null || detail.region_list_name==''?"":",不包邮地区:"+region_list_name}} diff --git a/pages/user/index/index.js b/pages/user/index/index.js index 5bab8c8..e9b1a5e 100644 --- a/pages/user/index/index.js +++ b/pages/user/index/index.js @@ -143,12 +143,15 @@ Page({ /*-----获取线下会员的预存款和优惠券的数量-----*/ rq.get("/api/weshop/users/getinfo/" + os.stoid + "/" + e.user_id, { success: function(su) { - var data = su.data.data; - if(!data) data={}; - data.cashcount = parseInt(data.cashcount); - s.setData({ - udata: data, - }); + if(su.data.code==0 && su.data.data ) { + var data = su.data.data; + if(!data) data={}; + data.cashcount = parseInt(data.cashcount); + s.setData({ + udata: data, + }); + } + } }) /*-----获取会员提现金额-----*/ diff --git a/pages/user/integral/filter.wxs b/pages/user/integral/filter.wxs index c9e3dc3..cb724f7 100644 --- a/pages/user/integral/filter.wxs +++ b/pages/user/integral/filter.wxs @@ -2,8 +2,14 @@ var numFr = { getNum: function(x) { var f = parseInt(x); return f; + }, + getval: function(x,n) { + var f = parseFloat(x); + f=f.toFixed(n); + return f; } } module.exports = { - getNum: numFr.getNum + getNum: numFr.getNum, + getval: numFr.getval, } \ No newline at end of file diff --git a/pages/user/integral/integral.js b/pages/user/integral/integral.js index abf7e0d..463ddf1 100644 --- a/pages/user/integral/integral.js +++ b/pages/user/integral/integral.js @@ -73,13 +73,15 @@ Page({ await getApp().request.promiseGet("/api/weshop/users/listPoints", { data: get_data }).then(res => { + var msg = res.data; - details = msg.data.pageData; - if (details.length == 0) { + if(!msg || !msg.data.pageData || msg.data.pageData.length == 0){ this.data.is_no_more = 1; getApp().showWarning("未找更多数据"); return false; } + + details = msg.data.pageData; details.forEach(function (val, ind) { big_arr.push(val); }) diff --git a/pages/user/integral/integral.wxml b/pages/user/integral/integral.wxml index ba47d3c..e980d75 100644 --- a/pages/user/integral/integral.wxml +++ b/pages/user/integral/integral.wxml @@ -55,7 +55,7 @@ ￥ - {{filter.getNum(result.ToSum)}} + {{filter.getval(result.ToSum,2)}} 充值{{result.Integral}}积分 @@ -74,7 +74,7 @@ 充值{{integral}}积分 ¥ - {{filter.getNum(money)}} + {{filter.getval(money,2)}} diff --git a/pages/user/integral/query/index.js b/pages/user/integral/query/index.js index f5d0671..db4d829 100644 --- a/pages/user/integral/query/index.js +++ b/pages/user/integral/query/index.js @@ -168,19 +168,19 @@ Page({ }).then(res => { var details = res.data; - console.log(details, "iiii"); - var details = details.data.pageData; - console.log(details, "aaa"); - if (details.length == 0) { + + + + if (!details.data || details.data.pageData.length == 0) { // this.data.is_no_more = 1; - console.log("无极剑圣", details); - getApp().showWarning("未找更多数据"); return false; } - console.log("不空", details); - console.log("长度", details.length); + + var details = details.data.pageData; + + details.forEach(function (val, ind) { big_arr.push(val); }) diff --git a/pages/user/member/account/account.js b/pages/user/member/account/account.js index 6fe309a..a1eee9d 100644 --- a/pages/user/member/account/account.js +++ b/pages/user/member/account/account.js @@ -100,16 +100,15 @@ Page({ data: get_data, isShowLoading:1 }).then(res => { var details = res.data; - // console.log(details, "iiii"); - var details=details.data.pageData; - //console.log(details,"aaa"); - if (details.length== 0){ + if (!details || !details.data || !details.data.pageData || details.data.pageData.length== 0){ this.data.is_no_more=1; getApp().showWarning("未找更多数据"); return false; } + + var details=details.data.pageData; // console.log("不空", details); // console.log("长度", details.length); details.forEach(function(val,ind){ diff --git a/pages/user/member/account_unable/account_unable.js b/pages/user/member/account_unable/account_unable.js index e229120..1943da9 100644 --- a/pages/user/member/account_unable/account_unable.js +++ b/pages/user/member/account_unable/account_unable.js @@ -99,17 +99,16 @@ Page({ await getApp().request.promiseGet("/api/weshop/users/pageUnablereCord", { data: get_data, isShowLoading: 1 }).then(res => { + var details = res.data; - // console.log(details, "iiii"); - var details = details.data.pageData; - //console.log(details,"aaa"); - if (details.length == 0) { + if ( !details || !details.data || !details.data.pageData || details.data.pageData.length == 0) { this.data.is_no_more = 1; getApp().showWarning("未找更多数据"); - return false; } + + var details = details.data.pageData; // console.log("不空", details); // console.log("长度", details.length); details.forEach(function (val, ind) { diff --git a/pages/user/member/cash_record/cash_record.js b/pages/user/member/cash_record/cash_record.js index bbeee5a..c7aa73f 100644 --- a/pages/user/member/cash_record/cash_record.js +++ b/pages/user/member/cash_record/cash_record.js @@ -110,17 +110,14 @@ Page({ data: get_data, isShowLoading: 1 }).then(res => { var details = res.data; - console.log(details, "iiii"); - var details = details.data.pageData; - console.log(details, "aaa"); - if (details.length == 0) { + if (!details || !details.data || !details.data.pageData || details.data.pageData.length == 0) { this.data.is_no_more = 1; getApp().showWarning("未找更多数据"); return false; } - console.log("不空", details); - console.log("长度", details.length); + var details = details.data.pageData; + details.forEach(function (val, ind) { big_arr.push(val); }) diff --git a/pages/user/return_goods_list/return_goods_list.js b/pages/user/return_goods_list/return_goods_list.js index d137523..b7add3a 100644 --- a/pages/user/return_goods_list/return_goods_list.js +++ b/pages/user/return_goods_list/return_goods_list.js @@ -15,7 +15,7 @@ Page({ }, onLoad: function() { var th=this,ts=s; - //确保有登陆 + //确保有登录 e.getUserInfo(function(){ ts.init(th, "", "list"), th.requestReturnGoods(); })