diff --git a/yanzhu-ui-app/miniprogram/config.js b/yanzhu-ui-app/miniprogram/config.js
index bc78aeeb..9e5b4bf2 100644
--- a/yanzhu-ui-app/miniprogram/config.js
+++ b/yanzhu-ui-app/miniprogram/config.js
@@ -2,10 +2,9 @@
module.exports = {
timeout: 60000,
appId: "wx46466c7828eede2b",
- baseUrl: 'https://xiangguan.sxyanzhu.com',
+ baseUrl: 'https://xiangguan.sxyanzhu.com/wechat',
//baseUrl: 'http://127.0.0.1:8080',
- baseImgUrl: 'https://xiangguan.sxyanzhu.com',
- //baseImgUrl: 'https:xiangguan.sxyanzhu.com/file',
+ baseImgUrl: 'https://xiangguan.sxyanzhu.com/wechat',
//baseImgUrl: 'http://127.0.0.1:9300',
noSecuritys:['/code','/auth/wxLogin','/auth/getMaOpenId','/auth/getMaPhoneNumber','/auth/maLogin']
};
\ No newline at end of file
diff --git a/yanzhu-ui-app/miniprogram/pageage/project_info/index.js b/yanzhu-ui-app/miniprogram/pageage/project_info/index.js
index febd301d..dcdce438 100644
--- a/yanzhu-ui-app/miniprogram/pageage/project_info/index.js
+++ b/yanzhu-ui-app/miniprogram/pageage/project_info/index.js
@@ -472,11 +472,13 @@ Page({
// 页签选中事件
selectedTab(e) {
- this.setData({
- nactive: e.target.dataset.set,
- labourImg: this.data.labourTypeList[e.target.dataset.set].img,
- })
- this.initSubDeptUsersCharts();
+ if(e.target.dataset.set!==undefined){
+ this.setData({
+ nactive: e.target.dataset.set,
+ labourImg: this.data.labourTypeList[e.target.dataset.set].img,
+ })
+ this.initSubDeptUsersCharts();
+ }
},
//项目切换 返回值
diff --git a/yanzhu-ui-app/miniprogram/pageage/project_problemmodify/add/index.js b/yanzhu-ui-app/miniprogram/pageage/project_problemmodify/add/index.js
index 3ef625d0..ff5ccb10 100644
--- a/yanzhu-ui-app/miniprogram/pageage/project_problemmodify/add/index.js
+++ b/yanzhu-ui-app/miniprogram/pageage/project_problemmodify/add/index.js
@@ -31,8 +31,8 @@ Page({
projectId: "",
projectName: "",
infoType: "",
- problemType: "1",
- dangerType: "1",
+ problemType: '1',
+ dangerType: null,
workParts: "",
changeInfo: "",
nickedTime: "",
@@ -82,7 +82,7 @@ Page({
"form.recheckSend": proUserInfo.userId,
"form.recheckSendUser": proUserInfo.nickName
});
- this.getDictCache();
+ this.getDictCache(options.type);
this.getHisInfo(options.type);
this.getProjectUsers();
},
@@ -90,7 +90,7 @@ Page({
/**
* 获取字典缓存数据
*/
- getDictCache() {
+ getDictCache(type) {
// 初始化检查类型
findDictCache("ssp_proble_type").then(res => {
if (res.code == 200) {
@@ -112,10 +112,12 @@ Page({
if (res.code == 200) {
let list = [];
res.data.forEach(item => {
- list.push({
- "id": item.dictValue,
- "text": item.dictLabel
- });
+ if(item.remark==type){
+ list.push({
+ "id": item.dictValue,
+ "text": item.dictLabel
+ });
+ }
});
this.setData({
problemSubTypeList: list
diff --git a/yanzhu-ui-app/miniprogram/pages/components/voucher-select/index.js b/yanzhu-ui-app/miniprogram/pages/components/voucher-select/index.js
index 1cf131b1..75b5ecfd 100644
--- a/yanzhu-ui-app/miniprogram/pages/components/voucher-select/index.js
+++ b/yanzhu-ui-app/miniprogram/pages/components/voucher-select/index.js
@@ -26,43 +26,10 @@ Component({
},
/**数据监听 */
observers: {
- columns: function (vals) {
- if(vals.length>0){
- this.setData({
- item: []
- })
- let _vals = this.data.value;
- if(_vals!='' && typeof _vals === 'number'){
- for (let i = 0; i < vals.length; i++) {
- if (_vals == columns[i].id) {
- this.setData({
- value: columns[i].text
- })
- break;
- }
- }
- }
- }else{
- this.setData({
- item: [],
- value: ''
- })
- }
-
- },
selectValue: function (val) {
- let columns = this.data.columns;
- if (val && columns) {
- for (let i = 0; i < columns.length; i++) {
- if (val == columns[i].id) {
- val = columns[i].text;
- break;
- }
- }
- }
- this.setData({
- value: val
- })
+ setTimeout(() => {
+ this.timeOutValue(val)
+ }, 500);
},
selectIndex: function (val) {
this.setData({
@@ -99,6 +66,21 @@ Component({
* 组件的方法列表
*/
methods: {
+ timeOutValue(val){
+ let columns = this.data.columns;
+ if (val && columns) {
+ console.log("ssssssss",columns,val)
+ for (let i = 0; i < columns.length; i++) {
+ if (val == columns[i].id) {
+ val = columns[i].text;
+ break;
+ }
+ }
+ }
+ this.setData({
+ value: val
+ })
+ },
showPopup() {
this.setData({
show: true
diff --git a/yanzhu-ui-app/miniprogram/pages/login/login.wxml b/yanzhu-ui-app/miniprogram/pages/login/login.wxml
index 05444c70..089c646f 100644
--- a/yanzhu-ui-app/miniprogram/pages/login/login.wxml
+++ b/yanzhu-ui-app/miniprogram/pages/login/login.wxml
@@ -3,7 +3,7 @@
- 数字工程项目管理系统
+
diff --git a/yanzhu-ui-app/miniprogram/pages/login/login.wxss b/yanzhu-ui-app/miniprogram/pages/login/login.wxss
index 1e4c84bd..9c6776ac 100644
--- a/yanzhu-ui-app/miniprogram/pages/login/login.wxss
+++ b/yanzhu-ui-app/miniprogram/pages/login/login.wxss
@@ -15,14 +15,18 @@ page {
}
.login_title {
- height: 100rpx;
- line-height: 100rpx;
+ height: 158rpx;
+ line-height: 158rpx;
color: #DDDDDD;
font-size: 40rpx;
font-weight: bold;
text-align: center;
word-spacing: 30rpx;
background: url("https://xiangguan.sxyanzhu.com/profile/static/yanzhu_title.png") no-repeat left/100% 100%;
+ margin-bottom: 50px;
+}
+.login_title image{
+ height: 148rpx;
}
.login_bg {