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

Compare commits

merge into: zm:master
Branches Tags
zm:master zm:restore2 zm:index_tag zm:xie1206 zm:xie_fangji zm:xie_tiangandizhi zm:xulu-visitor zm:appJump zm:xie_wuyunliuqi zm:xie_quhao zm:xie_xuewei zm:xie_address zm:xie1023 zm:xie1010 zm:xie0928 zm:liqian0909 zm:guonei zm:turnjs zm:liqian0908
...
pull from: zm:restore2
Branches Tags
zm:restore2 zm:master zm:index_tag zm:xie1206 zm:xie_fangji zm:xie_tiangandizhi zm:xulu-visitor zm:appJump zm:xie_wuyunliuqi zm:xie_quhao zm:xie_xuewei zm:xie_address zm:xie1023 zm:xie1010 zm:xie0928 zm:liqian0909 zm:guonei zm:turnjs zm:liqian0908

6 Commits
master ... restore2

Author SHA1 Message Date
chenghuan
e8b98a62cb docs: 统一收货相关术语为收件并更新版本号 
将“收货地址”、“收货人”、“待发货”、“待收货”等术语统一修改为“收件地址”、“收件人”、“待发出”、“待收到”等更准确的表述
更新manifest.json中的版本号为1.2.84
 2026-03-05 09:35:28 +08:00
chenghuan
6f21c57137 chore: 更新.gitignore，停止追踪忽略文件 2026-01-21 16:39:02 +08:00
chenghuan
115c627eed fix: 修复结算页面金额计算精度问题 2026-01-21 16:27:27 +08:00
chenghuan
2a9df2f1c6 fix: 修复结算页金额显示精度问题 
更新manifest.json中的版本号至1.2.82
修改开发环境baseUrl配置
修复结算页金额显示格式并调整底部操作栏z-index
 2026-01-21 15:06:37 +08:00
fuchao
5c9d7b89b2 修复：查看图书详情后返回首页屏幕定位问题、及选择的图书标签返回后会重置选择第一个 2025-12-31 16:40:30 +08:00
chenghuan
24b63154af 1.更改文字错误；2.修复首页“标签图书”刷新异常 2025-12-12 14:20:59 +08:00
29 changed files with 93 additions and 111 deletions
Expand all files Collapse all files

1
.gitignore vendored
View File

@@ -1,4 +1,5 @@
.DS_Store .DS_Store
.hbuilderx/
node_modules node_modules
unpackage/dist unpackage/dist
unpackage/release unpackage/release

31
.hbuilderx/launch.json
View File

@@ -1,31 +0,0 @@
{
// launch.json 配置了启动调试时相关设置，configurations下节点名称可为 app-plus/h5/mp-weixin/mp-baidu/mp-alipay/mp-qq/mp-toutiao/mp-360/
// launchtype项可配置值为local或remote, local代表前端连本地云函数，remote代表前端连云端云函数
"version" : "0.0",
"configurations" : [
{
"app-plus" : {
"launchtype" : "remote"
},
"default" : {
"launchtype" : "local"
},
"h5" : {
"launchtype" : "local"
},
"mp-weixin" : {
"launchtype" : "local"
},
"provider" : "aliyun",
"type" : "uniCloud"
},
{
"playground" : "custom",
"type" : "uni-app:app-ios"
},
{
"playground" : "standard",
"type" : "uni-app:app-android"
}
]
}

4
config/baseUrl.js
View File

