Skip to content

S
self-support
Commit 00c56ae2 authored by Damon's avatar Damon
Browse files
Options

Merge branch 'master' of https://git.banshouhui.com/lijundan/self-support

parents bfda1277 6cd34ecf
Show whitespace changes
Inline Side-by-side
Showing with 133 additions and 38 deletions
src/App.vue
View file @ 00c56ae2
...@@ -145,8 +145,12 @@ export default { ...@@ -145,8 +145,12 @@ export default {
wxAppNo: that.globalData.wxAppNo, // 自营平台小程序 wxAppNo: that.globalData.wxAppNo, // 自营平台小程序
}; };
let result = await that.$u.api.loginWechatAuth(params) let result = await that.$u.api.loginWechatAuth(params)
if (result && result.code == 200 && result.data) { if (result && result.code == 200 && result.data && result.data.token) {
that.setUserData(result.data); that.setUserData(result.data);
} else {
uni.navigateTo({
url: "pages/login/index"
})
} }
} else { } else {
uni.showModal({ uni.showModal({
......
src/components/complete-check/complete-check.vue
View file @ 00c56ae2
...@@ -24,13 +24,14 @@ ...@@ -24,13 +24,14 @@
'color': '#FFFFFF', 'color': '#FFFFFF',
}" }"
:confirm-text="confirmText" :confirm-text="confirmText"
@confirm="confirmModel" ref="checkModel" @cancel="cancel"
@confirm="confirm" ref="checkModel"
:show-cancel-button="true" :show-cancel-button="true"
:show-title="false"> :show-title="false">
<view class="slot-content"> <view class="slot-content">
<view class="check-status"> <view class="check-status">
<u-image width="224rpx" height="224rpx" :src="statusImage"></u-image> <u-image width="224rpx" height="224rpx" :src="statusImage"></u-image>
<text class="check-status-txt">{{statusTxt}}</text> <text :class="['status-txt', { 'pass-color': pass }]">{{statusTxt}}</text>
</view> </view>
<view class="check-list"> <view class="check-list">
<view class="u-flex u-row-between list-title"> <view class="u-flex u-row-between list-title">
...@@ -50,7 +51,7 @@ ...@@ -50,7 +51,7 @@
size="32"></u-icon> size="32"></u-icon>
</view> </view>
<view class="item-txt">{{item.submitted}}/{{item.required}}</view> <view class="item-txt">{{item.submitted}}/{{item.required}}</view>
<view class="item-txt" :class="item.pass ? 'pass-color' : 'no-pass-color'"> <view :class="['item-txt', item.pass ? 'pass-color' : 'no-pass-color']">
{{item.pass ? "通过" : "未通过"}} {{item.pass ? "通过" : "未通过"}}
</view> </view>
</view> </view>
...@@ -64,6 +65,10 @@ ...@@ -64,6 +65,10 @@
export default { export default {
name:"complete-check", name:"complete-check",
props: { props: {
show: {
type: Boolean,
default: true
},
pass: { pass: {
type: Boolean, type: Boolean,
default: false default: false
...@@ -72,7 +77,7 @@ ...@@ -72,7 +77,7 @@
type: Array, type: Array,
default(){ default(){
return [ return [
{label: '基本信息', submitted: 3, required: 3, pass: false}, {label: '基本信息', submitted: 3, required: 3, pass: true},
{label: '勘察信息', submitted: 20, required: 20, pass: true}, {label: '勘察信息', submitted: 20, required: 20, pass: true},
{label: '安装信息', submitted: 15, required: 20, pass: false} {label: '安装信息', submitted: 15, required: 20, pass: false}
] ]
...@@ -81,7 +86,6 @@ ...@@ -81,7 +86,6 @@
}, },
data() { data() {
return { return {
show: true,
}; };
}, },
computed: { computed: {
...@@ -102,6 +106,9 @@ ...@@ -102,6 +106,9 @@
noPassIcon() { return process.uniEnv.qn_base_url + 'icon/no-pass.png'}, noPassIcon() { return process.uniEnv.qn_base_url + 'icon/no-pass.png'},
}, },
methods: { methods: {
cancel() {
this.$emit('close')
},
confirm() { confirm() {
if(this.pass) { if(this.pass) {
uni.navigateTo({ uni.navigateTo({
...@@ -114,6 +121,7 @@ ...@@ -114,6 +121,7 @@
this.$emit('handle-problem', data) this.$emit('handle-problem', data)
} }
} }
}, },
} }
</script> </script>
...@@ -127,7 +135,7 @@ ...@@ -127,7 +135,7 @@
flex-direction: column; flex-direction: column;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
.check-status-txt { .status-txt {
height: 46rpx; height: 46rpx;
font-size: 40rpx; font-size: 40rpx;
font-weight: bold; font-weight: bold;
...@@ -159,10 +167,10 @@ ...@@ -159,10 +167,10 @@
line-height: 32rpx; line-height: 32rpx;
} }
.pass-color { .pass-color {
color: #2272FF; color: #2272FF !important;
} }
.no-pass-color { .no-pass-color {
color: #FA5A49; color: #FA5A49 !important;;
} }
.u-border-top { .u-border-top {
......
src/components/createCom/XhInput.vue
View file @ 00c56ae2
<!-- ******************* 输入框 ******************* --> <!-- ******************* 输入框 ******************* -->
<template> <template>
<view> <view>
<u-input :type="type" class="input-item" v-model="dataValue" @input="valueChange" :border="true" placeholder="请输入" /> <u-input :type="type" class="input-item" v-model="dataValue" @input="valueChange" :placeholder="placeholder" placeholder-style="placeholderStyle"
custom-style="customStyle"/>
</view> </view>
</template> </template>
...@@ -11,7 +12,12 @@ ...@@ -11,7 +12,12 @@
name: 'XhInput', // 新建 input name: 'XhInput', // 新建 input
components: {}, components: {},
mixins: [stringMixin], mixins: [stringMixin],
props: {}, props: {
placeholder: {
type: String,
default: '请输入'
}
},
data() { data() {
return {} return {}
}, },
...@@ -22,6 +28,16 @@ ...@@ -22,6 +28,16 @@
} else { } else {
return 'text' return 'text'
} }
},
placeholderStyle() {
return 'color:#FFFFFF;font-size:26rpx'
},
customStyle() {
return {
'background-color': '#F4F5F7',
'border-radius': '12rpx',
'color': '#ff0000'
}
} }
}, },
watch: {}, watch: {},
......
src/pages/learn/index.vue
View file @ 00c56ae2
...@@ -9,13 +9,26 @@ ...@@ -9,13 +9,26 @@
:current="current" @change="tabsChange" :is-scroll="false" swiperWidth="750"></u-tabs-swiper> :current="current" @change="tabsChange" :is-scroll="false" swiperWidth="750"></u-tabs-swiper>
</view> </view>
<swiper :current="swiperCurrent" @transition="transition" @animationfinish="animationfinish" <swiper :current="swiperCurrent" @transition="transition" @animationfinish="animationfinish"
style="height: 755rpx;"> style="height: 755rpx;padding-top: 30rpx;">
<swiper-item class="swiper-item"> <swiper-item class="swiper-item">
<scroll-view scroll-y style="height:796rpx;width:100%;" @scrolltolower="onreachBottom"> <scroll-view scroll-y style="height:796rpx;width:100%;" @scrolltolower="onreachBottom">
<view class="standard" @click="goToPrint"> <view class="currency-class" :style="{'background-image':'url(/static/photo/jianbian@3x.png)'}">
<text>充电桩交付规范</text> <view class="class1" @click=ccc(courselist[0].id)>
<text>></text> <image class="img" :src="rule.pic" mode=""></image>
<view class="right u-margin-left-30 u-padding-top-10 u-padding-bottom-14 width-360">
<view class="u-font-32 font-bold">
充电桩交付规范
</view>
<view class="u-font-24">
请点击学习
</view>
</view> </view>
<view class="line-percent">
<text class="font-default-color">去查看</text>
</view>
</view>
</view>
</scroll-view> </scroll-view>
</swiper-item> </swiper-item>
<swiper-item class="swiper-item"> <swiper-item class="swiper-item">
...@@ -199,6 +212,9 @@ ...@@ -199,6 +212,9 @@
start: 0, start: 0,
}, },
list: [], list: [],
rule: {
pic: process.uniEnv.qn_base_url + "guifan1@3x.png"
},
courselist: [{ courselist: [{
title: '服务规范', title: '服务规范',
desc: '为用户提供更好服务，自己赚更多钱', desc: '为用户提供更好服务，自己赚更多钱',
...@@ -473,14 +489,12 @@ ...@@ -473,14 +489,12 @@
console.log(that.exam); console.log(that.exam);
if (res.data.examStatus == 2) { if (res.data.examStatus == 2) {
console.log("examStatus " + i + " 2"); console.log("examStatus " + i + " 2");
that.applyExam();
return; return;
} }
if (res.data.examStatus == 1) { if (res.data.examStatus == 1) {
console.log("examStatus " + i + " 1"); console.log("examStatus " + i + " 1");
that.examList[i].isComplete = true; that.examList[i].isComplete = true;
that.examScore = res.data.examScore; that.examScore = res.data.examScore;
that.postResult();
return; return;
} }
if (res.data.examStatus == 0) { if (res.data.examStatus == 0) {
...@@ -532,12 +546,17 @@ ...@@ -532,12 +546,17 @@
/* //交付规范 */ /* //交付规范 */
.standard { .standard {
width: 656rpx; width: 690rpx;
height: 180rpx;
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
border-bottom: 1rpx solid #82848a; /* border-bottom: 1rpx solid #82848a; */
padding: 0 34rpx; /* padding: 0 34rpx; */
margin: 72rpx auto; /* margin: 72rpx auto; */
border-radius: 12rpx;
padding: 30rpx;
margin-top: 30rpx;
background-color: #FFFFFF;
} }
/* //培训通知 */ /* //培训通知 */
...@@ -549,18 +568,22 @@ ...@@ -549,18 +568,22 @@
overflow: hidden; overflow: hidden;
background-color: #ffffff; background-color: #ffffff;
border-radius: 12rpx; border-radius: 12rpx;
padding: 30rpx;
} }
.n-head { .n-head {
text-align: left; text-align: left;
/* margin: 30rpx 30rpx 0 30rpx;
*/ margin-left: 30rpx;
} }
.news { .news {
height: 168rpx; height: 168rpx;
overflow: hidden; overflow: hidden;
/* margin: 30rpx 30rpx 0 30rpx; */ margin-top: 30rpx;
/* margin-top: 30rpx;
margin-left: 30rpx;
margin-right: 30rpx;
margin-bottom: 0; */
} }
/* //在线学习 */ /* //在线学习 */
...@@ -665,4 +688,47 @@ ...@@ -665,4 +688,47 @@
.content-line { .content-line {
margin-top: 30rpx; margin-top: 30rpx;
} }
.standard {
}
.standard-img {
width: 160rpx;
height: 120rpx;
}
.standard-body {
height: 120rpx;
display: flex;
}
.standard-body-title {
font-size: 32rpx;
font-weight: bold;
}
.width-360 {
width: 360rpx;
}
.rule-back {
background-image: process.uniEnv.qn_base_url + "banner-xx@3x.png";
}
/* <view class="standard" @click="goToPrint">
<!-- <text>充电桩交付规范</text>
<text>></text> -->
<view class="standard-img"></view>
<view class="standard-body">
<view class="standard-body-title">
充电桩交付规范
</view>
<view class="standard-body-title">
请点击学习
</view>
</view>
<view cl ass="standard-go-look-look">去查看</view>*/
</style> </style>
src/pages/login/index.vue
View file @ 00c56ae2
...@@ -99,15 +99,15 @@ export default { ...@@ -99,15 +99,15 @@ export default {
return login.authorization(params); return login.authorization(params);
}).then(res => { }).then(res => {
uni.hideLoading(); uni.hideLoading();
if (res) { if (res && res.code == 200 && res.data && res.data.token) {
that.setUserData(res.data) that.setUserData(res.data)
that.goBackPage() that.goBackPage()
} else { } else {
this.setLoginStatus() that.setLoginStatus()
} }
}).catch(res => { }).catch(res => {
uni.hideLoading() uni.hideLoading()
this.setLoginStatus() that.setLoginStatus()
}) })
}, },
......
src/pages/order/complete.vue
View file @ 00c56ae2
<template> <template>
<view> <view class="com-content">
<view class="u-wrap" v-if="!takeStatus"> <view class="u-wrap" v-if="!takeStatus">
<u-navbar :background="{background: '#2272FF'}" back-icon-color="#fff" :title-size="26" title-color="#fff" :border-bottom="false" title="完工信息"></u-navbar> <u-navbar :background="{background: '#2272FF'}" back-icon-color="#fff" :title-size="26" title-color="#fff" :border-bottom="false" title="完工信息"></u-navbar>
<u-tabs-swiper ref="tabs" :current="tabIndex" name="panelName" :list="list" @change="tabsChange" :is-scroll="false" bg-color="#2272FF" inactive-color="#a6c6ff" active-color="#fff" height="120"></u-tabs-swiper> <u-tabs-swiper ref="tabs" :current="tabIndex" name="panelName" :list="list" @change="tabsChange" :is-scroll="false" bg-color="#2272FF" inactive-color="#a6c6ff" active-color="#fff" height="120"></u-tabs-swiper>
...@@ -502,6 +502,10 @@ ...@@ -502,6 +502,10 @@
.class-item { .class-item {
padding: 50rpx; padding: 50rpx;
margin-bottom: 30rpx;
background-color: #fff;
padding: 30rpx;
border-radius: 8rpx;
.title { .title {
font-weight: bold; font-weight: bold;
font-size: 32rpx; font-size: 32rpx;
...@@ -538,6 +542,10 @@ ...@@ -538,6 +542,10 @@
/* #endif */ /* #endif */
display: flex; display: flex;
flex-direction: column; flex-direction: column;
background-color: #FFFFFF;
background-image: linear-gradient(to top, #2272ff 0%, #2272ff 100%);
background-size: 750rpx 600rpx;
background-repeat: no-repeat;
} }
.u-search-box { .u-search-box {
...@@ -548,6 +556,7 @@ ...@@ -548,6 +556,7 @@
flex: 1; flex: 1;
display: flex; display: flex;
overflow: hidden; overflow: hidden;
border-radius: 12rpx 12rpx 0 0;
} }
.u-search-inner { .u-search-inner {
...@@ -611,13 +620,6 @@ ...@@ -611,13 +620,6 @@
padding: 16rpx; padding: 16rpx;
} }
.class-item {
margin-bottom: 30rpx;
background-color: #fff;
padding: 16rpx;
border-radius: 8rpx;
}
.class-item:last-child { .class-item:last-child {
min-height: 100vh; min-height: 100vh;
} }
......
src/pages/order/index.vue
View file @ 00c56ae2
...@@ -234,7 +234,6 @@ ...@@ -234,7 +234,6 @@
self.triggered = false; self.triggered = false;
self._freshing = false; self._freshing = false;
if (res.data.list) { if (res.data.list) {
res.data.list[0].currentOverTime = undefined
self.orderList.push(...res.data.list) self.orderList.push(...res.data.list)
if (self.list[self.types[res.data.type]]) { if (self.list[self.types[res.data.type]]) {
self.list[self.types[res.data.type]].total = res.data.total self.list[self.types[res.data.type]].total = res.data.total
......
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