diff --git a/src/assets/images/peoSuggestion/13.png b/src/assets/images/peoSuggestion/13.png
new file mode 100644
index 0000000..dcb0416
Binary files /dev/null and b/src/assets/images/peoSuggestion/13.png differ
diff --git a/src/assets/images/peoSuggestion/14.png b/src/assets/images/peoSuggestion/14.png
new file mode 100644
index 0000000..203c5a4
Binary files /dev/null and b/src/assets/images/peoSuggestion/14.png differ
diff --git a/src/router/router.config.js b/src/router/router.config.js
index 59c9872..67f57b9 100644
--- a/src/router/router.config.js
+++ b/src/router/router.config.js
@@ -147,7 +147,7 @@ export const constantRouterMap = [
path: '/peoSuggestion',
name: 'peoSuggestion',
component: () => import('@/views/peoSuggestion'),
- meta: { title: '人民意见征集', keepAlive: false }
+ meta: { title: '人民建议征集', keepAlive: false }
},
{
diff --git a/src/utils/jweixin.js b/src/utils/jweixin.js
index 7e758e7..4a9954a 100644
--- a/src/utils/jweixin.js
+++ b/src/utils/jweixin.js
@@ -19,7 +19,7 @@ export const setConfig = function (jsApiList = []) {
wx.ready(function(){
wx.updateAppMessageShareData({
- title: '城peoSuggestion阳社会工作人民意见征集', // 分享标题
+ title: '城阳社会工作人民建议征集', // 分享标题
desc: '倾听民声,汇集民智,期待您的好建议、金点子。', // 分享描述
link: `${location.href.split('#')[0]+"#/peoSuggestion"}`, // 分享链接,该链接域名或路径必须与当前页面对应的公众号JS安全域名一致
diff --git a/src/views/peoSuggestion/SpecialsolicitationFill.vue b/src/views/peoSuggestion/SpecialsolicitationFill.vue
index 6438711..75f784e 100644
--- a/src/views/peoSuggestion/SpecialsolicitationFill.vue
+++ b/src/views/peoSuggestion/SpecialsolicitationFill.vue
@@ -17,14 +17,12 @@
-
您也可以将建议内容整理成文档上传,支持word、pdf格式,文件大小不超过5Mb.
+ style="color:#C1C1C1; font-size: 15px; line-height: 18px;margin-top: 10px;">您也可以将建议内容整理成文档上传,支持word、pdf格式,文件大小不超过5Mb。
-
@@ -48,7 +46,7 @@
-
+
请输入公民姓名、法人或社会组织名称
@@ -57,11 +55,11 @@
-
-
@@ -72,11 +70,15 @@
提交
-
+
-
-
+
+
{{ item.label }}
@@ -108,6 +110,7 @@ export default {
showPopup:false,
ideaIdentityList:[],
formData:{
+ attachmentList:[],
openId:"",
fileList:[],
identityTypeCode:[],
@@ -161,15 +164,22 @@ export default {
},
methods: {
- onCheck(name){
+ onConfirm(){
console.log(this.formData.identityTypeCode,"但是克莱斯勒开发接口是");
+ this.showPopup = false;
+ },
+ onCheck(name){
+ console.log(name,"但是克莱斯勒开发接口是");
},
onClose(){
this.showPopup = false;
},
+ onCancel(){
+ this.showPopup = false;
+ this.formData.identityTypeCode=[]
+ },
onClickPopup() {
console.log("sdkjfkldsj");
-
this.showPopup = true;
},
// 字典
@@ -211,12 +221,12 @@ export default {
file.message = '上传成功'
file.url = res.data.url
let fileInfo = {
- type: type,
- format: format,
+ // type: type,
+ // format: format,
name: name,
url: url
};
- this.formData.imageList.push(res.data.url)
+ this.formData.attachmentList.push(res.data.url)
console.log(fileInfo,"sdlkjdslgfjdgls");
// this.attrs.push(fileInfo)
})
diff --git a/src/views/peoSuggestion/index.vue b/src/views/peoSuggestion/index.vue
index de5f78e..b738cdf 100644
--- a/src/views/peoSuggestion/index.vue
+++ b/src/views/peoSuggestion/index.vue
@@ -179,7 +179,7 @@
- 人民意见征集二维码
+ 人民建议征集二维码
(长按二维码保存到手机)
diff --git a/src/views/peoSuggestion/solicitationDaily.vue b/src/views/peoSuggestion/solicitationDaily.vue
index 3b0e5e3..b519a96 100644
--- a/src/views/peoSuggestion/solicitationDaily.vue
+++ b/src/views/peoSuggestion/solicitationDaily.vue
@@ -2,7 +2,7 @@
-
+
@@ -17,20 +17,21 @@
-
-
-
-
-

-
+
+
+
+
+

+
-
-
您也可以将建议内容整理成文档上传,支持word、pdf格式,文件大小不超过5Mb.
-
-
+
+
您也可以将建议内容整理成文档上传,支持word、pdf格式,文件大小不超过5Mb。
+
+
@@ -54,7 +55,7 @@
-
+
请输入公民姓名、法人或社会组织名称
@@ -70,10 +71,9 @@
type="number" />
-
-
-
+
+
+
你的身份(可多选)
@@ -83,13 +83,18 @@
+ value-key="label" />
-
+
-
+
+
+ @click="onCheck(item)" style="margin: 10px;" shape="square">
{{ item.label }}
@@ -104,7 +109,7 @@
import {
ideaList,icEventSpecialSubject,icEventOldAdd
} from "@/api/peoSuggestion"
-import { wx1078fa1e99424de9, sendsmscode,editUser,dictlist } from '@/api/user'
+import { wxce2db0866b0698f8, sendsmscode,editUser,dictlist } from '@/api/user'
import {uploadvariedfile} from '@/api/basic'
import {sphereLifeSearcdetail } from "@/api/lingCircle"
import Share from "@/components/Share"
@@ -123,6 +128,7 @@ export default {
ideaTitleTypeList:[],
adviceType:false,
formData:{
+ attachmentList:[],
age:"",
ideaTitleType:"",
operationType:"4",
@@ -167,6 +173,25 @@ export default {
this.getDictionaries()
},
methods: {
+ onConfirm1(){
+ console.log(this.formData.identityTypeCode,"但是克莱斯勒开发接口是");
+ this.showPopup = false;
+ },
+ onCancel1(){
+ this.showPopup = false;
+ this.formData.identityTypeCode=[]
+ },
+ // 上传前校验文件类型
+ beforeRead(file) {
+ const allowedTypes = ['application/pdf',
+ 'application/msword',
+ 'application/vnd.openxmlformats-officedocument.wordprocessingml.document'];
+ if (!allowedTypes.includes(file.type)) {
+ this.$toast.fail('仅支持上传 Word 或 PDF 文件');
+ return false; // 阻止上传
+ }
+ return true; // 允许上传
+ },
//主题关闭
onCancel() {
this.adviceType = false
@@ -182,11 +207,11 @@ export default {
},
//身份选择
onCheck(selectedValues){
- const selectedLabels = this.ideaIdentityList
- .filter(item => selectedValues.includes(item.value))
- .map(item => item.label);
- this.operationName=selectedLabels.toString()
- console.log('选中的 Labels:', this.operationName);
+ // const selectedLabels = this.ideaIdentityList
+ // .filter(item => selectedValues.includes(item.value))
+ // .map(item => item.label);
+ // this.operationName=selectedLabels.toString()
+ // console.log('选中的 Labels:', this.operationName);
},
onClose(){
this.showPopup = false;
@@ -212,12 +237,12 @@ export default {
file.message = '上传成功'
file.url = res.data.url
let fileInfo = {
- type: type,
- format: format,
+ // type: type,
+ // format: format,
name: name,
url: url
};
- this.formData.imageList.push(fileInfo)
+ this.formData.attachmentList.push(fileInfo)
})
.catch(() => {
diff --git a/yarn.lock b/yarn.lock
index 9fa0fe2..34b8436 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4923,6 +4923,11 @@ jsonfile@^6.0.1:
optionalDependencies:
graceful-fs "^4.1.6"
+jweixin-module@^1.6.0:
+ version "1.6.0"
+ resolved "https://registry.npmmirror.com/jweixin-module/-/jweixin-module-1.6.0.tgz#4a7ea614083e3c9c3f49e2fdc2bb882cfa58dfcd"
+ integrity sha512-dGk9cf+ipipHmtzYmKZs5B2toX+p4hLyllGLF6xuC8t+B05oYxd8fYoaRz0T30U2n3RUv8a4iwvjhA+OcYz52w==
+
keyv@^4.5.3:
version "4.5.4"
resolved "https://registry.npmmirror.com/keyv/-/keyv-4.5.4.tgz#a879a99e29452f942439f2a405e3af8b31d4de93"