From a51e096915b61e6067e607bbe47b5152b4852e40 Mon Sep 17 00:00:00 2001 From: yujialong <479214531@qq.com> Date: Wed, 13 Dec 2023 14:25:19 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E7=AD=89=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apis/modules/activity.js | 9 ++ apis/modules/order.js | 42 ----- config/request.js | 4 +- order/activityDetail/activityDetail.vue | 207 +++++++----------------- pages.json | 12 +- pages/index/index.vue | 147 +++++++++-------- pages/login/login.vue | 3 +- pages/person/person.vue | 94 ++++------- pages/supplier/supplier.vue | 9 +- static/image/index/1.png | Bin 775 -> 0 bytes static/image/index/2.png | Bin 1078 -> 0 bytes static/image/index/3.png | Bin 1331 -> 0 bytes static/image/index/4.png | Bin 1289 -> 0 bytes static/image/index/5.png | Bin 599 -> 0 bytes static/image/index/6.png | Bin 439 -> 0 bytes static/image/index/7.png | Bin 1062 -> 0 bytes static/image/index/8.png | Bin 518 -> 0 bytes static/image/index/9.png | Bin 522 -> 0 bytes static/image/index/banner.png | Bin 25860 -> 0 bytes static/image/index/banner1.png | Bin 21349 -> 0 bytes static/image/info.png | Bin 29025 -> 0 bytes static/image/product/1.png | Bin 483 -> 0 bytes static/image/product/2.png | Bin 434 -> 0 bytes static/image/product/3.png | Bin 298 -> 0 bytes static/image/product/4.png | Bin 351 -> 0 bytes static/image/product/5.png | Bin 641 -> 0 bytes static/image/product/6.png | Bin 251 -> 0 bytes static/image/product/excel.png | Bin 480 -> 0 bytes static/image/product/pdf.png | Bin 440 -> 0 bytes static/image/product/ppt.png | Bin 347 -> 0 bytes static/image/product/shop-blue.png | Bin 1007 -> 0 bytes static/image/product/shop.png | Bin 510 -> 0 bytes static/image/product/word.png | Bin 502 -> 0 bytes static/image/study-bg.jpg | Bin 49116 -> 0 bytes styles/common.scss | 2 +- team/info/info.vue | 46 ++---- team/infoEdit/infoEdit.vue | 107 ++++++++++++ uni_modules/uni-scss/variables.scss | 2 +- 38 files changed, 312 insertions(+), 372 deletions(-) create mode 100644 apis/modules/activity.js delete mode 100644 apis/modules/order.js delete mode 100644 static/image/index/1.png delete mode 100644 static/image/index/2.png delete mode 100644 static/image/index/3.png delete mode 100644 static/image/index/4.png delete mode 100644 static/image/index/5.png delete mode 100644 static/image/index/6.png delete mode 100644 static/image/index/7.png delete mode 100644 static/image/index/8.png delete mode 100644 static/image/index/9.png delete mode 100644 static/image/index/banner.png delete mode 100644 static/image/index/banner1.png delete mode 100644 static/image/info.png delete mode 100644 static/image/product/1.png delete mode 100644 static/image/product/2.png delete mode 100644 static/image/product/3.png delete mode 100644 static/image/product/4.png delete mode 100644 static/image/product/5.png delete mode 100644 static/image/product/6.png delete mode 100644 static/image/product/excel.png delete mode 100644 static/image/product/pdf.png delete mode 100644 static/image/product/ppt.png delete mode 100644 static/image/product/shop-blue.png delete mode 100644 static/image/product/shop.png delete mode 100644 static/image/product/word.png delete mode 100644 static/image/study-bg.jpg create mode 100644 team/infoEdit/infoEdit.vue diff --git a/apis/modules/activity.js b/apis/modules/activity.js new file mode 100644 index 0000000..4656b43 --- /dev/null +++ b/apis/modules/activity.js @@ -0,0 +1,9 @@ +import request from '@/apis/request.js' +const { get, post } = request + +export const postLoginActivity = (data) => { + return post('competition/competition/management/postLoginActivity', data) +} +export const getCompetition = (id) => { + return post(`competition/competition/management/getCompetition?competitionId=${id}`) +} \ No newline at end of file diff --git a/apis/modules/order.js b/apis/modules/order.js deleted file mode 100644 index e9a003d..0000000 --- a/apis/modules/order.js +++ /dev/null @@ -1,42 +0,0 @@ -import request from '@/apis/request.js' -const { get, post } = request - -export const getOrderOtherTime = (data) => { - return post('nakadai/nakadai/orderOther/getOrderOtherTime', data) -} - -export const add = (data) => { - return post('nakadai/nakadai/order/add', data) -} - -export const update = (data) => { - return post('nakadai/nakadai/order/update', data) -} - -export const getDetail = (data) => { - return get('nakadai/nakadai/order/get', data) -} - -export const renew = (data) => { - return post('nakadai/nakadai/orderOther/renew', data) -} - -export const list = (data) => { - return post('nakadai/nakadai/applets/order/orderList', data) -} - -export const orderList = (data) => { - return post('nakadai/nakadai/order/list', data) -} - -export const del = (data) => { - return post('nakadai/nakadai/order/delete', data) -} - -export const miniProgramOrderRecord = (data) => { - return post('nakadai/nakadai/applets/order/miniProgramOrderRecord', data) -} - -export const queryCitySettlementPrice = (mallId, provinceId, cityId) => { - return post(`nakadai/mallPrice/queryCitySettlementPrice?mallId=${mallId}&provinceId=${provinceId}&cityId=${cityId}`) -} \ No newline at end of file diff --git a/config/request.js b/config/request.js index 6f3a944..3c03aad 100644 --- a/config/request.js +++ b/config/request.js @@ -5,8 +5,8 @@ */ export default { - baseURL: 'https://huorantech.cn/', - // baseURL: 'http://192.168.31.152:9000/', + // baseURL: 'https://huorantech.cn/', + baseURL: 'http://192.168.31.217:10010/', // baseURL: 'http://121.37.12.51/', headers: { 'Content-Type': 'application/json;charset=UTF-8' diff --git a/order/activityDetail/activityDetail.vue b/order/activityDetail/activityDetail.vue index 0006784..cb82e9f 100644 --- a/order/activityDetail/activityDetail.vue +++ b/order/activityDetail/activityDetail.vue @@ -1,7 +1,7 @@ @@ -236,7 +143,7 @@ margin: 20rpx 0; } .label { - width: 180rpx; + min-width: 180rpx; font-size: 28rpx; } .val { @@ -245,34 +152,36 @@ color: #333; } } -.tabs { +.detail { + padding: 34rpx 32rpx; + margin: 20rpx; + border-radius: 20px; + background-color: #fff; +} +.btns { + position: fixed; + bottom: 0; display: flex; justify-content: center; - margin-bottom: 32rpx; - li { - width: 33.33%; - text-align: center; + width: 100%; + padding: 20rpx 0; + background-color: #fff; + .btn { + width: 200rpx; + padding: 16rpx 0; font-size: 28rpx; - color: #333; - white-space: nowrap; + color: #fff; + text-align: center; } - .active { - color: #007EFF; - &:after { - content: ''; - display: block; - width: 40rpx; - height: 8rpx; - margin: 18rpx auto 0; - border-radius: 4px; - background-color: #007EFF; - } + .share { + background-color: #75b4ff; + border-top-left-radius: 40rpx; + border-bottom-left-radius: 40rpx; + } + .sign { + background-color: $uni-primary; + border-top-right-radius: 40rpx; + border-bottom-right-radius: 40rpx; } -} -.detail { - padding: 34rpx 32rpx; - margin: 16rpx 0; - border-radius: 20px; - background-color: #fff; } diff --git a/pages.json b/pages.json index bf2f0ba..84122fb 100644 --- a/pages.json +++ b/pages.json @@ -146,6 +146,14 @@ "navigationBarTitleText" : "企业认证", "enablePullDownRefresh" : false } + }, + { + "path" : "infoEdit/infoEdit", + "style" : + { + "navigationBarTitleText" : "信息维护", + "enablePullDownRefresh" : false + } } ] } @@ -166,7 +174,7 @@ "globalStyle": { "navigationBarTextStyle": "white", "navigationBarTitleText": "幼教产业B2B产业平台", - "navigationBarBackgroundColor": "#007EFF", + "navigationBarBackgroundColor": "#4876f9", "backgroundColor": "#f5f5f5", "app-plus": { "background": "#efeff4" @@ -174,7 +182,7 @@ }, "tabBar": { "color": "#B8B9B8", - "selectedColor": "#007FFF", + "selectedColor": "#4876f9", "borderStyle": "white", "backgroundColor": "#ffffff", "fontSize": "22px", diff --git a/pages/index/index.vue b/pages/index/index.vue index 3e40967..3c78d89 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -9,30 +9,32 @@ - + 爆款推荐 - + - + 活动速递
  • {{ tab.name }}
- - + + - {{ item.productName }} - {{ item.tagsName }} - {{ item.marketUnitPrice }}元/年 + {{ item.competitionName }} + 时间:{{ item.playStartTime + ' ~ ' + item.playEndTime }} + 主办方:{{ item.sponsor }} + (0/{{ item.quantityLimit }})人已报名 + 报名 @@ -43,19 +45,16 @@ @@ -119,8 +134,6 @@ diff --git a/pages/login/login.vue b/pages/login/login.vue index 4306b13..c8afb6f 100644 --- a/pages/login/login.vue +++ b/pages/login/login.vue @@ -45,7 +45,8 @@ } }, onShow() { - // uni.setStorageSync('token', 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJzdWIiOiJ1c2VyIiwiaWF0IjoxNjg2NzExNTA5LCJleHAiOjE2ODY3NTQ3MDksImFjY291bnRJZCI6IjEyNTU4In0.SX1sNFtb2JiCufgTz3ZmQkcJ-FtVci7Hp0DFd_mVk8E') + + uni.setStorageSync('token', 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJzdWIiOiJ1c2VyIiwiaWF0IjoxNzAyMjg4MDEzLCJleHAiOjE3MDMxNTIwMTMsImFjY291bnRJZCI6IjEifQ.3dZSZAG7w8tSPU9DBL0VdULgkQmiZpYVzjf1qfxx5HY') // 先授权用户信息,再授权手机号 this.checkLogin() }, diff --git a/pages/person/person.vue b/pages/person/person.vue index f93c5d6..f1b83e5 100644 --- a/pages/person/person.vue +++ b/pages/person/person.vue @@ -1,7 +1,7 @@