feat: 新增心理论坛功能并优化订单相关文案;更新音视频播放组件版本;
- 新增心理论坛页面及文章详情页 - 更新订单状态文案:"待发货"改为"待发出","待收货"改为"待收到" - 统一修改"收货地址"相关文案为"收件地址" - 添加安卓应用包下载地址配置 - 更新依赖edu-core至v1.0.6版本 - 优化首页课程列表布局和样式 - 新增分享功能到我的页面
This commit is contained in:
@@ -1,7 +1,7 @@
|
||||
<template>
|
||||
<view class="">
|
||||
<view class="common_address_box" style="background-color: #fff">
|
||||
<z-nav-bar :title="`${addressId ? '编辑' : '添加'}收货地址`">
|
||||
<z-nav-bar :title="`${addressId ? '编辑' : '添加'}收件地址`">
|
||||
<template slot="right">
|
||||
<text @click="handleClickDelete" v-if="addressId" style="padding-right: 20rpx; color: red">删除</text>
|
||||
</template>
|
||||
@@ -16,7 +16,7 @@
|
||||
<view v-for="(item, index) in argee" :key="index">
|
||||
<radio class="agreeRadio" :value="item.id" :checked="item.id == radioValue"
|
||||
color="#7dc1f0" @click="radioCheck(index)"></radio>
|
||||
默认收货地址
|
||||
默认收件地址
|
||||
</view>
|
||||
</radio-group>
|
||||
</view>
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
>
|
||||
<z-nav-bar
|
||||
navFontAlign="left"
|
||||
title="我的收货地址"
|
||||
title="我的收件地址"
|
||||
>
|
||||
<template slot="right"></template>
|
||||
</z-nav-bar>
|
||||
@@ -114,7 +114,7 @@ import { mapState } from "vuex";
|
||||
export default {
|
||||
components: {
|
||||
courseDescription, //课程说明
|
||||
editAddress, //编辑收货地址
|
||||
editAddress, //编辑收件地址
|
||||
},
|
||||
props: ["backState", "type"],
|
||||
data() {
|
||||
@@ -126,7 +126,7 @@ export default {
|
||||
customButtonGroup1: [
|
||||
{
|
||||
with: 200,
|
||||
text: "+ 添加收货地址",
|
||||
text: "+ 添加收件地址",
|
||||
backgroundColor: "linear-gradient(90deg, #294a97 0%, #7dc1f0 80%)",
|
||||
color: "#fff",
|
||||
},
|
||||
|
||||
@@ -23,7 +23,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">
|
||||
@@ -1401,7 +1401,7 @@
|
||||
} else {
|
||||
if (this.options.goods[0].goodsType != "05") {
|
||||
if (!this.addressData.id) {
|
||||
this.$commonJS.showToast("请选择收货地址");
|
||||
this.$commonJS.showToast("请选择收件地址");
|
||||
return false;
|
||||
}
|
||||
}
|
||||
@@ -1411,8 +1411,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, //订单金额
|
||||
|
||||
Reference in New Issue
Block a user