Signed-off-by: zhaobao <528046418@qq.com>

App.vue

@@ -26,7 +26,7 @@
 	.status_bar{
 		height: 25px;
 		/* #ifndef H5 */
-		height: var(--status-bar-height);
+		height: calc(var(--status-bar-height) + 40rpx) ;
 		/* #endif */
 	}	
 </style>

api/upload.js

@@ -0,0 +1,52 @@
+import { request } from '../libs/request.js'
+import {getToken} from '@/libs/auth.js';
+import config from "@/config/index.js"
+/**
+ * 单文件上传
+ * @param data
+ */
+export function uploadFile(data) {
+  return request({
+    url: '/admin/uploadFile',
+    method: 'POST',
+    data
+  })
+}
+/**
+ * 多文件上传
+ * @param data
+ */
+export function uploadFiles(data) {
+  return request({
+    url: '/admin/uploadFiles',
+    method: 'POST',
+    data
+  })
+}
+/*单独服务部署*/
+export const uploadApi=({formData,filePath,callback})=>{
+	return new Promise(function(resolve,reject){
+		const uploadTask=uni.uploadFile({
+			url: config.uploadFile+'/admin/uploadFiles',
+			filePath,
+			name: 'files',
+			header:{
+				[config.TokenKey]:getToken(),
+				appID: config.appID,
+				appKey: config.appKey,
+				appSecret: config.appSecret,
+				permitTplId: config.permitTplId
+			},
+			formData,
+			success: (uploadFileRes) => {
+				resolve(uploadFileRes.data)
+			},
+			fail({errMsg}){
+				reject(errMsg)
+			}
+		});	
+		if(callback){
+			callback(uploadTask);
+		}			
+	})
+}	

config/index.js

@@ -8,8 +8,5 @@ export default {
 	appSecret: '82a8bf439373e305',
 	permitTplId: 7,
 	TokenKey:"Authorization",
-	uploadFile:{//上传图片地址
-		dev: "https://zhycapi.58yunkang.com",
-		pro: "https://zhycapi.58yunkang.com"		
-	}
+	uploadFile:'http://192.168.3.201:8080'
 }

libs/permission.js

@@ -3,7 +3,7 @@ import {Router} from '@/libs/router';
 
 // 页面白名单
 const whiteList = [
-    '/pages/login/index',
+    '/pages/login/login',
     '/pages/index/index'
 ];
 /*设置白名单后台可以返回权限，然后再匹配路由地址*/
@@ -31,7 +31,7 @@ uni.addInterceptor('navigateTo', {
     invoke (e) {
         if(!hasPermission(e.url)){
             uni.reLaunch({
-                url: '/pages/login/index'
+                url: '/pages/login/login'
             })
             return false
         }
@@ -49,7 +49,7 @@ uni.addInterceptor('switchTab', {
     invoke (e) {
         if(!hasPermission(e.url)){
             uni.reLaunch({
-                url: '/pages/login/index'
+                url: '/pages/login/login'
             })
             return false
         }

libs/request.js

@@ -54,7 +54,7 @@ export async function request(parmas) {
 				}
 			})
 		} catch (err) {
-			console.log(err)
+			uni.hideLoading();
 			reject(err)
 		}
 	})

libs/router.js

@@ -1,21 +1,12 @@
 /*根路径写法*/
 export const Router={
 	"login":{
-		"path": "/pages/login/index"
+		"path": "/pages/login/login"
 	},		
 	"index":{
 		"path": "/pages/index/index"
 	},
-	"record":{
-		"path" : "/views/record/index",	
-	},
 	"myCenter":{
-		"path" : "/pages/myCenter/index" 
-	},
-	"views-login":{
-		"path": "/views/login/index"
-	},
-	"icon":{
-		"path": "/pages/icon/index"
-	}		
+		"path" : "/pages/mine/mine" 
+	}
 }

pages/risk/check/form/form.vue

