diff --git a/app.json b/app.json
index 88d3784..c86ef80 100644
--- a/app.json
+++ b/app.json
@@ -5,8 +5,8 @@
"pages/222",
"pages/details/details",
"pages/search/index",
- "pages/s-list/s-list"
-
+ "pages/s-list/s-list",
+ "pages/about/about"
],
"window": {
"navigationBarTextStyle": "black",
diff --git a/app.wxss b/app.wxss
index 1d5f1b9..d120959 100644
--- a/app.wxss
+++ b/app.wxss
@@ -10,8 +10,8 @@
} */
@font-face {
- font-family: 'YouSheBiaoTiHei-1';
- src: url('data:font/ttf;charset=utf-8;base64,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') format('truetype');
+ font-family: 'YouSheBiaoTiHei-3';
+ src: url('data:font/ttf;charset=utf-8;base64,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') format('truetype');
font-weight: normal;
font-style: normal;
font-display: swap;
diff --git a/components/index-nav-bar/index-nav-bar.wxss b/components/index-nav-bar/index-nav-bar.wxss
index 7994992..39cccab 100644
--- a/components/index-nav-bar/index-nav-bar.wxss
+++ b/components/index-nav-bar/index-nav-bar.wxss
@@ -47,14 +47,14 @@
.title{
padding: 0;
margin: 0;
- font-family: YouSheBiaoTiHei-1;
+ font-family: YouSheBiaoTiHei-3;
font-size: 38rpx;
line-height: 1.2;
}
.subtitle{
padding: 0;
margin: 0;
- font-family: YouSheBiaoTiHei-1;
+ font-family: YouSheBiaoTiHei-3;
font-size: 45rpx;
line-height: 1.3;
}
diff --git a/pages/about/about.js b/pages/about/about.js
new file mode 100644
index 0000000..6e622f8
--- /dev/null
+++ b/pages/about/about.js
@@ -0,0 +1,114 @@
+const request = require('../../utils/request')
+const ui = require('../../utils/ui')
+const wxParse = require("../../wxParse/wxParse.js");
+Page({
+
+ /**
+ * 页面的初始数据
+ */
+ data: {
+ navTitle: "联系我们",
+ title: "北京欧华莱茵科技有限公司"
+ },
+
+ /**
+ * 生命周期函数--监听页面加载
+ */
+ onLoad(options) {
+ let that = this;
+ that.GetLabelList()
+ },
+
+
+
+ GetLabelList() {
+ let that = this;
+ request.request({
+ method: "GET",
+ // https://app.19year.cn/api.php/doc/details?id=51
+ url: "/api.php/doc/label_list"
+ }).then(res => {
+ if (res.data.code === 1) {
+ let list = res.data.data.data
+ for(let j = 0, len=list.length; j < len; j++) {
+ that.setData({[`${list[j].name}`]:list[j].value})
+ }
+ that.initContent()
+ }
+ }).catch(err => {
+ console.log('ERROR', err)
+ });
+ },
+
+ initContent() {
+ let that = this;
+ console.log(that.data.contact_content);
+ if (that.data.contact_content.length > 0) {
+ wxParse.wxParse('content', 'html', that.data.contact_content, that, 0);
+ }
+ },
+
+
+ // 拨打电话事件
+ phoneOn() {
+ let that = this;
+ wx.makePhoneCall({
+ phoneNumber: that.data.contact_tel, //此号码仅用于测试
+ success: function () {
+ console.log("拨打电话成功!")
+ },
+ fail: function () {
+ console.log("拨打电话失败!")
+ }
+ })
+ },
+
+ /**
+ * 生命周期函数--监听页面初次渲染完成
+ */
+ onReady() {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面显示
+ */
+ onShow() {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面隐藏
+ */
+ onHide() {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面卸载
+ */
+ onUnload() {
+
+ },
+
+ /**
+ * 页面相关事件处理函数--监听用户下拉动作
+ */
+ onPullDownRefresh() {
+
+ },
+
+ /**
+ * 页面上拉触底事件的处理函数
+ */
+ onReachBottom() {
+
+ },
+
+ /**
+ * 用户点击右上角分享
+ */
+ onShareAppMessage() {
+
+ }
+})
\ No newline at end of file
diff --git a/pages/about/about.json b/pages/about/about.json
new file mode 100644
index 0000000..656712d
--- /dev/null
+++ b/pages/about/about.json
@@ -0,0 +1,6 @@
+{
+ "usingComponents": {
+ "list-nav-bar": "/components/list-nav-bar/list-nav-bar"
+
+ }
+}
\ No newline at end of file
diff --git a/pages/about/about.wxml b/pages/about/about.wxml
new file mode 100644
index 0000000..bf47a3a
--- /dev/null
+++ b/pages/about/about.wxml
@@ -0,0 +1,23 @@
+
+
+
+
+
+
+ {{contact_title}}
+ {{date}}
+
+
+
+
+
+ 地址:{{contact_address}}
+ 电话:{{contact_tel}}
+ 邮编:{{contact_post_code}}
+ 邮箱:{{contact_email}}
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/about/about.wxss b/pages/about/about.wxss
new file mode 100644
index 0000000..ff9c989
--- /dev/null
+++ b/pages/about/about.wxss
@@ -0,0 +1,66 @@
+@import "../../wxParse/wxParse.wxss";
+
+page {
+ height: 100vh;
+ display: flex;
+ flex-direction: column;
+ background: #ffffff;
+ min-height: 100vh;
+}
+
+.container{
+ margin-top: 45rpx;
+ margin-bottom: 120rpx;
+ /* margin-left: 30rpx;
+ margin-right: 30rpx; */
+}
+
+
+
+.title {
+ border-bottom: 2rpx solid #e9e9e9;
+ /* padding-bottom: 30rpx; */
+ padding-left: 30rpx;
+ padding-right: 30rpx;
+ font-size: 36rpx;
+ text-align: center;
+ /* margin-bottom: 20rpx; */
+}
+
+.date {
+ font-size: 24rpx;
+ color: #737373;
+ margin-top: 30rpx;
+}
+
+
+.content {
+ margin-top: 30rpx;
+ margin-left: 30rpx;
+ margin-right: 30rpx;
+
+}
+.text {
+ /* margin-top: 16px; */
+ font-size: 28rpx;
+ line-height: 55rpx;
+ color: #333;
+}
+.text-list {
+ /* margin-top: 16px; */
+ font-size: 28rpx;
+ line-height: 55rpx;
+ color: #333;
+}
+
+
+.btn-view {
+ box-shadow: 0 -5px 5px -5px rgba(0, 0, 0, 0.2);
+ width: 100%;
+ padding: 20rpx 0;
+ background-color: #fff;
+ position: fixed;
+ bottom: 0;
+ left: 0;
+ }
+
diff --git a/pages/details/details.js b/pages/details/details.js
index 001fc93..72e5469 100644
--- a/pages/details/details.js
+++ b/pages/details/details.js
@@ -109,7 +109,7 @@ Page({
showMenu: true,
success: function (res) {
console.log('打开成功');
- util.hideLoading()
+ ui.hideLoading()
}
})
},
diff --git a/pages/index/index.js b/pages/index/index.js
index bcad43c..d3a105f 100644
--- a/pages/index/index.js
+++ b/pages/index/index.js
@@ -3,121 +3,147 @@ const request = require('../../utils/request')
const ui = require('../../utils/ui')
Page({
- data: {
- codes: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16],
- codes_current_page: 1,
- codes_has_prev: false,
- codes_has_next: false,
+ data: {
+ codes: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16],
+ codes_current_page: 1,
+ codes_has_prev: false,
+ codes_has_next: false,
- codes_total_count: 0,
- codes_total_pages: 0,
- categorys: []
- },
+ codes_total_count: 0,
+ codes_total_pages: 0,
+ categorys: []
+ },
- /**
- * 生命周期函数--监听页面加载
- */
- onLoad(options) {
- //获取接口数据
+ /**
+ * 生命周期函数--监听页面加载
+ */
+ onLoad(options) {
+ //获取接口数据
- let that = this;
- that.GetCodes()
- that.GetIndexList()
- },
+ let that = this;
+ that.GetCodes()
+ that.GetIndexList()
+ that.GetLabelList()
+ },
+
+ GetLabelList() {
+ let that = this;
+ request.request({
+ method: "GET",
+ // https://app.19year.cn/api.php/doc/details?id=51
+ url: "/api.php/doc/label_list"
+ }).then(res => {
+ if (res.data.code === 1) {
+ let list = res.data.data.data
+ for(let j = 0, len=list.length; j < len; j++) {
+ that.setData({[`${list[j].name}`]:list[j].value})
+ }
+ // that.initContent()
+ }
+ }).catch(err => {
+ console.log('ERROR', err)
+ });
+ },
+
+ GetIndexList() {
+ let that = this;
+ request.request({
+ method: "GET",
+ url: "/api.php/doc/index_category"
+ }).then(res => {
+ if (res.data.code === 1) {
+ console.log(res.data.data);
+ that.setData({
+ categorys: res.data.data.data
+ })
+ }
+ // ui.showToast(res.data.errorMsg)
+ }).catch(err => {
+ console.log('ERROR')
+ });
+ },
- GetIndexList() {
- let that = this;
- request.request({
- method: "GET",
- url: "/api.php/doc/index_category"
- }).then(res => {
- if (res.data.code === 1) {
- console.log(res.data.data);
- that.setData({
- categorys: res.data.data.data
- })
- }
- // ui.showToast(res.data.errorMsg)
- }).catch(err => {
- console.log('ERROR')
- });
- },
+ codesPrev() {
+ let that = this;
+ console.log(that.data.codes_has_prev);
+ if (that.data.codes_has_prev) {
+ console.log("shang");
+ that.setData({
+ codes_current_page: that.data.codes_current_page - 1
+ })
+ that.GetCodes()
+ console.log("shang");
+ }
+ },
+ codesNext() {
+ let that = this;
+ if (that.data.codes_has_next) {
+ that.setData({
+ codes_current_page: that.data.codes_current_page + 1
+ })
+ that.GetCodes()
+ console.log("xia");
+ }
+ },
+ GetCodes() {
+ let that = this;
+ request.request({
+ method: "GET",
+ url: "/api.php/doc/index_codes?page=" + that.data.codes_current_page + "&pageSize=16"
+ }).then(res => {
+ if (res.data.code === 1) {
+ that.setData({
+ codes: res.data.data.data,
+ codes_current_page: res.data.data.current_page,
+ codes_has_next: res.data.data.has_next,
+ codes_has_prev: res.data.data.has_prev,
+ codes_total_count: res.data.data.total_count,
+ codes_total_pages: res.data.data.total_pages,
+ })
+ }
+ // ui.showToast(res.data.errorMsg)
+ }).catch(err => {
+ console.log('ERROR')
+ });
+ },
+ // 页面跳转
+ jumpPage(e) {
+ let jumpType = e.currentTarget.dataset.jumptype;
+ // 文章id
+ let aid = e.currentTarget.dataset.aid;
+ // 类目id
+ let cid = e.currentTarget.dataset.cid;
+ console.log(jumpType == 1);
+ console.log(aid);
+ console.log(cid);
+ // 类目
+ if (jumpType == 1 && cid) {
+ wx.navigateTo({
+ url: "/pages/list/list?cid=" + cid
+ })
+ }
+ if (jumpType == 2 && aid) {
+ wx.navigateTo({
+ url: "/pages/details/details?aid=" + aid
+ })
+ }
+ // 搜索页面
+ if (jumpType == 3) {
+ wx.navigateTo({
+ url: "/pages/search/index"
+ })
+ }
-
- codesPrev() {
- let that = this;
- console.log(that.data.codes_has_prev);
- if (that.data.codes_has_prev) {
- console.log("shang");
- that.setData({
- codes_current_page: that.data.codes_current_page - 1
- })
- that.GetCodes()
- console.log("shang");
+ // 搜索页面
+ if (jumpType == 4) {
+ wx.navigateTo({
+ url: "/pages/about/about"
+ })
+ }
+ },
+ bindFocus(e) {
+ console.log(e);
}
- },
- codesNext() {
- let that = this;
- if (that.data.codes_has_next) {
- that.setData({
- codes_current_page: that.data.codes_current_page + 1
- })
- that.GetCodes()
- console.log("xia");
- }
- },
- GetCodes() {
- let that = this;
- request.request({
- method: "GET",
- url: "/api.php/doc/index_codes?page=" + that.data.codes_current_page + "&pageSize=16"
- }).then(res => {
- if (res.data.code === 1) {
- that.setData({
- codes: res.data.data.data,
- codes_current_page: res.data.data.current_page,
- codes_has_next: res.data.data.has_next,
- codes_has_prev: res.data.data.has_prev,
- codes_total_count: res.data.data.total_count,
- codes_total_pages: res.data.data.total_pages,
- })
- }
- // ui.showToast(res.data.errorMsg)
- }).catch(err => {
- console.log('ERROR')
- });
- },
- // 页面跳转
- jumpPage(e) {
- let jumpType = e.currentTarget.dataset.jumptype;
- // 文章id
- let aid = e.currentTarget.dataset.aid;
- // 类目id
- let cid = e.currentTarget.dataset.cid;
- console.log(jumpType == 1);
- console.log(aid);
- console.log(cid);
- // 类目
- if (jumpType == 1 && cid) {
- wx.navigateTo({
- url: "/pages/list/list?cid=" + cid
- })
- }
- if (jumpType == 2 && aid) {
- wx.navigateTo({
- url: "/pages/details/details?aid=" + aid
- })
- }
- // 搜索页面
- if (jumpType == 3) {
- wx.navigateTo({
- url: "/pages/search/index"
- })
- }
- },
- bindFocus(e) {
- console.log(e);
- }
})
\ No newline at end of file
diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index 5f56fd5..99af73c 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -130,35 +130,18 @@
-->
-
+
+ {{index_copyright}}
\ No newline at end of file
diff --git a/pages/index/index.wxss b/pages/index/index.wxss
index c9ebe9f..241d68c 100644
--- a/pages/index/index.wxss
+++ b/pages/index/index.wxss
@@ -104,7 +104,7 @@ page {
align-items: center;
justify-content: center;
line-height: 65rpx;
- font-family: YouSheBiaoTiHei-1;
+ font-family: YouSheBiaoTiHei-3;
font-size: 36rpx;
color: #3c8af6;
}
@@ -196,7 +196,7 @@ page {
padding-right: 25rpx;
padding-top: 5rpx; */
padding:5rpx 25rpx 0 25rpx;
- font-family: YouSheBiaoTiHei-1;
+ font-family: YouSheBiaoTiHei-3;
text-align: center;
font-size: 36rpx;
color: #3c8af6;
@@ -263,7 +263,7 @@ page {
width: 12rpx;
height: 12rpx;
- background-color: #3c8bf6;; /* 蓝色圆点 */
+ background-color: #3c8bf6; /* 蓝色圆点 */
border-radius: 50%;
margin-right: 15rpx;
}
@@ -279,6 +279,7 @@ page {
}
.copyright {
+ color: #3c8af6;
margin-bottom: 60rpx;
text-align: center;
}
\ No newline at end of file