chen
/
flying-monkey
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

修改首页解决方案，微信端兼容性，修改引导页跳转问题，修改详情图片处理、修改列表无更多处理

master
chen 2022-04-22 18:39:36 +08:00
parent 49899aa8ed
commit 33575542f5
25 changed files with 317 additions and 311 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
App.vue
View File

@ -4,7 +4,7 @@
projectname:'', // 项目名称 projectname:'', // 项目名称
lat:'', // 公司地址维度 lat:'', // 公司地址维度
lng:'' ,// 公司地址经度 lng:'' ,// 公司地址经度
hostapi:'' // 域名配置 hostapi:'https://7and5.cn' // 域名配置
}, },
// 优先于show方法 // 优先于show方法
onLaunch: function() { onLaunch: function() {

15
jsFile/requst.js
View File

@ -1,17 +1,6 @@
// 判断当前环境 // 判断当前环境
const ENV = process.env.NODE_ENV; const ENV = process.env.NODE_ENV;
console.log(ENV,'当前环境'); // development：开发环境 test：测试环境 production：生产环境 console.log(ENV,'当前环境'); // development：开发环境 test：测试环境 production：生产环境
// 配置全局域名
// #ifdef APP-PLUS
const hostapi = 'https://7and5.cn';
// #endif
// #ifdef MP-WEIXIN
const hostapi = 'https://7and5.cn';
// #endif
// #ifdef H5
const hostapi = '/web';
// const hostapi = 'https://7and5.cn';
// #endif
// 清理所有缓存并前往授权页 // 清理所有缓存并前往授权页
const goLogin = () => { const goLogin = () => {
uni.clearStorageSync(); uni.clearStorageSync();
@ -90,7 +79,7 @@ const request = (method, url, options) => {
// params.token = uni.getStorageSync('token'); // params.token = uni.getStorageSync('token');
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
uni.request({ uni.request({
url: `${hostapi}${url}`, url: `${getApp().globalData.hostapi}${url}`,
method: methods, method: methods,
data: params, data: params,
header: headers, header: headers,
@ -122,7 +111,7 @@ const uploadFile = (url, options) => {
let tempData = options || {} let tempData = options || {}
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
uni.uploadFile({ uni.uploadFile({
url: `${hostapi}${url}`, url: `${getApp().globalData.hostapi}${url}`,
filePath: tempData.path, filePath: tempData.path,
name: 'file', name: 'file',
fileType:'image', fileType:'image',

6
jsFile/tools.js
View File

@ -651,8 +651,10 @@ const tools = {
return arrEntities[t]; return arrEntities[t];
}) })
.replace('<section', '<div') .replace('<section', '<div')
.replace(/\<img/g, '<img @tap="pre" style="max-width:100%!important;height:auto" ') // .replace(/\<img/g, '<img style="max-width:100%!important;width:100%!important;height:auto" mode="widthFix" ')
.replace(/src=\"/g,'src="https://oss.hmzfyy.cn'); .replace(/\<img/g, '<img mode="widthFix" ')
.replace(/src=\"/g,'src="https://7and5.cn')
.replace(/style="[^\"]*?"/g,'style="max-width:100%!important;width:100%!important;height:auto" ');
}, },
// 检查网络状态 // 检查网络状态
networkStatus(){ networkStatus(){

12
manifest.json
View File

@ -42,6 +42,11 @@
"ios" : { "ios" : {
"privacyDescription" : { "privacyDescription" : {
"NSLocationWhenInUseUsageDescription" : "" "NSLocationWhenInUseUsageDescription" : ""
},
"capabilities" : {
"entitlements" : {
"com.apple.developer.associated-domains" : [ "applinks:static-c27fa8d7-ef72-4327-ab9b-d4787a747ee3.bspapp.com" ]
}
} }
}, },
/* ios打包配置 */ /* ios打包配置 */
@ -56,7 +61,7 @@
"weixin" : { "weixin" : {
"__platform__" : [ "ios", "android" ], "__platform__" : [ "ios", "android" ],
"appid" : "wx2654bc27c419ada6", "appid" : "wx2654bc27c419ada6",
"UniversalLinks" : "" "UniversalLinks" : "https://static-c27fa8d7-ef72-4327-ab9b-d4787a747ee3.bspapp.com/uni-universallinks/__UNI__25FB71A/"
} }
}, },
"push" : {}, "push" : {},
@ -78,7 +83,7 @@
"share" : { "share" : {
"weixin" : { "weixin" : {
"appid" : "wx2654bc27c419ada6", "appid" : "wx2654bc27c419ada6",
"UniversalLinks" : "" "UniversalLinks" : "https://static-c27fa8d7-ef72-4327-ab9b-d4787a747ee3.bspapp.com/uni-universallinks/__UNI__25FB71A/"
} }
}, },
"ad" : {} "ad" : {}
@ -132,5 +137,6 @@
}, },
"mp-baidu" : { "mp-baidu" : {
"appid" : "24346353" "appid" : "24346353"
} },
"_spaceID" : "c27fa8d7-ef72-4327-ab9b-d4787a747ee3"
} }

27
pages/dataQuery/client.vue
View File

@ -1,15 +1,15 @@
<template> <template>
<view class="content"> <view>
<statusNav returnColor="#c2c2c2" navBarTitle="客户(查询结果列表)"></statusNav> <statusNav returnColor="#c2c2c2" navBarTitle="客户(查询结果列表)"></statusNav>
<container-subgroup-two> <container-subgroup-two>
<view class="client-content" slot="content" style="margin: -20rpx -30rpx 0;"> <view class="client-content" slot="content" style="margin: 0rpx -30rpx 0;">
<view @tap="goDetail(item.id)" class="li" v-for="(item,index) in dataList" :key="index"> <view @tap="goDetail(item.id)" class="li mar-x20 animated fadeIn" v-for="(item,index) in dataList" :key="index">
<view class="li-content"> <view class="li-content">
<view class=""> <view class="">
<view class="title">{{item.name}}</view> <view class="title">{{item.name}}</view>
<view class="code">编号：{{item.code}}</view> <view class="code">编号：{{item.code}}</view>
<view class="label-content" > <view class="label-content fw" >
<view class="label" v-for="(key,index) in item.icon">{{key}}</view> <view :class="key ? 'label' : ''" v-for="(key,index) in item.icon">{{key}}</view>
</view> </view>
</view> </view>
<view class="icon">{{item.num}}</view> <view class="icon">{{item.num}}</view>
@ -19,7 +19,7 @@
<view class="text">{{item.address}}</view> <view class="text">{{item.address}}</view>
</view> </view>
</view> </view>
<pitera v-if="total==dataList.length" textStr="暂无更多客户列表数据"></pitera> <pitera v-if="total==dataList.length && !ifLoging" textStr="暂无更多客户列表数据"></pitera>
</view> </view>
</container-subgroup-two> </container-subgroup-two>
</view> </view>
@ -47,10 +47,11 @@
// address:"湖南省长沙市高新开发区谷园路109号像素大厦1205" // address:"湖南省长沙市高新开发区谷园路109号像素大厦1205"
// } // }
], ],
list_rows:20, list_rows:10,
page:1, page:1,
total:0, total:0,
key_word:''//关键词 key_word:'',//关键词
ifLoging:true
} }
}, },
onReachBottom() { onReachBottom() {
@ -75,6 +76,10 @@
}, },
// 查询客户列表事件 // 查询客户列表事件
queryFunEv(keyword){ queryFunEv(keyword){
uni.showLoading({
title:'加载中...',
mask:true
})
let params = { let params = {
type_id:1, type_id:1,
keyword, keyword,
@ -91,7 +96,7 @@
id:item.member_id,//客户id id:item.member_id,//客户id
name:item.name,//客户名称 name:item.name,//客户名称
code:item.serial_number,//客户编号 code:item.serial_number,//客户编号
icon:["弱电安防","弱电安防","弱电安防"], icon:[item.industry_name,item.member_level,item.member_type],
num:item.project_count,//项目数量 num:item.project_count,//项目数量
address:item.address//客户地址 address:item.address//客户地址
} }
@ -101,6 +106,8 @@
} else { } else {
this.$toolAll.tools.showToast(res.msg); this.$toolAll.tools.showToast(res.msg);
} }
uni.hideLoading();
this.ifLoging = false;
}) })
} }
} }
@ -111,7 +118,6 @@
<style> <style>
.client-content .li { .client-content .li {
background-color: #FFFFFF; background-color: #FFFFFF;
margin-top: 20rpx;
padding: 30rpx 34rpx 30rpx 53rpx; padding: 30rpx 34rpx 30rpx 53rpx;
} }
@ -139,6 +145,7 @@
color: #999999; color: #999999;
font-size: 24rpx; font-size: 24rpx;
border-radius: 5rpx; border-radius: 5rpx;
margin-top: 10rpx;
} }
.client-content .li .li-content { .client-content .li .li-content {

119
pages/dataQuery/dataQuery.vue
View File

@ -4,70 +4,23 @@
<container-subgroup-two> <container-subgroup-two>
<view class="dataQuery-content" slot="content" style="margin: 0 -30rpx;"> <view class="dataQuery-content" slot="content" style="margin: 0 -30rpx;">
<view class="li"> <view class="li animated fadeIn" v-for="(item,index) in dataList" :key="index">
<view class="title mar-y120 clips1">项目名称：湖南工业大学生化学院三楼会议室湖南工业大学生化学院三楼会议室</view> <view class="title mar-y120 clips1">项目名称：{{item.name}}</view>
<view class="text-content"> <view class="text-content">
<view class="left"> <view class="left">
<view class="text clips1">核心品牌：海康威视</view> <view class="text clips1">核心品牌：{{item.brand}}</view>
<view class="text clips1">规格型号：DS-CK18FI-H</view> <view class="text clips1">规格型号：{{item.model}}</view>
<view class="text clips1">批 次 号：2210122</view> <view class="text clips1">批 次 号：{{item.batch_number}}</view>
</view> </view>
<view class="rigth"> <view class="rigth">
<view class="text">备品数量：<text class="cor">3张</text></view> <view class="text">备品数量：<text class="cor">{{item.quantity}}张</text></view>
<view class="text cor1">备品尺寸：320*160</view> <view class="text cor1">备品尺寸：{{item.size}}</view>
<view class="text cor1">入库时间：2021-04-06 16:45:45</view> <view class="text cor1">入库时间：{{item.time}}</view>
</view> </view>
</view> </view>
<view class="icon" v-if="true"> <view class="icon1" :class="['icon','icon1']"><text class="icon-text">{{['正常','待维保'][item.status]}}</text></view>
<text class="icon-text">正常</text>
</view>
<view class="icon1" v-else>
<text class="icon-text">待维保</text>
</view>
</view> </view>
<view class="li"> <pitera v-if="total==dataList.length && !ifLoading" textStr="查询数据加载完毕~" textFontSize="30rpx" textColor="#b5b2b2"></pitera>
<view class="title">项目名称：湖南工业大学生化学院三楼会议室</view>
<view class="text-content">
<view class="left">
<view class="text">核心品牌：海康威视</view>
<view class="text">规格型号：DS-CK18FI-H</view>
<view class="text">批 次 号：2210122</view>
</view>
<view class="rigth">
<view class="text">备品数量：<text class="cor">3张</text></view>
<view class="text cor1">备品尺寸：320*160</view>
<view class="text cor1">入库时间：2021-04-06 16:45:45</view>
</view>
</view>
<view class="icon" v-if="true">
<text class="icon-text">正常</text>
</view>
<view class="icon1" v-else>
<text class="icon-text">待维保</text>
</view>
</view>
<view class="li">
<view class="title">项目名称：湖南工业大学生化学院三楼会议室</view>
<view class="text-content">
<view class="left">
<view class="text">核心品牌：海康威视</view>
<view class="text">规格型号：DS-CK18FI-H</view>
<view class="text">批 次 号：2210122</view>
</view>
<view class="rigth">
<view class="text">备品数量：<text class="cor">3张</text></view>
<view class="text cor1">备品尺寸：320*160</view>
<view class="text cor1">入库时间：2021-04-06 16:45:45</view>
</view>
</view>
<view class="icon" v-if="false">
<text class="icon-text">正常</text>
</view>
<view class="icon1" v-else>
<text class="icon-text">待维保</text>
</view>
</view>
<pitera v-if="total==dataList.length" textStr="暂无更多备品列表数据"></pitera>
</view> </view>
</container-subgroup-two> </container-subgroup-two>
</view> </view>
@ -88,11 +41,24 @@
}, },
data() { data() {
return { return {
dataList: [], dataList: [
// {
// id:1,
// name:'湖南工业大学生化学院三楼会议室湖南工业大学生化学院三楼会议室',//项目名称
// brand:'海康威视',//核心品牌
// quantity: 0,//备品数量
// model:'DS-CK18FI-H',//规格型号
// size:'320*160',//产品尺寸
// batch_number:'2210122',//批次号
// time:'2021-04-06 16:45:45',//入库时间
// status:0
// },
],
list_rows: 20, list_rows: 20,
page: 1, page: 1,
total: 0, total: 0,
key_word: '' //关键词 key_word: '' ,//关键词
ifLoading:true
} }
}, },
onReachBottom() { onReachBottom() {
@ -111,6 +77,10 @@
methods: { methods: {
// 查询(备品)列表事件 // 查询(备品)列表事件
queryFunEv() { queryFunEv() {
uni.showLoading({
title:'加载中...',
mask:true
})
let params = { let params = {
type_id: 3, type_id: 3,
keyword: this.key_word, keyword: this.key_word,
@ -121,22 +91,27 @@
if (res.code) { if (res.code) {
this.total = res.data.total; //设置总条数 this.total = res.data.total; //设置总条数
if (this.page == 1) this.dataList = []; if (this.page == 1) this.dataList = [];
// if(res.data.data.length) { if(res.data.data.length) {
// res.data.data.forEach(item=>{ res.data.data.forEach(item=>{
// let obj = { let obj = {
// id:item.member_id,//客户id id:item.spare_id,
// name:item.name,//客户名称 name:item.name,//项目名称
// code:item.serial_number,//客户编号 brand:item.brand,//核心品牌
// icon:["弱电安防","弱电安防","弱电安防"], quantity: item.quantity,//备品数量
// num:item.project_count,//项目数量 model:item.model,//规格型号
// address:item.address//客户地址 size:item.size,//产品尺寸
// } batch_number:item.batch_number,//批次号
// this.projectQuery.push(obj); time:item.time,//入库时间
// }) status:item.status //0：正常 1：待维修
// } }
this.dataList.push(obj);
})
}
} else { } else {
this.$toolAll.tools.showToast(res.msg); this.$toolAll.tools.showToast(res.msg);
} }
uni.hideLoading();
this.ifLoading = false;
}) })
} }
} }

