zm/nuttyreading-html
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

11

Browse Source
This commit is contained in:
@fawn-nine
2024-09-27 17:04:35 +08:00
parent eedeb5c37f
commit 806c08174f
10 changed files with 107 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.hbuilderx/launch.json
View File

@@ -20,7 +20,7 @@
"type" : "uniCloud"
},
{
"playground" : "standard",
"playground" : "custom",
"type" : "uni-app:app-ios"
},
{

4
manifest.json
View File

@@ -12,8 +12,8 @@
"src" : "图片路径"
}
],
"versionName" : "1.2.52",
"versionCode" : 1252,
"versionName" : "1.2.55",
"versionCode" : 1255,
"app-plus" : {
"compatible" : {
"ignoreVersion" : true

2
pages/bookShop/commodityDetail.vue
View File

@@ -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'

36
pages/bookShop/orderLCont.vue
View File

@@ -3,7 +3,7 @@
<!-- 公共组件-每个页面必须引入 -->
<public-module></public-module>
<z-nav-bar title="订单详情"></z-nav-bar>
<view class="adDefault" v-if="consigneeShow && orderContet.orderType == 'order'">
<view class="adDefault" v-if="consigneeShow && orderContet.orderType == 'order' && (orderContet.addressId != 0 && orderContet.addressId != null )">
<view class="defalTop">
<text class="userName">
{{orderContet.consignee.consigneeName}}
@@ -32,8 +32,9 @@
<text class="orderState orderState3" v-if="orderContet.orderStatus==3">已完成</text>
<text class="orderState orderState5" v-if="orderContet.orderStatus==5">已超时</text>
</view>
<template v-if="orderContet.orderType == 'order' && orderContet.goodsList.length > 0">
<view class="orderContent" v-for="(item,index) in orderContet.goodsList" :key="index"
@click="goDetail(item.productId)" v-if="orderContet.goodsList.length > 0">
@click="goDetail(item.productId)" >
<image :src="item.productImage" mode=""></image>
<view class="itemJian">
<view class="orderTitle">
@@ -51,21 +52,36 @@
<view class="orderOper" v-if="item.orderStatus == 3">
<view style="width: 100%; text-align: right;">
<view v-if="userRecordid == null" @click.stop="pingji(item.productId)" class="opCan" >评价</view>
<view v-else @click.stop="showZhuiping(item.productId)" class="opCan" >追评</view>
<!-- <view v-else @click.stop="showZhuiping(item.productId)" class="opCan" >追评</view> -->
</view>
</view>
<br clear="both">
</view>
<view class="orderContent" v-if="orderContet.products==''">
</template>
<template v-if="orderContet.orderType =='vip'">
<view class="orderContent" >
<image :src="'../../static/icon/oder_vip.png'" style="height: 150rpx;"></image>
<view class="itemJian">
<view class="orderTitle">
<text>VIP开通</text>
</view>
<!-- <view class="orderPrice" >
￥<text style="font-weight: bold;">{{orderContet.realMoney}}</text>
</view> -->
<br clear="both">
</view>
<br clear="both">
</view>
</template>
<view class="orderContent" v-if="orderContet.orderType == 'point'">
<image src="../../static/icon/oder_chong.png" mode="" style="height: 150rpx;"></image>
<view class="itemJian">
<view class="orderTitle">
<text>充值</text>
</view>
<view class="orderPrice">
<!-- <view class="orderPrice" >
￥<text style="font-weight: bold;">{{orderContet.realMoney}}</text>
</view>
</view> -->
<br clear="both">
</view>
<br clear="both">
@@ -78,11 +94,11 @@
<span style="color: #666;margin-right: 10rpx;float: left;">运费 : </span>
<span>￥</span>{{orderContet.shippingPrice}}
</view>
<view class="orderReal">
<!-- <view class="orderReal">
<span style="color: #666;margin-right: 10rpx;float: left;">优惠券 : </span>
<b v-if="orderContet.coupon.couponAmount" style="color: #dd3c0c;"><span>-￥</span>{{orderContet.coupon.couponAmount}}</b>
<b v-else style="color: #dd3c0c;"><span>-￥</span>0</b>
</view>
</view> -->
<view class="orderReal">
<span style="color: #666;margin-right: 10rpx;float: left;">实付款 : </span>
<b style="color: #dd3c0c;"><span>￥</span>{{orderContet.realPrice}}</b>
@@ -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 = []

53
pages/bookShop/orderList.vue
View File

@@ -31,6 +31,7 @@
<view class="orderstatus" v-show="item.orderStatus == 3">交易成功</view>
<view class="orderstatus" v-show="item.orderStatus == 4">交易失败</view>
<view class="orderstatus" v-show="item.orderStatus == 5">过期</view>
<template v-if="item.orderType == 'order'">
<view v-for="(item1,index1) in item.productList" :key="index1" class="bookinfolist">
<image class="feng" v-if="item1.product.productImages" :src="item1.product.productImages" mode="aspectFill"></image>
<!-- <view class="description" v-html="item.content">
@@ -42,12 +43,37 @@
</span>
</view>
<view class="btns flexbox" style="margin-top:10rpx;padding-bottom: 72rpx;">
<span class="left" style="color: #C0C4CC;"></span>
<view class="left" style="color: #C0C4CC;">
<view class="orderstatusbtn addcomment" v-if="item.orderStatus == 3 && item1.recordId == 0 &&
item.come == 0" @click.stop="pingji(item1.productId,item)">评价</view>
</view>
<span class="right flexbox opbtns" style="color: #C0C4CC;">
×{{item1.quantity}}
</span>
</view>
</view>
</template>
<template v-if="item.orderType == 'point'">
<view class="flexbox" style="align-items: center;">
<view class="" style="height: 150rpx;">
<image src="../../static/icon/oder_chong.png" style="height: 150rpx; width: 150rpx;"></image>
</view>
<view class="">
<text style="font-size: 28rpx;">充值订单</text>
</view>
</view>
</template>
<template v-if="item.orderType == 'vip'">
<view class="flexbox" style="align-items: center;">
<view class="" style="height: 150rpx;">
<image :src="'../../static/icon/oder_vip.png'" style="height: 150rpx; width: 150rpx;"></image>
</view>
<view class="">
<text style="font-size: 28rpx;">VIP开通</text>
</view>
</view>
</template>
<view class="btns flexbox" style="margin-top:10rpx;">
<span class="left" style="color: #C0C4CC;"></span>
<span class="right flexbox opbtns">
@@ -60,11 +86,12 @@
<span class="right flexbox opbtns">
<view class="orderstatusbtn" v-if="item.orderStatus == 0" @click.stop="canceOrder(item)">取消订单</view>
<view class="orderstatusbtn" v-if="item.orderStatus == 0" @click.stop="goPay(item)">付款</view>
<view class="orderstatusbtn" v-if="item.orderStatus == 1">催发货</view>
<!-- <view class="orderstatusbtn alertDeliver" v-if="item.orderStatus == 1">催发货</view> -->
<view class="orderstatusbtn" v-if="item.orderStatus == 2" @click.stop="seeExpressDetail(item)">查看物流</view>
<view class="orderstatusbtn" v-if="item.orderStatus == 2" @click.stop="OverOrder(item)">确认收货</view>
<view class="orderstatusbtn" v-if="item.orderStatus == 3">申请售后</view>
<view class="orderstatusbtn" v-if="item.orderStatus == 3 && userRecordid == null" @click.stop="pingji(item.productId)">评价</view>
<!-- <view class="orderstatusbtn" v-if="item.orderStatus == 3">申请售后</view> -->
<!-- -->
<!-- <view class="orderstatusbtn" v-if=" userRecordid == null && item.come == 0" @click.stop="pingji(item.id)">评价</view> -->
<!-- <view class="orderstatusbtn" v-if="item.orderStatus == 3 && userRecordid != null" @click.stop="showZhuiping(item.productId)">追评</view> -->
</span>
</view>
@@ -516,9 +543,9 @@ 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(){
@@ -527,7 +554,7 @@ import { data } from 'jquery';
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;}

22
pages/bookShop/settlement.vue
View File

@@ -52,7 +52,7 @@
商品总价
<text>￥{{totalPrice}}</text>
</view>
<view class="yq_youhui" @click="youhuiShow = true">
<!-- <view class="yq_youhui" @click="youhuiShow = true">
<u-icon name="red-packet-fill" color="#e74141" size="18" class="yqLeft"></u-icon>
优惠券
<u-icon name="arrow-right" color="#aaa" size="18" class="yqRight"></u-icon>
@@ -60,7 +60,7 @@
<text class="dagnqian" v-else style="background-color: #999;">暂无优惠券</text>
<text class="dagnqian" v-if="youhuiContent.id!=undefined">
- ￥{{youhuiContent.coupons.couponAmount}}</text>
</view>
</view> -->
<view class="yq_yunfei">
<u-icon name="car-fill" color="#e0880c" size="18" class="yqLeft"></u-icon>
运费
@@ -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()
})
},

4
pages/bookShop/settlementBook.vue
View File

@@ -51,7 +51,7 @@
商品总价
<text>￥{{totalPrice}}</text>
</view>
<view class="yq_youhui" @click="youhuiShow = true">
<!-- <view class="yq_youhui" @click="youhuiShow = true">
<u-icon name="red-packet-fill" color="#e74141" size="18" class="yqLeft"></u-icon>
优惠券
<u-icon name="arrow-right" color="#aaa" size="18" class="yqRight"></u-icon>
@@ -61,7 +61,7 @@
style="background-color: #999;">暂无优惠券</text>
<text class="dagnqian" v-if="youhuiContent.id!=undefined">
- ￥{{youhuiContent.coupons.couponAmount}}</text>
</view>
</view> -->
<view class="yq_yunfei">
<u-icon name="car-fill" color="#e0880c" size="18" class="yqLeft"></u-icon>
运费

2
pages/clock/clock.vue
View File

@@ -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 = ''

6
pages/peanut/home.vue
View File

@@ -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();

22
pages/user/persCount.vue
View File

@@ -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()
},