qichexitong/car-repair-mini-app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source 
# Conflicts:
#	config.js
This commit is contained in:
Hong
2024-03-22 18:26:11 +08:00
parent 8fa3892027 740d34fd4a
commit 8d139cc2df
9 changed files with 437 additions and 152 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
config/app.js
View File

@@ -1,8 +1,7 @@
//移动端商城API
// let domain = 'http://192.168.31.15:8081/car_app_api' //花花
let domain = 'https://wxapp.diyouzhijia.com/car_app_api' //线上
// let domain = 'http://192.168.31.226:8081/car_app_api' //薛磊
// let domain = 'http://192.168.31.226:8081/car_app_api' // 薛
module.exports = {
// 请求域名 格式： https://您的域名
HTTP_H5_URL: 'https://https://wxapp.diyouzhijia.com/shop_h5',

178
manifest.json
View File

@@ -1,90 +1,90 @@
{
"name": "汽车系统",
"appid": "__UNI__EA6CF83",
"description": "",
"versionName": "1.0.0",
"versionCode": "100",
"transformPx": false,
"app-plus": {
"usingComponents": true,
"nvueCompiler": "uni-app",
"splashscreen": {
"alwaysShowBeforeRender": true,
"waiting": true,
"autoclose": true,
"delay": 0
},
"modules": {
"Camera": {}
},
"distribute": {
"android": {
"permissions": [
"<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
"<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
"<uses-permission android:name=\"android.permission.VIBRATE\"/>",
"<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
"<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
"<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
"<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
"<uses-permission android:name=\"android.permission.CAMERA\"/>",
"<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
"<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
"<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
"<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
"<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
"<uses-feature android:name=\"android.hardware.camera\"/>",
"<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
]
},
"ios": {},
"sdkConfigs": {},
"splashscreen": {
"androidStyle": "common"
}
}
},
"quickapp": {},
"mp-weixin": {
"appid": "wx0be41c65a0f132eb",
"__usePrivacyCheck__": true, //隐私政策
"setting": {
"urlCheck": false,
"es6": false,
"minified": true,
"postcss": true
},
"optimization": {
"subPackages": true
},
"usingComponents": true,
"permission": {
"scope.userLocation": {
"desc": "你的位置信息将用于寻找距您最近的门店"
},
"scope.userFuzzyLocation": {
"desc": "你的位置信息将用于寻找距您最近的门店"
},
"phone": {
"desc": "你的通讯录将用于联系门店"
},
"scope.userInfo": {
"desc": "获取微信头像,昵称用于展示"
}
},
"requiredPrivateInfos": ["getLocation", "chooseLocation"]
},
"vueVersion": "2",
"h5": {
"template": "static/index.html",
"devServer": {
"port": 9090,
"https": false
},
"title": "RuoYi-App",
"router": {
"mode": "hash",
"base": "./"
}
}
}
"name" : "汽车系统",
"appid" : "__UNI__41149A5",
"description" : "",
"versionName" : "1.0.0",
"versionCode" : "100",
"transformPx" : false,
"app-plus" : {
"usingComponents" : true,
"nvueCompiler" : "uni-app",
"splashscreen" : {
"alwaysShowBeforeRender" : true,
"waiting" : true,
"autoclose" : true,
"delay" : 0
},
"modules" : {
"Camera" : {}
},
"distribute" : {
"android" : {
"permissions" : [
"<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
"<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
"<uses-permission android:name=\"android.permission.VIBRATE\"/>",
"<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
"<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
"<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
"<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
"<uses-permission android:name=\"android.permission.CAMERA\"/>",
"<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
"<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
"<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
"<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
"<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
"<uses-feature android:name=\"android.hardware.camera\"/>",
"<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
]
},
"ios" : {},
"sdkConfigs" : {},
"splashscreen" : {
"androidStyle" : "common"
}
}
},
"quickapp" : {},
"mp-weixin" : {
"appid" : "wx0be41c65a0f132eb",
"__usePrivacyCheck__" : true, //隐私政策
"setting" : {
"urlCheck" : false,
"es6" : false,
"minified" : true,
"postcss" : true
},
"optimization" : {
"subPackages" : true
},
"usingComponents" : true,
"permission" : {
"scope.userLocation" : {
"desc" : "你的位置信息将用于寻找距您最近的门店"
},
"scope.userFuzzyLocation" : {
"desc" : "你的位置信息将用于寻找距您最近的门店"
},
"phone" : {
"desc" : "你的通讯录将用于联系门店"
},
"scope.userInfo" : {
"desc" : "获取微信头像,昵称用于展示"
}
},
"requiredPrivateInfos" : [ "getLocation", "chooseLocation" ]
},
"vueVersion" : "2",
"h5" : {
"template" : "static/index.html",
"devServer" : {
"port" : 9090,
"https" : false
},
"title" : "RuoYi-App",
"router" : {
"mode" : "hash",
"base" : "./"
}
}
}