116
pages/dataQuery/projectQuery.vue
View File

@ -4,29 +4,39 @@
<container-subgroup-two> <container-subgroup-two>
<view slot="content" style="margin: 0 -30rpx;"> <view slot="content" style="margin: 0 -30rpx;">
<view class="project-list"> <view class="project-list">
<view class="li" @click="projectDetailsFun(item.id)" v-for="(item,index) in projectQuery" :key="index"> <view class="li animated fadeIn" @click="projectDetailsFun(item.id)" v-for="(item,index) in projectQuery" :key="index">
<view class="message pad-s10"> <view class="message pad-s10">
<image class="img" src="../../static/del/img001.png" mode="aspectFill"></image> <!-- 项目图片 -->
<image class="img" :src="item.img" mode="aspectFill" lazy-load></image>
<view class="text"> <view class="text">
<view class="title">{{item.name}}</view> <view class="title">{{item.name}}</view>
<view class="serial-number">项目编号：{{item.code}}</view> <view class="serial-number">项目编号：{{item.code}}</view>
<view class="specification">规格型号：{{item.model}}</view> <view class="specification" v-if="item.model">规格型号：{{item.model}}</view>
<view class="specification">产品尺寸：{{item.size}}</view> <view class="specification" v-if="item.size">产品尺寸：{{item.size}}</view>
<view class="installation-site">安装位置：{{item.installationSite}}</view> <view class="installation-site" v-if="item.installationSite">安装位置：{{item.installationSite}}</view>
</view> </view>
</view> </view>
<view class="project-list-address"> <view class="project-list-address disjbac">
<view class="address"> <view class="address">
<image class="img" src="../../static/iocn/im.png" mode="aspectFill"></image> <image class="img flexs" src="../../static/iocn/im.png" mode="" lazy-load></image>
<!-- 地址 -->
<view class="text">{{item.address}}</view> <view class="text">{{item.address}}</view>
</view> </view>
<view class="date">{{item.date}}</view> <!-- 时间 -->
<view class="date col6">{{item.date}}</view>
</view> </view>
<view class="icon iconBer" v-if="item.state==0">质保到期</view> <!-- 状态 -->
<view class="icon" :style="{backgroundColor: item.statusStyle.color}">
<view class="posir disac" style="width: 135rpx;height: 40rpx;">
<span class="posia" :style="{border: `6rpx solid ${item.statusStyle.color}`,borderBottom: `6rpx solid transparent`,borderRight: `6rpx solid transparent`}" style="display: block;width: 0;height: 0;transform: rotate(45deg);right: -4rpx;top: 2rpx;"></span>
<span class="posia width100">{{item.statusStyle.text}}</span>
</view>
</view>
<!-- <view class="icon iconBer" v-if="item.state==0">质保到期</view>
<view class="icon iconBera" v-if="item.state==1">质保中</view> <view class="icon iconBera" v-if="item.state==1">质保中</view>
<view class="icon iconBerb" v-if="item.state==2">临时项目</view> <view class="icon iconBerb" v-if="item.state==2">临时项目</view> -->
</view> </view>
<pitera v-if="total==projectQuery.length" textStr="暂无更多项目列表数据"></pitera> <pitera v-if="total==projectQuery.length && !ifLoading" textStr="查询数据加载完毕~" textFontSize="30rpx" textColor="#b5b2b2"></pitera>
</view> </view>
</view> </view>
</container-subgroup-two> </container-subgroup-two>
@ -48,24 +58,24 @@
return { return {
projectQuery: [ projectQuery: [
{ // {
id:1, // id:1,
name: "湖南工业大学化工学院会议室P2.5全彩LED显示屏", // name: "湖南工业大学化工学院会议室P2.5全彩LED显示屏",
img: "../../static/del/img001.png", // img: "../../static/del/img001.png",
code: "20220108-1001", // code: "20220108-1001",
model: "DS-CK25FI/H", // model: "DS-CK25FI/H",
size: "3.94ｍ*2.02ｍ", // size: "3.94ｍ*2.02ｍ",
installationSite: "xxx综合楼2楼会议室", // installationSite: "xxx综合楼2楼会议室",
address: "湖南省长沙市高新开发区谷园路109号像素大厦1205", // address: "湖南省长沙市高新开发区谷园路109号像素大厦1205",
date: "2022/01/08", // date: "2022/01/08",
state: 1 // state: 1
// }
}
], ],
list_rows:20, list_rows:20,
page:1, page:1,
total:0, total:0,
key_word:''//关键词 key_word:'',//关键词
ifLoading:true
} }
}, },
onReachBottom() { onReachBottom() {
@ -89,6 +99,10 @@
}, },
// 查询(项目)列表事件 // 查询(项目)列表事件
queryFunEv(){ queryFunEv(){
uni.showLoading({
title:'加载中...',
mask:true
})
let params = { let params = {
type_id:2, type_id:2,
keyword:this.key_word, keyword:this.key_word,
@ -99,22 +113,32 @@
if(res.code) { if(res.code) {
this.total = res.data.total;//设置总条数 this.total = res.data.total;//设置总条数
if(this.page==1) this.projectQuery = []; if(this.page==1) this.projectQuery = [];
// if(res.data.data.length) { if(res.data.data.length) {
// res.data.data.forEach(item=>{ res.data.data.forEach(item=>{
// let obj = { let newTime = item.joint_starting_times.slice(0,10).split('-');
// id:item.member_id,//客户id newTime = newTime.join('/');
// name:item.name,//客户名称 let obj = {
// code:item.serial_number,//客户编号 id:item.project_id,
// icon:["弱电安防","弱电安防","弱电安防"], name: item.project_name,//项目名称
// num:item.project_count,//项目数量 img: item.completed_img,//项目图片
// address:item.address//客户地址 code: item.project_number,//项目编号
// } model: item.product_model,//规格型号
// this.projectQuery.push(obj); size: item.product_size,//产品尺寸
// }) installationSite: item.installation_location,//安装位置
// } address: item.address,//详细地址
date: newTime,
state: 1,
statusStyle:item.attributes//状态颜色和文字
}
this.projectQuery.push(obj);
})
}
} else { } else {
this.$toolAll.tools.showToast(res.msg); this.$toolAll.tools.showToast(res.msg);
} }
uni.hideLoading();
this.ifLoading = false;
}) })
}, },
bindPickerChange(data){ bindPickerChange(data){
@ -230,19 +254,7 @@
text-align: center; text-align: center;
background-size: 100% 100%; background-size: 100% 100%;
top: 0rpx; top: 0rpx;
border-radius: 6rpx 0 6rpx 6rpx;
}
.project-list .li .iconBer {
background-image: url(../../static/iocn/za.png);
}
.project-list .li .iconBera {
background-image: url(../../static/iocn/zac.png);
}
.project-list .li .iconBerb {
background-image: url(../../static/iocn/lsxm.png);
} }
.project-list .li .message { .project-list .li .message {
display: flex; display: flex;
@ -309,8 +321,6 @@
.project-list-address .date { .project-list-address .date {
font-size: 24rpx; font-size: 24rpx;
text-align: right; text-align: right;
margin-left: 20rpx;
margin-top: 12rpx;
} }
.project-list-address .img { .project-list-address .img {

67
pages/guide-page/guide-page.vue
View File

@ -17,44 +17,47 @@
methods: { methods: {
// 检测是否是微信端 // 检测是否是微信端
checkContext(){ checkContext(){
setTimeout(()=>{
uni.reLaunch({
url:'/pages/login/login'
})
},3000)
// #ifdef APP-PLUS // #ifdef APP-PLUS
if(uni.getSystemInfoSync().platform != "devtools"){//devtools：开发版 值域为：ios、android、mac（3.1.10+）、windows（3.1.10+）、linux（3.1.10+） // if(uni.getSystemInfoSync().platform != "devtools"){//devtools：开发版 值域为：ios、android、mac（3.1.10+）、windows（3.1.10+）、linux（3.1.10+）
console.log = () =>{} // console.log = () =>{}
} // }
setTimeout(()=>{ // setTimeout(()=>{
uni.reLaunch({ // uni.reLaunch({
url:'/pages/login/login' // url:'/pages/login/login'
}) // })
},3000) // },3000)
// #endif // #endif
// #ifdef H5 // #ifdef H5
if(uni.getSystemInfoSync().platform != "development"){//devtools：开发版 值域为：ios、android、mac（3.1.10+）、windows（3.1.10+）、linux（3.1.10+） // if(uni.getSystemInfoSync().platform != "development"){//devtools：开发版 值域为：ios、android、mac（3.1.10+）、windows（3.1.10+）、linux（3.1.10+）
console.log = () =>{} // console.log = () =>{}
} // }
setTimeout(()=>{ // setTimeout(()=>{
uni.reLaunch({ // uni.reLaunch({
url:'/pages/login/login' // url:'/pages/login/login'
}) // })
},3000) // },3000)
// #endif // #endif
// 微信小程序原生API性能优化 // 微信小程序原生API性能优化
// #ifdef MP-WEIXIN // #ifdef MP-WEIXIN
let hInfo = wx.getAccountInfoSync(); // let hInfo = wx.getAccountInfoSync();
// console.log(hInfo.envVersion);//develop:开发版 trial：体验版 release：正式版 // // console.log(hInfo.envVersion);//develop:开发版 trial：体验版 release：正式版
if(hInfo.miniProgram.envVersion == "develop" || hInfo.miniProgram.envVersion == "trial"){ // if(hInfo.miniProgram.envVersion == "develop" || hInfo.miniProgram.envVersion == "trial"){
// (开发版,体验版)-配置全局域名 // // (开发版,体验版)-配置全局域名
// uni.setStorageSync('hostapi','https://hengmei.scdxtc.cn/api/'); // } else {
} else { // // 清除所有输出日志
// 清除所有输出日志 // console.log = () =>{};
console.log = () =>{}; // // 正式版-配置全局域名
// 正式版-配置全局域名 // }
// uni.setStorageSync('hostapi','https://hm.hmzfyy.cn/api/'); // setTimeout(()=>{
} // uni.reLaunch({
setTimeout(()=>{ // url:'/pages/tabbar/pagehome/pagehome'
uni.reLaunch({ // })
url:'/pages/tabbar/pagehome/pagehome' // },3000)
})
},3000)
// #endif // #endif
} }
} }

49
pages/mountingsList/mountingsList.vue
View File

@ -5,21 +5,21 @@
<view slot="content" style="margin: -26rpx -25rpx 0rpx" :style="{paddingTop:statusBarHeight + 'px'}"> <view slot="content" style="margin: -26rpx -25rpx 0rpx" :style="{paddingTop:statusBarHeight + 'px'}">
<view class="mountingsList-input" :style="{top:statusBarHeight + 'px'}"> <view class="mountingsList-input" :style="{top:statusBarHeight + 'px'}">
<input type="text" class="int fon24" value="" placeholder="请输入关键字" /> <input type="text" class="int fon24" value="" placeholder="请输入关键字" />
<image class="search" src="../../static/iocn/ss.png" mode=""></image> <image class="search" src="../../static/iocn/ss.png" mode="" lazy-load></image>
<view class="xian"></view> <view class="xian"></view>
</view> </view>
<view class="mountings-list"> <view class="mountings-list">
<view class="li radius10" v-for="(item,index) in dataList.data" :key="index"> <view class="li radius10 animated fadeIn" v-for="(item,index) in dataList.data" :key="index">
<view class="textCon" style="padding: 0rpx 16rpx;"> <view class="textCon" style="padding: 0rpx 16rpx;">
<view class="imgCon"> <view class="imgCon">
<image :src="item.images" class="img radius10" mode="aspectFill"></image> <image :src="item.images" class="img radius10" mode="aspectFill" lazy-load></image>
<!-- <image src="/static/del/img001.png" class="img radius10" mode="aspectFill"></image> --> <!-- <image src="/static/del/img001.png" class="img radius10" mode="aspectFill"></image> -->
</view> </view>
<view class="text" style="104rpx"> <view class="text" style="104rpx">
<view class="title disjbac posir"> <view class="title disjbac posir">
<view class="clips1 mar-y40 bold fon24">{{item.name}}</view> <view class="clips1 mar-y40 bold fon24">{{item.name}}</view>
<view class="ispitchOn" @click="ispitchOnFun(item)" style="position: absolute;right: 0;"> <view class="ispitchOn" @click="ispitchOnFun(item)" style="position: absolute;right: 0;">
<image v-if="item.isJob" src="../../static/iocn/pxz.png" class="icon1" mode=""></image> <image v-if="item.isJob" src="../../static/iocn/pxz.png" class="icon1" mode="" lazy-load></image>
<view v-else class="icon"></view> <view v-else class="icon"></view>
</view> </view>
</view> </view>
@ -40,8 +40,10 @@
<view class="sum fon24 bold flexs">费用合计：¥{{item.sum}}</view> <view class="sum fon24 bold flexs">费用合计：¥{{item.sum}}</view>
</view> </view>
</view> </view>
<pitera v-if="dataList.data.length" textStr="暂无更多配件列表数据"></pitera>
<nothing-page v-if="dataList.data.length==0 && !ifLoading"></nothing-page>
</view> </view>
<button class="submit-button" @tap="submitEv" type="default">确认提交</button> <button v-show="dbtn" class="submit-button" @tap="submitEv" type="default">确认提交</button>
</view> </view>
</container-subgroup-two> </container-subgroup-two>
</view> </view>
@ -50,10 +52,12 @@
<script> <script>
import statusNav from '../../components/status-nav.vue'; import statusNav from '../../components/status-nav.vue';
import containerSubgroupTwo from '@/components/containers/container-subgroup-two.vue'; import containerSubgroupTwo from '@/components/containers/container-subgroup-two.vue';
import pitera from '@/components/nothing/pitera.vue';
export default { export default {
components: { components: {
statusNav, statusNav,
containerSubgroupTwo containerSubgroupTwo,
pitera
}, },
data() { data() {
return { return {
@ -61,11 +65,20 @@
dataList: { dataList: {
list_rows: 10, list_rows: 10,
page: 1, page: 1,
data:{}, data:[],
}, },
temporaryList:[] // 暂时存储选中的配件列表 total:0,
temporaryList:[] ,// 暂时存储选中的配件列表
ifLoading:true,
dbtn:false
} }
}, },
onReachBottom() {
if(this.total!=this.dataList.data.length) {
this.dataList.page++;
this.getData();
}
},
onLoad() { onLoad() {
// 调用获取配件列表事件 // 调用获取配件列表事件
this.getData() this.getData()
@ -85,7 +98,8 @@
this.temporaryList.push(item); this.temporaryList.push(item);
} }
}) })
uni.setStorageSync('partsList',this.temporaryList) uni.setStorageSync('partsList',this.temporaryList);
this.temporaryList.length ? this.dbtn = true : this.dbtn = false;
}, },
// 配件数量加减事件 // 配件数量加减事件
addDelEv(item,index) { addDelEv(item,index) {
@ -105,6 +119,10 @@
}, },
// 获取配件列表事件 // 获取配件列表事件
getData() { getData() {
uni.showLoading({
title:'加载中...',
mask:true
})
this.$requst.post('/universal/api.accessory/accessory_list', { this.$requst.post('/universal/api.accessory/accessory_list', {
list_rows: this.dataList.list_rows, list_rows: this.dataList.list_rows,
page: this.dataList.page, page: this.dataList.page,
@ -134,12 +152,14 @@
newList.splice(index,1) newList.splice(index,1)
} }
}) })
// 调用暂存配件列表事件
this.temporaryEv();
} }
}) })
} }
} else {
} }
uni.hideLoading();
this.ifLoading = false;
}) })
}, },
// 确认提交事件 // 确认提交事件
@ -154,7 +174,6 @@
<style> <style>
.content { .content {
padding-top: 70rpx; padding-top: 70rpx;
padding-bottom: 80rpx;
} }
.mountingsList-input .xian { .mountingsList-input .xian {
width: 3rpx; width: 3rpx;
@ -167,13 +186,17 @@
margin-top: -14rpx; margin-top: -14rpx;
} }
.submit-button { .submit-button {
position: fixed;
bottom: 20rpx;
left: 50%;
transform: translateX(-50%);
width: 686rpx; width: 686rpx;
border-radius: 50rpx; border-radius: 50rpx;
margin-top: 60rpx;
height: 90rpx; height: 90rpx;
background-color: #02A2ea; background-color: #02A2ea;
line-height: 90rpx; line-height: 90rpx;
color: #FFFFFF; color: #FFFFFF;
margin-top: 60rpx;
text-align: center; text-align: center;
font-size: 30rpx; font-size: 30rpx;
} }

