diff --git a/config.js b/config.js index bc0bb92..dee40a5 100644 --- a/config.js +++ b/config.js @@ -25,7 +25,7 @@ const config = { const defaultConfig = { mapKey : 'XMBBZ-BCPCV-SXPPQ-5Y7MY-PHZXK-YFFVU', aliOss : { - url : 'https://tennis-oss.xzaiyp.top/', + url : 'https://oss.mxqih.top/', config : { //桶的地址 region: 'oss-cn-guangzhou', @@ -35,7 +35,7 @@ const defaultConfig = { accessKeySecret:'tAdbYQCmdur6jbZ8hjvgB7T1Z52mIG', //桶的名字 bucket: 'zhuoqiu-image', - endpoint:'oss-cn-guangzhou.aliyuncs.com', + endpoint:'oss-cn-guangzhou.aliyuncs.com' } }, } diff --git a/manifest.json b/manifest.json index dc46cab..a366672 100644 --- a/manifest.json +++ b/manifest.json @@ -65,7 +65,8 @@ "desc" : "你的位置信息将用于小程序位置接口的效果展示" } }, - "requiredPrivateInfos" : [ "chooseLocation", "getLocation" ] + "requiredPrivateInfos" : [ "chooseLocation", "getLocation" ], + "lazyCodeLoading" : "requiredComponents" }, "mp-alipay" : { "usingComponents" : true diff --git a/pages.json b/pages.json index 5f84a18..42a7ce0 100644 --- a/pages.json +++ b/pages.json @@ -4,7 +4,7 @@ "style": { "navigationBarTitleText": "登录" } - },{ + }, { "path": "pages/index/index", "style": { "navigationBarTitleText": "打卡" @@ -16,91 +16,53 @@ "navigationBarTitleText": "我的" } }, - { - "path": "pages/record/record", - "style": { - "navigationBarTitleText": "打卡记录" - } - }, - { - "path": "pages/autonym/autonym", - "style": { - "navigationBarTitleText": "身份认证" - } - }, - { - "path": "pages/human/human", - "style": { - "navigationBarTitleText": "人脸识别" - } - }, { "path": "pages/login/wxUserInfo", "style": { "navigationBarTitleText": "用户设置" } - }, - { - "path" : "pages/punchCard/punchCard", - "style" : + } + ], + "preloadRule": { + "pages/index/index": { + "network": "all", + "packages": ["pages/subPack"] + } + }, + "subPackages": [{ + "root": "pages/subPack", + "pages": [{ + "path": "record/record", + "style": { + "navigationBarTitleText": "打卡记录" + } + }, { - "navigationBarTitleText" : "打卡" - } - }, - { - "path" : "pages/team/team", - "style" : + "path": "autonym/autonym", + "style": { + "navigationBarTitleText": "实名认证" + } + }, + { + "path": "punchCard/punchCard", + "style": { + "navigationBarTitleText": "打卡" + } + }, { - "navigationBarTitleText" : "" + "path": "human/human", + "style": { + "navigationBarTitleText": "人脸识别" + } + }, + { + "path": "team/team", + "style": { + "navigationBarTitleText": "选择工程" + } } - } - ], - // "preloadRule": { - // "pages/index/index": { - // "network": "all", - // "packages": ["pages"] - // } - // }, - // "subPackages": [{ - // "root": "pages", - // "pages": [{ - // "path": "login/login", - // "style": { - // "navigationBarTitleText": "登录" - // } - // }, - // { - // "path": "login/wxUserInfo", - // "style": { - // "navigationBarTitleText": "用户信息" - // } - // }, - // { - // "path": "record/record", - // "style": { - // "navigationBarTitleText": "打卡记录" - // } - // }, - // { - // "path": "autonym/autonym", - // "style": { - // "navigationBarTitleText": "实名认证" - // } - // }, - // { - // "path": "punchCard/punchCard", - // "style": { - // "navigationBarTitleText": "打卡" - // } - // }, - // { - // "path": "human/human", - // "style": { - // "navigationBarTitleText": "人脸识别" - // } - // } - // ] - // }], + ] + }], "globalStyle": { "navigationBarTextStyle": "black", "navigationBarTitleText": "工程打卡", diff --git a/pages/index/center.vue b/pages/index/center.vue index d13c364..9dbb8f8 100644 --- a/pages/index/center.vue +++ b/pages/index/center.vue @@ -11,7 +11,7 @@
高新区项目一队项目1
- + @@ -19,17 +19,17 @@ @@ -59,7 +59,7 @@ }) }else if(index == 2){ uni.navigateTo({ - url: "/pages/autonym/autonym" + url: "/pages/subPack/autonym/autonym" }) } } diff --git a/pages/index/index.vue b/pages/index/index.vue index 71f02b3..6429eb9 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -2,14 +2,14 @@ - + - + 高新区项目一队项目1 @@ -32,7 +32,7 @@
- +
打卡记录
@@ -74,7 +74,7 @@ // 跳转签到记录 toRecord() { uni.navigateTo({ - url: "/pages/record/record" + url: "/pages/subPack/record/record" }) }, @@ -96,7 +96,7 @@ id: 1, latitude: res.latitude, longitude: res.longitude, - iconPath: '/static/image/home/location.png', + iconPath: 'https://tennis-oss.xzaiyp.top/2024-10-22/103fa1db-8524-45e6-8d00-c36a69977a5b.png', width: 30, height: 30 }) @@ -153,7 +153,7 @@ //打卡(跳转人脸识别) callCard(){ uni.navigateTo({ - url: "/pages/human/human" + url: "/pages/subPack/human/human" }) } } diff --git a/pages/login/wxUserInfo.vue b/pages/login/wxUserInfo.vue index c004243..dfb44ca 100644 --- a/pages/login/wxUserInfo.vue +++ b/pages/login/wxUserInfo.vue @@ -19,7 +19,8 @@ 头像 - @@ -45,7 +46,7 @@ data() { return { userInfo: { - headImage: '../static/login/user.png', //设置了一个本地默认头像 + headImage: '', //设置了一个本地默认头像 nickName: '', name: '' } @@ -75,7 +76,7 @@ self.userInfo.name = nickName if (self.$utils.verificationAll(self.userInfo, { - headImage: '请选择头像', + headImage: '请更换默认头像', nickName: '请填写昵称', })) { return @@ -89,9 +90,9 @@ // }) // } // }) - + uni.reLaunch({ - url: "/pages/team/team" + url: "/pages/subPack/team/team" }) }) }, diff --git a/pages/autonym/autonym.vue b/pages/subPack/autonym/autonym.vue similarity index 90% rename from pages/autonym/autonym.vue rename to pages/subPack/autonym/autonym.vue index bb294c6..b88432f 100644 --- a/pages/autonym/autonym.vue +++ b/pages/subPack/autonym/autonym.vue @@ -3,7 +3,7 @@ - + @@ -24,7 +24,7 @@ - + 实名仅用于您是否为真人用户，不会对信息做任何采集与保留，请放心使用 diff --git a/pages/human/human.vue b/pages/subPack/human/human.vue similarity index 83% rename from pages/human/human.vue rename to pages/subPack/human/human.vue index cafa916..ab723f7 100644 --- a/pages/human/human.vue +++ b/pages/subPack/human/human.vue @@ -10,7 +10,7 @@ - + @@ -21,15 +21,15 @@ - + 避免遮挡 - + 光线充足 - + 正对充足 @@ -66,7 +66,7 @@ console.log(JSON.stringify(res.tempFilePaths)); //后续在这里上传文件 uni.navigateTo({ - url: "/pages/punchCard/punchCard" + url: "/pages/subPack/punchCard/punchCard" }) } }); diff --git a/pages/punchCard/punchCard.vue b/pages/subPack/punchCard/punchCard.vue similarity index 100% rename from pages/punchCard/punchCard.vue rename to pages/subPack/punchCard/punchCard.vue diff --git a/pages/record/record.vue b/pages/subPack/record/record.vue similarity index 100% rename from pages/record/record.vue rename to pages/subPack/record/record.vue diff --git a/pages/team/team.vue b/pages/subPack/team/team.vue similarity index 100% rename from pages/team/team.vue rename to pages/subPack/team/team.vue diff --git a/static/image/autonym/autonum-bg.png b/static/image/autonym/autonum-bg.png deleted file mode 100644 index a5ebece..0000000 Binary files a/static/image/autonym/autonum-bg.png and /dev/null differ diff --git a/static/image/autonym/info.png b/static/image/autonym/info.png deleted file mode 100644 index af4a24b..0000000 Binary files a/static/image/autonym/info.png and /dev/null differ diff --git a/static/image/center/center-bg.png b/static/image/center/center-bg.png deleted file mode 100644 index f2701b9..0000000 Binary files a/static/image/center/center-bg.png and /dev/null differ diff --git a/static/image/center/menu1.png b/static/image/center/menu1.png deleted file mode 100644 index 7c0d752..0000000 Binary files a/static/image/center/menu1.png and /dev/null differ diff --git a/static/image/center/menu2.png b/static/image/center/menu2.png deleted file mode 100644 index a938c45..0000000 Binary files a/static/image/center/menu2.png and /dev/null differ diff --git a/static/image/center/menu3.png b/static/image/center/menu3.png deleted file mode 100644 index 86655c0..0000000 Binary files a/static/image/center/menu3.png and /dev/null differ diff --git a/static/image/home/change.png b/static/image/home/change.png deleted file mode 100644 index 5cca9c9..0000000 Binary files a/static/image/home/change.png and /dev/null differ diff --git a/static/image/home/location.png b/static/image/home/location.png deleted file mode 100644 index c988852..0000000 Binary files a/static/image/home/location.png and /dev/null differ diff --git a/static/image/home/sign.png b/static/image/home/sign.png deleted file mode 100644 index a71b7e6..0000000 Binary files a/static/image/home/sign.png and /dev/null differ diff --git a/static/image/home/top-bg.png b/static/image/home/top-bg.png deleted file mode 100644 index 212f54c..0000000 Binary files a/static/image/home/top-bg.png and /dev/null differ diff --git a/static/image/human/icon1.png b/static/image/human/icon1.png deleted file mode 100644 index f7c0bda..0000000 Binary files a/static/image/human/icon1.png and /dev/null differ diff --git a/static/image/human/icon2.png b/static/image/human/icon2.png deleted file mode 100644 index 253691b..0000000 Binary files a/static/image/human/icon2.png and /dev/null differ diff --git a/static/image/human/icon3.png b/static/image/human/icon3.png deleted file mode 100644 index 97e728f..0000000 Binary files a/static/image/human/icon3.png and /dev/null differ diff --git a/static/image/human/img.png b/static/image/human/img.png deleted file mode 100644 index c7f2138..0000000 Binary files a/static/image/human/img.png and /dev/null differ