zm/medicine_app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: 1.修改“货”字；2.优化视频播放；3.优化小班心得和思考题状态显示

Browse Source 
更新多个文件中的"收货地址"相关文案为"收件地址"，包括页面标题、按钮文字、状态提示等
更新隐私政策文件中"健康超市收货"为"健康超市收件"
更新订单状态相关文案："待发货"改为"待发出"，"待收货"改为"待收到"，"确认收货"改为"确认收到"
更新商品库存状态提示："无货"改为"无库存"
更新manifest.json版本号为2.0.42
更新edu-core依赖版本为v1.0.8
新增yingbing-video视频播放器组件
This commit is contained in:
chenghuan
2026-03-03 15:17:40 +08:00
parent 455ce146a3
commit 735badd45d
52 changed files with 11654 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -19,7 +19,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

@@ -24,7 +24,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>

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 = '已完成'
}

22
pages/bookShop/orderLCont.vue
View File

@@ -73,12 +73,12 @@
<text
class="orderState orderState1"
v-if="orderContet.orderStatus == 1"
>待发货</text
>待发出</text
>
<text
class="orderState orderState2"
v-if="orderContet.orderStatus == 2"
>待收货</text
>待收到</text
>
<text
class="orderState orderState3"
@@ -437,7 +437,7 @@
</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>
@@ -599,7 +599,7 @@
plain
type="success"
/></view>
<view class="">发货时间：{{ item.createTime }}</view>
<view class="">发出时间：{{ item.createTime }}</view>
</view>
</view>
</view>
@@ -771,7 +771,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);
@@ -1068,10 +1068,10 @@ export default {
});
},
OverOrder() {
// 确认收货
// 确认收到
uni.showModal({
title: "提示",
content: "确认收货？",
content: "确认收到？",
success: (res) => {
let data = {
orderId: this.orderID,
@@ -1093,7 +1093,7 @@ export default {
if (res.code == 0) {
uni.hideLoading();
uni.showToast({
title: "收货成功",
title: "确认收到成功",
icon: "success",
duration: 1000,
});
@@ -1174,7 +1174,7 @@ export default {
if (this.orderContet.orderStatus == 2) {
this.customButton.push({
width: "160rpx",
text: "确认收货",
text: "确认收到",
color: "#fff",
});
@@ -1209,9 +1209,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 = "已完成";
}

24
pages/bookShop/orderList.vue
View File

@@ -89,12 +89,12 @@
<text
class="orderstatus"
v-show="slotProps.row.orderStatus == 1"
>待发货</text
>待发出</text
>
<text
class="orderstatus"
v-show="slotProps.row.orderStatus == 2"
>已发货</text
>已发出</text
>
<text
class="orderstatus"
@@ -423,7 +423,7 @@
<view
class="orderstatusbtn"
v-if="slotProps.row.orderStatus == 1"
>催发货</view
>催发出</view
>
<view
class="orderstatusbtn"
@@ -435,7 +435,7 @@
class="orderstatusbtn"
v-if="slotProps.row.orderStatus == 2"
@click.native.stop="OverOrder(slotProps.row)"
>确认收货</view
>确认收到</view
>
<view
class="orderstatusbtn"
@@ -657,12 +657,12 @@ export default {
badge: {},
},
{
name: "待发货",
name: "待发出",
value: 1,
badge: {},
},
{
name: "待收货",
name: "待收到",
value: 2,
badge: {},
},
@@ -838,8 +838,8 @@ export default {
.then((res) => {
// 订单状态
// * 0: 待付款
// * 1: 待发货
// * 2: 已发货
// * 1: 待发出
// * 2: 待收到
// * 3：已完成
// * 4: 交易失败
// * 5: 已过期
@@ -872,7 +872,7 @@ export default {
var params = {
userId: this.userInfo.id,
come: this.come,
orderStatus: flag == -1 ? "" : flag, //传null为全部，订单状态 0-未付款 1-待发货 2-已发货 3-交易成功 4-交易失败 5-过期
orderStatus: flag == -1 ? "" : flag, //传null为全部，订单状态 0-未付款 1-待发出 2-待收到 3-交易成功 4-交易失败 5-过期
...this.pagination,
// limit: 10,
// page: this.newestpage,
@@ -1062,11 +1062,11 @@ export default {
});
// }
},
// 确认收货
// 确认收到
OverOrder(item) {
uni.showModal({
title: "提示",
content: "确认收货？",
content: "确认收到？",
success: (res) => {
let data = {
orderId: item.orderId,
@@ -1088,7 +1088,7 @@ export default {
if (res.code == 0) {
uni.hideLoading();
uni.showToast({
title: "收货成功",
title: "确认收到成功",
icon: "success",
duration: 1000,
});

8
pages/bookShop/settlement.vue
View File

@@ -5,7 +5,7 @@
<z-nav-bar title="商品结算"></z-nav-bar>
<view v-if="adressMoRen.consigneeName==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.consigneeName!=undefined">
<view class="defalTop">
@@ -68,7 +68,7 @@
</view>
<view class="yq_beizhu">
<u-icon name="info-circle" color="#ffb529" size="12" style="display: inline-block;margin-right: 10rpx;"></u-icon>
注：如订单包含一种或多种预售书，预售书和现货书需分开发货（即需要收取多次快递首重费用）；如多本书会按照实际重量，收取快递续重费用。
注：如订单包含一种或多种预售书，预售书和现售书需分开发出（即需要收取多次快递首重费用）；如多本书会按照实际重量，收取快递续重费用。
</view>
</view>
<!-- 安卓支付列表 -->
@@ -616,8 +616,8 @@
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], //区