diff --git a/App.vue b/App.vue index fce6d215..32eb067a 100644 --- a/App.vue +++ b/App.vue @@ -21,11 +21,12 @@ @import "./uni_modules/vk-uview-ui/index.scss"; // @import './common/PDA_style.css'; @import './common/style/new_style.css'; - @import "./static/icon/iconfont.css"; @import './common/style/uni.css'; @import './common/style/pdabasic.css'; @import './uni.scss'; @import '@/static/scss/index.scss'; + @import './static/ali_icon/iconfont.css'; + body{ background-color: #EBEEF0; diff --git a/pages.json b/pages.json index 8f8e9dce..b86ffb87 100644 --- a/pages.json +++ b/pages.json @@ -34,8 +34,30 @@ "style": { "navigationBarTitleText": "登录", "titleNView": { - "autoBackButton": "true", - "buttons": [{}] + // "autoBackButton": "true", + "buttons": [ + // 右边按钮 + // { + // "float": "right", + // "fontSize": "52rpx", //按钮上文字的大小 + // "text": "\ue706", + // "fontSrc": "/static/ali_icon/iconfont.ttf" + // } + + ] + } + } + }, + { + "path": "pages/config/config", + "style": { + "navigationBarTitleText": "配置", + "titleNView": { + // "autoBackButton": "true", + "buttons": [ + + + ] } } }, @@ -66,17 +88,17 @@ // 右边按钮 { "float": "right", - "fontSize": "23px", //按钮上文字的大小 - "text": "\ue7c6", - "fontSrc": "/static/iconfont/iconfont.ttf" + "fontSize": "58rpx", //按钮上文字的大小 + "text": "\ue696", + "fontSrc": "/static/ali_icon/iconfont.ttf" }, { "float": "right", - "fontSize": "21px", //按钮上文字的大小 + "fontSize": "52rpx", //按钮上文字的大小 "text": "\ue6e2", - "fontSrc": "/static/iconfont/iconfont.ttf" + "fontSrc": "/static/ali_icon/iconfont.ttf" } ] } @@ -101,17 +123,17 @@ // 右边按钮 { "float": "right", - "fontSize": "23px", //按钮上文字的大小 - "text": "\ue7c6", - "fontSrc": "/static/iconfont/iconfont.ttf" + "fontSize": "58rpx", //按钮上文字的大小 + "text": "\ue696", + "fontSrc": "/static/ali_icon/iconfont.ttf" }, { "float": "right", - "fontSize": "21px", //按钮上文字的大小 + "fontSize": "52rpx", //按钮上文字的大小 "text": "\ue6e2", - "fontSrc": "/static/iconfont/iconfont.ttf" + "fontSrc": "/static/ali_icon/iconfont.ttf" } ] } @@ -139,17 +161,17 @@ { "float": "right", - "fontSize": "23px", //按钮上文字的大小 - "text": "\ue7c6", - "fontSrc": "/static/iconfont/iconfont.ttf" + "fontSize": "58rpx", //按钮上文字的大小 + "text": "\ue696", + "fontSrc": "/static/ali_icon/iconfont.ttf" }, { "float": "right", - "fontSize": "21px", //按钮上文字的大小 + "fontSize": "52rpx", //按钮上文字的大小 "text": "\ue6e2", - "fontSrc": "/static/iconfont/iconfont.ttf" + "fontSrc": "/static/ali_icon/iconfont.ttf" } ] } @@ -174,15 +196,15 @@ // 右边按钮 { "float": "right", - "fontSize": "23px", //按钮上文字的大小 - "text": "\ue7c6", - "fontSrc": "/static/iconfont/iconfont.ttf" + "fontSize": "58rpx", //按钮上文字的大小 + "text": "\ue696", + "fontSrc": "/static/ali_icon/iconfont.ttf" }, { "float": "right", - "fontSize": "21px", //按钮上文字的大小 + "fontSize": "52rpx", //按钮上文字的大小 "text": "\ue6e2", - "fontSrc": "/static/iconfont/iconfont.ttf" + "fontSrc": "/static/ali_icon/iconfont.ttf" } ] } @@ -209,17 +231,17 @@ { "float": "right", - "fontSize": "23px", //按钮上文字的大小 - "text": "\ue7c6", - "fontSrc": "/static/iconfont/iconfont.ttf" + "fontSize": "58rpx", //按钮上文字的大小 + "text": "\ue696", + "fontSrc": "/static/ali_icon/iconfont.ttf" }, { "float": "right", - "fontSize": "21px", //按钮上文字的大小 + "fontSize": "52rpx", //按钮上文字的大小 "text": "\ue6e2", - "fontSrc": "/static/iconfont/iconfont.ttf" + "fontSrc": "/static/ali_icon/iconfont.ttf" } ] } @@ -251,17 +273,17 @@ // 右边按钮 { "float": "right", - "fontSize": "23px", //按钮上文字的大小 - "text": "\ue7c6", - "fontSrc": "/static/iconfont/iconfont.ttf" + "fontSize": "58rpx", //按钮上文字的大小 + "text": "\ue696", + "fontSrc": "/static/ali_icon/iconfont.ttf" }, { "float": "right", - "fontSize": "21px", //按钮上文字的大小 + "fontSize": "52rpx", //按钮上文字的大小 "text": "\ue6e2", - "fontSrc": "/static/iconfont/iconfont.ttf" + "fontSrc": "/static/ali_icon/iconfont.ttf" } ] } @@ -287,17 +309,17 @@ { "float": "right", - "fontSize": "23px", //按钮上文字的大小 - "text": "\ue7c6", - "fontSrc": "/static/iconfont/iconfont.ttf" + "fontSize": "58rpx", //按钮上文字的大小 + "text": "\ue696", + "fontSrc": "/static/ali_icon/iconfont.ttf" }, { "float": "right", - "fontSize": "21px", //按钮上文字的大小 + "fontSize": "52rpx", //按钮上文字的大小 "text": "\ue6e2", - "fontSrc": "/static/iconfont/iconfont.ttf" + "fontSrc": "/static/ali_icon/iconfont.ttf" } ] } @@ -330,17 +352,17 @@ { "float": "right", - "fontSize": "23px", //按钮上文字的大小 - "text": "\ue7c6", - "fontSrc": "/static/iconfont/iconfont.ttf" + "fontSize": "58rpx", //按钮上文字的大小 + "text": "\ue696", + "fontSrc": "/static/ali_icon/iconfont.ttf" }, { "float": "right", - "fontSize": "21px", //按钮上文字的大小 + "fontSize": "52rpx", //按钮上文字的大小 "text": "\ue6e2", - "fontSrc": "/static/iconfont/iconfont.ttf" + "fontSrc": "/static/ali_icon/iconfont.ttf" } ] } @@ -358,17 +380,17 @@ { "float": "right", - "fontSize": "23px", //按钮上文字的大小 - "text": "\ue7c6", - "fontSrc": "/static/iconfont/iconfont.ttf" + "fontSize": "58rpx", //按钮上文字的大小 + "text": "\ue696", + "fontSrc": "/static/ali_icon/iconfont.ttf" }, { "float": "right", - "fontSize": "21px", //按钮上文字的大小 + "fontSize": "52rpx", //按钮上文字的大小 "text": "\ue6e2", - "fontSrc": "/static/iconfont/iconfont.ttf" + "fontSrc": "/static/ali_icon/iconfont.ttf" } ] } @@ -423,17 +445,17 @@ // 右边按钮 { "float": "right", - "fontSize": "23px", //按钮上文字的大小 - "text": "\ue7c6", - "fontSrc": "/static/iconfont/iconfont.ttf" + "fontSize": "58rpx", //按钮上文字的大小 + "text": "\ue696", + "fontSrc": "/static/ali_icon/iconfont.ttf" }, { "float": "right", - "fontSize": "21px", //按钮上文字的大小 + "fontSize": "52rpx", //按钮上文字的大小 "text": "\ue6e2", - "fontSrc": "/static/iconfont/iconfont.ttf" + "fontSrc": "/static/ali_icon/iconfont.ttf" } ] } @@ -466,17 +488,17 @@ { "float": "right", - "fontSize": "23px", //按钮上文字的大小 - "text": "\ue7c6", - "fontSrc": "/static/iconfont/iconfont.ttf" + "fontSize": "58rpx", //按钮上文字的大小 + "text": "\ue696", + "fontSrc": "/static/ali_icon/iconfont.ttf" }, { "float": "right", - "fontSize": "21px", //按钮上文字的大小 + "fontSize": "52rpx", //按钮上文字的大小 "text": "\ue6e2", - "fontSrc": "/static/iconfont/iconfont.ttf" + "fontSrc": "/static/ali_icon/iconfont.ttf" } ] } @@ -515,17 +537,17 @@ // 右边按钮 { "float": "right", - "fontSize": "23px", //按钮上文字的大小 - "text": "\ue7c6", - "fontSrc": "/static/iconfont/iconfont.ttf" + "fontSize": "58rpx", //按钮上文字的大小 + "text": "\ue696", + "fontSrc": "/static/ali_icon/iconfont.ttf" }, { "float": "right", - "fontSize": "21px", //按钮上文字的大小 + "fontSize": "52rpx", //按钮上文字的大小 "text": "\ue6e2", - "fontSrc": "/static/iconfont/iconfont.ttf" + "fontSrc": "/static/ali_icon/iconfont.ttf" } ] } @@ -542,17 +564,17 @@ // 右边按钮 { "float": "right", - "fontSize": "23px", //按钮上文字的大小 - "text": "\ue7c6", - "fontSrc": "/static/iconfont/iconfont.ttf" + "fontSize": "58rpx", //按钮上文字的大小 + "text": "\ue696", + "fontSrc": "/static/ali_icon/iconfont.ttf" }, { "float": "right", - "fontSize": "21px", //按钮上文字的大小 + "fontSize": "52rpx", //按钮上文字的大小 "text": "\ue6e2", - "fontSrc": "/static/iconfont/iconfont.ttf" + "fontSrc": "/static/ali_icon/iconfont.ttf" } ] } @@ -615,17 +637,17 @@ { "float": "right", - "fontSize": "23px", //按钮上文字的大小 - "text": "\ue7c6", - "fontSrc": "/static/iconfont/iconfont.ttf" + "fontSize": "58rpx", //按钮上文字的大小 + "text": "\ue696", + "fontSrc": "/static/ali_icon/iconfont.ttf" }, { "float": "right", - "fontSize": "21px", //按钮上文字的大小 + "fontSize": "52rpx", //按钮上文字的大小 "text": "\ue6e2", - "fontSrc": "/static/iconfont/iconfont.ttf" + "fontSrc": "/static/ali_icon/iconfont.ttf" } ] } @@ -650,17 +672,17 @@ { "float": "right", - "fontSize": "23px", //按钮上文字的大小 - "text": "\ue7c6", - "fontSrc": "/static/iconfont/iconfont.ttf" + "fontSize": "58rpx", //按钮上文字的大小 + "text": "\ue696", + "fontSrc": "/static/ali_icon/iconfont.ttf" }, { "float": "right", - "fontSize": "21px", //按钮上文字的大小 + "fontSize": "52rpx", //按钮上文字的大小 "text": "\ue6e2", - "fontSrc": "/static/iconfont/iconfont.ttf" + "fontSrc": "/static/ali_icon/iconfont.ttf" } ] } @@ -694,16 +716,16 @@ // 右边按钮 { "float": "right", - "fontSize": "23px", //按钮上文字的大小 - "text": "\ue7c6", - "fontSrc": "/static/iconfont/iconfont.ttf" + "fontSize": "58rpx", //按钮上文字的大小 + "text": "\ue696", + "fontSrc": "/static/ali_icon/iconfont.ttf" }, { "float": "right", - "fontSize": "21px", //按钮上文字的大小 + "fontSize": "52rpx", //按钮上文字的大小 "text": "\ue6e2", - "fontSrc": "/static/iconfont/iconfont.ttf" + "fontSrc": "/static/ali_icon/iconfont.ttf" } ] } @@ -727,16 +749,16 @@ // 右边按钮 { "float": "right", - "fontSize": "23px", //按钮上文字的大小 - "text": "\ue7c6", - "fontSrc": "/static/iconfont/iconfont.ttf" + "fontSize": "58rpx", //按钮上文字的大小 + "text": "\ue696", + "fontSrc": "/static/ali_icon/iconfont.ttf" }, { "float": "right", - "fontSize": "21px", //按钮上文字的大小 + "fontSize": "52rpx", //按钮上文字的大小 "text": "\ue6e2", - "fontSrc": "/static/iconfont/iconfont.ttf" + "fontSrc": "/static/ali_icon/iconfont.ttf" } ] } @@ -753,16 +775,16 @@ // 右边按钮 { "float": "right", - "fontSize": "23px", //按钮上文字的大小 - "text": "\ue7c6", - "fontSrc": "/static/iconfont/iconfont.ttf" + "fontSize": "58rpx", //按钮上文字的大小 + "text": "\ue696", + "fontSrc": "/static/ali_icon/iconfont.ttf" }, { "float": "right", - "fontSize": "21px", //按钮上文字的大小 + "fontSize": "52rpx", //按钮上文字的大小 "text": "\ue6e2", - "fontSrc": "/static/iconfont/iconfont.ttf" + "fontSrc": "/static/ali_icon/iconfont.ttf" } ] } @@ -779,16 +801,16 @@ // 右边按钮 { "float": "right", - "fontSize": "23px", //按钮上文字的大小 - "text": "\ue7c6", - "fontSrc": "/static/iconfont/iconfont.ttf" + "fontSize": "58rpx", //按钮上文字的大小 + "text": "\ue696", + "fontSrc": "/static/ali_icon/iconfont.ttf" }, { "float": "right", - "fontSize": "21px", //按钮上文字的大小 + "fontSize": "52rpx", //按钮上文字的大小 "text": "\ue6e2", - "fontSrc": "/static/iconfont/iconfont.ttf" + "fontSrc": "/static/ali_icon/iconfont.ttf" } ] } @@ -805,16 +827,16 @@ // 右边按钮 { "float": "right", - "fontSize": "23px", //按钮上文字的大小 - "text": "\ue7c6", - "fontSrc": "/static/iconfont/iconfont.ttf" + "fontSize": "58rpx", //按钮上文字的大小 + "text": "\ue696", + "fontSrc": "/static/ali_icon/iconfont.ttf" }, { "float": "right", - "fontSize": "21px", //按钮上文字的大小 + "fontSize": "52rpx", //按钮上文字的大小 "text": "\ue6e2", - "fontSrc": "/static/iconfont/iconfont.ttf" + "fontSrc": "/static/ali_icon/iconfont.ttf" } ] } @@ -831,16 +853,16 @@ // 右边按钮 { "float": "right", - "fontSize": "23px", //按钮上文字的大小 - "text": "\ue7c6", - "fontSrc": "/static/iconfont/iconfont.ttf" + "fontSize": "58rpx", //按钮上文字的大小 + "text": "\ue696", + "fontSrc": "/static/ali_icon/iconfont.ttf" }, { "float": "right", - "fontSize": "21px", //按钮上文字的大小 + "fontSize": "52rpx", //按钮上文字的大小 "text": "\ue6e2", - "fontSrc": "/static/iconfont/iconfont.ttf" + "fontSrc": "/static/ali_icon/iconfont.ttf" } ] } @@ -903,16 +925,16 @@ // 右边按钮 { "float": "right", - "fontSize": "23px", //按钮上文字的大小 - "text": "\ue7c6", - "fontSrc": "/static/iconfont/iconfont.ttf" + "fontSize": "58rpx", //按钮上文字的大小 + "text": "\ue696", + "fontSrc": "/static/ali_icon/iconfont.ttf" }, { "float": "right", - "fontSize": "21px", //按钮上文字的大小 + "fontSize": "52rpx", //按钮上文字的大小 "text": "\ue6e2", - "fontSrc": "/static/iconfont/iconfont.ttf" + "fontSrc": "/static/ali_icon/iconfont.ttf" } ] } @@ -941,16 +963,16 @@ "titleNView": { "buttons": [{ "float": "right", - "fontSize": "23px", //按钮上文字的大小 - "text": "\ue7c6", - "fontSrc": "/static/iconfont/iconfont.ttf" + "fontSize": "58rpx", //按钮上文字的大小 + "text": "\ue696", + "fontSrc": "/static/ali_icon/iconfont.ttf" }, { "float": "right", - "fontSize": "21px", //按钮上文字的大小 + "fontSize": "52rpx", //按钮上文字的大小 "text": "\ue6e2", - "fontSrc": "/static/iconfont/iconfont.ttf" + "fontSrc": "/static/ali_icon/iconfont.ttf" } ] } @@ -983,17 +1005,17 @@ { "float": "right", - "fontSize": "23px", //按钮上文字的大小 - "text": "\ue7c6", - "fontSrc": "/static/iconfont/iconfont.ttf" + "fontSize": "58rpx", //按钮上文字的大小 + "text": "\ue696", + "fontSrc": "/static/ali_icon/iconfont.ttf" }, { "float": "right", - "fontSize": "21px", //按钮上文字的大小 + "fontSize": "52rpx", //按钮上文字的大小 "text": "\ue6e2", - "fontSrc": "/static/iconfont/iconfont.ttf" + "fontSrc": "/static/ali_icon/iconfont.ttf" } ] } @@ -1026,17 +1048,17 @@ // 右边按钮 { "float": "right", - "fontSize": "23px", //按钮上文字的大小 - "text": "\ue7c6", - "fontSrc": "/static/iconfont/iconfont.ttf" + "fontSize": "58rpx", //按钮上文字的大小 + "text": "\ue696", + "fontSrc": "/static/ali_icon/iconfont.ttf" }, { "float": "right", - "fontSize": "21px", //按钮上文字的大小 + "fontSize": "52rpx", //按钮上文字的大小 "text": "\ue6e2", - "fontSrc": "/static/iconfont/iconfont.ttf" + "fontSrc": "/static/ali_icon/iconfont.ttf" } ] } @@ -1068,17 +1090,17 @@ // 右边按钮 { "float": "right", - "fontSize": "23px", //按钮上文字的大小 - "text": "\ue7c6", - "fontSrc": "/static/iconfont/iconfont.ttf" + "fontSize": "58rpx", //按钮上文字的大小 + "text": "\ue696", + "fontSrc": "/static/ali_icon/iconfont.ttf" }, { "float": "right", - "fontSize": "21px", //按钮上文字的大小 + "fontSize": "52rpx", //按钮上文字的大小 "text": "\ue6e2", - "fontSrc": "/static/iconfont/iconfont.ttf" + "fontSrc": "/static/ali_icon/iconfont.ttf" } ] } @@ -1112,17 +1134,17 @@ // 右边按钮 { "float": "right", - "fontSize": "23px", //按钮上文字的大小 - "text": "\ue7c6", - "fontSrc": "/static/iconfont/iconfont.ttf" + "fontSize": "58rpx", //按钮上文字的大小 + "text": "\ue696", + "fontSrc": "/static/ali_icon/iconfont.ttf" }, { "float": "right", - "fontSize": "21px", //按钮上文字的大小 + "fontSize": "52rpx", //按钮上文字的大小 "text": "\ue6e2", - "fontSrc": "/static/iconfont/iconfont.ttf" + "fontSrc": "/static/ali_icon/iconfont.ttf" } ] } @@ -1148,17 +1170,17 @@ // 右边按钮 { "float": "right", - "fontSize": "23px", //按钮上文字的大小 - "text": "\ue7c6", - "fontSrc": "/static/iconfont/iconfont.ttf" + "fontSize": "58rpx", //按钮上文字的大小 + "text": "\ue696", + "fontSrc": "/static/ali_icon/iconfont.ttf" }, { "float": "right", - "fontSize": "21px", //按钮上文字的大小 + "fontSize": "52rpx", //按钮上文字的大小 "text": "\ue6e2", - "fontSrc": "/static/iconfont/iconfont.ttf" + "fontSrc": "/static/ali_icon/iconfont.ttf" } ] } @@ -1208,17 +1230,17 @@ { "float": "right", - "fontSize": "23px", //按钮上文字的大小 - "text": "\ue7c6", - "fontSrc": "/static/iconfont/iconfont.ttf" + "fontSize": "58rpx", //按钮上文字的大小 + "text": "\ue696", + "fontSrc": "/static/ali_icon/iconfont.ttf" }, { "float": "right", - "fontSize": "21px", //按钮上文字的大小 + "fontSize": "52rpx", //按钮上文字的大小 "text": "\ue6e2", - "fontSrc": "/static/iconfont/iconfont.ttf" + "fontSrc": "/static/ali_icon/iconfont.ttf" } ] } @@ -1243,16 +1265,16 @@ // 右边按钮 { "float": "right", - "fontSize": "23px", //按钮上文字的大小 - "text": "\ue7c6", - "fontSrc": "/static/iconfont/iconfont.ttf" + "fontSize": "58rpx", //按钮上文字的大小 + "text": "\ue696", + "fontSrc": "/static/ali_icon/iconfont.ttf" }, { "float": "right", - "fontSize": "21px", //按钮上文字的大小 + "fontSize": "52rpx", //按钮上文字的大小 "text": "\ue6e2", - "fontSrc": "/static/iconfont/iconfont.ttf" + "fontSrc": "/static/ali_icon/iconfont.ttf" } ] } @@ -1278,17 +1300,17 @@ { "float": "right", - "fontSize": "23px", //按钮上文字的大小 - "text": "\ue7c6", - "fontSrc": "/static/iconfont/iconfont.ttf" + "fontSize": "58rpx", //按钮上文字的大小 + "text": "\ue696", + "fontSrc": "/static/ali_icon/iconfont.ttf" }, { "float": "right", - "fontSize": "21px", //按钮上文字的大小 + "fontSize": "52rpx", //按钮上文字的大小 "text": "\ue6e2", - "fontSrc": "/static/iconfont/iconfont.ttf" + "fontSrc": "/static/ali_icon/iconfont.ttf" } ] } @@ -1312,16 +1334,16 @@ // 右边按钮 { "float": "right", - "fontSize": "23px", //按钮上文字的大小 - "text": "\ue7c6", - "fontSrc": "/static/iconfont/iconfont.ttf" + "fontSize": "58rpx", //按钮上文字的大小 + "text": "\ue696", + "fontSrc": "/static/ali_icon/iconfont.ttf" }, { "float": "right", - "fontSize": "21px", //按钮上文字的大小 + "fontSize": "52rpx", //按钮上文字的大小 "text": "\ue6e2", - "fontSrc": "/static/iconfont/iconfont.ttf" + "fontSrc": "/static/ali_icon/iconfont.ttf" } ] } @@ -1360,16 +1382,16 @@ // 右边按钮 { "float": "right", - "fontSize": "23px", //按钮上文字的大小 - "text": "\ue7c6", - "fontSrc": "/static/iconfont/iconfont.ttf" + "fontSize": "58rpx", //按钮上文字的大小 + "text": "\ue696", + "fontSrc": "/static/ali_icon/iconfont.ttf" }, { "float": "right", - "fontSize": "21px", //按钮上文字的大小 + "fontSize": "52rpx", //按钮上文字的大小 "text": "\ue6e2", - "fontSrc": "/static/iconfont/iconfont.ttf" + "fontSrc": "/static/ali_icon/iconfont.ttf" } ] } @@ -1400,16 +1422,16 @@ // 右边按钮 { "float": "right", - "fontSize": "23px", //按钮上文字的大小 - "text": "\ue7c6", - "fontSrc": "/static/iconfont/iconfont.ttf" + "fontSize": "58rpx", //按钮上文字的大小 + "text": "\ue696", + "fontSrc": "/static/ali_icon/iconfont.ttf" }, { "float": "right", - "fontSize": "21px", //按钮上文字的大小 + "fontSize": "52rpx", //按钮上文字的大小 "text": "\ue6e2", - "fontSrc": "/static/iconfont/iconfont.ttf" + "fontSrc": "/static/ali_icon/iconfont.ttf" } ] } @@ -1443,16 +1465,16 @@ // 右边按钮 { "float": "right", - "fontSize": "23px", //按钮上文字的大小 - "text": "\ue7c6", - "fontSrc": "/static/iconfont/iconfont.ttf" + "fontSize": "58rpx", //按钮上文字的大小 + "text": "\ue696", + "fontSrc": "/static/ali_icon/iconfont.ttf" }, { "float": "right", - "fontSize": "21px", //按钮上文字的大小 + "fontSize": "52rpx", //按钮上文字的大小 "text": "\ue6e2", - "fontSrc": "/static/iconfont/iconfont.ttf" + "fontSrc": "/static/ali_icon/iconfont.ttf" } ] } @@ -1484,16 +1506,16 @@ // 右边按钮 { "float": "right", - "fontSize": "23px", //按钮上文字的大小 - "text": "\ue7c6", - "fontSrc": "/static/iconfont/iconfont.ttf" + "fontSize": "58rpx", //按钮上文字的大小 + "text": "\ue696", + "fontSrc": "/static/ali_icon/iconfont.ttf" }, { "float": "right", - "fontSize": "21px", //按钮上文字的大小 + "fontSize": "52rpx", //按钮上文字的大小 "text": "\ue6e2", - "fontSrc": "/static/iconfont/iconfont.ttf" + "fontSrc": "/static/ali_icon/iconfont.ttf" } ] } @@ -1526,17 +1548,17 @@ // 右边按钮 { "float": "right", - "fontSize": "23px", //按钮上文字的大小 - "text": "\ue7c6", - "fontSrc": "/static/iconfont/iconfont.ttf" + "fontSize": "58rpx", //按钮上文字的大小 + "text": "\ue696", + "fontSrc": "/static/ali_icon/iconfont.ttf" }, { "float": "right", - "fontSize": "21px", //按钮上文字的大小 + "fontSize": "52rpx", //按钮上文字的大小 "text": "\ue6e2", - "fontSrc": "/static/iconfont/iconfont.ttf" + "fontSrc": "/static/ali_icon/iconfont.ttf" } ] } @@ -1560,16 +1582,16 @@ // 右边按钮 { "float": "right", - "fontSize": "23px", //按钮上文字的大小 - "text": "\ue7c6", - "fontSrc": "/static/iconfont/iconfont.ttf" + "fontSize": "52rpx", //按钮上文字的大小 + "text": "\ue696", + "fontSrc": "/static/ali_icon/iconfont.ttf" }, { "float": "right", - "fontSize": "21px", //按钮上文字的大小 + "fontSize": "52rpx", //按钮上文字的大小 "text": "\ue6e2", - "fontSrc": "/static/iconfont/iconfont.ttf" + "fontSrc": "/static/ali_icon/iconfont.ttf" } ] } @@ -1648,9 +1670,9 @@ "autoBackButton": "true", "buttons": [{ "float": "right", - "text": "\ue7c6", - "fontSrc": "/static/icon/iconfont.ttf", - "fontSize": "22px" + "text": "\ue696", + "fontSrc": "/static/ali_icon/iconfont.ttf", + "fontSize": "58rpx" }] }, "softinputMode": "adjustPan" //adjustResize diff --git a/pages/config/config.vue b/pages/config/config.vue new file mode 100644 index 00000000..25011727 --- /dev/null +++ b/pages/config/config.vue @@ -0,0 +1,42 @@ + + + + + \ No newline at end of file diff --git a/pages/customerReturn/coms/comReturnJobCard.vue b/pages/customerReturn/coms/comReturnJobCard.vue index 1d282c73..4691483d 100644 --- a/pages/customerReturn/coms/comReturnJobCard.vue +++ b/pages/customerReturn/coms/comReturnJobCard.vue @@ -9,13 +9,7 @@ - 客户名称 : {{dataContent.customerName}} - - - - - - 物品代码 : {{dataContent.itemCode}} + 客户代码 : {{dataContent.customerCode}} diff --git a/pages/customerReturn/job/returnDetail.vue b/pages/customerReturn/job/returnDetail.vue index 7e9e7725..ae34419d 100644 --- a/pages/customerReturn/job/returnDetail.vue +++ b/pages/customerReturn/job/returnDetail.vue @@ -95,8 +95,6 @@ }; }, onLoad(option) { - console.log("任务id",option.id) - console.log("任务状态",option.status) this.id = option.id; if (this.id != undefined) { //新建的任务自动接收 @@ -277,8 +275,7 @@ ']不一致,是否继续上架?', res => { if (res) { itemDetail.scaned = true; - itemDetail.handleQty = Number(result.label.qty) > Number(result.balance - .qty) ? Number(result.balance.qty) : Number(result.label.qty); + itemDetail.handleQty = Number(result.balance.qty) itemDetail.balance = result.balance; itemDetail.balance.balanceQty = result.balance.qty; itemDetail.balance.stdPackQty = result.package.stdPackQty @@ -290,8 +287,7 @@ }); } else { itemDetail.scaned = true; - itemDetail.handleQty = Number(result.label.qty) > Number(result.balance - .qty) ? Number(result.balance.qty) : Number(result.label.qty); + itemDetail.handleQty = Number(result.balance.qty) itemDetail.balance = result.balance; itemDetail.balance.balanceQty = result.balance.qty; itemDetail.balance.stdPackQty = result.package.stdPackQty @@ -363,19 +359,18 @@ this.managementList = res.list; var params = this.setParams() console.log("提交参数", JSON.stringify(params)); - // customerReturnJobSubmit(this.id, params).then(res => { - // uni.hideLoading() - // if (res.data) { - // var hint = res.data.Number; - // this.showCommitSuccessMessage("提交成功" + hint) - - // } else { - // this.showErrorMessage("提交失败[" + res.msg + "]") - // } - // }).catch(error => { - // uni.hideLoading() - // this.showErrorMessage(error) - // }) + customerReturnJobSubmit(this.id, params).then(res => { + uni.hideLoading() + if (res.data) { + this.showCommitSuccessMessage("提交成功
生成客户退货记录:" + res.data) + + } else { + this.showErrorMessage("提交失败[" + res.msg + "]") + } + }).catch(error => { + uni.hideLoading() + this.showErrorMessage(error) + }) } else { uni.hideLoading(); this.showErrorMessage(res.message); @@ -394,7 +389,9 @@ var info = getPackingNumberAndBatch(this.managementList, detail.itemCode, detail.packingNumber, detail.batch); detail.toPackingNumber = info.packingNumber; + detail.toContainerNumber = detail.containerNumber; detail.toBatch = info.batch; + detail.toLocationCode = detail.toLocationCode; subList.push(detail) } }) diff --git a/pages/deliver/coms/comScanDeliverPack.vue b/pages/deliver/coms/comScanDeliverPack.vue index 8b02061f..42391651 100644 --- a/pages/deliver/coms/comScanDeliverPack.vue +++ b/pages/deliver/coms/comScanDeliverPack.vue @@ -138,7 +138,7 @@ fromLocationList: [], fromLocationCode: '', fromLocation: null, - issueRecord: [], //补料历史 + issueRecord: [], //发货历史 expand: true, scanOptions: {}, editItem: {}, @@ -212,7 +212,7 @@ let location = this.fromLocationList.find(r => r == fromlocation) if (location == undefined) { this.fromLocationCode = '' - this.showErrorMessage('补料库位【' + fromlocation + '】不存在') + this.showErrorMessage('发货库位【' + fromlocation + '】不存在') } }, onScan(result) { @@ -231,7 +231,7 @@ let lot = result.label.batch; let item = that.toLocation.Items.find(r => r.itemCode == itemCode); if (item == undefined) { - that.showErrorMessage('未查找到零件【' + itemCode + '】的补料明细', + that.showErrorMessage('未查找到零件【' + itemCode + '】的发货明细', res => { that.getfocus(); } @@ -321,21 +321,21 @@ } else { if (this.jobContent.AllowModifyBatch == null) { this.showQuestionMessage('在【' + that.fromLocationCode + '】库位下,未查找到批次【' + lot + - '】的补料明细,是否要继续补料?', res => { + '】的发货明细,是否要继续发货?', res => { if (res) { let batch = that.createBatchInfo(label, balance); fromLocation.Batchs.unshift(batch); } }) } else { - that.showErrorMessage('未查找到批次【' + lot + '】的补料明细', + that.showErrorMessage('未查找到批次【' + lot + '】的发货明细', res => { that.getfocus(); }); } } } else { - that.showErrorMessage('未查找到推荐库位【' + that.fromLocationCode + '】的补料明细', + that.showErrorMessage('未查找到推荐库位【' + that.fromLocationCode + '】的发货明细', res => { that.getfocus(); } diff --git a/pages/login/index.vue b/pages/login/index.vue index dd305289..790d8e4a 100644 --- a/pages/login/index.vue +++ b/pages/login/index.vue @@ -136,6 +136,14 @@ backgroundColor: "#476DF5 !important" }) }, + //返回首页 + onNavigationBarButtonTap(e) { + if (e.index === 0) { + uni.navigateTo({ + url:"/pages/config/config" + }) + } + }, onLoad() { getCaptchaImage().then(res => { if (res) { diff --git a/pages/purchaseReturn/job/returnDetail.vue b/pages/purchaseReturn/job/returnDetail.vue index be7d1b76..5fd66b57 100644 --- a/pages/purchaseReturn/job/returnDetail.vue +++ b/pages/purchaseReturn/job/returnDetail.vue @@ -248,7 +248,8 @@ ']不一致,是否继续上架?', res => { if (res) { itemDetail.scaned = true; - itemDetail.handleQty = Number(qty); + itemDetail.handleQty = Number(result.label.qty) > Number(result.balance + .qty) ? Number(result.balance.qty) : Number(result.label.qty); itemDetail.toInventoryStatus = result.balance.inventoryStatus; itemDetail.balance = result.balance; itemDetail.balance.balanceQty = result.balance.qty; @@ -262,13 +263,13 @@ }); } else { itemDetail.scaned = true; - itemDetail.handleQty = Number(qty); + itemDetail.handleQty = Number(result.label.qty) > Number(result.balance + .qty) ? Number(result.balance.qty) : Number(result.label.qty); itemDetail.toInventoryStatus = result.balance.inventoryStatus; itemDetail.balance = result.balance; itemDetail.balance.balanceQty = result.balance.qty; itemDetail.balance.stdPackQty =result.package.stdPackQty itemDetail.balance.stdPackUnit =result.package.stdPackUnit - itemDetail.handleQty = Number(qty); this.calcHandleQty(); } } diff --git a/router/my_router.js b/router/my_router.js index e0370424..1d6dfc55 100644 --- a/router/my_router.js +++ b/router/my_router.js @@ -1,7 +1,8 @@ //只要是未登录状态，想要跳转到名单内的路径时，直接跳到登录页 // 页面白名单，不受拦截 const whiteList = [ - '/pages/login/index' + '/pages/login/index', + '/pages/config/config' ] function hasPermission(url) { diff --git a/static/icon/iconfont_filter.css b/static/ali_icon/iconfont.css similarity index 64% rename from static/icon/iconfont_filter.css rename to static/ali_icon/iconfont.css index 980b6ae6..8034fb9b 100644 --- a/static/icon/iconfont_filter.css +++ b/static/ali_icon/iconfont.css @@ -1,6 +1,6 @@ @font-face { font-family: "iconfont"; /* Project id 4087030 */ - src: url('@/static/icon/iconfont_filter.ttf') format('truetype'); + src: url('/static/ali_icon/iconfont.ttf') format('truetype'); } .iconfont { @@ -11,6 +11,14 @@ -moz-osx-font-smoothing: grayscale; } +.icon-shezhi:before { + content: "\e706"; +} + +.icon-icon_home:before { + content: "\e696"; +} + .icon-guolv:before { content: "\e6e2"; } diff --git a/static/ali_icon/iconfont.ttf b/static/ali_icon/iconfont.ttf new file mode 100644 index 00000000..984d072b Binary files /dev/null and b/static/ali_icon/iconfont.ttf differ diff --git a/static/config.json b/static/config.json index 1c570702..471c6bba 100644 --- a/static/config.json +++ b/static/config.json @@ -18,7 +18,7 @@ "request_url": { "name": "request_url", - "value": "http://192.168.0.230:12080/admin-api", + "value": "http://192.168.0.178:12080/admin-api", "dev2": "http://192.168.0.157:12080/admin-api", "chefang": "http://192.168.0.178:12080/admin-api", "chenxinming": "http://192.168.0.230:12080/admin-api", diff --git a/static/icon/iconfont.css b/static/icon/iconfont.css deleted file mode 100644 index 6d78f452..00000000 --- a/static/icon/iconfont.css +++ /dev/null @@ -1,18 +0,0 @@ -@font-face { - font-family: "iconfont"; - /* Project id */ - /* src: url('iconfont.ttf?t=1653546564489') format('truetype'); */ - src: url('@/static/icon/iconfont.ttf') format('truetype'); -} - -/* .iconfont { - font-family: "iconfont" !important; - font-size: 16px; - font-style: normal; - -webkit-font-smoothing: antialiased; - -moz-osx-font-smoothing: grayscale; -} - -.icon-home:before { - content: "\e7c6"; -} */ diff --git a/static/icon/iconfont.ttf b/static/icon/iconfont.ttf deleted file mode 100644 index ddc7c080..00000000 Binary files a/static/icon/iconfont.ttf and /dev/null differ diff --git a/static/icon/iconfont_filter.ttf b/static/icon/iconfont_filter.ttf deleted file mode 100644 index aa26b102..00000000 Binary files a/static/icon/iconfont_filter.ttf and /dev/null differ diff --git a/static/iconfont.css b/static/iconfont.css deleted file mode 100644 index 18cf80a4..00000000 --- a/static/iconfont.css +++ /dev/null @@ -1,32 +0,0 @@ -@font-face { - font-family: "iconfont"; /* Project id */ - src: url('@/static/iconfont.ttf') format('truetype'); -} - -.iconfont { - font-family: "iconfont" !important; - font-size: 16px; - font-style: normal; - -webkit-font-smoothing: antialiased; - -moz-osx-font-smoothing: grayscale; -} - -.icon-link:before { - content: "\e772"; -} - -.icon-poweroff:before { - content: "\e774"; -} - -.icon-safety-certificate:before { - content: "\e776"; -} - -.icon-chart-pie-alt:before { - content: "\e78c"; -} - -.icon-kongxincai:before { - content: "\e642"; -} diff --git a/static/iconfont.ttf b/static/iconfont.ttf deleted file mode 100644 index 2b132b60..00000000 Binary files a/static/iconfont.ttf and /dev/null differ diff --git a/static/iconfont/iconfont.ttf b/static/iconfont/iconfont.ttf deleted file mode 100644 index 60c76173..00000000 Binary files a/static/iconfont/iconfont.ttf and /dev/null differ diff --git a/static/scss/index.scss b/static/scss/index.scss index 745cffa2..0ae6983d 100644 --- a/static/scss/index.scss +++ b/static/scss/index.scss @@ -1,6 +1,4 @@ // global @import "./global.scss"; // color-ui -@import "@/static/scss/colorui.css"; -// iconfont -@import "@/static/font/iconfont.css"; \ No newline at end of file +@import "@/static/scss/colorui.css"; \ No newline at end of file