diff --git a/app.js b/app.js
index 981ebb5..fab4ac5 100644
--- a/app.js
+++ b/app.js
@@ -21,7 +21,7 @@ App({
unique_key: "wechatxcx"
}).then(res => {
let data = JSON.parse(res.data);
- data.isTest = data.isTest54? true : false;
+ data.isTest = data.isTest55? true : false;
this.globalData.configJson = data
}).then(() => {
// 获取ui配置文件
diff --git a/pages/component/TitleHeader.js b/pages/component/TitleHeader.js
index 7c384b3..6aaafbf 100644
--- a/pages/component/TitleHeader.js
+++ b/pages/component/TitleHeader.js
@@ -75,15 +75,18 @@ Component({
// })
// }
else if (pages[pages.length-1].route.indexOf('pages/order/pay/index') != -1){
- console.log(pages[pages.length-1]);
wx.redirectTo({
url:'/pages/user/order/list'
})
}
+ else if (pages[pages.length-1].route.indexOf('pages/user/order/list') != -1){
+ wx.switchTab({
+ url: '/pages/user/user'
+ })
+ }
else if (pages[pages.length-1].route.indexOf('orderList') != -1){
- console.log(11111);
wx.navigateTo({
url: '/pages/user/cartlist/list'
})
diff --git a/pages/order/scene/index.js b/pages/order/scene/index.js
index c00611d..6ba8417 100644
--- a/pages/order/scene/index.js
+++ b/pages/order/scene/index.js
@@ -378,35 +378,35 @@ Page({
coupon: app.globalData.couponInfo
})
// 获取补贴
- if (this.data.product) {
- commonApi.user_post("product/getProductAllowancePrice", {
- product_code: this.data.product.product.product_code
- }).then(resTwo => {
- if (resTwo && resTwo.code == 1) {
- this.setData({
- allowance_data: resTwo.data
- })
- let spread_price = Number(this.data.allowance_data.discount_limit_price - this.data.allowance_data.user_used_price)
- let sInfo = this.data.product.sku
- if (spread_price > 0) {
- if (spread_price < this.data.allowance_data.discount_rate / 100 * sInfo.price) {
- this.setData({
- allowance_price: spread_price
- })
- } else {
- this.setData({
- allowance_price: this.data.allowance_data.discount_rate / 100 * sInfo.price
- })
- }
- this.changePrice()
- } else {
- this.setData({
- allowance_price: 0
- })
- }
- }
- })
- }
+ // if (this.data.product) {
+ // commonApi.user_post("product/getProductAllowancePrice", {
+ // product_code: this.data.product.product.product_code
+ // }).then(resTwo => {
+ // if (resTwo && resTwo.code == 1) {
+ // this.setData({
+ // allowance_data: resTwo.data
+ // })
+ // let spread_price = Number(this.data.allowance_data.discount_limit_price - this.data.allowance_data.user_used_price)
+ // let sInfo = this.data.product.sku
+ // if (spread_price > 0) {
+ // if (spread_price < this.data.allowance_data.discount_rate / 100 * sInfo.price) {
+ // this.setData({
+ // allowance_price: spread_price
+ // })
+ // } else {
+ // this.setData({
+ // allowance_price: this.data.allowance_data.discount_rate / 100 * sInfo.price
+ // })
+ // }
+ // this.changePrice()
+ // } else {
+ // this.setData({
+ // allowance_price: 0
+ // })
+ // }
+ // }
+ // })
+ // }
},
/**
diff --git a/pages/pbService/wwcx/index.wxml b/pages/pbService/wwcx/index.wxml
index 7193b9e..2eb35d0 100644
--- a/pages/pbService/wwcx/index.wxml
+++ b/pages/pbService/wwcx/index.wxml
@@ -35,8 +35,8 @@
{{item.name}}
- 藏于{{item.collection_name}}
- 入藏时间{{item.age}}
+ 藏于{{item.collection_name}}
+ 入藏时间{{item.age}}
等级{{item.level_name}}
区域{{item.area?areaName[item.area]:'苏州'}}
历史年代{{item.age}}
diff --git a/pages/search/list/index.wxml b/pages/search/list/index.wxml
index e70d080..6e2a3f6 100644
--- a/pages/search/list/index.wxml
+++ b/pages/search/list/index.wxml
@@ -102,8 +102,8 @@
{{item.title}}
- 电话：{{item.ext.tel}}
- 地址：{{item.ext.address}}
+ 电话：{{item.ext.tel||item.ext.scene_tel}}
+ 地址：{{item.ext.address||item.ext.supplier_address}}
diff --git a/pages/user/address/add/index.js b/pages/user/address/add/index.js
index 7186676..647d084 100644
--- a/pages/user/address/add/index.js
+++ b/pages/user/address/add/index.js
@@ -9,7 +9,7 @@ Page({
* 页面的初始数据
*/
data: {
- isDefault:true,
+ is_default:true,
region: [],
customItem: '',
formData:{
@@ -38,7 +38,7 @@ Page({
if(this.data.id){
// 获取当前收货地址详情
user.user_post("user/getContactInfoById",{id:this.data.id}).then(res=>{
- res.data.isDefault = res.data.isDefault=='1';
+ res.data.is_default = res.data.is_default=='1';
res.data.mobile = res.data.tel;
res.data.username = res.data.name;
res.data.address = res.data.detail_addr;
@@ -117,7 +117,7 @@ Page({
// 设为默认
setDefault:function(e){
var formData = this.data.formData;
- formData.isDefault = e.detail.value;
+ formData.is_default = e.detail.value;
this.setData({
formData: formData
})
@@ -268,7 +268,7 @@ Page({
data.province_id = areaList.filter(item => item.name == province)[0].id;
data.city_id = areaList.filter(item => item.name == city && item.pid == data.province_id)[0].id;
data.district_id = areaList.filter(item => item.name == area && item.pid == data.city_id)[0].id;
- data.is_default = data.isDefault?'1':'0';
+ data.is_default = data.is_default?'1':'0';
data.detail_addr = data.address
let service ="addNewConsignee";
if(this.data.id){
diff --git a/pages/user/order/list.js b/pages/user/order/list.js
index cf87a6d..de965af 100644
--- a/pages/user/order/list.js
+++ b/pages/user/order/list.js
@@ -133,12 +133,11 @@ Page({
})
})
+
},
gotoDetail:function(e){
let item = e.currentTarget.dataset.item;
-
item = this.getChild(item)
-
util.gotoOrder(item)
},
@@ -247,7 +246,10 @@ Page({
* 生命周期函数--监听页面显示
*/
onShow: function () {
-
+ this.setData({
+ list:[]
+ })
+ this.getList()
},
/**
diff --git a/pages/user/order/postOrderInfo/index.js b/pages/user/order/postOrderInfo/index.js
index 8982e37..ae80367 100644
--- a/pages/user/order/postOrderInfo/index.js
+++ b/pages/user/order/postOrderInfo/index.js
@@ -66,8 +66,11 @@ Page({
icon:'success'
})
info.state = "CLOSED";
+ info.state_text = "已关闭";
+
info.order_product_list.map(item=>{
item.state='CLOSED'
+ item.state_text='已关闭'
})
_this.setData({
info:info