diff --git a/.env.development b/.env.development index bee9daf..a3f1b1a 100644 --- a/.env.development +++ b/.env.development @@ -1,5 +1,6 @@ NODE_ENV='development' # must start with VUE_APP_ VUE_APP_ENV = 'development' -VUE_APP_BASE_URL = http://192.168.1.140/api' +VUE_APP_BASE_URL = 'http://192.168.1.144/api' +# VUE_APP_BASE_URL = http://192.168.1.140/api' outputDir = 'epmet-work-wx-dev' diff --git a/package-lock.json b/package-lock.json index 995143e..7386f23 100644 --- a/package-lock.json +++ b/package-lock.json @@ -7787,6 +7787,11 @@ "resolved": "https://registry.npmmirror.com/punycode/-/punycode-2.3.1.tgz", "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==" }, + "qrcodejs2": { + "version": "0.0.2", + "resolved": "https://registry.npmmirror.com/qrcodejs2/-/qrcodejs2-0.0.2.tgz", + "integrity": "sha512-+Y4HA+cb6qUzdgvI3KML8GYpMFwB24dFwzMkS/yXq6hwtUGNUnZQdUnksrV1XGMc2mid5ROw5SAuY9XhI3ValA==" + }, "qs": { "version": "6.13.0", "resolved": "https://registry.npmmirror.com/qs/-/qs-6.13.0.tgz", diff --git a/package.json b/package.json index 4bc9025..86a53f3 100644 --- a/package.json +++ b/package.json @@ -29,6 +29,7 @@ "html-webpack-plugin": "^5.5.3", "less-loader": "^11.1.0", "postcss-pxtorem": "^6.0.0", + "qrcodejs2": "0.0.2", "regenerator-runtime": "^0.13.5", "vant": "^2.12.48", "vconsole": "^3.15.0", diff --git a/src/api/basic.js b/src/api/basic.js index fc60c9e..6b02a34 100644 --- a/src/api/basic.js +++ b/src/api/basic.js @@ -12,6 +12,8 @@ export function getAutograph(data) { // 上传文件 export function uploadvariedfile(file) { + console.log(file,"神的"); + var files = new File([file], new Date().getTime() + file.name) const data = new FormData() data.append('file', files) diff --git a/src/assets/images/peoSuggestion/5.png b/src/assets/images/peoSuggestion/5.png new file mode 100644 index 0000000..7ec3b6f Binary files /dev/null and b/src/assets/images/peoSuggestion/5.png differ diff --git a/src/assets/images/peoSuggestion/6.jpg b/src/assets/images/peoSuggestion/6.jpg new file mode 100644 index 0000000..a799d4c Binary files /dev/null and b/src/assets/images/peoSuggestion/6.jpg differ diff --git a/src/assets/images/peoSuggestion/7.jpg b/src/assets/images/peoSuggestion/7.jpg new file mode 100644 index 0000000..817a96a Binary files /dev/null and b/src/assets/images/peoSuggestion/7.jpg differ diff --git a/src/assets/images/peoSuggestion/8.jpg b/src/assets/images/peoSuggestion/8.jpg new file mode 100644 index 0000000..3944ecf Binary files /dev/null and b/src/assets/images/peoSuggestion/8.jpg differ diff --git a/src/router/router.config.js b/src/router/router.config.js index 45cd878..1b1c40d 100644 --- a/src/router/router.config.js +++ b/src/router/router.config.js @@ -137,18 +137,70 @@ export const constantRouterMap = [ component: () => import('@/views/peoSuggestion'), meta: { title: '人民意见征集', keepAlive: false } }, + { path: '/peoSuggestionexplain', name: 'peoSuggestionexplain', component: () => import('@/views/peoSuggestion/explain.vue'), meta: { title: '征集说明', keepAlive: false } }, + { + path: '/solicitationDaily', + name: 'solicitationDaily', + component: () => import('@/views/peoSuggestion/solicitationDaily.vue'), + meta: { title: '日常征集', keepAlive: false } + }, + { + path: '/specialTopicList', + name: 'specialTopicList', + component: () => import('@/views/peoSuggestion/specialTopicList.vue'), + meta: { title: '专题征集列表', keepAlive: false } + }, + { + path: '/SpecialsolicitationFill', + name: 'SpecialsolicitationFill', + component: () => import('@/views/peoSuggestion/SpecialsolicitationFill.vue'), + meta: { title: '专题征集', keepAlive: false } + }, + // { + // path: '/SpecialsolicitationFill', + // name: 'SpecialsolicitationFill', + // component: () => import('@/views/peoSuggestion/SpecialsolicitationFill.vue'), + // meta: { title: '专题征集', keepAlive: false } + // }, + { + path: '/goldenIdea', + name: 'goldenIdea', + component: () => import('@/views/peoSuggestion/goldenIdea.vue'), + meta: { title: '金点子列表', keepAlive: false } + }, + { + path: '/goldenIdeaDetail', + name: 'goldenIdeaDetail', + component: () => import('@/views/peoSuggestion/goldenIdeaDetail.vue'), + meta: { title: '金点子详情', keepAlive: false } + }, + + { + path: '/topicList', + name: 'topicList', + component: () => import('@/views/peoSuggestion/topicList.vue'), + meta: { title: '最新专题', keepAlive: false } + }, + { + path: '/topicListDetail', + name: 'topicListDetail', + component: () => import('@/views/peoSuggestion/topicListDetail.vue'), + meta: { title: '专题详情', keepAlive: false } + }, + { path: '/sing', name: 'sing', component: () => import('@/views/activity/sing'), meta: { title: '', keepAlive: false } }, + { path: '/discusionDetail', name: 'discusionDetail', diff --git a/src/views/peoSuggestion/Specialsolicitation.vue b/src/views/peoSuggestion/Specialsolicitation.vue new file mode 100644 index 0000000..83a0c09 --- /dev/null +++ b/src/views/peoSuggestion/Specialsolicitation.vue @@ -0,0 +1,122 @@ + + + + + diff --git a/src/views/peoSuggestion/SpecialsolicitationFill.vue b/src/views/peoSuggestion/SpecialsolicitationFill.vue new file mode 100644 index 0000000..5861d83 --- /dev/null +++ b/src/views/peoSuggestion/SpecialsolicitationFill.vue @@ -0,0 +1,165 @@ + + + + + diff --git a/src/views/peoSuggestion/explain.vue b/src/views/peoSuggestion/explain.vue index e48e696..8aa3c3b 100644 --- a/src/views/peoSuggestion/explain.vue +++ b/src/views/peoSuggestion/explain.vue @@ -1,91 +1,29 @@ + + diff --git a/src/views/peoSuggestion/specialTopicList.vue b/src/views/peoSuggestion/specialTopicList.vue new file mode 100644 index 0000000..5ba0889 --- /dev/null +++ b/src/views/peoSuggestion/specialTopicList.vue @@ -0,0 +1,218 @@ + + + + + diff --git a/src/views/peoSuggestion/topicList.vue b/src/views/peoSuggestion/topicList.vue new file mode 100644 index 0000000..74b7662 --- /dev/null +++ b/src/views/peoSuggestion/topicList.vue @@ -0,0 +1,304 @@ + + + + + diff --git a/src/views/peoSuggestion/topicListDetail.vue b/src/views/peoSuggestion/topicListDetail.vue new file mode 100644 index 0000000..588e905 --- /dev/null +++ b/src/views/peoSuggestion/topicListDetail.vue @@ -0,0 +1,271 @@ + + + + + diff --git a/vue.config.js b/vue.config.js index e31ea43..a00eadf 100644 --- a/vue.config.js +++ b/vue.config.js @@ -32,8 +32,8 @@ module.exports = defineConfig({ //配置跨域 '/api': { // target: `https://epmet-preview.elinkservice.cn`, - // target: `http://219.146.91.110:30801`, - target: `http://192.168.1.140`, + target: `http://219.146.91.110:30801`, + // target: `http://192.168.1.140`, // target: `http://127.0.0.1:8080`, changeOrigin: true, ws: false,