Skip to content

R
repair_workers_h5
Commit 48cf7b31 authored by 郭欢's avatar 郭欢
Browse files
Options

Merge branch 'gh_test' into 'master' 

Gh test

See merge request !42
parents ca7a15af 0d033b16
Expand all Show whitespace changes
Inline Side-by-side
Showing with 2127 additions and 1796 deletions
public/index.html
View file @ 48cf7b31
......@@ -29,5 +29,26 @@
}
window.onresize = resizeRoot;
})(window);
// 强制禁止用户修改微信客户端的字体大小
(function() {
function handleFontSize() {
// 设置网页字体为默认大小
WeixinJSBridge.invoke('setFontSizeCallback', { 'fontSize' : 0 });
// 重写设置网页字体大小的事件
WeixinJSBridge.on('menu:setfont', function() {
WeixinJSBridge.invoke('setFontSizeCallback', { 'fontSize' : 0 });
});
}
if (typeof WeixinJSBridge == "object" && typeof WeixinJSBridge.invoke == "function") {
handleFontSize();
} else {
if (document.addEventListener) {
document.addEventListener("WeixinJSBridgeReady", handleFontSize, false);
} else if (document.attachEvent) {
document.attachEvent("WeixinJSBridgeReady", handleFontSize);
document.attachEvent("onWeixinJSBridgeReady", handleFontSize); }
}
})();
</script>
</html>
\ No newline at end of file
src/App.vue
View file @ 48cf7b31
<template>
<div id="app">
<keep-alive v-if="$route.meta.keepAlive">
<router-view />
<keep-alive >
<router-view v-if="$route.meta.keepAlive" />
</keep-alive>
<router-view v-else />
<router-view v-if="!$route.meta.keepAlive" />
<div class="goBack-btn flex-h flex-hc flex-align-center" v-if="!$route.meta.hideBack" >
<i class="iconfont icon-icon_fanhuishouye" @click="gohome"></i>
</div>
......
src/api/apiList.js
View file @ 48cf7b31
......@@ -10,8 +10,8 @@ const baseUrl = '/api'
// todo: url
// const httpUrl = 'https://repairtest.zeruiedu.com' // 测试接口
const httpUrl = 'https://repair.zeruiedu.com' // 正式接口
const h5Url = 'http://localhost:8080' // 测试h5线上地址
// const h5Url = 'http://repair.h5.zeruiedu.com' // 测试h5线上地址
// const h5Url = 'http://localhost:8080' // 测试h5线上地址
const h5Url = 'http://repair.h5.zeruiedu.com' // 测试h5线上地址
window.localStorage.setItem('httpUrl', httpUrl)
window.localStorage.setItem('h5Url', h5Url)
// const httpUrl = 'https://fenghexm.xueyoubangedu.com' // 正式接口
......
src/api/axios.js
View file @ 48cf7b31
......@@ -53,7 +53,7 @@ service.interceptors.response.use(
}, (err) => {
resolve(err)
window.localStorage.clear()
Toast('身份失效，请重新登录')
Toast('身份失效，请重新登录11111')
window.document.location = selfApi.WINDOWHREF_LOGIN // url-
console.log('错误--------', err)
})
......
src/api/wxShare.js
View file @ 48cf7b31
var wx = require('weixin-js-sdk')
import axios from 'axios'
import apiList from './apiList'
import myAxios from './index'
import {
Toast
} from 'vant'
var wx = require('weixin-js-sdk')
// 微信分享方法
const share = (param) => {
Toast.loading({
message: "加载中...",
duration: 1000, //持续展示 toast
message: '加载中...',
duration: 1000 // 持续展示 toast
})
const successCall = (res) => {
console.log('res', res)
Toast.clear()
let result = res.conf
const result = res.conf
// let result = res.data
// let {
// wxConfig,
......@@ -68,7 +68,7 @@ const share = (param) => {
menuList: hideMenuItems
})
wx.showMenuItems({
menuList: ["menuItem:share:appMessage", "menuItem:share:timeline"] // 要显示的菜单项，所有menu项见附录3
menuList: ['menuItem:share:appMessage', 'menuItem:share:timeline'] // 要显示的菜单项，所有menu项见附录3
})
})
}
......@@ -81,7 +81,7 @@ const share = (param) => {
successCall(res)
Toast.clear()
})
.catch(() => {})
.catch(() => { })
}
export {
......
src/assets/js/self.js
View file @ 48cf7b31
// export const SELFSHOP = 'self_shop'
export const REFRESH_LIST = 'REFRESH_LIST'
/**
* 设置缓存 getLocalStorage
......
src/assets/styles/common.scss
View file @ 48cf7b31
@charset "UTF-8";
/* iOS禁止微信调整字体大小 */
body {
-webkit-text-size-adjust: 100% !important;
text-size-adjust: 100% !important;
-moz-text-size-adjust: 100% !important;
}
html, body, div, span, applet, object, iframe, h1, h2, h3,
h4, h5, h6, p, blockquote, pre, a, abbr, acronym, address,
big, cite, code, del, dfn, em, font, img, ins, kbd, q, s, samp,
......
src/assets/styles/common/tabbar.scss
View file @ 48cf7b31
......@@ -21,7 +21,7 @@
width: 1.5rem;
height: 100%;
text-align: center;
font-size: 0.26rem;
font-size: 0.3rem;
color: #333333;
}
......@@ -30,7 +30,7 @@
}
.tabbar-item img {
width: 0.44rem;
height: 0.44rem;
width: 0.56rem;
height: 0.56rem;
margin: 0 auto;
}
\ No newline at end of file
src/assets/styles/global.scss
View file @ 48cf7b31
......@@ -197,3 +197,7 @@ $text-gray: #989794;
.self-cont-sticky .van-sticky.van-sticky--fixed {
width: 1rem !important;
}
.specile-text {
color: #ff0000 !important;
}
\ No newline at end of file
src/assets/styles/index/menulist.scss
View file @ 48cf7b31
......@@ -16,7 +16,7 @@
}
.title-cont {
font-size: .32rem;
font-size: 0.4rem;
}
}
......
src/assets/styles/tabbar/admin_index.scss
View file @ 48cf7b31
......@@ -22,13 +22,13 @@
.top .status {
color: #0054ff;
font-size: 0.36rem;
font-size: 0.38rem;
font-weight: bold;
}
.menu .hc_total {
color: #727272;
font-size: 0.28rem;
font-size: 0.32rem;
}
.menu .options {
......@@ -38,7 +38,7 @@
border: 1px solid #0054ff;
border-radius: 0.12rem;
color: #0054ff;
font-size: 0.28rem;
font-size: 0.34rem;
line-height: 0.58rem;
text-align: center;
position: relative;
......@@ -74,7 +74,7 @@
text-align: center;
line-height: 0.58rem;
color: #000000;
font-size: 0.28rem;
font-size: 0.32rem;
}
.date .end {
width: 3.08rem;
......@@ -85,7 +85,7 @@
text-align: center;
line-height: 0.58rem;
color: #000000;
font-size: 0.28rem;
font-size: 0.32rem;
}
.date .blue{
width: 0.31rem;
......@@ -111,7 +111,7 @@
text-align: center;
line-height: 0.7rem;
color: #000000;
font-size: 0.24rem;
font-size: 0.32rem;
// margin-right: 0.2rem;
}
.allBtn .sureBtn {
......@@ -122,7 +122,7 @@
text-align: center;
line-height: 0.7rem;
color: #fff;
font-size: 0.24rem;
font-size: 0.32rem;
margin-left: 0.2rem;
}
.cancel_cont{
......@@ -141,12 +141,12 @@
border-radius: 0.12rem;
margin: 0.4rem auto 0.2rem;
padding: 0.4rem 0.3rem;
font-size: 0.3rem;
font-size: 0.4rem;
}
.title {
color: #0054ff;
font-size: 0.32rem;
// font-size: 0.4rem;
font-weight: bold;
margin-bottom: 0.5rem;
}
......@@ -225,7 +225,7 @@
}
.btn {
margin-top: 0.2rem;
margin-top: 0.5rem;
}
.btn-item {
......@@ -236,8 +236,9 @@
text-align: center;
line-height: 0.7rem;
color: #fff;
font-size: 0.27rem;
font-size: 0.34rem;
margin-left: 0.2rem;
margin-bottom: .1rem;
}
.sf-btn {
......@@ -263,7 +264,7 @@
.pop_title {
color: #000000;
font-size: 0.36rem;
font-size: 0.4rem;
font-weight: bold;
margin-bottom: 0.4rem;
}
......@@ -362,7 +363,7 @@
}
.tc-box .tc-title{
color: #000000;
font-size: 0.28rem;
font-size: 0.32rem;
margin-bottom: 0.3rem;
font-weight: bold;
text-align: center;
......@@ -376,7 +377,7 @@
background: #f2f2f2;
line-height: 0.56rem;
color: #000000;
font-size: 0.28rem;
font-size: 0.32rem;
padding-left: 0.3rem;
margin-bottom: 0.3rem;
}
......@@ -392,7 +393,7 @@
}
.tc-box .workers .gr-item .gr-name{
color: #000000;
font-size: 0.28rem;
font-size: 0.32rem;
}
.tc-box .workers .k-img {
width: 0.42rem;
......@@ -437,5 +438,13 @@
.none{
margin-left: 0.3rem;
color: #000000;
font-size: 0.28rem;
font-size: 0.32rem;
}
/deep/ .van-ellipsis {
font-size: 0.4rem !important;
}
/deep/ .van-picker__confirm, /deep/ .van-picker__cancel {
font-size: 0.4rem !important;
}
\ No newline at end of file
src/assets/styles/tabbar/index.scss
View file @ 48cf7b31
......@@ -18,12 +18,12 @@
}
.top .status {
color: #0054ff;
font-size: 0.36rem;
font-size: 0.38rem;
font-weight: bold;
}
.menu .hc_total {
color: #727272;
font-size: 0.28rem;
font-size: 0.4rem;
}
.menu .options {
width: 1.76rem;
......@@ -32,7 +32,7 @@
border: 1px solid #0054ff;
border-radius: 0.12rem;
color: #0054ff;
font-size: 0.28rem;
font-size: 0.34rem;
line-height: 0.58rem;
text-align: center;
position: relative;
......@@ -57,11 +57,11 @@
border-radius: 0.12rem;
margin: 0.4rem auto 0.2rem;
padding: 0.4rem 0.3rem;
font-size: 0.3rem;
font-size: 0.4rem;
}
.title {
color: #0054ff;
font-size: 0.32rem;
// font-size: 0.4rem;
font-weight: bold;
margin-bottom: 0.5rem;
}
......@@ -158,7 +158,7 @@
margin-right: 0.3rem;
}
.btn{
margin-top: 0.2rem;
margin-top: 0.5rem;
}
.btn-item {
width: 1.8rem;
......@@ -168,8 +168,9 @@
text-align: center;
line-height: 0.7rem;
color: #fff;
font-size: 0.27rem;
font-size: 0.34rem;
margin-left: 0.2rem;
margin-bottom: .1rem;
}
.sf-btn {
background: #ffffff;
......@@ -200,7 +201,7 @@
// }
.pop_title {
color: #000000;
font-size: 0.36rem;
font-size: 0.4rem;
font-weight: bold;
margin-bottom: 0.4rem;
}
......@@ -213,7 +214,7 @@
}
.van-popup textarea::-webkit-input-placeholder {
color: #c8c8c8;
font-size: 0.26rem;
font-size: 0.34rem;
}
.btnItem {
margin-top: 0.4rem;
......@@ -279,7 +280,7 @@
color: #000000;
font-size: 0.26rem;
margin-left: 0.3rem;
margin-top: 0.4rem;
// margin-top: 0.4rem;
}
.sure-btn {
width: 3.12rem;
......@@ -308,7 +309,7 @@
text-align: center;
line-height: 0.58rem;
color: #000000;
font-size: 0.28rem;
font-size: 0.34rem;
}
.date .end {
......@@ -320,7 +321,7 @@
text-align: center;
line-height: 0.58rem;
color: #000000;
font-size: 0.28rem;
font-size: 0.34rem;
}
.date .blue {
......@@ -328,3 +329,11 @@
height: 0.03rem;
background: #0054FF;
}
/deep/ .van-ellipsis {
font-size: 0.4rem !important;
}
/deep/ .van-picker__confirm, /deep/ .van-picker__cancel {
font-size: 0.4rem !important;
}
\ No newline at end of file
src/assets/styles/tabbar/modifyPhone.scss
View file @ 48cf7b31
......@@ -28,7 +28,7 @@
}
input::-webkit-input-placeholder{
color: #C8C8C8;
font-size: 0.28rem;
font-size: 0.32rem;
}
.code{
position: relative;
......
src/main.js
View file @ 48cf7b31
......@@ -7,11 +7,11 @@ import myApi from './api/apiList'
import myAxios from './api/index'
import Vant from 'vant'
import 'vant/lib/index.css'
import vConsole from '@/plugins/vconsole.js'
// import vConsole from '@/plugins/vconsole.js'
import listTips from '@/components/common/listtips.vue'
Vue.component('listTips', listTips)
Vue.use(vConsole)
// Vue.use(vConsole)
Vue.config.productionTip = false
......
src/router/index.js
View file @ 48cf7b31
......@@ -29,7 +29,8 @@ const routes = [{
name: 'mine',
meta: {
title: '我的',
hideBack: true
hideBack: true,
keepAlive: true
},
component: () => import('../views/tabbar/mine.vue')
},
......@@ -66,7 +67,8 @@ const routes = [{
name: 'order_detail',
meta: {
title: '工单详情',
hideBack: true
hideBack: true,
keepAlive: true
},
component: () => import('@/views/my/order_detail.vue')
},
......@@ -94,7 +96,7 @@ const router = new VueRouter({
mode: 'history',
base: process.env.BASE_URL,
routes,
scrollBehavior(to, from, savePosition) {
scrollBehavior (to, from, savePosition) {
if (savePosition) {
return savePosition
} else {
......
src/views/login/login.vue
View file @ 48cf7b31
......@@ -7,12 +7,22 @@
<div>
<div class="filed-list">
<img class="icon-img" src="@assets/images/login/shouji.png" />
<van-field v-model.trim="tel" type="tel" placeholder="请输入手机号" maxlength="11" />
<van-field
v-model.trim="tel"
type="tel"
placeholder="请输入手机号"
maxlength="11"
/>
</div>
<div class="filed-list code-cont">
<img class="icon-img" src="@assets/images/login/yzm.png" />
<van-field v-model.trim="code" type="text" placeholder="请输入验证码" maxlength="6" />
<div class="code-btn" @click="getCode">{{buttonText}}</div>
<van-field
v-model.trim="code"
type="text"
placeholder="请输入验证码"
maxlength="6"
/>
<div class="code-btn" @click="getCode">{{ buttonText }}</div>
</div>
</div>
<div class="login-btn" @click="goLogin">立即登录</div>
......@@ -64,7 +74,7 @@ export default {
this.isSending = true
this.countDown()
})
.catch(() => {})
.catch(() => { })
},
countDown () {
let seconds = 60
......@@ -93,7 +103,7 @@ export default {
let url = `${httpUrl}${wxLogin}?callBack=${t}&scopes=snsapi_userinfo&type=1`
window.document.location = url // url-
})
.catch(() => {})
.catch(() => { })
},
fetchData (to, from) {
this.tel = '' // 手机号
......@@ -118,5 +128,5 @@ export default {
}
</script>
<style lang="scss" scoped>
@import "@assets/styles/login/login.scss";
@import '@assets/styles/login/login.scss';
</style>
src/views/my/admin_detail.vue
View file @ 48cf7b31
This diff is collapsed.
src/views/my/charge.vue
View file @ 48cf7b31
This diff is collapsed.
src/views/my/lookEvaluate.vue
View file @ 48cf7b31
......@@ -2,24 +2,48 @@
<div class="cont">
<div class="evaluate-cont">
<div class="title">整体评价</div>
<van-rate readonly void-icon="star" v-model="totalStar" void-color="#eee" color="#FFA300" />
<van-rate
readonly
void-icon="star"
v-model="totalStar"
void-color="#eee"
color="#FFA300"
/>
<div class="eva_detail">详细评价</div>
<div class="flex-h star-item">
<div class="left_title">速度</div>
<van-rate readonly void-icon="star" v-model="speedStar" void-color="#eee" color="#FFA300" />
<van-rate
readonly
void-icon="star"
v-model="speedStar"
void-color="#eee"
color="#FFA300"
/>
</div>
<div class="flex-h star-item">
<div class="left_title">质量</div>
<van-rate readonly void-icon="star" v-model="qualityStar" void-color="#eee" color="#FFA300" />
<van-rate
readonly
void-icon="star"
v-model="qualityStar"
void-color="#eee"
color="#FFA300"
/>
</div>
<div class="flex-h star-item">
<div class="left_title">态度</div>
<van-rate readonly void-icon="star" v-model="attitudeStar" void-color="#eee" color="#FFA300" />
<van-rate
readonly
void-icon="star"
v-model="attitudeStar"
void-color="#eee"
color="#FFA300"
/>
</div>
<div class="line"></div>
<div class="comments">
<div class="title">评价内容</div>
<div class="content">{{comment.content}}</div>
<div class="content">{{ comment.content }}</div>
</div>
</div>
</div>
......@@ -27,18 +51,18 @@
<script>
export default {
data(){
return{
data () {
return {
totalStar: 0,
speedStar: 0,
qualityStar: 0,
attitudeStar:0,
attitudeStar: 0,
repair_order_id: '',
comment: '',
comment: ''
}
},
created () {
console.log('接收的id啊',this.$route.query.id);
console.log('接收的id啊', this.$route.query.id)
this.repair_order_id = this.$route.query.id
this.look_comment()
// this.getStatus()
......@@ -58,12 +82,12 @@ export default {
this.attitudeStar = Number(data.attitude_stars)
this.totalStar = Number(data.stars)
})
.catch(() => {})
},
.catch(() => { })
}
}
}
</script>
<style lang="scss" scoped>
@import "@assets/styles/my/lookEvaluate.scss";
@import '@assets/styles/my/lookEvaluate.scss';
</style>
src/views/my/order_detail.vue
View file @ 48cf7b31
This diff is collapsed.
src/views/tabbar/Home.vue
View file @ 48cf7b31
This diff is collapsed.
src/views/tabbar/admin_home.vue
View file @ 48cf7b31
This diff is collapsed.
src/views/tabbar/mine.vue
View file @ 48cf7b31
......@@ -5,11 +5,11 @@
<div class="photo">
<img src="@assets/images/my/touxiang.png" alt />
</div>
<div class="btn">{{user.online_status_display}}</div>
<div class="name">{{user.name}}</div>
<div class="group">{{user.department.name}}</div>
<div class="btn">{{ user.online_status_display }}</div>
<div class="name">{{ user.name }}</div>
<div class="group">{{ user.department.name }}</div>
<div class="tel flex-h" @click="goPhone">
<div class="telNumber">{{telToHide(user.phone)}}</div>
<div class="telNumber">{{ telToHide(user.phone) }}</div>
<img src="@assets/images/my/bianji.png" alt />
</div>
</div>
......@@ -30,14 +30,11 @@ export default {
user: ''
}
},
created () {
this.getUserInfo()
},
methods: {
goPhone(){
goPhone () {
this.$router.push({
path: '/modifyPhone',
query:{phone:this.user.phone}
query: { phone: this.user.phone }
})
},
getUserInfo () {
......@@ -46,12 +43,23 @@ export default {
.then((res) => {
this.user = res
})
.catch(() => {})
.catch(() => { })
},
telToHide (tel) {
var phone = tel.substr(0, 3) + '****' + tel.substring(7, 11);
return phone;
var phone = tel.substr(0, 3) + '****' + tel.substring(7, 11)
return phone
},
fetchData (to, from) {
this.getUserInfo()
}
},
beforeRouteEnter (to, from, next) {
next(vm => {
vm.fetchData(to, from, next)
})
},
beforeRouteLeave (to, from, next) {
next()
}
}
</script>
......
src/views/tabbar/modifyPhone.vue
View file @ 48cf7b31
<template>
<div class="cont">
<div class="tel">
<input v-model.trim="old_tel" maxlength="11" type="tel" placeholder="请输入原手机号" />
<input
v-model.trim="old_tel"
maxlength="11"
type="tel"
placeholder="请输入原手机号"
/>
</div>
<div class="tel">
<input v-model.trim="tel" maxlength="11" type="tel" placeholder="请输入新的手机号" />
<input
v-model.trim="tel"
maxlength="11"
type="tel"
placeholder="请输入新的手机号"
/>
</div>
<div class="code flex-h">
<van-field class="code_field" v-model.trim="code" type="text" placeholder="请输入验证码" maxlength="6" />
<div class="getCode" @click="getCode">{{buttonText}}</div>
<van-field
class="code_field"
v-model.trim="code"
type="text"
placeholder="请输入验证码"
maxlength="6"
/>
<div class="getCode" @click="getCode">{{ buttonText }}</div>
</div>
<div class="submit-btn" @click="submit">提交</div>
</div>
......@@ -18,7 +34,7 @@
export default {
data () {
return {
old_tel: '',//旧手机号
old_tel: '', // 旧手机号
tel: '', // 手机号
code: '', // 验证码
buttonText: '获取验证码',
......@@ -29,7 +45,7 @@ export default {
},
methods: {
checkData () {
if(!this.checkCon()){
if (!this.checkCon()) {
return
}
if (this.code.length !== 6) {
......@@ -38,7 +54,7 @@ export default {
}
return true
},
checkCon(){
checkCon () {
if (this.old_tel != this.$route.query.phone) {
this.$toast('请正确输入原手机号码')
return false
......@@ -55,7 +71,7 @@ export default {
},
getCode () {
if (this.isSending) return
if(!this.checkCon()){
if (!this.checkCon()) {
return
}
const curParams = {
......@@ -68,7 +84,7 @@ export default {
this.isSending = true
this.countDown()
})
.catch(() => {})
.catch(() => { })
},
countDown () {
let seconds = 60
......@@ -93,7 +109,7 @@ export default {
this.$toast('修改成功')
this.$router.go(-1)
})
.catch(() => {})
.catch(() => { })
},
fetchData (to, from) {
this.tel = '' // 手机号
......@@ -119,5 +135,5 @@ export default {
</script>
<style lang="scss" scoped>
@import "@assets/styles/tabbar/modifyPhone.scss";
@import '@assets/styles/tabbar/modifyPhone.scss';
</style>
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