@@ -55,7 +55,7 @@
 		},
 		methods: {
 			upload(){
-				uni.chooseFile({
+				uni.chooseImage({
 					success: (files) => {
 						const tempFilePaths = files.tempFilePaths;
 						uni.uploadFile({

pages/risk/rectify/form/form.vue

@@ -55,7 +55,7 @@
 		},
 		methods: {
 			upload(){
-				uni.chooseFile({
+				uni.chooseImage({
 					success: (files) => {
 						const tempFilePaths = files.tempFilePaths;
 						uni.uploadFile({

pages/risk/review/form/form.vue

@@ -25,6 +25,9 @@
 					<image @click="upload" class="upload" src="/static/icon/upload.png" mode="widthFix"></image>
 					<p class="tip">注：单个附件上传不超过10M，附件累计不超过20M</p>					
 				</div>
+				<view class="preview" v-if="form.attachList.length>0">
+					<image :src="attach.path" mode="widthFix" v-for="(attach,index) in form.attachList" :key="index"></image>
+				</view>
 			</uni-forms-item>
 		</uni-forms>	
 		<view class="footer" @click="onSubmit">提交</view>
@@ -32,6 +35,7 @@
 </template>
 
 <script>
+	import {uploadFile,uploadFiles,uploadApi} from '@/api/upload.js'
 	export default {
 		data() {
 			return {
@@ -64,26 +68,22 @@
 				form:{
 					status:1,
 					password:"",
-					desc:""
+					desc:"",
+					attachList:[]
 				}
 			}
 		},
 		methods: {
 			upload(){
-				uni.chooseFile({
+				uni.chooseImage({
 					success: (files) => {
 						const tempFilePaths = files.tempFilePaths;
-						uni.uploadFile({
-							url: 'https://www.example.com/upload', //仅为示例，非真实的接口地址
-							filePath: tempFilePaths[0],
-							name: 'file',
-							formData: {
-								'user': 'test'
-							},
-							success: (uploadFileRes) => {
-								console.log(uploadFileRes.data);
-							}
-						});
+						const tempFiles = files.tempFiles
+						const formData = new FormData()
+						formData.append('file', tempFilePaths)
+						// uploadApi({
+						// 	formData
+						// })
 					}
 				});
 			},

unpackage/dist/dev/mp-weixin/common/main.wxss

@@ -2358,6 +2358,6 @@ page {
 }
 .status_bar {
   height: 25px;
-  height: 25px;
+  height: calc(25px + 40rpx);
 }
 

unpackage/dist/dev/mp-weixin/pages/login/login.js

@@ -170,8 +170,8 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var _user = __webpack_require__(/*! @/api/user */ 56);
-var _auth = __webpack_require__(/*! @/libs/auth */ 62);
+var _user = __webpack_require__(/*! @/api/user */ 55);
+var _auth = __webpack_require__(/*! @/libs/auth */ 61);
 //
 //
 //

unpackage/dist/dev/mp-weixin/pages/mine/mine.js

@@ -31,7 +31,7 @@ createPage(_mine.default);
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var _mine_vue_vue_type_template_id_dcbcfe34_scoped_true___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./mine.vue?vue&type=template&id=dcbcfe34&scoped=true& */ 51);
-/* harmony import */ var _mine_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./mine.vue?vue&type=script&lang=js& */ 54);
+/* harmony import */ var _mine_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./mine.vue?vue&type=script&lang=js& */ 53);
 /* harmony reexport (unknown) */ for(var __WEBPACK_IMPORT_KEY__ in _mine_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__) if(["default"].indexOf(__WEBPACK_IMPORT_KEY__) < 0) (function(key) { __webpack_require__.d(__webpack_exports__, key, function() { return _mine_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__[key]; }) }(__WEBPACK_IMPORT_KEY__));
 /* harmony import */ var _mine_vue_vue_type_style_index_0_id_dcbcfe34_lang_scss_scoped_true___WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./mine.vue?vue&type=style&index=0&id=dcbcfe34&lang=scss&scoped=true& */ 64);
 /* harmony import */ var _software_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_runtime_componentNormalizer_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../../../../../../software/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/runtime/componentNormalizer.js */ 32);
@@ -116,7 +116,7 @@ render._withStripped = true
 
 /***/ }),
 
-/***/ 54:
+/***/ 53:
 /*!***********************************************************************************!*\
   !*** E:/work/Project_newGit/CKQ/app/pages/mine/mine.vue?vue&type=script&lang=js& ***!
   \***********************************************************************************/
@@ -125,14 +125,14 @@ render._withStripped = true
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
-/* harmony import */ var _software_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_software_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_software_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_software_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_software_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_mine_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!../../../../../../software/HBuilderX/plugins/uniapp-cli/node_modules/babel-loader/lib!../../../../../../software/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--13-1!../../../../../../software/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!../../../../../../software/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!../../../../../../software/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./mine.vue?vue&type=script&lang=js& */ 55);
+/* harmony import */ var _software_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_software_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_software_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_software_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_software_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_mine_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!../../../../../../software/HBuilderX/plugins/uniapp-cli/node_modules/babel-loader/lib!../../../../../../software/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--13-1!../../../../../../software/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!../../../../../../software/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!../../../../../../software/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./mine.vue?vue&type=script&lang=js& */ 54);
 /* harmony import */ var _software_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_software_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_software_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_software_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_software_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_mine_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_software_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_software_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_software_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_software_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_software_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_mine_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__);
 /* harmony reexport (unknown) */ for(var __WEBPACK_IMPORT_KEY__ in _software_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_software_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_software_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_software_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_software_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_mine_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__) if(["default"].indexOf(__WEBPACK_IMPORT_KEY__) < 0) (function(key) { __webpack_require__.d(__webpack_exports__, key, function() { return _software_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_software_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_software_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_software_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_software_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_mine_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__[key]; }) }(__WEBPACK_IMPORT_KEY__));
  /* harmony default export */ __webpack_exports__["default"] = (_software_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_software_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_software_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_software_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_software_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_mine_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0___default.a); 
 
 /***/ }),
 
-/***/ 55:
+/***/ 54:
 /*!******************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
   !*** ./node_modules/babel-loader/lib!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--13-1!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!E:/work/Project_newGit/CKQ/app/pages/mine/mine.vue?vue&type=script&lang=js& ***!
   \******************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
@@ -146,7 +146,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var _user = __webpack_require__(/*! @/api/user.js */ 56);
+var _user = __webpack_require__(/*! @/api/user.js */ 55);
 //
 //
 //
@@ -195,9 +195,9 @@ var _default = {
         userRealName: "--",
         groupName: "--",
         ocName: "--",
-        userPhoto: __webpack_require__(/*! ./image/head.png */ 53)
+        userPhoto: __webpack_require__(/*! ./image/head.png */ 62)
       },
-      userPhoto: __webpack_require__(/*! ./image/head.png */ 53),
+      userPhoto: __webpack_require__(/*! ./image/head.png */ 62),
       bg: __webpack_require__(/*! ./image/bg.png */ 63)
     };
   },

unpackage/dist/dev/mp-weixin/pages/mine/password/password.js

@@ -170,7 +170,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var _user = __webpack_require__(/*! @/api/user.js */ 56);
+var _user = __webpack_require__(/*! @/api/user.js */ 55);
 //
 //
 //

unpackage/dist/dev/mp-weixin/pages/risk/check/form/form.js

@@ -224,7 +224,7 @@ var _default = {
   },
   methods: {
     upload: function upload() {
-      uni.chooseFile({
+      uni.chooseImage({
         success: function success(files) {
           var tempFilePaths = files.tempFilePaths;
           uni.uploadFile({

unpackage/dist/dev/mp-weixin/pages/risk/rectify/form/form.js

@@ -224,7 +224,7 @@ var _default = {
   },
   methods: {
     upload: function upload() {
-      uni.chooseFile({
+      uni.chooseImage({
         success: function success(files) {
           var tempFilePaths = files.tempFilePaths;
           uni.uploadFile({

unpackage/dist/dev/mp-weixin/pages/risk/review/form/form.js

@@ -134,6 +134,7 @@ var render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
+  var g0 = _vm.form.attachList.length
   if (!_vm._isMounted) {
     _vm.e0 = function ($event) {
       _vm.form.status = 1
@@ -142,6 +143,14 @@ var render = function () {
       _vm.form.status = 2
     }
   }
+  _vm.$mp.data = Object.assign(
+    {},
+    {
+      $root: {
+        g0: g0,
+      },
+    }
+  )
 }
 var recyclableRender = false
 var staticRenderFns = []
@@ -181,6 +190,10 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
+var _upload = __webpack_require__(/*! @/api/upload.js */ 222);
+//
+//
+//
 //
 //
 //
@@ -248,27 +261,22 @@ var _default = {
       form: {
         status: 1,
         password: "",
-        desc: ""
+        desc: "",
+        attachList: []
       }
     };
   },
   methods: {
     upload: function upload() {
-      uni.chooseFile({
+      uni.chooseImage({
         success: function success(files) {
           var tempFilePaths = files.tempFilePaths;
-          uni.uploadFile({
-            url: 'https://www.example.com/upload',
-            //仅为示例，非真实的接口地址
-            filePath: tempFilePaths[0],
-            name: 'file',
-            formData: {
-              'user': 'test'
-            },
-            success: function success(uploadFileRes) {
-              console.log(uploadFileRes.data);
-            }
-          });
+          var tempFiles = files.tempFiles;
+          var formData = new FormData();
+          formData.append('file', tempFilePaths);
+          // uploadApi({
+          // 	formData
+          // })
         }
       });
     },

unpackage/dist/dev/mp-weixin/project.config.json

@@ -19,7 +19,7 @@
   },
   "compileType": "miniprogram",
   "libVersion": "2.31.0",
-  "appid": "touristappid",
+  "appid": "wxee54338450a52d40",
   "projectname": "app",
   "condition": {},
   "editorSetting": {