19
pages/project/projectList.vue
View File

@ -32,7 +32,7 @@
</view> </view>
</view> </view>
<view class="project-list"> <view class="project-list">
<view class="li" @click="projectDetailsFun(item.project_id)" v-for="(item,index) in dataList.data" :key="index"> <view class="li animated fadeIn" @click="projectDetailsFun(item.project_id)" v-for="(item,index) in dataList.data" :key="index">
<view class="message"> <view class="message">
<image class="img" src="../../static/del/img001.png" mode="aspectFill" lazy-load></image> <image class="img" src="../../static/del/img001.png" mode="aspectFill" lazy-load></image>
<view class="text disjb fc" style="height: 180rpx;"> <view class="text disjb fc" style="height: 180rpx;">
@ -47,10 +47,8 @@
</view> </view>
<view class="project-list-address col6 mar-s20 disjbac"> <view class="project-list-address col6 mar-s20 disjbac">
<view class="address"> <view class="address">
<image class="img flexs" src="../../static/iocn/im.png" mode="scaleToFill" lazy-load> <image class="img flexs" src="../../static/iocn/im.png" mode="scaleToFill" lazy-load></image>
</image> <view class="text scal09" style="margin-left: -26rpx;">{{item.address}}</view>
<view class="text scal09" style="margin-left: -26rpx;">{{item.address}}
</view>
</view> </view>
<view class="date scal09 flexs">{{item.joint_starting_times}}</view> <view class="date scal09 flexs">{{item.joint_starting_times}}</view>
</view> </view>
@ -59,7 +57,7 @@
</view> </view>
<pitera v-if="total==dataList.data.length && dataList.data.length" textStr="暂无更多项目列表数据"></pitera> <pitera v-if="total==dataList.data.length && dataList.data.length" textStr="暂无更多项目列表数据"></pitera>
</view> </view>
<nothing-page v-if="dataList.data.length==0" content="暂无更多项目列表数据"></nothing-page> <nothing-page v-if="dataList.data.length==0 && !ifLoading" content="暂无更多项目列表数据"></nothing-page>
</view> </view>
</container-subgroup-two> </container-subgroup-two>
<footTabOne :current="1"></footTabOne> <footTabOne :current="1"></footTabOne>
@ -99,7 +97,8 @@
}, },
productType:'',//产品类型id productType:'',//产品类型id
completion_time:'',//竣工日期 completion_time:'',//竣工日期
total:''//总数 total:'',//总数
ifLoading:true
} }
}, },
onReachBottom() { onReachBottom() {
@ -120,6 +119,10 @@
}, },
// 查询项目列表 // 查询项目列表
getData() { getData() {
uni.showLoading({
mask:true,
title:'加载中...'
})
if(this.dataList.page==1) this.dataList.data = []; if(this.dataList.page==1) this.dataList.data = [];
this.$requst.get('/universal/api.project/project_list', { this.$requst.get('/universal/api.project/project_list', {
product_type:this.productType, product_type:this.productType,
@ -133,6 +136,8 @@
this.total = res.data.total; this.total = res.data.total;
this.dataList.data = [...this.dataList.data,...res.data.data]; this.dataList.data = [...this.dataList.data,...res.data.data];
} }
uni.hideLoading();
this.ifLoading = false;
}) })
}, },
projectDetailsFun(id) { projectDetailsFun(id) {

10
pages/tabbar/pagehome/pagehome.vue
View File

@ -194,7 +194,7 @@
</view> </view>
<view class="mar-s30"> <view class="mar-s30">
<scroll-view scroll-x> <scroll-view scroll-x>
<view :class="solutionList.length == 4 ? 'disjbac' : 'disac'"> <view :class="[solutionList.length == 4 ? 'disjbac' : 'disac']">
<view @tap="goDetail(0,item.id)" class="posir flexs" v-for="(item,index) in solutionList" :key="index" style="width: 23%;height: 110px;" :style="{marginRight: solutionList.length != 4 ? '20rpx' : ''}"> <view @tap="goDetail(0,item.id)" class="posir flexs" v-for="(item,index) in solutionList" :key="index" style="width: 23%;height: 110px;" :style="{marginRight: solutionList.length != 4 ? '20rpx' : ''}">
<image style="width: 100%;height: 110px;" class="radius10 " :src="item.imgsrc" mode="aspectFill"></image> <image style="width: 100%;height: 110px;" class="radius10 " :src="item.imgsrc" mode="aspectFill"></image>
<view class="posia solution-title clips1">{{item.title}}</view> <view class="posia solution-title clips1">{{item.title}}</view>
@ -271,10 +271,10 @@
], ],
// 解决方案 // 解决方案
solutionList:[ solutionList:[
{imgsrc:'/static/deleteImg/flying-img01.png',title:'控制室解决方案'}, {imgsrc:'',title:'控制室解决方案'},
{imgsrc:'/static/deleteImg/flying-img02.png',title:'户外屏解决方案'}, {imgsrc:'',title:'户外屏解决方案'},
{imgsrc:'/static/deleteImg/flying-img03.png',title:'会议室解决方案'}, {imgsrc:'',title:'会议室解决方案'},
{imgsrc:'/static/deleteImg/flying-img04.png',title:'实体店解决方案'}, {imgsrc:'',title:'实体店解决方案'},
], ],
// 项目维保 // 项目维保
projectRepairList:[ projectRepairList:[

4
pages/workOrder/details.vue
View File

@ -48,7 +48,7 @@
</view> </view>
<view class="li"> <view class="li">
<view class="title">维保说明：</view> <view class="title">维保说明：</view>
<textarea style="max-height: 260rpx;overflow: hidden;overflow-y: scroll;" disabled class="input" :value="detailObj.failure_description" /> <textarea style="overflow: hidden;overflow-y: scroll;height: auto;max-height: 200rpx;" disabled class="input" :value="detailObj.failure_description" />
</view> </view>
<view class="li"> <view class="li">
<view class="title">维保图片：</view> <view class="title">维保图片：</view>
@ -129,7 +129,7 @@
</view> </view>
<view class="li"> <view class="li">
<view class="title">工作描述：</view> <view class="title">工作描述：</view>
<textarea style="max-height: 260rpx;overflow: hidden;overflow-y: scroll;" disabled class="input " :value="handleDetail.work_explanation"/> <textarea style="overflow: hidden;overflow-y: scroll;height: auto;max-height: 200rpx;" disabled class="input " :value="handleDetail.work_explanation"/>
</view> </view>
<view class="li"> <view class="li">
<view class="title">维保图片：</view> <view class="title">维保图片：</view>

115
pages/workOrder/workOrder.vue
View File

@ -101,9 +101,9 @@
import footTabOne from "@/components/foot-tabs/foot-tab-one.vue" import footTabOne from "@/components/foot-tabs/foot-tab-one.vue"
import {handleWorkOrderGet,handleWorkOrderSubmit,getProductType,getFaultType,getServiceMode,uploadImg} from '@/jsFile/public-api.js'; import {handleWorkOrderGet,handleWorkOrderSubmit,getProductType,getFaultType,getServiceMode,uploadImg} from '@/jsFile/public-api.js';
var QQMapWX = require('@/jsFile/map/qqmap-wx-jssdk.min.js'); var QQMapWX = require('@/jsFile/map/qqmap-wx-jssdk.min.js');
var qqmapsdk = new QQMapWX({ var qqmapsdk = new QQMapWX({
key: 'QNHBZ-55RKF-OMFJJ-NPU7O-EPSDH-ACBAA' key: 'QNHBZ-55RKF-OMFJJ-NPU7O-EPSDH-ACBAA'
}); });
// 解决H5跨域 // 解决H5跨域
const jsonp = function(url, data) { const jsonp = function(url, data) {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
@ -169,15 +169,15 @@ var qqmapsdk = new QQMapWX({
maintenancePersonnel:''//维保人员 maintenancePersonnel:''//维保人员
}, },
productTypeList:[ productTypeList:[
{id:1,name:'产品1'},{id:2,name:'产品2'}, {id:1,name:'不显示'}
],//产品类型 ],//产品类型
productIndex:0,//产品类型下标 productIndex:0,//产品类型下标
faultTypeList:[ faultTypeList:[
{id:1,name:'产品1'},{id:2,name:'产品2'}, {id:2,name:'参数错误'}
],//维保类型 ],//维保类型
faultIndex:0,//维保类型下标 faultIndex:0,//维保类型下标
serviceModeList:[ serviceModeList:[
{id:1,name:'上门服务'},{id:2,name:'线上服务'}, {id:1,name:'上门服务'}
],//服务方式 ],//服务方式
serviceModeIndex:0,//服务方式下标 serviceModeIndex:0,//服务方式下标
flag:true, flag:true,
@ -299,57 +299,6 @@ var qqmapsdk = new QQMapWX({
break; break;
} }
}, },
// 获取产品类型
getProductType() {
getProductType().then(res=>{
if(res.code) {
this.productTypeList = res.data;
if(this.productTypeList.length) {
// this.productIndex = this.productTypeList.findIndex(item=>{return item.name==this.targetObj.productType});
// 筛选默认选中项
this.productTypeList.forEach((item,index)=>{
if(item.name==this.targetObj.productType) {
this.productIndex = index;
}
})
}
}
})
},
// 获取维保类型
getFaultType() {
getFaultType().then(res=>{
if(res.code) {
this.faultTypeList = res.data;
if(this.faultTypeList.length) {
// this.faultIndex = this.faultTypeList.findIndex(item=>{return item.name==this.targetObj.faultType});
// 筛选默认选中项
this.faultTypeList.forEach((item,index)=>{
if(item.name==this.targetObj.faultType) {
this.faultIndex = index;
}
})
}
}
})
},
// 获取服务方式
getServiceMode() {
getServiceMode().then(res=>{
if(res.code) {
this.serviceModeList = res.data;
if(this.serviceModeList.length) {
// this.serviceModeIndex = this.serviceModeList.findIndex(item=>{return item.name==this.targetObj.serviceMode});
// 筛选默认选中项
this.serviceModeList.forEach((item,index)=>{
if(item.name==this.targetObj.serviceMode) {
this.serviceModeIndex = index;
}
})
}
}
})
},
// 查看信息签到执行 // 查看信息签到执行
handleWorkOrderGet(id){ handleWorkOrderGet(id){
let params = { let params = {
@ -362,21 +311,45 @@ var qqmapsdk = new QQMapWX({
this.targetObj.workOrderNo = dataObj.order_number;//工单编号 this.targetObj.workOrderNo = dataObj.order_number;//工单编号
this.targetObj.projectNo = dataObj.project_number;//项目编号 this.targetObj.projectNo = dataObj.project_number;//项目编号
this.targetObj.projectName = dataObj.project_name;//项目名称 this.targetObj.projectName = dataObj.project_name;//项目名称
this.targetObj.productType = dataObj.product_type;//产品类型
this.targetObj.installLocation = dataObj.installation_location;//安装位置 this.targetObj.installLocation = dataObj.installation_location;//安装位置
this.targetObj.faultType = dataObj.fault_type;//维保类型
this.targetObj.faultExplain = dataObj.failure_description;//维保说明 this.targetObj.faultExplain = dataObj.failure_description;//维保说明
this.targetObj.urgentDegree = dataObj.emergency_level_view;//紧急程度 this.targetObj.urgentDegree = dataObj.emergency_level_view;//紧急程度
this.targetObj.reporter = dataObj.order_contact;//报单人 this.targetObj.reporter = dataObj.order_contact;//报单人
this.targetObj.declarationTime = dataObj.order_times;//报单时间 this.targetObj.declarationTime = dataObj.order_times;//报单时间
this.targetObj.serviceMode = dataObj.service_method_view;//服务方式
// this.targetObj.address = dataObj.order_times;//定位地址 // 产品类型
// 调用查询产品类型事件 if(dataObj.form.product_type.length) {
this.getProductType(); this.productTypeList = [];
// 调用查询故障类型事件 dataObj.form.product_type.forEach((item,index)=>{
this.getFaultType(); this.productTypeList.push(item);
// 调用获取服务方式 if(item.id==dataObj.product_type) {
// this.getServiceMode() this.productIndex = index;
this.targetObj.productType = item.name;//产品类型
}
})
}
// 维保类型
if(dataObj.form.fault_type.length) {
this.faultTypeList = [];
dataObj.form.fault_type.forEach((item,index)=>{
this.faultTypeList.push(item);
if(item.id==dataObj.fault_type) {
this.faultIndex = index;
this.targetObj.faultType = item.name;//维保类型
}
})
}
// 服务方式
if(dataObj.form.service_method.length) {
this.serviceModeList = [];
dataObj.form.service_method.forEach((item,index)=>{
this.serviceModeList.push(item);
if(item.id==dataObj.service_method) {
this.serviceModeIndex = index;
this.targetObj.serviceMode = item.name;//服务方式
}
})
}
} }
}) })
}, },
@ -429,18 +402,12 @@ var qqmapsdk = new QQMapWX({
// 判空 // 判空
checkEmpty(){ checkEmpty(){
let result = false; let result = false;
if(!this.targetObj.productType) { if(!this.targetObj.installLocation) {
this.$toolAll.tools.showToast('请填写产品类型');
} else if(!this.targetObj.installLocation) {
this.$toolAll.tools.showToast('请填写安装位置'); this.$toolAll.tools.showToast('请填写安装位置');
} else if(!this.targetObj.faultType) {
this.$toolAll.tools.showToast('请填写维保类型');
} else if(!this.targetObj.faultExplain) { } else if(!this.targetObj.faultExplain) {
this.$toolAll.tools.showToast('请填写维保说明'); this.$toolAll.tools.showToast('请填写维保说明');
} else if(this.targetObj.faultImgList.length==0) { } else if(this.targetObj.faultImgList.length==0) {
this.$toolAll.tools.showToast('请添加维保图片'); this.$toolAll.tools.showToast('请添加维保图片');
} else if(!this.targetObj.serviceMode) {
this.$toolAll.tools.showToast('请填写服务方式');
} else { } else {
result = true; result = true;
} }

51
pages/workOrder/workOrderLlsit.vue
View File

@ -6,7 +6,7 @@
<view slot="content" style="margin: -25rpx -25rpx -0rpx;"> <view slot="content" style="margin: -25rpx -25rpx -0rpx;">
<view class="project-list-input" :style="{top:statusBarHeight + 'px'}"> <view class="project-list-input" :style="{top:statusBarHeight + 'px'}">
<input type="text" @keydown.enter="getDatalist" @confirm="getDatalist" class="int" v-model="dataPage.keyword" value="" placeholder="请输入关键字" /> <input type="text" @keydown.enter="getDatalist" @confirm="getDatalist" class="int" v-model="dataPage.keyword" value="" placeholder="请输入关键字" />
<image @click="getDatalist" class="search" src="../../static/iocn/ss.png" mode=""></image> <image @click="getDatalist" class="search" src="../../static/iocn/ss.png" mode="" lazy-load></image>
<view class="xian"></view> <view class="xian"></view>
</view> </view>
<view class="screen"> <view class="screen">
@ -15,27 +15,27 @@
<view class="li"> <view class="li">
<view class="text" v-if="workeOrderStatus!=''">{{workeOrderStatus}}</view> <view class="text" v-if="workeOrderStatus!=''">{{workeOrderStatus}}</view>
<view class="text" v-else>{{array[workeOrderStatusIndex].name}}</view> <view class="text" v-else>{{array[workeOrderStatusIndex].name}}</view>
<image class="img" src="../../static/iocn/xla.png" mode="aspectFill"></image> <image class="img" src="../../static/iocn/xla.png" mode="aspectFill" lazy-load></image>
</view> </view>
</picker> </picker>
<picker class="width30 disjcac" mode="date" :value="date" @change="bindDateChange"> <picker class="width30 disjcac" mode="date" :value="date" @change="bindDateChange">
<view class="li"> <view class="li">
<view class="text" v-if="dataPage.order_times==''">工单日期</view> <view class="text" v-if="dataPage.order_times==''">工单日期</view>
<view class="text" v-else>{{dataPage.order_times}}</view> <view class="text" v-else>{{dataPage.order_times}}</view>
<image class="img" src="../../static/iocn/xla.png" mode="aspectFill"></image> <image class="img" src="../../static/iocn/xla.png" mode="aspectFill" lazy-load></image>
</view> </view>
</picker> </picker>
<view class="li width30 disjcac"> <view class="li width30 disjcac">
<view class="text">筛选</view> <view class="text">筛选</view>
<image class="imgA" src="../../static/iocn/sx.png" mode="aspectFill"></image> <image class="imgA" src="../../static/iocn/sx.png" mode="aspectFill" lazy-load></image>
</view> </view>
</view> </view>
<view class="project-list"> <view class="project-list">
<!-- 列表循环体 --> <!-- 列表循环体 -->
<view class="li" @click="projectDetailsFun(item.order_status,item.order_id,item.btn.attributes.text,item.btn.attributes.color)" v-for="(item,index) in dataList" :key="index"> <view class="li animated fadeIn" @click="projectDetailsFun(item.order_status,item.order_id,item.btn.attributes.text,item.btn.attributes.color)" v-for="(item,index) in dataList" :key="index">
<view class="work-order-code">工单编号：{{item.order_number}}</view> <view class="work-order-code">工单编号：{{item.order_number}}</view>
<view class="message"> <view class="message">
<image class="img" src="../../static/del/img001.png" mode="aspectFill"></image> <image class="img" src="../../static/del/img001.png" mode="aspectFill" lazy-load></image>
<view class="text disjb fc" style="height: 180rpx;"> <view class="text disjb fc" style="height: 180rpx;">
<view class="title flexs"> <view class="title flexs">
<view class="text clips1">{{item.project_name}}</view> <view class="text clips1">{{item.project_name}}</view>
@ -56,18 +56,18 @@
</view> </view>
<view class="project-list-address"> <view class="project-list-address">
<view class="address clips2"> <view class="address clips2">
<image class="img" src="../../static/iocn/dz2.png" mode="aspectFill"></image> <image class="img" src="../../static/iocn/dz2.png" mode="aspectFill" lazy-load></image>
<view class="text">{{item.address}}</view> <view class="text">{{item.address}}</view>
</view> </view>
<!-- 订单不等于已完成和待回访，并且访问人不是工程师 --> <!-- 订单不等于已完成和待回访，并且访问人不是工程师 -->
<view @tap.stop="hurryUpEv(item.id)" class="date" v-if="item.status!=8 && item.status!=9 && role!=4"> <view @tap.stop="hurryUpEv(item.id)" class="date" v-if="item.status!=8 && item.status!=9 && role!=4">
催一催 <image class="img" src="../../static/iocn/ld.png" mode=""></image> 催一催 <image class="img" src="../../static/iocn/ld.png" mode="" lazy-load></image>
</view> </view>
</view> </view>
</view> </view>
<pitera v-if="total==dataList.length && dataList.length!=0" textStr="暂无更多列表数据"></pitera> <pitera v-if="total==dataList.length && dataList.length!=0" textStr="暂无更多列表数据"></pitera>
</view> </view>
<nothing-page v-if="dataList.length==0" content="暂无更多列表数据" currentType="0"></nothing-page> <nothing-page v-if="dataList.length==0 && !ifLoading" content="暂无更多列表数据" currentType="0"></nothing-page>
</view> </view>
</container-subgroup-two> </container-subgroup-two>
@ -95,9 +95,7 @@
role: uni.getStorageSync('type_id'), // 1：业务员 2:表示客户 3:表示客服 4：表示工程师 role: uni.getStorageSync('type_id'), // 1：业务员 2:表示客户 3:表示客服 4：表示工程师
date: currentDate, date: currentDate,
workeOrderStatus:'工单状态', workeOrderStatus:'工单状态',
array: [ array: [],
],
workeOrderStatusIndex: 0, workeOrderStatusIndex: 0,
dataPage:{ dataPage:{
list_rows:10, list_rows:10,
@ -108,14 +106,22 @@
}, },
total:0, total:0,
dataList:[], dataList:[],
statusId:0 statusId:0,
ifLoading:true
} }
}, },
onReachBottom() {
if(this.total!=this.dataList.length) {
this.dataPage.page++;
this.getDatalist();
}
},
onShow() {
// 调用获取工单状态事件
this.getType();
},
onLoad(op) { onLoad(op) {
if(op.statusId!=undefined) this.statusId = op.statusId; if(op.statusId!=undefined) this.statusId = op.statusId;
// 调用获取工单状态事件
this.getType();
}, },
methods: { methods: {
// 获取工单状态 // 获取工单状态
@ -135,15 +141,20 @@
}, },
// 获取工单列表 // 获取工单列表
getDatalist(){ getDatalist(){
uni.showLoading({
mask:true,
title:'加载中...'
})
this.$requst.get('/universal/api.order/order_list',this.dataPage).then(res => { this.$requst.get('/universal/api.order/order_list',this.dataPage).then(res => {
if (res.code==1) { if (res.code==1) {
this.total = res.data.total; this.total = res.data.total;
this.dataList = res.data.data; if(this.dataPage.page==1) this.dataList = [];
console.log(this.dataList,"---------1" ) this.dataList = [...this.dataList,...res.data.data];
}else{ }else{
this.dataList = []; this.dataList = [];
console.log(this.dataList,"---------2" )
} }
uni.hideLoading();
this.ifLoading = false;
}) })
}, },
// 催一催事件 // 催一催事件

