Skip to content

S
self-support
Commit fb31a673 authored by 高铭波's avatar 高铭波
Browse files
Options

Merge branch 'master' into dev 

# Conflicts:
#	src/pages.json
#	src/pages/index/learn.vue
#	src/utils/util.js
parents d9db56f4 d6a9df62
Hide whitespace changes
Inline Side-by-side
Showing with 160 additions and 153 deletions
src/pages.json
View file @ fb31a673
...@@ -5,13 +5,12 @@ ...@@ -5,13 +5,12 @@
"^u-(.*)": "@/uview-ui/components/u-$1/u-$1.vue" "^u-(.*)": "@/uview-ui/components/u-$1/u-$1.vue"
} }
}, },
"pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages "pages": [
{ {
"path": "pages/index/index", "path": "pages/index/index",
"style": { "style": {
"navigationBarTitleText": "首页", "navigationBarTitleText": "首页",
"navigationStyle": "custom", "navigationStyle": "custom",
// "enablePullDownRefresh": true,
"disableScroll": true "disableScroll": true
} }
}, },
...@@ -27,28 +26,28 @@ ...@@ -27,28 +26,28 @@
"path": "pages/index/learn", "path": "pages/index/learn",
"style": { "style": {
"navigationBarTitleText": "学习", "navigationBarTitleText": "学习",
"navigationStyle":"custom",//隐藏系统导航栏 "navigationStyle": "custom",
"disableScroll": true "disableScroll": true
} }
}, },
{ {
"path": "pages/index/mine", "path": "pages/index/mine",
"style": { "style": {
"navigationBarTitleText": "我的", "navigationBarTitleText": "我的",
"navigationStyle": "custom" , "navigationStyle": "custom",
"disableScroll": true "disableScroll": true
} }
}, },
{ {
"path": "pages/login/index", "path": "pages/login/index",
"style": { "style": {
// "navigationBarTitleText": "授权登录", "navigationBarBackgroundColor": "#FFFFFF",
"navigationBarBackgroundColor":"#FFFFFF",
"disableScroll": true "disableScroll": true
} }
} }
], ],
"subPackages": [{ "subPackages": [
{
"root": "pages/exam", "root": "pages/exam",
"pages": [ "pages": [
{ {
...@@ -74,42 +73,42 @@ ...@@ -74,42 +73,42 @@
"path": "assessment", "path": "assessment",
"style": { "style": {
"navigationBarTitleText": "认证介绍", "navigationBarTitleText": "认证介绍",
"navigationStyle":"custom" "navigationStyle": "custom"
} }
}, },
{ {
"path": "answer", "path": "answer",
"style": { "style": {
"navigationBarTitleText": "考核认证", "navigationBarTitleText": "考核认证",
"navigationStyle":"custom" "navigationStyle": "custom"
} }
}, },
{ {
"path":"result", "path": "result",
"style":{ "style": {
"navigationBarTitleText":"", "navigationBarTitleText": "",
"navigationStyle":"custom" "navigationStyle": "custom"
} }
}, },
{ {
"path": "news-details", "path": "news-details",
"style": { "style": {
"navigationBarTitleText": "", "navigationBarTitleText": "",
"navigationStyle":"custom" "navigationStyle": "custom"
} }
}, },
{ {
"path":"section", "path": "section",
"style" :{ "style": {
"navigationBarTitleText": "", "navigationBarTitleText": "",
"navigationStyle":"custom" "navigationStyle": "custom"
} }
}, },
{ {
"path": "curriculum", "path": "curriculum",
"style": { "style": {
"navigationBarTitleText": "", "navigationBarTitleText": "",
"navigationStyle": "custom" // 隐藏系统导航栏 "navigationStyle": "custom"
} }
}, },
{ {
...@@ -117,7 +116,7 @@ ...@@ -117,7 +116,7 @@
"style": { "style": {
"navigationBarTitleText": "在线考试", "navigationBarTitleText": "在线考试",
"enablePullDownRefresh": false, "enablePullDownRefresh": false,
"navigationStyle": "custom", // 隐藏系统导航栏 "navigationStyle": "custom",
"disableScroll": true "disableScroll": true
} }
}, },
...@@ -125,18 +124,18 @@ ...@@ -125,18 +124,18 @@
"path": "course-detail", "path": "course-detail",
"style": { "style": {
"navigationBarTitleText": "培训视频", "navigationBarTitleText": "培训视频",
"navigationBarBackgroundColor":"#F4F5F7", "navigationBarBackgroundColor": "#F4F5F7",
"enablePullDownRefresh": false, "enablePullDownRefresh": false,
"navigationStyle": "custom", // 隐藏系统导航栏 "navigationStyle": "custom",
"disableScroll": true "disableScroll": true
} }
}, },
{ {
"path": "exam-pass", "path": "exam-pass",
"style": { "style": {
"navigationBarTitleText": "", "navigationBarTitleText": "",
"enablePullDownRefresh": false, "enablePullDownRefresh": false,
"navigationStyle": "custom" // 隐藏系统导航栏 "navigationStyle": "custom"
} }
} }
] ]
...@@ -149,7 +148,7 @@ ...@@ -149,7 +148,7 @@
"style": { "style": {
"navigationBarTitleText": "收获地址", "navigationBarTitleText": "收获地址",
"enablePullDownRefresh": false, "enablePullDownRefresh": false,
"navigationStyle": "custom", // 隐藏系统导航栏 "navigationStyle": "custom",
"disableScroll": true "disableScroll": true
} }
}, },
...@@ -158,7 +157,7 @@ ...@@ -158,7 +157,7 @@
"style": { "style": {
"navigationBarTitleText": "修改地址", "navigationBarTitleText": "修改地址",
"enablePullDownRefresh": false, "enablePullDownRefresh": false,
"navigationStyle": "custom", // 隐藏系统导航栏 "navigationStyle": "custom",
"disableScroll": true "disableScroll": true
} }
}, },
...@@ -168,8 +167,8 @@ ...@@ -168,8 +167,8 @@
"navigationBarTitleText": "我的钱包", "navigationBarTitleText": "我的钱包",
"enablePullDownRefresh": false, "enablePullDownRefresh": false,
"disableScroll": true, "disableScroll": true,
"navigationStyle": "custom", // 隐藏系统导航栏 "navigationStyle": "custom",
"navigationBarBackgroundColor":"#F4F5F7" "navigationBarBackgroundColor": "#F4F5F7"
} }
}, },
{ {
...@@ -178,8 +177,8 @@ ...@@ -178,8 +177,8 @@
"navigationBarTitleText": "提现", "navigationBarTitleText": "提现",
"enablePullDownRefresh": false, "enablePullDownRefresh": false,
"disableScroll": true, "disableScroll": true,
"navigationStyle": "custom", // 隐藏系统导航栏 "navigationStyle": "custom",
"navigationBarBackgroundColor":"#F4F5F7" "navigationBarBackgroundColor": "#F4F5F7"
} }
}, },
{ {
...@@ -188,8 +187,8 @@ ...@@ -188,8 +187,8 @@
"navigationBarTitleText": "收入流水", "navigationBarTitleText": "收入流水",
"enablePullDownRefresh": false, "enablePullDownRefresh": false,
"disableScroll": true, "disableScroll": true,
"navigationStyle": "custom", // 隐藏系统导航栏 "navigationStyle": "custom",
"navigationBarBackgroundColor":"#F4F5F7" "navigationBarBackgroundColor": "#F4F5F7"
} }
}, },
{ {
...@@ -198,80 +197,77 @@ ...@@ -198,80 +197,77 @@
"navigationBarTitleText": "结算账单", "navigationBarTitleText": "结算账单",
"enablePullDownRefresh": false, "enablePullDownRefresh": false,
"disableScroll": true, "disableScroll": true,
"navigationStyle": "custom", // 隐藏系统导航栏 "navigationStyle": "custom",
"navigationBarBackgroundColor":"#F4F5F7" "navigationBarBackgroundColor": "#F4F5F7"
} }
}, },
{ {
"path": "cert/index", "path": "cert/index",
"style": { "style": {
"navigationBarTitleText": "我的证件", "navigationBarTitleText": "我的证件",
"navigationStyle":"custom", "navigationStyle": "custom",
"disableScroll": true "disableScroll": true
} }
}, },
{ {
"path": "cert/detail", "path": "cert/detail",
"style": { "style": {
"navigationBarTitleText": "",//证件详情 "navigationBarTitleText": "证件详情",
"navigationStyle":"custom" "navigationStyle": "custom"
} }
}, },
{ {
"path": "cert/upload", "path": "cert/upload",
"style": { "style": {
"navigationBarTitleText": "",//证件上传 "navigationBarTitleText": "证件上传",
"navigationStyle":"custom" "navigationStyle": "custom"
} }
}, },
{ {
"path":"contract/index", "path": "contract/index",
"style":{ "style": {
"navigationBarTitleText":"",//我的合同 "navigationBarTitleText": "我的合同",
"navigationStyle":"custom" "navigationStyle": "custom"
} }
}, },
{ {
"path":"contract/out", "path": "contract/out",
"style":{ "style": {
"navigationBarTitleText":"" "navigationBarTitleText": ""
}
} },
}, {
{ "path": "customer/index",
"path": "customer/index", "style": {
"style": { "navigationStyle": "custom",
"navigationStyle":"custom",
"navigationBarTitleText": "联系客服", "navigationBarTitleText": "联系客服",
"enablePullDownRefresh": false, "enablePullDownRefresh": false,
"disableScroll": true "disableScroll": true
} }
}, },
{ {
"path": "deposit/index", "path": "deposit/index",
"style": { "style": {
"navigationStyle":"custom", "navigationStyle": "custom",
"navigationBarTitleText": "配件押金", "navigationBarTitleText": "配件押金",
"enablePullDownRefresh": false "enablePullDownRefresh": false
} }
}, },
{ {
"path": "warehouse/index", "path": "warehouse/index",
"style": { "style": {
"navigationStyle":"custom", "navigationStyle": "custom",
"navigationBarTitleText": "我的仓库", "navigationBarTitleText": "我的仓库",
"enablePullDownRefresh": false "enablePullDownRefresh": false
} }
}, },
{
{ "path": "superLogin/index",
"path": "superLogin/index", "style": {
"style": { "navigationBarTitleText": ""
"navigationBarTitleText": "" }
}
} }
] ]
}, },
{ {
"root": "pages/order", "root": "pages/order",
...@@ -279,7 +275,7 @@ ...@@ -279,7 +275,7 @@
{ {
"path": "complete", "path": "complete",
"style": { "style": {
"navigationBarTitleText": "", "navigationBarTitleText": "订单完工",
"navigationStyle": "custom", "navigationStyle": "custom",
"disableScroll": true "disableScroll": true
} }
...@@ -287,49 +283,44 @@ ...@@ -287,49 +283,44 @@
{ {
"path": "feedback", "path": "feedback",
"style": { "style": {
"navigationBarTitleText": "", "navigationBarTitleText": "过程反馈",
"enablePullDownRefresh": false, "enablePullDownRefresh": false,
"navigationStyle": "custom", // 隐藏系统导航栏 "navigationStyle": "custom",
"disableScroll": true "disableScroll": true
} }
}, },
{ {
"path": "refuse", "path": "refuse",
"style": { "style": {
"navigationBarTitleText": "", "navigationBarTitleText": "订单拒单",
"enablePullDownRefresh": false, "enablePullDownRefresh": false,
"navigationStyle": "custom", // 隐藏系统导航栏 "navigationStyle": "custom",
"disableScroll": true "disableScroll": true
} }
}, },
{ {
"path" : "detail", "path": "detail",
"style" : "style": {
{
"navigationBarTitleText": "订单详情", "navigationBarTitleText": "订单详情",
"navigationStyle": "custom", "navigationStyle": "custom",
"disableScroll": true "disableScroll": true
} }
},
}, {
{ "path": "search",
"path" : "search", "style": {
"style" : "navigationBarTitleText": "订单搜索",
{ "enablePullDownRefresh": false,
"navigationBarTitleText": "订单搜索", "navigationBarBackgroundColor": "#F4F5F7"
"enablePullDownRefresh": false, }
"navigationBarBackgroundColor":"#F4F5F7" },
} {
}, "path": "material",
{ "style": {
"path" : "material", "navigationBarTitleText": "勘察材料",
"style" : "enablePullDownRefresh": false,
{ "navigationBarBackgroundColor": "#FFFFFF"
"navigationBarTitleText": "勘察材料", }
"enablePullDownRefresh": false,
"navigationBarBackgroundColor":"#FFFFFF"
}
} }
] ]
}, },
...@@ -340,22 +331,22 @@ ...@@ -340,22 +331,22 @@
"path": "index", "path": "index",
"style": { "style": {
"navigationBarTitleText": "拍照小工具", "navigationBarTitleText": "拍照小工具",
"navigationBarBackgroundColor":"#FFFFFF", "navigationBarBackgroundColor": "#FFFFFF",
"backgroundColor":"#F4F5F7" "backgroundColor": "#F4F5F7"
} }
}, },
{ {
"path": "setting", "path": "setting",
"style": { "style": {
"navigationBarTitleText": "水印设置", "navigationBarTitleText": "水印设置",
"navigationBarBackgroundColor":"#FFFFFF", "navigationBarBackgroundColor": "#FFFFFF",
"backgroundColor":"#F4F5F7" "backgroundColor": "#F4F5F7"
} }
}, },
{ {
"path": "take", "path": "take",
"style": { "style": {
"navigationStyle":"custom", "navigationStyle": "custom",
"navigationBarTitleText": "拍照", "navigationBarTitleText": "拍照",
"navigationBarBackgroundColor": "#333333", "navigationBarBackgroundColor": "#333333",
"navigationBarTextStyle": "#FFFFFF", "navigationBarTextStyle": "#FFFFFF",
...@@ -366,18 +357,18 @@ ...@@ -366,18 +357,18 @@
"path": "preview", "path": "preview",
"style": { "style": {
"navigationBarTitleText": "照片预览", "navigationBarTitleText": "照片预览",
"navigationBarBackgroundColor":"#333333", "navigationBarBackgroundColor": "#333333",
"backgroundColor":"#FFFFFF", "backgroundColor": "#FFFFFF",
"navigationBarTextStyle":"white" "navigationBarTextStyle": "white"
} }
}, },
{ {
"path": "list", "path": "list",
"style": { "style": {
"navigationBarTitleText": "规范展示", "navigationBarTitleText": "规范展示",
"navigationBarBackgroundColor":"#FFFFFF", "navigationBarBackgroundColor": "#FFFFFF",
"backgroundColor":"#F4F5F7", "backgroundColor": "#F4F5F7",
"navigationStyle": "custom", // 隐藏系统导航栏 "navigationStyle": "custom",
"disableScroll": true "disableScroll": true
} }
} }
...@@ -390,7 +381,7 @@ ...@@ -390,7 +381,7 @@
"path": "index", "path": "index",
"style": { "style": {
"navigationBarTitleText": "入驻", "navigationBarTitleText": "入驻",
"navigationStyle": "custom", // 隐藏系统导航栏 "navigationStyle": "custom",
"disableScroll": true "disableScroll": true
} }
}, },
...@@ -436,7 +427,7 @@ ...@@ -436,7 +427,7 @@
"path": "sign-contract", "path": "sign-contract",
"style": { "style": {
"navigationBarTitleText": "签约页面", "navigationBarTitleText": "签约页面",
"navigationStyle": "custom", // 隐藏系统导航栏 "navigationStyle": "custom",
"disableScroll": true "disableScroll": true
} }
}, },
...@@ -454,7 +445,11 @@ ...@@ -454,7 +445,11 @@
"preloadRule": { "preloadRule": {
"pages/index/index": { "pages/index/index": {
"network": "all", "network": "all",
"packages": ["pages/order", "pages/learn", "pages/mine"] "packages": [
"pages/order",
"pages/learn",
"pages/mine"
]
} }
}, },
"globalStyle": { "globalStyle": {
......
src/pages/index/learn.vue
View file @ fb31a673
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
</view> </view>
</scroll-view> </scroll-view>
</swiper-item> </swiper-item>
<swiper-item @touchmove.stop.prevent="stopTouchMove"> <swiper-item @touchmove.stop.prevent="stopTouchMove" v-if="version">
<scroll-view scroll-y style="height:100%;width:100%;"> <scroll-view scroll-y style="height:100%;width:100%;">
<view class="title u-margin-top-10 u-margin-bottom-30">通用课程</view> <view class="title u-margin-top-10 u-margin-bottom-30">通用课程</view>
<view class="learn-currency-class"> <view class="learn-currency-class">
...@@ -231,12 +231,12 @@ var json = { ...@@ -231,12 +231,12 @@ var json = {
sectionId: "", sectionId: "",
}, },
{ {
title: "充电桩安装要点提示", title: "学习-我的模块",
desc: "在充电装安装过程中需要着重注意的要点", desc: "学习-我的模块",
pic: process.uniEnv.qn_base_url + "cdz-3x-v2.png", pic: process.uniEnv.qn_base_url + "cdz-3x-v2.png",
percent: 0, percent: 0,
status: "", status: "",
id: 151, id: 152,
sectionId: "", sectionId: "",
}, },
], ],
...@@ -392,6 +392,17 @@ export default { ...@@ -392,6 +392,17 @@ export default {
name: "考核认证", name: "考核认证",
}, },
], ],
tabs2: [
{
name: "交付规范",
},
{
name: "消息通知",
},
{
name: "考核认证",
},
],
bofang: process.uniEnv.qn_base_url + "bofang@3x.png", bofang: process.uniEnv.qn_base_url + "bofang@3x.png",
current: 0, current: 0,
swiperCurrent: 0, swiperCurrent: 0,
...@@ -474,7 +485,7 @@ export default { ...@@ -474,7 +485,7 @@ export default {
isReflesh: true, isReflesh: true,
triggered: false, triggered: false,
_freshing: false, _freshing: false,
version: false, version: true,
}; };
}, },
onLoad(param) { onLoad(param) {
...@@ -512,8 +523,9 @@ export default { ...@@ -512,8 +523,9 @@ export default {
.getVersionInfo(version) .getVersionInfo(version)
.then((res) => { .then((res) => {
let data = res.data; let data = res.data;
if(data.hasOwnProperty('is_audit') && data.is_audit == 1){ if(data.hasOwnProperty('is_audit') && data.is_audit == 0){
that.tabs = that.tabs2; that.tabs = that.tabs2;
that.version = false
} }
}) })
.catch((err) => { .catch((err) => {
......
src/utils/util.js
View file @ fb31a673
...@@ -38,14 +38,14 @@ const setOpenid = function (openid) { ...@@ -38,14 +38,14 @@ const setOpenid = function (openid) {
function validImages(imgurl) { function validImages(imgurl) {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
uni.getImageInfo({ uni.getImageInfo({
src: imgurl, src: imgurl,
success (res) { success(res) {
resolve(true) resolve(true)
}, },
fail () { fail() {
reject(false) reject(false)
} }
}) })
}) })
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment