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