diff --git a/apis/modules/supplier.js b/apis/modules/supplier.js index 1e81308..4cf9291 100644 --- a/apis/modules/supplier.js +++ b/apis/modules/supplier.js @@ -2,7 +2,7 @@ import request from '@/apis/request.js' const { get, post } = request export const selectEnterpriseCertificationList = (data) => { - return post('nakadai/enterprise/certification/selectEnterpriseCertificationList', data) + return post('nakadai/enterprise/certification/supplierList', data) } export const treeStructureList = () => { return post('nakadai/supplierClassification/treeStructureList') @@ -10,3 +10,9 @@ export const treeStructureList = () => { export const saveSupplierClassification = (data) => { return post('nakadai/supplierClassificationConfig/save', data) } +export const cancelCollection = (id) => { + return post('nakadai/collectionProvider/cancelCollection?id=' + id) +} +export const collect = (data) => { + return post('nakadai/collectionProvider/collect', data) +} diff --git a/config/request.js b/config/request.js index d57d2ba..aea2d7a 100644 --- a/config/request.js +++ b/config/request.js @@ -5,7 +5,7 @@ */ export default { - // baseURL: 'http://192.168.31.51:10010/', + // 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/follow/follow.vue b/other/follow/follow.vue new file mode 100644 index 0000000..4246f1c --- /dev/null +++ b/other/follow/follow.vue @@ -0,0 +1,260 @@ + + + + + diff --git a/other/registeredActivity/registeredActivity.vue b/other/registeredActivity/registeredActivity.vue index 54f9ee8..90b3645 100644 --- a/other/registeredActivity/registeredActivity.vue +++ b/other/registeredActivity/registeredActivity.vue @@ -2,11 +2,10 @@ - - + + + - - - - {{ item.competitionName }} - {{ item.applicantNum }}/{{ item.quantityLimit }}人已报名 - - - + - 举办时间:{{ item.playStartTime + ' ~ ' + item.playEndTime }} + {{ item.competitionName }} + 举办时间:{{ item.playStartTime.substr(0, 16) + ' ~ ' + item.playEndTime.substr(0, 16) }} 主办方:{{ item.sponsor }} + {{ item.applicantNum }}/{{ item.quantityLimit }}人已报名 + 电子入场券 - 电子入场券 @@ -68,51 +64,6 @@ return { tabs: [], popup: false, - //筛选表单数据 - filters: [ - { - children: false,//是否有子项 - title: "产品类型", - key: "productType", //键名 接收对象名字 - keyValue: "value", //获取的值是哪个 - isRadio: true, //是否单选 否则多选 - data: [], - }, - { - children: false,//是否有子项 - title: "官方精选", - key: "selection", //键名 接收对象名字 - keyValue: "value", //获取的值是哪个 - data: [ - { - value: 1, - title: '官方精选' - } - ], - }, - { - children: false,//是否有子项 - title: "产品标签", - key: "tagId", //键名 接收对象名字 - keyValue: "value", //获取的值是哪个 - isRadio: true, //是否单选 否则多选 - data: [], - }, - ], - filterForm: { - productType: [], - selection: [], - tagId: [] - }, - form: { - categoryId: '', - professionalCategoryId: '', - professionalId: '', - productType: '', - selection: '', - tagId: '' - }, - tagId: '', curTab: '', tabs: [], scrollLeft: 0, @@ -281,10 +232,8 @@ }, // 展示电子券 use(row) { - if (row.playing) { - this.curRow = row - this.$refs.popup.open() - } + this.curRow = row + this.$refs.popup.open() }, // 关闭弹框 closePopup() { @@ -297,8 +246,13 @@ \ No newline at end of file diff --git a/pages.json b/pages.json index 9a72fbc..749b0ac 100644 --- a/pages.json +++ b/pages.json @@ -124,6 +124,22 @@ "navigationBarTitleText" : "爆款详情", "enablePullDownRefresh" : false } + }, + { + "path" : "webview/webview", + "style" : + { + "navigationBarTitleText" : "", + "enablePullDownRefresh" : false + } + }, + { + "path" : "follow/follow", + "style" : + { + "navigationBarTitleText" : "我的关注", + "enablePullDownRefresh" : true + } } ] }, diff --git a/pages/index/index.vue b/pages/index/index.vue index 14b70cc..917d247 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -266,12 +266,8 @@ } else if (selectLinkId === '3') { this.$util.to('/other/supplierDetail/supplierDetail?teamId=' + correspondingLinkId) } - } else { - location.href = item.jumpLink - // uni.openUrl({ - // url: item.jumpLink - // }) - // this.$util.to() + } else if (item.jumpLink) { // 外部链接 + this.$util.to('/other/webview/webview?url=' + item.jumpLink) } } }, diff --git a/pages/person/person.vue b/pages/person/person.vue index d48d842..06b4beb 100644 --- a/pages/person/person.vue +++ b/pages/person/person.vue @@ -36,7 +36,7 @@ 我的电子券 -
  • +
  • 我的关注
  • diff --git a/pages/supplier/supplier.vue b/pages/supplier/supplier.vue index 1e749d7..d98d712 100644 --- a/pages/supplier/supplier.vue +++ b/pages/supplier/supplier.vue @@ -9,7 +9,7 @@ - + {{ item.companyName }} @@ -23,7 +23,13 @@ {{ item.province }}-{{ item.city }} - 我想采购 + + + + {{ item.whetherAttention ? '取消关注' : '关注' }} + + 我想采购 + @@ -34,7 +40,7 @@