Commit baf86b0754d64de81331839ef42c471bf43fdd9f
Merge branch 'dev' into 'test'
Dev See merge request !345
Showing
5 changed files
with
101 additions
and
25 deletions
components/diy_shopname/diy_shopname.wxml
pages/goods/goodsInfo/goodsInfo.js
| ... | ... | @@ -231,13 +231,13 @@ Page({ |
| 231 | 231 | comments_no_more:0, |
| 232 | 232 | get_c:0, //获取评价是不是成 |
| 233 | 233 | is_collect_load:0, //是不是处理 |
| 234 | + is_newsales_rules:0, //是否开启最新的门店规则,此时会新读门店,当点击选择门店时会触发读取线下库存 | |
| 235 | + sales_rules:1, //默认是线上销售 | |
| 234 | 236 | }, |
| 235 | 237 | |
| 236 | 238 | //------初始化加载---------- |
| 237 | 239 | onLoad: function(t) { |
| 238 | 240 | |
| 239 | - | |
| 240 | - | |
| 241 | 241 | wx.setNavigationBarTitle({ |
| 242 | 242 | title: "商品详情", |
| 243 | 243 | }) |
| ... | ... | @@ -251,14 +251,13 @@ Page({ |
| 251 | 251 | if (gid == undefined || gid == null || gid == "") { |
| 252 | 252 | gid = decodeURIComponent(t.scene); |
| 253 | 253 | } |
| 254 | - ee.setData({ | |
| 255 | - gid: gid | |
| 256 | - }); | |
| 254 | + ee.setData({ gid: gid}); | |
| 257 | 255 | |
| 258 | 256 | //----获取系统参数----- |
| 259 | 257 | getApp().getConfig2(function(e) { |
| 260 | 258 | ee.setData({ |
| 261 | - bconfig: e | |
| 259 | + bconfig: e, | |
| 260 | + sales_rules:e.sales_rules | |
| 262 | 261 | }); |
| 263 | 262 | |
| 264 | 263 | if (e.categoryset.indexOf("," + 1 + ",") != -1) { |
| ... | ... | @@ -280,7 +279,8 @@ Page({ |
| 280 | 279 | var json_d = JSON.parse(e.switch_list); |
| 281 | 280 | ee.setData({ |
| 282 | 281 | store_config: e, |
| 283 | - is_closecoupon: json_d.is_closecoupon | |
| 282 | + is_closecoupon: json_d.is_closecoupon, | |
| 283 | + is_newsales_rules:json_d.is_newsales_rules | |
| 284 | 284 | }); |
| 285 | 285 | ee.init(gid); |
| 286 | 286 | //------几人评价------- |
| ... | ... | @@ -339,21 +339,65 @@ Page({ |
| 339 | 339 | //获取用户的默认门店 |
| 340 | 340 | getApp().get_user_store(function(e) { |
| 341 | 341 | if(!e) return false; |
| 342 | + var appd=getApp().globalData; | |
| 342 | 343 | var w_time = setInterval(function() { |
| 343 | 344 | if (that.data.is_get_local_ok == 0) return false; |
| 345 | + clearInterval(w_time); | |
| 344 | 346 | var distance = null; |
| 345 | - if (that.data.lat != null && e.distance == undefined) { | |
| 346 | - //distance=Math.sqrt((e.lat-th.data.lat)*(e.lat-th.data.lat)+(e.lon-th.data.lon)* (e.lon-th.data.lon)); | |
| 347 | - var distance = ut.getDistance(e.lat, th.data.lat, e.lon, th.data.lon); | |
| 348 | - e.distance = distance; | |
| 349 | - } | |
| 350 | - if (e) that.setData({ | |
| 351 | - def_pick_store: e, | |
| 352 | - sto_sele_name: e.pickup_name, | |
| 353 | - sto_sele_id: e.pickup_id, | |
| 354 | - sto_sele_distr: e.distr_type | |
| 355 | - }) | |
| 356 | - clearInterval(w_time); | |
| 347 | + | |
| 348 | + //如果有开启近距离的话,同时距离优不一样了 | |
| 349 | + if (that.data.lat != null) { | |
| 350 | + //如果经纬度有变化的话 | |
| 351 | + if( appd.lat==that.data.lat && appd.lon==that.data.lon && e.distance>0 ){ | |
| 352 | + that.setData({ | |
| 353 | + def_pick_store: e, | |
| 354 | + sto_sele_name: e.pickup_name, | |
| 355 | + sto_sele_id: e.pickup_id, | |
| 356 | + sto_sele_distr: e.distr_type | |
| 357 | + }) | |
| 358 | + }else{ | |
| 359 | + //要用接口是获取距离，js的计算不准 | |
| 360 | + getApp().request.get("/api/weshop/pickup/list",{ | |
| 361 | + data:{store_id:os.stoid,pickup_id:e.pickup_id,lat:th.data.lat,lon: th.data.lon}, | |
| 362 | + success:function (res) { | |
| 363 | + if(res.data.code==0){ | |
| 364 | + e=res.data.data.pageData[0]; | |
| 365 | + if (e){ | |
| 366 | + appd.pk_store=e; | |
| 367 | + that.setData({ | |
| 368 | + def_pick_store: e, | |
| 369 | + sto_sele_name: e.pickup_name, | |
| 370 | + sto_sele_id: e.pickup_id, | |
| 371 | + sto_sele_distr: e.distr_type | |
| 372 | + }) | |
| 373 | + } | |
| 374 | + | |
| 375 | + | |
| 376 | + | |
| 377 | + } | |
| 378 | + } | |
| 379 | + }) | |
| 380 | + } | |
| 381 | + | |
| 382 | + //e.distance = distance; | |
| 383 | + appd.lat=that.data.lat; | |
| 384 | + appd.lon=that.data.lon; | |
| 385 | + | |
| 386 | + }else{ | |
| 387 | + if (e) { | |
| 388 | + e.distance = null; | |
| 389 | + that.setData({ | |
| 390 | + def_pick_store: e, | |
| 391 | + sto_sele_name: e.pickup_name, | |
| 392 | + sto_sele_id: e.pickup_id, | |
| 393 | + sto_sele_distr: e.distr_type | |
| 394 | + }) | |
| 395 | + } | |
| 396 | + | |
| 397 | + | |
| 398 | + } | |
| 399 | + | |
| 400 | + | |
| 357 | 401 | }, 500) |
| 358 | 402 | }); |
| 359 | 403 | |
| ... | ... | @@ -1356,6 +1400,12 @@ Page({ |
| 1356 | 1400 | } |
| 1357 | 1401 | e.data.data.pageData.splice(0, 0, th.data.def_pick_store); //添加 |
| 1358 | 1402 | } |
| 1403 | + | |
| 1404 | + //--获取线下库存-- | |
| 1405 | + if(this.data.sales_rules){ | |
| 1406 | + | |
| 1407 | + } | |
| 1408 | + | |
| 1359 | 1409 | |
| 1360 | 1410 | //单总量超出5个的时候 |
| 1361 | 1411 | if (e.data.data.total > 5) { | ... | ... |
pages/order/refund_order/refund_order.js
| ... | ... | @@ -33,6 +33,7 @@ Page({ |
| 33 | 33 | orderId: t.order_id, |
| 34 | 34 | user: e, |
| 35 | 35 | }), |
| 36 | + wx.showLoading(); | |
| 36 | 37 | rq.get("/api/weshop/order/get/" + os.stoid + "/" + t.order_id,{ |
| 37 | 38 | success:function(ed){ |
| 38 | 39 | var bm = ed.data.data.order_amount + ed.data.data.user_money |
| ... | ... | @@ -41,6 +42,7 @@ Page({ |
| 41 | 42 | order_sn: ed.data.data.order_sn, |
| 42 | 43 | back_money: bm |
| 43 | 44 | }) |
| 45 | + wx.hideLoading(); | |
| 44 | 46 | } |
| 45 | 47 | }) |
| 46 | 48 | }); |
| ... | ... | @@ -49,6 +51,10 @@ Page({ |
| 49 | 51 | |
| 50 | 52 | //------提交退款申请------- |
| 51 | 53 | refundOrder: function(e) { |
| 54 | + | |
| 55 | + if(!this.data.back_money){ | |
| 56 | + return false; | |
| 57 | + } | |
| 52 | 58 | if(this.data.isloading) return false; |
| 53 | 59 | this.data.isloading=1; |
| 54 | 60 | var th = this; |
| ... | ... | @@ -59,10 +65,16 @@ Page({ |
| 59 | 65 | console.log('ordergoods'); |
| 60 | 66 | console.log(od); |
| 61 | 67 | var glist=""; |
| 62 | - var olist=od.data.data.pageData; | |
| 63 | - olist.forEach(function(ie,ind){ | |
| 68 | + var olist=od.data.data.pageData; | |
| 69 | + /*-- | |
| 70 | + olist.forEach(function(ie,ind){ | |
| 64 | 71 | glist+=ie.goods_id+"," |
| 65 | - }) | |
| 72 | + })--*/ | |
| 73 | + for(var i in olist){ | |
| 74 | + var ie=olist[i]; | |
| 75 | + glist+=ie.goods_id+"," | |
| 76 | + } | |
| 77 | + | |
| 66 | 78 | glist = glist.substring(0, glist.length-1); |
| 67 | 79 | console.log(glist); |
| 68 | 80 | rq.post("/api/weshop/order/returngoods/saveReturnGoods", { | ... | ... |
pages/user/return_goods/return_goods.js
| ... | ... | @@ -44,6 +44,7 @@ Page({ |
| 44 | 44 | }, |
| 45 | 45 | requestReturnGoods: function(t) { |
| 46 | 46 | var e = this; |
| 47 | + wx.showLoading(); | |
| 47 | 48 | a.get("/api/weshop/ordergoods/list", { |
| 48 | 49 | failRollback: !0, |
| 49 | 50 | data: { |
| ... | ... | @@ -57,6 +58,7 @@ Page({ |
| 57 | 58 | order: t.data.data.pageData[0], |
| 58 | 59 | applyNum: t.data.data.pageData[0].goods_num |
| 59 | 60 | }); |
| 61 | + wx.hideLoading(); | |
| 60 | 62 | } |
| 61 | 63 | }); |
| 62 | 64 | }, |
| ... | ... | @@ -128,10 +130,15 @@ Page({ |
| 128 | 130 | |
| 129 | 131 | /*-------------提交退款申请--------------*/ |
| 130 | 132 | submiApply: function() { |
| 131 | - if(this.data.isloading) return false; | |
| 132 | - this.data.isloading=1; | |
| 133 | + | |
| 134 | + if(!this.data.order) return false; | |
| 135 | + | |
| 133 | 136 | var t = this,th=t; |
| 134 | 137 | this.checkSubmit(function() { |
| 138 | + | |
| 139 | + if(th.data.isloading) return false; | |
| 140 | + th.data.isloading=1; | |
| 141 | + | |
| 135 | 142 | t.uploadPhotos(function() { |
| 136 | 143 | a.post("/api/weshop/order/returngoods/saveReturnGoods", { |
| 137 | 144 | /*--- |
| ... | ... | @@ -159,7 +166,9 @@ Page({ |
| 159 | 166 | addtime: ut.gettimestamp(), |
| 160 | 167 | type:2, |
| 161 | 168 | refund_type: th.data.refund_type, |
| 169 | + remark:th.data.description | |
| 162 | 170 | }, |
| 171 | + | |
| 163 | 172 | success: function(t) { |
| 164 | 173 | wx.showToast({ |
| 165 | 174 | title: "提交成功", | ... | ... |
pages/user/userinfo/userinfo.js