From 0e6123a027629d68e7bb516b28af2b2cc4157734 Mon Sep 17 00:00:00 2001 From: dengxiongfei Date: Thu, 20 Jan 2022 19:51:02 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E4=B8=8E=E9=9A=90=E7=A7=81?= =?UTF-8?q?=E5=8D=8F=E8=AE=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/qn-map/qn-map.nvue | 2 +- enums/index.js | 4 +- manifest.json | 252 ++++++----- pages.json | 4 +- pages/agreement/index.vue | 97 +++-- pages/mall/index.vue | 783 +++++++++++++++++----------------- pages/mine/index.vue | 4 +- utils/http/index.js | 18 +- 8 files changed, 630 insertions(+), 534 deletions(-) diff --git a/components/qn-map/qn-map.nvue b/components/qn-map/qn-map.nvue index a2aa7d9..04bfc72 100644 --- a/components/qn-map/qn-map.nvue +++ b/components/qn-map/qn-map.nvue @@ -70,7 +70,7 @@ export default { // 生成markers causeMarker(item) { let result = {} - if (this.scale >= 15) { + if (this.scale >= 14) { result = { latitude: item.latitude - 0, longitude: item.longitude - 0, diff --git a/enums/index.js b/enums/index.js index bec7584..d9b0d94 100644 --- a/enums/index.js +++ b/enums/index.js @@ -43,8 +43,8 @@ export const fddEnterpriseStatus = { * 上传地址 */ export const uploadUrl = { - image: `https://api-ops-yyt${urlEnv}.qniao.cn/yyt-uec/file-uploading/upload/image`, - file: `https://api-ops-yyt${urlEnv}.qniao.cn/yyt-uec/file-uploading/upload/file` + image: `https://api-client-yyt${urlEnv}.qniao.cn/yyt-uec/file-uploading/upload/image`, + file: `https://api-client-yyt${urlEnv}.qniao.cn/yyt-uec/file-uploading/upload/file` } /** * 结算周期:1:月结30(飞算1期),2:月结45,3:月结60(飞算2期),4:月结75,5:月结90(飞算3期) diff --git a/manifest.json b/manifest.json index ae8c6ec..2caaf6c 100644 --- a/manifest.json +++ b/manifest.json @@ -1,119 +1,151 @@ { - "name": "纸掌柜", - "appid": "__UNI__8C1E198", - "description": "", - "versionName": "1.0.0", - "versionCode": "100", - "transformPx": false, - "networkTimeout": { - "request": 6000 - }, - /* 5+App特有相关 */ - "app-plus": { - "usingComponents": true, - "nvueStyleCompiler": "uni-app", - "compilerVersion": 3, - "splashscreen": { - "alwaysShowBeforeRender": true, - "waiting": true, - "autoclose": true, - "delay": 0 + "name" : "纸掌柜", + "appid" : "__UNI__8C1E198", + "description" : "", + "versionName" : "1.0.0", + "versionCode" : "100", + "transformPx" : false, + "networkTimeout" : { + "request" : 6000 }, - "compatible": { - "ignoreVersion": true - }, - /* 模块配置 */ - "modules": { - "Maps": {}, - "Geolocation": {}, - "FaceID": {}, - "iBeacon": {} - }, - /* 应用发布信息 */ - "distribute": { - /* android打包配置 */ - "android": { - "permissions": [ - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "" - ], - "abiFilters": ["armeabi-v7a", "x86"] - }, - /* ios打包配置 */ - "ios": {}, - /* SDK配置 */ - "sdkConfigs": { - "maps": { - "amap": { - "appkey_ios": "0182ee2a9fdd5fd3ef6a8bd5a2f98325", - "appkey_android": "877848546f7f3717101a17c33e1d4df3" - } + /* 5+App特有相关 */ + "app-plus" : { + "usingComponents" : true, + "nvueStyleCompiler" : "uni-app", + "compilerVersion" : 3, + "splashscreen" : { + "alwaysShowBeforeRender" : true, + "waiting" : true, + "autoclose" : true, + "delay" : 0 + }, + "compatible" : { + "ignoreVersion" : true }, - "payment": { - "weixin": { - "__platform__": ["ios", "android"], - "appid": "", - "UniversalLinks": "" - } + /* 模块配置 */ + "modules" : { + "Maps" : {}, + "Geolocation" : {}, + "FaceID" : {}, + "iBeacon" : {} }, - "ad": {}, - "geolocation": { - "amap": { - "__platform__": ["ios", "android"], - "appkey_ios": "0182ee2a9fdd5fd3ef6a8bd5a2f98325", - "appkey_android": "877848546f7f3717101a17c33e1d4df3" - } + /* 应用发布信息 */ + "distribute" : { + /* android打包配置 */ + "android" : { + "permissions" : [ + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "" + ], + "abiFilters" : [ "armeabi-v7a", "x86" ] + }, + /* ios打包配置 */ + "ios" : {}, + /* SDK配置 */ + "sdkConfigs" : { + "maps" : { + "amap" : { + "appkey_ios" : "0182ee2a9fdd5fd3ef6a8bd5a2f98325", + "appkey_android" : "877848546f7f3717101a17c33e1d4df3" + } + }, + "payment" : { + "weixin" : { + "__platform__" : [ "ios", "android" ], + "appid" : "", + "UniversalLinks" : "" + } + }, + "ad" : {}, + "geolocation" : { + "amap" : { + "__platform__" : [ "ios", "android" ], + "appkey_ios" : "0182ee2a9fdd5fd3ef6a8bd5a2f98325", + "appkey_android" : "877848546f7f3717101a17c33e1d4df3" + } + }, + "share" : {} + }, + "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" + } + } + } }, - "share": {} - } + "uniStatistics" : { + "enable" : true + } }, - "uniStatistics": { - "enable": true - } - }, - /* 快应用特有相关 */ - "quickapp": {}, - /* 小程序特有相关 */ - "mp-weixin": { - "appid": "", - "setting": { - "urlCheck": false + /* 快应用特有相关 */ + "quickapp" : {}, + /* 小程序特有相关 */ + "mp-weixin" : { + "appid" : "", + "setting" : { + "urlCheck" : false + }, + "usingComponents" : true + }, + "mp-alipay" : { + "usingComponents" : true + }, + "mp-baidu" : { + "usingComponents" : true + }, + "mp-toutiao" : { + "usingComponents" : true + }, + "uniStatistics" : { + "enable" : false }, - "usingComponents": true - }, - "mp-alipay": { - "usingComponents": true - }, - "mp-baidu": { - "usingComponents": true - }, - "mp-toutiao": { - "usingComponents": true - }, - "uniStatistics": { - "enable": false - }, - "vueVersion": "2", - "h5": { - "router": { - "mode": "history" + "vueVersion" : "2", + "h5" : { + "router" : { + "mode" : "history" + } } - } } diff --git a/pages.json b/pages.json index d4d4db1..791f3cd 100644 --- a/pages.json +++ b/pages.json @@ -101,7 +101,9 @@ { "path": "pages/agreement/index", "style": { - "navigationBarTitleText": "用户与隐私协议" + "navigationBarTitleText": "用户与隐私协议", + "enablePullDownRefresh": false, + "navigationStyle": "custom" } }, { diff --git a/pages/agreement/index.vue b/pages/agreement/index.vue index 7ebaabe..c79c362 100644 --- a/pages/agreement/index.vue +++ b/pages/agreement/index.vue @@ -1,35 +1,82 @@ - +const content = `软件许可使用协议 +发布时间:2020年 7 月 1 日 - diff --git a/pages/mall/index.vue b/pages/mall/index.vue index d5df669..27250a0 100644 --- a/pages/mall/index.vue +++ b/pages/mall/index.vue @@ -1,60 +1,64 @@ + diff --git a/pages/mine/index.vue b/pages/mine/index.vue index 07eaae0..2a0c9b5 100644 --- a/pages/mine/index.vue +++ b/pages/mine/index.vue @@ -271,7 +271,7 @@ export default { } }, onShow() { - getBaseInfo().then((res) => { + getBaseInfo({}, true).then((res) => { if (res) { this.companyNum = res.enterpriseList.length } @@ -285,6 +285,8 @@ export default {