diff --git a/App.vue b/App.vue index 081a31b..07e285c 100644 --- a/App.vue +++ b/App.vue @@ -4,7 +4,7 @@ // #ifdef H5 openApp() //创建在h5端全局悬浮引导用户下载app的功能 // #endif - import checkIsAgree from '@/pagesPackage/uni-agree/utils/uni-agree.js'; + import checkIsAgree from '@/common/uni-agree.js'; import uniIdPageInit from '@/uni_modules/uni-id-pages/init.js'; export default { globalData: { diff --git a/common/uni-agree.js b/common/uni-agree.js new file mode 100644 index 0000000..3d1340c --- /dev/null +++ b/common/uni-agree.js @@ -0,0 +1,11 @@ +export default function(){ + console.log(uni.getSystemInfoSync().platform) + let userprotocol = uni.getStorageSync('userprotocol'); + console.log('userprotocol',userprotocol); + if(!userprotocol){ + uni.navigateTo({ + url:'/pages/uni-agree/uni-agree', + animationType:"none" + }) + } +} \ No newline at end of file diff --git a/main.js b/main.js index 220e826..1093ca3 100644 --- a/main.js +++ b/main.js @@ -1,6 +1,6 @@ import App from './App' import i18n from './lang/i18n' -Vue.prototype.staticDir = 'https://ngtools.cn:3000/pic/static/'; +Vue.prototype.staticDir = 'https://ngtools.cn/pic/static/'; Vue.prototype.getStaticFilePath = function(url) { return Vue.prototype.staticDir + url; } diff --git a/package.json b/package.json index 96a4b8b..4297008 100644 --- a/package.json +++ b/package.json @@ -3,6 +3,7 @@ "displayName": "NGTools", "version": "2.1.8", "description": "天然气计算工具", + "private": true, "keywords": [ "login", "登录", @@ -11,7 +12,7 @@ "留言板" ], "type": "module", - "repository": "https://gitcode.net/dcloud/uni-starter", + "repository": "http://ngtools.cn:53000/ldeyun/ngtools", "engines": { "HBuilderX": "^3.2.6" }, diff --git a/pages.json b/pages.json index 5e45365..c8a00fd 100644 --- a/pages.json +++ b/pages.json @@ -1,6 +1,20 @@ { - "pages": [{ + "pages": [ + // { + // "path": "pages/grid/login", + // "style": { + // "navigationStyle": "custom" + // } + // } + // , + + { "path": "pages/grid/grid", + "style": { + "navigationStyle": "custom" + } + },{ + "path": "pages/ucenter", "style": { "navigationStyle": "custom" } @@ -16,18 +30,13 @@ "style": { "navigationStyle": "custom" } - }, - - { - "path": "pages/ucenter", - "style": { - "navigationStyle": "custom" - } } + + // #ifdef APP-PLUS - , { + ,{ "path": "uni_modules/uni-upgrade-center-app/pages/upgrade-popup", "style": { "disableScroll": true, @@ -619,16 +628,17 @@ // "rpxCalcIncludeWidth":0 }, "condition": { - "list": [{ - "path": "pages/list/detail" - }, + "list": [ + // { + // "path": "pages/list/detail" + // }, // { // "path": "pages/list/list" // }, - - { - "path": "pages/ucenter/settings/settings" - } + + // { + // "path": "pages/ucenter/settings/settings" + // } ], "current": 1 }, @@ -638,23 +648,24 @@ "borderStyle": "black", "backgroundColor": "#FFFFFF", "list": [{ - "pagePath": "pages/grid/grid", - "iconPath": "static/tabbar/list.png", - "selectedIconPath": "static/tabbar/list_active.png", - "text": "首页" - } - // , { - // "pagePath": "pages/list/list", - // "iconPath": "static/tabbar/grid.png", - // "selectedIconPath": "static/tabbar/grid_active.png", - // "text": "常用资料" - // } - , { - "pagePath": "pages/ucenter", - "iconPath": "static/tabbar/me.png", - "selectedIconPath": "static/tabbar/me_active.png", - "text": "我的" - }] + "pagePath": "pages/grid/grid", + "iconPath": "static/tabbar/list.png", + "selectedIconPath": "static/tabbar/list_active.png", + "text": "首页" + } + // , { + // "pagePath": "pages/list/list", + // "iconPath": "static/tabbar/grid.png", + // "selectedIconPath": "static/tabbar/grid_active.png", + // "text": "常用资料" + // } + , { + "pagePath": "pages/ucenter", + "iconPath": "static/tabbar/me.png", + "selectedIconPath": "static/tabbar/me_active.png", + "text": "我的" + } + ] }, "uniIdRouter": { "loginPage": "uni_modules/uni-id-pages/pages/login/login-withoutpwd", diff --git a/pages/grid/grid.vue b/pages/grid/grid.vue index 35e0081..81e227f 100644 --- a/pages/grid/grid.vue +++ b/pages/grid/grid.vue @@ -1,80 +1,83 @@ @@ -259,16 +262,17 @@ line-height: inherit; } - - + /* #endif */ .section-box { display: flex; flex-direction: row; - align-items: center; - padding: 20rpx; + align-items: left; + padding-left : calc(10vw /2); + padding-top: 10px; + padding-bottom: 10px; } .decoration { @@ -276,7 +280,7 @@ height: 12px; border-radius: 10px; background-color: #2979ff; - margin-left: 30rpx; + // margin-left: 30rpx; } .section-text { @@ -292,19 +296,7 @@ /* #endif */ - - .big-number { - font-size: 50rpx; - font-weight: 700; - font-stretch: condensed; - font-style: oblique; - } - - .text { - text-align: center; - font-size: 26rpx; - margin-top: 10rpx; - } + .Grid { width: 90vw; @@ -313,9 +305,9 @@ flex-wrap: wrap; justify-content: flex-start; align-content: space-between; - padding: 20rpx 40rpx; + padding-left : calc(10vw /2); column-gap: calc(25% / 3); - row-gap: 10rpx; + row-gap: 5rpx; box-sizing: content-box; .Grid-Item { @@ -330,21 +322,20 @@ .GSimg { width: 100%; height: 10rpx; - margin-top: 20rpx; text-align: center; .Image { - width: 80rpx; - height: 80rpx; + width: 100rpx; + height: 100rpx; } } - .GStitle { width: 100%; height: 34rpx; line-height: 34rpx; color: orangered; - font-size: 24rpx; + font-size: 26rpx; + padding-top: 15px; margin-top: 80rpx; } diff --git a/pages/grid/login.vue b/pages/grid/login.vue new file mode 100644 index 0000000..629e443 --- /dev/null +++ b/pages/grid/login.vue @@ -0,0 +1,21 @@ + + + + + \ No newline at end of file diff --git a/pages/ucenter.vue b/pages/ucenter.vue index 70a1d03..62029ad 100644 --- a/pages/ucenter.vue +++ b/pages/ucenter.vue @@ -133,13 +133,13 @@ "icon": "help" }, { "title": this.$t('mine.settings'), - "to": '/pages/ucenter/settings/settings', + "to": '/pagesPackage/ucenter/settings/settings', "icon": "gear" }], // #ifdef APP-PLUS [{ "title": this.$t('mine.about'), - "to": '/pages/ucenter/about/about', + "to": '/pagesPackage/ucenter/about/about', "icon": "info" }] // #endif @@ -167,7 +167,7 @@ }) //#endif }, - onShow() {}, + onShow() {}, computed: { userInfo() { return store.userInfo @@ -432,7 +432,7 @@ height: 100rpx; line-height: 100rpx; font-size: 38rpx; - color: #FFFFFF; + color: blue; } .center-list { diff --git a/pagesPackage/ngtools_CNG/LNGQhJs.vue b/pagesPackage/ngtools_CNG/LNGQhJs.vue index 7b17f58..1040fc3 100644 --- a/pagesPackage/ngtools_CNG/LNGQhJs.vue +++ b/pagesPackage/ngtools_CNG/LNGQhJs.vue @@ -267,6 +267,9 @@ console.log(NG_par); var that = this; var url = ""; + // #ifdef APP-PLUS + url = "https://ngtools.cn:8443"; + // #endif // #ifdef MP-WEIXIN url = "https://ngtools.cn:8443"; // #endif diff --git a/pagesPackage/ngtools_CNG/srjBgJs.vue b/pagesPackage/ngtools_CNG/srjBgJs.vue index f5abde9..56c94c2 100644 --- a/pagesPackage/ngtools_CNG/srjBgJs.vue +++ b/pagesPackage/ngtools_CNG/srjBgJs.vue @@ -266,6 +266,10 @@ console.log(NG_par); var that = this; var url = ""; + // #ifdef APP-PLUS + url = "https://ngtools.cn:8443"; + // #endif + // #ifdef MP-WEIXIN url = "https://ngtools.cn:8443"; // #endif diff --git a/pagesPackage/ngtools_CNG/srjJs.vue b/pagesPackage/ngtools_CNG/srjJs.vue index 62ebaf7..905579a 100644 --- a/pagesPackage/ngtools_CNG/srjJs.vue +++ b/pagesPackage/ngtools_CNG/srjJs.vue @@ -254,6 +254,10 @@ console.log(NG_par); var that = this; var url = ""; + // #ifdef APP-PLUS + url = "https://ngtools.cn:8443"; + // #endif + // #ifdef MP-WEIXIN url = "https://ngtools.cn:8443"; // #endif diff --git a/pagesPackage/ngtools_CNG/zxcJs.vue b/pagesPackage/ngtools_CNG/zxcJs.vue index 4e9df97..db69977 100644 --- a/pagesPackage/ngtools_CNG/zxcJs.vue +++ b/pagesPackage/ngtools_CNG/zxcJs.vue @@ -278,6 +278,10 @@ console.log(NG_par); var that = this; var url = ""; + // #ifdef APP-PLUS + url = "https://ngtools.cn:8443"; + // #endif + // #ifdef MP-WEIXIN url="https://ngtools.cn:8443"; // #endif diff --git a/pagesPackage/ngtools_Flow/SqgyJs.vue b/pagesPackage/ngtools_Flow/SqgyJs.vue index 83730de..7b6ccad 100644 --- a/pagesPackage/ngtools_Flow/SqgyJs.vue +++ b/pagesPackage/ngtools_Flow/SqgyJs.vue @@ -416,6 +416,10 @@ console.log(NG_par); var that = this; var url = ""; + // #ifdef APP-PLUS + url = "https://ngtools.cn:8443"; + // #endif + // #ifdef MP-WEIXIN url="https://ngtools.cn:8443"; // #endif diff --git a/pagesPackage/ngtools_Flow/cysllJs.vue b/pagesPackage/ngtools_Flow/cysllJs.vue index 7bd67e6..fd6d2cb 100644 --- a/pagesPackage/ngtools_Flow/cysllJs.vue +++ b/pagesPackage/ngtools_Flow/cysllJs.vue @@ -19,7 +19,6 @@ - @@ -221,6 +220,11 @@ console.log(NG_par); var that = this; var url = ""; + + // #ifdef APP-PLUS + url = "https://ngtools.cn:8443"; + // #endif + // #ifdef MP-WEIXIN url = "https://ngtools.cn:8443"; // #endif diff --git a/pagesPackage/ngtools_Flow/ljlllJs.vue b/pagesPackage/ngtools_Flow/ljlllJs.vue index 96c72c0..bd080ca 100644 --- a/pagesPackage/ngtools_Flow/ljlllJs.vue +++ b/pagesPackage/ngtools_Flow/ljlllJs.vue @@ -225,6 +225,10 @@ console.log(NG_par); var that = this; var url = ""; + // #ifdef APP-PLUS + url = "https://ngtools.cn:8443"; + // #endif + // #ifdef MP-WEIXIN url="https://ngtools.cn:8443"; // #endif diff --git a/pagesPackage/ngtools_Flow/sdsllJs.vue b/pagesPackage/ngtools_Flow/sdsllJs.vue index a492b2c..a1db9ac 100644 --- a/pagesPackage/ngtools_Flow/sdsllJs.vue +++ b/pagesPackage/ngtools_Flow/sdsllJs.vue @@ -224,6 +224,10 @@ console.log(NG_par); var that = this; var url = ""; + // #ifdef APP-PLUS + url = "https://ngtools.cn:8443"; + // #endif + // #ifdef MP-WEIXIN url="https://ngtools.cn:8443"; // #endif diff --git a/pagesPackage/ngtools_Par/ZBgJs.vue b/pagesPackage/ngtools_Par/ZBgJs.vue index fb58e50..292cee9 100644 --- a/pagesPackage/ngtools_Par/ZBgJs.vue +++ b/pagesPackage/ngtools_Par/ZBgJs.vue @@ -278,6 +278,10 @@ console.log(NG_par); var that = this; var url = ""; + // #ifdef APP-PLUS + url = "https://ngtools.cn:8443"; + // #endif + // #ifdef MP-WEIXIN url = "https://ngtools.cn:8443"; // #endif diff --git a/pagesPackage/ngtools_Par/mdRzJs.vue b/pagesPackage/ngtools_Par/mdRzJs.vue index 67100b0..8a62c3a 100644 --- a/pagesPackage/ngtools_Par/mdRzJs.vue +++ b/pagesPackage/ngtools_Par/mdRzJs.vue @@ -265,6 +265,10 @@ console.log(NG_par); var that = this; var url = ""; + // #ifdef APP-PLUS + url = "https://ngtools.cn:8443"; + // #endif + // #ifdef MP-WEIXIN url="https://ngtools.cn:8443"; // #endif diff --git a/pagesPackage/ngtools_Par/qtJs.vue b/pagesPackage/ngtools_Par/qtJs.vue index 15cb478..b130310 100644 --- a/pagesPackage/ngtools_Par/qtJs.vue +++ b/pagesPackage/ngtools_Par/qtJs.vue @@ -264,6 +264,10 @@ console.log(NG_par); var that = this; var url = ""; + // #ifdef APP-PLUS + url = "https://ngtools.cn:8443"; + // #endif + // #ifdef MP-WEIXIN url = "https://ngtools.cn:8443"; // #endif diff --git a/pagesPackage/ngtools_Par/zJs.vue b/pagesPackage/ngtools_Par/zJs.vue index c0a5231..52d7d32 100644 --- a/pagesPackage/ngtools_Par/zJs.vue +++ b/pagesPackage/ngtools_Par/zJs.vue @@ -264,6 +264,10 @@ console.log(NG_par); var that = this; var url = ""; + // #ifdef APP-PLUS + url = "https://ngtools.cn:8443"; + // #endif + // #ifdef MP-WEIXIN url = "https://ngtools.cn:8443"; // #endif diff --git a/uni-starter.config.js b/uni-starter.config.js index 6f0ac31..97ff00b 100644 --- a/uni-starter.config.js +++ b/uni-starter.config.js @@ -9,7 +9,7 @@ export default { // //左侧显示的应用名称 "appname": '天然气计算', // //应用的图标 - "logo": "https://ngtools.cn/pic/static/logomain.png", + "logo": "https://ngtools.cnhttps://ngtools.cn/pic/static/logomain.png", } }, "mp": { @@ -23,7 +23,7 @@ export default { //应用名称 "appName": "天然气计算", //应用logo - "logo": "https://ngtools.cn/pic/static/logomain.png", + "logo": "https://ngtools.cnhttps://ngtools.cn/pic/static/logomain.png", //公司名称 "company": "妍杰丽云工作室", //口号 diff --git a/uni_modules/uni-config-center/uniCloud/cloudfunctions/common/uni-config-center/uni-id/config.json b/uni_modules/uni-config-center/uniCloud/cloudfunctions/common/uni-config-center/uni-id/config.json index ff893af..b357444 100644 --- a/uni_modules/uni-config-center/uniCloud/cloudfunctions/common/uni-config-center/uni-id/config.json +++ b/uni_modules/uni-config-center/uniCloud/cloudfunctions/common/uni-config-center/uni-id/config.json @@ -37,8 +37,8 @@ "mp-weixin": { "oauth": { "weixin": { - "appid": "微信小程序登录所用的appid、appsecret需要在对应的小程序管理控制台获取", - "appsecret": "微信小程序后台获取的appsecret" + "appid": "wx9f9b7d747d261686", + "appsecret": "86f3c4ca07a79a34ebb23e790151b999" } } }, diff --git a/uni_modules/uni-id-pages/common/login-page.mixin.js b/uni_modules/uni-id-pages/common/login-page.mixin.js index 3f04454..360cdd8 100644 --- a/uni_modules/uni-id-pages/common/login-page.mixin.js +++ b/uni_modules/uni-id-pages/common/login-page.mixin.js @@ -43,6 +43,7 @@ const mixin = { } if (e.uniIdRedirectUrl) { + console.log(e.uniIdRedirectUrl) this.uniIdRedirectUrl = decodeURIComponent(e.uniIdRedirectUrl) } @@ -85,6 +86,7 @@ const mixin = { methods: { loginSuccess(e) { console.log("登录成功"+JSON.stringify(e)) + console.log("============"+this.uniIdRedirectUrl) mutations.loginSuccess({ ...e, uniIdRedirectUrl: this.uniIdRedirectUrl diff --git a/uni_modules/uni-id-pages/common/login-page.scss b/uni_modules/uni-id-pages/common/login-page.scss index 5de6899..6a698d9 100644 --- a/uni_modules/uni-id-pages/common/login-page.scss +++ b/uni_modules/uni-id-pages/common/login-page.scss @@ -90,7 +90,6 @@ // 解决小程序端开启虚拟节点virtualHost引起的 class = input-box丢失的问题 [详情参考](https://uniapp.dcloud.net.cn/matter.html#%E5%90%84%E5%AE%B6%E5%B0%8F%E7%A8%8B%E5%BA%8F%E5%AE%9E%E7%8E%B0%E6%9C%BA%E5%88%B6%E4%B8%8D%E5%90%8C-%E5%8F%AF%E8%83%BD%E5%AD%98%E5%9C%A8%E7%9A%84%E5%B9%B3%E5%8F%B0%E5%85%BC%E5%AE%B9%E9%97%AE%E9%A2%98) .uni-content ::v-deep .uni-easyinput__content, /* #endif */ - .input-box { height: 44px; background-color: #F8F8F8 !important; @@ -101,16 +100,13 @@ /* #endif */ flex: 1; } - .link { color: #04498c; cursor: pointer; } - .uni-content ::v-deep .uni-forms-item__inner { padding-bottom: 8px; } - .uni-btn { text-align: center; height: 40px; @@ -120,7 +116,6 @@ border-radius: 5px; font-size: 16px; } - .uni-body.uni_modules-uni-id-pages-pages-login-login-withoutpwd{ height: auto !important; } diff --git a/uni_modules/uni-id-pages/config.js b/uni_modules/uni-id-pages/config.js index 618bcf7..e7fc927 100644 --- a/uni_modules/uni-id-pages/config.js +++ b/uni_modules/uni-id-pages/config.js @@ -15,13 +15,16 @@ export default { // "google", // "alipay", // "douyin", - // #ifdef APP + 'weixin', 'univerify', // #endif + // #ifdef MP-WEIXIN 'weixin', + // #endif 'username', // #ifdef APP + 'weixin', 'apple', // #endif 'smsCode' @@ -39,7 +42,7 @@ export default { appid: { weixin: { // 微信公众号的appid，来源:登录微信公众号（https://mp.weixin.qq.com）-> 设置与开发 -> 基本配置 -> 公众号开发信息 -> AppID - h5: 'xxxxxx', + h5: 'wx9f9b7d747d261686', // 微信开放平台的appid，来源:登录微信开放平台（https://open.weixin.qq.com） -> 管理中心 -> 网站应用 -> 选择对应的应用名称，点击查看 -> AppID web: 'xxxxxx' } diff --git a/uni_modules/uni-id-pages/pages/login/login-smscode.vue b/uni_modules/uni-id-pages/pages/login/login-smscode.vue index f847cc5..192eb2b 100644 --- a/uni_modules/uni-id-pages/pages/login/login-smscode.vue +++ b/uni_modules/uni-id-pages/pages/login/login-smscode.vue @@ -24,7 +24,7 @@ "code": "", "phone": "", "captcha": "", - "logo": "/static/logo.png" + "logo": "https://ngtools.cnhttps://ngtools.cn/pic/static/logomain.png" } }, computed: { diff --git a/uni_modules/uni-id-pages/pages/login/login-withoutpwd.vue b/uni_modules/uni-id-pages/pages/login/login-withoutpwd.vue index 26f963f..e3feb35 100644 --- a/uni_modules/uni-id-pages/pages/login/login-withoutpwd.vue +++ b/uni_modules/uni-id-pages/pages/login/login-withoutpwd.vue @@ -43,7 +43,7 @@ type: "", //快捷登录方式 phone: "", //手机号码 focusPhone: false, - logo: "/static/logo.png" + logo: "https://ngtools.cnhttps://ngtools.cn/pic/static/logomain.png" } }, computed: { diff --git a/uni_modules/uni-id-pages/pages/login/login-withpwd.vue b/uni_modules/uni-id-pages/pages/login/login-withpwd.vue index 3fe053b..8639a06 100644 --- a/uni_modules/uni-id-pages/pages/login/login-withpwd.vue +++ b/uni_modules/uni-id-pages/pages/login/login-withpwd.vue @@ -51,7 +51,7 @@ "needCaptcha": false, "focusUsername": false, "focusPassword": false, - "logo": "/static/logo.png" + "logo": "https://ngtools.cnhttps://ngtools.cn/pic/static/logomain.png" } }, onShow() { @@ -123,7 +123,7 @@ } uniIdCo.login(data).then(e => { - console.log(JSON.stringify(data)) + console.log(JSON.stringify(e)) this.loginSuccess(e) }).catch(e => { if (e.errCode == 'uni-id-captcha-required') { diff --git a/uni_modules/uni-id-pages/pages/userinfo/set-pwd/set-pwd.vue b/uni_modules/uni-id-pages/pages/userinfo/set-pwd/set-pwd.vue index 94ed02a..6490e75 100644 --- a/uni_modules/uni-id-pages/pages/userinfo/set-pwd/set-pwd.vue +++ b/uni_modules/uni-id-pages/pages/userinfo/set-pwd/set-pwd.vue @@ -98,6 +98,7 @@ export default { content: '密码设置成功', showCancel: false, success: () => { + console.log("rrrrrrrr" + this.uniIdRedirectUrl) mutations.loginBack({ uniIdRedirectUrl: this.uniIdRedirectUrl, loginType: this.loginType diff --git a/uni_modules/yjly-ngtools-meterResult/components/yjly-ngtools-meterResult/yjly-ngtools-meterResult.vue b/uni_modules/yjly-ngtools-meterResult/components/yjly-ngtools-meterResult/yjly-ngtools-meterResult.vue index 52b531d..97e7e6b 100644 --- a/uni_modules/yjly-ngtools-meterResult/components/yjly-ngtools-meterResult/yjly-ngtools-meterResult.vue +++ b/uni_modules/yjly-ngtools-meterResult/components/yjly-ngtools-meterResult/yjly-ngtools-meterResult.vue @@ -123,20 +123,16 @@ :title="formData.dRnPipe"> - - - - - - + - @@ -203,7 +199,7 @@ mounted() { let that = this; // #ifdef APP - + uni.getSystemInfo({ success: function(res) { that.scrollerHeight = (res.windowHeight - 200) @@ -211,7 +207,7 @@ }); // #endif // #ifdef H5 - + uni.getSystemInfo({ success: function(res) { that.scrollerHeight = (res.windowHeight - 200) @@ -219,11 +215,11 @@ }); // #endif // #ifdef MP-WEIXIN - wx.getSystemInfo({ - success: function(res) { - that.scrollerHeight = (res.windowHeight - 200) - } - }) + wx.getSystemInfo({ + success: function(res) { + that.scrollerHeight = (res.windowHeight - 200) + } + }) // #endif // this.$refs.form.setRules(this.rules)