2
pages/workOrder/workOrderThree.vue
View File

@ -149,7 +149,6 @@
import containerSubgroupTwo from '@/components/containers/container-subgroup-two.vue'; import containerSubgroupTwo from '@/components/containers/container-subgroup-two.vue';
import {base64ToPath} from '@/jsFile/base64-src.js'; import {base64ToPath} from '@/jsFile/base64-src.js';
import {handleWorkOrderGet,handleWorkOrderSubmit,uploadImg} from '../../jsFile/public-api.js'; import {handleWorkOrderGet,handleWorkOrderSubmit,uploadImg} from '../../jsFile/public-api.js';
var content = null; var content = null;
var touchs = []; var touchs = [];
var canvasw = 0; var canvasw = 0;
@ -250,6 +249,7 @@
this.priceEv(); this.priceEv();
} }
this.handleWorkOrderGet(); this.handleWorkOrderGet();
}, },
methods: { methods: {
// 其他费用输入框监听事件 // 其他费用输入框监听事件

3
pagesB/plan-fault-product-detail/detail.vue
View File

@ -12,7 +12,8 @@
<!-- 封面图 --> <!-- 封面图 -->
<image :src="dataObj.cover_img" mode="widthFix" style="width: 100%;"></image> <image :src="dataObj.cover_img" mode="widthFix" style="width: 100%;"></image>
<!-- 详情 --> <!-- 详情 -->
<rich-text :nodes="rich_text"></rich-text> <!-- <rich-text :nodes="rich_text"></rich-text> -->
<view v-html="rich_text"></view>
</view> </view>
</view> </view>
</view> </view>

11
pagesB/plan-fault/plan-fault.vue
View File

@ -25,7 +25,7 @@
<pitera v-if="total==dataList.length && dataList.length" textStr="暂无更多列表数据"></pitera> <pitera v-if="total==dataList.length && dataList.length" textStr="暂无更多列表数据"></pitera>
</view> </view>
</container-subgroup> </container-subgroup>
<nothing-page v-if="dataList.length==0" content="暂无更多列表数据"></nothing-page> <nothing-page v-if="dataList.length==0 && !ifLogin" content="暂无更多列表数据"></nothing-page>
</view> </view>
</template> </template>
@ -46,7 +46,8 @@
page:1, page:1,
total:0, total:0,
type_id:'',//解决方案类型id type_id:'',//解决方案类型id
dataList:[] dataList:[],
ifLogin:true
} }
}, },
onReachBottom() { onReachBottom() {
@ -85,6 +86,10 @@
page:this.page page:this.page
} }
] ]
uni.showLoading({
title:'加载中...',
mask:true
})
// 常见故障 // 常见故障
this.$requst.get(url[this.current],params[this.current]).then(res=>{ this.$requst.get(url[this.current],params[this.current]).then(res=>{
if(res.code==1) { if(res.code==1) {
@ -101,6 +106,8 @@
this.dataList.push(obj); this.dataList.push(obj);
}) })
} }
uni.hideLoading();
this.ifLogin = false;
}) })
} }
} }

BIN
static/del/img002.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 42 KiB

BIN
static/del/img003.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 44 KiB

BIN
static/del/img004.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 64 KiB

BIN
static/deleteImg/flying-img01.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 59 KiB

BIN
static/deleteImg/flying-img02.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 73 KiB

BIN
static/deleteImg/flying-img03.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 70 KiB

BIN
static/deleteImg/flying-img04.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 74 KiB

BIN
static/deleteImg/flying-img05.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 65 KiB