Merge branch 'master' of http://ngtools.cn:53000/ldeyun/NGTools

lang/zh-Hans.js

@@ -110,12 +110,12 @@ export default {
 		ZBGJs: {
 			title: "压缩因子表格",
 			url: "/pagesPackage/ngtools_Par/ZBgJs",
-			icon:'zt'
+			icon:'zt.png'
 		},
 		srjBGJs: {
 			title: "水容积表格",
 			url: "/pagesPackage/ngtools_CNG/srjBgJs",
-			icon:'vt'
+			icon:'vt.png'
 		} 
 		// ,
 		// SqgyJs: {

main.js

@@ -1,6 +1,6 @@
 import App from './App'
 import i18n from './lang/i18n'
-Vue.prototype.staticDir = 'https://ngtools.cn/pic/static/';
+Vue.prototype.staticDir = 'https://ngtools.cn:3000/pic/static/';
 Vue.prototype.getStaticFilePath = function(url) {
 	return Vue.prototype.staticDir + url;
 }

pages/grid/grid.vue

@@ -1,10 +1,10 @@
 <template>
 	<view class="warp">
 		<uni-nav-bar dark :fixed="true" shadow background-color="#007AFF" status-bar title="天然气计算工具集" />
-		<view  >
+		<view>
-			
+
-			 
+
-			
+
 			<!-- 流量计算 -->
 			<view class="section-box">
 				<text class="decoration"></text>
@@ -36,7 +36,8 @@
 				<view class="Grid-Item" v-for="(item,index) in wxcsJsgridList" :key="index">
 					<navigator :url="item.url">
 						<view class="GSimg">
-							<image class="Image" :src="getStaticFilePath('/logomain.png')" mode="aspectFit"></image>
+							<image class="Image" :src="getStaticFilePath('mianicon/'+item.icon)" mode="aspectFit">
+							</image>
 						</view>
 						<view class="GStitle">{{ item.type }}</view>
 					</navigator>
@@ -52,7 +53,8 @@
 				<view class="Grid-Item" v-for="(item,index) in CNGJsgridList" :key="index">
 					<navigator :url="item.url">
 						<view class="GSimg">
-							<image class="Image" :src="getStaticFilePath('/logomain.png')" mode="aspectFill"></image>
+							<image class="Image" :src="getStaticFilePath('mianicon/'+item.icon)" mode="aspectFill">
+							</image>
 						</view>
 						<view class="GStitle">{{ item.type }}</view>
 					</navigator>
@@ -68,7 +70,8 @@
 				<view class="Grid-Item" v-for="(item,index) in QtJsgridList" :key="index">
 					<navigator :url="item.url">
 						<view class="GSimg">
-							<image class="Image" :src="getStaticFilePath('/logomain.png')" mode="aspectFill"></image>
+							<image class="Image" :src="getStaticFilePath('mianicon/'+item.icon)" mode="aspectFill">
+							</image>
 						</view>
 						<view class="GStitle">{{ item.type }}</view>
 					</navigator>
@@ -173,15 +176,18 @@
 				gridList = []
 				gridList.push({
 					"type": this.$t('wxcsJs.ysyzJs.title'),
-					"url": this.$t('wxcsJs.ysyzJs.url')
+					"url": this.$t('wxcsJs.ysyzJs.url'),
+					"icon": this.$t('wxcsJs.ysyzJs.icon')
 				})
 				gridList.push({
 					"type": this.$t('wxcsJs.rzJs.title'),
-					"url": this.$t('wxcsJs.rzJs.url')
+					"url": this.$t('wxcsJs.rzJs.url'),
+					"icon": this.$t('wxcsJs.rzJs.icon')
 				})
 				gridList.push({
 					"type": this.$t('wxcsJs.qtJs.title'),
-					"url": this.$t('wxcsJs.qtJs.url')
+					"url": this.$t('wxcsJs.qtJs.url'),
+					"icon": this.$t('wxcsJs.qtJs.icon')
 				})
 				this.wxcsJsgridList = gridList
 
@@ -189,26 +195,31 @@
 
 				gridList.push({
 					"type": this.$t('CNGJs.srjJs.title'),
-					"url": this.$t('CNGJs.srjJs.url')
+					"url": this.$t('CNGJs.srjJs.url'),
+					"icon": this.$t('CNGJs.srjJs.icon')
 				})
 				gridList.push({
 					"type": this.$t('CNGJs.zxcJs.title'),
-					"url": this.$t('CNGJs.zxcJs.url')
+					"url": this.$t('CNGJs.zxcJs.url'),
+					"icon": this.$t('CNGJs.zxcJs.icon')
 				})
 				gridList.push({
 					"type": this.$t('CNGJs.LNGQhJs.title'),
-					"url": this.$t('CNGJs.LNGQhJs.url')
+					"url": this.$t('CNGJs.LNGQhJs.url'),
+					"icon": this.$t('CNGJs.LNGQhJs.icon')
 				})
 				this.CNGJsgridList = gridList
 				gridList = []
 
 				gridList.push({
 					"type": this.$t('QtJs.ZBGJs.title'),
-					"url": this.$t('QtJs.ZBGJs.url')
+					"url": this.$t('QtJs.ZBGJs.url'),
+					"icon": this.$t('QtJs.ZBGJs.icon')
 				})
 				gridList.push({
 					"type": this.$t('QtJs.srjBGJs.title'),
-					"url": this.$t('QtJs.srjBGJs.url')
+					"url": this.$t('QtJs.srjBGJs.url'),
+					"icon": this.$t('QtJs.srjBGJs.icon')
 				})
 				// gridList.push({
 				// 	"type": this.$t('QtJs.SqgyJs.title'),
@@ -262,7 +273,7 @@
 		line-height: inherit;
 	}
 
-	
+
 
 	/* #endif */
 
@@ -270,7 +281,7 @@
 		display: flex;
 		flex-direction: row;
 		align-items: left;
-		padding-left :  calc(10vw /2);
+		padding-left: calc(10vw /2);
 		padding-top: 10px;
 		padding-bottom: 10px;
 	}
@@ -296,7 +307,7 @@
 
 	/* #endif */
 
- 
+
 
 	.Grid {
 		width: 90vw;
@@ -305,7 +316,7 @@
 		flex-wrap: wrap;
 		justify-content: flex-start;
 		align-content: space-between;
-		padding-left :  calc(10vw /2);	 
+		padding-left: calc(10vw /2);
 		column-gap: calc(25% / 3);
 		row-gap: 5rpx;
 		box-sizing: content-box;
@@ -329,6 +340,7 @@
 					height: 100rpx;
 				}
 			}
+
 			.GStitle {
 				width: 100%;
 				height: 34rpx;

pages/ucenter.vue

@@ -127,11 +127,13 @@
 						// 	}
 						// 	// #endif
 					],
-					[{
+					[
-						"title": this.$t('mine.feedback'),
+					// 	{
-						"to": '/uni_modules/uni-feedback/pages/opendb-feedback/opendb-feedback',
+					// 	"title": this.$t('mine.feedback'),
-						"icon": "help"
+					// 	"to": '/uni_modules/uni-feedback/pages/opendb-feedback/opendb-feedback',
-					}, {
+					// 	"icon": "help"
+					// },
+					{
 						"title": this.$t('mine.settings'),
 						"to": '/pagesPackage/ucenter/settings/settings',
 						"icon": "gear"