diff --git a/pages/index/index.js b/pages/index/index.js
index 366f11d..bcad43c 100644
--- a/pages/index/index.js
+++ b/pages/index/index.js
@@ -1,60 +1,123 @@
// index.js
+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],
- faq: [{
- title: '超出焊接时间',
- date: '08.04 00:48'
- },
- {
- title: '时间超长',
- date: '08.04 00:48'
- },
- {
- title: '常见问题常见问题',
- date: '08.04 00:48'
- }
- ],
- knowledge: [{
- title: '超出焊接时间',
- date: '08.04 00:48'
- },
- {
- title: '时间超长',
- date: '08.04 00:48'
- },
- {
- title: '常见问题常见问题',
- date: '08.04 00:48'
- }
- ]
- },
+ 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,
- // 页面跳转
- jumpPage(e) {
- let jumpType = e.currentTarget.dataset.jumptype;
- console.log(jumpType == 1);
- if(jumpType == 1){
- wx.navigateTo({
- url: "/pages/list/list?id=1"
- })
- }
- if(jumpType == 2){
- wx.navigateTo({
- url: "/pages/list/list?id=1"
- })
- }
- if(jumpType == 3){
- wx.navigateTo({
- url: "/pages/search/index"
- })
- }
- // wx.navigateTo({
- // url: this.data.category[index].url
- // })
- },
- bindFocus(e){
- console.log(e);
+ codes_total_count: 0,
+ codes_total_pages: 0,
+ categorys: []
+ },
+
+
+ /**
+ * 生命周期函数--监听页面加载
+ */
+ onLoad(options) {
+ //获取接口数据
+
+ let that = this;
+ that.GetCodes()
+ that.GetIndexList()
+ },
+
+
+ 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"
+ })
+ }
+ },
+ bindFocus(e) {
+ console.log(e);
+ }
})
\ No newline at end of file
diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index 54a5a6a..5f862a7 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -1,66 +1,78 @@
-
-
-
-
-
-
- 请输入故障代码或关键词
-
-
-
+
+
+
+
+
+
+ 请输入故障代码或关键词
+
+
+
-
-
-
- 故障码快速查询
-
-
- {{item}}
-
-
-
-
+
+
+
+ 故障码快速查询
+
+
+ {{item.code}}
+
+
+
+
-
+
+
-
-
-
-
- 超出焊接时间
- 08.04 00:48
-
-
-
- 超出焊接时间
- 08.04 00:48
-
-
-
- 超出焊接时间
- 08.04 00:48
-
+
+
-
+
+
+
+ {{itemArt.title}}
+ {{itemArt.date}}
+
+
+
-
+
+
+
+
+
+
+
-
+
-
- iuu by © 2017-2024版权所有
-
+ iuu by © 2017-2024版权所有
+
\ No newline at end of file
diff --git a/pages/list/list.js b/pages/list/list.js
index e122232..91b844c 100644
--- a/pages/list/list.js
+++ b/pages/list/list.js
@@ -1,82 +1,181 @@
// pages/list/list.js
+const request = require('../../utils/request')
+const ui = require('../../utils/ui')
Page({
- /**
- * 页面的初始数据
- */
- data: {
-
- },
+ /**
+ * 页面的初始数据
+ */
+ data: {
+ categoryName: "",
+ categoryId: 0,
+ total_count: 0,
+ total_pages: 0,
+ has_next: false,
+ has_next: false,
+ current_page: 1,
+ list: []
+ },
- jumpPage(e) {
-
- let jumpType = e.currentTarget.dataset.jumptype;
- console.log(jumpType == 2);
- if (jumpType == 2) {
- wx.navigateTo({
- url: "/pages/details/details?id=1"
- })
- }
- // wx.navigateTo({
- // url: this.data.category[index].url
- // })
- },
- /**
- * 生命周期函数--监听页面加载
- */
- onLoad(options) {
-
- },
-
- /**
- * 生命周期函数--监听页面初次渲染完成
- */
- onReady() {
-
- },
-
- /**
- * 生命周期函数--监听页面显示
- */
- onShow() {
-
- },
-
- /**
- * 生命周期函数--监听页面隐藏
- */
- onHide() {
-
- },
-
- /**
- * 生命周期函数--监听页面卸载
- */
- onUnload() {
-
- },
-
- /**
- * 页面相关事件处理函数--监听用户下拉动作
- */
- onPullDownRefresh() {
-
- },
-
- /**
- * 页面上拉触底事件的处理函数
- */
- onReachBottom() {
-
- },
-
- /**
- * 用户点击右上角分享
- */
- onShareAppMessage() {
-
+ /**
+ * 生命周期函数--监听页面加载
+ */
+ onLoad(options) {
+ let that = this;
+ if (!options.cid) {
+ wx.navigateBack()
+ this.triggerEvent('onBack')
}
+ that.setData({
+ categoryId: options.cid
+ })
+ that.GetCategoryInfo()
+ that.GetList()
+ },
+
+
+ GetCategoryInfo() {
+ let that = this;
+ request.request({
+ method: "GET",
+ url: "/api.php/doc/category_info?cid=" + that.data.categoryId
+ }).then(res => {
+ if (res.data.code === 1) {
+ that.setData({
+ categoryName: res.data.data.data.name,
+ categoryId: res.data.data.data.scode,
+ })
+ }
+ }).catch(err => {
+ console.log('ERROR')
+ });
+ },
+ GetList() {
+ let that = this;
+ request.request({
+ method: "GET",
+ url: "/api.php/doc/list?cid=" + that.data.categoryId + "&pageSize=16"
+ }).then(res => {
+ if (res.data.code === 1) {
+ that.setData({
+ list: res.data.data.data,
+ current_page: res.data.data.current_page,
+ has_next: res.data.data.has_next,
+ has_prev: res.data.data.has_prev,
+ total_count: res.data.data.total_count,
+ 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;
+ console.log(jumpType == 2);
+ if (jumpType == 2) {
+ wx.navigateTo({
+ url: "/pages/details/details?id=1"
+ })
+ }
+ },
+
+
+ /**
+ * 页面上拉触底事件的处理函数
+ */
+ onReachBottom() {
+console.log(111);
+ // if (this.data.has_next) {
+ // that.setData({
+ // current_page: this.current_page + 1
+ // })
+ // //加载下一页
+ // this.GetList();
+ // } else {
+ // ui.showToast({
+ // icon: "none",
+ // title: '没有更多数据了'
+ // })
+ // }
+ },
+
+ loadData: function () {
+ wx.request({
+ url: 'http://test.com', //假的后台接口
+ method: 'POST',
+ data: {
+ pageSize: this.pageSize,
+ pageNum: this.pageNum,
+ },
+ success: function (res) {
+ this.pageNum = res.data.content.pageNum;
+ this.totalPage = res.data.content.totalPageNum;
+ this.resultData = res.data.content.rows;
+ },
+ fail: function (res) {
+
+ }
+ })
+ },
+
+
+
+
+
+
+ /**
+ * 生命周期函数--监听页面初次渲染完成
+ */
+ onReady() {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面显示
+ */
+ onShow() {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面隐藏
+ */
+ onHide() {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面卸载
+ */
+ onUnload() {
+
+ },
+
+ /**
+ * 页面相关事件处理函数--监听用户下拉动作
+ */
+ onPullDownRefresh() {
+
+ },
+
+ /**
+ * 页面上拉触底事件的处理函数
+ */
+ onReachBottom() {
+
+ },
+
+ /**
+ * 用户点击右上角分享
+ */
+ onShareAppMessage() {
+
+ }
})
\ No newline at end of file
diff --git a/pages/list/list.wxml b/pages/list/list.wxml
index 5e290e0..96f9424 100644
--- a/pages/list/list.wxml
+++ b/pages/list/list.wxml
@@ -1,144 +1,14 @@
-
-
+
+
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -146,5 +16,7 @@
+
+
\ No newline at end of file
diff --git a/pages/search/index.wxml b/pages/search/index.wxml
index 3c7e4f5..bcdc081 100644
--- a/pages/search/index.wxml
+++ b/pages/search/index.wxml
@@ -1,4 +1,4 @@
-
+
@@ -7,7 +7,7 @@
-
+
diff --git a/project.private.config.json b/project.private.config.json
index f3f9cb5..e2057ac 100644
--- a/project.private.config.json
+++ b/project.private.config.json
@@ -5,5 +5,5 @@
"compileHotReLoad": true,
"skylineRenderEnable": true
},
- "libVersion": "3.5.3"
+ "libVersion": "3.5.4"
}
\ No newline at end of file
diff --git a/utils/request.js b/utils/request.js
new file mode 100644
index 0000000..7e45547
--- /dev/null
+++ b/utils/request.js
@@ -0,0 +1,89 @@
+const ui = require('./ui');
+const BASE_URL = 'https://app.19year.cn'
+
+
+/**
+ * 网络请求request
+ * obj.data 请求接口需要传递的数据
+ * obj.showLoading 控制是否显示加载Loading 默认为false不显示
+ * obj.contentType 默认为 application/json
+ * obj.method 请求的方法 默认为GET
+ * obj.url 请求的接口路径
+ * obj.message 加载数据提示语
+ */
+function request(obj) {
+ return new Promise(function(resolve, reject) {
+ if(obj.showLoading){
+ ui.showLoading(obj.message? obj.message : '加载中...');
+ }
+ var data = {};
+ if(obj.data) {
+ data = obj.data;
+ }
+ var contentType = 'application/json';
+ if(obj.contentType){
+ contentType = obj.contentType;
+ }
+
+ var method = 'GET';
+ if(obj.method){
+ method = obj.method;
+ }
+
+ wx.request({
+ url: BASE_URL + obj.url,
+ data: data,
+ method: method,
+ //添加请求头
+ header: {
+ 'Content-Type': contentType ,
+ 'token': wx.getStorageSync('token') //获取保存的token
+ },
+ //请求成功
+ success: function(res) {
+ console.log('===============================================================================================')
+ console.log('== 接口地址：' + obj.url);
+ console.log('== 接口参数：' + JSON.stringify(data));
+ console.log('== 请求类型：' + method);
+ console.log("== 接口状态：" + res.statusCode);
+ console.log("== 接口数据：" + JSON.stringify(res.data));
+ console.log('===============================================================================================')
+ if (res.statusCode == 200) {
+ resolve(res);
+ } else if (res.statusCode == 401) {//授权失效
+ reject("登录已过期");
+ jumpToLogin();//跳转到登录页
+ } else {
+ //请求失败
+ reject("请求失败：" + res.statusCode)
+ }
+ },
+ fail: function(err) {
+ //服务器连接异常
+ console.log('===============================================================================================')
+ console.log('== 接口地址：' + url)
+ console.log('== 接口参数：' + JSON.stringify(data))
+ console.log('== 请求类型：' + method)
+ console.log("== 服务器连接异常")
+ console.log('===============================================================================================')
+ reject("服务器连接异常，请检查网络再试");
+ },
+ complete: function() {
+ ui.hideLoading();
+ }
+ })
+ });
+ }
+
+
+ //跳转到登录页
+ function jumpToLogin(){
+ wx.reLaunch({
+ url: '/pages/login/login',
+ })
+ }
+
+ module.exports = {
+ request,
+ }
+
diff --git a/utils/ui.js b/utils/ui.js
new file mode 100644
index 0000000..39d3cbf
--- /dev/null
+++ b/utils/ui.js
@@ -0,0 +1,26 @@
+export const showToast = function(content,duration) {
+ if(!duration) duration = 2000
+ wx.showToast({
+ title: content,
+ icon: 'none',
+ duration: duration,
+ })
+}
+
+var isShowLoading = false
+export const showLoading = function(title) {
+ if(isShowLoading) return
+ wx.showLoading({
+ title: title?title:'',
+ mask:true,
+ success:()=>{
+ isShowLoading = true
+ }
+ })
+}
+
+export const hideLoading = function() {
+ if(!isShowLoading) return
+ isShowLoading = false
+ wx.hideLoading()
+}
\ No newline at end of file