diff --git a/components/orderCoupon.vue b/components/orderCoupon.vue
index 78d478f..6b819f1 100644
--- a/components/orderCoupon.vue
+++ b/components/orderCoupon.vue
@@ -1,267 +1,388 @@
-
-
-
-
- 请选择优惠券
-
-
-
-
- ￥
- {{item.couponEntity.couponAmount}}
- 满{{item.couponEntity.useLevel}}元可用
-
-
-
- {{item.couponEntity.couponName}}
- {{item.couponEntity.couponRange | couponType}}
-
- 到期时间：{{item.effectType == 0 ? '永久有效' : item.endTime}}
-
-
- 不可用：
- {{item.canUseReason}}
-
-
- 说明：{{item.couponEntity.remark}}
-
-
-
-
+
+
+ 请选择优惠券
+
+
+
+ {{ item.couponEntity.couponRange | couponType }}
+
+ ￥
+ {{
+ item.couponEntity.couponAmount
+ }}
+ 满{{ item.couponEntity.useLevel }}元可用
+
+
+
+ {{ item.couponEntity.couponName }}
+
+ 有效期至：{{
+ item.effectType == 0 ? "永久有效" : item.endTime
+ }}
+
+
+ 不可用原因：
+ {{ item.canUseReason }}
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+ 使用说明：{{ item.couponEntity.remark }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
+ color: #979797 !important;
+ .couponPrice {
+ color: #979797 !important;
+ }
+ .useLevel {
+ color: #979797 !important;
+ }
+ .border_radius_10 {
+ color: #98989a !important;
+ background-color: #fafafa !important;
+ }
+ }
+ .youhuiItem > view {
+ float: left;
+ }
+
+ .youhuiItem.youItem_style {
+ border-color: #fd6004;
+ }
+}
+::v-deep .u-cell__body {
+ padding-top: 0 !important ;
+ padding-bottom: 0 !important ;
+ z-index: 10 !important ;
+ .u-cell__title-text {
+ color: #333 !important;
+ font-size: 24rpx !important;
+ padding-left: 0 !important;
+ }
+}
+
+::v-deep .u-collapse-item__content__text {
+ padding: 10rpx 20rpx !important;
+ box-sizing: border-box;
+}
+
diff --git a/config/baseUrl.js b/config/baseUrl.js
index 06fd9cd..6d44fd5 100644
--- a/config/baseUrl.js
+++ b/config/baseUrl.js
@@ -6,9 +6,9 @@ if (process.env.NODE_ENV === 'development') {
// socketUrl = "ws://localhost:6001/";
// baseUrl = "https://twin-ui.com/demo/";
// baseUrl = "https://testapi.nuttyreading.com/"; // 线上测试环境
- baseUrl = "https://api.nuttyreading.com/"; // 线上正式
+ // baseUrl = "https://api.nuttyreading.com/"; // 线上正式
// baseUrl = "http://192.168.110.110:9200/pb/"; // 磊哥
- // baseUrl = "http://192.168.110.100:9200/pb/"; // 开发用电脑
+ baseUrl = "http://192.168.110.100:9200/pb/"; // 张川川
// baseUrl = "http://59.110.212.44:9200/pb/";
// baseUrl = "http://192.168.110.100:9100/pb/"; // 开发用电脑
// baseUrl = "http://192.168.110.110:9200/pb/";
@@ -16,11 +16,12 @@ if (process.env.NODE_ENV === 'development') {
// socketUrl = "ws://8.129.186.35:6001/";
} else if (process.env.NODE_ENV === 'production') {
// 生产环境11
+
// baseUrl = "http://59.110.212.44:9100/pb/";
// baseUrl = "https://testapi.nuttyreading.com/";
// baseUrl = "http://192.168.110.110:9200/pb/";//磊哥
- baseUrl = "https://api.nuttyreading.com/"; //1
- // baseUrl = "http://192.168.110.100:9200/pb/"; // 开发用电脑
+ // baseUrl = "https://api.nuttyreading.com/"; //1
+ baseUrl = "http://192.168.110.100:9200/pb/"; // 张川川
// baseUrl = "ws://twin-ui.com:6001/";
// socketUrl = "ws://twin-ui.com:6001/";
}
diff --git a/main.js b/main.js
index b1957d1..6d51b53 100644
--- a/main.js
+++ b/main.js
@@ -88,6 +88,8 @@ import commonList from '@/pages/component/commonComponents/list.vue'
Vue.component('common-list', commonList);
import commonVideo from '@/pages/component/commonComponents/video/index.vue'
Vue.component('common-video', commonVideo);
+import commonCoupon from '@/pages/component/commonComponents/coupon/index.vue'
+Vue.component('common-coupon', commonCoupon);
import commonGoodsList from '@/pages/component/commonComponents/goodsList.vue'
Vue.component('common-goods-list', commonGoodsList);
import commonCurriculumList from '@/pages/component/commonComponents/curriculum.vue'
diff --git a/manifest.json b/manifest.json
index 49e7154..690a193 100644
--- a/manifest.json
+++ b/manifest.json
@@ -12,8 +12,8 @@
"src" : "图片路径"
}
],
- "versionName" : "1.0.28",
- "versionCode" : 1028,
+ "versionName" : "1.0.31",
+ "versionCode" : 1031,
"app-plus" : {
"nvueCompiler" : "weex",
"compatible" : {
diff --git a/pages/bookShop/orderList.vue b/pages/bookShop/orderList.vue
index 872f716..48c18a9 100644
--- a/pages/bookShop/orderList.vue
+++ b/pages/bookShop/orderList.vue
@@ -1,17 +1,9 @@
-
-
-
-
-
+
+
+
-
+
-
-
+
+
-
-
-
+
+
+
-
+
-
-
-
-
-
-
-
-
- -->
+
+
+
+
+
+
+
+ {{ slotProps.row.orderSn }}
+ ">{{ slotProps.row.orderSn }}
-
-
-
+
+
+
+
-
-
-
-
- 未付款
- 待发货
- 已发货
- 交易成功
- 交易失败
- 已过期
-
-
-
-
-
-
-
- {{ slotProps.row.remark }}
-
+
+
+ {{ slotProps.row.remark }}
+
-
-
-
-
-
-
-
-
-
-
-
- {{ slotProps.row.vipBuyConfigEntity.title }}
-
+
+
+ {{ slotProps.row.vipBuyConfigEntity?slotProps.row.vipBuyConfigEntity.title:' ' }}
+
-
-
-
-
-
- 下单时间：{{ slotProps.row.createTime }}
-
-
+ ">
+
+
+
+
+ 下单时间：{{ slotProps.row.createTime }}
+
+
-
-
-
-
-
- 充值
- {{ slotProps.row.bookBuyConfigEntity.money }}天医币
+
+
+ 充值
+ {{ slotProps.row.bookBuyConfigEntity.money }}天医币
+
-
-
-
-
- 下单时间：{{ slotProps.row.createTime }}
-
-
+ ">
+
+
+
+ 下单时间：{{ slotProps.row.createTime }}
+
+
-
-
-
-
-
-
+
+
+
+
+
+
- 暂无封面图
-
-
- {{
+
+ {{
item2.product && item2.product.productName
? item2.product.productName
: ""
}}
-
- ￥
- {{
+ ">
+ ￥
+ {{
item2.product.price ? item2.product.price : ""
- }}
-
-
-
-
- ×{{ item2.quantity ? item2.quantity : "" }}
-
-
-
-
-
-
- 未知商品
-
- ×{{ item2.quantity ? item2.quantity : "" }}
-
-
-
-
-
+ }}
+
+
+
+
+
+ ×{{ item2.quantity ? item2.quantity : "" }}
+
+
+
+
+
+
+ 未知商品
+
+ ×{{ item2.quantity ? item2.quantity : "" }}
+
+
+
+
+
-
-
-
+
+
-
+ 实付款
- 实付款
+
- ￥
- {{
+ ">
+ ￥
+ {{
slotProps.row.realMoney ||
slotProps.row.realMoney == 0
? slotProps.row.realMoney
: ""
- }}
-
-
-
-
+ （
- （
+ 积分抵扣
- 积分抵扣
+
- ￥
- {{ slotProps.row.jfDeduction }}
- ）
-
-
+ ">
+ ￥
+ {{ slotProps.row.jfDeduction }}
+
+ ）
+
+
-
- 取消订单
-
-
-
+ 取消订单
+
+
+ 更多
-
- 继续付款
- 催发货
- 查看物流
- 确认收货
- 申请售后
-
-
-
-
+
+
+
-
-
-
-
-
+
+
-
-
-
-
-
+
+
+
+
-
-
-
- 添加评价
- 添加追评
+
+
+
+ 添加评价
+ 添加追评
-
-
-
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 提交评价
- 提交追评
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 提交评价
+ 提交追评
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+ .starLight {
+ background: url(../../static/icon/star_light.png) no-repeat;
+ background-size: contain;
+ }
+
+ .cuIcon-emoji {
+ background: url(../../static/biaoqing.png) no-repeat;
+ background-size: contain;
+ display: block;
+ margin-right: 20rpx;
+ width: 30px;
+ }
+
+ .cuIcon-keyboard {
+ background: url(../../static/biaoqing.png) no-repeat;
+ background-size: contain;
+ display: block;
+ width: 30px;
+ }
+
+ .tanchu {
+ padding: 40rpx 30rpx 40rpx 30rpx;
+ position: relative;
+
+ .dp_title {
+ font-size: 32rpx;
+ margin-bottom: 50rpx;
+ color: #555;
+ text-align: center;
+ font-weight: bold;
+ }
+
+ .dp_add {
+ position: absolute;
+ top: 40rpx;
+ right: 30rpx;
+ font-size: 22rpx;
+ background-color: #fd6004;
+ color: #fff;
+ border-radius: 10rpx;
+ padding: 5rpx 10rpx;
+
+ .u-icon {
+ display: inline-block;
+ margin-right: 5rpx;
+ }
+ }
+ }
+
+ .quesheng {
+ text-align: center;
+ margin-top: 100rpx;
+ color: #8b8a91;
+ padding-bottom: 20rpx;
+ padding-top: 20rpx;
+ }
+
+ .gengduoshuping {
+ text-align: right;
+ color: #0044ff;
+ padding-bottom: 20rpx;
+ padding-top: 20rpx;
+ }
+
+ .orderInfo {
+ position: relative;
+ justify-content: space-between;
+ // margin-bottom: 15px;
+ background-color: #fff;
+ padding: 20rpx 20rpx;
+ border: 1px splid #999;
+ box-sizing: border-box;
+ // padding-bottom: 20rpx;
+ border-radius: 20rpx;
+ margin-bottom: 20rpx;
+
+ .bookinfolist {
+ width: 100%;
+ margin-bottom: 20rpx;
+ overflow: hidden;
+ // height: 180rpx;
+ }
+
+ .bookinfolist:nth-last-child(1) {
+ margin-bottom: 0 !important;
+ }
+
+ .operation_box {
+ position: absolute;
+ bottom: 20rpx;
+ left: 40rpx;
+ }
+ }
+
+ .mainContent {
+ background-color: #fff;
+
+ .item {
+ // padding: 10px;
+ // margin-bottom: 30rpx;
+ // border: 1px solid #999;
+ box-sizing: border-box;
+ // padding-bottom: 20rpx;
+ border-radius: 20rpx;
+ // margin-bottom: 20rpx;
+ }
+
+ .feng {
+ background-color: #fafafa;
+ margin: 0rpx 22rpx 0 0;
+ height: 140rpx;
+ width: 140rpx;
+ float: left;
+ border-radius: 14rpx;
+ // border: 1rpx solid #e9e9e9;
+ }
+
+ .point_box {
+ .booknameleft {
+ line-height: 70rpx !important;
+ }
+ }
+
+ .fengPoint {
+ background-color: #fff;
+ height: 100rpx;
+ width: 100rpx;
+ }
+
+ .item_top {
+ width: 100%;
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+
+ margin-bottom: 25rpx;
+
+ .source_app {
+ font-size: 26rpx;
+ font-weight: bold;
+ line-height: 26rpx;
+ }
+ }
+
+ .orderstatus {
+ line-height: 24rpx;
+ font-size: 24rpx;
+ color: #e55f18;
+ text-align: right;
+ letter-spacing: 2rpx;
+ }
+
+ /deep/.description {
+ overflow: hidden;
+ color: #666;
+ text-overflow: -o-ellipsis-lastline;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ display: -webkit-box;
+ -webkit-line-clamp: 5;
+ line-clamp: 5;
+ -webkit-box-orient: vertical;
+ font-size: 26rpx;
+ margin-bottom: 20rpx;
+ margin-top: 10rpx;
+ height: 172rpx;
+
+ img {
+ width: 100% !important;
+ }
+ }
+
+ .btns {
+ font-size: 28rpx;
+ justify-content: space-between;
+ align-items: center;
+
+ .booknameleft {
+ font-size: 32rpx;
+ width: calc(100% - 200rpx);
+ color: #070707;
+ letter-spacing: 0.5rpx;
+ font-weight: 600;
+ }
+
+ .left {
+ width: 300rpx;
+ color: #a1a1a1;
+ }
+
+ .right {
+ width: 350rpx;
+ display: flex;
+ justify-content: flex-end;
+ align-items: center;
+ }
+
+ .price {
+ width: 120rpx;
+ }
+
+ .gzicon {
+ margin: 0 0 0 20rpx;
+ height: 40rpx;
+ width: 40rpx;
+ // float:left;
+ // border-radius: 20rpx;
+ // border:1rpx solid #e9e9e9;
+ }
+
+ .opbtns {
+ .pingjia {
+ margin-left: 10px;
+ }
+ }
+ }
+ }
+
+ .mb30 {
+ margin-bottom: 30rpx;
+ overflow: hidden;
+ }
+
+ .mytabs {
+ // background: url('@/static/icon/bgtushu.png') no-repeat left top;
+ height: 80rpx;
+ // margin-bottom: 30rpx;
+
+ .item {
+ border-radius: 10rpx;
+ background-color: #c6ead0;
+ width: 48%;
+ // margin: 0 10rpx;
+ text-align: center;
+ color: #3c7f56;
+ font-size: 36rpx;
+ line-height: 80rpx;
+ }
+
+ .item.active {
+ background-color: #3c7f56;
+ color: #fff;
+ }
+
+ .item2 {
+ margin-right: 20rpx;
+ }
+ }
+
+ /deep/.u-tabs__wrapper__nav__item__text {
+ // font-size: 32rpx !important;
+ }
+
+ .cateList {
+ width: 100%;
+ }
+
+ /deep/.u-tabs__wrapper__nav__item {
+ padding: 0 !important;
+ }
+
+ .commonDetailPage {
+ background-color: $themeBgColor;
+ }
+
+ .order_box {
+ padding: 20rpx;
+ }
+
+ /deep/.order_box .list_item {
+ // border-bottom: none;
+ padding: 0 !important;
+ padding-right: 0 !important;
+ border: none !important;
+ }
+
+ .product_quantity {
+ width: auto;
+ color: #9b9b9b;
+ font-size: 26rpx;
+ }
+
+ /deep/.commonDetailPage {
+ .uni-app--showtabbar uni-page-wrapper::after {
+ height: 0 !important;
+ }
+ }
+
\ No newline at end of file
diff --git a/pages/component/commonComponents/coupon/index.vue b/pages/component/commonComponents/coupon/index.vue
new file mode 100644
index 0000000..6240537
--- /dev/null
+++ b/pages/component/commonComponents/coupon/index.vue
@@ -0,0 +1,287 @@
+
+
+
+
+
+ {{ item.couponEntity.couponRange | couponType }}
+
+
+ ￥
+ {{ item.couponEntity.couponAmount }}
+ 满{{ item.couponEntity.useLevel }}元可用
+
+
+
+
+ {{
+ item.couponEntity.couponType == 0 ? "现金" : "折扣"
+ }}优惠券
+
+
+
+
+
+
+
+
+
+
+ 有效期至：{{
+ item.effectType == 0 ? "永久有效" : item.endTime
+ }}
+
+
+
+
+
+
+
+
+ {{ item.couponEntity.couponName }}
+
+
+
+
+
+
+
+
+
+
+ 使用说明：{{ item.couponEntity.remark }}
+
+
+
+
+
+
+
+
+
diff --git a/pages/goods/index/index.vue b/pages/goods/index/index.vue
index 84cf914..04ac016 100644
--- a/pages/goods/index/index.vue
+++ b/pages/goods/index/index.vue
@@ -1,127 +1,241 @@
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
-
- ￥{{ curriculumData.activityPrice }}
-
- 原价：￥{{ curriculumData.price }}
-
-
-
-
- ￥{{ curriculumData.price }}
-
-
+ "
+ >
+
+ ￥{{ curriculumData.activityPrice }}
+
+ 原价：￥{{ curriculumData.price }}
+
+
+
+
+ ￥{{ curriculumData.price }}
+
+
- 已售 {{ curriculumData.sumSales }}件
-
-
+ 已售 {{ curriculumData.sumSales }}件
+
+
-
- 秒杀商品
+
+ 秒杀商品
-
-
-
+
+
- {{ curriculumData.productName }}
-
-
-
-
- {{ curriculumData.productName }}
+
+
+
+
+
-
- ￥{{ curriculumData.activityPrice }}
-
- 原价：￥{{ curriculumData.price }}
-
-
-
-
- ￥{{ curriculumData.price }}
-
-
- 已售
- {{ curriculumData.sumSales }}件
-
-
+ "
+ >
+
+ ￥{{ curriculumData.activityPrice }}
+
+ 原价：￥{{ curriculumData.price }}
+
+
+
+
+ ￥{{ curriculumData.price }}
+
+
+ 已售 {{ curriculumData.sumSales }}件
+
+
- {{ curriculumData.productName }}
-
-
+ {{ curriculumData.productName }}
+
+
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
- 商品规格
-
+ }%;padding-left: 15px; padding-right: 15px; height: 68rpx;`"
+ :list="cateList"
+ :currentCateIndex="currentCateIndex"
+ @handleselectCate="handleselectCate"
+ >
+
+
+
+
+
+
+ 商品规格
+
- 共{{ goodsList.length }}种商品可选择
-
-
-
-
- 共{{ goodsList.length }}种商品可选择
+
+
+
+
+
-
-
-
-
+ }`"
+ >
+
+
+
+
-
-
+
+
-
-
-
-
-
-
-
- 书籍信息
-
-
+
+
+
+
+
+
+ 书籍信息
+
+
-
-
-
-
-
-
-
-
-
- {{ slotProps.row.name }}
-
-
-
+
+
+
+
+
+
+
+
+
+ {{ slotProps.row.name }}
+
+
+
-
-
-
-
-
-
-
-
- 课程信息
-
-
+
+
+
+
+
+
+
+
+ 课程信息
+
+
-
-
-
-
-
-
-
-
-
- {{ slotProps.row.title }}
-
-
-
+
+
+
+
+
+
+
+
+
+ {{ slotProps.row.title }}
+
+
+
-
-
-
-
-
-
-
-
-
-
- ￥
- {{item.couponEntity.couponAmount}}
-
-
-
- {{item.couponEntity.couponName}}
-
-
- 说明：{{item.couponEntity.remark}}
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-
-
- {{ slotProps.row.name }}：
-
- {{ slotProps.row.value | formatDate }}
- {{ slotProps.row.value }}
-
-
-
+ }`"
+ >
+
+
+ {{ slotProps.row.name }}：
+
+ {{ slotProps.row.value | formatDate }}
+ {{ slotProps.row.value }}
+
+
+
-
-
+
+
-
-
-
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
-
-
-
+
+
-
-
-
-
- 相关课程
-
-
-
-
-
- {{
+
+
+
+
+ 相关课程
+
+
+
+
+
+ {{
slotProps.row.title
}}
-
-
+
+
-
-
+
+
-
- ￥{{ slotProps.row.courseFee }}
+
+ ￥{{ slotProps.row.courseFee }}
-
-
-
-
-
-
-
-
-
-
-
-
+
\ No newline at end of file
+@import "@/style/mixin.scss";
+
+.tanchu {
+ padding: 0 30rpx 40rpx 30rpx;
+ position: relative;
+ // max-height: 60vh;
+ // overflow-y: scroll;
+
+ .dp_title {
+ font-size: 32rpx;
+ margin-bottom: 50rpx;
+ color: #555;
+ text-align: center;
+ font-weight: bold;
+ }
+
+ .dp_add {
+ position: absolute;
+ top: 40rpx;
+ right: 30rpx;
+ font-size: 22rpx;
+ background-color: #fd6004;
+ color: #fff;
+ border-radius: 10rpx;
+ padding: 5rpx 10rpx;
+
+ .u-icon {
+ display: inline-block;
+ margin-right: 5rpx;
+ }
+ }
+
+ .addressItem {
+ border: 2px dashed #d9d9d9;
+ border-radius: 10rpx;
+ width: 100%;
+ display: flex;
+ padding: 20rpx 10rpx;
+ margin: 25rpx 0 0 0;
+ align-items: center;
+ background-color: #fff;
+
+ .addrContent {
+ margin-left: 40rpx;
+ flex: 1;
+
+ .addrContentTop {
+ display: flex;
+ align-items: flex-end;
+ margin: 0 0 15rpx 0;
+ position: relative;
+
+ .userName {
+ font-size: 35rpx;
+ font-weight: bold;
+ margin-right: 30rpx;
+ }
+
+ .userTel {
+ font-size: 25rpx;
+ color: #888;
+ }
+
+ .userMoren {
+ border: 1px solid #fd6004;
+ color: #fd6004;
+ padding: 3rpx 10rpx;
+ font-size: 22rpx;
+ border-radius: 10rpx;
+ margin: 0 0 0 20rpx;
+ }
+
+ .chooseCheck {
+ position: absolute;
+ top: 3rpx;
+ right: 6rpx;
+ }
+ }
+
+ .addrContentBottom {
+ font-size: 32rpx;
+ }
+ }
+ }
+
+ .addressItem.addItem_style {
+ border-color: #fd6004;
+ }
+
+ .youhuiItem {
+ border: 1px solid #ffddea;
+ border-radius: 10rpx;
+ width: 100%;
+ display: flex;
+ padding: 20rpx 10rpx;
+ margin: 25rpx 0 0 0;
+ align-items: center;
+ background-color: #fef2f4;
+ font-size: 30rpx;
+ }
+
+ .youhuiItem > view {
+ float: left;
+ }
+
+ .youhuiItem.youItem_style {
+ border-color: #fd6004;
+ }
+}
+
+.u-grid-list {
+ // height: 40rpx;
+}
+
+.searchList {
+ .item {
+ font-size: 28rpx;
+ padding: 20rpx;
+ border-bottom: 1px solid #dadbde;
+ }
+}
+
+.scroll-view_H {
+ background-color: #fff;
+ white-space: nowrap;
+ padding: 10rpx;
+}
+
+.contentBox {
+ height: calc(100% - 50px);
+
+ .statusList {
+ padding: 10rpx;
+ box-sizing: border-box;
+ justify-content: space-between;
+
+ text {
+ text-align: center;
+ display: inline-block;
+ width: 32%;
+ padding: 20rpx 0;
+ font-size: 34rpx;
+ border-radius: 10rpx;
+ }
+
+ .cur {
+ background-color: $themeColor;
+ color: #fff;
+ box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
+ }
+ }
+
+ .twoCateList {
+ font-size: 28rpx;
+ margin-top: 20rpx;
+
+ .grid-text {
+ padding: 10rpx 0rpx;
+ text-align: center;
+ }
+
+ .cur {
+ color: $themeColor;
+ }
+
+ // .u-grid-list{border: 0.5px solid #dadbde;}
+ }
+
+ .dataList {
+ font-size: 26rpx;
+ padding-bottom: 40rpx;
+ // margin-top: 20rpx;
+ // padding: 32rpx 0rpx;
+ border-radius: 10rpx;
+ background-color: #fff;
+ box-sizing: border-box;
+
+ .JFtitleItem {
+ background-color: #ffffff;
+ padding: 20rpx 10rpx;
+ width: 100%;
+ border-bottom: 0.5px solid #f8f9fa;
+ }
+
+ .wmzhimg {
+ width: 220rpx;
+ height: 220rpx;
+ }
+ }
+}
+
+.search_box {
+ margin: 0 auto;
+ overflow: hidden;
+ align-items: center;
+ width: calc(100% - 10px);
+ margin-top: 20rpx;
+ margin-bottom: 20rpx;
+
+ .search {
+ height: 56upx;
+ display: flex;
+ width: 86%;
+ margin: 0 auto;
+ align-items: center;
+ padding: 0upx 40upx;
+ background-color: #fff;
+ border-radius: 20upx;
+ box-shadow: 0 0px 10px 1px #258feb33;
+ }
+
+ .prompt {
+ color: #838383;
+ font-size: 24rpx;
+ }
+
+ .icon_search {
+ background-image: url("@/static/icon/map_ic_search.png");
+ background-position: center center;
+ background-repeat: no-repeat;
+ background-size: cover;
+ width: 36upx;
+ height: 36upx;
+ margin-right: 20upx;
+ }
+}
+
+.flexbox {
+ display: flex;
+}
+
+.uni-modal .uni-modal__bd {
+ text-align: left;
+}
+
+.limiTy {
+ font-size: 28rpx;
+ line-height: 46rpx;
+}
+
+.chImage {
+ height: 100rpx;
+}
+
+.dataList {
+ height: 100%;
+}
+
+.titleList2 {
+ height: calc(100% - 150rpx);
+}
+
+.priceDetail {
+ height: calc(100% - 180rpx) !important;
+ padding: 0rpx 0;
+ box-sizing: border-box;
+}
+
+.componentPage {
+ height: calc(100% - 90rpx) !important;
+}
+
+.dateReminder {
+ width: 100%;
+ font-size: 24rpx;
+ text-align: right;
+ line-height: 40rpx;
+}
+
+.fdButtonBox {
+ border: 1rpx solid $themeColor;
+ background-color: $themeColor;
+ color: #fff;
+ // width: 100%;
+ float: right;
+ padding: 4rpx 14rpx;
+ font-size: 24rpx;
+ font-weight: 500;
+ line-height: 30rpx;
+ border-radius: 10rpx;
+ box-sizing: border-box;
+
+ // margin-top: 20rpx;
+ // display: flex;
+ // align-items: center;
+}
+
+.headImage {
+ // height: 400rpx !important;
+}
+
+.commonDetailPage {
+ padding-bottom: 150rpx !important;
+ background-color: #f5f5f5 !important;
+}
+
+.goods_box {
+ background-color: #fff;
+ // margin-top: 20rpx;
+ // padding: 40rpx 30rpx;
+ box-sizing: border-box;
+ width: 100%;
+
+ .curriulum_title_box {
+ width: calc(100%) !important;
+ padding-bottom: 20rpx;
+ background-color: #fff;
+
+ .curriulum_title {
+ width: calc(100%);
+ font-weight: 600;
+ font-size: 34rpx;
+ // line-height: 40rpx;
+ // display: flex;
+ // align-items: center;
+ margin-top: 80rpx;
+ margin-bottom: 0rpx;
+ // padding: 20rpx;
+ box-sizing: border-box;
+ }
+ }
+}
+
+.dataList {
+ background-color: #fff !important;
+ padding: 0 30rpx 40rpx !important;
+ box-sizing: border-box;
+}
+
+/deep/.titleItem {
+ // width: calc(100% - 120rpx) !important;
+}
+
+/deep/.scroll-view-item:nth-child(2n-1) {
+ background-color: transparent !important;
+}
+
+.dataList {
+ height: auto !important;
+}
+
+.small_class_teaching_box {
+ padding-top: 20rpx;
+ width: 100%;
+ margin-top: 20rpx;
+ background: #fff;
+
+ .small_class_teaching_top {
+ padding: 20rpx 20rpx 0 10rpx;
+ box-sizing: border-box;
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+ // background: #EDFCF7;
+ color: #8f8e8e;
+
+ // box-shadow: 0px 0px 6rpx 0px #E9DCCC;
+ .icon1 {
+ width: 50rpx;
+ height: 50rpx;
+ }
+
+ .small_class_teaching_top_left {
+ display: flex;
+ align-items: center;
+ color: #018f89;
+
+ font-family: MicrosoftYaHei;
+ }
+ }
+
+ .small_class_teaching_content {
+ margin-top: 20rpx;
+ // background: #EDFCF7;
+ padding-bottom: 10rpx;
+
+ .top {
+ padding: 20rpx 20rpx;
+ box-sizing: border-box;
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+ border-bottom: 4rpx solid #fff;
+
+ .top_item {
+ width: 23%;
+ font-family: PangMenZhengDaoBiaoTiTiMianFeiBan;
+ font-weight: normal;
+ font-size: 34rpx;
+ color: #018f89;
+ line-height: 80rpx;
+ background: #cef8ea;
+ text-align: center;
+ border-radius: 10rpx;
+ box-shadow: 0px 0px 6rpx 0px #e9dccc;
+ }
+ }
+
+ .schedule {
+ width: 100%;
+ overflow: hidden;
+ padding: 20rpx 20rpx;
+ box-sizing: border-box;
+ align-items: center;
+ color: #018f89;
+
+ font-family: MicrosoftYaHei;
+
+ .icon_box {
+ width: 100%;
+ display: flex;
+ align-items: center;
+ margin-bottom: 0rpx;
+
+ .icon1 {
+ width: 50rpx;
+ height: 50rpx;
+ margin-right: 10rpx;
+ }
+ }
+
+ .progress_box {
+ width: 100%;
+ display: flex;
+ align-items: center;
+ position: relative;
+
+ .progress_icon {
+ width: calc(100% - 240rpx);
+ }
+
+ .icon1 {
+ width: 60rpx;
+ height: 60rpx;
+ margin: 0 20rpx;
+ }
+
+ .icon2 {
+ width: 140rpx;
+ height: 100rpx;
+ position: absolute;
+ right: 0;
+ // margin-top: -20rpx;
+ }
+ }
+ }
+ }
+}
+
+.related_courses_box {
+ background-color: #fff;
+
+ .small_class_teaching_content {
+ padding: 10rpx 20rpx;
+ box-sizing: border-box;
+ }
+}
+
+.related_courses_name {
+ display: inline-block;
+ width: calc(100% - 0rpx) !important;
+
+ .aui-text-danger {
+ display: inline-block;
+ float: right;
+ }
+}
+
+.original_price {
+ font-size: 28rpx !important;
+ font-weight: 500;
+ color: #999 !important;
+ white-space: nowrap;
+ text-decoration: line-through;
+ float: left;
+ margin-top: 6rpx;
+}
+
+.price {
+ font-size: 48rpx;
+ font-weight: 700;
+ float: left;
+ margin-right: 10rpx;
+ // font-family: PangMenZhengDaoBiaoTiTiMianFeiBan;
+}
+
+.price_box {
+ width: 100%;
+ overflow: hidden;
+}
+
+.commonTags {
+ margin-right: 20rpx;
+ margin-top: -5rpx !important;
+}
+
+.sales_number {
+ text-decoration: none;
+ color: #b0b0b0;
+ font-weight: 500;
+}
+
+.miaosha_box {
+ overflow: hidden;
+
+ .countdown {
+ display: flex;
+ align-items: center;
+ color: #fff;
+ font-size: 24rpx;
+ }
+
+ .price_left {
+ width: calc(100% - 300rpx);
+ float: left;
+ }
+
+ .price_box {
+ .price {
+ color: #fff !important;
+ }
+
+ .original_price {
+ color: #e4dede !important;
+ font-weight: 500;
+ margin-left: 20rpx;
+ font-size: 26rpx !important;
+ }
+
+ .sales_number {
+ display: block;
+ width: 100%;
+ color: #fff !important;
+ font-weight: 500;
+ padding-left: 10rpx;
+ margin-left: 0rpx;
+ font-size: 24rpx !important;
+ }
+
+ padding: 30rpx 20rpx 30rpx;
+ background: linear-gradient(to right, #ff2701, #fd8d024d);
+ // height: 100rpx;
+ }
+
+ .curriulum_title {
+ padding: 20rpx 40rpx;
+ margin-top: 20rpx !important;
+ }
+}
+
+.normal_box {
+ padding: 40rpx 30rpx;
+}
+
+.xianshimaiosha_box {
+ width: 300rpx;
+ height: 100%;
+ float: right;
+}
+
+.xianshimaiosha {
+ display: inline-block;
+ width: 100%;
+ line-height: 100rpx;
+ font-family: PangMenZhengDaoBiaoTiTiMianFeiBan;
+ font-weight: blod;
+ font-size: 64rpx;
+ color: red;
+ text-align: right;
+ padding-right: 20rpx;
+ box-sizing: border-box;
+ font-style: italic;
+}
+
+// .common_curriculum_list{
+
+// }
+/deep/.common_curriculum_list {
+ margin-top: 20rpx;
+ padding: 20rpx 20rpx 20rpx;
+
+ .content_item {
+ width: 100% !important;
+ margin-bottom: 0 !important;
+ padding: 15rpx 0 0rpx;
+ border-top: 1rpx solid #f1f0f0;
+ // height: 160rpx;
+
+ .book_image {
+ width: 60rpx !important;
+ height: 60rpx !important;
+ float: left !important;
+ background-color: #f5f5f5;
+ }
+
+ .common_curriculum_item {
+ width: calc(100% - 88rpx);
+ float: right;
+ display: block !important;
+
+ // overflow: hidden;
+
+ .related_courses_name {
+ width: 100% !important;
+ }
+ }
+ }
+
+ .content_item:nth-child(1) {
+ border-top: none !important;
+ }
+}
+
+/deep/.common_section {
+ padding: 0 !important;
+ padding-bottom: 20rpx !important;
+}
+
+.goods_detail_list_title {
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+
+ .left {
+ display: flex;
+ align-items: center;
+ }
+
+ .right {
+ font-size: 24rpx;
+ font-weight: 500 !important;
+ color: #333;
+ font-family: none;
+ }
+
+ // justify-content: space-between;
+}
+
+.commonPageContentBox {
+ height: auto !important;
+}
+
+.goods_item {
+ overflow: hidden;
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+ // margin-bottom: 20rpx;
+ padding: 10rpx 20rpx;
+ border: 2rpx solid #fff;
+ border-radius: 10rpx;
+}
+
+.title {
+ box-sizing: border-box;
+ // font-weight: bold;
+ margin-bottom: 40rpx;
+ padding-left: 20rpx;
+}
+
+.image_box {
+ width: 70rpx;
+ height: 70rpx;
+ float: left;
+ background-color: #f5f5f5;
+}
+
+.goods_image {
+ width: 100%;
+ height: 100%;
+}
+
+.goods_info {
+ width: calc(100%);
+ // padding: 10rpx 20rpx;
+ box-sizing: border-box;
+ // height: 100rpx;
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+ float: left;
+
+ .name {
+ font-size: 26rpx;
+ // font-weight: 600;
+ color: #333;
+ }
+
+ .price {
+ font-size: 26rpx;
+ color: #aaa;
+ }
+}
+
+.isSelectGoods {
+ color: $themeColor !important;
+
+ .name {
+ color: $themeColor !important;
+ }
+
+ .price {
+ color: $themeColor !important;
+ }
+
+ border: 2rpx solid $themeColor;
+ border-radius: 10rpx;
+}
+
+/deep/.list_item {
+ // border-bottom: none;
+ padding: 10rpx 0 !important;
+ padding-right: 0 !important;
+}
+
+.parameterList {
+ /deep/.list_item {
+ // border-bottom: none;
+ padding: 0 !important;
+ border: none !important;
+ box-shadow: none !important;
+ }
+
+ .parameter_box {
+ padding: 20rpx 0;
+ }
+
+ .goods_item {
+ padding-top: 5rpx !important;
+ padding-bottom: 5rpx !important;
+ }
+}
+
+.parameter_info_box {
+ padding: 0 20rpx;
+}
+
+.parameter_info {
+ /deep/.list_item {
+ // border-bottom: none;
+ padding: 0 !important;
+ border: none !important;
+ box-shadow: none !important;
+ }
+
+ .goods_item {
+ border: none !important;
+ }
+}
+
+.goodsList {
+ .image_box {
+ width: 80rpx;
+ height: 80rpx;
+ float: left;
+ background-color: #f5f5f5;
+ }
+}
+
+/deep/.u-popup__content {
+ background-color: transparent !important;
+}
+
+/deep/.u-popup__content__close {
+ color: #fff !important;
+}
+
+.title_box {
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+ padding-left: 0;
+
+ .title_price {
+ color: #ef1224;
+ font-size: 40rpx;
+ font-weight: 700;
+ }
+}
+
+.title_list {
+ margin-bottom: 20rpx;
+}
+
+.book_box {
+ .image_box {
+ width: 160rpx;
+ height: 160rpx;
+ }
+
+ .goods_info {
+ display: block;
+ }
+}
+
+
+
diff --git a/pages/goods/order/index.vue b/pages/goods/order/index.vue
index 6fe6da6..08ad515 100644
--- a/pages/goods/order/index.vue
+++ b/pages/goods/order/index.vue
@@ -1,12 +1,12 @@
-
-
-
-
+
+
+
+
-
-
-
+
-
+
-
-
-
+
+
+
-
-
- {{ addressData.address }}
-
- {{ addressData.consigneeName }}
- {{ addressData.consigneePhone }}
-
-
-
-
-
- 请添加收货地址
-
-
-
-
-
+
+
+ {{ addressData.address }}
+
+ {{ addressData.consigneeName }}
+ {{ addressData.consigneePhone }}
+
+
+
+
+
+ 请添加收货地址
+
+
+
+
+
-
-
+
+
-
-
-
-
-
-
-
-
- {{ v.productName }}
-
-
-
-
-
-
- 原价:￥{{v.price}}
-
- ￥{{ v.activityPrice && v.activityPrice > 0 ? v.activityPrice : v.price}}
-
- x 1
-
-
-
-
+
+ 原价：￥{{ v.price }}
+
+
+
+
+
+
{{ number }}{{ orderNumber }}
-
+
- -->
-
-
-
-
-
-
-
- {{ v.text }}
-
-
-
+
+
+
+ {{ v.text }}
+
+
+
- {{ remark == "" ? v.placeholder : remark }}
-
-
-
+ "
+ :class="remark ? 'hidden1 hasRemark' : 'hidden1'"
+ >
+ {{ remark == "" ? v.placeholder : remark }}
+
+
+
-
-
-
-
+
+
+
-
- 价格明细
+
+ 价格明细
-
-
-
-
-
-
+
+
+
+
+
+
- {{ v.text }}
-
- (全部积分：{{ initData.user.jf }})
-
-
-
- ￥{{ totalPrice }}
-
-
- ￥{{
+ {{ v.text }}
+
+ (全部积分：{{ initData.user.jf }})
+
+
+
+ ￥{{ totalPrice }}
+
+
+ ￥{{
isShowAddress ? freightNum.toFixed(2) : Number(0).toFixed(2)
- }}
-
-
-
-
- 共({{couponHistoryList.length}})张
- 选择优惠券
-
-
- 暂无可用优惠券
-
-
-
-
- - ￥ {{curCoupon.couponEntity.couponAmount}}
- 重新选择
-
-
-
-
- -￥{{ jfNumberShow }}
-
-
-
+ }}
+
+
+
+
+ 不可用
+
+ 共 {{ selectcouponList.length }} 张
+
-
-
- 可用积分({{ jfNumberMax }}分)
-
-
-
-
-
-
+
+
+ - ￥ {{ curCoupon.couponEntity.couponAmount }}
+ 重新选择
+
+
+
+
+ -￥{{ jfNumberShow }}
+
+
+
+
+
+
+ 可用积分({{ jfNumberMax }}分)
+
+
+
+
+
+
-
-
-
- 支付方式
-
-
-
-
-
-
-
-
- {{ v.text }}
-
- (余额：{{
- initData && initData.user ? initData.user.peanutCoin : 0
- }})
-
+
+
+
+ 支付方式
+
+
+
+
+
+
+
+
+ {{ v.text }}
+
+ (余额：{{
+ initData && initData.user ? initData.user.peanutCoin : 0
+ }})
+
- {{ v.text }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ v.text }}
-
- (余额：{{
- initData && initData.user ? initData.user.peanutCoin : 0
- }})
-
+ {{ v.text }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ v.text }}
+
+ (余额：{{
+ initData && initData.user ? initData.user.peanutCoin : 0
+ }})
+
- {{ v.text }}
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-
- 确保您的天医币足够支付
-
+ "
+ >
+
+
+ 确保您的天医币足够支付
+
- 立即充值
-
+ "
+ >立即充值
+
-
- 说明
- 1. 1天医币 = 1元人民币
-
- 2.若有疑问或意见请致电客服
- 022-24142321
-
-
-
- 3.非中国大陆用户可以信用卡支付。简单快捷，推荐使用！
- 支付时使用的信用卡需要带有Visa或MasterCard的标识。请向邮箱
-
- publisher@tmrjournals.com
-
- （点击复制）发送支付请求，内容需包含：拟购买的课程名称、支付金额、APP注册姓名及手机号码，或者加一路健康客服微信（
-
- yilujiankangkefu ）（点击复制）联系我们，我们将在24小时内向您的邮箱或者微信发送支付链接，根据提示即可完成信用卡支付，无需兑换外币。
-
-
-
-
-
+ 3.非中国大陆用户可以信用卡支付。简单快捷，推荐使用！
+ 支付时使用的信用卡需要带有Visa或MasterCard的标识。请向邮箱
+
+ publisher@tmrjournals.com
+
+ （点击复制）发送支付请求，内容需包含：拟购买的课程名称、支付金额、APP注册姓名及手机号码，或者加一路健康客服微信（
+
+ yilujiankangkefu ）（点击复制）联系我们，我们将在24小时内向您的邮箱或者微信发送支付链接，根据提示即可完成信用卡支付，无需兑换外币。
+
+
+
+
+
-
-
-
-
+ }%;padding-left: 15px; padding-right: 15px; height: 68rpx;`"
+ :list="cateList"
+ :currentCateIndex="currentCateIndex"
+ @handleselectCate="handleselectCate"
+ >
+
+
-
-
-
-
-
-
- 共{{ number }}件
- 合计:
+
+
+
+
+
+ 共{{ number }}件
+ 合计:
- ￥{{ actualPayment }}
-
-
-
-
+ ￥{{ actualPayment }}
+
+
+
+
-
-
+
-
-
-
-
-
-
+
+
+
-
-
-
-
+ "
+ >
+
+
+
+ 订单备注
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
+@import "@/style/mixin.scss";
+
+.order_box {
+ padding: 20rpx;
+
+ .order_top {
+ background-color: #fff;
+ margin-bottom: 20rpx;
+ }
+
+ .goods_item {
+ //
+ width: 100%;
+ overflow: hidden;
+
+ .textarea {
+ margin-top: 20rpx;
+ background-color: #fffdfd;
+ }
+
+ .goods_item_img {
+ width: 140rpx;
+ height: 140rpx;
+ float: left;
+ background-color: #f5f5f5;
+ border-radius: 10rpx;
+ }
+
+ .normal_box {
+ width: calc(100% - 160rpx);
+ height: auto;
+ float: right;
+
+ // overflow: hidden;
+ .normal_box_top {
+ width: 100%;
+ display: flex;
+
+ height: 100rpx;
+ // margin-bottom: 40rpx;
+ }
+ }
+ }
+}
+
+.u-grid-list {
+ // height: 40rpx;
+}
+
+.flexbox {
+ display: flex;
+}
+
+.dataList {
+ height: 100%;
+}
+
+.titleList2 {
+ height: calc(100% - 150rpx);
+}
+
+.priceDetail {
+ height: calc(100% - 180rpx) !important;
+ padding: 0rpx 0;
+ box-sizing: border-box;
+}
+
+.componentPage {
+ height: calc(100% - 90rpx) !important;
+}
+
+.dateReminder {
+ width: 100%;
+ font-size: 24rpx;
+ text-align: right;
+ line-height: 40rpx;
+}
+
+.fdButtonBox {
+ border: 1rpx solid $themeColor;
+ background-color: $themeColor;
+ color: #fff;
+ // width: 100%;
+ float: right;
+ padding: 4rpx 14rpx;
+ font-size: 24rpx;
+ font-weight: 500;
+ line-height: 30rpx;
+ border-radius: 10rpx;
+ box-sizing: border-box;
+
+ // margin-top: 20rpx;
+ // display: flex;
+ // align-items: center;
+}
+
+.commonDetailPage {
+ font-size: 28rpx;
+ padding-bottom: 150rpx !important;
+}
+
+.goods_box {
+ background-color: #fff;
+ // margin-top: 20rpx;
+ // padding: 40rpx 30rpx;
+ box-sizing: border-box;
+ width: 100%;
+
+ .title {
+ color: #333;
+ font-weight: 600;
+ margin-bottom: 20rpx;
+ }
+
+ .curriulum_title_box {
+ width: calc(100%) !important;
+ padding-bottom: 20rpx;
+ background-color: #fff;
+
+ .curriulum_title {
+ // width: calc(100% - 80rpx);
+ width: calc(100% - 130rpx);
+ font-weight: 500;
+ font-size: 30rpx;
+ // line-height: 40rpx;
+ // display: flex;
+ // align-items: center;
+ margin-top: 10rpx;
+ float: left;
+ margin-bottom: 0rpx;
+ color: #333;
+ // padding: 20rpx;
+ box-sizing: border-box;
+ }
+ }
+}
+
+.dataList {
+ background-color: #fff !important;
+ padding: 0 30rpx 40rpx !important;
+ box-sizing: border-box;
+}
+
+/deep/.titleItem {
+ // width: calc(100% - 120rpx) !important;
+}
+
+/deep/.scroll-view-item:nth-child(2n-1) {
+ background-color: transparent !important;
+}
+
+.dataList {
+ height: auto !important;
+}
+
+.related_courses_box {
+ background-color: #fff;
+
+ .small_class_teaching_content {
+ padding: 10rpx 20rpx;
+ box-sizing: border-box;
+ }
+}
+
+.related_courses_name {
+ display: inline-block;
+ width: calc(100% - 150rpx) !important;
+
+ .aui-text-danger {
+ display: inline-block;
+ float: right;
+ }
+}
+
+.original_price {
+ font-size: 28rpx !important;
+ font-weight: 500;
+ color: #999 !important;
+ white-space: nowrap;
+ text-decoration: line-through;
+ float: left;
+ margin-top: 6rpx;
+}
+
+.price {
+ width: auto;
+ font-size: 30rpx;
+ font-weight: 600;
+ float: right;
+ margin-right: 10rpx;
+ color: #333;
+ // font-family: PangMenZhengDaoBiaoTiTiMianFeiBan;
+}
+
+.price_box {
+ width: auto;
+ overflow: hidden;
+ margin-top: 10rpx;
+}
+
+.commonTags {
+ margin-right: 20rpx;
+ margin-top: -5rpx !important;
+}
+
+.sales_number {
+ text-decoration: none;
+ color: #b0b0b0;
+ font-weight: 500;
+}
+
+// .common_curriculum_list{
+
+// }
+/deep/.common_curriculum_list {
+ margin-top: 20rpx;
+ padding: 20rpx 20rpx 20rpx;
+
+ .content_item {
+ width: 100% !important;
+ margin-bottom: 0 !important;
+ padding: 15rpx 0 0rpx;
+ border-top: 1rpx solid #f1f0f0;
+ // height: 160rpx;
+
+ .book_image {
+ width: 60rpx !important;
+ height: 60rpx !important;
+ float: left !important;
+ background-color: #f5f5f5;
+ }
+
+ .common_curriculum_item {
+ width: calc(100% - 88rpx);
+ float: right;
+ display: block !important;
+
+ // overflow: hidden;
+
+ .related_courses_name {
+ width: 100% !important;
+ }
+ }
+ }
+
+ .content_item:nth-child(1) {
+ border-top: none !important;
+ }
+}
+
+/deep/.common_section {
+ padding: 0 !important;
+ padding-bottom: 20rpx !important;
+}
+
+.goods_detail_list_title {
+ display: block;
+ padding-top: 20rpx;
+ padding-bottom: 40rpx;
+
+ .linlanzhifu {
+ display: flex;
+ align-items: center;
+ }
+
+ .other_info {
+ font-size: 28rpx;
+ // color: #aaa;
+ color: #5a5a5a;
+
+ .explain {
+ }
+ }
+
+ .left {
+ display: flex;
+ align-items: center;
+ }
+
+ .right {
+ font-size: 24rpx;
+ font-weight: 500 !important;
+ color: #999;
+ font-family: none;
+ }
+
+ // justify-content: space-between;
+}
+
+.commonPageContentBox {
+ height: auto !important;
+}
+
+.minus {
+ width: 50rpx;
+ height: 50rpx;
+ border-width: 2rpx;
+ border-color: #e6e6e6;
+ border-right-color: transparent;
+
+ border-top-left-radius: 10rpx;
+ border-bottom-left-radius: 10rpx;
+ border-style: solid;
+ // border-top-left-radius: 100px;
+ // border-top-right-radius: 100px;
+ // border-bottom-left-radius: 100px;
+ // border-bottom-right-radius: 100px;
+ // border-radius:10rpx;
+ @include flex;
+ justify-content: center;
+ align-items: center;
+}
+
+.input {
+ padding: 0 10px;
+ height: 50rpx;
+ border: 1rpx solid #e6e6e6;
+}
+
+.plus {
+ width: 50rpx;
+ height: 50rpx;
+ border-width: 2rpx;
+ border-color: #e6e6e6;
+ border-left-color: transparent;
+ border-style: solid;
+ // background-color: #258feb;
+
+ border-top-right-radius: 10rpx;
+ border-bottom-right-radius: 10rpx;
+ /* #ifndef APP-NVUE */
+ display: flex;
+ /* #endif */
+ justify-content: center;
+ align-items: center;
+ color: $themeColor;
+}
+
+.order_bottom_box {
+ position: absolute;
+ right: 20rpx;
+
+ .number {
+ font-size: 28rpx;
+ margin-right: 15rpx;
+ margin-top: 5rpx;
+ }
+
+ .price {
+ .total {
+ font-size: 38rpx;
+ color: red;
+ }
+ }
+}
+
+/deep/.goods_nav_box {
+ .left {
+ margin-top: -10rpx;
+ width: calc(100% - 220rpx);
+ height: auto;
+ position: relative;
+ // overflow: hidden;
+ }
+}
+
+.explain {
+ word-wrap: break-word;
+ word-break: normal;
+ word-break: break-all; //会断词
+ // white-space: nowrap;
+}
+
+.order_bottom_box {
+ display: flex;
+ align-items: center;
+}
+
+.pay_box {
+ .pay_item {
+ border-bottom: 1rpx solid #eeecec;
+ padding-top: 20rpx;
+ justify-content: space-between;
+
+ .top {
+ width: 100%;
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+ }
+
+ .left {
+ line-height: 50rpx;
+ font-family: MicrosoftYaHei;
+ font-weight: 500;
+
+ color: #242323;
+
+ .pay_item_img {
+ width: 50rpx;
+ height: 50rpx;
+ float: left;
+ margin-right: 20rpx;
+ }
+ }
+
+ .bottom {
+ width: calc(100% - 60rpx);
+ float: right;
+ // background-color: #dcdfe6;
+ background-color: #f5f5f5;
+ border-radius: 20rpx;
+ margin-top: 20rpx;
+
+ .jf_box {
+ width: 100%;
+ display: flex;
+ align-items: center;
+ padding: 0 20rpx;
+ box-sizing: border-box;
+ justify-content: space-between;
+ color: #aaa;
+ }
+
+ .jf_input {
+ width: calc(100% - 320rpx) !important;
+ padding: 10rpx 0;
+ box-sizing: border-box;
+ }
+ }
+ }
+
+ /deep/.pay_item:nth-last-child(1) {
+ border-bottom: none !important;
+ }
+}
+
+.linlanzhifu {
+ font-size: 28rpx;
+ line-height: 24rpx;
+}
+
+.address_box {
+ // padding: 20rpx;
+ display: flex;
+ align-items: center;
+
+ .order_top {
+ background-color: #fff;
+ // margin-bottom: 20rpx;
+ }
+
+ .user_info {
+ width: 100%;
+ float: left;
+ display: flex;
+ margin-top: 10rpx;
+ align-items: center;
+
+ .name {
+ color: #838282;
+ margin-right: 10rpx;
+ }
+
+ .tel {
+ color: #838282;
+ }
+ }
+
+ .curriulum_title {
+ width: auto;
+ font-size: 34rpx;
+ font-weight: 700;
+ float: left;
+ margin-right: 10rpx;
+ color: #333;
+ line-height: 50rpx;
+ letter-spacing: 2rpx;
+ }
+
+ .normal_box {
+ margin-left: 5rpx;
+ width: calc(100% - 120rpx);
+ }
+
+ .goods_box {
+ padding: 20rpx 20rpx;
+ display: flex;
+ align-items: center;
+ }
+
+ .rightArrow {
+ margin-left: 40rpx;
+ width: 40rpx;
+ height: 40rpx;
+ // position: absolute;
+ // right: 30rpx;
+ }
+}
+
+.rightArrow {
+ width: 40rpx;
+ height: 40rpx;
+ // position: absolute;
+ // right: 30rpx;
+}
+
+.orderModalShow {
+ width: 100%;
+ max-height: 48vh;
+ padding-bottom: 120rpx;
+}
+
+.popup_box {
+ .curriulum_title_box {
+ .title {
+ text-align: center;
+ font-size: 34rpx !important;
+ padding-top: 15rpx !important;
+ margin-bottom: 60rpx !important;
+ }
+ }
+}
+
+.hasRemark {
+ color: #333 !important;
+ font-size: 40rpx !important;
+}
+
+.bgGrey {
+ // background-color: #f5f5f5;
+}
+
+.minus {
+ width: 22px;
+ height: 22px;
+ border-width: 1px;
+ border-color: #e6e6e6;
+ border-style: solid;
+ border-top-left-radius: 100px;
+ border-top-right-radius: 100px;
+ border-bottom-left-radius: 100px;
+ border-bottom-right-radius: 100px;
+ @include flex;
+ justify-content: center;
+ align-items: center;
+}
+
+.input {
+ padding: 0 10px;
+}
+
+.plus {
+ width: 22px;
+ height: 22px;
+ background-color: #ff0000;
+ border-radius: 50%;
+ /* #ifndef APP-NVUE */
+ display: flex;
+ /* #endif */
+ justify-content: center;
+ align-items: center;
+}
+
diff --git a/pages/mine/wallet/couponList.vue b/pages/mine/wallet/couponList.vue
index 6364615..e8b6897 100644
--- a/pages/mine/wallet/couponList.vue
+++ b/pages/mine/wallet/couponList.vue
@@ -1,297 +1,290 @@
-
-
-
-
-
-
-
-
-
-
-
-
- ￥
- {{item.couponEntity.couponAmount}}
- 满{{item.couponEntity.useLevel}}元可用
-
-
-
- {{item.couponEntity.couponName}}
- {{item.couponEntity.couponRange | couponType}}
-
- 到期时间：{{item.effectType == 0 ? '永久有效' : item.endTime}}
- 说明：{{item.couponEntity.remark}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/static/icon/coupon/bottom.png b/static/icon/coupon/bottom.png
new file mode 100644
index 0000000..0db68b4
Binary files /dev/null and b/static/icon/coupon/bottom.png differ
diff --git a/unpackage/wumen20241101103101.wgt b/unpackage/wumen20241101103101.wgt
new file mode 100644
index 0000000..b5c0cae
Binary files /dev/null and b/unpackage/wumen20241101103101.wgt differ