修改图片资源地址端口；

修改ucenter部分内容页面路径；
调整首页样式

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: {

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"
+		})
+	}
+}

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;
 }

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"
 	},

pages.json

@@ -1,9 +1,23 @@
 {
-	"pages": [{
+	"pages": [
+		// {
+		// 	"path": "pages/grid/login",
+		// 	"style": {
+		// 		"navigationStyle": "custom"
+		// 	}
+		// }
+		// ,
+		
+		 {
 			"path": "pages/grid/grid",
 			"style": {
 				"navigationStyle": "custom" 
 			}
+		},{
+			"path": "pages/ucenter",
+			"style": {
+				"navigationStyle": "custom"
+			}
 		},
 		{
 			"path": "pages/list/list",
@@ -16,14 +30,9 @@
 			"style": {
 				"navigationStyle": "custom"
 			}
-		},
+		}
+
 
-		{
-			"path": "pages/ucenter",
-			"style": {
-				"navigationStyle": "custom"
-			}
-		}
 
 
 		// #ifdef APP-PLUS
@@ -619,16 +628,17 @@
 		// "rpxCalcIncludeWidth":0
 	},
 	"condition": {
-		"list": [{
+		"list": [
-				"path": "pages/list/detail"
+			// {
-			}, 
+			// 	"path": "pages/list/detail"
+			// },
 			// {
 			// 	"path": "pages/list/list"
 			// },
 
-			{
+			// {
-				"path": "pages/ucenter/settings/settings"
+			// 	"path": "pages/ucenter/settings/settings"
-			}
+			// }
 		],
 		"current": 1
 	},
@@ -654,7 +664,8 @@
 				"iconPath": "static/tabbar/me.png",
 				"selectedIconPath": "static/tabbar/me_active.png",
 				"text": "我的"
-		}]
+			}
+		]
 	},
 	"uniIdRouter": {
 		"loginPage": "uni_modules/uni-id-pages/pages/login/login-withoutpwd",

pages/grid/grid.vue

@@ -1,14 +1,7 @@
 <template>
 	<view class="warp">
 		<uni-nav-bar dark :fixed="true" shadow background-color="#007AFF" status-bar title="天然气计算工具集" />
-
+		<view  >
-		<view class="content">
-			<ad-rewarded-video adpid="1507000689" :loadnext="true" v-slot:default="{loading, error}" @load="onadload"
-				@close="onadclose" @error="onaderror">
-				<button :disabled="loading" :loading="loading">显示广告</button>
-				<view v-if="error">{{error}}</view>
-			</ad-rewarded-video>
-		</view>
 			
 			 
 			
@@ -22,7 +15,8 @@
 				<view class="Grid-Item" v-for="(item,index) in llJsgridList" :key="index">
 					<navigator :url="item.url">
 						<view class="GSimg">
-						<image class="Image" :src="getStaticFilePath('mianicon/'+item.icon)" mode="aspectFit"></image>
+							<image class="Image" :src="getStaticFilePath('mianicon/'+item.icon)" mode="aspectFit">
+							</image>
 						</view>
 						<view class="GStitle">{{ item.type }}</view>
 					</navigator>
@@ -83,6 +77,7 @@
 
 
 
+		</view>
 	</view>
 </template>
 
@@ -269,14 +264,15 @@
 
 	
 
-
 	/* #endif */
 
 	.section-box {
 		display: flex;
 		flex-direction: row;
-		align-items: center;
+		align-items: left;
-		padding: 20rpx;
+		padding-left :  calc(10vw /2);
+		padding-top: 10px;
+		padding-bottom: 10px;
 	}
 
 	.decoration {
@@ -284,7 +280,7 @@
 		height: 12px;
 		border-radius: 10px;
 		background-color: #2979ff;
-		margin-left: 30rpx;
+		// margin-left: 30rpx;
 	}
 
 	.section-text {
@@ -301,18 +297,6 @@
 	/* #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;
@@ -321,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 {
@@ -338,21 +322,20 @@
 			.GSimg {
 				width: 100%;
 				height: 10rpx;
-				margin-top: 20rpx;
 				text-align: center;
 
 				.Image {
-					width: 80rpx;
+					width: 100rpx;
-					height: 80rpx;
+					height: 100rpx;
 				}
 			}
-
 			.GStitle {
 				width: 100%;
 				height: 34rpx;
 				line-height: 34rpx;
 				color: orangered;
-				font-size: 24rpx;
+				font-size: 26rpx;
+				padding-top: 15px;
 				margin-top: 80rpx;
 
 			}

pages/grid/login.vue

@@ -0,0 +1,21 @@
+<template>
+	<view>
+
+	</view>
+</template>
+
+<script>
+	export default {
+
+		onLoad() {
+			uni.navigateTo({
+				url: '/uni_modules/uni-id-pages/pages/login/login-withpwd'
+			})
+		} 
+
+
+	}
+</script>
+
+<style>
+</style>

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
@@ -432,7 +432,7 @@
 		height: 100rpx;
 		line-height: 100rpx;
 		font-size: 38rpx;
-		color: #FFFFFF;
+		color: blue;
 	}
 
 	.center-list {

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				

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				

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				

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				

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				

pagesPackage/ngtools_Flow/cysllJs.vue

@@ -19,7 +19,7 @@
 			<view v-show="current === 2">
 				<yjly-ngtools-meterResult :formData="meterResult"></yjly-ngtools-meterResult>
 			</view>
-
+		</view>
 	</view>
 </template>
 
@@ -32,7 +32,7 @@
 				strNG: "",
 				meterPar: [],
 
-		</view>meterResult: {
+				meterResult: {
 					"dCd": "",
 					"dCdCalMethod": "",
 					"dMeterFactor": "",
@@ -220,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				
@@ -242,7 +247,8 @@
 					timeout: 1000, //10秒超时
 					success: function(res) {
 						console.log(res)
-						var data = JSON.stringify(res.data.message).toString().replace('[', '').replace(']','').split(',');
+						var data = JSON.stringify(res.data.message).toString().replace('[', '').replace(']',
+							'').split(',');
 						that.meterResult.dCd = data[45].substring(0, data[45].indexOf(".") + 6);
 						that.meterResult.dE = data[46].substring(0, data[46].indexOf(".") + 6);
 						that.meterResult.dFG = data[47].substring(0, data[47].indexOf(".") + 6);

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				

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				

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				

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				

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				

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				

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": "妍杰丽云工作室",
 		//口号

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需要在对应的小程序管理控制台获取",
+        "appid": "wx9f9b7d747d261686",
-        "appsecret": "微信小程序后台获取的appsecret"
+        "appsecret": "86f3c4ca07a79a34ebb23e790151b999"
       }
     }
   },

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

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;
 }

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'
     }

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: {

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: {

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') {

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

uni_modules/yjly-ngtools-meterResult/components/yjly-ngtools-meterResult/yjly-ngtools-meterResult.vue

@@ -123,20 +123,16 @@
 									:title="formData.dRnPipe"></uni-title>
 							</uni-forms-item>
 						</view>
-
-
-
-
-
 						<view class="formItem">
-							<uni-forms-item v-if="meterType==0" name="dVelocityFlow" label-width='150' label="天然气流速(m/s)">
+							<uni-forms-item v-if="meterType==0" name="dVelocityFlow" label-width='150'
+								label="天然气流速(m/s)">
 								<uni-title type="h3" color="blue" placeholder="管道内天然气流速"
 									:title="formData.dVelocityFlow"></uni-title>
 							</uni-forms-item>
 						</view>
 						<view class="formItem"> <uni-forms-item v-if="meterType==0" name="dPressLost" label-width='150'
 								label="压力损失">
-								<uni-title type="h3" color="blue" placeholder="压力损失"
+								<uni-title type="h3" color="blue" placeholder="压力损失(Pa)"
 									:title="formData.dPressLost"></uni-title>
 							</uni-forms-item>
 						</view>