diff --git a/components/WaterfallsFlowItem/WaterfallsFlowItem.vue b/components/WaterfallsFlowItem/WaterfallsFlowItem.vue index 7ba60fa..715c816 100644 --- a/components/WaterfallsFlowItem/WaterfallsFlowItem.vue +++ b/components/WaterfallsFlowItem/WaterfallsFlowItem.vue @@ -213,9 +213,9 @@ } .wf-page0 .name { - color: #282828; + color: #000; margin: 20rpx 0 10rpx 0; - font-size: 13px; + font-size: 30rpx; overflow: hidden; text-overflow: ellipsis; display: -webkit-box; @@ -245,7 +245,7 @@ .wf-page1 .wf-item { .name { - font-size: 13px; + font-size: 30rpx; overflow: hidden; text-overflow: ellipsis; display: -webkit-box; @@ -433,8 +433,8 @@ .store_info { width: 100%; - font-size: 20rpx; - color: #aaa; + font-size: 22rpx; + color: #333; white-space: pre-wrap; font-weight: 400; display: -webkit-box; diff --git a/config/app.js b/config/app.js index 6e26a1a..889d74a 100644 --- a/config/app.js +++ b/config/app.js @@ -15,19 +15,32 @@ let openPlantGrass = '-openPlantGrass-' let httpSix, httpApi; -const env = 'dev' +// const env = 'dev'; // 开发 +const env = 'prod'; // 生产 +// const env = 'prew'; // 预上线 -// 网络接口修改此字符 小程序域名要求https -// httpApi = 'http://192.168.31.106:8324' //测试 -// httpApi = 'https://test.shop.lihaink.cn' //生产 -httpApi = 'https://crmeb-test.shop.lihaink.cn' //生产 +switch (env) { + case 'prod': + httpApi = 'https://shop.lihaink.cn' // 生产 + httpSix = 'https://new-worker.lihaink.cn' + wsApi = 'wss://shop.lihaink.cn' + break; + case 'prew': + httpApi = 'https://test.shop.lihaink.cn' //预发布环境 + httpSix = 'https://ceshi-new-wokr.lihaink.cn' + wsApi = 'wss://test.shop.lihaink.cn' + break; + default: + httpApi = "https://crmeb-test.shop.lihaink.cn" // 测试 + httpSix = 'https://ceshi-new-wokr.lihaink.cn' + wsApi = 'wss://crmeb-test.shop.lihaink.cn' +} -httpSix = 'https://ceshi-new-wokr.lihaink.cn' // httpSix = 'https://new-worker.lihaink.cn' // 聊天接口修改此字符 小程序聊天要求wss 例如：wss://mer.crmeb.net // let wsApi = 'ws://192.168.3.20:8324' -let wsApi = 'wss://mer1.crmeb.net' +// let wsApi = 'wss://mer1.crmeb.net' module.exports = { // 请求域名 格式： https://您的域名 @@ -39,7 +52,8 @@ module.exports = { // #ifdef H5 //H5接口是浏览器地址 - HTTP_REQUEST_URL: httpApi || window.location.protocol + "//" + window.location.host, + HTTP_REQUEST_URL: process.env.NODE_ENV == 'development' ? httpApi : window.location.protocol + "//" + window + .location.host, // 聊天长连接地址 VUE_APP_WS_URL: wsApi ? `${wsApi}?type=user` : VUE_APP_WS_URL, // #endif diff --git a/manifest.json b/manifest.json index e3e98f5..a161f07 100644 --- a/manifest.json +++ b/manifest.json @@ -2,8 +2,8 @@ "name" : "惠农生活", "appid" : "__UNI__3A527D1", "description" : "", - "versionName" : "2.0.08", - "versionCode" : 2008, + "versionName" : "2.0.09", + "versionCode" : 2009, "transformPx" : false, /* 5+App特有相关 */ "app-plus" : { diff --git a/pages/goods_details/index.vue b/pages/goods_details/index.vue index ce31d7f..3d4306c 100644 --- a/pages/goods_details/index.vue +++ b/pages/goods_details/index.vue @@ -1,2440 +1,2634 @@ + + .svipCon .svipBtn { + font-size: 22rpx; + + .iconfont { + font-size: 18rpx; + margin-left: 4rpx; + } + } + + button { + padding: 0; + margin: 0; + line-height: normal; + background-color: #fff; + } + + button::after { + border: 0; + } + + action-sheet-item { + padding: 0; + height: 240rpx; + align-items: center; + display: flex; + } + + .contact { + font-size: 16px; + width: 50%; + background-color: #fff; + padding: 8rpx 0; + border-radius: 0; + margin: 0; + line-height: 2; + } + + .contact::after { + border: none; + } + + .action-sheet { + font-size: 17px; + line-height: 1.8; + width: 50%; + position: absolute; + top: 0; + right: 0; + padding: 25rpx 0; + } + + .canvas { + z-index: 300; + width: 750px; + height: 1190px; + } + + .poster-pop { + width: 600rpx; + height: 897rpx; + position: fixed; + left: 50%; + transform: translateX(-50%); + z-index: 399; + top: 50%; + margin-top: -500rpx; + } + + .poster-pop image { + width: 100%; + height: 100%; + display: block; + } + + .poster-pop .close { + width: 46rpx; + height: 75rpx; + position: fixed; + right: 0; + top: -73rpx; + display: block; + } + + .poster-pop .save-poster { + background-color: #df2d0a; + font-size: 22rpx; + color: #fff; + text-align: center; + height: 76rpx; + line-height: 76rpx; + width: 100%; + border-radius: 43rpx; + margin-top: 20rpx; + } + + .poster-pop .keep { + color: #fff; + text-align: center; + font-size: 25rpx; + margin-top: 10rpx; + } + + .mask { + position: fixed; + top: 0; + left: 0; + right: 0; + bottom: 0; + background-color: rgba(0, 0, 0, 0.6); + z-index: 9; + } + + .pictrue_log { + width: 80upx; + height: 40upx; + border-radius: 6upx 0 12upx 0; + line-height: 40upx; + font-size: 24upx; + } + + .pictrue_log_class { + z-index: 3; + background: -webkit-gradient(linear, left top, right top, from(rgba(246, 122, 56, 1)), to(rgba(241, 27, 9, 1))); + background: linear-gradient(90deg, rgba(246, 122, 56, 1) 0%, rgba(241, 27, 9, 1) 100%); + opacity: 1; + position: absolute; + top: 0; + left: 0; + color: #fff; + text-align: center; + } + + .navbar .header { + height: 96rpx; + font-size: 30rpx; + color: #050505; + background-color: #fff; + /* #ifdef MP */ + padding-right: 95rpx; + /* #endif */ + } + + .navbar .header .item { + position: relative; + margin: 0 25rpx; + } + + .navbar .header .item.on:before { + position: absolute; + width: 60rpx; + height: 5rpx; + background-repeat: no-repeat; + content: ""; + background-image: linear-gradient(to right, #ff3366 0%, #ff6533 100%); + bottom: -10rpx; + left: 50%; + margin-left: -28rpx; + } + + .navbar { + position: fixed; + background-color: #fff; + top: 0; + left: 0; + z-index: 99; + width: 100%; + } + + .navbar .navbarH { + position: relative; + } + + .navbar .navbarH .navbarCon { + position: absolute; + bottom: 0; + height: 100rpx; + width: 100%; + } + + .share-box { + z-index: 1000; + position: fixed; + left: 0; + top: 0; + width: 100%; + height: 100%; + + image { + width: 100%; + height: 100%; + } + } + + .store-wrapper { + margin-top: 20rpx; + background-color: #fff; + + .store-hd { + padding: 30rpx; + border-bottom: 1px solid #F5F5F5; + + .store-info { + position: relative; + display: flex; + + .store-margin { + width: 24rpx; + height: 26rpx; + margin-left: 10rpx; + } + + .logo { + width: 86rpx; + height: 86rpx; + + image { + width: 86rpx; + height: 86rpx; + border-radius: 6rpx; + } + } + + .info { + display: flex; + flex-direction: column; + justify-content: center; + margin-left: 20rpx; + + .name { + font-size: 28rpx; + color: #282828; + font-weight: bold; + display: flex; + align-items: center; + } + + .txt { + margin-top: 8rpx; + color: #666666; + font-size: 22rpx; + } + } + + .link { + position: absolute; + right: 0; + top: 50%; + transform: translateY(-50%); + display: flex; + align-items: center; + justify-content: center; + width: 114rpx; + height: 50rpx; + background-image: linear-gradient(-90deg, var(--view-bntColor21) 0%, var(--view-bntColor22) 100%); + border-radius: 25rpx; + color: #fff; + } + } + + .score-wrapper { + display: flex; + justify-content: space-between; + margin-top: 30rpx; + + .item { + color: #948D8C; + font-size: 26rpx; + + text { + margin-left: 10rpx; + color: var(--view-priceColor); + } + } + } + } + + .con-box { + padding: 20rpx 30rpx 0; + + .title { + font-size: 28rpx; + color: #282828; + } + + .moer-btn { + font-size: 28rpx; + color: #999999; + } + + .img-box { + .img-item { + width: 220rpx; + margin: 30rpx 15rpx 0 0; + display: inline-block; + + &:nth-child(3n) { + margin-right: 0; + } + + /deep/image, + /deep/uni-image, + /deep/.easy-loadimage { + width: 218rpx; + height: 220rpx; + border-radius: 16rpx; + display: inline-block; + } + + .txt { + .title { + font-size: 28rpx; + color: #282828; + margin-top: 15rpx; + } + + .price { + color: var(--view-priceColor); + font-size: 28rpx; + + text { + font-size: 20rpx; + } + } + } + } + } + + /deep/.uni-swiper-dot { + width: 8rpx; + height: 4rpx; + background: rgba(0, 0, 0, .15); + } + + /deep/.uni-swiper-dot-active { + width: 16rpx; + background: var(--view-theme); + } + + .page_swiper, + swiper { + height: 760rpx; + } + } + } + + .sys-head { + background: transparent; + } + + .swiper-item, + /deep/uni-swiper-wrapper, + /deep/uni-swiper { + height: 740rpx !important; + } + + .head-wrapper { + z-index: 999; + display: flex; + align-items: center; + position: fixed; + left: 30rpx; + top: 0; + } + + .head-menu { + display: flex; + align-items: center; + height: 58rpx; + width: 158rpx; + background: rgba(255, 255, 255, 0.302); + border: 2rpx solid rgba(0, 0, 0, 0.0588); + border-radius: 29rpx; + + .iconfont { + flex: 1; + text-align: center; + color: #000000; + box-sizing: border-box; + + &.icon-fanhui2 { + border-right: 1px solid rgba(0, 0, 0, 0.2); + ; + } + } + } + + .price-tab { + margin-right: 10rpx; + font-weight: 400 !important; + padding: 3rpx 8rpx 5rpx 8rpx; + margin-top: 16rpx; + border-radius: 8rpx; + color: #000000; + // border: 1px solid #F55726; + } + \ No newline at end of file diff --git a/pages/index/component/homeComb.vue b/pages/index/component/homeComb.vue index 7f44b1a..0e7844e 100644 --- a/pages/index/component/homeComb.vue +++ b/pages/index/component/homeComb.vue @@ -23,7 +23,7 @@ - + 暂无商品，去添加点什么吧 - + diff --git a/pages/store/home/index.vue b/pages/store/home/index.vue index a1a51e0..57d5bf1 100644 --- a/pages/store/home/index.vue +++ b/pages/store/home/index.vue @@ -1674,7 +1674,7 @@ .name_text { display: inline-block; max-width: 340rpx; - font-size: 26rpx; + font-size: 29rpx; color: #262626; } @@ -1704,9 +1704,8 @@ align-items: center; width: 100%; // margin-bottom: 28rpx; - font-size: 18rpx; - line-height: 26rpx; - max-height: 78rpx; + font-size: 22rpx; + line-height: 28rpx; color: #999999; display: -webkit-box; -webkit-box-orient: vertical;