diff --git a/.hbuilderx/launch.json b/.hbuilderx/launch.json
index 5be1b72..b5014f6 100644
--- a/.hbuilderx/launch.json
+++ b/.hbuilderx/launch.json
@@ -24,7 +24,7 @@
"type" : "uni-app:app-ios"
},
{
- "playground" : "custom",
+ "playground" : "standard",
"type" : "uni-app:app-android"
},
{
diff --git a/pages/bookShop/orderLCont.vue b/pages/bookShop/orderLCont.vue
index de50514..31a67bb 100644
--- a/pages/bookShop/orderLCont.vue
+++ b/pages/bookShop/orderLCont.vue
@@ -136,9 +136,16 @@
>
- ×{{ item.quantity ? item.quantity : "" }}
+ ￥{{ item.price }}
+
+
+
+ ×{{ item.quantity ? item.quantity : "" }}
+
+
@@ -15,7 +24,30 @@
￥{{ selectGoodsData.activityPrice?selectGoodsData.activityPrice:selectGoodsData.price }}
+
+
+ ￥{{(selectGoodsData.vipPrice).toFixed(2)}}
+ VIP到手价
+
+
+
+
+
+
+
+ ￥{{(selectGoodsData.activityPrice).toFixed(2)}}
+ 活动价
+
+
+
+
+
+
+ ￥{{Number(selectGoodsData.price).toFixed(2)}}
+
-
+
-
+
{{ slotProps.row.productName }}
-
-
+
+
+
+ ￥{{ slotProps.row.vipPrice.toFixed(2) }}
+
+ ￥{{ Number(slotProps.row.price).toFixed(2) }}
+
+
+
+ ￥{{ slotProps.row.activityPrice.toFixed(2) }}
+
+ ￥{{ Number(slotProps.row.price).toFixed(2) }}
+
+
+ ￥{{ Number(slotProps.row.price).toFixed(2) }}
+
+ VIP优惠
+
+
@@ -109,7 +220,7 @@ export default {
"selectGoodsData",
"customButtonGroup1",
"buyOptions",
- "isFudu", // 是否复读
+ "isFudu", // 是否复读
],
data() {
return {
@@ -166,7 +277,7 @@ export default {
\ No newline at end of file
+@import "@/style/mixin.scss";
+
+.classItemBox {
+ .jianjie {
+ @include bov(2);
+ }
+}
+
+.nomargin {
+ margin: 0 !important;
+}
+
+.nopadding {
+ padding: 0 !important;
+}
+
+.noRadius {
+ border-radius: 0 !important;
+}
+
+.appJump {
+ position: fixed;
+ right: 0;
+ top: 8%;
+ z-index: 1;
+
+ .item {
+ background: rgba(255, 255, 255, 0.9);
+ margin-bottom: 20rpx;
+ border: 1px solid #fff;
+ align-items: center;
+ padding-right: 10rpx;
+ overflow: hidden;
+ border-radius: 50rpx 0 0 50rpx;
+
+ text {
+ font-size: 20rpx;
+ }
+
+ .img {
+ // width: 60rpx; height: 60rpx;
+ padding: 6rpx;
+ overflow: hidden;
+
+ image {
+ width: 36rpx;
+ height: 36rpx;
+ border-radius: 100%;
+ }
+ }
+ }
+}
+
+.newsBox {
+ justify-content: space-between;
+ background-color: #fff;
+ @include mshadow(10px, 1);
+ margin-top: 10px;
+ overflow: hidden;
+ border-radius: 20rpx;
+ padding: 10rpx;
+ overflow: hidden;
+
+ .icon {
+ width: 44rpx;
+ }
+
+ .newscoll {
+ overflow: hidden;
+ width: calc(100% - 60rpx);
+ height: 40rpx;
+ border: #11a669;
+ line-height: 50rpx;
+
+ .item {
+ .swiper-item {
+ font-size: 28rpx;
+ @include toe();
+ }
+ }
+ }
+}
+
+.containerBg {
+ background-color: $containerColor;
+}
+
+.shiting {
+ flex-wrap: wrap;
+ justify-content: space-between;
+ margin-bottom: 40rpx;
+
+ .buyItems {
+ align-items: center;
+
+ .buybtn {
+ display: block;
+ width: 28%;
+ padding: 0 4px;
+ font-size: 24rpx;
+ line-height: 40rpx;
+ text-align: center;
+ background-color: $themeColor;
+ color: #fff;
+ border-radius: 20rpx;
+ height: 40rpx;
+ }
+
+ .txt555 {
+ width: 70%;
+ overflow: hidden;
+ }
+ }
+}
+
+.moreBox {
+ margin-top: 10px;
+ text-align: center;
+
+ text {
+ display: inline-block;
+ border: 1px solid $themeColor;
+ // @include theme("btn_bg");
+ padding: 14rpx 0;
+ width: 80%;
+ border-radius: 60rpx;
+ color: $themeColor;
+ }
+}
+
+.supermarket {
+ @include pleft_right(5px) .borderbb {
+ background-image: linear-gradient(180deg, #468aff 0%, #46c0ff 100%);
+ @include pleft_right(10px);
+ border-radius: 20rpx;
+ @include ptop_bottm(10px);
+ @include mshadow(10px, 1);
+ }
+
+ .tips {
+ margin-top: 10px;
+ background-color: #e9f0ff;
+ padding: 5px;
+ border-radius: 5px;
+ font-size: 24rpx;
+
+ text {
+ font-weight: bold;
+ color: $themeColor;
+ }
+ }
+}
+
+.seckillBox {
+ .hightLightTitleBox {
+ background: url("@/static/level_bg_red.png") center top no-repeat;
+ background-size: contain;
+ height: 60rpx;
+ color: red;
+ }
+}
+
+.seckill {
+ @include pleft_right(5px) .borderbb {
+ background-image: linear-gradient(180deg, #d93737 0%, #fff 100%);
+ @include pleft_right(10px);
+ border-radius: 20rpx;
+ @include ptop_bottm(10px);
+ @include mshadow(10px, 1);
+ }
+
+ .yxTagBox {
+ width: 100%;
+ }
+
+ .tips {
+ margin-top: 10px;
+ background-color: #e9f0ff;
+ padding: 5px;
+ border-radius: 5px;
+ font-size: 24rpx;
+
+ text {
+ font-weight: bold;
+ color: $themeColor;
+ }
+ }
+
+ .main {
+ background-color: #fff;
+ @include pleft_right(10px);
+ @include ptop_bottm(10px);
+ border-radius: 20rpx;
+
+ .ftitle {
+ font-size: 34rpx;
+ color: red;
+ font-weight: bold;
+ }
+ }
+
+ .item {
+ display: inline-block;
+ overflow: hidden;
+
+ .name {
+ font-size: 24rpx;
+ @include toe();
+ margin-top: 10rpx;
+ }
+
+ .price {
+ font-size: 26rpx;
+
+ color: #666;
+ padding-top: 10rpx;
+ }
+
+ .fall {
+ background-image: linear-gradient(90deg, #e70503 0%, #e7a535 100%);
+ border-radius: 10px;
+ color: #fff;
+ padding: 4rpx;
+ padding-bottom: 8rpx;
+ height: 50rpx;
+ line-height: 40rpx;
+ position: relative;
+ margin-top: 50rpx;
+ font-size: 24rpx;
+
+ .mprice {
+ width: 52%;
+ font-size: 28rpx;
+ font-weight: bold;
+ }
+ }
+
+ image {
+ width: 100%;
+ height: 240rpx;
+ }
+ }
+}
+.cprice {
+ color: #fff;
+ text-align: center;
+ padding: 60rpx 0 20rpx;
+ width: 58px;
+ height: 65px;
+ box-sizing: border-box;
+ font-weight: 500;
+ font-size: 10px;
+ z-index: 10;
+ line-height: 24rpx;
+ position: absolute;
+ left: 0;
+ top: -30px;
+ background: url(@/static/icon/zhijiang.png) center no-repeat;
+ background-size: 100% 100%;
+}
+.supermarketBox {
+ .hightLightTitleBox {
+ background: url("@/static/level_bg_green.png") center top no-repeat;
+ background-size: contain;
+ height: 60rpx;
+ color: $themeColor;
+ }
+
+ .main {
+ background-color: #fff;
+ @include pleft_right(10px);
+ @include ptop_bottm(10px);
+ border-radius: 20rpx;
+
+ .flexbox {
+ justify-content: space-between;
+ }
+ }
+
+ .item {
+ overflow: hidden;
+ width: 23%;
+
+ .name {
+ font-size: 24rpx;
+ @include toe();
+ margin-top: 10rpx;
+ }
+
+ .price {
+ text-align: center;
+ font-size: 26rpx;
+ font-weight: bold;
+ color: $themeColor;
+ padding-top: 10rpx;
+ }
+
+ image {
+ width: 100%;
+ height: 240rpx;
+ }
+ }
+}
+
+.hightLightTitleBox {
+ margin: 20rpx 0;
+ text-align: center;
+ line-height: 60rpx;
+
+ text {
+ font-size: 30rpx;
+ font-weight: bold;
+ }
+}
+
+.moreBtn {
+ color: $themeColor;
+ font-size: 26rpx;
+}
+
+.learnBox {
+ background-color: #fff;
+ margin-top: 10px;
+ border-radius: 20rpx;
+ @include ptop_bottm(10px);
+ @include pleft_right(10px);
+ @include mshadow(10px, 1);
+ margin-bottom: 10px;
+
+ .img {
+ width: 100%;
+ height: 180rpx;
+ background-color: #f7f7f7;
+ display: flex;
+ align-items: center;
+ }
+
+ .learn {
+ justify-content: space-between;
+ margin-top: 20rpx;
+ flex-wrap: wrap;
+
+ .item {
+ width: 48%;
+
+ overflow: hidden;
+
+ image {
+ width: 100%;
+ height: 200rpx;
+ }
+
+ .txt555 {
+ height: 40rpx;
+ line-height: 40rpx;
+ @include bov(1);
+ margin-top: 10rpx;
+ font-size: 24rpx;
+ }
+ }
+ }
+}
+
+.titleBox {
+ align-items: center;
+
+ image {
+ width: 50rpx;
+ height: 50rpx;
+ }
+
+ text {
+ font-size: 30rpx;
+ padding-left: 10rpx;
+ align-items: center;
+ }
+}
+
+.fourBox {
+ @include pleft_right(4px);
+}
+
+.childrenBox {
+ background-color: #e4eefa !important;
+ // border:1px solid #e4eefa;
+ border-radius: 6rpx !important;
+ @include mshadow(10px, 1);
+ // background-color: #fff;
+ justify-content: center;
+ box-shadow: none !important;
+ // border-radius: 0 !important;
+
+ .item {
+ text {
+ color: #3361a5;
+ }
+ }
+
+ image {
+ width: 80rpx;
+ height: 80rpx;
+ }
+}
+
+.homeTestBox {
+ background-color: #ffaa00;
+ color: #fff;
+}
+
+.children_cate {
+ justify-content: space-evenly;
+ padding: 0 10rpx;
+ background-color: #fff;
+ display: flex;
+ justify-items: normal;
+ padding-top: 12rpx;
+ overflow: hidden;
+ padding-bottom: 10rpx;
+
+ .item {
+ width: 100%;
+ text-align: center;
+ margin-right: 1px;
+ font-size: 32rpx;
+ padding: 10rpx;
+ color: #fff;
+ // background-color: #55aa7f;
+ background-color: #eee;
+ color: #333;
+ border-radius: 10rpx;
+ }
+
+ .item:last-child {
+ margin-right: 0;
+ }
+
+ .cur {
+ color: #55aa7f;
+ font-weight: bold;
+ border-radius: 5rpx;
+ }
+}
+
+.fourIcon {
+ justify-content: space-between;
+ box-shadow: 0px 0px 10px 0px rgba(167, 187, 228, 1);
+ // margin-bottom: 8px;
+ // border: 1px solid #fff;
+ text-align: center;
+ height: 60px;
+ // border: 2px solid #e0e9ff;
+ background-color: #fff;
+ border-radius: 10px;
+ // @include theme('fourIcon') ;
+ line-height: 60px;
+
+ .item {
+ align-items: center;
+ }
+
+ text {
+ font-size: 28rpx;
+ color: #76664d;
+ padding-left: 6rpx;
+ }
+
+ image {
+ width: 48rpx;
+ height: 48rpx;
+ margin: 0 auto;
+ }
+}
+
+.activityPrice {
+ font-size: 60rpx;
+}
+
+.ProTabs {
+ // margin: 20rpx 0;
+ padding: 0 20rpx;
+
+ text {
+ padding: 8rpx 14rpx;
+ font-size: 32rpx;
+ display: inline-block;
+ border-radius: 10rpx;
+ overflow: hidden;
+ // background-color: #eee;
+ color: #55aa7f;
+ margin-right: 10rpx;
+ }
+
+ text.cur {
+ background-color: #55aa7f;
+ color: #fff;
+ }
+}
+
+.New_ProTabs {
+ justify-content: space-between;
+ background-color: #fff;
+ padding-left: 5px;
+ padding-right: 5px;
+
+ text {
+ // max-width: 12.5%;
+ // background-color: #56565633;
+ font-size: 32rpx;
+ padding: 5px 3px;
+ font-weight: bold;
+ display: block;
+ width: 100%;
+ border-radius: 10rpx;
+ overflow: hidden;
+ // background-color: #eee;
+ color: #333;
+ // white-space:wrap !important;
+ text-align: center;
+ }
+
+ text.cur {
+ background-color: #55aa7f;
+ color: #fff;
+ }
+}
+
+// .newBook{margin-top: 10rpx;}
+.scroll-view_H {
+ background-color: #fff;
+ white-space: nowrap;
+ padding: 10rpx;
+ margin-top: 12rpx;
+}
+
+.scroll-view_H {
+ .item {
+ padding: 10rpx;
+ overflow: hidden;
+ display: inline-block;
+ padding-bottom: 0;
+ width: 210rpx !important;
+ margin-right: 8rpx;
+ border-radius: 10rpx;
+
+ .videoBox {
+ image {
+ display: block;
+ width: 150rpx;
+ height: 170rpx;
+ }
+ }
+
+ .bookName {
+ display: block;
+ margin-top: 6rpx;
+ color: #666;
+ font-size: 24rpx;
+ white-space: nowrap;
+ overflow-x: hidden;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ }
+ }
+
+ // .item.active{margin-right: 20rpx; border: 1px solid #55aa00; border-radius: 10rpx;}
+}
+
+.flexbox {
+ display: flex;
+}
+
+.home_bg {
+ background-image: url("@/static/icon/home_bg.jpg");
+ background-position: center center;
+ background-repeat: no-repeat;
+ background-size: cover;
+ padding: 30rpx 20rpx;
+ position: relative;
+ padding-bottom: 40rpx;
+
+ // margin-bottom:60rpx;
+ // height: 400rpx; margin-bottom: 130rpx;
+ .icon_hua_1 {
+ // margin: 0 auto;
+ width: 100%;
+ text-align: center;
+ height: 80rpx;
+
+ image {
+ width: 150rpx;
+ height: 80rpx;
+ }
+ }
+
+ .icon_hua {
+ width: 100%;
+ text-align: center;
+ display: block;
+
+ image {
+ width: 150rpx;
+ height: 150rpx;
+ margin: 0 auto;
+ }
+ }
+}
+
+.topSearch_box {
+ image {
+ width: 48rpx;
+ height: 48rpx;
+ position: absolute;
+ top: 54rpx;
+ right: 30rpx;
+ }
+}
+
+.search_box {
+ margin: 20rpx auto 10rpx auto;
+ align-items: center;
+ width: calc(100% - 30rpx);
+ margin-bottom: 20rpx;
+
+ .search {
+ height: 56upx;
+ display: flex;
+ width: 100%;
+ margin: 0 auto;
+ align-items: center;
+ padding: 0upx 40upx;
+ background-color: #fff;
+ border-radius: 20upx;
+ box-shadow: 0 0px 10px 1px #54a96633;
+ }
+
+ .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;
+ }
+
+ .searBtn {
+ width: 180rpx;
+ line-height: 56rpx;
+ text-align: center;
+ align-items: center;
+ font-size: 28rpx;
+ color: #fff;
+ margin-left: -80rpx;
+ background-color: #11a669;
+ border-top-right-radius: 20upx;
+ border-bottom-right-radius: 20upx;
+ }
+}
+
+.newLeve2 {
+ // box-shadow: 0px 0px 6px 0px rgba(0, 0, 0, 0.3);
+ background-color: #fff;
+ padding: 0 10rpx;
+ border-top: 1px solid #eee;
+ padding-top: 4rpx;
+ // padding-bottom:2rpx;
+}
+
+.home_nar {
+ margin: 10px 0;
+ justify-content: space-between;
+ color: #333;
+ margin-bottom: 0;
+
+ @include pleft_right(5px) .hn_cl_tit {
+ display: block;
+ width: 100%;
+ background-color: #fff;
+ text-align: center;
+ // border-radius: 20rpx;
+ align-content: center;
+ justify-content: center;
+ margin-right: 8rpx;
+ border-bottom: 1px solid #fff;
+ // box-shadow: 0px 0px 6px 0px rgba(0, 0, 0, 0.3);
+
+ image {
+ width: 100rpx;
+ height: 90rpx;
+ display: block;
+ margin: 0 auto;
+ padding: 20rpx;
+ // margin: 0 20rpx;
+ }
+
+ text {
+ display: block;
+ padding-bottom: 20rpx;
+ text-align: center;
+ margin-top: 4rpx;
+ font-size: 28rpx;
+ color: #00337f;
+ font-weight: blod;
+ }
+ }
+
+ .hn_cl_tit:last-child {
+ margin-right: 0;
+ }
+
+ .hn_cl_tit.active {
+ background-color: #e4eefa;
+
+ // position: relative;
+ text {
+ color: #3361a5;
+ // font-weight: bold;
+ }
+ }
+
+ // .hn_cl_tit.active::after{
+ // display: block;
+ // transform: rotate(180deg);
+ // content: ''; position: absolute; bottom: -20rpx; left: calc(50% - 16rpx); z-index: 1;
+ // border-right: 20rpx solid transparent;
+ // border-left: 20rpx solid transparent;
+ // border-bottom: 20rpx solid #ffff;
+ // }
+}
+
+.home_shujia {
+ margin: 40rpx 20rpx 0 20rpx;
+ display: flex;
+ color: #333;
+
+ .hn_sj {
+ width: 20%;
+ text-align: center;
+ font-size: 26upx;
+
+ image {
+ width: 100upx;
+ height: 100upx;
+ margin: 0 auto;
+ }
+ }
+}
+
+.limited {
+ width: 100%;
+ height: auto;
+ padding: 20rpx 10rpx 10rpx 10rpx;
+ display: flex;
+ align-items: center;
+ background-color: #fff;
+ margin-top: 50rpx;
+
+ .limitedSymbol {
+ width: 22%;
+ height: 300rpx;
+ border-right: 1px solid #eee;
+ vertical-align: middle;
+
+ image {
+ width: 120rpx;
+ height: 120rpx;
+ margin: 45px auto 0 auto;
+ }
+ }
+
+ .limitedScrollBox {
+ width: 76%;
+ padding: 0 10rpx;
+ }
+
+ .limitedItem {
+ width: 200rpx;
+ text-align: center;
+
+ image {
+ width: 150upx;
+ height: 200upx;
+ margin: 15rpx auto 20rpx auto;
+ }
+
+ text {
+ font-size: 20rpx;
+ display: block;
+ }
+
+ .biaoti {
+ font-size: 30rpx;
+ margin: 10rpx 0 10rpx 0;
+ font-weight: bold;
+ }
+
+ .xian {
+ font-size: 32rpx;
+ color: #bf0c0c;
+ font-weight: bold;
+ }
+
+ .yuan {
+ text-decoration: line-through;
+ color: #c1c1c1;
+ }
+ }
+}
+
+.imgcontainer {
+ background-color: $imgBg;
+}
+
+.classItemBox {
+ margin-top: 20rpx;
+ height: 250rpx;
+
+ swiper-item {
+ padding: 10rpx;
+ width: 90% !important;
+
+ .wid90 {
+ width: 90% !important;
+ }
+
+ .classItem {
+ border: 1px solid #eee;
+ border-radius: 10rpx;
+ padding: 10rpx;
+ }
+
+ padding-right: 20rpx;
+ box-sizing: border-box;
+ }
+}
+
+.classItem {
+ .className {
+ font-weight: bold;
+ font-size: 32rpx;
+ }
+
+ .textBox {
+ margin-left: 20rpx;
+ flex: 1;
+ align-items: center;
+ }
+
+ .img {
+ width: 200rpx;
+ height: 200rpx;
+ overflow: hidden;
+
+ imgage {
+ width: 100%;
+ height: 100%;
+ }
+ }
+}
+
+.retake {
+ border: 1px solid #fff;
+ color: #fff;
+}
+.superBox {
+ padding: 0 5px;
+}
+.super_block {
+ margin-top: 20rpx;
+}
+.scroll-view {
+}
+.super_product_list {
+ display: inline-flex;
+ padding-bottom: 20rpx;
+
+ .super_product_item {
+ width: 185rpx;
+ margin-right: 20rpx;
+ box-sizing: border-box;
+
+ image {
+ display: block;
+ width: 100%;
+ height: 185rpx;
+ }
+ text {
+ text-align: center;
+ font-size: 24rpx;
+ display: block;
+ width: 100%;
+ height: 36rpx;
+ line-height: 36rpx;
+ margin-top: 10rpx;
+ overflow: hidden;
+ white-space: nowrap;
+ text-overflow: ellipsis;
+ }
+ }
+ .super_product_item:last-child {
+ margin-right: 0;
+ }
+}
+
diff --git a/static/icon/zhijiang.png b/static/icon/zhijiang.png
new file mode 100644
index 0000000..00b2943
Binary files /dev/null and b/static/icon/zhijiang.png differ
diff --git a/unpackage/debug/android_debug.apk b/unpackage/debug/android_debug.apk
deleted file mode 100644
index 59990d9..0000000
Binary files a/unpackage/debug/android_debug.apk and /dev/null differ