diff --git a/app.js b/app.js
index 5212ad6..4fce025 100644
--- a/app.js
+++ b/app.js
@@ -67,16 +67,17 @@ App({
console.log(envVersion)
if (envVersion === 'develop') {
console.log('当前是开发环境');
- // baseUrl = "https://test.renminshitang.com.cn/zhuchangtong/api_dev"
that.globalData.ip = 'https://test.renminshitang.com.cn/daotian/api_dev'
- // that.globalData.ip = 'https://daotian.matripe.com.cn'
+ that.globalData.agencyId = '2743'
// that.globalData.ip = 'https://daotian.matripe.com.cn'
} else if (envVersion === 'trial') {
console.log('当前是体验环境');
that.globalData.ip = "https://test.renminshitang.com.cn/daotian/api_dev"
+ that.globalData.agencyId = '2743'
} else if (envVersion === 'release') {
console.log('当前是正式环境');
that.globalData.ip = 'https://daotian.matripe.com.cn'
+ that.globalData.agencyId = '3087'
// baseUrl = "https://test.renminshitang.com.cn/zhuchangtong/api_dev"
}
diff --git a/app.json b/app.json
index f2c4308..7992b68 100644
--- a/app.json
+++ b/app.json
@@ -2,6 +2,7 @@
"pages": [
"pages/index/index",
"pages/hotList/index",
+ "pages/empty/index",
"pages/jobListSearch/index",
"pages/city/index",
"pages/detail/index",
diff --git a/pages/company/company/index.js b/pages/company/company/index.js
index a84fc97..cef7bd5 100644
--- a/pages/company/company/index.js
+++ b/pages/company/company/index.js
@@ -8,7 +8,8 @@ Page({
*/
data: {
storeInfo: {},
- infoList:[]
+ infoList:[],
+ agencyId:app.globalData.agencyId
},
/**
@@ -55,7 +56,7 @@ Page({
let that = this
wx.request({
url: app.globalData.ip + "/yishoudan/agency/store/list",
- data: { pageSize: 100, pageNum: 1, keys: "",agencyId:2743},
+ data: { pageSize: 100, pageNum: 1, keys: "",agencyId:that.data.agencyId},
header: app.globalData.headers,
method: "post",
success: function (res) {
diff --git a/pages/company/company/index.wxml b/pages/company/company/index.wxml
index cdc38f5..8e0a252 100644
--- a/pages/company/company/index.wxml
+++ b/pages/company/company/index.wxml
@@ -1,7 +1,6 @@
-
-
+
@@ -23,50 +22,11 @@
-
diff --git a/pages/company/companyDetail/index.json b/pages/company/companyDetail/index.json
index 743872e..30d79c2 100644
--- a/pages/company/companyDetail/index.json
+++ b/pages/company/companyDetail/index.json
@@ -2,5 +2,5 @@
"navigationBarBackgroundColor":"#0dcc91",
"navigationBarTextStyle":"white",
"backgroundColor": "#FFFFFF",
- "navigationBarTitleText": "一才工作"
+ "navigationBarTitleText": "网点介绍"
}
\ No newline at end of file
diff --git a/pages/empty/index.js b/pages/empty/index.js
new file mode 100644
index 0000000..42677c2
--- /dev/null
+++ b/pages/empty/index.js
@@ -0,0 +1,66 @@
+// pages/empty/index.js
+Page({
+
+ /**
+ * 页面的初始数据
+ */
+ data: {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面加载
+ */
+ onLoad(options) {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面初次渲染完成
+ */
+ onReady() {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面显示
+ */
+ onShow() {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面隐藏
+ */
+ onHide() {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面卸载
+ */
+ onUnload() {
+
+ },
+
+ /**
+ * 页面相关事件处理函数--监听用户下拉动作
+ */
+ onPullDownRefresh() {
+
+ },
+
+ /**
+ * 页面上拉触底事件的处理函数
+ */
+ onReachBottom() {
+
+ },
+
+ /**
+ * 用户点击右上角分享
+ */
+ onShareAppMessage() {
+
+ }
+})
\ No newline at end of file
diff --git a/pages/empty/index.json b/pages/empty/index.json
new file mode 100644
index 0000000..9a4462a
--- /dev/null
+++ b/pages/empty/index.json
@@ -0,0 +1,6 @@
+{
+ "navigationBarTitleText": "暂无数据",
+ "navigationBarBackgroundColor": "#0dcc91",
+ "navigationBarTextStyle": "white",
+ "backgroundColor": "#f5f5f5"
+}
\ No newline at end of file
diff --git a/pages/empty/index.wxml b/pages/empty/index.wxml
new file mode 100644
index 0000000..f9c83ab
--- /dev/null
+++ b/pages/empty/index.wxml
@@ -0,0 +1,4 @@
+
+
+ 暂无数据
+
\ No newline at end of file
diff --git a/pages/empty/index.wxss b/pages/empty/index.wxss
new file mode 100644
index 0000000..f8092be
--- /dev/null
+++ b/pages/empty/index.wxss
@@ -0,0 +1 @@
+/* pages/empty/index.wxss */
\ No newline at end of file
diff --git a/pages/index/index.js b/pages/index/index.js
index 6056534..e382987 100644
--- a/pages/index/index.js
+++ b/pages/index/index.js
@@ -441,32 +441,39 @@ Page({
watch () { },
witchNav (e) {
console.log(e);
- if (!this.data.isLogin) {
- wx.navigateTo({
- url: "/pages/login/index",
- });
- return;
- }
- if (e.currentTarget.dataset.title == "成为代理") {
- console.log("成为代理");
- if (app.globalData.loginUserInfo.agencyStatus == 1) {
- wx.showToast({
- title: "您已经是代理了",
- icon: "none",
- duration: 2000,
- });
- return;
- }
- } else if (e.currentTarget.dataset.title == "主推/热推") {
- wx.navigateTo({
- url: e.currentTarget.dataset.url + "?listtype=" + this.data.toped,
- });
- return;
- }
-
wx.navigateTo({
- url: e.currentTarget.dataset.url,
- });
+ url: '../empty/index',
+ })
+ // wx.showToast({
+ // title: '敬请期待...',
+ // icon:'none'
+ // })
+ // if (!this.data.isLogin) {
+ // wx.navigateTo({
+ // url: "/pages/login/index",
+ // });
+ // return;
+ // }
+ // if (e.currentTarget.dataset.title == "成为代理") {
+ // console.log("成为代理");
+ // if (app.globalData.loginUserInfo.agencyStatus == 1) {
+ // wx.showToast({
+ // title: "您已经是代理了",
+ // icon: "none",
+ // duration: 2000,
+ // });
+ // return;
+ // }
+ // } else if (e.currentTarget.dataset.title == "主推/热推") {
+ // wx.navigateTo({
+ // url: e.currentTarget.dataset.url + "?listtype=" + this.data.toped,
+ // });
+ // return;
+ // }
+
+ // wx.navigateTo({
+ // url: e.currentTarget.dataset.url,
+ // });
},
toHot (e) {
if (e.currentTarget.dataset.path) {
diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index b37aa16..49d154c 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -37,37 +37,29 @@
-
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+ {{item.title}}
- {{item.title}}
-
-
-
+
-
+
-
+
+
-
-
+
立即报名
@@ -476,4 +470,4 @@
-
+
\ No newline at end of file
diff --git a/pages/index/index.wxss b/pages/index/index.wxss
index cf85024..e35718b 100644
--- a/pages/index/index.wxss
+++ b/pages/index/index.wxss
@@ -1401,7 +1401,7 @@ button.collect icon::before {
.bannerContainer {
background-color: #f5f5f5;
padding-top: 10px;
- margin-bottom: 12px;
+ margin-bottom: 10px;
}
.banner {
width: calc(100vw - 20px);
diff --git a/pages/jobListSearch/index.wxml b/pages/jobListSearch/index.wxml
index 89911db..3af9582 100644
--- a/pages/jobListSearch/index.wxml
+++ b/pages/jobListSearch/index.wxml
@@ -253,9 +253,9 @@
-
+
-
+
@@ -296,7 +296,7 @@
{{item1}}
暂无特色
-
+
立即报名
diff --git a/pages/message/index.js b/pages/message/index.js
index 47972f7..974443f 100644
--- a/pages/message/index.js
+++ b/pages/message/index.js
@@ -12,7 +12,7 @@ Page({
isLoading: true,
messageClick: false,
infoList: [],
- agencyId: app.globalData.user.agencyId
+ agencyId: app.globalData.agencyId
},
/**
@@ -22,7 +22,6 @@ Page({
this.setData({
messageClick: wx.getStorageSync("messageClick" + app.globalData.loginUserInfo.id),
});
- console.log(this.data.messageClick);
},
/**
@@ -110,7 +109,7 @@ Page({
let that = this;
wx.request({
url: app.globalData.ip + "/yicai/bocai/cms/list",
- data: { pageSize: 100, pageNum: 1, keys: "",agencyId:2743,status:10 },
+ data: { pageSize: 100, pageNum: 1, keys: "",agencyId:that.data.agencyId,status:10 },
header: app.globalData.headers,
method: "post",
success: function (res) {
diff --git a/pages/message/index.wxml b/pages/message/index.wxml
index 1a34f07..30e501f 100644
--- a/pages/message/index.wxml
+++ b/pages/message/index.wxml
@@ -70,7 +70,7 @@
{{item.remark || '[图片]'}}
-
+
暂无消息