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/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

@@ -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], //区

4
pages/component/commonComponents/address/edit.vue
View File

@@ -5,7 +5,7 @@
<z-nav-bar title="确认订单" bgColor="#258feb" fontColor="#fff"></z-nav-bar> -->
<view class="common_address_box" style="background-color: #fff">
<z-nav-bar :title="`${addressId ? '编辑' : '添加'}收货地址`" bgColor="#258feb" fontColor="#fff">
<z-nav-bar :title="`${addressId ? '编辑' : '添加'}收件地址`" bgColor="#258feb" fontColor="#fff">
<template slot="right">
<text @click="handleClickDelete" v-if="addressId" style="padding-right: 20rpx; color: red;font-size: 28rpx;">删除</text>
</template>
@@ -20,7 +20,7 @@
<view v-for="(item, index) in argee" :key="index" style="font-size: 32rpx;">
<radio class="agreeRadio" :value="item.id" :checked="item.id == radioValue"
color="#258feb" @click="radioCheck(index)"></radio>
默认收货地址
默认收件地址
</view>
</radio-group>
</view>

6
pages/component/commonComponents/address/index.vue
View File

@@ -12,7 +12,7 @@
>
<z-nav-bar
navFontAlign="left"
title="我的收货地址"
title="我的收件地址"
bgColor="#258feb"
fontColor="#fff"
>
@@ -128,7 +128,7 @@ import { mapState } from "vuex";
export default {
components: {
courseDescription, //课程说明
editAddress, //编辑收货地址
editAddress, //编辑收件地址
},
props: ["backState", "type"],
data() {
@@ -161,7 +161,7 @@ export default {
customButtonGroup1: [
{
with: 200,
text: "+ 添加收货地址",
text: "+ 添加收件地址",
backgroundColor: "linear-gradient(90deg, #3C77BE 0%,#258feb 100%)",
color: "#fff",
},

19
pages/component/commonComponents/orderSubmit.vue
View File

@@ -25,7 +25,7 @@
</view>
<view class="normal_box" v-else>
<view class="normal_box_top">
<view class="curriulum_title">请添加收货地址 </view>
<view class="curriulum_title">请添加收件地址 </view>
</view>
</view>
<view class="right">
@@ -241,6 +241,13 @@
</template>
</view>
</view>
<view v-if="v.type == 2" class="top">
<view class="yq_beizhu">
<u-icon name="info-circle" color="#ffb529" size="12" style="display: inline-block;margin-right: 10rpx;"></u-icon>
注：如订单包含一种或多种预售书，预售书和现售书需分开发出（即需要收取多次快递首重费用）；如多本书会按照实际重量，收取快递续重费用。
</view>
</view>
<view
class="bottom jf_box"
@@ -1405,7 +1412,7 @@
} else {
if (this.options.goods[0].goodsType != "05") {
if (!this.addressData.id) {
this.$commonJS.showToast("请选择收货地址");
this.$commonJS.showToast("请选择收件地址");
return false;
}
}
@@ -1415,8 +1422,8 @@
userId: this.userInfo.id, //下单人ID
shippingUser: this.addressData
? this.addressData.consigneeName
: "111", //收货人姓名
userPhone: this.addressData.consigneePhone, //收货人手机号
: "111", //收件人姓名
userPhone: this.addressData.consigneePhone, //收件人手机号
jfDeduction: this.jfNumber,
paymentMethod: this.payType, //支付方式 2支付宝，1微信，3ios内购 4，天医币购买
orderMoney: this.totalPrice, //订单金额
@@ -2425,5 +2432,9 @@
.themeColor {
color: $themeColor;
}
.yq_beizhu {
color: #aaa;
font-size: 24rpx;
}
</style>

13
pages/mine/mine/index.vue
View File

@@ -232,6 +232,11 @@
url: "/pages/component/commonComponents/address/index?type=mine",
type: "pageJump",
},
{
name: "分享APP",
url: "",
type: "share",
},
{
name: "关于我们",
url: "/pages/mine/aboutUs/index",
@@ -618,7 +623,6 @@
width: 100%;
position: relative;
margin-top: 50rpx;
align-items: center;
display: flex;
align-items: center;
@@ -626,7 +630,7 @@
width: 120rpx;
height: 120rpx;
border-radius: 100rpx;
margin: 0 0 0 0;
margin: 0;
float: left;
}
@@ -874,7 +878,6 @@
.bg_top {
padding: 0 10rpx 0 20rpx;
padding-top: 80rpx;
margin-bottom: 60rpx;
}
.setIcon {
@@ -969,7 +972,7 @@
}
.user_vip_box{
width: 125rpx;
position: absolute;
position: relative;
margin-top: - 40rpx;
z-index: 99;
}
@@ -996,6 +999,7 @@
.vip_type{
display: flex;
align-items: center;
flex-wrap: wrap;
}
.vip_type_item{
display: flex;
@@ -1010,6 +1014,7 @@
font-weight: bold;
color: #fff;
margin-right: 8rpx;
margin-bottom: 8rpx;
}
.vip_type_item_len{
padding: 0 7rpx;

2
pages/mine/wallet/recharge/index.vue
View File

@@ -593,7 +593,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, //优惠金额

8
pages/miniClass/classInfo.vue
View File

@@ -320,6 +320,9 @@
<view class="score" v-if="item.scoreSuccess == 0">
等待评分
</view>
<view class="score" v-if="item.scoreSuccess > 0 && item.scoreSuccess < 3">
评分中
</view>
<view class="score" v-if="item.scoreSuccess >= 3">
分数：{{item.score}}
</view>
@@ -372,9 +375,12 @@
<text v-if="thisClass.state == '2' || thisClass.state == '3'" style="color: #999; font-size: 26rpx;">已不可作答</text>
</template>
<template v-else>
<text style="padding-left: 10rpx; color: #55aa7f; font-size: 26rpx;" v-if="item.reply.scoreSuccess <= 2 && thisClass.state != '2'">
<text style="padding-left: 10rpx; color: #55aa7f; font-size: 26rpx;" v-if="item.reply.scoreSuccess == 0 && thisClass.state != '2'">
等待评分
</text>
<text style="padding-left: 10rpx; color: #55aa7f; font-size: 26rpx;" v-if="item.reply.scoreSuccess > 0 && item.reply.scoreSuccess <= 2 && thisClass.state != '2'">
评分中
</text>
<text style="padding-left: 10rpx; color: #999; font-size: 26rpx;" v-if="item.reply.scoreSuccess <= 2 && thisClass.state == '2'">
已结班无法评分
</text>

8
pages/miniClass/sikaoQuestionList.vue
View File

@@ -16,7 +16,8 @@
<view class="score noscore" v-else-if=" classState == '1' || classState == '3' ">
<text v-show="item.scoreInfos < 3 && item.haveGiveScore">等待其他评分员评分</text>
<text v-show="item.scoreInfos < 3 && (item.scoreInfo=='' || !item.haveGiveScore) && roleCode.includes('4')">请您评分</text>
<text v-show="item.scoreInfos < 3 && ( roleCode.includes('1') || roleCode.includes('1') || roleCode.includes('主任') || roleCode.includes('副主任'))">已开始评分</text>
<text v-show="item.scoreInfos < 3 && item.scoreInfos > 0 && !roleCode.includes('4')">评分中</text>
<text v-show="item.scoreInfos == 0 && !roleCode.includes('4')">未开始评分</text>
</view>
<!-- <text v-if="" class="blue light"></text> -->
</view>
@@ -39,7 +40,7 @@
<u-popup key="1" v-if="curReplay.replyId" @touchmove.stop="" :show="showEditBlank" :round="10" @close="closePup" ref="" z-index="998" overlay-style="z-index:998">
<view class="" style="padding: 40rpx; max-height: 80vh; overflow-y:scroll">
<view class="anserBox">
<h3>提交的内容</h3>
<h3>提交的内容{{ curReplay.scoreSuccess }}</h3>
<scroll-view scroll-top="" scroll-y="true" class="scroll-Y" style="max-height: 500rpx; margin: 20rpx 0;">
<view class="" style="border-bottom: 1px solid #eee; padding-bottom: 20rpx; margin-bottom: 20rpx;">
<view class="anserContent" v-html="curReplay.content"></view>
@@ -61,6 +62,9 @@
<view class="score noscore" v-if="curReplay.scoreSuccess == 0 && (classState == '1' || classState == '3')">
未开始评分
</view>
<view class="score noscore" v-if="curReplay.scoreSuccess < 3 && curReplay.scoreSuccess > 0 && (classState == '1' || classState == '3')">
评分中
</view>
<view class="" style="color: #999; font-size: 26rpx; margin-top: 20rpx;" v-if="curReplay.scoreSuccess == 0 && (classState == '0' || classState == '2')">
不可评分
</view>

8
pages/miniClass/xindeList.vue
View File

@@ -23,7 +23,8 @@
<view class="score noscore" v-else-if=" classState == '1' || classState == '3' ">
<text v-show="item.scoreInfos < 3 && item.haveGiveScore">等待其他评分员评分</text>
<text v-show="item.scoreInfos < 3 && !item.haveGiveScore && roleCode.includes('4')">请您评分</text>
<text v-show="item.scoreInfos < 3 && ( roleCode.includes('1') || roleCode.includes('1') || roleCode.includes('主任') || roleCode.includes('副主任'))">已开始评分</text>
<text v-show="item.scoreInfos < 3 && item.scoreInfos > 0 && !roleCode.includes('4')">评分中</text>
<text v-show="item.scoreInfos == 0 && !roleCode.includes('4')">未开始评分</text>
</view>
<view class="score noscore" v-else-if="classState == '1' || classState == '3'">未开始评分</view>
@@ -72,7 +73,10 @@
分数：{{curReplay.score}}
</view>
<view class="score noscore" v-show="curReplay.scoreSuccess == 0">
未生成成绩
未开始评分
</view>
<view class="score noscore" v-show="curReplay.scoreSuccess > 0 && curReplay.scoreSuccess < 3">
评分中
</view>
<!-- -->
<template

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

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