diff --git a/apis/modules/supplier.js b/apis/modules/supplier.js index c381802..e177fd3 100644 --- a/apis/modules/supplier.js +++ b/apis/modules/supplier.js @@ -2,5 +2,5 @@ import request from '@/apis/request.js' const { get, post } = request export const selectEnterpriseCertificationList = (data) => { - return post('users/enterprise/certification/selectEnterpriseCertificationList', data) + return post('nakadai/enterprise/certification/selectEnterpriseCertificationList', data) } diff --git a/apis/modules/user.js b/apis/modules/user.js index 1a2ac30..e3027fa 100644 --- a/apis/modules/user.js +++ b/apis/modules/user.js @@ -8,22 +8,22 @@ export const kindergartenWeChatApplication = (data) => { return post('nakadai/kindergarten/platformTeamAccount/kindergartenWeChatApplication', data) } export const realNameAuthentication = (data) => { - return post(`users/users/autonym/realNameAuthentication`, data) + return post(`nakadai/users/autonym/realNameAuthentication`, data) } export const faceAuthentication = (data) => { - return post(`users/users/autonym/faceAuthentication?imgFile=${data.imgFile}&side=${data.side}`) + return post(`nakadai/users/autonym/faceAuthentication?imgFile=${data.imgFile}&side=${data.side}`) } export const authenticationOrNot = () => { - return post(`users/users/autonym/authenticationOrNot`) + return post(`nakadai/users/autonym/authenticationOrNot`) } export const businessLicensePictureVerification = (imgFile) => { - return post(`users/users/autonym/businessLicensePictureVerification?imgFile=${imgFile}`) + return post(`nakadai/users/autonym/businessLicensePictureVerification?imgFile=${imgFile}`) } export const creditCodeAuthentication = (data) => { - return post(`users/users/autonym/creditCodeAuthentication`, data) + return post(`nakadai/users/autonym/creditCodeAuthentication`, data) } export const organizationCertification = (data) => { - return post(`users/users/autonym/organizationCertification`, data) + return post(`nakadai/users/autonym/organizationCertification`, data) } export const updateTeamInfo = (data) => { return post(`nakadai/kindergarten/platformTeamAccount/updateTeamInfo`, data) @@ -35,10 +35,10 @@ export const viewUserDetails = (data) => { return get(`users/users/userAccount/viewUserDetails`, data) } export const enterpriseCertificationStatus = (openId) => { - return post(`users/enterprise/certification/enterpriseCertificationStatus?openId=${openId}`) + return post(`nakadai/enterprise/certification/enterpriseCertificationStatus?openId=${openId}`) } export const saveCertification = (data) => { - return post(`users/enterprise/certification/save`, data) + return post(`nakadai/enterprise/certification/save`, data) } diff --git a/config/request.js b/config/request.js index 08ed423..c7a55e0 100644 --- a/config/request.js +++ b/config/request.js @@ -6,8 +6,8 @@ export default { // baseURL: 'https://huorantech.cn/', - baseURL: 'http://192.168.31.51:10010/', - // baseURL: 'http://124.71.79.122/', + // baseURL: 'http://192.168.31.217:10010/', + baseURL: 'http://124.71.79.122/', headers: { 'Content-Type': 'application/json;charset=UTF-8' }, diff --git a/other/activityDetail/activityDetail.vue b/other/activityDetail/activityDetail.vue index 764b477..77ba67b 100644 --- a/other/activityDetail/activityDetail.vue +++ b/other/activityDetail/activityDetail.vue @@ -50,9 +50,6 @@ {{ item.username }} - - 组织名称： - 手机号：{{ item.phone }} @@ -275,7 +272,6 @@ .top { display: flex; align-items: center; - margin-bottom: 20rpx; } .avatar { width: 60rpx; diff --git a/other/supplierDetail/supplierDetail.vue b/other/supplierDetail/supplierDetail.vue index 41338ba..1095811 100644 --- a/other/supplierDetail/supplierDetail.vue +++ b/other/supplierDetail/supplierDetail.vue @@ -2,48 +2,65 @@ {{ form.classificationName }} + + - +
  • 主页
  • 商品
- - - - 公司简介 - - - - + + + + 测试标题 + ￥12.8 + + --> + + + + + 联系我们 + + + @@ -55,32 +72,19 @@ return { teamId: '', curTab: 0, - tabs: [ - { - name: '详情介绍', - id: 0 - }, - { - name: '界面图', - id: 1 - }, - { - name: '参数', - id: 2 - } - ], form: { classificationName: '', + slogan: '', briefIntroduction: '' }, - shopCartTotal: 0, - types: [], + desPics: [], + curPic: 0, dotsStyles: { backgroundColor: 'rgba(83, 200, 249,0.3)', border: '1px rgba(83, 200, 249,0.3) solid', color: '#fff', - selectedBackgroundColor: 'rgba(83, 200, 249,0.9)', - selectedBorder: '1px rgba(83, 200, 249,0.9) solid' + selectedBackgroundColor: 'rgba(255, 255, 249,0.9)', + selectedBorder: '1px rgba(251, 251, 251,0.9) solid' }, mpStyle: { p: 'font-size: 25rpx !important;font-family: Microsoft Yahei !important;font-weight: 400 !important;color: #333 !important;', @@ -103,9 +107,20 @@ const res = await queryTeamInfo({ teamId: this.teamId }) - this.form = res.teamInfo + const data = res.teamInfo + if (data) { + // 处理描述图片 + if (data.pictureUrl) { + this.desPics = data.pictureUrl.split(',') + } + } + this.form = data uni.hideLoading() }, + // 描述图片切换 + picChange(e) { + this.curPic = e.detail.current; + }, // tab切换 tabChange(id) { this.curTab = id @@ -122,6 +137,11 @@ padding: 20rpx; .name { font-size: 30rpx; + font-weight: 600; + } + .slogan { + margin: 20rpx 0; + font-size: 28rpx; } } .tabs { @@ -148,11 +168,27 @@ } } } +.block { + padding: 24rpx; +} .detail { - padding: 34rpx 32rpx; - margin: 16rpx 0; - border-radius: 20px; - background-color: #fff; + .title { + margin-bottom: 20rpx; + font-size: 28rpx; + font-weight: 600; + } + .pics { + margin: 20rpx 0; + .pic { + width: 100%; + height: 300rpx; + } + } + .des { + margin-top: 20rpx; + font-size: 26rpx; + line-height: 1.6; + } } .list { display: flex; diff --git a/pages.json b/pages.json index aaa0089..3b23ca0 100644 --- a/pages.json +++ b/pages.json @@ -212,11 +212,6 @@ "iconPath": "static/image/tab2.png", "selectedIconPath": "static/image/tab2-1.png", "text": "供应商" - },{ - "pagePath": "pages/shop/shop", - "iconPath": "static/image/tab3.png", - "selectedIconPath": "static/image/tab3-1.png", - "text": "商城" }, { "pagePath": "pages/person/person", "iconPath": "static/image/tab4.png", diff --git a/pages/person/person.vue b/pages/person/person.vue index 46d7c5f..32ec4a7 100644 --- a/pages/person/person.vue +++ b/pages/person/person.vue @@ -14,14 +14,18 @@ - - {{ info.userName || userName }} + + + {{ info.userName || userName }} + + {{ info.authentication }} + + + + {{ curAccount.account || info.phone }} - - {{ info.authentication }} - - + @@ -128,10 +132,6 @@ 我要采购 -
  • - - 对账管理 -