diff --git a/App.vue b/App.vue
index 92ac298..3cd4cd1 100644
--- a/App.vue
+++ b/App.vue
@@ -8,9 +8,17 @@
// 优先于show方法
onLaunch: function() {
// 配置全局域名
- uni.setStorageSync('hostapi','/web');
+ // #ifdef APP-PLUS
+ uni.setStorageSync('hostapi','http://maintain.7and5.cn');
+ // #endif
+ // #ifdef MP-WEIXIN
+ uni.setStorageSync('hostapi','http://maintain.7and5.cn');
+ // #endif
+ // #ifdef H5
+ uni.setStorageSync('hostapi','/web');
+ // #endif
// 设置主色调
- uni.setStorageSync('publicColor','#000000');
+ // uni.setStorageSync('publicColor','#000000');
},
onShow: function() {
if(uni.getStorageSync('phone_active')){
diff --git a/commons/base.css b/commons/base.css
index aefcaf5..525bf77 100644
--- a/commons/base.css
+++ b/commons/base.css
@@ -103,6 +103,13 @@ button:after{content: none!important;}
.clips1{display: -webkit-box;-webkit-box-orient: vertical;-webkit-line-clamp: 1;overflow: hidden;text-overflow: ellipsis;word-wrap: break-word;word-break:break-all;}
.clips2{display: -webkit-box;-webkit-box-orient: vertical;-webkit-line-clamp: 2;overflow: hidden;text-overflow: ellipsis;word-wrap: break-word;word-break:break-all;}
.clips3{display: -webkit-box;-webkit-box-orient: vertical;-webkit-line-clamp: 3;overflow: hidden;text-overflow: ellipsis;word-wrap: break-word;word-break:break-all;}
+.clips4{display: -webkit-box;-webkit-box-orient: vertical;-webkit-line-clamp: 4;overflow: hidden;text-overflow: ellipsis;word-wrap: break-word;word-break:break-all;}
+.clips5{display: -webkit-box;-webkit-box-orient: vertical;-webkit-line-clamp: 5;overflow: hidden;text-overflow: ellipsis;word-wrap: break-word;word-break:break-all;}
+.clips6{display: -webkit-box;-webkit-box-orient: vertical;-webkit-line-clamp: 6;overflow: hidden;text-overflow: ellipsis;word-wrap: break-word;word-break:break-all;}
+.clips7{display: -webkit-box;-webkit-box-orient: vertical;-webkit-line-clamp: 7;overflow: hidden;text-overflow: ellipsis;word-wrap: break-word;word-break:break-all;}
+.clips8{display: -webkit-box;-webkit-box-orient: vertical;-webkit-line-clamp: 8;overflow: hidden;text-overflow: ellipsis;word-wrap: break-word;word-break:break-all;}
+.clips9{display: -webkit-box;-webkit-box-orient: vertical;-webkit-line-clamp: 9;overflow: hidden;text-overflow: ellipsis;word-wrap: break-word;word-break:break-all;}
+.clips10{display: -webkit-box;-webkit-box-orient: vertical;-webkit-line-clamp: 10;overflow: hidden;text-overflow: ellipsis;word-wrap: break-word;word-break:break-all;}
/* 字体大小 */
@@ -153,13 +160,14 @@ button:after{content: none!important;}
.colB3{color: #B3B3B3;}
.col5b{color: #5B5B5B;}
.colpeili{color: #868695;}
-/* 佩丽字体颜色 */
-.peili-colorRed{color: #fe2525;}
/* 字体位置 */
-.tc{text-align: center;}
.tright{text-align: right;}
+.tcenter{text-align: center;}
+
+/* 文字空两格 */
+.tindent{text-indent: 2em;}
/* 行间距 */
.linh40{line-height: 40rpx;}
@@ -171,8 +179,6 @@ button:after{content: none!important;}
.bold{font-weight: bold;}
.bold400{font-weight: 400;}
.bold500{font-weight: 500;}
-.font5{font-weight: 500;}
-.font4{font-weight: 400;}
/* 背景颜色 */
@@ -183,13 +189,8 @@ button:after{content: none!important;}
.bcf8{background: #F85050;}
.bacf5{background: #F5F5F5;}
.bacf6{background-color: #f6f6f6;}
-/* 佩丽商城背景色 */
-.peili-backColor{background-color: #fe2525;}
-/* 文本居中方式 */
-.tcenter{text-align: center;}
-
/* 圆角 */
.radius10{border-radius: 10rpx;}
diff --git a/components/status-nav.vue b/components/status-nav.vue
index aacf212..b0ed12c 100644
--- a/components/status-nav.vue
+++ b/components/status-nav.vue
@@ -92,7 +92,7 @@
},
data(){
return {
- statusBarHeight: uni.getStorageSync('statusBar'),
+ statusBarHeight: uni.getSystemInfoSync().statusBarHeight,
ifNet:true ,// 是否有网络
netText:'当前无网络',
netTimer:null
diff --git a/jsFile/requst.js b/jsFile/requst.js
index 240f831..495f9b1 100644
--- a/jsFile/requst.js
+++ b/jsFile/requst.js
@@ -97,6 +97,7 @@ const request = (method, url, options) => {
},
complete: rest => {
// 是否成功，都会执行
+ console.log(rest,100);
}
})
})
diff --git a/jsFile/tools.js b/jsFile/tools.js
index e51524c..118ef71 100644
--- a/jsFile/tools.js
+++ b/jsFile/tools.js
@@ -437,7 +437,7 @@ const tools = {
currentContext(){
// #ifdef APP-PLUS
if(uni.getSystemInfoSync().platform != "devtools"){//devtools：开发版 值域为：ios、android、mac（3.1.10+）、windows（3.1.10+）、linux（3.1.10+）
- console.log = () =>{}
+ // console.log = () =>{}
}
// #endif
// 微信小程序原生API性能优化
diff --git a/pages.json b/pages.json
index 8a5ad96..a952d48 100644
--- a/pages.json
+++ b/pages.json
@@ -14,7 +14,8 @@
"path": "pages/login/login",
"style": {
"navigationBarTitleText": "",
- "navigationStyle": "custom" //禁用原生导航栏，微信小程序可用
+ "navigationStyle": "custom" ,//禁用原生导航栏，微信小程序可用
+ "navigationBarTextStyle": "white"
}
}, {
"path": "pages/tabbar/pagehome/pagehome",
@@ -219,7 +220,34 @@
"enablePullDownRefresh": false
}
- }]
+ } ,{
+ "path" : "new-product/new-product",
+ "style" :
+ {
+ "navigationBarTitleText": "",
+ "enablePullDownRefresh": false
+ }
+
+ }
+ ,{
+ "path" : "plan-fault/plan-fault",
+ "style" :
+ {
+ "navigationBarTitleText": "",
+ "enablePullDownRefresh": false
+ }
+
+ }
+ ,{
+ "path" : "plan-fault-product-detail/detail",
+ "style" :
+ {
+ "navigationBarTitleText": "",
+ "enablePullDownRefresh": false
+ }
+
+ }
+ ]
}
],
diff --git a/pages/guide-page/guide-page.vue b/pages/guide-page/guide-page.vue
index 39e088c..26d9513 100644
--- a/pages/guide-page/guide-page.vue
+++ b/pages/guide-page/guide-page.vue
@@ -62,5 +62,5 @@
diff --git a/pages/login/login.vue b/pages/login/login.vue
index a9df0a5..e6a7b2f 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -92,7 +92,6 @@
affiliation: this.login_unitName // 单位名称
}
this.$requst.post('/universal/api.login/login',params).then(res=>{
- this.login_unitName = 95
if(res.code==1) {
this.$toolAll.tools.showToast('登录成功');
// 缓存token和角色类型
@@ -250,5 +249,5 @@
}
diff --git a/pages/register/register.vue b/pages/register/register.vue
index 02c3d46..6986833 100644
--- a/pages/register/register.vue
+++ b/pages/register/register.vue
@@ -275,5 +275,5 @@
diff --git a/pages/tabbar/my/my.vue b/pages/tabbar/my/my.vue
index b216166..d03f410 100644
--- a/pages/tabbar/my/my.vue
+++ b/pages/tabbar/my/my.vue
@@ -1,13 +1,14 @@
-
-
+
+
+
个人中心
-
+
-
+
-
+
@@ -63,6 +64,7 @@
components:{statusNavSlot,cmdProgress,'foot-tab' :footTabOne},
data() {
return {
+ newHeight: uni.getSystemInfoSync().statusBarHeight + 50,
backgroudColor:'rgba(255,255,255,0)',
newColor:'rgba(255,255,255,1)',
headList:[
@@ -110,6 +112,13 @@
this.$toolAll.tools.showToast('退出成功');
// 清除所有缓存
uni.clearStorageSync();
+ // 配置全局域名
+ // #ifdef APP-PLUS
+ uni.setStorageSync('hostapi','http://maintain.7and5.cn');
+ // #endif
+ // #ifdef H5
+ uni.setStorageSync('hostapi','/web');
+ // #endif
setTimeout(()=>{
uni.reLaunch({
url:'/pages/login/login'
@@ -142,6 +151,12 @@
uni.navigateTo({
url:urls[index]
})
+ },
+ // 前往设置页面
+ goSetUp(){
+ uni.navigateTo({
+ url:'/pagesB/set-up/set-up'
+ })
}
}
}
diff --git a/pages/tabbar/pagehome/pagehome.vue b/pages/tabbar/pagehome/pagehome.vue
index c83f8f1..295bbc2 100644
--- a/pages/tabbar/pagehome/pagehome.vue
+++ b/pages/tabbar/pagehome/pagehome.vue
@@ -163,7 +163,7 @@
其他
-
+
{{item.title}}
@@ -172,7 +172,7 @@
-
+
畅想智能-场景化设计
解决方案Solution
@@ -182,9 +182,9 @@
-
+
- {{item.title}}
+ {{item.title}}
@@ -192,8 +192,8 @@
- 常见故障Common faults
-
+ 常见故障Common faults
+
{{item.title}}
{{item.content}}
@@ -224,7 +224,7 @@
},
data() {
return {
- role: 3, // 0:表示客户 1：表示工程师 2:表示客服 3：业务员
+ role: 0, // 0:表示客户 1：表示工程师 2:表示客服 3：业务员
statusHeight: uni.getSystemInfoSync().statusBarHeight + 50,
messageNumber: 16 ,// 消息数量
noticeList:['2021年11月06日公司团建，维修服务暂停一天服务暂停一天服务暂停一天。','51akslfj;dkpiojasdjf;j1ij'],//公告
@@ -322,7 +322,30 @@
methods: {
goNoticeDetail(e){
console.log(e);
- }
+ },
+ // 其他分类下的点击事件
+ otherEv(index) {
+ let otherUrls = [
+ '',
+ '',
+ '/pagesB/new-product/new-product',
+ ];
+ uni.navigateTo({
+ url:otherUrls[index]
+ })
+ },
+ // 前往解决方案、常见故障列表
+ goPlant(index){
+ uni.navigateTo({
+ url:`/pagesB/plan-fault/plan-fault?index=${index}`
+ })
+ },
+ // 前往解决方案详情、常见故障详情
+ goDetail(index) {
+ uni.navigateTo({
+ url:`/pagesB/plan-fault-product-detail/detail?index=${index}`
+ })
+ },
}
}
diff --git a/pagesB/new-product/new-product.vue b/pagesB/new-product/new-product.vue
new file mode 100644
index 0000000..9b4b0f3
--- /dev/null
+++ b/pagesB/new-product/new-product.vue
@@ -0,0 +1,47 @@
+
+
+
+
+
+
+
+
+ 智能会议平板交互电子白板会议一体机视 频会议多媒体教学培训
+
+ 联系在线客服
+
+
+ 起订量：1台起批
+ 1135想采购
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pagesB/plan-fault-product-detail/detail.vue b/pagesB/plan-fault-product-detail/detail.vue
new file mode 100644
index 0000000..ed5d4e1
--- /dev/null
+++ b/pagesB/plan-fault-product-detail/detail.vue
@@ -0,0 +1,42 @@
+
+
+
+
+
+
+ 智能会议平板交互电子白板会议一体机 视频会议多媒体教学培训
+ 2022-01-05 12:59
+
+
+ 霜降，是二十四节气中的第十八个节气，秋季的最后一个节气。斗指戌；太阳黄经为210°；于每年公历10月23—24日交
+
+
+
+
+
+
+
+
+
+
diff --git a/pagesB/plan-fault/plan-fault.vue b/pagesB/plan-fault/plan-fault.vue
new file mode 100644
index 0000000..f1dda3e
--- /dev/null
+++ b/pagesB/plan-fault/plan-fault.vue
@@ -0,0 +1,60 @@
+
+
+
+
+
+
+
+
+
+
+ 小型会议室解决方案小
+ 课程的内容课程的内容课程的内容课程的内容课程的内容课程的内容课程的内容课程....
+
+
+
+ 热度：
+
+ 344人已查阅
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pagesB/set-up/set-up.vue b/pagesB/set-up/set-up.vue
index a0c08b2..584c9c2 100644
--- a/pagesB/set-up/set-up.vue
+++ b/pagesB/set-up/set-up.vue
@@ -17,7 +17,7 @@
清除缓存
- {{cacheSize}} KB
+ {{cacheSize}}
上门服务条款
@@ -83,11 +83,11 @@
plus.cache.calculate(function(size) { //size是多少个字节单位是b
//做下面相应的处理
if (size < 1024) {
- self.cacheSize = size + 'B';
+ self.cacheSize = size + ' B';
} else if (size / 1024 >= 1 && size / 1024 / 1024 < 1) {
- self.cacheSize = Math.floor(size / 1024 * 100) / 100 + 'KB';
+ self.cacheSize = Math.floor(size / 1024 * 100) / 100 + ' KB';
} else if (size / 1024 / 1024 >= 1) {
- self.cacheSize = Math.floor(size / 1024 / 1024 * 100) / 100 + 'M';
+ self.cacheSize = Math.floor(size / 1024 / 1024 * 100) / 100 + ' M';
}
});
// #endif
diff --git a/static/public/icon-plan-fire.png b/static/public/icon-plan-fire.png
new file mode 100644
index 0000000..129fc72
Binary files /dev/null and b/static/public/icon-plan-fire.png differ