diff --git a/components/diy_shopname/diy_shopname.wxml b/components/diy_shopname/diy_shopname.wxml
index 779c337..78de886 100644
--- a/components/diy_shopname/diy_shopname.wxml
+++ b/components/diy_shopname/diy_shopname.wxml
@@ -45,7 +45,7 @@
- 派派通001
+ {{store_name}}
diff --git a/pages/goods/goodsInfo/goodsInfo.js b/pages/goods/goodsInfo/goodsInfo.js
index 31f1f81..48e4f5f 100644
--- a/pages/goods/goodsInfo/goodsInfo.js
+++ b/pages/goods/goodsInfo/goodsInfo.js
@@ -231,13 +231,13 @@ Page({
comments_no_more:0,
get_c:0, //获取评价是不是成
is_collect_load:0, //是不是处理
+ is_newsales_rules:0, //是否开启最新的门店规则,此时会新读门店,当点击选择门店时会触发读取线下库存
+ sales_rules:1, //默认是线上销售
},
//------初始化加载----------
onLoad: function(t) {
-
-
wx.setNavigationBarTitle({
title: "商品详情",
})
@@ -251,14 +251,13 @@ Page({
if (gid == undefined || gid == null || gid == "") {
gid = decodeURIComponent(t.scene);
}
- ee.setData({
- gid: gid
- });
+ ee.setData({ gid: gid});
//----获取系统参数-----
getApp().getConfig2(function(e) {
ee.setData({
- bconfig: e
+ bconfig: e,
+ sales_rules:e.sales_rules
});
if (e.categoryset.indexOf("," + 1 + ",") != -1) {
@@ -280,7 +279,8 @@ Page({
var json_d = JSON.parse(e.switch_list);
ee.setData({
store_config: e,
- is_closecoupon: json_d.is_closecoupon
+ is_closecoupon: json_d.is_closecoupon,
+ is_newsales_rules:json_d.is_newsales_rules
});
ee.init(gid);
//------几人评价-------
@@ -339,21 +339,65 @@ Page({
//获取用户的默认门店
getApp().get_user_store(function(e) {
if(!e) return false;
+ var appd=getApp().globalData;
var w_time = setInterval(function() {
if (that.data.is_get_local_ok == 0) return false;
+ clearInterval(w_time);
var distance = null;
- if (that.data.lat != null && e.distance == undefined) {
- //distance=Math.sqrt((e.lat-th.data.lat)*(e.lat-th.data.lat)+(e.lon-th.data.lon)* (e.lon-th.data.lon));
- var distance = ut.getDistance(e.lat, th.data.lat, e.lon, th.data.lon);
- e.distance = distance;
- }
- if (e) that.setData({
- def_pick_store: e,
- sto_sele_name: e.pickup_name,
- sto_sele_id: e.pickup_id,
- sto_sele_distr: e.distr_type
- })
- clearInterval(w_time);
+
+ //如果有开启近距离的话,同时距离优不一样了
+ if (that.data.lat != null) {
+ //如果经纬度有变化的话
+ if( appd.lat==that.data.lat && appd.lon==that.data.lon && e.distance>0 ){
+ that.setData({
+ def_pick_store: e,
+ sto_sele_name: e.pickup_name,
+ sto_sele_id: e.pickup_id,
+ sto_sele_distr: e.distr_type
+ })
+ }else{
+ //要用接口是获取距离,js的计算不准
+ getApp().request.get("/api/weshop/pickup/list",{
+ data:{store_id:os.stoid,pickup_id:e.pickup_id,lat:th.data.lat,lon: th.data.lon},
+ success:function (res) {
+ if(res.data.code==0){
+ e=res.data.data.pageData[0];
+ if (e){
+ appd.pk_store=e;
+ that.setData({
+ def_pick_store: e,
+ sto_sele_name: e.pickup_name,
+ sto_sele_id: e.pickup_id,
+ sto_sele_distr: e.distr_type
+ })
+ }
+
+
+
+ }
+ }
+ })
+ }
+
+ //e.distance = distance;
+ appd.lat=that.data.lat;
+ appd.lon=that.data.lon;
+
+ }else{
+ if (e) {
+ e.distance = null;
+ that.setData({
+ def_pick_store: e,
+ sto_sele_name: e.pickup_name,
+ sto_sele_id: e.pickup_id,
+ sto_sele_distr: e.distr_type
+ })
+ }
+
+
+ }
+
+
}, 500)
});
@@ -1356,6 +1400,12 @@ Page({
}
e.data.data.pageData.splice(0, 0, th.data.def_pick_store); //添加
}
+
+ //--获取线下库存--
+ if(this.data.sales_rules){
+
+ }
+
//单总量超出5个的时候
if (e.data.data.total > 5) {
diff --git a/pages/order/refund_order/refund_order.js b/pages/order/refund_order/refund_order.js
index 49b0e8e..9cfa00f 100644
--- a/pages/order/refund_order/refund_order.js
+++ b/pages/order/refund_order/refund_order.js
@@ -33,6 +33,7 @@ Page({
orderId: t.order_id,
user: e,
}),
+ wx.showLoading();
rq.get("/api/weshop/order/get/" + os.stoid + "/" + t.order_id,{
success:function(ed){
var bm = ed.data.data.order_amount + ed.data.data.user_money
@@ -41,6 +42,7 @@ Page({
order_sn: ed.data.data.order_sn,
back_money: bm
})
+ wx.hideLoading();
}
})
});
@@ -49,6 +51,10 @@ Page({
//------提交退款申请-------
refundOrder: function(e) {
+
+ if(!this.data.back_money){
+ return false;
+ }
if(this.data.isloading) return false;
this.data.isloading=1;
var th = this;
@@ -59,10 +65,16 @@ Page({
console.log('ordergoods');
console.log(od);
var glist="";
- var olist=od.data.data.pageData;
- olist.forEach(function(ie,ind){
+ var olist=od.data.data.pageData;
+ /*--
+ olist.forEach(function(ie,ind){
glist+=ie.goods_id+","
- })
+ })--*/
+ for(var i in olist){
+ var ie=olist[i];
+ glist+=ie.goods_id+","
+ }
+
glist = glist.substring(0, glist.length-1);
console.log(glist);
rq.post("/api/weshop/order/returngoods/saveReturnGoods", {
diff --git a/pages/user/return_goods/return_goods.js b/pages/user/return_goods/return_goods.js
index a941c79..38435c7 100644
--- a/pages/user/return_goods/return_goods.js
+++ b/pages/user/return_goods/return_goods.js
@@ -44,6 +44,7 @@ Page({
},
requestReturnGoods: function(t) {
var e = this;
+ wx.showLoading();
a.get("/api/weshop/ordergoods/list", {
failRollback: !0,
data: {
@@ -57,6 +58,7 @@ Page({
order: t.data.data.pageData[0],
applyNum: t.data.data.pageData[0].goods_num
});
+ wx.hideLoading();
}
});
},
@@ -128,10 +130,15 @@ Page({
/*-------------提交退款申请--------------*/
submiApply: function() {
- if(this.data.isloading) return false;
- this.data.isloading=1;
+
+ if(!this.data.order) return false;
+
var t = this,th=t;
this.checkSubmit(function() {
+
+ if(th.data.isloading) return false;
+ th.data.isloading=1;
+
t.uploadPhotos(function() {
a.post("/api/weshop/order/returngoods/saveReturnGoods", {
/*---
@@ -159,7 +166,9 @@ Page({
addtime: ut.gettimestamp(),
type:2,
refund_type: th.data.refund_type,
+ remark:th.data.description
},
+
success: function(t) {
wx.showToast({
title: "提交成功",
diff --git a/pages/user/userinfo/userinfo.js b/pages/user/userinfo/userinfo.js
index 3d9d51c..883a9e4 100644
--- a/pages/user/userinfo/userinfo.js
+++ b/pages/user/userinfo/userinfo.js
@@ -838,6 +838,11 @@ Page({
});
getApp().goto(url);
},
+
+ //--点击分享事件---
+ onShareAppMessage: function(t) {
+ return o.share;
+ },
});
\ No newline at end of file