diff --git a/manifest.json b/manifest.json
index 042cda5..6d6d8b5 100644
--- a/manifest.json
+++ b/manifest.json
@@ -12,8 +12,8 @@
"src" : "图片路径"
}
],
- "versionName" : "1.2.44",
- "versionCode" : 1244,
+ "versionName" : "1.2.45",
+ "versionCode" : 1245,
"app-plus" : {
"compatible" : {
"ignoreVersion" : true
@@ -22,7 +22,7 @@
"prompt" : "template",
"template" : {
"title" : "用户协议和隐私政策",
- "message" : "请你务必审慎阅读、充分理解“隐私政策”各条款，包括但不限于：为了更好的向你提供服务，我们需要收集你的设备标识、操作日志等信息用于分析、优化应用性能。
你可阅读《用户协议》和《隐私协议》了解详细信息。如果你同意，请点击下面按钮开始接受我们的服务。",
+ "message" : "请你务必审慎阅读、充分理解“隐私政策”各条款，包括但不限于：为了更好的向你提供服务，我们需要收集你的设备标识、操作日志等信息用于分析、优化应用性能。
你可阅读《用户协议》和《隐私协议》了解详细信息。如果你同意，请点击下面按钮开始接受我们的服务。",
"buttonAccept" : "同意",
"buttonRefuse" : "暂不同意"
}
diff --git a/pages/bookShop/settlement.vue b/pages/bookShop/settlement.vue
index 92f0063..c4b0866 100644
--- a/pages/bookShop/settlement.vue
+++ b/pages/bookShop/settlement.vue
@@ -635,7 +635,8 @@
orderStatus: 0, //订单状态
productList: xiaBiao, //订单列表商品
orderType: "order", //订单类型
- addressId: this.adressMoRen.id // 地址ID
+ addressId: this.adressMoRen.id, // 地址ID
+ jfDeduction:0,//积分抵扣
}
$http.request({
// url: "book/buyOrder/buySave",
@@ -673,9 +674,9 @@
title: "支付成功"
});
setTimeout(() => {
- uni.switchTab({
- url: './orderList'
- });
+ uni.navigateTo({
+ url: '/pages/bookShop/orderList'
+ });
// uni.navigateTo({
// url: './orderList'
// });
@@ -707,9 +708,9 @@
title: "支付成功"
});
setTimeout(() => {
- uni.switchTab({
- url: './orderList'
- });
+ uni.navigateTo({
+ url: '/pages/bookShop/orderList'
+ });
}, 1000)
} else {
console.log(res)
@@ -732,12 +733,12 @@
// 天医币支付
uni.showToast({
title: "购买成功",
- icon: "success"
+ icon: "success"
});
setTimeout(() => {
- uni.switchTab({
- url: './orderList'
- });
+ uni.navigateTo({
+ url: '/pages/bookShop/orderList'
+ });
}, 1000)
}
}
diff --git a/pages/bookShop/settlementBook.vue b/pages/bookShop/settlementBook.vue
index 291e32b..795dc6a 100644
--- a/pages/bookShop/settlementBook.vue
+++ b/pages/bookShop/settlementBook.vue
@@ -661,9 +661,9 @@
title: "支付成功"
});
setTimeout(() => {
- uni.switchTab({
- url: './orderList'
- });
+ uni.navigateTo({
+ url: '/pages/bookShop/orderList'
+ });
// uni.navigateTo({
// url: './orderList'
// });
@@ -695,9 +695,9 @@
title: "支付成功"
});
setTimeout(() => {
- uni.switchTab({
- url: './orderList'
- });
+ uni.navigateTo({
+ url: '/pages/bookShop/orderList'
+ });
}, 1000)
} else {
console.log(res)
@@ -718,14 +718,15 @@
})
}else if(this.payType == 4){
// 天医币支付
+ // console.log('到这里--------',res)
uni.showToast({
title: "购买成功",
icon: "success"
});
setTimeout(() => {
- uni.switchTab({
- url: './orderList'
- });
+ uni.navigateTo({
+ url: '/pages/bookShop/orderList'
+ });
}, 1000)
}
}
diff --git a/pages/peanut/home.vue b/pages/peanut/home.vue
index 53bafaa..7d7921b 100644
--- a/pages/peanut/home.vue
+++ b/pages/peanut/home.vue
@@ -133,10 +133,19 @@
新书上市
-->
+
+
+
+ 请输入书名
+
+
+ 书名检索
+
+
-
-
+
+
{{item.title}}
@@ -224,30 +233,18 @@
-
-
-
-
- 请输入书名
-
-
-
- 书名检索
-
-
-
-
{{item.title}}
-
-
-
- {{item.title}}
+
+
+
+ {{item.title}}
+
@@ -516,7 +513,7 @@
tag_id = this.yingxiaoTags[0].id
} else {
tag_id = item.id
- }
+ }
this.$http
.post('book/labelAndMarket/getShopProductListByMarketId', {
'marketId': tag_id
@@ -524,12 +521,12 @@
.then(res => {
if (res.code == 0 && res.result.length > 0) {
this.YXBookList = res.result
- }else{
+ } else {
this.YXBookList = []
}
// console.log(res.result, '营销商品列表')
-
- }).catch( e =>{
+
+ }).catch(e => {
this.YXBookList = []
});
},
@@ -574,7 +571,7 @@
this.getJtData(this.childrenCatList[index].id)
},
tabsChange(item, cindex) {
- // this.tjProList = []
+ // this.tjProList = []
this.tabsid = item.id
this.childrenCatList = []
if (this.catTagList[cindex].isLast == 1) {
@@ -610,7 +607,7 @@
// this.getJtData()
},
getJtData(cid) {
-
+
this.$http
// .post('book/label/list',{
.post('book/labelAndMarket/getShopProductListByLabelId', {
@@ -909,36 +906,46 @@