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

docs: 统一收货相关术语为收件并更新版本号

Browse Source 
将“收货地址”、“收货人”、“待发货”、“待收货”等术语统一修改为“收件地址”、“收件人”、“待发出”、“待收到”等更准确的表述
更新manifest.json中的版本号为1.2.84
This commit is contained in:
chenghuan
2026-03-05 09:35:28 +08:00
parent 6f21c57137
commit e8b98a62cb
23 changed files with 62 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pages/agreement/yszcPage.vue
View File

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

2
pages/bookShop/bookShopType.vue
View File

@@ -9,7 +9,7 @@
<view class="sl_tit">
<text class="bok_name">
{{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>
</view>
<view class="sl_ric">

2
pages/bookShop/commodityDetail copy.vue
View File

@@ -20,7 +20,7 @@
</view>
<view class="commodityyName">
{{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>
<view class="contentButton">

2
pages/bookShop/commodityDetail.vue
View File

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

4
pages/bookShop/deliverDetail.vue
View File

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

20
pages/bookShop/orderLCont.vue
View File

@@ -27,8 +27,8 @@
<view class="orderItem">
<view class="" style="position: relative; height: 120rpx;">
<text class="orderState orderState0" v-if="orderContet.orderStatus==0">待支付</text>
<text class="orderState orderState1" v-if="orderContet.orderStatus==1">待发货</text>
<text class="orderState orderState2" v-if="orderContet.orderStatus==2">待收货</text>
<text class="orderState orderState1" v-if="orderContet.orderStatus==1">待发出</text>
<text class="orderState orderState2" v-if="orderContet.orderStatus==2">待收到</text>
<text class="orderState orderState3" v-if="orderContet.orderStatus==3">已完成</text>
<text class="orderState orderState5" v-if="orderContet.orderStatus==5">已超时</text>
</view>
@@ -128,7 +128,7 @@
<text style="font-size: 24rpx;color: #666;">{{orderContet.paymentDate}}</text>
</view>
<!-- <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>
</view> -->
<view class="orderOper">
@@ -138,7 +138,7 @@
</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" 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="opCan" @click="goPay(orderContet)">去支付</view>
@@ -208,7 +208,7 @@
<h4 style="margin-bottom: 10rpx;">包裹 {{index+1}}</h4>
<view class="">运单号：{{item.expressOrderSn}}
<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>
@@ -565,10 +565,10 @@
url: "./deliverDetail?objId=" + item
})
},
OverOrder() { // 确认收货
OverOrder() { // 确认收到
uni.showModal({
title: '提示',
content: '确认收货？',
content: '确认收到？',
success: res => {
let data = {
orderId: this.orderID,
@@ -587,7 +587,7 @@
if (res.code == 0) {
uni.hideLoading()
uni.showToast({
title: '收货成功',
title: '确认收到成功',
icon: 'success',
duration: 1000
})
@@ -624,9 +624,9 @@
if (this.orderContet.orderStatus == 0) {
this.titleStat = '待支付'
} else if (this.orderContet.orderStatus == 1) {
this.titleStat = '待发货'
this.titleStat = '待发出'
} else if (this.orderContet.orderStatus == 2) {
this.titleStat = '待收货'
this.titleStat = '待收到'
} else if (this.orderContet.orderStatus == 3) {
this.titleStat = '已完成'
}

8
pages/bookShop/orderList copy.vue
View File

@@ -13,8 +13,8 @@
<view class="orderList" v-if="orderList.length > 0">
<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 orderState1" v-if="ifex.orderStatus==1">待发货</text>
<text class="orderState orderState2" v-if="ifex.orderStatus==2">待收货</text>
<text class="orderState orderState1" v-if="ifex.orderStatus==1">待发出</text>
<text class="orderState orderState2" v-if="ifex.orderStatus==2">待收到</text>
<text class="orderState orderState3" v-if="ifex.orderStatus==3">已完成</text>
<text class="orderState orderState5" v-if="ifex.orderStatus==5">已超时</text>
<view class="guoqi flexbox" v-if="ifex.orderStatus==0 && ifex.overTime > 0">
@@ -122,10 +122,10 @@
name: '待支付',
value: 0
}, {
name: '待发货',
name: '待发出',
value: 1
}, {
name: '待收货',
name: '待收到',
value: 2
}, {
name: '已完成',

20
pages/bookShop/orderList.vue
View File

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

4
pages/bookShop/orderList1.vue
View File

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

8
pages/bookShop/settlement.vue
View File

@@ -13,7 +13,7 @@
size="20"
style="display: inline-block; margin-right: 10rpx"
></u-icon>
请添加收货地址
请添加收件地址
</view>
<view
@@ -171,7 +171,7 @@
size="12"
style="display: inline-block; margin-right: 10rpx"
></u-icon>
注：如订单包含一种或多种预售书，预售书和现货书需分开发货（即需要收取多次快递首重费用）；如多本书会按照实际重量，收取快递续重费用。
注：如订单包含一种或多种预售书，预售书和现售书需分开发出（即需要收取多次快递首重费用）；如多本书会按照实际重量，收取快递续重费用。
</view>
<view class="yq_yunfei" v-if="districtAmount > 0" style="color: #202020">
@@ -926,8 +926,8 @@ export default {
let data = {
buyType: this.typeId, //0- 商品页直接下单 1- 购物车结算
userId: this.userInfo.id, //下单人ID
shippingUser: this.adressMoRen.consigneeName, //收货人姓名
userPhone: this.adressMoRen.consigneePhone, //收货人手机号
shippingUser: this.adressMoRen.consigneeName, //收件人姓名
userPhone: this.adressMoRen.consigneePhone, //收件人手机号
// province: this.adressMoRen.areaidpathtext.split(' ')[0], //省
// city: this.adressMoRen.areaidpathtext.split(' ')[1], //市

6
pages/bookShop/settlementBook.vue
View File

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

20
pages/detail/orderLCont.vue
View File

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

4
pages/peanut/chargeDetaill.vue
View File

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

2
pages/peanut/opeVip.vue
View File

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

2
pages/peanut/reCharge.vue
View File

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

2
pages/peanut/reCharge1.vue
View File

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

2
pages/user/address.vue
View File

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

2
pages/user/visitor.vue
View File

@@ -176,7 +176,7 @@
</view>
<view class="commodityyName">
{{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
style="padding-left:10rpx;">{{productInfo.sumSales}}</span>件</text></view>
</view>