diff --git a/app.wxss b/app.wxss index 4a90e28..530e4b0 100644 --- a/app.wxss +++ b/app.wxss @@ -12,7 +12,7 @@ box-sizing: border-box; } page { - /*background-color: #f2f2f2;*/ + overflow-x: hidden; } button { border-radius: 0; padding-left: 0; @@ -158,6 +158,8 @@ align-items:center; display:flex; justify-content:space-around; } +.jc_sb{ justify-content: space-between} + /* 相对定位 */ .rel{ position: relative; diff --git a/pages/cart/cart2/cart2.js b/pages/cart/cart2/cart2.js index 13a8eb4..c7af1cb 100644 --- a/pages/cart/cart2/cart2.js +++ b/pages/cart/cart2/cart2.js @@ -683,7 +683,9 @@ Page({ console.log("buy_new"); if(th.data.bn_exp_type == 0 && th.data.user_addr==null ){ - ff = false; getApp().confirmBox("请新建收货地址"); } + ff = false; getApp().my_warnning("请选择收货地址",0,th); + this.data.is_summit_ing = 0; + } if (!ff) return false; var addr = th.data.user_addr; if (th.data.bn_exp_type == 1) addr=null; @@ -694,7 +696,7 @@ Page({ if(th.data.bn_exp_type==0) if(th.data.wu_arr==null || th.data.wu_arr.length<=0){ - getApp().confirmBox("读取物流失败"); + getApp().my_warnning("读取物流失败",0,th); return false; } diff --git a/pages/cart/cart2_pt/cart2_pt.js b/pages/cart/cart2_pt/cart2_pt.js index 190a2d6..7d7ffab 100644 --- a/pages/cart/cart2_pt/cart2_pt.js +++ b/pages/cart/cart2_pt/cart2_pt.js @@ -341,7 +341,11 @@ Page({ //------------立即购买------------- console.log("buy_new"); - if(th.data.bn_exp_type == 0 && th.data.user_addr==null ){ ff = false; confirmBox("请新建收货地址"); } + if(th.data.bn_exp_type == 0 && th.data.user_addr==null ){ + ff = false; + getApp().my_warnning("请选择收货地址",0,this); + this.data.is_summit_ing = 0; + } if (!ff) return false; var addr = th.data.user_addr; if (th.data.bn_exp_type == 1) addr=null; @@ -352,7 +356,8 @@ Page({ if(th.data.bn_exp_type==0) { if (th.data.wu_arr == null || th.data.wu_arr.length <= 0) { - confirmBox("读取物流失败"); + getApp().my_warnning("读取物流失败",0,this); + this.data.is_summit_ing = 0; return false; } } diff --git a/pages/cart/cart_wk/cart_wk.js b/pages/cart/cart_wk/cart_wk.js index 79c16d4..dafbfea 100644 --- a/pages/cart/cart_wk/cart_wk.js +++ b/pages/cart/cart_wk/cart_wk.js @@ -301,6 +301,11 @@ Page({ }, //--弹起支付框-- to_pay(){ + //--物流支付时要有地址-- + if (this.data.exp_type == 0 && this.data.user_addr == null) { + return getApp().my_warnning("请选择收货地址", 0, this); + } + this.setData({show_pay_type:1}); }, @@ -316,7 +321,7 @@ Page({ //--物流支付时要有地址-- if (th.data.exp_type == 0 && th.data.user_addr==null){ - return getApp().my_warnning("请先建地址",0,th); + return getApp().my_warnning("请选择收货地址",0,th); } //---支付参数-- diff --git a/pages/cart/cart_wk/cart_wk.json b/pages/cart/cart_wk/cart_wk.json index 4fca492..a3afde3 100644 --- a/pages/cart/cart_wk/cart_wk.json +++ b/pages/cart/cart_wk/cart_wk.json @@ -1,4 +1,5 @@ { + "navigationBarTitleText": "支付尾款", "usingComponents": { "warn": "/components/long_warn/long_warn" } diff --git a/pages/cart/cart_wk/cart_wk.wxml b/pages/cart/cart_wk/cart_wk.wxml index 987536f..adccd77 100644 --- a/pages/cart/cart_wk/cart_wk.wxml +++ b/pages/cart/cart_wk/cart_wk.wxml @@ -73,15 +73,15 @@ - + 成团人数 1 - + 成团单价 {{filters.toFix(order.order_amount+order.user_money+order.pt_tail_money,2)}} - + 支付定金 {{order.order_amount+order.user_money}} @@ -90,13 +90,13 @@ - + 尾款金额 {{order.pt_tail_money}} - + 配送费用 {{exp_price}} diff --git a/pages/cart/cart_wk/cart_wk.wxss b/pages/cart/cart_wk/cart_wk.wxss index dff9c12..e8f3bf6 100644 --- a/pages/cart/cart_wk/cart_wk.wxss +++ b/pages/cart/cart_wk/cart_wk.wxss @@ -3,7 +3,7 @@ .user-mes { position: relative; background-color: #fff; - font-size: 32rpx; + font-size: 30rpx; color: #444; } .user-contact { @@ -60,13 +60,14 @@ } .top { - widows: 100%; - background-color: white; - min-height: 70rpx; - display: flex; - padding: 10rpx; - border-bottom: 2rpx solid rgb(238, 238, 238); - margin-top: 20rpx; + + background-color: white; +height: 40px; +display: flex; +padding: 10rpx 0 0 0; +border-bottom: 2rpx solid rgb(238, 238, 238); +margin-top: 10rpx; + } .t_img image { @@ -75,7 +76,7 @@ } .t_wz { - font-size: 36rpx; + font-size: 30rpx; font-weight: bold; color: rgb(0, 0, 0); line-height: 65rpx; @@ -104,7 +105,7 @@ .center .cen_name { height: 120rpx; width: 370rpx; - font-size: 36rpx; + font-size: 30rpx; padding-left: 10rpx; overflow:hidden; text-overflow:ellipsis; @@ -113,7 +114,7 @@ .center .cen_jg { color: #c4182e; - font-size: 40rpx; + font-size: 32rpx; width: 200rpx; height: 40rpx; text-align: right; @@ -121,8 +122,7 @@ .center .cen_jg .cen_sl { color: black; - font-size: 32rpx; - font-weight: bold; + font-size: 26rpx; width: 200rpx; height: 38rpx; } @@ -137,20 +137,20 @@ } .quhou .qu_fs { - font-size: 38rpx; + font-size: 30rpx; display: flex; - height: 80rpx; + height: 60rpx; margin-left: 25rpx; line-height: 62rpx; } .quhou .qu_fs image { - width: 46rpx; - height: 46rpx; + width: 34rpx; + height: 34rpx; margin-right: 18rpx; vertical-align: center; position: relative; - top:8rpx + top:14rpx } .quhou .qu_fs .qu_wz {} @@ -161,14 +161,14 @@ background-color: white; padding: 20rpx 10rpx; margin-top: 20rpx; - font-size: 36rpx; + font-size: 28rpx; } .chentuan .ct_one { height: 40rpx; margin-bottom: 10rpx; display: flex; - width: 100%; + width: 708rpx; } .chentuan .ct_one .ct_one_left { @@ -177,7 +177,6 @@ .chentuan .ct_one .ct_one_right { text-align: right; - margin-left: 358rpx; width: 200rpx; } @@ -190,7 +189,7 @@ width: 100%; min-height: 80rpx; line-height: 80rpx; - font-size: 38rpx; + font-size: 30rpx; position: fixed; bottom: 0; text-align: right; @@ -208,7 +207,7 @@ .zf .zf_btn { color: white; background-color: #c4182e; - font-size: 30rpx; + font-size: 28rpx; width: 170rpx; text-align: center; line-height: 80rpx; diff --git a/pages/goods/goodsInfo/goodsInfo.js b/pages/goods/goodsInfo/goodsInfo.js index 66fc74b..46ee0e0 100644 --- a/pages/goods/goodsInfo/goodsInfo.js +++ b/pages/goods/goodsInfo/goodsInfo.js @@ -1478,8 +1478,6 @@ Page({ }); th.data.wk_order_id=odr.order_id; } - - } }, }); @@ -2562,6 +2560,13 @@ Page({ go_pay_wk:function () { var url = "/pages/cart/cart_wk/cart_wk?order_id="+ this.data.wk_order_id; getApp().goto(url); + }, + + pop_err_img:function(e){ + var txt = e.currentTarget.dataset.errorimg; + var ob={}; + ob[txt] = this.data.iurl + "/miniapp/images/default_g_img.gif"; + this.setData(ob); } }); \ No newline at end of file diff --git a/pages/goods/goodsInfo/goodsInfo.wxml b/pages/goods/goodsInfo/goodsInfo.wxml index b024234..0d40213 100644 --- a/pages/goods/goodsInfo/goodsInfo.wxml +++ b/pages/goods/goodsInfo/goodsInfo.wxml @@ -2,9 +2,7 @@ - - @@ -712,7 +710,7 @@ - + {{data.goods_name}} ¥ {{sele_g.shop_price}} @@ -797,7 +795,7 @@ - + {{data.goods_name}} ¥ {{sele_g.shop_price}} diff --git a/pages/team/team_ping/team_ping.wxss b/pages/team/team_ping/team_ping.wxss index 5cc63ba..c346b6a 100644 --- a/pages/team/team_ping/team_ping.wxss +++ b/pages/team/team_ping/team_ping.wxss @@ -284,7 +284,7 @@ margin-right: 20rpx; display: inline-block; width: 33.33%; color: #777777; - font-size: 36rpx; + font-size: 32rpx; } .on{ color:#e4374d; border-bottom: 5rpx solid #e4374d;} diff --git a/pages/team/team_show/team_show.wxml b/pages/team/team_show/team_show.wxml index 45abbfc..0b737c9 100644 --- a/pages/team/team_show/team_show.wxml +++ b/pages/team/team_show/team_show.wxml @@ -184,11 +184,19 @@ - + - ¥ - {{teamlist.price}} + + + ¥{{teamlist.price}} + + + {{goods.goods_name}} + + + + diff --git a/pages/team/team_show/team_show.wxss b/pages/team/team_show/team_show.wxss index 6b3eba4..22a214a 100644 --- a/pages/team/team_show/team_show.wxss +++ b/pages/team/team_show/team_show.wxss @@ -589,7 +589,6 @@ flex-grow:1.7; } .buy-image text { - float: left; margin-left: 10rpx; color: red; } @@ -709,7 +708,7 @@ flex-grow:1.7; .buy-image { margin-right: 20rpx; - width: 320rpx; + width: 630rpx; height: 200rpx; float: left; } @@ -722,8 +721,8 @@ flex-grow:1.7; margin-right: 16rpx; } + .buy-image text { - float: left; margin-left: 10rpx; color: red; } @@ -742,7 +741,6 @@ flex-grow:1.7; } .t1 { - float: left; font-size: 28rpx; padding-left: 4rpx; color: red; diff --git a/pages/team/team_success/team_success.js b/pages/team/team_success/team_success.js index cc637a3..6686cd0 100644 --- a/pages/team/team_success/team_success.js +++ b/pages/team/team_success/team_success.js @@ -658,6 +658,14 @@ Page({ go_pay_wk:function(){ var url = "/pages/cart/cart_wk/cart_wk?order_id=" + this.data.order.order_id; getApp().goto(url); + }, + + img_show_err:function(e){ + var err_img = e.currentTarget.dataset.err; + var ob={}; + ob[err_img] = this.data.iurl + "/miniapp/images/default_g_img.gif"; + this.setData(ob); + } }) diff --git a/pages/team/team_success/team_success.wxml b/pages/team/team_success/team_success.wxml index 58f4690..33db5cb 100644 --- a/pages/team/team_success/team_success.wxml +++ b/pages/team/team_success/team_success.wxml @@ -4,7 +4,7 @@ - + diff --git a/pages/user/add_address/add_address.js b/pages/user/add_address/add_address.js index adec7ca..3bb1f5f 100644 --- a/pages/user/add_address/add_address.js +++ b/pages/user/add_address/add_address.js @@ -50,9 +50,18 @@ Page({ var a= this.data.address, b=a,th=this; Object.assign(a, s.detail.value), a.is_default = Number(a.is_default); a.store_id = os.stoid; + + var ob = ut.check_mobile(a.mobile); + if(ob.code!=1){ + return getApp().my_warnning(ob.title,0,th); + } + if (a.more_address == null || a.more_address == undefined || a.more_address=="" ){ - wx.showModal({title: "请选择地区"}); return false; + getApp().my_warnning("请选择地区",0,th); + return false; } + + //判断是不是空对象 //--------如果是修改地址---------- if (!th.data.isnew){ diff --git a/pages/user/add_address/add_address.json b/pages/user/add_address/add_address.json index 2d80317..5394760 100644 --- a/pages/user/add_address/add_address.json +++ b/pages/user/add_address/add_address.json @@ -1,4 +1,7 @@ { "navigationBarTitleText": "收货地址", - "enablePullDownRefresh": false + "enablePullDownRefresh": false, + "usingComponents": { + "warn": "/components/long_warn/long_warn" + } } \ No newline at end of file diff --git a/pages/user/add_address/add_address.wxml b/pages/user/add_address/add_address.wxml index 76bf6e9..970d4c1 100644 --- a/pages/user/add_address/add_address.wxml +++ b/pages/user/add_address/add_address.wxml @@ -7,7 +7,7 @@ 手机号码: - + 所在地区: @@ -31,3 +31,5 @@ + + diff --git a/pages/user/express/express.js b/pages/user/express/express.js index b3aed38..8a04054 100644 --- a/pages/user/express/express.js +++ b/pages/user/express/express.js @@ -6,6 +6,7 @@ Page({ resourceUrl: e.globalData.setting.imghost, delivery: null, express: null, + re_arr:null,//反转后的数组 error: "快递信息异常" }, onLoad: function(e) { @@ -27,9 +28,9 @@ Page({ wx.request({ url: this.data.url + "/api/weshop/order/wuliu/" + this.data.delivery.shipping_code + "/" + this.data.delivery.invoice_no, success: function(e) { - console.log("success", e.data.data.data); + var re_arr = e.data.data.Traces.reverse(); s.setData({ - express: e.data.data, + express: e.data.data, re_arr: re_arr, }); }, fail: function(s) { diff --git a/pages/user/express/express.wxml b/pages/user/express/express.wxml index a77365a..8015e35 100644 --- a/pages/user/express/express.wxml +++ b/pages/user/express/express.wxml @@ -4,19 +4,30 @@ {{delivery.invoice_no}} - 国内承运人 : + 承运公司 : {{delivery.shipping_name}} + + + 物流状态 : + 在途中 + 已签收 + 问题件 + + - - {{express.message}} + + + + {{item.AcceptStation}} + {{item.AcceptTime}} diff --git a/pages/user/express/express.wxss b/pages/user/express/express.wxss index 80720f1..b2018f7 100644 --- a/pages/user/express/express.wxss +++ b/pages/user/express/express.wxss @@ -27,7 +27,7 @@ .state-item { border-left: 1px solid #ccc; - padding-left: 40rpx; + padding:0 40rpx; } .item-wrap { @@ -57,4 +57,5 @@ font-weight: bold; color: #666; padding-bottom: 20rpx; + line-height: 40rpx } \ No newline at end of file diff --git a/pages/user/index/index.wxss b/pages/user/index/index.wxss index 36ef8b2..f1e49eb 100644 --- a/pages/user/index/index.wxss +++ b/pages/user/index/index.wxss @@ -42,9 +42,9 @@ } .xc-uesr-name{ color: #fff; - font-size: 35rpx; + font-size: 32rpx; margin-top:17rpx; - margin-left:20rpx; + margin-left:20rpx; } .xc-user-grade{ @@ -525,6 +525,8 @@ border-radius:20rpx; background:#ffbdce; padding-left: 16rpx; padding-right: 16rpx;padding-bottom: 3rpx; +margin-right: 5rpx; + } .hvip{display: inline-block; font-size: 20rpx; height: 40rpx;line-height: 40rpx; color:#e7bf77; background: #383838; padding: 0 15rpx; border-radius:20rpx; vertical-align: middle } diff --git a/pages/user/order_detail/order_detail.js b/pages/user/order_detail/order_detail.js index 30f0417..d840150 100644 --- a/pages/user/order_detail/order_detail.js +++ b/pages/user/order_detail/order_detail.js @@ -137,7 +137,7 @@ Page({ var t = this, o = this.data.order.order_id,order=this.data.order; var is_zsorder=order.is_zsorder; wx.showModal({ - title: "是否确定收货", + title: "是否确认收货?", success: function(e) { e.confirm && r.put("/api/weshop/order/updatebyId", { data: { diff --git a/pages/user/order_detail/order_detail.wxml b/pages/user/order_detail/order_detail.wxml index 2bc619b..9ebf674 100644 --- a/pages/user/order_detail/order_detail.wxml +++ b/pages/user/order_detail/order_detail.wxml @@ -99,7 +99,7 @@ ¥ {{order.order_prom_amount}}元 - + 订单总价 ¥ {{filters.toFix(order.order_amount+order.user_money+order.pt_tail_money)}}元 diff --git a/pages/user/order_list/order_list.js b/pages/user/order_list/order_list.js index e2763f6..88f202a 100644 --- a/pages/user/order_list/order_list.js +++ b/pages/user/order_list/order_list.js @@ -234,7 +234,7 @@ Page({ console.log(is_zsorder); wx.showModal({ - title: "是否确定收货", + title: "是否确认收货?", success: function(t) { t.confirm && rq.put("/api/weshop/order/updatebyId", { data: { diff --git a/pages/user/userqy/userqy.wxml b/pages/user/userqy/userqy.wxml index 8419f4e..78ca589 100644 --- a/pages/user/userqy/userqy.wxml +++ b/pages/user/userqy/userqy.wxml @@ -40,7 +40,7 @@ [{{item.GradeName}}]365天累计成长值≥{{item.BuyGradeSum }}可保级 - 会员将在{{filter.replace_time(gradeEndDate)}}到期,365天累计成长值≥{{need_money}}可升级[{{ backClass[index+1].GradeName}}][{{item.GradeName}}]365天累计成长值≥{{item.BuyGradeSum}}可保级 + 会员将在{{filter.replace_time2(gradeEndDate)}}到期,365天累计成长值≥{{need_money}}可升级[{{ backClass[index+1].GradeName}}][{{item.GradeName}}]365天累计成长值≥{{item.BuyGradeSum}}可保级 [{{item.GradeName}}]365天累计成长值≥{{backClass[index+1].BuyGradeSum }}可升级[{{ backClass[index+1].GradeName}}] diff --git a/pages/user/userqy/userqy.wxss b/pages/user/userqy/userqy.wxss index 22763a1..ac250b8 100644 --- a/pages/user/userqy/userqy.wxss +++ b/pages/user/userqy/userqy.wxss @@ -177,7 +177,7 @@ margin-top:60rpx; .li .discounts{ top:115rpx; left: 36rpx; - width: 435rpx; + width: 440rpx; } .li .money{ left: 41rpx; diff --git a/utils/util.js b/utils/util.js index 1d4929b..190adb8 100644 --- a/utils/util.js +++ b/utils/util.js @@ -230,6 +230,22 @@ function measureText(text, fontSize = 10) { return width * fontSize / 10; } +//验证手机号 +function check_mobile(phoneMobile){ + var myreg = /^(((13[0-9]{1})|(15[0-9]{1})|(18[0-9]{1})|(17[0-9]{1}))+\d{8})$/; + var ob={code:1}; + if (phoneMobile.length === 0) { + ob.title='输入的手机号为空'; + ob.code=-1; + } else if (phoneMobile.length < 11) { + ob.title ='手机号长度有误!'; + ob.code = -1; + } else if (!myreg.test(phoneMobile)) { + ob.title = '手机号格式有误!'; + ob.code = -1; + } + return ob; +} module.exports = { formatTime: function(e, r) { @@ -319,4 +335,5 @@ module.exports = { isArray: isArray, sub_last: sub_last,//去掉末尾一个字符 measureText: measureText,//画布需要的函数 + check_mobile: check_mobile,//验证手机 };