diff --git a/.hbuilderx/launch.json b/.hbuilderx/launch.json
index 8dc9183..0d12f45 100644
--- a/.hbuilderx/launch.json
+++ b/.hbuilderx/launch.json
@@ -20,7 +20,7 @@
"type" : "uniCloud"
},
{
- "playground" : "standard",
+ "playground" : "custom",
"type" : "uni-app:app-ios"
},
{
diff --git a/manifest.json b/manifest.json
index 1d35e70..2a3d378 100644
--- a/manifest.json
+++ b/manifest.json
@@ -12,8 +12,8 @@
"src" : "图片路径"
}
],
- "versionName" : "1.2.52",
- "versionCode" : 1252,
+ "versionName" : "1.2.55",
+ "versionCode" : 1255,
"app-plus" : {
"compatible" : {
"ignoreVersion" : true
diff --git a/pages/bookShop/commodityDetail.vue b/pages/bookShop/commodityDetail.vue
index d95ef2a..a3fb068 100644
--- a/pages/bookShop/commodityDetail.vue
+++ b/pages/bookShop/commodityDetail.vue
@@ -518,7 +518,7 @@ export default {
url: "buy/record/All",
method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档1
data: {
- 'bookid': this.productId
+ 'productId': this.productId
},
header: { //默认 无 说明：请求头
'Content-Type': 'application/json'
diff --git a/pages/bookShop/orderLCont.vue b/pages/bookShop/orderLCont.vue
index 10cc9f9..1f8f1b8 100644
--- a/pages/bookShop/orderLCont.vue
+++ b/pages/bookShop/orderLCont.vue
@@ -3,7 +3,7 @@
-
+
{{orderContet.consignee.consigneeName}}
@@ -31,9 +31,10 @@
待收货
已完成
已超时
-
+
+
+ @click="goDetail(item.productId)" >
@@ -51,21 +52,36 @@
评价
- 追评
+
-
-
+
-
-
+
+
+
+
+
+
+
+ VIP开通
+
+
+
+
+
+
+
+
充值
-
+
@@ -78,11 +94,11 @@
运费 :
￥{{orderContet.shippingPrice}}
-
+
实付款 :
￥{{orderContet.realPrice}}
@@ -602,7 +618,7 @@
} else if (this.orderContet.orderStatus == 3) {
this.titleStat = '已完成'
}
- if(this.orderContet.orderStatus >= 2 && this.orderContet.orderType == 'order'){
+ if(this.orderContet.orderStatus >= 2 && this.orderContet.orderType == 'order' && this.orderContet.expressOrders != null){
this.sheetList = this.orderContet.expressOrders
}else{
this.sheetList = []
diff --git a/pages/bookShop/orderList.vue b/pages/bookShop/orderList.vue
index 71549da..bd16b11 100644
--- a/pages/bookShop/orderList.vue
+++ b/pages/bookShop/orderList.vue
@@ -31,6 +31,7 @@
交易成功
交易失败
过期
+
查看物流
确认收货
- 申请售后
- 评价
+
+
+
@@ -516,18 +543,18 @@ import { data } from 'jquery';
},
closePingjia(){
this.pingjiaShow = false
- this.Pform.comment = ''
- this.Pform.html = ''
- this.emoji = []
+ // this.Pform.comment = ''
+ // this.Pform.html = ''
+ // this.emoji = []
},
// 提交评价
submitPJ(){
if(this.Pform.comment != ''){
- let data={
+ let data={
'userid':this.userInfo.id,
'orderSn': this.orderSn,
- 'bookid': this.productID,
+ 'productId': this.productID,
// 'content': this.Pform.html,
'content': this.Pform.comment,
'starLevel':this.Pform.star,
@@ -536,7 +563,7 @@ import { data } from 'jquery';
}
// console.log(data,'data')
$http.request({
- url: "buy/record/UserRecordcomment",
+ url: "buy/record/UserRecordComment",
method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档
data,
header: { //默认 无 说明：请求头
@@ -568,10 +595,11 @@ import { data } from 'jquery';
}
},
// 添加评价
- pingji(id){
- console.log(id)
+ pingji(id,item){
+ console.log('评价实例',id, item)
this.pjType = ''
this.productID = id
+ this.orderSn = item.orderSn
this.pingjiaShow = true
},
getStar(i){
@@ -700,7 +728,8 @@ import { data } from 'jquery';
width:140rpx;
text-align: center;
}
-
+.addcomment{color: #ffaa00; border-color: #ffaa00; margin: 0 ;}
+.alertDeliver{ color: #55aa00; border-color: #55aa00;}
.flexbox{display: flex;}
.container{padding: 0 10px;}
diff --git a/pages/bookShop/settlement.vue b/pages/bookShop/settlement.vue
index 1bc45d9..b461b41 100644
--- a/pages/bookShop/settlement.vue
+++ b/pages/bookShop/settlement.vue
@@ -52,7 +52,7 @@
商品总价
￥{{totalPrice}}
-
+
运费
@@ -411,6 +411,8 @@
'&type=0')
.then(res => {
this.youhuiList = res.userCoupons
+ }).catch( e => {
+ console.log('获取优惠券报错',);
});
},
@@ -433,7 +435,7 @@
}
prodCont.weight = res.shopProduct.weight
this.cartList.push(prodCont)
- this.getCourpe()
+ // this.getCourpe()
this.getUserAddress()
//this.getYunFei()
// this.getYunFei()
@@ -450,7 +452,7 @@
this.cartList.push(res.cartList[this.cartIDNum[i]])
}
console.log(this.cartList, '购物车列表')
- this.getCourpe()
+ // this.getCourpe()
this.getUserAddress()
})
@@ -505,11 +507,11 @@
allprice += price
})
this.totalPrice = allprice
- if (this.youhuiContent.id != undefined) {
- this.realPrice = this.totalPrice - this.youhuiContent.coupons.couponAmount
- } else {
- this.realPrice = this.totalPrice
- }
+ // if (this.youhuiContent.id != undefined) {
+ // this.realPrice = this.totalPrice - this.youhuiContent.coupons.couponAmount
+ // } else {
+ this.realPrice = this.totalPrice
+ // }
this.realPrice = this.realPrice + this.farePrice
},
// 超出阈值时
@@ -528,7 +530,7 @@
this.updateCart(productItem)
this.$nextTick(() => {
this.getYunFei()
- this.getCourpe()
+ // this.getCourpe()
})
},
diff --git a/pages/bookShop/settlementBook.vue b/pages/bookShop/settlementBook.vue
index 795dc6a..4bda00e 100644
--- a/pages/bookShop/settlementBook.vue
+++ b/pages/bookShop/settlementBook.vue
@@ -51,7 +51,7 @@
商品总价
￥{{totalPrice}}
-
+
运费
diff --git a/pages/clock/clock.vue b/pages/clock/clock.vue
index b16c1ff..0bd823f 100644
--- a/pages/clock/clock.vue
+++ b/pages/clock/clock.vue
@@ -573,7 +573,7 @@
.get('book/clockInForum/getChatList', data)
.then(res => {
console.log(res, '当天我的打卡内容')
- if (res.code == 0 && res.chatList.length > 0) {
+ if (res.code == 0 && res.chatList && res.chatList.length > 0) {
var arr = []
res.chatList.forEach((item1) => {
var pjstr = ''
diff --git a/pages/peanut/home.vue b/pages/peanut/home.vue
index 95374f3..9ef9599 100644
--- a/pages/peanut/home.vue
+++ b/pages/peanut/home.vue
@@ -335,6 +335,9 @@
import musicPlay from '@/components/music.vue'
import repciptData from '@/static/json/repcipt.json'
import $http from '@/config/requestConfig.js';
+ // #ifdef APP-PLUS
+ import updata from '@/uni_modules/uni-upgrade-center-app/utils/check-update'
+ // #endif
import {
mapState,
mapMutations
@@ -450,6 +453,9 @@
//页面显示
onShow() {
// 隐藏原生的tabbar
+ // #ifdef APP-PLUS
+ updata();
+ // #endif
// this.getUserInfo()
// this.tjProList = []
// uni.hideTabBar();
diff --git a/pages/user/persCount.vue b/pages/user/persCount.vue
index cc1378f..3b1f056 100644
--- a/pages/user/persCount.vue
+++ b/pages/user/persCount.vue
@@ -246,19 +246,19 @@
},
// 优惠券
- getCourpe() {
- this.$http
- .post('/book/couponhistory/appGetUserCenterCoupon?userId=' + this.userInfo.id + '&useStatus=' + this
- .couponListTab)
- .then(res => {
- // this.cardList = res.couponVos
- this.cardList = res.couponVos
- });
- },
+ // getCourpe() {
+ // this.$http
+ // .post('/book/couponhistory/appGetUserCenterCoupon?userId=' + this.userInfo.id + '&useStatus=' + this
+ // .couponListTab)
+ // .then(res => {
+ // // this.cardList = res.couponVos
+ // this.cardList = res.couponVos
+ // });
+ // },
// 切换优惠券
couponTabCLi(e) {
- this.couponListTab = e
- this.getCourpe()
+ // this.couponListTab = e
+ // this.getCourpe()
},