From 34b34d95802507f684f01eb46730c81e41be5f47 Mon Sep 17 00:00:00 2001 From: cc_zbp <487602586@qq.com> Date: Fri, 12 May 2023 18:16:16 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=85=A5=E9=A9=BB=E6=B5=81?= =?UTF-8?q?=E7=A8=8B=EF=BC=8C=E4=BF=AE=E6=94=B9http=E8=AF=B7=E6=B1=82?= =?UTF-8?q?=EF=BC=8C=E8=AF=B7=E6=B1=82=E6=88=90=E5=8A=9F=E9=9C=80=E8=A6=81?= =?UTF-8?q?=20res.data=EF=BC=8C=E7=AD=89=E5=85=B6=E4=BB=96=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/article.js | 9 +- components/associated.vue | 948 ++--- config/app.js | 5 +- manifest.json | 2 +- pages.json | 9 + pages/gather/gather.vue | 25 +- pages/home/index.vue | 19 +- pages/nongKe/supply_chain/supplier.vue | 16 +- pages/store/entryProcess/entryProcess.vue | 95 + pages/store/home/index.vue | 3839 +++++++++++---------- pages/store/settledApply/settledApply.vue | 74 +- pages/supply_chains/supply_chains.vue | 22 +- utils/http.js | 4 +- 13 files changed, 2705 insertions(+), 2362 deletions(-) create mode 100644 pages/store/entryProcess/entryProcess.vue diff --git a/api/article.js b/api/article.js index 092bc12..a0f0637 100644 --- a/api/article.js +++ b/api/article.js @@ -1,5 +1,6 @@ // import request from "@/utils/request.js"; import request from "@/utils/request.js"; +import http from "@/utils/http.js"; // export const postShopInfo = (params, config = {}) => request.post('/edcapi/Shop_shopDeatil', params, config) // // get请求，获取菜单，注意：get请求的配置等，都在第二个参数中，详见前面解释 /** @@ -8,7 +9,7 @@ import request from "@/utils/request.js"; /** * 文创文章 */ -export const getCulturalArticleAPI = (data) => request.get('/cultural/article', data, { noAuth: true }) +export const getCulturalArticleAPI = (data) => http.get('/cultural/article', data, { noAuth: true }) /** * 全民打卡 */ @@ -28,7 +29,7 @@ export const getSlideAPI = (data) => request.get('/Slide/get_slide', data, { noA /** * 获取文章 */ -export const getIndexArticleList = (data) => request.get('/article/indexs', data, { noAuth: true }) +export const getIndexArticleList = (data) => http.get('/article/indexs', data, { noAuth: true }) export const getIndexArticleDetails = (data) => request.get('/article/details', data, { noAuth: true }) export const postIndexArticleDetails = (data) => request.post('/article/post', data) export const getIndexArticleEdit = (data) => request.get('/article/edit', data) @@ -64,10 +65,10 @@ export const getWorkArticleCount = (data) => request.get('/getWorkArticleCount', // } //首页 -export const getArticleList = (data) => request.get('/getArticleList', data) +export const getArticleListAPI = (data) => http.get('/getArticleList', data) // 首页文章 -export const getHomeListAPI = (data) => request.get('/article/hot_list', data) +export const getHomeListAPI = (data) => http.get('/article/hot_list', data) //获取朋友圈分类信息 export const getFriendcirclelist = (data) => request.get('/Personal/getlist', data, { noVerify: true diff --git a/components/associated.vue b/components/associated.vue index 9573664..64f3ef8 100644 --- a/components/associated.vue +++ b/components/associated.vue @@ -1,464 +1,498 @@ + .containers { + background: #ffffff; + border-radius: 16rpx 16rpx 0 0; + padding: 40rpx 0; + position: relative; + + .header { + position: relative; + padding: 0 30rpx; + + .title { + width: 100%; + text-align: center; + + text { + position: relative; + margin: 0 50rpx; + color: #999999; + font-size: 30rpx; + + &.on { + color: #333333; + font-weight: bold; + font-size: 34rpx; + + &::after { + content: ""; + display: inline-block; + width: 40rpx; + height: 5rpx; + background: var(--view-theme); + position: absolute; + bottom: -10rpx; + left: 10rpx; + } + } + } + } + + .search { + margin-top: 44rpx; + background: #F5F5F5; + border-radius: 30rpx; + padding: 12rpx 30rpx 12rpx 66rpx; + position: relative; + + .iconfont { + font-size: 24rpx; + color: #939393; + position: absolute; + top: 20rpx; + left: 30rpx; + } + + .placeholder { + color: #999999; + font-size: 26rpx; + } + } + + .sub_title { + color: #282828; + font-size: 26rpx; + margin-top: 30rpx; + } + + .iconfont { + color: #8A8A8A; + font-size: 28rpx; + position: absolute; + top: 0; + right: 30rpx; + } + } + + scroll-view { + height: 650rpx; + } + + .main { + height: 650rpx; + margin: 40rpx 0 80rpx; + padding: 0 30rpx; + } + } + + .picTxt { + width: 100%; + padding: 25rpx 0; + position: relative; + align-items: center; + justify-content: space-between; + margin-bottom: 10rpx; + + .checkbox { + margin-right: 30rpx; + + .iconfont { + font-size: 38rpx; + color: #CCCCCC; + } + + .icon-xuanzhong1 { + color: var(--view-theme); + } + + .disabled { + pointer-events: none; + cursor: default; + opacity: 0.3; + } + } + + .pictrue { + width: 160rpx; + height: 160rpx; + + image { + width: 100%; + height: 100%; + border-radius: 8rpx; + } + } + + .text { + width: 430rpx; + margin-left: 30rpx; + font-size: 28rpx; + color: #282828; + position: relative; + height: 160rpx; + + .name { + color: #282828; + font-size: 28rpx; + } + + .money { + position: absolute; + bottom: 0; + left: 0; + color: var(--view-priceColor); + font-size: 22rpx; + font-weight: bold; + + text { + font-size: 26rpx; + } + } + } + } + + .foot_bar { + width: 100%; + position: fixed; + bottom: 122.81rpx; + left: 0; + background: #ffffff; + padding: 20rpx 0; + z-index: 5; + + .confirm_btn { + width: 710rpx; + height: 86rpx; + line-height: 86rpx; + color: #ffffff; + text-align: center; + font-size: 32rpx; + background: var(--view-theme); + border-radius: 43rpx; + margin: 0 auto; + } + } + + .empty { + margin: 130rpx 0 150rpx; + text-align: center; + + image, + uni-image { + display: inline-block; + width: 414rpx; + height: 305rpx; + } + + text { + display: block; + color: #999999; + font-size: 26rpx; + } + } + \ No newline at end of file diff --git a/config/app.js b/config/app.js index d8f20aa..d30dd89 100644 --- a/config/app.js +++ b/config/app.js @@ -19,8 +19,9 @@ if (process.env.NODE_ENV === "development") { httpApiThree = 'http://ceshi-oa.lihaink.cn' // #endif // #ifdef H5 - httpApiTwo = "baseUrl" // h5跨域配置 - httpApiThree = 'baseUrlTest' // 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' // 生产 diff --git a/manifest.json b/manifest.json index 7632111..e708746 100644 --- a/manifest.json +++ b/manifest.json @@ -158,7 +158,7 @@ "quickapp" : {}, /* 小程序特有相关 */ "mp-weixin" : { - "appid" : "wx6e14cb98394e36bc", + "appid" : "wxfb4695444ab8d0d0", "setting" : { "urlCheck" : false, "minified" : true, diff --git a/pages.json b/pages.json index 3cbe8ed..48a0e85 100644 --- a/pages.json +++ b/pages.json @@ -710,6 +710,15 @@ "enablePullDownRefresh": true } + } + ,{ + "path" : "entryProcess/entryProcess", + "style" : + { + "navigationBarTitleText": "入驻流程", + "enablePullDownRefresh": false + } + } ] }, diff --git a/pages/gather/gather.vue b/pages/gather/gather.vue index 26ab030..45f64c5 100644 --- a/pages/gather/gather.vue +++ b/pages/gather/gather.vue @@ -1,8 +1,8 @@ + .store-home { + position: fixed; + top: 0; + right: 0; + bottom: 0; + left: 0; + display: flex; + flex-direction: column; + padding-bottom: 100rpx; + padding-bottom: calc(100rpx+ constant(safe-area-inset-bottom)); ///兼容 IOS<11.2/ + padding-bottom: calc(100rpx + env(safe-area-inset-bottom)); ///兼容 IOS>11.2/ + background: left top/750rpx 390rpx no-repeat fixed; + overflow: hidden; + } + + .header { + position: relative; + z-index: 6; + display: flex; + align-items: center; + padding-right: 34rpx; + height: 43px; + padding-left: 33rpx; + + .head-menu { + display: -webkit-box; + display: -webkit-flex; + display: flex; + -webkit-box-align: center; + -webkit-align-items: center; + align-items: center; + height: 27px; + width: 70px; + background: rgba(0, 0, 0, 0.25); + border-radius: 13px; + + .icon-xiangzuo { + font-size: 32rpx; + color: #FFFFFF; + } + + .iconfont { + -webkit-box-flex: 1; + -webkit-flex: 1; + flex: 1; + text-align: center; + color: #fff; + box-sizing: border-box; + + &.icon-xiangzuo { + border-right: 1px solid rgba(255, 255, 255, .3); + } + } + } + + .search { + flex: 1; + display: flex; + align-items: center; + min-width: 0; + height: 58rpx; + border-radius: 29rpx; + margin-left: 32rpx; + background-color: #FFFFFF; + font-weight: 500; + font-size: 26rpx; + color: #999999; + /* #ifdef MP */ + margin-right: 200rpx; + + /* #endif */ + .iconfont { + margin-right: 13rpx; + margin-left: 30rpx; + font-size: 24rpx; + } + } + } + + .main_count { + background-color: #ffffff; + padding: 30rpx 20rpx; + + .list { + width: 710rpx; + height: 280rpx; + margin-bottom: 30rpx; + position: relative; + + .picture { + width: 710rpx; + height: 280rpx; + border-radius: 16rpx; + } + } + } + + .main { + flex: 1; + min-height: 0rpx; + box-sizing: border-box; + padding: 0; + } + + .store { + position: relative; + z-index: 6; + display: flex; + align-items: center; + padding-right: 20rpx; + padding-left: 20rpx; + padding-top: 20rpx; + padding-bottom: 22rpx; + + image { + width: 74rpx; + height: 74rpx; + border-radius: 6rpx; + } + + .store-margin { + width: 26rpx; + height: 26rpx; + margin-left: 10rpx; + } + + .kefu { + color: #ffffff; + margin-right: 26rpx; + cursor: pointer; + + .icon-kefu3 { + font-size: 34rpx; + } + } + + .text { + flex: 1; + min-width: 0; + margin-right: 20rpx; + margin-left: 20rpx; + + navigator { + display: inline-flex; + align-items: center; + max-width: 100%; + + .name { + flex: 1; + min-width: 0; + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; + font-weight: bold; + font-size: 30rpx; + line-height: 1; + color: #FFFFFF; + } + + .iconfont { + margin-left: 10rpx; + font-size: 17rpx; + color: #FFFFFF; + } + } + + .score { + display: flex; + align-items: center; + margin-top: 17rpx; + font-weight: 500; + font-size: 24rpx; + line-height: 1; + color: #FFFFFF; + + .star { + position: relative; + width: 111rpx; + height: 19rpx; + margin-right: 10rpx; + background: url(../../columnGoods/images/star.png) left top/100% 100% no-repeat; + overflow: hidden; + + view { + position: absolute; + top: 0; + left: 0; + width: 100%; + height: 100%; + background: url(../../columnGoods/images/star_active.png) left top/111rpx 19rpx no-repeat; + + &.star_purple { + background: url(../../columnGoods/images/star_active_purple.png) left top/111rpx 19rpx no-repeat; + } + } + } + } + } + + button { + display: flex; + justify-content: center; + align-items: center; + width: 113rpx; + height: 48rpx; + border-radius: 24rpx; + background-image: linear-gradient(-90deg, var(--view-bntColor21) 0%, var(--view-bntColor22) 100%); + font-weight: 500; + font-size: 22rpx; + color: #FFFFFF; + + .iconfont { + margin-right: 6rpx; + font-size: 22rpx; + } + + &.gary { + background-color: #999; + } + } + } + + .font-bg-red { + background-color: var(--view-theme); + border: 1px solid var(--view-theme); + } + + .nav.fixed { + position: fixed; + left: 0; + width: 100%; + + .nav-cont { + position: absolute; + width: 100%; + } + } + + .nav { + position: relative; + + .nav-cont { + display: flex; + align-items: center; + height: 84rpx; + + .item { + flex: 1; + display: flex; + justify-content: center; + align-items: center; + min-width: 0; + + .cont { + display: flex; + justify-content: center; + align-items: center; + width: 116rpx; + height: 44rpx; + border-radius: 22rpx; + font-weight: 500; + font-size: 24rpx; + color: #FFFFFF; + + .arrow-icon { + margin-left: 10rpx; + font-size: 18rpx; + } + + .layout-icon { + font-size: 32rpx; + } + + .icon-pailie { + font-size: 32rpx; + } + + image { + width: 15rpx; + height: 21rpx; + margin-left: 7rpx; + } + } + } + + .active { + .cont { + background-color: #FFFFFF; + font-weight: bold; + color: var(--view-theme); + } + } + } + + .select { + position: absolute; + top: 100%; + left: 0; + z-index: 2; + width: 100%; + padding-right: 40rpx; + padding-bottom: 28rpx; + padding-left: 74rpx; + border-bottom-right-radius: 24rpx; + border-bottom-left-radius: 24rpx; + background-color: #FFFFFF; + box-shadow: 0px 2px 10px 0px rgba(0, 0, 0, 0.06); + + .item { + margin-top: 28rpx; + font-size: 24rpx; + color: #454545; + } + + .active { + color: var(--view-theme); + + .iconfont { + color: var(--view-theme); + float: right; + font-size: 20rpx; + } + } + } + } + + .goods { + display: flex; + flex-wrap: wrap; + justify-content: space-between; + padding-top: 20rpx; + padding-right: 20rpx; + padding-left: 20rpx; + background-color: #F5F5F5; + width: 750rpx; + + .item { + width: 345rpx; + border-radius: 16rpx; + margin-bottom: 20rpx; + background-color: #FFFFFF; + overflow: hidden; + + .sell_out { + display: flex; + width: 110rpx; + height: 110rpx; + align-items: center; + justify-content: center; + border-radius: 100%; + background: rgba(0, 0, 0, .6); + color: #fff; + font-size: 24rpx; + position: absolute; + top: 50%; + left: 50%; + margin: -55rpx 0 0 -55rpx; + + &::before { + content: ""; + display: block; + width: 100rpx; + height: 100rpx; + border-radius: 100%; + border: 1px dashed #fff; + position: absolute; + top: 5rpx; + left: 5rpx; + } + } + + .image, + .easy-loadimage, + image, + uni-image { + width: 345rpx; + height: 345rpx; + + image { + display: block; + width: 100%; + height: 100%; + } + } + + .text { + padding: 20rpx 20rpx 25rpx; + + .name { + font-weight: 500; + font-size: 30rpx; + line-height: 1; + color: #222222; + display: flex; + align-items: center; + + .name_text { + display: inline-block; + max-width: 400rpx; + } + } + + .money-wrap { + display: flex; + align-items: center; + margin-top: 43rpx; + + .money { + font-weight: bold; + font-size: 26rpx; + color: var(--view-priceColor); + + text { + font-size: 34rpx; + line-height: 1; + } + } + } + + .score { + margin-top: 20rpx; + font-weight: 500; + font-size: 20rpx; + line-height: 1; + color: #737373; + } + } + + .item_tags { + margin-top: 8rpx; + } + + .item_tags .tags_item { + display: inline-block; + font-size: 20rpx; + text-align: center; + border-radius: 5rpx; + padding: 0 4rpx; + line-height: 28rpx; + margin-right: 8rpx; + } + + .item_tags .tags_item.ticket { + border: 1px solid var(--view-theme); + color: var(--view-theme); + } + + .item_tags .tags_item.delivery { + color: #FF9000; + border: 1px solid #FF9000; + } + + .foot { + display: flex; + justify-content: center; + align-items: center; + height: 52rpx; + background-image: linear-gradient(-90deg, var(--view-bntColor21) 0%, var(--view-bntColor22) 100%); + font-weight: 500; + font-size: 24rpx; + color: #FFFFFF; + + .iconfont { + margin-right: 10rpx; + font-size: 22rpx; + line-height: 1; + } + } + } + } + + .column { + padding: 0; + background-color: #FFFFFF; + + .item { + position: relative; + display: flex; + width: 100%; + padding: 30rpx 20rpx; + border-radius: 0; + margin-bottom: 0; + + &::before { + content: " "; + position: absolute; + top: 0; + right: 20rpx; + left: 250rpx; + border-top: 1px solid #F5F5F5; + } + + /deep/.image, + /deep/.easy-loadimage, + /deep/image, + /deep/uni-image { + width: 260rpx; + height: 260rpx; + border-radius: 16rpx; + overflow: hidden; + position: relative; + + } + + .border-picture { + position: absolute; + top: 0; + left: 0; + width: 100%; + height: 100%; + background: center/cover no-repeat; + } + + .text { + position: relative; + width: 450rpx; + min-width: 0; + padding-top: 0; + padding-right: 0; + padding-bottom: 0; + + .name { + color: #282828; + width: 100%; + display: flex; + } + + .item_bot { + width: 100%; + } + + .money-wrap { + display: flex; + align-items: center; + margin-top: 52rpx; + + .ticket { + height: 28rpx; + padding-right: 12rpx; + padding-left: 12rpx; + border: none; + border-radius: 0; + margin-top: 17rpx; + margin-left: 0; + background: url(../../../static/images/yh.png) top left/100% 100% no-repeat; + line-height: 28rpx; + } + } + } + + .foot { + position: absolute; + right: 20rpx; + bottom: 30rpx; + height: 44rpx; + padding-right: 17rpx; + padding-left: 17rpx; + border-radius: 22rpx; + font-size: 22rpx; + color: #F5F5F5; + } + } + } + + .category { + padding-top: 34rpx; + padding-right: 20rpx; + padding-left: 20rpx; + + .section { + border-radius: 10rpx; + margin-bottom: 20rpx; + background-color: #FFFFFF; + + .head { + position: relative; + display: flex; + align-items: center; + height: 90rpx; + padding-right: 20rpx; + padding-left: 36rpx; + font-weight: bold; + color: #282828; + + &::before { + content: " "; + position: absolute; + top: 50%; + left: 20rpx; + width: 6rpx; + height: 24rpx; + background-color: var(--view-theme); + transform: translateY(-50%); + } + + .title { + flex: 1; + min-width: 0; + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; + font-size: 30rpx; + } + + .iconfont { + font-size: 22rpx; + line-height: 1; + } + } + + .body { + display: flex; + flex-wrap: wrap; + justify-content: space-between; + align-items: center; + padding: 9rpx 36rpx 14rpx; + + .item { + width: 314rpx; + height: 84rpx; + padding-right: 30rpx; + padding-left: 30rpx; + border-radius: 10rpx; + background-color: #F5F5F5; + margin-bottom: 10rpx; + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; + font-weight: 500; + font-size: 26rpx; + line-height: 84rpx; + color: #282828; + } + } + } + } + + .coupon { + padding: 30rpx; + background-color: #F5F5F5; + + .item { + display: flex; + margin-bottom: 16rpx; + + .left { + display: flex; + flex-direction: column; + justify-content: center; + align-items: center; + width: 240rpx; + font-weight: 500; + font-size: 24rpx; + line-height: 1; + color: #FFFFFF; + background-size: 100% 100%; + + &.gary { + background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAPAAAACqCAMAAACknjIxAAAAgVBMVEUAAADGxsbKysrKysvDw8LBwcG/v77MzMzGxsaxsbHExMS/v7+9vb26urqvr6+3t7e0tLTCwsKlpaTGxsatra2qqqq8vLynp6fIyMi5ubm2trazs7Ojo6PKysqpqanBwcGfn5+mpqasrKzMzMyioqKhoaGgoKCampqdnZ2cnJyhoKBnDnX9AAAACXRSTlMAE3Zubnapp1QPqckSAAAYs0lEQVR42pyc3XITMQyFCVzwU0J/0jYN6TYkpL3g/R+Q2mv7SDrSKqBlOpO9++ZIsixp+QD7ndrk2NP0ZG2j7JuwW9jhcLg9VLsa9n3YY7d1t12z624/q91028/2tduPrz+G3Xc7nU7gXaW470/5o3k7MGifBCx4DfABdhUSr2GNdmdwf1pcmIergL/EpAMY5uNuyiN46xMAF+YrRXs1YBswiFleLXDEy8QA/pz7s2XWuLk/wxbVBW7A+/N6pgU0FCZeQatcejXlLp1EMDwavBsB3JEPDfgKAgtiT14AQ2FovIfAcQCfZnv4F4E18VP5Y2hZ3lhf0FL4kr4Vdqdhr+HSBXbvhi/07cSd92Puz3l+NvkqjN9uAxbAyM+DthFDXakviENgKfFDV/jTMm6WsFhfjl8CdvV9JIE9b7ZJi92ZA1gCrz7nwUv5alKwEFjGL6JXCnwLXA0MiZfD1zmEk/R833gL8OrL52kRFwoDFsAwLe9/JGj2Z5b3utMyb+zPA7cAE6DH7GUspgUyaHWCPgxgLS/M8K6p3vAO4Zvl82jEL4AThcmfHdO4UbqKAxjxuxa8DRi4xLtHyorLjYuBwUoJelo6j4zC7MyuP9v4pfpK4wJ4ifcEXgbOD6S82mB/1smKCkoY5PX9Ob40MC/HbwdefZrSA4k9elqQFwrfGn8G7yHMV3RfMIZLQzMGvpcCEzBqDtef/fPXWuLOcYEl5KWC0te3qusJ/EMaaGdcBbyKcfn8ZVh2542gRYKGP9P9KL8vgBb6gjnLVw/DXl6WgOvD5cZEwNEFWNUby/UkARMuxe/FwMB9f5ZcenLdeVq8DW5SXJhOz2uW19CC1wEGLXAdgV+QtFKBwZrlZw5f70KY3n+vyyPJgQvYdgovlc8aOJI3Pn4n1M+Ei/IZwEE5afzZ13fXDApb4mLkz6ivNG0IPDWJoTDCV5nCNQpzv+7CcnINXhnKlK/Q2mF5h8IM7Fsor8lWQM7LSSXvlS43AAxN6aoEfY3ATEzH0UsB3oYxPDntyazAyvNV2p9EPVlw18QLYtPIcvVVtM22nKUnlBvmRsjHURDBt7q84hOY4peJ1x2YTmHwosrS98GT9WfwFuCVW3KQwlpiui1ofZn4kv4VfHiHX+6tgVp3WmHr0AOXgSfASmTQwpsBzQUWeIdJ3oFs0hVwqbTsuOJWqHp3DRfElKC3xeDSCN6wfs7bz8ybhy/lK6U2ig6cwgQMkSNeEIukNUFkrjiy9rPCBXLnPQDX5QWkhkeN5Wcsbu3AoS1uA47bz8DNLwx+APsX/pwXCWtYPDnjQlrHL2hdYO+6MGUV9CYZmHnzI7eeFOSEezHwu4G2PJUYwFk5mR9Hy/3JrHwGr0RnXObd+7wVGMQQ2MTw1B+Yn5+RoXlAiPjNziP06wh3XXkNMV36CRe8IC60UBhZGvr6EZzff+MDCbT2vrBWFZbWl3DVZLTNF8yo4V4cTQ23+TPsWM5hNGP99sa0HL4bL0F3WsHL+WrtWTrpv5G6BgKfwCv8+bg9NuCOnMfwUr/drSeZF+3nYckoCQJze0PcG9SoAe4s9a3AH6d4gQMGXMGb52fm5XlZOOrndNVmDNKJAawqrZGgBW0FrkmLmrE+bkVmeXNezldSVGeXwyoc6esBt4PYynuc7UN4HaQG1kYPkML9Db/fTsAkL/FCYC2v8eIOrnkt8HEmvvswN59Th964DSzQOhF8SX1lcpe+LpiKMpwv0KxfKgyrvO/AgT9fPg/lC3DcsOu0j0SbuvPCqWv8GcCKtvLe1RgGbTY+goX1MwYM2f3XhHJw3zfyev06j/dB+/O2A5csnTo096/8gegh6j9f8TglGCX5m2eqqkL8dsSqsmrNnuYOFuJXAq9yXqD6Ds0DpCR+k1UOAGtv1sDQlHrRRuBO24BjVm5w5Pf9K74Pkr6dHbRLwME6objt86iw64t0BeCPecGxPO3+ttzP4fAVZ3E/n3zaeGEFuMW4dcfnUbWatBg37W/k/VjmHZCQWpra5MD9yKPlpGxHheTOQmGiDeRNHDrl7ZTyLgyBi1G9obc3GBiqohcNfUGsFZ6y+y/JSwLTfD++8FPl4R1Kihe2sK8y6qvWyuJ6IwS2uKQwRW9UT35nXhPLEBgdafASLu8z9COIZg1G3zvY83sMP2X+HAdw4s+a12t2MG4jrrmKgCOBT8MYGLicpZnY0G7S+2+cr4Ti3aEfw3132cXhC/CoN2YnFgV0M+vOEPhZn8N8HaTxUbJOGAFjwQHAUdFR5A2aku2nng/yqo6QtwADF8CevjRNMQNCJjaw4HM7eKRvwwWvKbDwpodsgbSjMyStwjtwAfyR5oNBP+d/FoIf67+FBsDONN37UNCJX/lCaOqtcujzCLjPMmlZcaMBQ+zQ3J7suPEC+FpP+TEEtbz6JxgD4OOcrwRvAw4SFmiTiWhaYOFFtL6CAzj+/ojcG4wteenRd9VWykvAyfiI3DmdL0DdeGF2p26F8VCB9b4Xkt57uxz6BH5udi7ADTf7YGPjqtuB/foq2XfX9YY7EwSuuR92Rvi0HY3eEW8hrjHM697LFyQah/q8/j4lp+fBu/eAg/pj8L489PMJDj2OJaPv+7+SpZ/c+36M7DawiM6ZGDazU6SGC2ChaMR7L8ehvN2gK63Bez4X4FU2/wVszAsj3vj4hTdjamQ+uArvD52vTlRUEDutuwZ89oE3QfwihNP5L+Ny/OL8VVuEqt4w+MJ0jnrQOYuRB+/s0gQskdP6mXnDARryMzZY9JYK+CpuJLDdz9HA2/I02EF8rh5dk5YFXpoeLS40APfiD2Rp1Ru0jMsOPfY3eCGr1h4grvK+nl8/LK/nkC+TwrYbi4wNeZ1t6PUcvQYXy/zgdQOYU9RLj2jp0uBtwK+vH5x60h0g5e2NiktvBDG1N+RYEHiQF/wyP8uMVeA6H6b9MkuPvAXg/+tf5bzcjzbVc7iDxMeT7u+gjCQ9K/iWWpZV4tdiJoahrVtf6RED4R6SD4J9efcABm7MOwMDF3gdTvLW4qMWIDPvK7I00160voGAjRt4ZqHDerMGRECHDTyxf8UnEIgRwHcD+K2cw4OXb/zEGw/4TQaDUXlVeSFwt1ld4MffTwp9hZhgq8RHuDOA3xQwLFvgYH3DhSzn+nsdLhHuwb/UvuvDX0pOIEb4joI6cGl8XUb6xgmLP9CJ9YW68nv2IS8EdhJ0NwPM3Q11JA2F34rCq08bp7wytCqACThZuNMb0Xrq2/kabjHfnc2UX58+RwJGh/Z4B+A/b+/AwYGU7D9LdW/TgRIENmNuyAlc8mezdQafJncGcPstWwCvTWE/RYfdHBJ4aeD/6OM66TlYKow/SFLzUOJ9bsQQ+PmtAEPhC/MV6esl7PK47gx5TT2plvrTeQNvrXQ69DdmccW7QlvsV41hqjb89Ryic108+v75OnLnzov7MOMufSA72lfghcIiY81WsjSvMwAXvAeboOHf5gpRHihMuAbYlNPp/yBUTS1EP2xJ4cYLgRvwr1/lHCZ9FxeSRq4qFuoLp27eTF8672+gLvUrYQo33O8344U2cMCrglt53xiYF5LwOR3KKbXCwvoiivuk29X3Bu8C3OT7nHEgM7B8AeBf7NLx+Qs5D1Cd9s+op+N/yl5xm4X6UokVf3Gm+pPaw0u7o9AW3pK0rLybC+ZH6vXAhb4QeOd/ldJw8RawVmFckhh42FbyqpHDbFXfCqzDN5uHIoL5dcE1ApdkBeAbxdve4h0TU472Ahg+jXZs5wXyueICOD5+WUmK4cMQ2Oi700veJC+dyhb3q62yLC/sCN6zpa1RbIC/UYJWtHw9kn3L8VLLu/N3nt+fIi7eBl3LH+6hdP/gA6uBCvOeu8QfVn8rOxcepYIYCqtRo4Ki6C5ZIMhuuFeW//8Dnfdpe1qu1lUTH4mfp9OZ6WN4H/d7My+If1fiuItU4BrgPa1qzLbD7p45gIs1DDYX+JI0vuooHeHy4SJ/3X/W7uuGeIFbfo15WV4+VFZzgBUbgFuFJfOmr7kmADzeIEMJsnrnpzR8w42nytxRFa75k7587CCBB92ki8KXCjyVnEcD1quXBHbLg/EzFdzEvwduxBtPmiFEA9dk3Z+hb7YjFQ2zwiPjEb1XgLD044tzulhxlgPyuvFqv+FdaimpA9z0FY7JFjB4b5MYAgM4BS3QBvnncoVw0q9S9zVwI3feu5vUYdmhI4Exd1bJ4LzTWMW9pDQVmxPw3YJKxS322+ln4PX7+DXq4t+bXwTw4qOjEPjBm+qHQwshj1riaRAzMGjBWySuWLJ8Al6JKxQGWPycDi79cXhG6yhMpLWMvp0YgRsCJ2DvfoQbEn75d+cC8Fo7+ajn01Ld06Ycr1/KQoOXBSbggTZftkeErYx8S1+3Oa/hQN9k6nfMwSIBD+KKy2M438ta3S8/kgyLBeZbUm+40w5d0ebbfLno2D3NNRH/IUjYSdzyC85zjOtRFA2mnPPitbzfCZhx+U4Yj/VvGxGWKq6/54yNQF0PHgoMRsJ7A8+Ql3Ar20aMTtrR50O3WF68IuTq24Ev0DcLXGi7TZ13HDxcXGdj/t1YZftCEfix4jIw1PXcmfQN4nPAizz8AC7Et1kBX6+zjGbSpaW6buRecb75Mf3aaKizaBsKYm7AgjEuZ+1gu276bDHfmj+DeOr/GXMOWj8IN5xr4O7QpHKn7XD7jmbcnPwZuIsbUrABAxi8lXYetOnrWoCbwsSVcJP5c6Mr+DM9oGPdmR/95qTl4vkqPE7qojdc9gZ5ofD1PI3d6k2EC5PHrvi9a0O8qXVvAcz7EYgp6Y4hO+AyMMrCY/+9WYUTb5a4G4ADXlNXWnkzgyzlhn61Gj395fKa+MznDR5033Z/xo6UrdJWiWs4K2sYVJSZprpSy62HwBXXGa1jgRdrDAjQsApLg3atHFr0PUuPNsD94AF17UWCnsFeHoKlR86Rv1K0YbyKqyrVormz47FVGSpq+oKN40jdh4e8mfl+YXid91+mBRuaoBdf0unQfH7mgAVillcNrqTvN6gL4FkAN3W58g9DX7SQl3k3MojBgqdlYAPX8uLOAFyYqYSjstJwYWN3zi6deNximt/2vr7zXu6TaeqHyf0IAgMb7YSuQ9efAKxCtJOGtsDnxlvStJAX+mpg/Yx9KDAesmPebByvYDIQvwzeAqqi9M5dwIxsBW68CRjuTJ0dbp52TeEKuPyrPA/8XcqLmKX2nVFCKl8wt3GHLWftJkH7+ppP111hre9PN8/DuKxv7rRjXn6/LygCD6RMZUaRXmyYBi7Wr60lCd4ksKgPC32X6w4JKsL9B+BuJLBugAYw3Bm8fUZHK8zEZyHwta3gWZVa7tWVatvoWvLKo4V8YAZBzOzCVFOBDeBTA5YHSiAX1HHtj3EL8SwEvnZ5Z1lqgT+TvAYXoQm4sjU4fAM7TnKgX7QCI4n1QksY5vFmXA2cJK686Qs9HgudO2X7dYGf3NZv8HYjXgX8ou4FD3TmcLdhSEy4l8u582bD6RrAMKJt8kJEgfuV7xJMvHzpf1H3IPexZLomRXtS/vFyPEPftIiVwu8WedcZyYNiXKNwgf2HJGWJzwBuJuVlfbuRvNkmCJwN98Wcpo3uR414TVD9PXP6pBGO0ULee53fHbYSFVjFi8ft4v5KZKG1RxeJp1sHpvD8RTeirYi3WMfl1n6FS7xBzq4CNQ1PpG+fRoIBV+grSisNtgH/+XNWTS1x5XAVDvzi/SB6mSJ8tD++BCuPPS2ndTqwIO60ReHKm7468Ot5znY9v8FhUiNXXn+cbAPcrzAAx5f+6G2OwgNgm+UgfXeghcGjZzi0Jq5r2FjXN1caAqhHjCJ1faOPYjSt4EHfmZLwgT+sYBfe+nn9pq9zYgVswk32WsM08tI2zbGKPl/ja8LF7wXPq+7/p8hfgMGjLwy8IfX3oqw7o450fZXAAzkfulB5MEt4TWu08wYfLYpLP3BhFtdUGZSAOE0CF+rmb+zQsrkhe7QEVmZrS6Nu9khQw5t51huL1yNernq/sMJxlhLxypO3ACuBNbJbPVzx9Cuw3FEzTRwdJ8Oms5e0SAEkNyTcF/i4EQKf4dLNnWEotaBmVnl9qHS64tF2hKsg675UFX1QeWbnPAlzkljo8KjA0znz/oE/K+DfSt4vRd4hovtgzmM0+hx1cSxM1mVgteUA1wtXsb6jKDpTvBLApu69whKNnPbJyMs1FVs1S1j8NgWylADOQAAm3oEb7EijpHYFMCm8WgEXRX5//rWZvO7nL/d6JC78TcY7VeCT9NeT9Oho/bK8KHtDYnDKNbwawMCNLn1I6NBVMQzPnxtVlZl5AVxpTrT/GoX9C3Bdvq1oeq64DnHJSwOXeN1TsnJns4D581S+iUpRYvZG6xSQXr68HwXurLuWpitgaR8uEocfoPLYVqk0E8r4g3Ll9mvfc3OqDIMJLs1lhlBf7i+cc5m45eI94NRKGT4/sV498sf/Pmlcc0ES8gqPRiEwMZsikqoj9GQAgGH6Qkj6TrB5HolKcmmaJ5O4q9ItateoimUwWsCVl1tTgNuC9DMEFAeO0q5ibkkkrxR4dNzdZJn4qoPW2n4++4jC/WU3TsptaPt17/sd2MnZvBhg+CseiKooWwEsqklg7bjoAkDe/Twb4jcZKVi/azTZ0aX+iYH962+RErDyPRkAS97nzjvi77MqneWvyouecKxf7c4jk/UK4Ojz2h7ly25Of13Uy2ImRQ+y05nfV2nAaoC//oEtWI50rFQKQ9/elTZVXGkATlyW9rGri55vhtos+XOztB9RSg7xqDC/dIEBvFMwWwWMizDWrtC34Rrmq1zD/Dzf2na/P7HXLpyfx+fVcWP3wg77kGMVgDPKs78rSXcW/nybYaOXR0ZpOb/eY5Vd2uy0eydD6V333XHBnfNeDl/mRzfh8c4xuvB24Bv0NcxyH9b6ogtaAbOIG6oCU4LjUIv7rC+A+QCl5a2WgBGv6BY8+gqTP9883isB95ycwDWhjG/1e++jY+m6fyjIAOY2K+JtuCCepy3PvY8hnewLffWywucSqtmloW7wlI7Ty+7gpq8D5G0SV5n9zwMqFOTP9mR8gRcIYhrtMLCqJ08ELbxyffepM7NI8xctYW7j0MjR/YcVlrH3sqU/RLzFZscoSgsmqS5fnZ74VPGdQjRV+WHlqUIQI4ERXW+nZsf65/iWpID7OjbG+zDkpeEzk/sYAuI9Ci9EB+PP43VGyk95CxijNxd4gdLXIa4W8wI4n6Fp2o6fWuESUZWYczoG+Jt+zy68z5vcRVu8O/Z6yQvaTnzrtAP5VV0eyuINPkoVuOmHDW+ze7oVYhA4bu0/0Qbs7UdJ4i0O0H4aC/JCYNERr29LiNIrGocGsCwgdSIRkjC6AVueVCkqN1rLi9m5rboxgFY4PowOlqKp1iYAwjFgKXCRmHPM36OuFcehzfNBSl6KuTlWZRs1hqOzfgl3vkHfwcvACx8lgwy0U0XgrF01wuXW4NOOcDGesjVp6Ol8vnCeQ/LWazCWsL04wKXpMV36LPPOvDnQ+jwsF/njUQbBq4e5q7pw56n8w496Q4K81qPPukncpmkRr9a8HenPFxlEkO97VGRgfQ3wQ3iAftY3/kvv+EaAFmcxuggjYnnAFK74aVXY04bD72e5IfH77jHuDrSmNnRUZe/jNO54FxGwBjAMvNo0cPx0H/RFX+F3DkcoMsT7Ec8Cn5S6WzDks5WQdzvJcRys3y4vYFWIjoFjXkQr+SDlZ16h1Pm98MBblZcDFpbj8xD4Mqt5jQnEtP+6sLwPu/7ccPEJQehq2B8I50AnsKXRukwj9aUTYg/OcsCs2EW4M8krkpXaCBi0K3PC4nqp47Bhk44/u3Gi/VfuR+3CkAzenNdvtZkfqsCBErzWZJR+++njGk9hdeSqK/RFUnbP7voZwMtvcZz8/AZ4SxYd3qwHVMpsLNzZ8+j8jQzA2d5+zMDSInmzHVi/g9PFEci7o5Oie9+ZjnIiFsBwaBWib7wd8ToGMBJ5sHgea59hdBH/W6X1u86sO8spI6MvTg+QCfL2KA1cLGDIG1pt3npDxLSGqapy4PvP538d5fev+3Uktk6H0tYC4HS21JfHdqCcBi3+VmRvun10iKOmQoMDiX1eMcz/gPuReN+sFJJ6pTPkndT2xduvCxsDvwWt5aWe7wOr9zngBW3bkMihM24m7hT0L++47S8wMl0Il4EhMdS914X1maNR+LZbeH6u8qLWX//xDXg2+l64oaPpO8GhPeIY+BPp200XvbMdmOZb0FVogU/yVrvdgXd3FOHW6DurI2gHntMCvlE+9p+B31LAiprOILFkCeLVNztJuIO8O/2AAfO2w8YFtMXaXjyVvOzNjVcxMAz6cv8O1Rf4dvvLz2/wbGxXuC1eIEMuOQB8nkzi7qLuwSTvgv0FWzFPbqn+R/UAAAAASUVORK5CYII='); + } + + .money { + margin-bottom: 25rpx; + font-weight: 800; + font-size: 36rpx; + + text { + margin-left: 10rpx; + font-size: 60rpx; + } + } + } + + .right { + flex: 1; + min-width: 0; + padding-right: 18rpx; + padding-left: 27rpx; + background-color: #FFFFFF; + position: relative; + overflow: hidden; + + .name { + padding-top: 32rpx; + padding-bottom: 32rpx; + border-bottom: 1px solid #F0F0F0; + font-weight: 500; + font-size: 30; + line-height: 1; + color: #282828; + + text { + display: inline-block; + text-align: center; + line-height: 40rpx; + height: 40rpx; + padding: 0 10rpx; + -webkit-box-sizing: border-box; + box-sizing: border-box; + background: var(--view-minorColor); + border: 1px solid var(--view-theme); + opacity: 1; + border-radius: 22rpx; + font-size: 20rpx; + color: var(--view-theme); + margin-right: 12rpx; + + &.gary { + border-color: #BBB; + color: #bbb; + background-color: #F5F5F5; + + } + } + } + + .time-wrap { + display: flex; + align-items: center; + padding-top: 16rpx; + padding-bottom: 16rpx; + font-weight: 500; + font-size: 20rpx; + color: #999999; + + .time { + flex: 1; + min-width: 0; + } + + .button { + width: 136rpx; + height: 44rpx; + border-radius: 22rpx; + background-color: var(--view-theme); + font-weight: 500; + font-size: 22rpx; + line-height: 44rpx; + text-align: center; + color: #FFFFFF; + + } + + .gary { + font-size: 130rpx; + color: #DFDFDF; + position: absolute; + right: -15rpx; + z-index: 0; + bottom: -20rpx; + } + } + } + } + + .disabled { + .left { + background-image: url(../static/images/coupon2.png); + } + + .right { + .name { + text { + border-color: #C1C1C1; + color: #C1C1C1; + } + } + + .time-wrap { + .button { + background-color: #CCCCCC; + color: #FFFFFF; + } + } + } + } + } + + .empty-box { + display: flex; + flex-direction: column; + justify-content: center; + align-items: center; + margin-top: 0; + padding-top: 200rpx; + + image { + width: 414rpx; + height: 240rpx; + } + + .txt { + font-size: 26rpx; + color: #999; + } + } + + .footer { + position: fixed; + bottom: 0; + left: 0; + z-index: 5; + display: flex; + width: 100%; + height: 100rpx; + height: calc(100rpx+ constant(safe-area-inset-bottom)); ///兼容 IOS<11.2/ + height: calc(100rpx + env(safe-area-inset-bottom)); ///兼容 IOS>11.2/ + background-color: #FFFFFF; + opacity: 0.96; + + .item { + flex: 1; + display: flex; + flex-direction: column; + justify-content: center; + align-items: center; + font-weight: 500; + font-size: 20rpx; + color: #282828; + + .iconfont { + font-size: 43rpx; + } + + .icon-zhuanti { + font-size: 38rpx; + } + } + + .active { + color: var(--view-theme); + } + } + + .p-b-75 { + padding-bottom: 150rpx; + } + + .vip-money { + color: #282828; + font-size: 22rpx; + margin-left: 6rpx; + font-weight: bold; + } + + .vipImg { + width: 65rpx; + height: 28rpx; + margin-left: 4rpx; + + image { + width: 100% !important; + height: 100% !important; + display: block; + } + } + \ No newline at end of file diff --git a/pages/store/settledApply/settledApply.vue b/pages/store/settledApply/settledApply.vue index 767648d..eb16e87 100644 --- a/pages/store/settledApply/settledApply.vue +++ b/pages/store/settledApply/settledApply.vue @@ -4,12 +4,12 @@ 商户名称 - 真实姓名 - @@ -20,7 +20,7 @@ 验证码 - - + @@ -107,13 +107,14 @@ data() { return { formData: { - enterprise_name: '', - user_name: '', + mer_name: '', + name: '', phone: '', - yanzhengma: '', - classification: '', - mer_type: '', - site: '' + code: '', + merchant_category_id: '', + mer_type_id: '', + site: '', + images: [] }, disabled: false, timer: "", @@ -123,6 +124,7 @@ columns: [], mer_classification: '', // 商户分类 mer_storeType: '', // 店铺类型 + site_name: '', // 店铺所在地 isOpenFair: false, // 是否农贸市场 pics: [], isAgree: false, @@ -135,8 +137,11 @@ onLoad() {}, onShow() {}, methods: { - formSubmit() { - + async formSubmit() { + this.formData.images = this.pics + if (this.validateForm()) { + const res = await create(this.formData).catch(err => Toast(err)) + } }, ChangeIsAgree: function(e) { this.isAgree = !this.isAgree; @@ -189,13 +194,16 @@ console.log('e', e); switch (this.keyName) { case 'category_name': - this.formData.classification = e.value[0].category_name + this.mer_classification = e.value[0].category_name + this.formData.merchant_category_id = e.value[0].merchant_category_id break; case 'type_name': - this.formData.mer_type = e.value[0].type_name + this.formData.mer_type_id = e.value[0].mer_type_id + this.mer_storeType = e.value[0].type_name break; case 'name': - this.formData.site = e.value[1].name + this.formData.site = e.value[1].code + this.site_name = e.value[1].name break; } this.pickerShow = false @@ -312,6 +320,36 @@ that.pics.splice(index, 1); that.$set(that, 'pics', that.pics); }, + validateForm: function() { + let that = this, + value = that.formData; + if (!value.mer_name) return that.$util.Tips({ + title: '请输入企业名称' + }); + if (!value.name) return that.$util.Tips({ + title: '请输入姓名' + }); + if (!value.phone) return that.$util.Tips({ + title: '请输入手机号' + }); + if (!/^1(3|4|5|7|8|9|6)\d{9}$/i.test(value.phone)) return that.$util.Tips({ + title: '请输入正确的手机号码' + }); + if (!value.code) return that.$util.Tips({ + title: '请填写验证码' + }); + if (!value.merchant_category_id) return that.$util.Tips({ + title: '请选择商户分类' + }); + if (!that.isAgree) return that.$util.Tips({ + title: '请勾选并同意入驻协议' + }); + // if (that.isShowCode && !that.codeVal) return that.$util.Tips({ + // title: '请填写图片验证码' + // }); + // that.validate = true; + return true; + }, }, onPullDownRefresh() { uni.stopPullDownRefresh() diff --git a/pages/supply_chains/supply_chains.vue b/pages/supply_chains/supply_chains.vue index 9555952..47348d3 100644 --- a/pages/supply_chains/supply_chains.vue +++ b/pages/supply_chains/supply_chains.vue @@ -6,7 +6,7 @@ :interval="swiper.interval" :duration="swiper.duration" indicator-active-color="#fff"> - + @@ -142,9 +142,9 @@ import { mapGetters } from 'vuex' import mTabbar from '@/components/m-tabbar/m-tabbar.vue' import WaterfallsFlow from '@/components/plantWaterfallsFlow/WaterfallsFlow.vue' - import { getSlideAPI, getArea, getStreet } from '@/api/article.js' + import { getSlideAPI, getArea, getStreet, getArticleListAPI } from '@/api/article.js' import { graphicLstApi, getTopicList, graphicStartApi } from '@/api/community.js' - import { getIndexData, getArticleCategoryList, getArticleList } from '@/api/api.js' + import { getDiy, getArticleCategoryList, getArticleList } from '@/api/api.js' import { Toast } from '@/libs/uniApi' export default { components: { @@ -221,6 +221,7 @@ }, async articleHotList() { const res = await getArticleList(19) + // console.log('res', res); this.ArticleHotList = res.data.list }, gogogo(item) { @@ -265,15 +266,19 @@ this.tabsData.tabsActive = item.index }, async getBanner() { - const { data } = await getIndexData() - this.swiper.url = data.banner + const { data } = await getDiy({ id: 0 }) + if (data.value['1683638943100000']) { + this.swiper.url = data.value['1683638943100000'].swiperConfig.list + } else { + this.swiper.url = data.value['1683875164005000'].swiperConfig.list + } }, // 二级联动 changeHandler(e) { const { columnIndex, value, values, index, picker = this.$refs.uPicker } = e; if (columnIndex === 0) { getStreet({ area_code: value[0]['code'] }).then(res => { - this.$refs.uPicker.setColumnValues(1, res); + this.$refs.uPicker.setColumnValues(1, res.data); }); } }, @@ -297,6 +302,11 @@ }, }, onPullDownRefresh() { + this.getBanner() + this.getCateList() + this.getGoods() + this.articleHotList() + this.Area() uni.stopPullDownRefresh() } } diff --git a/utils/http.js b/utils/http.js index fc983f3..5f4b530 100644 --- a/utils/http.js +++ b/utils/http.js @@ -55,7 +55,7 @@ function baseRequestTwo(url, method, data, { else if (res.data.status == 200) reslove(res.data, res); else if (res.data.code == 1) { - reslove(res.data.data); + reslove(res.data); } else if (res.data.code == 0) { reslove(res.data, res); } else if ([410000, 410001, 410002, 40000].indexOf(res.data.status) !== -1) { @@ -86,4 +86,4 @@ const http = {}; http[method] = (api, data, opt) => baseRequestTwo(api, method, data, opt || {}) }); -export default http; +export default http; \ No newline at end of file