diff --git a/components/zbpSwiper.vue b/components/zbpSwiper.vue index 07c5a3d..bd5f6e9 100644 --- a/components/zbpSwiper.vue +++ b/components/zbpSwiper.vue @@ -1,321 +1,320 @@ + .swi_item { + width: 100%; + height: 242.11rpx; + } + } + } + } + \ No newline at end of file diff --git a/config/app.js b/config/app.js index d30dd89..cf87715 100644 --- a/config/app.js +++ b/config/app.js @@ -8,26 +8,26 @@ let httpApiTwo let httpApiThree // 网络接口修改此字符 小程序域名要求https // let httpApi = 'http://192.168.31.110:8324' //测试 -// httpApi = 'https://shop.lihaink.cn' //生产 +httpApi = 'https://shop.lihaink.cn' //生产 // httpApi = 'http://192.168.0.222:8324' //生产 -// httpApiTwo = 'https://nk.lihaink.cn' //生产 +httpApiTwo = 'https://nk.lihaink.cn' //生产 -if (process.env.NODE_ENV === "development") { - httpApi = "https://crmeb-test.shop.lihaink.cn" - // #ifdef MP-WEIXIN - httpApiTwo = "http://cms.com" - httpApiThree = 'http://ceshi-oa.lihaink.cn' - // #endif - // #ifdef H5 - // httpApiTwo = "baseUrl" // h5跨域配置 - httpApiTwo = "https://nk.lihaink.cn" // h5跨域配置 - // httpApiThree = 'baseUrlTest' // h5跨域配置 - // #endif -} else if (process.env.NODE_ENV === 'production') { - httpApi = 'https://shop.lihaink.cn' // 生产 - httpApiTwo = 'https://nk.lihaink.cn' // 生产 - httpApiThree = 'http://ceshi-oa.lihaink.cn' //生产 -} +// if (process.env.NODE_ENV === "development") { +// httpApi = "https://crmeb-test.shop.lihaink.cn" +// // #ifdef MP-WEIXIN +// httpApiTwo = "http://cms.com" +// httpApiThree = 'http://ceshi-oa.lihaink.cn' +// // #endif +// // #ifdef H5 +// // httpApiTwo = "baseUrl" // h5跨域配置 +// httpApiTwo = "https://nk.lihaink.cn" // h5跨域配置 +// // httpApiThree = 'baseUrlTest' // h5跨域配置 +// // #endif +// } else if (process.env.NODE_ENV === 'production') { +// httpApi = 'https://shop.lihaink.cn' // 生产 +// httpApiTwo = 'https://nk.lihaink.cn' // 生产 +// httpApiThree = 'http://ceshi-oa.lihaink.cn' //生产 +// } // 聊天接口修改此字符 小程序聊天要求wss 例如:wss://mer.crmeb.net // let wsApi = 'ws://192.168.3.20:8324' diff --git a/pages/home/index.vue b/pages/home/index.vue index 79212d6..c5a4647 100644 --- a/pages/home/index.vue +++ b/pages/home/index.vue @@ -5,8 +5,7 @@ - + @@ -53,29 +52,12 @@ - + .goods_item { + width: 342.11rpx; + height: 491.23rpx; + border-radius: 8px; + overflow: hidden; + background-color: #000; + display: flex; + flex-direction: column; + padding-bottom: 10px; + + .goods_img { + width: 342.11rpx; + border-top-left-radius: 8px; + border-top-right-radius: 8px; + height: 294.74rpx; + } + + .botm { + flex: 1; + padding: 0 14.04rpx; + padding-bottom: 21.05rpx; + display: flex; + flex-direction: column; + justify-content: space-between; + background-color: #fff; + border-radius: 0 0 8px 8px; + + .title { + font-size: 26.32rpx !important; + margin: 12px 0; + width: 342.11rpx; + overflow: hidden; + text-overflow: ellipsis; + lines: 2; + } + + .goods_info { + display: flex; + flex-direction: row; + direction: ltr; + justify-content: space-between; + + .l_info { + flex-direction: row; // 可以生效 + direction: ltr; + display: flex; + align-items: center; + } + + .g_img { + width: 60rpx; + height: 60rpx; + border-radius: 50%; + } + + .g_name { + font-size: 26.32rpx !important; + margin-left: 8.77rpx; + width: 100.63rpx; + text-overflow: ellipsis; + lines: 1; + } + + .nice_box { + flex-direction: row; // 可以生效 + direction: ltr; + align-items: center; + + .isshow { + color: #FE3530 !important; + } + + .iconfont { + font-size: 30rpx; + } + + .icon-shoucang1 { + color: #F84221; + } + + .collect { + font-size: 24rpx; + margin-left: 5rpx; + } + } + } + } + } + } + + .noVideo { + position: fixed; + top: 400rpx; + z-index: 9; + width: 750rpx; + flex-direction: row; + justify-content: center; + + .pictrue { + width: 414rpx; + height: 256rpx; + } + + .tips { + text-align: center; + margin-top: 14rpx; + font-size: 26rpx; + color: #999; + } + } + + .fixed-head { + flex-direction: row; + justify-content: center; + align-items: center; + position: fixed; + left: 0; + top: 70rpx; + height: 86rpx; + + .icon-xiangzuo { + margin-left: 10px; + width: 16px; + height: 16px; + color: #ffffff; + } + } + + .header { + position: fixed; + z-index: 9; + width: 750rpx; + height: 86rpx; + flex-direction: row; + justify-content: center; + align-items: center; + top: 70rpx; + + .items { + margin: 0 30rpx; + + .tName { + color: #ffffff; + font-size: 32rpx; + + &.on { + font-size: 38rpx; + } + } + } + } + + .container { + background-color: #000000; + } + + .item { + position: relative; + } + + .videoHover { + position: absolute; + top: 0; + left: 0; + flex: 1; + background-color: rgba(0, 0, 0, 0.1); + justify-content: center; + align-items: center; + } + + .playState { + width: 160rpx; + height: 160rpx; + opacity: 0.2; + } + + .video-status { + width: 690rpx; + position: absolute; + left: 30rpx; + background: #000; + border-radius: 10rpx; + top: 150rpx; + padding: 30rpx; + + .status-title { + flex-direction: row; + align-items: center; + + .title { + margin-left: 20rpx; + color: #ffffff; + font-size: 28rpx; + } + } + + .refusal { + color: #ffffff; + font-size: 22rpx; + margin: 15rpx 0 0 48rpx; + } + + .image { + width: 28rpx; + height: 28rpx; + } + } + + .userInfo { + position: absolute; + bottom: 30px; + right: 10px; + display: flex; + align-items: center; + flex-direction: column; + + .pictrue { + flex-direction: column; + justify-content: center; + align-items: center; + position: relative; + + // margin-bottom: 18rpx; + .guanzhu { + width: 42rpx; + height: 42rpx; + display: flex; + align-items: center; + justify-content: center; + color: #fff; + background: #E93323; + border-radius: 100%; + position: relative; + top: -20rpx; + left: 3rpx; + + .iconfont { + font-size: 30rpx; + color: #fff; + } + } + + .yiguanzhu { + width: 42rpx; + height: 42rpx; + } + } + } + + .video-my { + position: relative; + align-items: center; + justify-content: center; + flex-direction: row; + + } + + .video-dian { + position: relative; + width: 33px; + height: 33px; + align-items: center; + justify-content: center; + flex-direction: row; + left: 3px; + + .dian { + width: 7px; + height: 7px; + background-color: #fff; + border-radius: 100%; + margin-right: 3px; + + &:last-child { + margin-right: 0; + } + } + } + + .manage { + width: 115px; + background: #ffffff; + box-shadow: 0 1px 8px rgba(0, 0, 0, 0.1); + padding: 0 8px; + position: absolute; + bottom: 10px; + right: 60px; + border-radius: 8px; + + .manage-gou { + display: flex; + width: 13px; + height: 13px; + background: #ffffff; + transform: rotate(140deg); + position: absolute; + top: 30px; + right: -6px; + box-shadow: -1px -1px 1px rgba(0, 0, 0, 0.05); + } + + .items { + border-bottom: 1px solid #EEEEEE; + padding: 10px 0; + display: flex; + align-items: center; + flex-direction: row; + + .text { + color: #282828; + font-size: 13px; + } + + &:last-child { + border-bottom-color: transparent; + } + + .image { + width: 32rpx; + height: 32rpx; + margin: 0 16rpx 0; + } + } + } + + .userAvatar { + border-radius: 500%; + border-style: solid; + border-width: 2px; + border-color: #ffffff; + width: 80rpx; + height: 80rpx; + } + + .info-text { + display: flex; + margin-top: 10rpx; + color: #ffffff; + font-size: 22rpx; + text-align: center; + + &.likeNumActive { + color: #E93323; + } + } + + .likeIco, + .shareIco, + .commentIco { + width: 60rpx; + height: 60rpx; + margin-top: 15px; + } + + .likeNum, + .commentNum, + .shareTex { + color: #ffffff; + font-size: 30rpx; + text-align: center; + margin: 5px; + } + + .mention { + width: 46px; + height: 46px; + position: relative; + + .image { + width: 30px; + height: 30px; + position: absolute; + right: 8px; + } + + .count { + padding: 2px 6px; + background: #fff; + border-radius: 100%; + display: flex; + align-items: center; + justify-content: center; + color: #E93323; + position: absolute; + right: 6px; + top: 0; + font-size: 10px; + } + } + + .content { + width: 325px; + position: absolute; + bottom: 15px; + /* justify-content: center; */ + padding: 15rpx; + flex-direction: column; + justify-content: flex-start; + color: #ffffff; + + .cart { + height: 48rpx; + flex-direction: row; + + .cartName { + font-size: 24rpx; + color: #fff; + } + } + + .product { + flex-direction: row; + margin-top: 27rpx; + + .scroll-view { + flex-direction: row; + } + + .product-item { + width: 444rpx; + height: 136rpx; + background: rgba(0, 0, 0, .55); + border-radius: 12rpx; + padding: 16rpx 15rpx; + margin-right: 30rpx; + } + + .swiper { + width: 500rpx !important; + height: 136rpx !important; + + .swiper-count { + width: 444rpx !important; + height: 136rpx !important; + background: rgba(0, 0, 0, .55); + border-radius: 12rpx; + padding: 16rpx 15rpx; + } + + .swiper-item { + flex-direction: row; + } + } + + .item-count { + flex-direction: row; + justify-content: space-between; + + .picture { + width: 104rpx; + height: 104rpx; + border-radius: 10rpx; + + .image { + width: 104rpx; + height: 104rpx; + border-radius: 10rpx; + } + } + + .product-text { + width: 286rpx; + justify-content: space-between; + + .name { + font-size: 24rpx; + width: 286rpx; + color: #fff; + } + + .product-price { + display: flex; + flex-direction: row; + justify-content: space-between; + align-items: center; + + .price { + display: flex; + flex-direction: row; + + .sm, + .money { + color: #ffffff; + font-size: 24rpx; + } + } + + .buy-btn { + padding: 6rpx 20rpx; + display: flex; + align-items: center; + justify-content: center; + color: #fff; + border-radius: 26rpx; + background: #E93323; + font-size: 20rpx; + } + } + } + } + } + } + + .product_cate { + margin: 20rpx 0; + flex-direction: row; + + .pro-view { + flex-direction: row; + align-items: center; + border-radius: 30rpx; + padding: 0 25rpx; + line-height: 40rpx; + border-radius: 29rpx; + border: 1rpx solid #ffffff; + + .text { + color: #ffffff; + font-size: 24rpx; + } + + .icon { + font-size: 26rpx; + font-weight: bold; + margin-right: 8rpx; + color: #ffffff; + } + } + } + + .timeCon { + flex-direction: row; + align-items: center; + + .userName { + font-size: 30rpx; + color: #ffffff; + } + } + + .words { + margin-top: 20rpx; + + .close { + display: flex; + flex-direction: row; + align-items: center; + justify-content: flex-end; + margin-right: 20rpx; + + .imgClose { + width: 18rpx; + height: 10rpx; + margin-left: 10rpx; + } + } + + .wordsCon { + position: relative; + + .more { + position: absolute; + bottom: 0; + right: 40rpx; + font-size: 26rpx; + color: #ffffff; + font-weight: bold; + } + + .img { + width: 18rpx; + height: 10rpx; + margin-left: 4rpx; + position: absolute; + bottom: 7rpx; + right: 20rpx; + } + } + + .info { + color: #fff; + font-size: 28rpx; + } + + .more { + font-size: 26rpx; + color: #ffffff; + font-weight: bold; + } + } + + .root { + background-color: #000000; + } + \ No newline at end of file diff --git a/pages/supply_chains/supply_chains.vue b/pages/supply_chains/supply_chains.vue index 3b18e01..eb58500 100644 --- a/pages/supply_chains/supply_chains.vue +++ b/pages/supply_chains/supply_chains.vue @@ -1,7 +1,7 @@