diff --git a/App.vue b/App.vue index a972fda..a10b72c 100644 --- a/App.vue +++ b/App.vue @@ -26,7 +26,7 @@ onLaunch: function(e) { // 检测自动更新 // #ifdef APP-PLUS - updata(); + // updata(); // #endif uni.getSystemInfo({ diff --git a/pages/course/courseDetail.vue b/pages/course/courseDetail.vue index ac6fb3a..9901097 100644 --- a/pages/course/courseDetail.vue +++ b/pages/course/courseDetail.vue @@ -452,6 +452,7 @@ fatherIndex: null, supportFlag: false, selectGoodsData: {}, + buyOptions: [ // { // icon: 'chat', @@ -663,12 +664,8 @@ this.$forceUpdate(); }, onHandleClickBuy(e) { - console.log("this.selectGoodsData at line 589:", this.selectGoodsData); - - // if (e.index == 0) { - // this.handleClickClose(); - // } - // if (e.index == 0) { + console.log("this.selectGoodsData at line 589:", this.selectGoodsData); + var mynavData = JSON.stringify({ goods: [this.selectGoodsData], typeId: 0, @@ -688,7 +685,7 @@ //获取相关关联课程商品 handleClickGetGoodsList(v) { // console.log("data at line 313:", data); - + if (v.type == 0) { //免费 @@ -705,20 +702,11 @@ }, }) .then(async (res) => { - console.log("res at line 493:", res); + console.log("res at line 493:", res); if (res.code == 0) { this.getCourseDescriptionData(); // this.$commonJS.showToast(""); } - // if (res.productList.length > 0) { - // this.goodsList = res.productList; - // this.selectGoodsData = this.goodsList[0]; - // this.$refs.commonSelectGoods.open(); - // this.show = true; - // } else { - // this.$commonJS.showToast("此课程暂无购买方式"); - // } - this.$forceUpdate(); }); } else { @@ -734,7 +722,7 @@ "Content-Type": "application/json", }, }) - .then(async (res) => { + .then(async (res) => { if (res.productList.length > 0) { this.goodsList = res.productList; this.selectGoodsData = this.goodsList[0]; @@ -745,7 +733,7 @@ } this.$forceUpdate(); - }); + }) } }, getUserInfo() { diff --git a/pages/goods/order/index.vue b/pages/goods/order/index.vue index 935749f..7e9f918 100644 --- a/pages/goods/order/index.vue +++ b/pages/goods/order/index.vue @@ -1,12 +1,12 @@ - - - - - - + - - + - - - - - - - + + + + + - - - - 订单备注 - - - - - - - - - - - + "> + + + + 订单备注 + + + + + + + + + + + + @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); + 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; + } + \ No newline at end of file diff --git a/pages/mine/set/index.vue b/pages/mine/set/index.vue index e53f3d6..704c389 100644 --- a/pages/mine/set/index.vue +++ b/pages/mine/set/index.vue @@ -38,31 +38,6 @@ >退出登录 - - + + + 点击图片后长按图片保存到手机，或使用微信扫描二维码添加客服企业微信 + + +