@@ -6,8 +6,8 @@ if (process.env.NODE_ENV === 'development') {
baseUrl = "http://192.168.110.100:9200/pb/"; // 张川川 baseUrl = "http://192.168.110.100:9200/pb/"; // 张川川
} else if (process.env.NODE_ENV === 'production') { } else if (process.env.NODE_ENV === 'production') {
//生产环境 //生产环境
// baseUrl = "https://api.nuttyreading.com/"; baseUrl = "https://api.nuttyreading.com/";
baseUrl = "http://192.168.110.100:9200/pb/"; // 张川川 //baseUrl = "http://192.168.110.100:9200/pb/"; // 张川川
} }
const courtConfig = { const courtConfig = {
//微信公众号APPID //微信公众号APPID

5
manifest.json
View File

@@ -12,8 +12,9 @@
"src" : "图片路径" "src" : "图片路径"
} }
], ],
"versionName" : "1.2.75", "sassImplementationName" : "node-sass",
"versionCode" : 1275, "versionName" : "1.2.84",
"versionCode" : 1284,
"app-plus" : { "app-plus" : {
"compatible" : { "compatible" : {
"ignoreVersion" : true "ignoreVersion" : true

6
pages/acupoint/givenDegree.vue
View File

@@ -51,7 +51,7 @@
MonList: { MonList: {
title: '阴经', title: '阴经',
vlue: '属性', vlue: '属性',
attribute: ['阴经', '属性', '肺经(金)', '脾经(士)', '心(火)', '肾经(水)', '心包经(冬至前相火，冬至后相水)', '肝经(木)'], attribute: ['阴经', '属性', '肺经(金)', '脾经(土)', '心(火)', '肾经(水)', '心包经(冬至前相火，冬至后相水)', '肝经(木)'],
arry: [ arry: [
['井', '木', '少商', '隐白', '少冲(母穴)', '涌泉(子穴)', '中冲(冬至前母穴冬至后子穴)', '大敦(本穴)'], ['井', '木', '少商', '隐白', '少冲(母穴)', '涌泉(子穴)', '中冲(冬至前母穴冬至后子穴)', '大敦(本穴)'],
['荥', '火', '鱼际', '大都(母穴)', '少府(本穴)', '然谷(泄井当泄荥)', '劳宫(冬至前本穴)', '行间(子穴)'], ['荥', '火', '鱼际', '大都(母穴)', '少府(本穴)', '然谷(泄井当泄荥)', '劳宫(冬至前本穴)', '行间(子穴)'],
@@ -66,12 +66,12 @@
SunList: { SunList: {
title: '阳经', title: '阳经',
vlue: '属性', vlue: '属性',
attribute: ['阳经', '属性', '大肠经(金)', '脾经(士)', '心(火)', '膀胱经(水)', '三焦经(冬至前相火,冬至后相水)', '胆经(木)'], attribute: ['阳经', '属性', '大肠经(金)', '脾经(土)', '心(火)', '膀胱经(水)', '三焦经(冬至前相火,冬至后相水)', '胆经(木)'],
arry: [ arry: [
['井', '金', '商阳(本穴)', '厉兑(子穴)', '少泽', '至阴(母穴)', '关冲(冬至后母穴)', '窍阴'], ['井', '金', '商阳(本穴)', '厉兑(子穴)', '少泽', '至阴(母穴)', '关冲(冬至后母穴)', '窍阴'],
['荥', '水', '二间(子穴)', '内庭(泄井当泄荥)', '前谷', '通谷(本穴)', '液门(冬至后本穴)', '侠溪(母穴)'], ['荥', '水', '二间(子穴)', '内庭(泄井当泄荥)', '前谷', '通谷(本穴)', '液门(冬至后本穴)', '侠溪(母穴)'],
['俞', '木', '三间', '陷谷', '后匾(母穴)', '束骨(子穴)', '中渚(冬至前回穴，冬至后子穴)', '临泣(本穴)'], ['俞', '木', '三间', '陷谷', '后匾(母穴)', '束骨(子穴)', '中渚(冬至前回穴，冬至后子穴)', '临泣(本穴)'],
['经', '水', '阳溪', '解溪(母穴)', '阳谷(本穴)', '昆仑', '支沟(冬至前本穴)', '阳辅(子穴)'], ['经', '火', '阳溪', '解溪(母穴)', '阳谷(本穴)', '昆仑', '支沟(冬至前本穴)', '阳辅(子穴)'],
['合', '土', '曲池(母穴)', '足三里(本穴)', '小海(子穴)', '委中(补井当补合)', '天井(冬至前子穴)', '阳陵泉'], ['合', '土', '曲池(母穴)', '足三里(本穴)', '小海(子穴)', '委中(补井当补合)', '天井(冬至前子穴)', '阳陵泉'],
['原', '', '合谷', '冲阳', '腕骨', '京骨', '阳池', '丘墟'], ['原', '', '合谷', '冲阳', '腕骨', '京骨', '阳池', '丘墟'],
['郄', '', '温溜', '梁丘', '养老', '金门', '会宗', '外丘'], ['郄', '', '温溜', '梁丘', '养老', '金门', '会宗', '外丘'],

2
pages/agreement/yszcPage.vue
View File

@@ -34,7 +34,7 @@
<view>1.2 您通过我们的服务进行通讯的信息，例如曾通讯的账号。</view> <view>1.2 您通过我们的服务进行通讯的信息，例如曾通讯的账号。</view>
<view>1.3 您通过我们的服务分享的内容所包含的信息（元数据），例如拍摄或上传的共享照片或录像的日期、时间或地点等。</view> <view>1.3 您通过我们的服务分享的内容所包含的信息（元数据），例如拍摄或上传的共享照片或录像的日期、时间或地点等。</view>
<view class="dp_con2">2、位置信息，指您开启设备定位功能并使用我们基于位置提供的相关服务时，收集的有关您位置的信息，包括：</view> <view class="dp_con2">2、位置信息，指您开启设备定位功能并使用我们基于位置提供的相关服务时，收集的有关您位置的信息，包括：</view>
<view>2.1 您通过具有定位功能的移动设备使用我们的服务时，通过GPS或WiFi等方式收集的您的地理位置信息用于 健康超市收货 提供位置信息。</view> <view>2.1 您通过具有定位功能的移动设备使用我们的服务时，通过GPS或WiFi等方式收集的您的地理位置信息用于 健康超市收件 提供位置信息。</view>
<view> <view>
2.2 您或其他用户提供的包含您所处地理位置的实时信息，例如您提供的账户信息中包含的您所在地区信息，您上传的显示您当前或曾经所处地理位置的共享信息，您或其他人共享的照片包含的地理标记信息。 2.2 您或其他用户提供的包含您所处地理位置的实时信息，例如您提供的账户信息中包含的您所在地区信息，您上传的显示您当前或曾经所处地理位置的共享信息，您或其他人共享的照片包含的地理标记信息。
</view> </view>

2
pages/bookShop/bookShopType.vue
View File

@@ -9,7 +9,7 @@
<view class="sl_tit"> <view class="sl_tit">
<text class="bok_name"> <text class="bok_name">
{{item.productName}} {{item.productName}}
<span v-if="item.productStock==0" style="color: #aaa;font-size:26rpx;">（无货）</span> <span v-if="item.productStock==0" style="color: #aaa;font-size:26rpx;">（无库存）</span>
</text> </text>
</view> </view>
<view class="sl_ric"> <view class="sl_ric">

2
pages/bookShop/commodityDetail copy.vue
View File

@@ -20,7 +20,7 @@
</view> </view>
<view class="commodityyName"> <view class="commodityyName">
{{productInfo.productName}} {{productInfo.productName}}
<span v-if="productInfo.productStock==0" style="color: #aaa;font-size:26rpx;">（无货）</span> <span v-if="productInfo.productStock==0" style="color: #aaa;font-size:26rpx;">（无库存）</span>
<view><text class="SoldNumber">已售<span>{{productInfo.sumSales}}</span>件</text></view> <view><text class="SoldNumber">已售<span>{{productInfo.sumSales}}</span>件</text></view>
</view> </view>
<view class="contentButton"> <view class="contentButton">

2
pages/bookShop/commodityDetail.vue
View File

@@ -127,7 +127,7 @@
<span <span
v-if="productInfo.productStock == 0" v-if="productInfo.productStock == 0"
style="color: #aaa; font-size: 28rpx" style="color: #aaa; font-size: 28rpx"
>（无货）</span >（无库存）</span
> >
<view <view
style=" style="

4
pages/bookShop/deliverDetail.vue
View File

@@ -104,9 +104,9 @@
if (this.orderContet.orderStatus == 0) { if (this.orderContet.orderStatus == 0) {
this.titleStat = '待支付' this.titleStat = '待支付'
} else if (this.orderContet.orderStatus == 1) { } else if (this.orderContet.orderStatus == 1) {
this.titleStat = '待发货' this.titleStat = '待发出'
} else if (this.orderContet.orderStatus == 2) { } else if (this.orderContet.orderStatus == 2) {
this.titleStat = '待收货' this.titleStat = '待收到'
} else if (this.orderContet.orderStatus == 3) { } else if (this.orderContet.orderStatus == 3) {
this.titleStat = '已完成' this.titleStat = '已完成'
} }

20
pages/bookShop/orderLCont.vue
View File

@@ -27,8 +27,8 @@
<view class="orderItem"> <view class="orderItem">
<view class="" style="position: relative; height: 120rpx;"> <view class="" style="position: relative; height: 120rpx;">
<text class="orderState orderState0" v-if="orderContet.orderStatus==0">待支付</text> <text class="orderState orderState0" v-if="orderContet.orderStatus==0">待支付</text>
<text class="orderState orderState1" v-if="orderContet.orderStatus==1">待发货</text> <text class="orderState orderState1" v-if="orderContet.orderStatus==1">待发出</text>
<text class="orderState orderState2" v-if="orderContet.orderStatus==2">待收货</text> <text class="orderState orderState2" v-if="orderContet.orderStatus==2">待收到</text>
<text class="orderState orderState3" v-if="orderContet.orderStatus==3">已完成</text> <text class="orderState orderState3" v-if="orderContet.orderStatus==3">已完成</text>
<text class="orderState orderState5" v-if="orderContet.orderStatus==5">已超时</text> <text class="orderState orderState5" v-if="orderContet.orderStatus==5">已超时</text>
</view> </view>
@@ -128,7 +128,7 @@
<text style="font-size: 24rpx;color: #666;">{{orderContet.paymentDate}}</text> <text style="font-size: 24rpx;color: #666;">{{orderContet.paymentDate}}</text>
</view> </view>
<!-- <view class="orderReal" v-if="orderContet.orderStatus >= 2 && orderContet.orderStatus != 5"> <!-- <view class="orderReal" v-if="orderContet.orderStatus >= 2 && orderContet.orderStatus != 5">
<span style="color: #666;margin-right: 10rpx;float: left;">发货时间 : </span> <span style="color: #666;margin-right: 10rpx;float: left;">发出时间 : </span>
<text style="font-size: 24rpx;color: #666;">{{orderContet.shippingTime}}</text> <text style="font-size: 24rpx;color: #666;">{{orderContet.shippingTime}}</text>
</view> --> </view> -->
<view class="orderOper"> <view class="orderOper">
@@ -138,7 +138,7 @@
</u-button> --> </u-button> -->
<view v-if="orderContet.orderStatus==2 && sheetList.length > 0 && orderContet.orderStatus != 5" class="opFix" @click="seeExpressDetail(orderContet)">查看物流</view> <view v-if="orderContet.orderStatus==2 && sheetList.length > 0 && orderContet.orderStatus != 5" class="opFix" @click="seeExpressDetail(orderContet)">查看物流</view>
<view v-if="orderContet.orderStatus==2" class="opCan" @click="OverOrder" >确认收货</view> <view v-if="orderContet.orderStatus==2" class="opCan" @click="OverOrder" >确认收到</view>
<view v-if="orderContet.orderStatus==0" class="opFix" @click="canceOrder">取消订单</view> <view v-if="orderContet.orderStatus==0" class="opFix" @click="canceOrder">取消订单</view>
<view v-if="orderContet.orderStatus==0" class="opCan" @click="goPay(orderContet)">去支付</view> <view v-if="orderContet.orderStatus==0" class="opCan" @click="goPay(orderContet)">去支付</view>
@@ -208,7 +208,7 @@
<h4 style="margin-bottom: 10rpx;">包裹 {{index+1}}</h4> <h4 style="margin-bottom: 10rpx;">包裹 {{index+1}}</h4>
<view class="">运单号：{{item.expressOrderSn}} <view class="">运单号：{{item.expressOrderSn}}
<u-tag @click="copyData(item.expressOrderSn)" size="mini" class="copyCode" text="复制单号" plain type="success" /></view> <u-tag @click="copyData(item.expressOrderSn)" size="mini" class="copyCode" text="复制单号" plain type="success" /></view>
<view class="">发货时间：{{item.createTime}}</view> <view class="">发出时间：{{item.createTime}}</view>
</view> </view>
</view> </view>
@@ -565,10 +565,10 @@
url: "./deliverDetail?objId=" + item url: "./deliverDetail?objId=" + item
}) })
}, },
OverOrder() { // 确认收货 OverOrder() { // 确认收到
uni.showModal({ uni.showModal({
title: '提示', title: '提示',
content: '确认收货？', content: '确认收到？',
success: res => { success: res => {
let data = { let data = {
orderId: this.orderID, orderId: this.orderID,
@@ -587,7 +587,7 @@
if (res.code == 0) { if (res.code == 0) {
uni.hideLoading() uni.hideLoading()
uni.showToast({ uni.showToast({
title: '收货成功', title: '确认收到成功',
icon: 'success', icon: 'success',
duration: 1000 duration: 1000
}) })
@@ -624,9 +624,9 @@
if (this.orderContet.orderStatus == 0) { if (this.orderContet.orderStatus == 0) {
this.titleStat = '待支付' this.titleStat = '待支付'
} else if (this.orderContet.orderStatus == 1) { } else if (this.orderContet.orderStatus == 1) {
this.titleStat = '待发货' this.titleStat = '待发出'
} else if (this.orderContet.orderStatus == 2) { } else if (this.orderContet.orderStatus == 2) {
this.titleStat = '待收货' this.titleStat = '待收到'
} else if (this.orderContet.orderStatus == 3) { } else if (this.orderContet.orderStatus == 3) {
this.titleStat = '已完成' this.titleStat = '已完成'
} }

8
pages/bookShop/orderList copy.vue
View File

@@ -13,8 +13,8 @@
<view class="orderList" v-if="orderList.length > 0"> <view class="orderList" v-if="orderList.length > 0">
<view class="orderItem" v-for="(ifex,inten) in orderList" @click="goOrdiCont(ifex)" :key="inten"> <view class="orderItem" v-for="(ifex,inten) in orderList" @click="goOrdiCont(ifex)" :key="inten">
<text class="orderState orderState0" v-if="ifex.orderStatus==0">待支付</text> <text class="orderState orderState0" v-if="ifex.orderStatus==0">待支付</text>
<text class="orderState orderState1" v-if="ifex.orderStatus==1">待发货</text> <text class="orderState orderState1" v-if="ifex.orderStatus==1">待发出</text>
<text class="orderState orderState2" v-if="ifex.orderStatus==2">待收货</text> <text class="orderState orderState2" v-if="ifex.orderStatus==2">待收到</text>
<text class="orderState orderState3" v-if="ifex.orderStatus==3">已完成</text> <text class="orderState orderState3" v-if="ifex.orderStatus==3">已完成</text>
<text class="orderState orderState5" v-if="ifex.orderStatus==5">已超时</text> <text class="orderState orderState5" v-if="ifex.orderStatus==5">已超时</text>
<view class="guoqi flexbox" v-if="ifex.orderStatus==0 && ifex.overTime > 0"> <view class="guoqi flexbox" v-if="ifex.orderStatus==0 && ifex.overTime > 0">
@@ -122,10 +122,10 @@
name: '待支付', name: '待支付',
value: 0 value: 0
}, { }, {
name: '待发货', name: '待发出',
value: 1 value: 1
}, { }, {
name: '待收货', name: '待收到',
value: 2 value: 2
}, { }, {
name: '已完成', name: '已完成',

20
pages/bookShop/orderList.vue
View File

@@ -26,8 +26,8 @@
<view class="mainContent"> <view class="mainContent">
<view class="item" @click.stop="toDetail(item)"> <view class="item" @click.stop="toDetail(item)">
<view class="orderstatus" v-show="item.orderStatus == 0">未付款</view> <view class="orderstatus" v-show="item.orderStatus == 0">未付款</view>
<view class="orderstatus" v-show="item.orderStatus == 1">待发货</view> <view class="orderstatus" v-show="item.orderStatus == 1">待发出</view>
<view class="orderstatus" v-show="item.orderStatus == 2">已发货</view> <view class="orderstatus" v-show="item.orderStatus == 2">待收到</view>
<view class="orderstatus" v-show="item.orderStatus == 3">交易成功</view> <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 == 4">交易失败</view>
<view class="orderstatus" v-show="item.orderStatus == 5">过期</view> <view class="orderstatus" v-show="item.orderStatus == 5">过期</view>
@@ -90,9 +90,9 @@
<span class="right flexbox opbtns"> <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="canceOrder(item)">取消订单</view>
<view class="orderstatusbtn" v-if="item.orderStatus == 0" @click.stop="goPay(item)">付款</view> <view class="orderstatusbtn" v-if="item.orderStatus == 0" @click.stop="goPay(item)">付款</view>
<!-- <view class="orderstatusbtn alertDeliver" 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="seeExpressDetail(item)">查看物流</view>
<view class="orderstatusbtn" v-if="item.orderStatus == 2" @click.stop="OverOrder(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">申请售后</view> -->
<!-- --> <!-- -->
<!-- <view class="orderstatusbtn" v-if=" userRecordid == null && item.come == 0" @click.stop="pingji(item.id)">评价</view> --> <!-- <view class="orderstatusbtn" v-if=" userRecordid == null && item.come == 0" @click.stop="pingji(item.id)">评价</view> -->
@@ -206,10 +206,10 @@ import { data } from 'jquery';
name: '待付款', name: '待付款',
value: 0 value: 0
}, { }, {
name: '待发货', name: '待发出',
value: 1 value: 1
}, { }, {
name: '待收货', name: '待收到',
value: 2 value: 2
}, { }, {
name: '已完成', name: '已完成',
@@ -317,7 +317,7 @@ import { data } from 'jquery';
var params = { var params = {
"userId": this.userInfo.id, "userId": this.userInfo.id,
"orderStatus":flag,//传null为全部，订单状态 0-未付款 1-待发货 2-已发货 3-交易成功 4-交易失败 5-过期 "orderStatus":flag,//传null为全部，订单状态 0-未付款 1-待发出 2-待收到 3-交易成功 4-交易失败 5-过期
"limit": 10, "limit": 10,
"page": this.newestpage "page": this.newestpage
} }
@@ -511,11 +511,11 @@ import { data } from 'jquery';
}) })
// } // }
}, },
// 确认收货 // 确认收到
OverOrder(item) { OverOrder(item) {
uni.showModal({ uni.showModal({
title: '提示', title: '提示',
content: '确认收货？', content: '确认收到？',
success: res => { success: res => {
let data = { let data = {
orderId: item.orderId, orderId: item.orderId,
@@ -534,7 +534,7 @@ import { data } from 'jquery';
if (res.code == 0) { if (res.code == 0) {
uni.hideLoading() uni.hideLoading()
uni.showToast({ uni.showToast({
title: '收货成功', title: '确认收到成功',
icon: 'success', icon: 'success',
duration: 1000 duration: 1000
}) })

4
pages/bookShop/orderList1.vue
View File

@@ -189,10 +189,10 @@ import { data } from 'jquery';
name: '待付款', name: '待付款',
value: 2 value: 2
}, { }, {
name: '待发货', name: '待发出',
value: 3 value: 3
}, { }, {
name: '待收货', name: '待收到',
value: 4 value: 4
}, { }, {
name: '已完成', name: '已完成',

16
pages/bookShop/settlement.vue
View File

@@ -13,7 +13,7 @@
size="20" size="20"
style="display: inline-block; margin-right: 10rpx" style="display: inline-block; margin-right: 10rpx"
></u-icon> ></u-icon>
请添加收货地址 请添加收件地址
</view> </view>
<view <view
@@ -171,7 +171,7 @@
size="12" size="12"
style="display: inline-block; margin-right: 10rpx" style="display: inline-block; margin-right: 10rpx"
></u-icon> ></u-icon>
注：如订单包含一种或多种预售书，预售书和现货书需分开发货（即需要收取多次快递首重费用）；如多本书会按照实际重量，收取快递续重费用。 注：如订单包含一种或多种预售书，预售书和现售书需分开发出（即需要收取多次快递首重费用）；如多本书会按照实际重量，收取快递续重费用。
</view> </view>
<view class="yq_yunfei" v-if="districtAmount > 0" style="color: #202020"> <view class="yq_yunfei" v-if="districtAmount > 0" style="color: #202020">
@@ -245,7 +245,7 @@
<span style="color: #666; margin-right: 10rpx; font-size: 15px" <span style="color: #666; margin-right: 10rpx; font-size: 15px"
>实付款: >实付款:
</span> </span>
{{ realPrice }}<span>天医币</span> {{ realPrice.toFixed(2) }}<span>天医币</span>
</view> </view>
<view class="operate" @click="goBuyJie" v-if="payType != 4"> <view class="operate" @click="goBuyJie" v-if="payType != 4">
<view class="goBuy"> 立即支付 </view> <view class="goBuy"> 立即支付 </view>
@@ -809,8 +809,9 @@ export default {
// } // }
// } // }
price = (item.productAmount * item.price).toFixed(2); price = (item.productAmount * item.price);
allprice += Number(price); allprice += Number(price);
allprice = parseFloat(allprice.toFixed(2));
}); });
this.totalPrice = allprice; this.totalPrice = allprice;
// if (this.youhuiContent.id != undefined) { // if (this.youhuiContent.id != undefined) {
@@ -925,8 +926,8 @@ export default {
let data = { let data = {
buyType: this.typeId, //0- 商品页直接下单 1- 购物车结算 buyType: this.typeId, //0- 商品页直接下单 1- 购物车结算
userId: this.userInfo.id, //下单人ID userId: this.userInfo.id, //下单人ID
shippingUser: this.adressMoRen.consigneeName, //收货人姓名 shippingUser: this.adressMoRen.consigneeName, //收件人姓名
userPhone: this.adressMoRen.consigneePhone, //收货人手机号 userPhone: this.adressMoRen.consigneePhone, //收件人手机号
// province: this.adressMoRen.areaidpathtext.split(' ')[0], //省 // province: this.adressMoRen.areaidpathtext.split(' ')[0], //省
// city: this.adressMoRen.areaidpathtext.split(' ')[1], //市 // city: this.adressMoRen.areaidpathtext.split(' ')[1], //市
@@ -937,7 +938,7 @@ export default {
orderMoney: this.totalPrice, //订单金额 orderMoney: this.totalPrice, //订单金额
vipDiscountAmount: this.vipPrice, //折扣金额 vipDiscountAmount: this.vipPrice, //折扣金额
districtMoney: this.districtAmount, //折扣金额 districtMoney: this.districtAmount, //折扣金额
realMoney: this.realPrice, //实收金额 realMoney: this.realPrice.toFixed(2), //实收金额
shippingMoney: this.farePrice, //运费 shippingMoney: this.farePrice, //运费
couponId: youPre.id, //优惠券Id couponId: youPre.id, //优惠券Id
isSend: this.isSend, isSend: this.isSend,
@@ -1262,6 +1263,7 @@ export default {
align-items: center; align-items: center;
position: fixed; position: fixed;
bottom: 0%; bottom: 0%;
z-index: 11;
.commodityPrice { .commodityPrice {
font-size: 40rpx; font-size: 40rpx;

6
pages/bookShop/settlementBook.vue
View File

@@ -5,7 +5,7 @@
<z-nav-bar title="商品结算"></z-nav-bar> <z-nav-bar title="商品结算"></z-nav-bar>
<view v-if="adressMoRen.username==undefined" class="addShouhuo" @click="toAddress()"> <view v-if="adressMoRen.username==undefined" class="addShouhuo" @click="toAddress()">
<u-icon name="plus" size="20" style="display: inline-block;margin-right: 10rpx;"></u-icon> <u-icon name="plus" size="20" style="display: inline-block;margin-right: 10rpx;"></u-icon>
请添加收货地址 请添加收件地址
</view> </view>
<view class="adDefault" @click="dizhiShow = true" v-if="adressMoRen.username!=undefined"> <view class="adDefault" @click="dizhiShow = true" v-if="adressMoRen.username!=undefined">
<view class="defalTop"> <view class="defalTop">
@@ -606,8 +606,8 @@
let data = { let data = {
buyType: this.typeId, //0- 商品页直接下单 1- 购物车结算 buyType: this.typeId, //0- 商品页直接下单 1- 购物车结算
userId: this.userInfo.id, //下单人ID userId: this.userInfo.id, //下单人ID
shippingUser: this.adressMoRen.username, //收货人姓名 shippingUser: this.adressMoRen.username, //收件人姓名
userPhone: this.adressMoRen.userphone, //收货人手机号 userPhone: this.adressMoRen.userphone, //收件人手机号
province: this.adressMoRen.areaidpathtext.split(' ')[0], //省 province: this.adressMoRen.areaidpathtext.split(' ')[0], //省
city: this.adressMoRen.areaidpathtext.split(' ')[1], //市 city: this.adressMoRen.areaidpathtext.split(' ')[1], //市
district: this.adressMoRen.areaidpathtext.split(' ')[2], //区 district: this.adressMoRen.areaidpathtext.split(' ')[2], //区

20
pages/detail/orderLCont.vue
View File

@@ -59,10 +59,10 @@
v-if="orderContet.orderStatus == 0">待支付</text> v-if="orderContet.orderStatus == 0">待支付</text>
<text <text
class="orderState orderState1" class="orderState orderState1"
v-if="orderContet.orderStatus == 1">待发货</text> v-if="orderContet.orderStatus == 1">待发出</text>
<text <text
class="orderState orderState2" class="orderState orderState2"
v-if="orderContet.orderStatus == 2">待收货</text> v-if="orderContet.orderStatus == 2">待收到</text>
<text <text
class="orderState orderState3" class="orderState orderState3"
v-if="orderContet.orderStatus == 3">已完成</text> v-if="orderContet.orderStatus == 3">已完成</text>
@@ -325,7 +325,7 @@
plain plain
type="success" type="success"
/></view> /></view>
<view class="">发货时间：{{ item.createTime }}</view> <view class="">发出时间：{{ item.createTime }}</view>
</view> </view>
</view> </view>
</view> </view>
@@ -421,7 +421,7 @@ export default {
this.goPay(this.orderContet); this.goPay(this.orderContet);
} else if (data.text == "取消订单") { } else if (data.text == "取消订单") {
this.canceOrder(); this.canceOrder();
} else if (data.text == "确认收货") { } else if (data.text == "确认收到") {
this.OverOrder(); this.OverOrder();
} else if (data.text == "查看物流") { } else if (data.text == "查看物流") {
this.seeExpressDetail(this.orderContet); this.seeExpressDetail(this.orderContet);
@@ -531,10 +531,10 @@ export default {
}); });
}, },
OverOrder() { OverOrder() {
// 确认收货 // 确认收到
uni.showModal({ uni.showModal({
title: "提示", title: "提示",
content: "确认收货？", content: "确认收到？",
success: (res) => { success: (res) => {
let data = { let data = {
orderId: this.orderID, orderId: this.orderID,
@@ -554,7 +554,7 @@ export default {
if (res.code == 0) { if (res.code == 0) {
uni.hideLoading(); uni.hideLoading();
uni.showToast({ uni.showToast({
title: "收货成功", title: "确认收到成功",
icon: "success", icon: "success",
duration: 1000, duration: 1000,
}); });
@@ -604,7 +604,7 @@ export default {
if (this.orderContet.orderStatus == 2) { if (this.orderContet.orderStatus == 2) {
this.customButton.push({ this.customButton.push({
width: "160rpx", width: "160rpx",
text: "确认收货", text: "确认收到",
color: "#fff", color: "#fff",
}); });
@@ -626,9 +626,9 @@ export default {
if (this.orderContet.orderStatus == 0) { if (this.orderContet.orderStatus == 0) {
this.titleStat = "待支付"; this.titleStat = "待支付";
} else if (this.orderContet.orderStatus == 1) { } else if (this.orderContet.orderStatus == 1) {
this.titleStat = "待发货"; this.titleStat = "待发出";
} else if (this.orderContet.orderStatus == 2) { } else if (this.orderContet.orderStatus == 2) {
this.titleStat = "待收货"; this.titleStat = "待收到";
} else if (this.orderContet.orderStatus == 3) { } else if (this.orderContet.orderStatus == 3) {
this.titleStat = "已完成"; this.titleStat = "已完成";
} }

4
pages/peanut/chargeDetaill.vue
View File

@@ -227,9 +227,9 @@
if (this.orderDetail.orderStatus == 0) { if (this.orderDetail.orderStatus == 0) {
this.titleStat = '待支付' this.titleStat = '待支付'
} else if (this.orderDetail.orderStatus == 1) { } else if (this.orderDetail.orderStatus == 1) {
this.titleStat = '待发货' this.titleStat = '待发出'
} else if (this.orderDetail.orderStatus == 2) { } else if (this.orderDetail.orderStatus == 2) {
this.titleStat = '待收货' this.titleStat = '待收到'
} else if (this.orderDetail.orderStatus == 3) { } else if (this.orderDetail.orderStatus == 3) {
this.titleStat = '已完成' this.titleStat = '已完成'
} }

25
pages/peanut/home.vue
View File

@@ -120,13 +120,13 @@
<scroll-view class="ProTabsBox"> <scroll-view class="ProTabsBox">
<view class="New_ProTabs flexbox"> <view class="New_ProTabs flexbox">
<text v-for="(item, index) in catTagList" :key="item.splId" :class="[tabsid == item.id ? 'cur' : '']" <text v-for="(item, index) in catTagList" :key="item.splId" :class="[catTagIndex == index ? 'cur' : '']"
@click="tabsChange(item, index)">{{ item.title }}</text> @click="tabsChange(item, index)">{{ item.title }}</text>
</view> </view>
</scroll-view> </scroll-view>
<view class="children_cate_box" v-if="childrenCatList && childrenCatList.length > 0"> <view class="children_cate_box" v-if="childrenCatList && childrenCatList.length > 0">
<view class="children_cate flexbox"> <view class="children_cate flexbox">
<view @click="childrenChange(item, index)" :class="['item', curChildrenId == item.id ? 'cur' : '']" <view @click="childrenChange(item, index)" :class="['item', curChildrenIndex == index ? 'cur' : '']"
v-for="(item, index) in childrenCatList" :key="item.id"> v-for="(item, index) in childrenCatList" :key="item.id">
<text>{{ item.title }}</text> <text>{{ item.title }}</text>
</view> </view>
@@ -347,6 +347,8 @@
yxCurIndex: 0, // 当前营销标签序号 yxCurIndex: 0, // 当前营销标签序号
SystemInfoSync: {}, // 屏幕尺寸 SystemInfoSync: {}, // 屏幕尺寸
newsList: [], // 播报新闻列表 newsList: [], // 播报新闻列表
catTagIndex: 0,
curChildrenIndex: 0
}; };
}, },
onPageScroll(e) { onPageScroll(e) {
@@ -471,7 +473,7 @@
}, },
requestAll() { requestAll() {
this.getUserInfo(); this.getUserInfo();
this.tjProList = []; // this.tjProList = [];
uni.hideTabBar(); uni.hideTabBar();
// this.getData(); // this.getData();
this.getTags(); this.getTags();
@@ -529,7 +531,8 @@
// console.log(res, '营销标签列表') // console.log(res, '营销标签列表')
if (res.result.length > 0) { if (res.result.length > 0) {
this.yingxiaoTags = res.result; this.yingxiaoTags = res.result;
this.getYXproducts(); const item = this.yingxiaoTags.length > 0 && this.yingxiaoTags[this.yxCurIndex]
this.getYXproducts(item);
} }
// console.log(res) // console.log(res)
@@ -583,9 +586,11 @@
if (this.catTagList[0].isLast == 1) { if (this.catTagList[0].isLast == 1) {
this.getJtData(this.catTagList[0].id); this.getJtData(this.catTagList[0].id);
} else { } else {
this.childrenCatList = this.catTagList[0].children; const currentCatTag = this.catTagList?.[this.catTagIndex];
this.curChildrenId = this.childrenCatList[0].id; this.childrenCatList = currentCatTag.children.length > 0 ? currentCatTag.children : currentCatTag;
this.getJtData(this.childrenCatList[0].id); this.curChildrenId = this.childrenCatList[this.curChildrenIndex]?.id || this.childrenCatList.id;
//this.getJtData(this.childrenCatList[this.curChildrenIndex]?.id);
this.getJtData(this.curChildrenId);
} }
} }
}) })
@@ -596,11 +601,13 @@
// 二级分类点击 // 二级分类点击
childrenChange(item, index) { childrenChange(item, index) {
// console.log(item,this.curChildrenId,'点击') // console.log(item,this.curChildrenId,'点击')
this.curChildrenIndex = index;
this.curChildrenId = this.childrenCatList[index].id; this.curChildrenId = this.childrenCatList[index].id;
this.getJtData(this.childrenCatList[index].id); this.getJtData(this.childrenCatList[index].id);
}, },
tabsChange(item, cindex) { tabsChange(item, cindex) {
// this.tjProList = [] // this.tjProList = []
this.catTagIndex = cindex;
this.tabsid = item.id; this.tabsid = item.id;
this.childrenCatList = []; this.childrenCatList = [];
if (this.catTagList[cindex].isLast == 1) { if (this.catTagList[cindex].isLast == 1) {
@@ -609,6 +616,7 @@
this.childrenCatList = this.catTagList[cindex].children; this.childrenCatList = this.catTagList[cindex].children;
this.curChildrenId = this.childrenCatList[0].id; this.curChildrenId = this.childrenCatList[0].id;
this.getJtData(this.childrenCatList[0].id); this.getJtData(this.childrenCatList[0].id);
this.curChildrenIndex = 0
} }
// this.getJtData() // this.getJtData()
// if (this.tabsid == 15) { // if (this.tabsid == 15) {
@@ -1213,7 +1221,7 @@
color: #0e583a; color: #0e583a;
font-size: 34rpx; font-size: 34rpx;
line-height: 42rpx; line-height: 42rpx;
padding: 5px 10px; padding: 10rpx 0 14rpx 10rpx;
font-weight: bold; font-weight: bold;
display: block; display: block;
width: 100%; width: 100%;
@@ -1222,6 +1230,7 @@
overflow: hidden; overflow: hidden;
text-align: center; text-align: center;
letter-spacing: 10rpx; letter-spacing: 10rpx;
width: 3.5em;
} }
text:last-child { text:last-child {

2
pages/peanut/opeVip.vue
View File

@@ -279,7 +279,7 @@
let data = { let data = {
userId: that.userInfo.id, //下单人ID userId: that.userInfo.id, //下单人ID
userPhone: that.userInfo.tel, //收货人手机号 userPhone: that.userInfo.tel, //收件人手机号
paymentMethod: that.payType, //1支付宝，2微信，3ios内购 paymentMethod: that.payType, //1支付宝，2微信，3ios内购
orderMoney: that.stepsVc.money * 1, //订单金额 orderMoney: that.stepsVc.money * 1, //订单金额
districtMoney: 0, //优惠金额 districtMoney: 0, //优惠金额

2
pages/peanut/reCharge.vue
View File

@@ -566,7 +566,7 @@ export default {
let that = this; let that = this;
let data = { let data = {
userId: that.userInfo.id, //下单人ID userId: that.userInfo.id, //下单人ID
userPhone: that.userInfo.tel, //收货人手机号 userPhone: that.userInfo.tel, //收件人手机号
paymentMethod: that.payType, //2支付宝，1微信，3ios内购 paymentMethod: that.payType, //2支付宝，1微信，3ios内购
orderMoney: that.stepsCj.money * 1, //订单金额 orderMoney: that.stepsCj.money * 1, //订单金额
districtMoney: 0, //优惠金额 districtMoney: 0, //优惠金额

2
pages/peanut/reCharge1.vue
View File

@@ -350,7 +350,7 @@
let that = this let that = this
let data = { let data = {
userId: that.userInfo.id, //下单人ID userId: that.userInfo.id, //下单人ID
userPhone: that.userInfo.tel, //收货人手机号 userPhone: that.userInfo.tel, //收件人手机号
paymentMethod: that.payType, //2支付宝，1微信，3ios内购 paymentMethod: that.payType, //2支付宝，1微信，3ios内购
orderMoney: that.stepsCj.money * 1, //订单金额 orderMoney: that.stepsCj.money * 1, //订单金额
districtMoney: 0, //优惠金额 districtMoney: 0, //优惠金额

2
pages/user/address.vue
View File

@@ -33,7 +33,7 @@
</view> </view>
<view class="addressFooter"> <view class="addressFooter">
<view class="addAddress" @click="toAddress(0,0)"> <view class="addAddress" @click="toAddress(0,0)">
+ 添加收货地址 + 添加收件地址
</view> </view>
</view> </view>
<music-play :playData="playData"></music-play> <music-play :playData="playData"></music-play>

2
pages/user/visitor.vue
View File

@@ -176,7 +176,7 @@
</view> </view>
<view class="commodityyName"> <view class="commodityyName">
{{productInfo.productName}} {{productInfo.productName}}
<span v-if="productInfo.productStock==0" style="color: #aaa;font-size:26rpx;">（无货）</span> <span v-if="productInfo.productStock==0" style="color: #aaa;font-size:26rpx;">（无库存）</span>
<view><text class="SoldNumber">已售<span <view><text class="SoldNumber">已售<span
style="padding-left:10rpx;">{{productInfo.sumSales}}</span>件</text></view> style="padding-left:10rpx;">{{productInfo.sumSales}}</span>件</text></view>
</view> </view>

2
static/json/yinsiP.json
View File

File diff suppressed because one or more lines are too long

2
static/json/yinsiP.vue
View File

File diff suppressed because one or more lines are too long

BIN
unpackage/debug/iOS_debug.ipa
View File

Binary file not shown.

2
unpackage/resources/__UNI__9788EB5/www/static/json/yinsiP.json
View File

File diff suppressed because one or more lines are too long

2
unpackage/resources/__UNI__9788EB5/www/static/json/yinsiP.vue
View File

File diff suppressed because one or more lines are too long