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

feat: 添加视频播放器组件并更新相关依赖

Browse Source 
refactor: 统一将"无货"改为"无库存"、"收货"改为"收件"等文案

fix: 更新edu-core依赖版本至v1.0.8

chore: 更新manifest版本号至1.0.55并移除GET_ACCOUNTS权限

style: 调整mine页面样式布局

docs: 更新页面标题和地址相关文案
This commit is contained in:
chenghuan
2026-03-03 15:57:18 +08:00
parent 91decda774
commit 7317550374
42 changed files with 11626 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pages/bookShop/bookShopType.vue
View File

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

2
pages/bookShop/commodityDetail copy.vue
View File

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

2
pages/bookShop/commodityDetail.vue
View File

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

4
pages/bookShop/deliverDetail.vue
View File

@@ -110,9 +110,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 = "已完成";
}

22
pages/bookShop/orderLCont.vue
View File

@@ -71,12 +71,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"
@@ -432,7 +432,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 class=""></view>
@@ -586,7 +586,7 @@
plain
type="success"
/></view>
<view class="">发货时间：{{ item.createTime }}</view>
<view class="">发出时间：{{ item.createTime }}</view>
</view>
</view>
</view>
@@ -691,7 +691,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);
@@ -988,10 +988,10 @@ export default {
});
},
OverOrder() {
// 确认收货
// 确认收到
uni.showModal({
title: "提示",
content: "确认收货？",
content: "确认收到？",
success: (res) => {
let data = {
orderId: this.orderID,
@@ -1013,7 +1013,7 @@ export default {
if (res.code == 0) {
uni.hideLoading();
uni.showToast({
title: "收货成功",
title: "确认收到成功",
icon: "success",
duration: 1000,
});
@@ -1067,7 +1067,7 @@ export default {
if (this.orderContet.orderStatus == 2) {
this.customButton.push({
width: "160rpx",
text: "确认收货",
text: "确认收到",
color: "#fff",
});
@@ -1099,9 +1099,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 = "已完成";
}

34
pages/bookShop/orderList.vue
View File

@@ -98,12 +98,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"
@@ -405,7 +405,7 @@
<view
class="orderstatusbtn"
v-if="slotProps.row.orderStatus == 1"
>催发货</view
>催发出</view
>
<view
class="orderstatusbtn"
@@ -417,7 +417,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: {},
},
@@ -877,8 +877,8 @@ export default {
.then((res) => {
// 订单状态
// * 0: 待付款
// * 1: 待发货
// * 2: 已发货
// * 1: 待发出
// * 2: 待收到
// * 3：已完成
// * 4: 交易失败
// * 5: 已过期
@@ -909,7 +909,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,
@@ -1021,16 +1021,6 @@ export default {
} else if (payItem.paymentMethod == 3) {
// 苹果充值
console.log("苹果二次支付");
if (this.isAndorid) {
uni.showModal({
title: "提示",
showCancel: false,
content:
"很抱歉，当前订单属于苹果系统内购订单，安卓系统无法完成支付操作，您可切换到苹果系统进行支付，也可以取消该订单，并重新下单",
});
} else {
this.iphonepay(payItem);
}
}
},
// 取消订单
@@ -1115,11 +1105,11 @@ export default {
});
// }
},
// 确认收货
// 确认收到
OverOrder(item) {
uni.showModal({
title: "提示",
content: "确认收货？",
content: "确认收到吗？",
success: (res) => {
let data = {
orderId: item.orderId,
@@ -1141,7 +1131,7 @@ export default {
if (res.code == 0) {
uni.hideLoading();
uni.showToast({
title: "收货成功",
title: "确认收到成功",
icon: "success",
duration: 1000,
});

4
pages/bookShop/settlement.vue
View File

@@ -14,7 +14,7 @@
size="20"
style="display: inline-block; margin-right: 10rpx"
></u-icon>
请添加收货地址
请添加收件地址
</view>
<view
class="adDefault"
@@ -118,7 +118,7 @@
size="12"
style="display: inline-block; margin-right: 10rpx"
></u-icon>
注：如订单包含一种或多种预售书，预售书和现货书需分开发货（即需要收取多次快递首重费用）；如多本书会按照实际重量，收取快递续重费用。
注：如订单包含一种或多种预售书，预售书和现售书需分开发出（即需要收取多次快递首重费用）；如多本书会按照实际重量，收取快递续重费用。
</view>
</view>
<!-- 安卓支付列表 -->

6
pages/bookShop/settlementBook.vue
View File

@@ -14,7 +14,7 @@
size="20"
style="display: inline-block; margin-right: 10rpx"
></u-icon>
请添加收货地址
请添加收件地址
</view>
<view
class="adDefault"
@@ -738,8 +738,8 @@ export default {
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

@@ -7,7 +7,7 @@
<view class="common_address_box" style="background-color: #fff">
<z-nav-bar
:title="`${addressId ? '编辑' : '添加'}收货地址`"
:title="`${addressId ? '编辑' : '添加'}收件地址`"
bgColor="#3AB3AE"
fontColor="#fff"
>
@@ -37,7 +37,7 @@
color="#3AB3AE"
@click="radioCheck(index)"
></radio>
默认收货地址
默认收件地址
</view>
</radio-group>
</view>

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

@@ -13,7 +13,7 @@
>
<z-nav-bar
navFontAlign="left"
title="我的收货地址"
title="我的收件地址"
bgColor="#3AB3AE"
fontColor="#fff"
>
@@ -129,7 +129,7 @@ import { mapState } from "vuex";
export default {
components: {
courseDescription, //课程说明
editAddress, //编辑收货地址
editAddress, //编辑收件地址
},
props: ["backState", "type"],
data() {
@@ -162,7 +162,7 @@ export default {
customButtonGroup1: [
{
with: 200,
text: "+ 添加收货地址",
text: "+ 添加收件地址",
backgroundColor: "linear-gradient(90deg, #3AB3AE 0%, #117e4c 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 @@
</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"
v-if="v.type == 4 && initData.user.jf > 0"
@@ -1398,7 +1405,7 @@ export default {
};
} else {
if (this.isShowAddress && !this.addressData.id) {
this.$commonJS.showToast("请选择收货地址");
this.$commonJS.showToast("请选择收件地址");
return false;
}
@@ -1407,8 +1414,8 @@ export default {
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, //订单金额
@@ -2421,4 +2428,8 @@ export default {
.themeColor {
color: $themeColor;
}
.yq_beizhu {
color: #aaa;
font-size: 24rpx;
}
</style>

8
pages/goods/order/index copy.vue
View File

@@ -41,7 +41,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">
@@ -1298,7 +1298,7 @@ export default {
// }
if (this.options.goods[0].goodsType != "05") {
if (!this.addressData.id) {
this.$commonJS.showToast("请选择收货地址");
this.$commonJS.showToast("请选择收件地址");
return false;
}
}
@@ -1307,8 +1307,8 @@ export default {
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, //订单金额

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

@@ -333,13 +333,13 @@ export default {
imgUrl: require("@/static/icon/ordericon2.png"),
},
{
title: "待发货",
title: "待发出",
value: 1,
badge: {},
imgUrl: require("@/static/icon/ordericon3.png"),
},
{
title: "待收货",
title: "待收到",
value: 2,
badge: {},
imgUrl: require("@/static/icon/ordericon4.png"),
@@ -515,8 +515,8 @@ export default {
.then((res) => {
// 订单状态
// * 0: 待付款
// * 1: 待发货
// * 2: 已发货
// * 1: 待发出
// * 2: 已发出
// * 3：已完成
// * 4: 交易失败
// * 5: 已过期
@@ -1039,9 +1039,9 @@ uni-page-body {
.bg_top {
padding: 0 30rpx;
height: 30vh;
height: 120rpx;
position: relative;
margin-top: 30rpx;
margin-top: 20rpx;
.setIcon {
position: absolute;
@@ -1051,8 +1051,6 @@ uni-page-body {
.mine_box {
width: 100%;
position: absolute;
left: 0;
padding: 0 0rpx;
margin-top: 30rpx;
}

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

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