diff --git a/components/job-sub/index.js b/components/job-sub/index.js
index 556dff7..40b6812 100644
--- a/components/job-sub/index.js
+++ b/components/job-sub/index.js
@@ -45,11 +45,14 @@ Component({
},
lifetimes: {
attached: function () {
- app.getLoginUserTokenInfo().then(() => {
- this.setData({
- corpUserFlag: this.properties.loginUserInfo.corpUserFlag
- })
- });
+ console.log('wx.getStorageSync)', wx.getStorageSync('loginUser'));
+ let loginUserInfo = wx.getStorageSync('loginUser')
+ // app.getLoginUserTokenInfo().then(() => {
+ this.setData({
+ corpUserFlag: loginUserInfo.corpUserFlag,
+ agencyStatus: loginUserInfo.agencyStatus,
+ })
+ // });
// 在组件实例进入页面节点树时执行
},
diff --git a/components/job-sub/index.wxml b/components/job-sub/index.wxml
index 85c08c1..3d94c2d 100644
--- a/components/job-sub/index.wxml
+++ b/components/job-sub/index.wxml
@@ -76,7 +76,7 @@
登录查看
- {{(agencyStatus == 1 ? (item.fuWuFei ? item.fuWuFei : '详询客服') : '仅代理可见') }}
+ {{(agencyStatus == 1 ? (item.fuWuFei || '详询客服') : '仅代理可见') }}
diff --git a/pages/firstBill/index.js b/pages/firstBill/index.js
index dac0f9a..754dc3e 100644
--- a/pages/firstBill/index.js
+++ b/pages/firstBill/index.js
@@ -91,7 +91,6 @@ Page({
chaShowed: false,
isTrigger: false,
// background: ["../../assets/images/banner1.jpg", "../../assets/images/banner2.jpg", "../../assets/images/banner3.jpg", "../../assets/images/banner4.jpg"],
- pullNum: 0, //下拉次数
tabs: [],
activeTab: 0,
systemInfo: {},
@@ -2917,8 +2916,11 @@ Page({
console.log("====================================================");
var that = this;
if (app.globalData.isLogin) {
- that.data.storeJobListSearchForm.pageNum =
- that.data.storeJobListSearchForm.pageNum + 1;
+ that.data.storeJobListSearchForm.pageNum = that.data.storeJobListSearchForm.pageNum + 1;
+ that.setData({
+ recordList: [],
+ // loading:true
+ });
if (that.data.hasMoreData) {
that.getJobList();
}
@@ -2928,13 +2930,7 @@ Page({
loadMore: "load",
// loading:true
});
- } else {
- // if (that.data.pullNum == 0) {
- // that.openIOS1();
- // }
}
-
- that.data.pullNum = that.data.pullNum + 1;
},
handleTabClick (e) {
diff --git a/pages/firstBill/index.wxml b/pages/firstBill/index.wxml
index b8ee45b..f1c3a15 100644
--- a/pages/firstBill/index.wxml
+++ b/pages/firstBill/index.wxml
@@ -410,7 +410,7 @@
-->
-
+
-
-
-
diff --git a/pages/userDetail/index.wxml b/pages/userDetail/index.wxml
index c31a743..a4fdc26 100644
--- a/pages/userDetail/index.wxml
+++ b/pages/userDetail/index.wxml
@@ -83,21 +83,20 @@
-
-
-
-
-
- 当前团队
-
+
+
+
+
+
+ 当前团队
-
+
- {{userInfo.agencyName || '-'}}
+ {{userInfo.agencyName || '-'}}
-
+
diff --git a/pages/userDetail/index.wxss b/pages/userDetail/index.wxss
index e0b046d..ed02862 100644
--- a/pages/userDetail/index.wxss
+++ b/pages/userDetail/index.wxss
@@ -1,4 +1,3 @@
-@import '../mine/index.wxss';
.container {
padding: 10px;
}
@@ -79,4 +78,7 @@
}
.c0{
color: #000;
+}
+.setting{
+ padding: 0 9px;
}
\ No newline at end of file
diff --git a/pages/workBench/index.wxml b/pages/workBench/index.wxml
index f804b1c..e587cca 100644
--- a/pages/workBench/index.wxml
+++ b/pages/workBench/index.wxml
@@ -141,7 +141,8 @@
-->
-
+
+
@@ -168,7 +169,8 @@
-
+
+
今日数据
@@ -236,14 +238,14 @@
-
+
diff --git a/project.config.json b/project.config.json
index 577cad2..858bc26 100644
--- a/project.config.json
+++ b/project.config.json
@@ -44,7 +44,7 @@
"tabIndent": "insertSpaces",
"tabSize": 2
},
- "appid": "wxe431e0b3abd9ae0b",
+ "appid": "wxb0dea4d11428c6a5",
"packOptions": {
"ignore": [],
"include": []
diff --git a/subPage/todayBill/index.wxml b/subPage/todayBill/index.wxml
index 372105f..1ebe201 100644
--- a/subPage/todayBill/index.wxml
+++ b/subPage/todayBill/index.wxml
@@ -25,7 +25,7 @@
-
+
暂未发单