4
pages/mine/index.vue
View File

@@ -99,8 +99,8 @@
</view>
</u-popup>
<!-- <view @click="logonFn">授权</view> -->
<u-button class="btn" shape="circle" color="#13AFA8" :loading="loading" throttleTime="1000"
:customStyle="customStyle" openType="getUserInfo" @getphonenumber="logonFn" text="同意" />
<!-- <u-button class="btn" shape="circle" color="#13AFA8" :loading="loading" throttleTime="1000"
:customStyle="customStyle" openType="getUserInfo" @getphonenumber="logonFn" text="同意" /> -->
</view>
</template>

210
pages/order/myOrder.vue
View File

@@ -35,28 +35,37 @@
<u-row gutter="10" customStyle="margin-bottom: 10px">
<u-col span="6">
<!-- <view class="titletxt"> 星桔EV(祥园路店) </view> -->
<view class="titletxt"> {{item.merName?item.merName:'暂无'}} </view>
<view class="titletxt"> {{item.merName || '暂无'}} </view>
</u-col>
<u-col span="6" textAlign='right'>
<text v-if="item.auditStatus==2">已驳回</text>
<text v-else-if="item.billAuditStatus==0">待处理</text>
<text v-else-if="item.auditRepair==1">
<text v-if="item.status==0">同意受理</text>
<text v-else-if="item.status==1">维修中</text>
<text v-else="item.status==2">
<text v-if="item.isFinish">已完成</text>
<text v-else>
<text v-if="!item.isDelivery">待提车</text>
<text v-else>待结算</text>
</text>
</text>
</text>
<!-- 判断 -->
<!-- <view class="redtxt" v-if="item.auditStatus===0 && item.isFinish===false"> 待受理 </view>
<view class="redtxt" v-if="item.auditStatus===1 && item.isFinish===false"> 已确认 </view>
<view class="redtxt" v-if="item.auditStatus===2 && item.isFinish===false"> 已驳回 </view>
<view class="greytxt" v-if="item.isFinish===true"> 已完成 </view> -->
<view :class="(getLastText(item)=='已取消'||getLastText(item)=='维修完成')?'greytxt':'redtxt'" >
{{ getLastText(item) }}
</view>
<!-- <view :class="(getLastText(item)=='已取消'|| getLastText(item)=='已完成') ?'greytxt':'redtxt'" >
{{ getLastText(item) }}
</view> -->
<!-- <view class="greytxt" v-if="item.isDel===true"> 已取消 </view>
<view class="redtxt" v-else-if="item.auditStatus===2||item.billAuditStatus == 2 || item.auditRepair == 2"> 已驳回 </view>
<view class="greytxt" v-else-if="item.isFinish===true"> 已完成 </view>
<view class="redtxt" v-else-if="item.auditStatus==0 && item.billAuditStatus==0 && item.auditRepair==0">
<text v-if="item.auditStatus==0 && item.billAuditStatus==0 && item.auditRepair==0" >待受理</text>
</view>
<view class="redtxt" v-if="item.auditStatus===1 && item.billAuditStatus == 0 && item.auditRepair == 0"> 已确认 </view>
<view class="redtxt" v-if="item.auditStatus===1 && item.billAuditStatus == 0 && item.auditRepair == 0 && item.isArrived==true "> 已到店 </view>
<view class="redtxt" v-if="item.billAuditStatus == 0 && item.isArrived==true && item.isBilled == true "> 待审核 </view>
<view class="redtxt" v-if="(item.auditStatus===1 && item.billAuditStatus == 1 && item.isArrived==true && item.isBilled == true )||item.status == 1"> 维修中 </view>
<view class="redtxt" v-if="item.isPickUp===0"> 待接车 </view>
<view class="redtxt" v-if="item.isPickUp===1 && item.isDamage == 0 "> 待定损 </view>
<view class="redtxt" v-if="item.isPickUp===0 && item.isDamage == 1 "> 待开单 </view>
<view class="redtxt" v-if="item.status===2 && item.isDelivery == false "> 待交车 </view>
<view class="redtxt" v-if="item.isSettlement===0 && item.isDelivery == true "> 待结算 </view> -->
</u-col>
</u-row>
@@ -84,12 +93,12 @@
</u-col>
</u-row>
</view>
<u-row customStyle="margin-bottom: 10px;border:1rpx solid #f5f5f5"></u-row>
<!-- transform:scaleY(0.5); -->
<u-row customStyle="margin-bottom: 10px; border-bottom:1rpx solid #EDEDED;"></u-row>
<u-row gutter="10">
<u-col span="6">
<view class="lastview" @click="goHere">
<view class="lastview" @click.stop="openLocationFn(item)">
<view class="have_img">
<image src="https://qicheoss.oss-cn-shanghai.aliyuncs.com/static/images/images/mine_go.png" mode=""></image>
</view>
@@ -98,7 +107,8 @@
</u-col>
<u-col span="6" textAlign='right'>
<!-- 判断 -->
<view class="btn_view" v-if="item.auditStatus===0 && item.isFinish===false || item.auditStatus===1 && item.isFinish===false ">
<view class="btn_view" v-if="(item.auditStatus===0 && item.isFinish===false && item.isDel===false)
|| ( item.auditStatus===1 && item.isArrived==false && item.isFinish===false && item.isDel===false ) ">
<text class="btntxt" @click="cancelBtn(1,item.id)"> 取消工单 </text>
</view>
@@ -165,6 +175,147 @@
},
methods: {
// 状态
getLastText(obj) {
// console.log(obj,'数据111111');
if(obj.isDel){
return '已取消'
} else if (obj.auditStatus==0) {
return '待受理'
} else if (obj.auditStatus==2) {
return '已驳回'
} else {
// return '已确认'
if (!obj.isArrived) {
return '未到店'
} else {
if (obj.repairType == 1 || obj.repairType == 2) {
// return '已到店'
if (!obj.isBilled) {
return '未开单'
} else {
// return '已开单'
if (obj.billAuditStatus==0) {
//已开单-待审核
return '待审核'
} else if (obj.billAuditStatus==2) {
//已开单-审核拒绝
return '审核拒绝'
} else {
//已开单-审核通过
// return '审核通过'
if (obj.status==0) {
//维修开始
return '维修开始'
} else if (obj.status==1) {
//维修中
return '维修中'
} else {
//维修完成
return '维修完成'
}
}
}
}else if(obj.repairType == 3){
//已到店
if (!obj.isPickUp) {
//未接车
return '未接车'
} else {
//已接车
if (!obj.isDamage) {
// 未定损
return '未定损'
} else {
//已定损
if (!obj.isBilled) {
// 未开单
return '未开单'
} else {
//已开单-审核自动通过
if (obj.status==0) {
//维修开始
return '维修开始'
} else if (obj.status==1) {
//维修中
return '维修中'
} else {
//维修完成
return '维修完成'
//if (!obj.isDelivery) {
// 未交车
//} else {
// 已交车
// if (!obj.isSettlement) {
// 已结算
// } else {
// 未结算
// }
//}
}
}
}
}
}else{
//已到店
if (!obj.isPickUp) {
//未接车
return '未接车'
} else {
//已接车
if (!obj.isBilled) {
//未开单
return '未开单'
} else {
//已开单
if (obj.billAuditStatus==0) {
//已开单-待审核
return '待审核'
} else if (obj.billAuditStatus==2) {
//已开单-审核拒绝
return '审核拒绝'
} else {
//已开单-审核通过
if (obj.status==0) {
//维修开始
return '维修开始'
} else if (obj.status==1) {
//维修中
return '维修中'
} else {
//维修完成
return '维修完成'
//if (!isDelivery) {} else {}
}
}
}
}
}
}
}
},
// getLastText(obj) {
// const parts = obj.showText.split('|');
// let aaa=parts.length > 1 ? parts.pop() : parts[0]
// console.log(aaa,'返回的数据');
// return parts.length > 1 ? parts.pop() : parts[0];
// },
//打开地图
openLocationFn(data) {
// console.log(data,'1111111111111');
uni.openLocation({
latitude: parseFloat(data.latitude),
longitude: parseFloat(data.longitude),
name: data.merName,
address: data.addressDetail,
complete: (res) => {
console.log(res);
}
})
},
queryList(pageNo,pageSize){
getOrderListAPI({
limit:pageSize,
@@ -241,7 +392,7 @@
this.isItem=item
},
// 去评价
async toPushReview(obj){
toPushReview(obj){
// wx.setStorageSync('Obj',obj)
wx.setStorageSync('Obj',obj)
uni.navigateTo({
@@ -262,6 +413,8 @@
</script>
<style lang="scss" scoped>
.cancel_pop {
// padding: 40rpx 40rpx 0 40rpx;
padding: 40rpx;
@@ -322,13 +475,18 @@
}
.mine_order {
// background-color: pink;
background-color: #f6f6f6;
height: 100vh;
min-height: 100vh;
}
.contentview {
.haveview {
.have_con {
// border: 1px solid red;
margin-top: 16rpx;
background-color: #FFFFFF;
border-radius: 5rpx;

2
pages/order/myReview.vue
View File

@@ -61,7 +61,7 @@
page: 1,
},
reviewList: [],
// isShowView: true,
isShowView: false,
timer: null
}
},

177
pages/order/orderDetail.vue
View File

@@ -8,10 +8,17 @@
</u-col>
<u-col span="6" textAlign='right'>
<!-- 判断 -->
<view v-if='detailList.auditStatus==0 && detailList.isFinish==false' class="redtxt"> 待受理 </view>
<view v-if='detailList.auditStatus==1 && detailList.isFinish==false' class="redtxt"> 已确认 </view>
<view v-if='detailList.auditStatus==2 && detailList.isFinish==false' class="redtxt"> 已驳回 </view>
<view v-if='detailList.isFinish==true' class="greytxt"> 已完成 </view>
<view :class="(getLastText(detailList)=='已取消'||getLastText(detailList)=='维修完成')?'greytxt':'redtxt'" >
{{ getLastText(detailList) }}
</view>
<!-- <view class="redtxt" v-if="detailList.auditStatus===0 && detailList.isFinish===false && detailList.isDel===false"> 待受理 </view> -->
<!-- <view class="redtxt" v-if="detailList.auditStatus===1 && detailList.isArrived==false && detailList.isFinish===false && detailList.isDel===false"> 已确认 </view> -->
<!-- <view class="redtxt" v-if="detailList.auditStatus===1 && detailList.isArrived==true && detailList.isBilled == false && detailList.isFinish===false && detailList.isDel===false"> 已到店 </view> -->
<!-- <view class="redtxt" v-if="detailList.billAuditStatus == 0 && detailList.isArrived==true && detailList.isBilled == true && detailList.isFinish===false && detailList.isDel===false"> 待审核 </view> -->
<!-- <view class="redtxt" v-if="detailList.auditStatus===1 && detailList.billAuditStatus == 1 && detailList.isArrived==true && detailList.isBilled == true && detailList.isFinish===false && detailList.isDel===false"> 维修中 </view> -->
<!-- <view class="redtxt" v-if="detailList.auditStatus===2 && detailList.isFinish===false && detailList.isDel===false"> 已驳回 </view> -->
<!-- <view class="greytxt" v-if="detailList.isFinish===true"> 已完成 </view> -->
<!-- <view class="greytxt" v-if="detailList.isDel===true"> 已取消 </view> -->
</u-col>
</u-row>
@@ -85,16 +92,15 @@
</view>
<!-- 判断 -->
<view class="con_btnview">
<view class="btnview_quxiao" @click="reSubmit"
v-if='(detailList.auditStatus==0 || detailList.auditStatus==1 || detailList.auditStatus==2 )&& detailList.isFinish==false'>
重新提交</view>
<view class="btnview_sure" @click="quxiaoOrder(1)"
v-if='(detailList.auditStatus==0 || detailList.auditStatus==1) && detailList.isFinish==false'>取消工单</view>
<!-- <view class="btnview_sure" @click="quxiaoOrder(2)" v-if='detailList.auditStatus==1'>结束工单</view> -->
<view class="btnview_sure" @click="quxiaoOrder(3)"
v-if='detailList.auditStatus==2 && detailList.isFinish==false'>删除工单</view>
<view class="btnview_quxiao" @click="reSubmit" v-if='detailList.auditStatus==2 && detailList.isFinish==false && detailList.isDel==false'> 重新提交 </view>
<view class="btnview_sure_one" @click="quxiaoOrder(1)"
v-if='(detailList.auditStatus==0 || detailList.auditStatus==1)&& detailList.isArrived==false && detailList.isFinish===false && detailList.isDel===false'>取消工单
</view>
<view class="btnview_sure" @click="quxiaoOrder(3)" v-if='detailList.auditStatus==2 && detailList.isFinish==false && detailList.isDel==false '>删除工单</view>
</view>
<view class="con_btnview" v-if="detailList.isFinish==true && isShow==true">
<view class="con_btnview" v-if="detailList.isFinish===true && detailList.isReply===false">
<view class="btnview_sure_one" @click="quxiaoOrder(4)">去评价</view>
</view>
</view>
@@ -141,18 +147,139 @@
this.getOrderDetail()
},
methods: {
async getOrderDetail() {
// console.log(this.orderIds,'this.orderIds[0]');
const detail = await getOrderDetailAPI({ orderSn: this.orderSn })
// console.log(detail,'getOrderDetailAPI');
this.detailList = detail.data
const review = await getReviewListAPI() // 评价列表
review.data.list.forEach(item => {
if (item.orderSn == detail.data.orderSn) {
this.isShow = false
}
})
},
// 状态
getLastText(obj) {
// console.log(obj,'数据111111');
if(obj.isDel){
return '已取消'
} else if (obj.auditStatus==0) {
return '待受理'
} else if (obj.auditStatus==2) {
return '已驳回'
} else {
// return '已确认'
if (!obj.isArrived) {
return '未到店'
} else {
if (obj.repairType == 1 || obj.repairType == 2) {
// return '已到店'
if (!obj.isBilled) {
return '未开单'
} else {
// return '已开单'
if (obj.billAuditStatus==0) {
//已开单-待审核
return '待审核'
} else if (obj.billAuditStatus==2) {
//已开单-审核拒绝
return '审核拒绝'
} else {
//已开单-审核通过
// return '审核通过'
if (obj.status==0) {
//维修开始
return '维修开始'
} else if (obj.status==1) {
//维修中
return '维修中'
} else {
//维修完成
return '维修完成'
}
}
}
}else if(obj.repairType == 3){
//已到店
if (!obj.isPickUp) {
//未接车
return '未接车'
} else {
//已接车
if (!obj.isDamage) {
// 未定损
return '未定损'
} else {
//已定损
if (!obj.isBilled) {
// 未开单
return '未开单'
} else {
//已开单-审核自动通过
if (obj.status==0) {
//维修开始
return '维修开始'
} else if (obj.status==1) {
//维修中
return '维修中'
} else {
//维修完成
return '维修完成'
//if (!obj.isDelivery) {
// 未交车
//} else {
// 已交车
// if (!obj.isSettlement) {
// 已结算
// } else {
// 未结算
// }
//}
}
}
}
}
}else{
//已到店
if (!obj.isPickUp) {
//未接车
return '未接车'
} else {
//已接车
if (!obj.isBilled) {
//未开单
return '未开单'
} else {
//已开单
if (obj.billAuditStatus==0) {
//已开单-待审核
return '待审核'
} else if (obj.billAuditStatus==2) {
//已开单-审核拒绝
return '审核拒绝'
} else {
//已开单-审核通过
if (obj.status==0) {
//维修开始
return '维修开始'
} else if (obj.status==1) {
//维修中
return '维修中'
} else {
//维修完成
return '维修完成'
//if (!isDelivery) {} else {}
}
}
}
}
}
}
}
},
getOrderDetail() {
getOrderDetailAPI({ orderSn: this.orderSn }).then(detail=>{
this.detailList = detail.data
})
// 评价列表
// getReviewListAPI().then(review=>{
// review.data.list.forEach(item => {
// if (item.orderSn == detail.data.orderSn) {
// this.isShow = false
// }
// })
// })
},
quxiaoBtn() {
this.cancelShow = false
},

2
pages/order/pushReview.vue
View File

@@ -113,7 +113,7 @@
.then((res) => {
// console.log(res,'then-res');
uni.redirectTo({
url: `/pages/order/myReview?isShowView=true`
url: `/pages/order/myReview?isShowView=${this.isShowView}`
});
})
.catch((err) => {

11
pages/repair/repair.vue
View File

@@ -114,7 +114,7 @@
uni.getLocation({
type: 'gcj02',
success: res => {
console.log(res, '经纬');
// console.log(res, '经纬');
this.query.latitude = res.latitude,
this.query.longitude = res.longitude,
this.$refs.paging.reload()
@@ -142,7 +142,7 @@
methods: {
//打开地图
openLocationFn(data) {
console.log(data);
// console.log(data);
uni.openLocation({
latitude: parseFloat(data.latitude),
longitude: parseFloat(data.longitude),
@@ -155,7 +155,7 @@
},
//列表
queryList(pageNo, pageSize) {
console.log(this.query, 'shuju----11111');
// console.log(this.query, 'shuju----11111');
getStoreList({
limit: pageSize,
page: pageNo,
@@ -185,9 +185,10 @@
})
},
// 轮播图
async getCarousel() {
const res = await getCarouselAPI(this.carousel)
getCarousel() {
getCarouselAPI(this.carousel).then(res=>{
this.list = res.data.list
})
},
}
}

2
pages/residue/setup.vue
View File

@@ -15,7 +15,7 @@
</view>
<view class="card_row">
<view class='rowl'> 版本号 </view>
<view class='rowr'> 1.0.0 </view>
<view class='rowr'> 3.4.2 </view>
</view>
</view>
</view>