diff --git a/api/user.js b/api/user.js index 16e4413..d1aa82e 100644 --- a/api/user.js +++ b/api/user.js @@ -13,6 +13,20 @@ export function oauthtoken(data) { data }); } + +/** + * 修改密码 + * @param {Object} data + */ +export function editPassword(data) { + + return request({ + url: `blade-system/user/update-password?oldPassword=${data.oldPassword}&newPassword=${data.newPassword}&newPassword1=${data.newPassword1}`, + method: "post", + data: {} + }); +} + /** * 整托备货 * @param {Object} data diff --git a/manifest.json b/manifest.json index 5135a05..de5f660 100644 --- a/manifest.json +++ b/manifest.json @@ -1,187 +1,186 @@ { - "name" : "货无忧", - "appid" : "__UNI__EB22F37", - "description" : "", - "versionName" : "1.0.32", - "versionCode" : 1032, - "transformPx" : false, - /* 5+App特有相关 */ - "app-plus" : { - // "custom":false, - "usingComponents" : true, - "nvueStyleCompiler" : "uni-app", - "compilerVersion" : 3, - "splashscreen" : { - "alwaysShowBeforeRender" : true, - "waiting" : true, - "autoclose" : true, - "delay" : 0 - }, - /* 模块配置 */ - "modules" : { - "Bluetooth" : {}, - "Barcode" : {}, - "Camera" : {}, - "Geolocation" : {} - }, - /* 应用发布信息 */ - "distribute" : { - /* android打包配置 */ - "android" : { - "permissions" : [ - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "" - ] - }, - /* ios打包配置 */ - "ios" : { - "dSYMs" : false, - "idfa" : false - }, - /* SDK配置 */ - "sdkConfigs" : { - "geolocation" : { - "amap" : { - "__platform__" : [ "android" ], - "appkey_ios" : "f5577fdddf4f68f92bbde932e9e35bd6", - "appkey_android" : "f5577fdddf4f68f92bbde932e9e35bd6" - } - }, - "ad" : {} - }, - "splashscreen" : { - "androidStyle" : "common", - "useOriginalMsgbox" : false, - "iosStyle" : "common" - }, - "icons" : { - "android" : { - "hdpi" : "unpackage/res/icons/72x72.png", - "xhdpi" : "unpackage/res/icons/96x96.png", - "xxhdpi" : "unpackage/res/icons/144x144.png", - "xxxhdpi" : "unpackage/res/icons/192x192.png" - }, - "ios" : { - "appstore" : "unpackage/res/icons/1024x1024.png", - "ipad" : { - "app" : "unpackage/res/icons/76x76.png", - "app@2x" : "unpackage/res/icons/152x152.png", - "notification" : "unpackage/res/icons/20x20.png", - "notification@2x" : "unpackage/res/icons/40x40.png", - "proapp@2x" : "unpackage/res/icons/167x167.png", - "settings" : "unpackage/res/icons/29x29.png", - "settings@2x" : "unpackage/res/icons/58x58.png", - "spotlight" : "unpackage/res/icons/40x40.png", - "spotlight@2x" : "unpackage/res/icons/80x80.png" - }, - "iphone" : { - "app@2x" : "unpackage/res/icons/120x120.png", - "app@3x" : "unpackage/res/icons/180x180.png", - "notification@2x" : "unpackage/res/icons/40x40.png", - "notification@3x" : "unpackage/res/icons/60x60.png", - "settings@2x" : "unpackage/res/icons/58x58.png", - "settings@3x" : "unpackage/res/icons/87x87.png", - "spotlight@2x" : "unpackage/res/icons/80x80.png", - "spotlight@3x" : "unpackage/res/icons/120x120.png" - } - } - } - }, - "nativePlugins" : { - "MT-TTS" : { - "__plugin_info__" : { - "name" : "MT-TTS语音合成", - "description" : "安卓tts语音合成", - "platforms" : "Android", - "url" : "", - "android_package_name" : "", - "ios_bundle_id" : "", - "isCloud" : false, - "bought" : -1, - "pid" : "", - "parameters" : {} - } - }, - "Sunmi-Print-Inner" : { - "__plugin_info__" : { - "name" : "Sunmi-Print-Inner", - "description" : "商米打印服务uniapp插件", - "platforms" : "Android", - "url" : "", - "android_package_name" : "", - "ios_bundle_id" : "", - "isCloud" : false, - "bought" : -1, - "pid" : "", - "parameters" : {} - } - }, - "LcPrinter" : { - "__plugin_info__" : { - "name" : "LcPrinter", - "description" : "打印插件", - "platforms" : "Android", - "url" : "", - "android_package_name" : "", - "ios_bundle_id" : "", - "isCloud" : false, - "bought" : -1, - "pid" : "", - "parameters" : {} - } - } - } - }, - /* 快应用特有相关 */ - "quickapp" : {}, - /* 小程序特有相关 */ - "mp-weixin" : { - "appid" : "wxedb0d10ea46a0113", - "setting" : { - "urlCheck" : false, - "es6" : false, - "ignoreDevUnusedFiles" : false, - "lazyCodeLoading" : "requiredComponents", - "minified" : true - }, - "usingComponents" : true, - "permission" : { - "scope.userFuzzyLocation" : { - "desc" : "你的位置信息将用于小程序位置接口的效果展示" - }, - "scope.userLocation" : { - "desc" : "你的位置信息将用于小程序位置接口的效果展示" - } - }, - "requiredPrivateInfos" : [ "getLocation" ] - }, - "mp-alipay" : { - "usingComponents" : true - }, - "mp-baidu" : { - "usingComponents" : true - }, - "mp-toutiao" : { - "usingComponents" : true - }, - "uniStatistics" : { - "enable" : false - }, - "vueVersion" : "3" + "name": "货无忧", + "appid": "__UNI__EB22F37", + "description": "", + "versionName": "1.0.32", + "versionCode": 1032, + "transformPx": false, + /* 5+App特有相关 */ + "app-plus": { + // "custom":false, + "usingComponents": true, + "nvueStyleCompiler": "uni-app", + "compilerVersion": 3, + "splashscreen": { + "alwaysShowBeforeRender": true, + "waiting": true, + "autoclose": true, + "delay": 0 + }, + /* 模块配置 */ + "modules": { + "Bluetooth": {}, + "Barcode": {}, + "Camera": {}, + "Geolocation": {} + }, + /* 应用发布信息 */ + "distribute": { + /* android打包配置 */ + "android": { + "permissions": [ + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "" + ] + }, + /* ios打包配置 */ + "ios": { + "dSYMs": false, + "idfa": false + }, + /* SDK配置 */ + "sdkConfigs": { + "geolocation": { + "amap": { + "__platform__": ["android"], + "appkey_ios": "f5577fdddf4f68f92bbde932e9e35bd6", + "appkey_android": "f5577fdddf4f68f92bbde932e9e35bd6" + } + }, + "ad": {} + }, + "splashscreen": { + "androidStyle": "common", + "useOriginalMsgbox": false, + "iosStyle": "common" + }, + "icons": { + "android": { + "hdpi": "unpackage/res/icons/72x72.png", + "xhdpi": "unpackage/res/icons/96x96.png", + "xxhdpi": "unpackage/res/icons/144x144.png", + "xxxhdpi": "unpackage/res/icons/192x192.png" + }, + "ios": { + "appstore": "unpackage/res/icons/1024x1024.png", + "ipad": { + "app": "unpackage/res/icons/76x76.png", + "app@2x": "unpackage/res/icons/152x152.png", + "notification": "unpackage/res/icons/20x20.png", + "notification@2x": "unpackage/res/icons/40x40.png", + "proapp@2x": "unpackage/res/icons/167x167.png", + "settings": "unpackage/res/icons/29x29.png", + "settings@2x": "unpackage/res/icons/58x58.png", + "spotlight": "unpackage/res/icons/40x40.png", + "spotlight@2x": "unpackage/res/icons/80x80.png" + }, + "iphone": { + "app@2x": "unpackage/res/icons/120x120.png", + "app@3x": "unpackage/res/icons/180x180.png", + "notification@2x": "unpackage/res/icons/40x40.png", + "notification@3x": "unpackage/res/icons/60x60.png", + "settings@2x": "unpackage/res/icons/58x58.png", + "settings@3x": "unpackage/res/icons/87x87.png", + "spotlight@2x": "unpackage/res/icons/80x80.png", + "spotlight@3x": "unpackage/res/icons/120x120.png" + } + } + } + }, + "nativePlugins": { + "MT-TTS": { + "__plugin_info__": { + "name": "MT-TTS语音合成", + "description": "安卓tts语音合成", + "platforms": "Android", + "url": "", + "android_package_name": "", + "ios_bundle_id": "", + "isCloud": false, + "bought": -1, + "pid": "", + "parameters": {} + } + }, + "Sunmi-Print-Inner": { + "__plugin_info__": { + "name": "Sunmi-Print-Inner", + "description": "商米打印服务uniapp插件", + "platforms": "Android", + "url": "", + "android_package_name": "", + "ios_bundle_id": "", + "isCloud": false, + "bought": -1, + "pid": "", + "parameters": {} + } + }, + "LcPrinter": { + "__plugin_info__": { + "name": "LcPrinter", + "description": "打印插件", + "platforms": "Android", + "url": "", + "android_package_name": "", + "ios_bundle_id": "", + "isCloud": false, + "bought": -1, + "pid": "", + "parameters": {} + } + } + } + }, + /* 快应用特有相关 */ + "quickapp": {}, + /* 小程序特有相关 */ + "mp-weixin": { + "appid": "wxedb0d10ea46a0113", + "setting": { + "urlCheck": false, + "es6": false, + "ignoreDevUnusedFiles": false, + "lazyCodeLoading": "requiredComponents", + "minified": true + }, + "usingComponents": true, + "permission": { + "scope.userFuzzyLocation": { + "desc": "你的位置信息将用于小程序位置接口的效果展示" + }, + "scope.userLocation": { + "desc": "你的位置信息将用于小程序位置接口的效果展示" + } + }, + "requiredPrivateInfos": ["getLocation"] + }, + "mp-alipay": { + "usingComponents": true + }, + "mp-baidu": { + "usingComponents": true + }, + "mp-toutiao": { + "usingComponents": true + }, + "uniStatistics": { + "enable": false + }, + "vueVersion": "3" } // "custom":false, -/* 模块配置 */ - +/* 模块配置 */ \ No newline at end of file diff --git a/pages.json b/pages.json index 2a5d290..5b45919 100644 --- a/pages.json +++ b/pages.json @@ -1224,8 +1224,26 @@ } } } + }, + { + "path": "pages/securitySettings/securitySettings", + "style": { + "navigationBarTitleText": "安全设置", + "enablePullDownRefresh": true, + "onReachBottomDistance": 1, + "navigationStyle": "custom", + "app-plus": { + "animationDuration": 300, + "animationType": "zoom-fade-out", + "pullToRefresh": { + "support": true, + "color": "#d3832a", //小圈圈的颜色 + "style": "circle" //小圈圈的样式 + } + } + } } - ] + ], }, { "root": "pagesTask", diff --git a/pages/user/user.vue b/pages/user/user.vue index 66224ec..03562f3 100644 --- a/pages/user/user.vue +++ b/pages/user/user.vue @@ -165,6 +165,12 @@ url: '/pagesUser/pages/systemSettings/systemSettings' }) } + // 安全设置 + else if (item.type == 4) { + uni.navigateTo({ + url: '/pagesUser/pages/securitySettings/securitySettings' + }) + } // 关于我们 else if (item.type == 5) { uni.navigateTo({ diff --git a/pagesUser/pages/securitySettings/securitySettings.vue b/pagesUser/pages/securitySettings/securitySettings.vue new file mode 100644 index 0000000..60f3ce6 --- /dev/null +++ b/pagesUser/pages/securitySettings/securitySettings.vue @@ -0,0 +1,275 @@ + + + + + \ No newline at end of file diff --git a/pagesUser/pages/systemSettings/systemSettings.vue b/pagesUser/pages/systemSettings/systemSettings.vue index 5daf4b3..927979e 100644 --- a/pagesUser/pages/systemSettings/systemSettings.vue +++ b/pagesUser/pages/systemSettings/systemSettings.vue @@ -3,9 +3,10 @@ + - + 扫描后台监听状态: @@ -21,6 +22,9 @@ + + +