From 7bbaa4b3ec07c08f69b8551811f6bd067155d55b Mon Sep 17 00:00:00 2001
From: Lou <luzhiping@qqyjz.com>
Date: Sat, 23 Mar 2024 17:03:30 +0800
Subject: [PATCH] 投票更新
---
manifest.json | 498 ++++++++++++++++++++++++------------------------
pages.json | 9
subPackage/article/detail.vue | 33 ++
subPackage/article/document.vue | 46 ++++
4 files changed, 332 insertions(+), 254 deletions(-)
diff --git a/manifest.json b/manifest.json
index b1fe88e..862c673 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,250 +1,250 @@
{
- "name": "饶城格格通",
- "appid": "__UNI__EE88272",
- "description": "",
- "versionName": "1.0.10",
- "versionCode": 104,
- "transformPx": false,
- /* 5+App特有相关 */
- "app-plus": {
- "compatible": {
- "ignoreVersion": true //true表示忽略版本检查提示框，HBuilderX1.9.0及以上版本支持
- },
- "safearea": {
- "bottom": {
- "offset": "none"
- }
- },
- "usingComponents": true,
- "nvueCompiler": "uni-app",
- "compilerVersion": 3,
- "splashscreen": {
- "alwaysShowBeforeRender": false,
- "waiting": false,
- "autoclose": false,
- "delay": 0
- },
- /* 模块配置 */
- "modules": {
- "VideoPlayer": {},
- "Camera": {},
- "Geolocation": {},
- "Push": {},
- "Maps": {}
- },
- /* 应用发布信息 */
- "distribute": {
- /* android打包配置 */
- "android": {
- "permissions": [
- "<uses-feature android:name=\"android.hardware.camera\"/>",
- "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
- "<uses-permission android:name=\"android.permission.ACCESS_COARSE_LOCATION\"/>",
- "<uses-permission android:name=\"android.permission.ACCESS_FINE_LOCATION\"/>",
- "<uses-permission android:name=\"android.permission.ACCESS_LOCATION_EXTRA_COMMANDS\"/>",
- "<uses-permission android:name=\"android.permission.ACCESS_MOCK_LOCATION\"/>",
- "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
- "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
- "<uses-permission android:name=\"android.permission.CALL_PHONE\"/>",
- "<uses-permission android:name=\"android.permission.CAMERA\"/>",
- "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
- "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
- "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
- "<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
- "<uses-permission android:name=\"android.permission.INTERNET\"/>",
- "<uses-permission android:name=\"android.permission.MODIFY_AUDIO_SETTINGS\"/>",
- "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
- "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
- "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
- "<uses-permission android:name=\"android.permission.RECORD_AUDIO\"/>",
- "<uses-permission android:name=\"android.permission.REQUEST_INSTALL_PACKAGES\"/>",
- "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
- "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
- "<uses-permission android:name=\"android.permission.WRITE_CONTACTS\"/>",
- "<uses-permission android:name=\"android.permission.WRITE_EXTERNAL_STORAGE\"/>",
- "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
- ],
- "abiFilters": ["armeabi-v7a", "arm64-v8a"]
- },
- /* ios打包配置 */
- "ios": {
- "dSYMs": false,
- "UIBackgroundModes": "",
- "idfa": false
- },
- /* SDK配置 */
- "sdkConfigs": {
- "ad": {},
- "maps": {
- "amap": {
- "appkey_ios": "4bcdf5434597cc9160c9e0168c4a7bc7",
- "appkey_android": "c21be9bc7343573c28112c4fe272cb41"
- }
- },
- "geolocation": {
- "amap": {
- "__platform__": ["ios", "android"],
- "appkey_ios": "4bcdf5434597cc9160c9e0168c4a7bc7",
- "appkey_android": "c21be9bc7343573c28112c4fe272cb41"
- },
- "system": {
- "__platform__": ["ios", "android"]
- }
- },
- "push": {
- "unipush": {
- "offline": true
- }
- }
- },
- "icons": {
- "android": {
- "hdpi": "D:/Desktop/hbsl/app/应用图标/72.png",
- "xhdpi": "D:/Desktop/hbsl/app/应用图标/96.png",
- "xxhdpi": "D:/Desktop/hbsl/app/应用图标/144.png",
- "xxxhdpi": "D:/Desktop/hbsl/app/应用图标/192.png"
- },
- "ios": {
- "appstore": "D:/Desktop/icon/1024x1024bb.png",
- "iphone": {
- "app@2x": "D:/Desktop/icon/120.png",
- "app@3x": "D:/Desktop/icon/180.png",
- "spotlight@2x": "D:/Desktop/icon/80.png",
- "spotlight@3x": "D:/Desktop/icon/120.png",
- "settings@2x": "D:/Desktop/icon/58.png",
- "settings@3x": "D:/Desktop/icon/87.png",
- "notification@2x": "D:/Desktop/icon/40.png",
- "notification@3x": "D:/Desktop/icon/60.png"
- },
- "ipad": {
- "app": "",
- "app@2x": "",
- "proapp@2x": "",
- "spotlight": "",
- "spotlight@2x": "",
- "settings": "",
- "settings@2x": "",
- "notification": "",
- "notification@2x": ""
- }
- }
- },
- "splashscreen": {
- "useOriginalMsgbox": true
- }
- },
- "uniStatistics": {
- "enable": false
- },
- "nativePlugins": {}
- },
- /* 快应用特有相关 */
- "quickapp": {},
- /* 小程序特有相关 */
- "mp-weixin": {
- "appid": "wx41aa8a5d2e565a05",
- "setting": {
- "urlCheck": false,
- "minified": true,
- "postcss": true,
- "es6": true
- },
- "usingComponents": true,
- "plugins": {
- "ocr-plugin": {
- "version": "3.1.3",
- "provider": "wx4418e3e031e551be"
- }
- },
- "optimization": {
- "subPackages": true
- },
- "uniStatistics": {
- "enable": false
- },
- "requiredPrivateInfos": [
- "getLocation",
- "chooseLocation",
- "onLocationChange",
- "startLocationUpdateBackground"
- ],
- "requiredBackgroundModes": ["location"], //必填
- "permission": {
- "scope.userLocation": {
- "desc": "定位"
- }
- }
- },
- "mp-alipay": {
- "usingComponents": true,
- "uniStatistics": {
- "enable": false
- }
- },
- "mp-baidu": {
- "usingComponents": true,
- "uniStatistics": {
- "enable": false
- }
- },
- "mp-toutiao": {
- "usingComponents": true,
- "setting": {
- "es6": true,
- "minified": true,
- "postcss": true,
- "urlCheck": false
- },
- "uniStatistics": {
- "enable": false
- }
- },
- "h5": {
- "template": "template.h5.html",
- "router": {
- "mode": "hash",
- "base": "/app"
- },
- "optimization": {
- "treeShaking": {
- "enable": true
- }
- },
- "devServer": {
- "proxy": {
- "/api": {
- "target": "http://127.0.0.1",
- //"target" : "https://rider.bladex.vip/api",
- "pathRewrite": {
- "^/api": "/"
- }
- }
- },
- "port": "",
- "https": false
- },
- "uniStatistics": {
- "enable": false
- },
- "sdkConfigs": {
- "maps": {
- "amap": {
- "key": "7fa69abe1defd5888bb85bc736cda874",
- "securityJsCode": "8ac9e5f522c62ed6e3a5800a87b0d140",
- "serviceHost": ""
- }
- }
- },
- "unipush": {
- "enable": false
- }
- },
- "uniStatistics": {
- "enable": false
- },
- "mp-qq": {
- "uniStatistics": {
- "enable": false
- }
- }
-}
\ No newline at end of file
+ "name" : "饶城格格通",
+ "appid" : "__UNI__EE88272",
+ "description" : "",
+ "versionName" : "1.0.10",
+ "versionCode" : 104,
+ "transformPx" : false,
+ /* 5+App特有相关 */
+ "app-plus" : {
+ "compatible" : {
+ "ignoreVersion" : true //true表示忽略版本检查提示框，HBuilderX1.9.0及以上版本支持
+ },
+ "safearea" : {
+ "bottom" : {
+ "offset" : "none"
+ }
+ },
+ "usingComponents" : true,
+ "nvueCompiler" : "uni-app",
+ "compilerVersion" : 3,
+ "splashscreen" : {
+ "alwaysShowBeforeRender" : false,
+ "waiting" : false,
+ "autoclose" : false,
+ "delay" : 0
+ },
+ /* 模块配置 */
+ "modules" : {
+ "VideoPlayer" : {},
+ "Camera" : {},
+ "Geolocation" : {},
+ "Push" : {},
+ "Maps" : {}
+ },
+ /* 应用发布信息 */
+ "distribute" : {
+ /* android打包配置 */
+ "android" : {
+ "permissions" : [
+ "<uses-feature android:name=\"android.hardware.camera\"/>",
+ "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
+ "<uses-permission android:name=\"android.permission.ACCESS_COARSE_LOCATION\"/>",
+ "<uses-permission android:name=\"android.permission.ACCESS_FINE_LOCATION\"/>",
+ "<uses-permission android:name=\"android.permission.ACCESS_LOCATION_EXTRA_COMMANDS\"/>",
+ "<uses-permission android:name=\"android.permission.ACCESS_MOCK_LOCATION\"/>",
+ "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
+ "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
+ "<uses-permission android:name=\"android.permission.CALL_PHONE\"/>",
+ "<uses-permission android:name=\"android.permission.CAMERA\"/>",
+ "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
+ "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
+ "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
+ "<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
+ "<uses-permission android:name=\"android.permission.INTERNET\"/>",
+ "<uses-permission android:name=\"android.permission.MODIFY_AUDIO_SETTINGS\"/>",
+ "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
+ "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
+ "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
+ "<uses-permission android:name=\"android.permission.RECORD_AUDIO\"/>",
+ "<uses-permission android:name=\"android.permission.REQUEST_INSTALL_PACKAGES\"/>",
+ "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
+ "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
+ "<uses-permission android:name=\"android.permission.WRITE_CONTACTS\"/>",
+ "<uses-permission android:name=\"android.permission.WRITE_EXTERNAL_STORAGE\"/>",
+ "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
+ ],
+ "abiFilters" : [ "armeabi-v7a", "arm64-v8a" ]
+ },
+ /* ios打包配置 */
+ "ios" : {
+ "dSYMs" : false,
+ "UIBackgroundModes" : "",
+ "idfa" : false
+ },
+ /* SDK配置 */
+ "sdkConfigs" : {
+ "ad" : {},
+ "maps" : {
+ "amap" : {
+ "appkey_ios" : "4bcdf5434597cc9160c9e0168c4a7bc7",
+ "appkey_android" : "c21be9bc7343573c28112c4fe272cb41"
+ }
+ },
+ "geolocation" : {
+ "amap" : {
+ "__platform__" : [ "ios", "android" ],
+ "appkey_ios" : "4bcdf5434597cc9160c9e0168c4a7bc7",
+ "appkey_android" : "c21be9bc7343573c28112c4fe272cb41"
+ },
+ "system" : {
+ "__platform__" : [ "ios", "android" ]
+ }
+ },
+ "push" : {
+ "unipush" : {
+ "offline" : true
+ }
+ }
+ },
+ "icons" : {
+ "android" : {
+ "hdpi" : "D:/Desktop/hbsl/app/应用图标/72.png",
+ "xhdpi" : "D:/Desktop/hbsl/app/应用图标/96.png",
+ "xxhdpi" : "D:/Desktop/hbsl/app/应用图标/144.png",
+ "xxxhdpi" : "D:/Desktop/hbsl/app/应用图标/192.png"
+ },
+ "ios" : {
+ "appstore" : "D:/Desktop/icon/1024x1024bb.png",
+ "iphone" : {
+ "app@2x" : "D:/Desktop/icon/120.png",
+ "app@3x" : "D:/Desktop/icon/180.png",
+ "spotlight@2x" : "D:/Desktop/icon/80.png",
+ "spotlight@3x" : "D:/Desktop/icon/120.png",
+ "settings@2x" : "D:/Desktop/icon/58.png",
+ "settings@3x" : "D:/Desktop/icon/87.png",
+ "notification@2x" : "D:/Desktop/icon/40.png",
+ "notification@3x" : "D:/Desktop/icon/60.png"
+ },
+ "ipad" : {
+ "app" : "",
+ "app@2x" : "",
+ "proapp@2x" : "",
+ "spotlight" : "",
+ "spotlight@2x" : "",
+ "settings" : "",
+ "settings@2x" : "",
+ "notification" : "",
+ "notification@2x" : ""
+ }
+ }
+ },
+ "splashscreen" : {
+ "useOriginalMsgbox" : true
+ }
+ },
+ "uniStatistics" : {
+ "enable" : false
+ },
+ "nativePlugins" : {}
+ },
+ /* 快应用特有相关 */
+ "quickapp" : {},
+ /* 小程序特有相关 */
+ "mp-weixin" : {
+ "appid" : "wx41aa8a5d2e565a05",
+ "setting" : {
+ "urlCheck" : false,
+ "minified" : true,
+ "postcss" : true,
+ "es6" : true
+ },
+ "usingComponents" : true,
+ "plugins" : {
+ "ocr-plugin" : {
+ "version" : "3.1.3",
+ "provider" : "wx4418e3e031e551be"
+ }
+ },
+ "optimization" : {
+ "subPackages" : true
+ },
+ "uniStatistics" : {
+ "enable" : false
+ },
+ "requiredPrivateInfos" : [
+ "getLocation",
+ "chooseLocation",
+ "onLocationChange",
+ "startLocationUpdateBackground"
+ ],
+ "requiredBackgroundModes" : [ "location" ], //必填
+ "permission" : {
+ "scope.userLocation" : {
+ "desc" : "定位"
+ }
+ }
+ },
+ "mp-alipay" : {
+ "usingComponents" : true,
+ "uniStatistics" : {
+ "enable" : false
+ }
+ },
+ "mp-baidu" : {
+ "usingComponents" : true,
+ "uniStatistics" : {
+ "enable" : false
+ }
+ },
+ "mp-toutiao" : {
+ "usingComponents" : true,
+ "setting" : {
+ "es6" : true,
+ "minified" : true,
+ "postcss" : true,
+ "urlCheck" : false
+ },
+ "uniStatistics" : {
+ "enable" : false
+ }
+ },
+ "h5" : {
+ "template" : "template.h5.html",
+ "router" : {
+ "mode" : "hash",
+ "base" : "/app"
+ },
+ "optimization" : {
+ "treeShaking" : {
+ "enable" : true
+ }
+ },
+ "devServer" : {
+ "proxy" : {
+ "/api" : {
+ "target" : "http://127.0.0.1",
+ //"target" : "https://rider.bladex.vip/api",
+ "pathRewrite" : {
+ "^/api" : "/"
+ }
+ }
+ },
+ "port" : "",
+ "https" : false
+ },
+ "uniStatistics" : {
+ "enable" : false
+ },
+ "sdkConfigs" : {
+ "maps" : {
+ "amap" : {
+ "key" : "7fa69abe1defd5888bb85bc736cda874",
+ "securityJsCode" : "8ac9e5f522c62ed6e3a5800a87b0d140",
+ "serviceHost" : ""
+ }
+ }
+ },
+ "unipush" : {
+ "enable" : false
+ }
+ },
+ "uniStatistics" : {
+ "enable" : false
+ },
+ "mp-qq" : {
+ "uniStatistics" : {
+ "enable" : false
+ }
+ }
+}
diff --git a/pages.json b/pages.json
index 36e8ae7..925187f 100644
--- a/pages.json
+++ b/pages.json
@@ -259,6 +259,15 @@
"navigationBarBackgroundColor": "#fff",
"navigationBarTextStyle": "black"
}
+ },
+ {
+ "path": "document",
+ "style": {
+ "navigationBarTitleText": "附件",
+ "enablePullDownRefresh": false,
+ "navigationBarBackgroundColor": "#fff",
+ "navigationBarTextStyle": "black"
+ }
}
]
},
diff --git a/subPackage/article/detail.vue b/subPackage/article/detail.vue
index 87ff7ec..d3e7537 100644
--- a/subPackage/article/detail.vue
+++ b/subPackage/article/detail.vue
@@ -67,14 +67,19 @@
<view class="vote bgc-ff">
<view class="mb-20" v-for="(item,index) in voteTopicList" :key="index">
<view class="vote-title">
- <text v-if="item.mandatoryFlag == 1">*</text>
+ <text v-if="item.mandatoryFlag == 2">*</text>
<text class="f-30 fw">{{item.discussContent}}</text>
<text class="f-26 ml-10" v-if="item.optionRange == 0">（单选）</text>
<text class="f-26 ml-10" v-if="item.optionRange == 1 && !item.optionNumber">（多选）</text>
- <text class="f-26 ml-10" v-if="item.optionRange == 1 && item.optionNumber>0">（多选
- {{`最多可选${item.optionNumber}项`}}）</text>
-
+ <text class="f-26 ml-10" v-if="item.optionRange == 1 && item.optionNumber>0">
+ （多选{{`最多可选${item.optionNumber}项`}}）</text>
</view>
+ <view class="file-btn bgc-main f-28" v-if="item.attachment"
+ @click="navToDocument(item.attachment)">
+ 查看附件
+ </view>
+
+
<view class="" v-if="item.optionRange == 0">
<u-radio-group size="22" iconPlacement="right" activeColor="#017BFC" placement="column"
v-model="item.selected" @change="selectOption($event,index)"
@@ -346,6 +351,7 @@
this.voteTopicList = data;
if (data.length == tempArr.length) {
this.isComplete = true;
+ this.setOptionDisable()
}
}
})
@@ -444,8 +450,9 @@
i.houseCode = uni.getStorageSync("siteInfo").houseCode
i.signaturePath = signPath ? signPath : ""
arr.push(i)
- } else if (!i.selected && i.mandatoryFlag) {
+ } else if (!i.selected && i.mandatoryFlag == 2) {
this.$showTips('必填议题请选择选项')
+ return;
}
}
@@ -537,6 +544,13 @@
sendValidationCode() {
},
+
+ navToDocument(url) {
+ uni.navigateTo({
+ url: `document?url=${url}`
+ })
+ }
+
}
@@ -773,4 +787,13 @@
.mt-30 {
margin-top: 30rpx;
}
+
+ .file-btn {
+ width: 140rpx;
+ padding: 10rpx 0;
+ border-radius: 10rpx;
+ color: #fff;
+ margin-bottom: 20rpx;
+ text-align: center;
+ }
</style>
\ No newline at end of file
diff --git a/subPackage/article/document.vue b/subPackage/article/document.vue
new file mode 100644
index 0000000..e5dbc6f
--- /dev/null
+++ b/subPackage/article/document.vue
@@ -0,0 +1,46 @@
+<template>
+ <view></view>
+</template>
+
+<script>
+ import {
+ minioBaseUrl
+ } from "@/common/setting.js"
+
+ export default {
+ data() {
+ return {
+
+ }
+ },
+ onLoad(option) {
+ this.showPdf(option.url)
+ },
+ methods: {
+ showPdf(url) {
+ //打开pdf文件
+ wx.showLoading({
+ title: "加载中...",
+ });
+ wx.downloadFile({
+ url: `${minioBaseUrl}${url}`,
+ success: function(res) {
+ const filePath = res.tempFilePath;
+ wx.openDocument({
+ filePath: filePath,
+ success: function(res) {
+ wx.hideLoading();
+ },
+ fail: function(res) {
+ console.log("打开失败");
+ },
+ });
+ },
+ });
+ },
+ }
+ }
+</script>
+
+<style>
+</style>
\ No newline at end of file
--
Gitblit v1.9.3