feat: 添加视频播放器组件并更新相关依赖
refactor: 统一将"无货"改为"无库存"、"收货"改为"收件"等文案 fix: 更新edu-core依赖版本至v1.0.8 chore: 更新manifest版本号至1.0.55并移除GET_ACCOUNTS权限 style: 调整mine页面样式布局 docs: 更新页面标题和地址相关文案
This commit is contained in:
@@ -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>
|
||||
|
||||
@@ -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",
|
||||
},
|
||||
|
||||
@@ -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>
|
||||
|
||||
Reference in New Issue
Block a user