Skip to content

S
self-support
Commit 44e04f8d authored by 郭晓清's avatar 郭晓清
Browse files
Options

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

# Conflicts:
#	src/pages/order/detail.vue
parents 085246cc 831c6968
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1732 additions and 631 deletions
src/components/complete-check/complete-check.vue
View file @ 44e04f8d
...@@ -116,7 +116,7 @@ ...@@ -116,7 +116,7 @@
}, },
confirm() { confirm() {
if(this.pass) { if(this.pass) {
this.$emit('confirm') this.$emit('change')
} else { } else {
let data = this.listData.find((item, index) => { let data = this.listData.find((item, index) => {
return item.pass == false; return item.pass == false;
......
src/components/createCom/XhFiles.vue
View file @ 44e04f8d
<!-- ******************* 文件上传 ******************* --> <!-- ******************* 文件上传 ******************* -->
<template> <template>
<view class="file-box"> <view>
<!-- <view class="u-flex"> <view class="file-box" v-if="!takeStatus">
<view class="txt u-flex-1">{{item.fieldsTitle}}</view> <!-- <view class="u-flex">
<u-icon name="arrow-right" color="#666" size="28"></u-icon> <view class="txt u-flex-1">{{item.fieldsTitle}}</view>
</view> --> <u-icon name="arrow-right" color="#666" size="28"></u-icon>
<view class="pics u-flex u-flex-wrap"> </view> -->
<view class="img-list" v-for="(item,index) in imgList" :key="index"> <view class="pics u-flex u-flex-wrap">
<u-image class="pic" width="160" height="160" :src="item.path" :border-radius="10" @click.stop="prviewImage(item.path,index)"></u-image> <view class="img-list" v-for="(item,index) in imgList" :key="index">
<view class="icon-del-box" @click.stop="delFile(index)"> <u-image class="pic" width="160" height="160" :src="item.path" :border-radius="10" @click.stop="prviewImage(item.path,index)"></u-image>
<view class="icon-del"></view> <view class="icon-del-box" @click.stop="delFile(index)">
<view class="icon-del rotate"></view> <view class="icon-del"></view>
</view> <view class="icon-del rotate"></view>
</view> </view>
<view class="img-list"> </view>
<u-image class="pic" width="160rpx" height="160rpx" :border-radius="10" @click="selectUpload" :src="uploadImage"></u-image> <view class="img-list">
</view> <u-image class="pic" width="160rpx" height="160rpx" :border-radius="10" @click="selectUpload" :src="uploadImage"></u-image>
<!-- <u-image class="pic" v-for="item in 6" width="170rpx" height="170" src="'https://cdn.uviewui.com/uview/example/fade.jpg"></u-image> --> </view>
</view> <!-- <u-image class="pic" v-for="item in 6" width="170rpx" height="170" src="'https://cdn.uviewui.com/uview/example/fade.jpg"></u-image> -->
<u-action-sheet :list="list" v-model="maskShow" :cancel-btn="true" @click="uploadSelect"></u-action-sheet> </view>
<u-action-sheet :list="list" v-model="maskShow" :cancel-btn="true" @click="uploadSelect"></u-action-sheet>
</view>
<take-photo v-else @close="closeTake"></take-photo>
</view> </view>
</template> </template>
<script> <script>
import arrMixin from './arrMixin' import arrMixin from './arrMixin'
import baseFile from '@/components/upload/index'; import baseFile from '@/components/upload/index';
import takePhoto from '@/components/take/index.vue'
export default { export default {
name: 'XhFiles', name: 'XhFiles',
components: {}, components: {
'take-photo': takePhoto
},
mixins: [arrMixin,baseFile], mixins: [arrMixin,baseFile],
props: { props: {
files: { files: {
...@@ -57,28 +63,6 @@ ...@@ -57,28 +63,6 @@
return process.uniEnv.qn_base_url + 'upload-file.png' return process.uniEnv.qn_base_url + 'upload-file.png'
}, },
}, },
watch: {
'takeStatus': function(val, oldVal){
this.$emit('getTakeStatus', {status: val, index: this.itemIndex})
},
'files': { // 处理相机拍照返回的图片
handler (val) {
if(val && val.length > 0){
val.forEach((item,index,array)=>{
item.path = item.src
this.imgList.push(item)
})
// this.imgList = val.map(v => {
// v.path = v.src
// return v
// })
this.setValue()
}
},
deep:true,
immediate: true,
},
},
mounted() { mounted() {
if(this.value){ if(this.value){
this.imgList = this.value.map(img =>{ this.imgList = this.value.map(img =>{
...@@ -106,7 +90,7 @@ ...@@ -106,7 +90,7 @@
let config = { let config = {
options:{ options:{
sourceType:['album'],//['album', 'camera'] sourceType:['album'],//['album', 'camera']
count: 10, count: 3,
sizeType: ['compressed'] sizeType: ['compressed']
} }
} }
...@@ -123,6 +107,16 @@ ...@@ -123,6 +107,16 @@
dataValue.push(item.src) dataValue.push(item.src)
}) })
this.valueChange(dataValue) this.valueChange(dataValue)
},
closeTake(val) {
if(val && val.length > 0){
val.forEach((item,index,array)=>{
item.path = item.src
this.imgList.push(item)
})
this.setValue()
}
this.takeStatus = false
}, },
prviewImage(url, index) { prviewImage(url, index) {
uni.previewImage({ uni.previewImage({
......
src/components/createCom/XhSelect.vue
View file @ 44e04f8d
<!-- ******************* 单个下拉选择 ******************* --> <!-- ******************* 单个下拉选择 ******************* -->
<template> <template>
<view class="xh-select"> <view class="xh-select" :style="{'width': fieldsWidth}">
<u-input :value="text" disabled @click="show=true" :placeholder="placeholder" :placeholder-style="placeholderStyle" <u-input :value="text" disabled @click="show=true" :placeholder="placeholder" :placeholder-style="placeholderStyle"
:custom-style="customStyle" :clearable="false"></u-input> :custom-style="customStyle" :clearable="false"></u-input>
<u-select :list="settings" v-model="show" @confirm="actionSheetCallback" safe-area-inset-bottom></u-select> <u-select :list="settings" v-model="show" @confirm="actionSheetCallback" safe-area-inset-bottom></u-select>
...@@ -68,7 +68,10 @@ ...@@ -68,7 +68,10 @@
'font-size':'26rpx', 'font-size':'26rpx',
'height': '76rpx' 'height': '76rpx'
} }
} },
fieldsWidth() {
return this.item.fieldsWidth ? (this.item.fieldsWidth + 'rpx') : '100%'
},
}, },
watch: {}, watch: {},
mounted() {}, mounted() {},
......
src/components/createCom/XhServiceMeasure.vue
View file @ 44e04f8d
<!-- ******************* 单级/多级 选择 ******************* --> <!-- ******************* 单级/多级 选择 ******************* -->
<template> <template>
<view class="picker-box"> <view class="picker-box" :style="{'width': fieldsWidth}">
<view class="u-flex u-row-between text-view" @click="openPicker"> <view class="u-flex u-row-between text-view" @click="openPicker">
<view class="txt u-flex-1 text-title">{{text||''}}</view> <view class="txt u-flex-1 text-title">{{text||''}}</view>
<u-icon class="input-icon" color="#2272FF" :name="showPicker ? 'arrow-up' : 'arrow-down'"></u-icon> <u-icon class="input-icon" color="#2272FF" :name="showPicker ? 'arrow-up' : 'arrow-down'"></u-icon>
...@@ -68,7 +68,10 @@ ...@@ -68,7 +68,10 @@
val = data[0].measureTypeName + "-" + data[0].measureName val = data[0].measureTypeName + "-" + data[0].measureName
} }
return val return val
} },
fieldsWidth() {
return this.item.fieldsWidth ? (this.item.fieldsWidth + 'rpx') : '100%'
},
}, },
watch: { watch: {
specificationId(val, oldVal){ specificationId(val, oldVal){
......
src/components/order/index.vue
View file @ 44e04f8d
...@@ -99,7 +99,16 @@ ...@@ -99,7 +99,16 @@
return { return {
timeout: false, timeout: false,
timestamp: 0, timestamp: 0,
orderType: 0 /** orderType
0 待接单、
1 待预约、
2 待签到、
3 待完工、
4 审核中、
5 异常单、
6 已完工
*/
orderType: 0
}; };
}, },
computed: { computed: {
...@@ -124,7 +133,7 @@ ...@@ -124,7 +133,7 @@
return this.buttonStyles[2] return this.buttonStyles[2]
} }
}, },
showCountTime() { showCountTime() { // ((待预约、 待签到、 待完工) || (待接单 && 业务类型非抢单)) && 有超过时间点
return ([1, 2, 3].indexOf(this.orderType) != -1 || (this.orderType == 0 && this.orderData return ([1, 2, 3].indexOf(this.orderType) != -1 || (this.orderType == 0 && this.orderData
.orderBusinessType != 'R')) && this.orderData.currentOverTime .orderBusinessType != 'R')) && this.orderData.currentOverTime
}, },
......
src/components/take/readme.md
View file @ 44e04f8d
...@@ -39,8 +39,20 @@ uni.hideTabBar() ...@@ -39,8 +39,20 @@ uni.hideTabBar()
|事件称名 |说明 | 返回值 | |事件称名 |说明 | 返回值 |
|:-: |:-: | :-: | |:-: |:-: | :-: |
|@close | 关闭相机或完成拍照的时候触发 | 已拍照完成的图片数组| |@close | 关闭相机或完成拍照的时候触发 | 已拍照完成的图片数组 **格式见下文** |
```json
{
[
{
id: '',
key: 'https: //identity/cert/20210507wefew.png', // 七牛绝对路径地址
progress: 100, // 图片上传进度
src: 'wxfile://tmp_2324.png' // 微信临时文件地址
}
]
}
```
## 组件用法 ## 组件用法
......
src/components/upload/index.js
View file @ 44e04f8d
...@@ -58,7 +58,7 @@ export default { ...@@ -58,7 +58,7 @@ export default {
imgList[res.fileIndex] imgList[res.fileIndex]
self.imgList = imgList self.imgList = imgList
// 多文件上传每个文件进度条 // 多文件上传每个文件进度条
console.log(res,'res---onProgressUpdate') //console.log(res,'res---onProgressUpdate')
}, },
onEachUpdate(res){ onEachUpdate(res){
// 多文件上传每个文件上传成功触发 // 多文件上传每个文件上传成功触发
...@@ -67,7 +67,7 @@ export default { ...@@ -67,7 +67,7 @@ export default {
imgList[res.fileIndex].src = uploader.qiniuTokenObj.visitPrefix + res.url imgList[res.fileIndex].src = uploader.qiniuTokenObj.visitPrefix + res.url
} }
self.imgList = imgList self.imgList = imgList
console.log(res,'res---onEachUpdate') //console.log(res,'res---onEachUpdate')
}, },
cardType: category, cardType: category,
...config ...config
...@@ -75,8 +75,8 @@ export default { ...@@ -75,8 +75,8 @@ export default {
// 不需要进度条等可直接获取 // 不需要进度条等可直接获取
let res = await uploader.qnImgUpload(options) let res = await uploader.qnImgUpload(options)
console.log(self.imgList,'self.imgList') // console.log(self.imgList,'self.imgList')
console.log(uploader,uploader.qiniuTokenObj,'qiniuTokenObj') // console.log(uploader,uploader.qiniuTokenObj,'qiniuTokenObj')
// let imgList = res.map(item=>{ // let imgList = res.map(item=>{
// return { // return {
// key:item, // key:item,
......
src/components/upload/qiniup.js
View file @ 44e04f8d
...@@ -91,11 +91,11 @@ export default { ...@@ -91,11 +91,11 @@ export default {
} }
qiniuUploader.upload(params, (res) => { qiniuUploader.upload(params, (res) => {
console.log(res,'res') console.log(res,'res111')
let inLen = self.maximum - fileList.length let inLen = self.maximum - fileList.length
if (inLen > 0) { if (inLen > 0) {
item.src = file item.src = file
item.key = res.key || res.src item.key = res.url
self.fileMaps.push(item); self.fileMaps.push(item);
self.keys.push(item.key) self.keys.push(item.key)
if(submit) { if(submit) {
......
src/manifest.json
View file @ 44e04f8d
...@@ -6,6 +6,10 @@ ...@@ -6,6 +6,10 @@
"versionCode" : "100", "versionCode" : "100",
"transformPx" : false, "transformPx" : false,
"app-plus" : { "app-plus" : {
"optimization": {
"subPackages": true
},
"runmode" : "liberate", // 开启分包优化后，必须配置资源释放模式
/* 5+App特有相关 */ /* 5+App特有相关 */
"usingComponents" : true, "usingComponents" : true,
"splashscreen" : { "splashscreen" : {
......
src/pages.json
View file @ 44e04f8d
This diff is collapsed.
src/pages/index/learn.vue 0 → 100644
View file @ 44e04f8d
This diff is collapsed.
src/pages/mine/index.vue → src/pages/index/mine.vue
View file @ 44e04f8d
<template> <template>
<view> <view>
<u-navbar v-if="!takeStatus" :is-back="false" :title-size="26" title-color="#000" title="我的"></u-navbar> <u-navbar v-if="!takeStatus" :is-back="false" :title-size="26" title-color="#000" title="我的"></u-navbar>
<view v-if="!takeStatus"> <view v-if="!takeStatus">
<view class="u-flex user-box u-p-l-30 u-p-r-20 u-p-b-30"> <view class="u-flex user-box u-p-l-30 u-p-r-20 u-p-b-30">
<view class="u-m-r-10"> <view class="u-m-r-10">
<u-avatar :src="pic" size="140"></u-avatar> <u-avatar :src="pic" size="140"></u-avatar>
</view> </view>
<view class="u-flex-1"> <view class="u-flex-1">
<view class="u-font-18 u-p-b-20">uView ui</view> <view class="u-font-18 u-p-b-20">uView ui</view>
<view class="u-font-14 u-tips-color">微信号:helang_uView</view> <view class="u-font-14 u-tips-color">微信号:helang_uView</view>
</view> </view>
</view> </view>
<view class="u-m-t-20"> <view class="u-m-t-20">
<u-cell-group> <u-cell-group>
<u-cell-item v-for="(item, index) in items" :title="item.title" :value="item.value" :key="index"> <u-cell-item v-for="(item, index) in items" :title="item.title" :value="item.value" :key="index">
<u-icon slot="icon" size="32" name="search"></u-icon> <u-icon slot="icon" size="32" name="search"></u-icon>
</u-cell-item> </u-cell-item>
</u-cell-group> </u-cell-group>
</view> </view>
<view class="u-m-t-20"> <view class="u-m-t-20">
<u-cell-group> <u-cell-group>
<u-cell-item icon="setting" title="设置"></u-cell-item> <u-cell-item icon="setting" title="设置"></u-cell-item>
</u-cell-group> </u-cell-group>
</view> </view>
<view class="u-m-t-20" @click="take"> <view class="u-m-t-20" @click="take">
<u-cell-group> <u-cell-group>
<u-cell-item icon="setting" title="相机组件测试"></u-cell-item> <u-cell-item icon="setting" title="相机组件测试"></u-cell-item>
</u-cell-group> </u-cell-group>
</view> </view>
</view> </view>
<take-photo v-if="takeStatus" :currentItem="testData" @close="closeTake"></take-photo> <take-photo v-if="takeStatus" :currentItem="testData" @close="closeTake"></take-photo>
</view> </view>
</template> </template>
<script> <script>
import takePhoto from '@/components/take/index.vue' import takePhoto from '@/components/take/index.vue'
export default { export default {
components: { components: {
'take-photo': takePhoto 'take-photo': takePhoto
}, },
data() { data() {
return { return {
pic:'https://uviewui.com/common/logo.png', pic:'https://uviewui.com/common/logo.png',
show:true, show:true,
takeStatus: false, takeStatus: false,
testData: { testData: {
_id: '1', // 规格ID _id: '1', // 规格ID
system_id: '2', // 系统ID system_id: '2', // 系统ID
brand_id: '3', // 品牌ID brand_id: '3', // 品牌ID
classify_id: '4', // 分类ID classify_id: '4', // 分类ID
images: [ // 拍照要求示意图 images: [ // 拍照要求示意图
'https://qn-static.banshouhui.com/live_mark.png', 'https://qn-static.banshouhui.com/live_mark.png',
'https://qn-static.banshouhui.com/live_mark.png', 'https://qn-static.banshouhui.com/live_mark.png',
'https://qn-static.banshouhui.com/live_mark.png' 'https://qn-static.banshouhui.com/live_mark.png'
], ],
main_point: [] // 要点 main_point: [] // 要点
} }
} }
}, },
computed: { computed: {
items() { items() {
return [ return [
{title: '我的钱包', value: '', icon: ''}, {title: '我的钱包', value: '', icon: ''},
{title: '我的质保金', value: '', icon: ''}, {title: '我的质保金', value: '', icon: ''},
{title: '我的合同', value: '', icon: ''}, {title: '我的合同', value: '', icon: ''},
{title: '我的证件', value: '', icon: ''}, {title: '我的证件', value: '', icon: ''},
{title: '我的收货地址', value: '', icon: ''}, {title: '我的收货地址', value: '', icon: ''},
{title: '我的仓库', value: '', icon: ''}, {title: '我的仓库', value: '', icon: ''},
{title: '联系客服', value: '6666666', icon: ''}] {title: '联系客服', value: '6666666', icon: ''}]
} }
}, },
onLoad() { onLoad() {
}, },
methods: { methods: {
take() { take() {
uni.hideTabBar() uni.hideTabBar()
this.takeStatus = true this.takeStatus = true
}, },
closeTake(img) { closeTake(img) {
console.log(img) console.log(img)
this.takeStatus = false this.takeStatus = false
} }
} }
} }
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
</style> </style>
src/pages/learn/answer.vue
View file @ 44e04f8d
<template> <template>
<view class="content"> <view class="answer-box">
<view class=""> <u-navbar
<view class="" style="padding-left: 94rpx; margin: 36rpx 0"> title="考核认证"
<text class="dx">单选</text :background="background"
><text class="all">{{ ExaminationQuestions.progress }}</text> :border-bottom="false"
></u-navbar>
<view class="content">
<view class="">
<text class="dx">单选</text>
</view> </view>
<view class="" style="text-align: center"> <view class="topicView">
{{ ExaminationQuestions.question.content }} <text class="topictext">{{
ExaminationQuestions.question.content
}}</text>
</view> </view>
<view class="" style="margin-top: 130rpx"> <view class="">
<view class="list-box"> <view class="list-box">
<view <view
v-for="(item, index) in list" v-for="(item, index) in list"
...@@ -21,6 +27,7 @@ ...@@ -21,6 +27,7 @@
</view> </view>
</view> </view>
<button class="btn" @click="getNextClick()">下一题</button> <button class="btn" @click="getNextClick()">下一题</button>
<text class="all">{{ ExaminationQuestions.progress }}</text>
</view> </view>
</view> </view>
</template> </template>
...@@ -47,6 +54,9 @@ export default { ...@@ -47,6 +54,9 @@ export default {
content: "", content: "",
}, },
], ],
background: {
backgroundColor: "#F4F5F7",
},
isSelect: false, isSelect: false,
selectId: [], selectId: [],
userExamId: null, userExamId: null,
...@@ -199,20 +209,57 @@ export default { ...@@ -199,20 +209,57 @@ export default {
</script> </script>
<style lang="scss"> <style lang="scss">
.content { .answer-box {
width: 600rpx; width: 750rpx;
height: 800rpx; height: 100vh;
/* background: #8F8F94; */ /* background: #8F8F94; */
margin: 0 auto; margin: 0 auto;
} }
.content {
margin: 30rpx 30rpx;
overflow: hidden;
border-radius: 12rpx;
padding: 40rpx 30rpx 40rpx 30rpx;
background-repeat: no-repeat;
background-size: 66%;
background-color: #fff;
background-position: right bottom;
min-height: 800rpx;
}
.dx { .dx {
padding: 0rpx; border-radius: 8rpx;
background: #2979ff; background-color: #ff930d;
font-size: 20rpx;
color: #ffffff; color: #ffffff;
border-radius: 0px; width: 72rpx;
height: 40rpx;
display: -webkit-box;
display: -webkit-flex;
display: flex;
-webkit-box-align: center;
-webkit-align-items: center;
align-items: center;
-webkit-box-pack: center;
-webkit-justify-content: center;
justify-content: center;
}
.topicView {
margin-top: 40rpx;
width: 100%;
display: -webkit-box;
display: -webkit-flex;
display: flex;
-webkit-box-align: center;
-webkit-align-items: center;
align-items: center;
margin-bottom: 40rpx;
}
.topictext {
color: #333333;
font-size: 32rpx;
line-height: 48rpx;
font-weight: bold;
} }
.num { .num {
color: #2b85e4; color: #2b85e4;
} }
...@@ -263,10 +310,18 @@ export default { ...@@ -263,10 +310,18 @@ export default {
/*未选择*/ /*未选择*/
.noselde { .noselde {
background: #e4e7ed; margin-top: 30rpx;
color: #959595; background-color: #f4f5f7;
border-radius: 20upx; width: 100%;
font-size: 20upx; padding: 40rpx 30rpx;
padding: 0 10upx; display: -webkit-box;
display: -webkit-flex;
display: flex;
-webkit-box-align: start;
-webkit-align-items: flex-start;
align-items: flex-start;
border-radius: 12rpx;
border: 2rpx solid transparent;
font-size: 28rpx;
} }
</style> </style>
src/pages/learn/assessment.vue
View file @ 44e04f8d
<template> <template>
<view class="content"> <view class="content">
<view class="title">考试规则说明</view> <u-navbar
back-icon-color="#FFFFFF"
:background="background"
title-color="#fff"
:border-bottom="false"
></u-navbar>
<view class="title">考试规则</view>
<view class="test"> <view class="test">
<view class="slogan"
>这是一场严肃的考试，请认真查看 规则，预祝您顺利通过考试！</view
>
<view class="text"> <view class="text">
<text class="left">考试科目:</text <text class="left">考试科目:</text
><text style="color: #007aff">服务规范</text> ><text style="color: #007aff">服务规范</text>
</view> </view>
<view class="text"> <view class="text">
<text class="left">合格条件:</text <text class="left">合格条件:</text><text>60分</text>
><text>随机20题,答对20题</text>
</view> </view>
<view class="text"> <view class="text">
<text class="left">考试时间:</text><text>30分钟</text> <text class="left">考试时间:</text><text>30分钟</text>
</view> </view>
<view class="text"> <view class="text">
<text class="left">题目规则:</text <text class="left">题目来源:</text><text>系统随机20题</text>
><text>题库100题,随机抽20题</text>
</view>
<view class="text">
<text class="left">备注说明:</text><text>无</text>
</view> </view>
<button @click="getUserExamId()">开始考试</button>
</view> </view>
<button @click="getUserExamId()">开始考试</button>
</view> </view>
</template> </template>
...@@ -77,32 +81,62 @@ export default { ...@@ -77,32 +81,62 @@ export default {
<style> <style>
.content { .content {
margin: 187rpx 80rpx; width: 750rpx;
height: 100vh;
overflow: auto;
background-color: #f4f5f7;
background-image: linear-gradient(to top, #f4f5f7 0%, #2272ff 50%);
background-size: 750rpx 600rpx;
background-repeat: no-repeat;
} }
.title { .title {
font-size: 17px; padding: 30rpx 30rpx 46rpx;
text-align: center; line-height: 40rpx;
font-size: 40rpx;
color: #fff;
} }
.test { .test {
margin: 0 0; margin: 0 30rpx;
overflow: hidden;
border-radius: 12rpx;
padding-bottom: 60rpx;
background-image: url(../../static/photo/examination.png);
background-repeat: no-repeat;
background-size: 66%;
background-color: #fff;
background-position: right bottom;
min-height: 800rpx;
}
.slogan {
font-size: 40rpx;
font-weight: bold;
color: #333333;
line-height: 20px;
padding: 50rpx 58rpx 46rpx 30rpx;
} }
.left { .left {
margin-right: 8rpx; margin-right: 8rpx;
margin-left: 68rpx; margin-left: 30rpx;
color: #666666;
font-size: 28rpx;
} }
.text { .text {
margin: 50rpx 0; margin: 30rpx 0;
} }
button { button {
width: 364rpx; width: 600rpx;
height: 56rpx; height: 104rpx;
background: #007aff; background: #2272ff;
font-size: 24rpx; font-size: 32rpx;
font-weight: 600;
color: #ffffff; color: #ffffff;
margin-top: 237rpx;
border-radius: 26px;
line-height: 104rpx;
} }
</style> </style>
src/pages/login/index.vue
View file @ 44e04f8d
...@@ -160,13 +160,19 @@ export default { ...@@ -160,13 +160,19 @@ export default {
if(pages.length) { if(pages.length) {
let index = pages.length - 1; let index = pages.length - 1;
if(index) { if(index) {
let prevPage = pages[pages.length - 1]; //上一个页面 let prevPage = pages[index]; //上一个页面
if (prevPage && prevPage.$vm) { if(prevPage.route == "pages/login/index") {
prevPage.$vm.isRefresh = true; uni.navigateTo({
url:'pages/index/index'
})
} else {
if (prevPage && prevPage.$vm) {
prevPage.$vm.isRefresh = true;
}
uni.navigateBack({
delta: 1
})
} }
uni.navigateBack({
delta: 1
})
} else { } else {
uni.navigateTo({ uni.navigateTo({
url:'pages/index/index' url:'pages/index/index'
...@@ -174,7 +180,7 @@ export default { ...@@ -174,7 +180,7 @@ export default {
} }
} else { } else {
uni.navigateTo({ uni.navigateTo({
url: "pages/mine/index" url: "pages/index/mine"
}) })
} }
......
src/pages/order/complete.vue
View file @ 44e04f8d
<template> <template>
<view class="com-content"> <view class="com-content">
<complete-check :show="completeCheckStatus" :list-data="completeCheckResult" @close="closeCheckResult" @handle="handerProgrom" @change="confirm"></complete-check> <complete-check :show="completeCheckStatus" :list-data="completeCheckResult" :pass="pass" @close="closeCheckResult" @handle="handerProgrom" @change="confirm"></complete-check>
<view class="u-wrap" v-if="!takeStatus"> <view class="u-wrap">
<u-navbar :background="{background: '#2272FF'}" back-icon-color="#fff" :title-size="32" title-color="#fff" :border-bottom="false" title="完工信息"></u-navbar> <u-navbar :background="{background: '#2272FF'}" back-icon-color="#fff" :title-size="32" title-color="#fff" :border-bottom="false" title="完工信息"></u-navbar>
<u-tabs-swiper class="order-tabs" ref="tabs" :current="tabIndex" name="panelName" :list="list" @change="tabsChange" :is-scroll="false" bg-color="#2272FF" inactive-color="#a6c6ff" active-color="#fff" height="80" font-size="32"></u-tabs-swiper> <u-tabs-swiper class="order-tabs" ref="tabs" :current="tabIndex" name="panelName" :list="list" @change="tabsChange" :is-scroll="false" bg-color="#2272FF" inactive-color="#a6c6ff" active-color="#fff" height="80" font-size="32"></u-tabs-swiper>
<view class="u-menu-wrap"> <view class="u-menu-wrap">
...@@ -45,8 +45,7 @@ ...@@ -45,8 +45,7 @@
</xh-select> </xh-select>
<xh-files v-else-if="typeToComponentType(item.fieldsType)==='file'" <xh-files v-else-if="typeToComponentType(item.fieldsType)==='file'"
:groupIndex="groupIndex" :itemIndex="itemIndex" :item="item" :value='form[item.fieldsName] || []' :groupIndex="groupIndex" :itemIndex="itemIndex" :item="item" :value='form[item.fieldsName] || []'
:files="files[itemIndex.toString()]" @value-change="fieldValueChange">
@value-change="fieldValueChange" @getTakeStatus="getTakeStatus">
</xh-files> </xh-files>
<xh-location v-else-if="typeToComponentType(item.fieldsType)==='location'" <xh-location v-else-if="typeToComponentType(item.fieldsType)==='location'"
:groupIndex="groupIndex" :itemIndex="itemIndex" :item="item" :value='form[item.fieldsName] || ""' :groupIndex="groupIndex" :itemIndex="itemIndex" :item="item" :value='form[item.fieldsName] || ""'
...@@ -91,8 +90,7 @@ ...@@ -91,8 +90,7 @@
下一步 下一步
</u-button> </u-button>
</view> </view>
</view> </view>
<take-photo v-else @close="closeTake"></take-photo>
<u-toast ref="uToast" /> <u-toast ref="uToast" />
</view> </view>
</template> </template>
...@@ -108,7 +106,6 @@ ...@@ -108,7 +106,6 @@
import XhScan from '@/components/createCom/XhScan.vue' import XhScan from '@/components/createCom/XhScan.vue'
import XhPicker from '@/components/createCom/XhPicker.vue' import XhPicker from '@/components/createCom/XhPicker.vue'
import XhTime from '@/components/createCom/XhTime.vue' import XhTime from '@/components/createCom/XhTime.vue'
import takePhoto from '@/components/take/index.vue'
import XhServiceMeasure from '@/components/createCom/XhServiceMeasure.vue' import XhServiceMeasure from '@/components/createCom/XhServiceMeasure.vue'
// import XhRadio from '@/components/createCom/XhRadio.vue' // import XhRadio from '@/components/createCom/XhRadio.vue'
export default { export default {
...@@ -160,9 +157,6 @@ ...@@ -160,9 +157,6 @@
}] }]
}, },
submitBtnStatus: false, submitBtnStatus: false,
takeStatus: false,
fileIndex: null,
files: [],
completeCheckStatus: false, completeCheckStatus: false,
completeCheckResult: [], completeCheckResult: [],
waitHandlerPanelIndex: 0, waitHandlerPanelIndex: 0,
...@@ -181,8 +175,7 @@ ...@@ -181,8 +175,7 @@
XhScan, XhScan,
XhPicker, XhPicker,
XhTime, XhTime,
XhServiceMeasure, XhServiceMeasure
'take-photo': takePhoto
}, },
created() { created() {
// console.log(allComponents,'allComponents') // console.log(allComponents,'allComponents')
...@@ -319,7 +312,7 @@ ...@@ -319,7 +312,7 @@
}, },
confirm(){// 检查结果窗口 确认回调 confirm(){// 检查结果窗口 确认回调
uni.navigateTo({ uni.navigateTo({
url: 'pages/order/index' url: 'pages/index/order'
}) })
}, },
closeCheckResult(){// 检查结果窗口取消回调 closeCheckResult(){// 检查结果窗口取消回调
...@@ -358,11 +351,6 @@ ...@@ -358,11 +351,6 @@
} }
} }
}, },
getTakeStatus(event) {
this.takeStatus = event.status
this.fileIndex = event.index.toString()
if(!this.files[event.index] || this.files[event.index].length < 1) this.files[event.index] = []
},
tabsChange(index){ tabsChange(index){
this.tabIndex = index this.tabIndex = index
this.arr = [] this.arr = []
...@@ -373,11 +361,6 @@ ...@@ -373,11 +361,6 @@
this.getMenuItemTop() this.getMenuItemTop()
}) })
}, },
closeTake(images) {
this.takeStatus = false
//const newFile = this.files[this.fileIndex].concat(images)
this.$set(this.files, this.fileIndex, images)
},
// 字段的值更新 // 字段的值更新
fieldValueChange(data) { fieldValueChange(data) {
const groupItem = this.list[this.tabIndex].items[data.groupIndex] const groupItem = this.list[this.tabIndex].items[data.groupIndex]
......
src/pages/order/detail.vue
View file @ 44e04f8d
...@@ -156,7 +156,7 @@ ...@@ -156,7 +156,7 @@
import appointTime from '@/components/appoint/appoint-time.vue' import appointTime from '@/components/appoint/appoint-time.vue'
import takePhoto from '@/components/take/index.vue' import takePhoto from '@/components/take/index.vue'
import PopView from "@/components/popView/index.vue" import PopView from "@/components/popView/index.vue"
let now = Date.now() let now = new Date(new Date().toLocaleDateString()).getTime();
export default { export default {
components: { components: {
appointTime, appointTime,
...@@ -345,7 +345,10 @@ ...@@ -345,7 +345,10 @@
if (res.code == 200) { if (res.code == 200) {
self.order = res.data self.order = res.data
this.getCurrentBtn() this.getCurrentBtn()
// self.timeOutChange(self.order.currentOverTime) var nowTime = new Date();
if(nowTime.getTime() > this.order.currentOverTime){
this.btnClass='timeOut-btn'
}
if(self.order.isFirstOrder){ if(self.order.isFirstOrder){
this.visibale = true this.visibale = true
} }
...@@ -418,6 +421,7 @@ ...@@ -418,6 +421,7 @@
console.log(data,'dateChange') console.log(data,'dateChange')
let self = this let self = this
self.appointmentDatetime = data.item.day self.appointmentDatetime = data.item.day
self.appointmentDatetimeRange = null
self.timeList.map((item, index) => { self.timeList.map((item, index) => {
if(data.item.timeRange.indexOf(item.pkey) > -1) { if(data.item.timeRange.indexOf(item.pkey) > -1) {
item.disabled = true item.disabled = true
...@@ -505,15 +509,15 @@ ...@@ -505,15 +509,15 @@
data.orderId = this.order.orderId data.orderId = this.order.orderId
}else if(this.submitType === 'workerAppointment'){ // 预约 }else if(this.submitType === 'workerAppointment'){ // 预约
data.appointmentDatetime =this.appointmentDatetime data.appointmentDatetime =this.appointmentDatetime
data.appointmentDatetimeRange = this.appointmentDatetimeRange.pkey
if(!data.appointmentDatetime ){ if(!data.appointmentDatetime ){
this.commonToast('请选择预约日期','waring') this.commonToast('请选择预约日期','waring')
return return
} }
if( !data.appointmentDatetimeRange ){ if( !this.appointmentDatetimeRange || !this.appointmentDatetimeRange.pkey ){
this.commonToast('请选择预约时间段','waring') this.commonToast('请选择预约时间段','waring')
return return
} }
data.appointmentDatetimeRange = this.appointmentDatetimeRange.pkey
}else if (this.submitType === 'maintainWorkerCheckin') { // 签到 }else if (this.submitType === 'maintainWorkerCheckin') { // 签到
// 检查见到距离是否符合 // 检查见到距离是否符合
if(!this.isErrorSign){ if(!this.isErrorSign){
...@@ -666,7 +670,7 @@ ...@@ -666,7 +670,7 @@
this.visibale = false this.visibale = false
// 交互规范 // 交互规范
uni.switchTab({ uni.switchTab({
url: 'pages/learn/index' url: 'pages/index/learn'
}) })
}, },
threeDays() { threeDays() {
......
src/pages/order/feedback.vue
View file @ 44e04f8d
...@@ -121,11 +121,10 @@ export default { ...@@ -121,11 +121,10 @@ export default {
reasonType: '报备', // 反馈类型 reasonType: '报备', // 反馈类型
reasonRelegation: '客户', // 反馈归属 reasonRelegation: '客户', // 反馈归属
reason: '', // 反馈原因 reason: '', // 反馈原因
appointmentDatetime: null, // 预约时间
appointmentDatetimeRange: '', // 预约时间段类型
nextTraceDatetime: '', // 下次跟踪时间
remark: '' // 备注 remark: '' // 备注
}, },
traceDate: null, // 反馈时间
timeRange: null, // 反馈时间段
dateItem: null, dateItem: null,
timeItem: null, timeItem: null,
showRemark: false, showRemark: false,
...@@ -139,23 +138,15 @@ export default { ...@@ -139,23 +138,15 @@ export default {
appointTime appointTime
}, },
watch: { watch: {
vuex_token(val) { // vuex_token(val) {
this.initPageData(); // this.initPageData();
} // }
}, },
computed: { computed: {
disabledSubmit() { disabledSubmit() {
let self = this; let self = this;
if(self.trace.reasonRelegation && self.trace.reason) { if(self.trace.reasonRelegation && self.trace.reason && self.traceDate && self.timeRange) {
if (self.trace.reasonType == '改约') { return false;
if (self.trace.appointmentDatetime && self.trace.appointmentDatetimeRange) {
return false;
}
} else {
if (self.trace.nextTraceDatetime && self.trace.appointmentDatetimeRange) {
return false;
}
}
} }
return true; return true;
...@@ -222,9 +213,8 @@ export default { ...@@ -222,9 +213,8 @@ export default {
self.trace.reason = tabList['owns'][self.curOwn]['types'][0]; self.trace.reason = tabList['owns'][self.curOwn]['types'][0];
self.appointTitle = self.appoint[self.curTab] self.appointTitle = self.appoint[self.curTab]
self.trace.remark = ''; self.trace.remark = '';
self.trace.appointmentDatetime = null; self.traceDate = null;
self.trace.appointmentDatetimeRange = null; self.timeRange = null;
self.trace.nextTraceDatetime = null;
if (self.trace.reasonType == '改约') { if (self.trace.reasonType == '改约') {
self.showRemark = true; self.showRemark = true;
if (self.dateList && self.timeList) { if (self.dateList && self.timeList) {
...@@ -300,12 +290,9 @@ export default { ...@@ -300,12 +290,9 @@ export default {
}, },
dateChange(data) { dateChange(data) {
// 点击日期选择 // 点击日期选择
console.log(data, 'week-data');
let self = this; let self = this;
self.dateItem = data.item self.dateItem = data.item
if (self.trace.reasonType == '改约') { if (self.trace.reasonType == '改约') {
self.trace.appointmentDatetime = data.item.day;
self.trace.nextTraceDatetime = null;
self.timeList.map((item, index) => { self.timeList.map((item, index) => {
if (data.item.timeRange.indexOf(item.pkey) > -1) { if (data.item.timeRange.indexOf(item.pkey) > -1) {
item.disabled = true; item.disabled = true;
...@@ -314,18 +301,17 @@ export default { ...@@ -314,18 +301,17 @@ export default {
} }
}); });
} else { } else {
self.trace.appointmentDatetime = null;
self.trace.nextTraceDatetime = data.item.day;
self.timeList.map((item, index) => { self.timeList.map((item, index) => {
item.disabled = false; item.disabled = false;
}); });
} }
self.trace.appointmentDatetimeRange = ''; self.traceDate = data.item.day;
self.timeRange = null;
}, },
timeChange(data) { timeChange(data) {
// 时间段选择变化 // 时间段选择变化
console.log(data, 'week-data'); console.log(data, 'week-data');
this.trace.appointmentDatetimeRange = data.item.pkey; this.timeRange = data.item.pkey;
this.timeItem = data.item this.timeItem = data.item
}, },
async submitForm() { async submitForm() {
...@@ -341,15 +327,16 @@ export default { ...@@ -341,15 +327,16 @@ export default {
self.submiting = true; self.submiting = true;
let params = this.$u.deepClone(self.trace); let params = this.$u.deepClone(self.trace);
if(self.trace.reasonType != '改约') { if(self.trace.reasonType != '改约') {
params.appointmentDatetimeRange = null if(self.timeItem && self.timeItem.pkey && self.traceDate){
params.appointmentDatetime = null let traceDate = self.moment(self.traceDate);
if(self.timeItem && self.timeItem.pkey && params.nextTraceDatetime){
let traceDate = self.moment(params.nextTraceDatetime);
let timeArr = self.timeItem.pkey.split("_") let timeArr = self.timeItem.pkey.split("_")
let hours = timeArr && timeArr.length && timeArr.pop() let hours = timeArr && timeArr.length && timeArr.pop()
let traceDateTime = traceDate.clone().add(Number(hours), 'hours'); let traceDateTime = traceDate.clone().add(Number(hours), 'hours');
params.nextTraceDatetime = traceDateTime.unix() * 1000 params.nextTraceDatetime = traceDateTime.unix() * 1000
} }
} else {
params.appointmentDatetime = self.traceDate
params.appointmentDatetimeRange = self.timeRange
} }
let res = await self.$u.api.traceAndAppointment(params, self.orderId); let res = await self.$u.api.traceAndAppointment(params, self.orderId);
self.submiting = false; self.submiting = false;
......
src/pages/order/material.vue 0 → 100644
View file @ 44e04f8d
<template>
<view class="mtr-content">
<view class="content-view">
<!-- 材料列表 -->
<view class="mtr-tab">
<u-table align="center" border-color="#FFFFFF" color="#333333" font-size="rpx" :th-style="thStyle"
padding="0">
<u-tr class="u-tr">
<u-th class="u-th content-tab-th" v-for="(value, key) in titles" :key="key" width="auto">
<text :class="['tab-th-txt', {'left': key == firstKey}]">{{value}}</text>
</u-th>
</u-tr>
<view class="line-view"></view>
<u-tr class="u-tr" v-for="(item, index) in list" :key="index">
<u-td class="u-td" v-for="(value, key) in titles" :key="key">
<text :class="['tab-th-txt', {'left': key == firstKey}]">{{item[key]}}</text>
</u-td>
</u-tr>
</u-table>
</view>
<!-- 其他 -->
<view class="mtr-other">
<view class="line-view"></view>
<view class="other-space">
<text>其他</text>
<image class="image-view" :src="addImage" @click="handleAdd"></image>
</view>
<view v-if="other.length > 0" class="other-content">
<view class="other-space" v-for="(item, index) in other" :key="index">
<view class="input-view">
<view class="other-space">
<text class="input-title">说明：</text>
<view class="input-content">
<u-input v-model="item.title" :clearable="false" placeholder-style="color:#999999;font-size:26rpx" />
</view>
</view>
<view class="other-space">
<text class="input-title">金额：</text>
<view class="input-content">
<u-input v-model="item.value" type="number" :clearable="false" placeholder-style="color:#999999;font-size:26rpx" />
</view>
</view>
</view>
<image class="image-view" :src="subtractImage" @click="handleSubtract"></image>
</view>
</view>
<view class="other-space">
<text>超出金额</text>
<text>{{money}}元</text>
</view>
</view>
</view>
<!-- 底部确定按钮 -->
<view class="bottom-view">
<u-button class="sure-button" type="primary" shape="circle" @click="handleSure" :custom-style="buttonStyle">
确定
</u-button>
</view>
</view>
</template>
<script>
export default {
data() {
return {
list: [], // 材料列表
other: [], // 其他列表
};
},
computed: {
buttonStyle() {
return {
width: "600rpx",
height: "104rpx",
"font-size": "32rpx",
"font-weight": "bold",
};
},
titles() {
return {
name: '材料名称',
unit: '单位',
freeAmount: '免费量',
price: '单价/元',
consumption: '预计用量'
}
},
thStyle() {
return {
'font-weight': 'bold'
}
},
firstKey() {
return Object.keys(this.titles)[0]
},
subtractImage() {
return process.uniEnv.qn_base_url + 'qxiao.png'
},
addImage() {
return process.uniEnv.qn_base_url + 'tianjia.png'
},
money() { // 总额
var amount = 0
for (var item of this.list) {
if (Number(item.consumption) && Number(item.freeAmount) && Number(item.price)) {
amount += Math.max(Number(item.consumption) - Number(item.freeAmount), 0) * Number(item.price)
}
}
for (var item of this.other) {
if (item.value && Number(item.value)) {
amount += Number(item.value)
}
}
return amount
}
},
created() {
// 测试数据
console.log('0000')
for (var i = 0; i < 20; i++) {
this.list.push({
name: '开关发大法师放大范德萨发大水',
unit: '个',
freeAmount: '1',
price: '45.0',
consumption: '4',
})
}
},
methods: {
/* 其他添加新的 */
handleAdd() {
this.other.push({
title: '',
value: ''
})
},
/* 其他删除某个 */
handleSubtract(index) {
this.other.splice(index, 1)
},
handleSure() {
// 返回总额money
}
}
}
</script>
<style lang="scss" scoped>
.mtr-content {
display: flex;
flex-direction: column;
background-color: #F4F5F7;
height: 100vh;
.content-view {
padding: 30rpx 30rpx 60rpx 30rpx;
margin: 20rpx 30rpx;
border-radius: 12rpx;
background-color: #FFFFFF;
height: 100%;
overflow: auto;
.line-view {
background-color: #F4F5F7;
height: 2rpx;
margin: 20rpx 0;
}
.mtr-tab {
.tab-th-txt {
background-color: #FFFFFF;
padding: 10rpx 0;
&.left {
text-align: left;
}
}
}
.mtr-other {
.other-space {
display: flex;
justify-content: space-between;
align-items: center;
}
.other-content {
margin-bottom: 30rpx;
}
.input-view {
padding: 10rpx 30rpx;
width: 100%;
border-radius: 12rpx;
border: 1px #F4F5F7 solid;
margin-bottom: 30rpx;
.input-title {
width: 80rpx;
flex-shrink: 0;
color: #333333;
font-size: 26rpx;
}
.input-content {
width: 100%;
}
}
.image-view {
width: 52rpx;
height: 52rpx;
flex-shrink: 0;
margin: 30rpx 0 30rpx 30rpx;
}
}
}
.bottom-view {
margin-bottom: 44rpx;
margin-top: 10rpx;
height: 104rpx;
}
}
</style>
src/pages/study/index.vue deleted 100644 → 0
View file @ 085246cc
<template>
</template>
<script>
</script>
<style>
</style>
src/plugins/uploader/index.js
View file @ 44e04f8d
...@@ -39,7 +39,7 @@ uploader.getQnToken = function(params) { ...@@ -39,7 +39,7 @@ uploader.getQnToken = function(params) {
*region: 地区 默认为：ECN *region: 地区 默认为：ECN
*/ */
resolve({ resolve({
visitPrefix: data.host || globalUrl.qn_asset_url, visitPrefix: data.host,
token: data.token || '', token: data.token || '',
folderPath: data.folderPath || '', folderPath: data.folderPath || '',
region: "ECN" region: "ECN"
......
src/uview-ui/components/u-button/u-button.vue
View file @ 44e04f8d
...@@ -26,7 +26,6 @@ ...@@ -26,7 +26,6 @@
:send-message-img="sendMessageImg" :send-message-img="sendMessageImg"
:show-message-card="showMessageCard" :show-message-card="showMessageCard"
@getphonenumber="getphonenumber" @getphonenumber="getphonenumber"
@getuserinfo="getuserinfo"
@error="error" @error="error"
@opensetting="opensetting" @opensetting="opensetting"
@launchapp="launchapp" @launchapp="launchapp"
...@@ -325,9 +324,9 @@ export default { ...@@ -325,9 +324,9 @@ export default {
getphonenumber(res) { getphonenumber(res) {
this.$emit('getphonenumber', res); this.$emit('getphonenumber', res);
}, },
getuserinfo(res) { // getuserinfo(res) {
this.$emit('getuserinfo', res); // this.$emit('getuserinfo', res);
}, // },
error(res) { error(res) {
this.$emit('error', res); this.$emit('error', res);
}, },
......
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