diff --git a/config/api.js b/config/api.js
index e5f981f..756c882 100644
--- a/config/api.js
+++ b/config/api.js
@@ -94,6 +94,8 @@ export const getCardType = (params) => http.get('system/dict/cardType', {params}
// export const contractCreate = (data) => http.post('business/contract/create', data)
// // 获取驾校的合同
// export const getSchoolContract = (params) => http.get('business/contract/getSchoolContract', {params})
+// 我的合同
+export const selectContractPdfBase64 = (params) => http.get('business/contract/selectContractPdfBase64', {params})
// 获取合同链接
export const getSignContract = (data) => http.post('business/contract/signContract', data)
// 查询学员合同签署状态
@@ -136,6 +138,12 @@ export const masterPage = (params) => http.get('business/booking/master/page', {
export const masterDetail = (params) => http.get('business/booking/master/get', {params})
// 5实操取消预约
export const masterCancelBooking = (data) => http.put('business/booking/master/cancelBooking/'+data, )
+// 我的订单
+export const applyOrderPage = (params) => http.get('app/apply-order/page', {params})
+// 我的订单详情
+export const applyOrderGet = (params) => http.get('app/apply-order/get', {params})
+
+
diff --git a/pages.json b/pages.json
index c3d212b..e23a747 100644
--- a/pages.json
+++ b/pages.json
@@ -421,7 +421,7 @@
"style": {
"navigationBarTitleText": "订单详情",
"navigationStyle": "custom",
- "enablePullDownRefresh": false,
+ "enablePullDownRefresh": true,
"backgroundTextStyle": "dark"
}
},
@@ -430,7 +430,7 @@
"style": {
"navigationBarTitleText": "我的订单",
"navigationStyle": "custom",
- "enablePullDownRefresh": false,
+ "enablePullDownRefresh": true,
"backgroundTextStyle": "dark"
}
},
diff --git a/pages/carEntry/evaluate/comp/evaluateItem.vue b/pages/carEntry/evaluate/comp/evaluateItem.vue
index cfe9300..8f42ec9 100644
--- a/pages/carEntry/evaluate/comp/evaluateItem.vue
+++ b/pages/carEntry/evaluate/comp/evaluateItem.vue
@@ -97,6 +97,16 @@
imgArr:[]
}
},
+ watch: {
+ info: {
+ handler(newVal) {
+ if(newVal) {
+ this.$emit('updatedForm', newVal)
+ }
+ },
+ deep: true
+ }
+ },
methods: {
// 1是匿名 2是不匿名
changeChe(val) {
@@ -144,6 +154,8 @@
res.tempFiles.forEach(async (item,index)=>{
let imgLink = await uploadImgApi(item.path, index)
if(imgLink) this.info.imgArr.push(imgLink)
+ console.log('----------')
+ console.log(this.info.imgArr)
})
}
})
diff --git a/pages/carEntry/evaluate/evaluate.vue b/pages/carEntry/evaluate/evaluate.vue
index 105f5f9..7548c06 100644
--- a/pages/carEntry/evaluate/evaluate.vue
+++ b/pages/carEntry/evaluate/evaluate.vue
@@ -1,8 +1,8 @@
-
-
+
+
提交
@@ -44,9 +44,9 @@ import school from '../../../store/modules/school'
let {schoolInfo, coachInfo} = this
let num1 = schoolInfo.schoolLevel + schoolInfo.qualityLevel + schoolInfo.teachLevel + schoolInfo.serviceLevel
let num2 = coachInfo.qualityLevel + coachInfo.teachLevel + coachInfo.serviceLevel
- console.log(num1)
- console.log(num2)
- if(num1&&num2) {
+ if(this.subject==2&&num1&&num2) {
+ return true
+ }else if(this.subject!=2&&num2){
return true
}else {
return false
@@ -55,6 +55,12 @@ import school from '../../../store/modules/school'
}
},
methods: {
+ updatedCoachInfo(val) {
+ this.coachInfo = val
+ },
+ updatedSchoolInfo(val) {
+ this.schoolInfo = val
+ },
initFrom() {
this.schoolInfo = {
tit: '您对驾校满意吗？',
@@ -122,6 +128,7 @@ import school from '../../../store/modules/school'
this.initFrom()
},
async submintFn() {
+
if(this.coachInfo.imgArr.length) {
this.coachInfo.images = this.coachInfo.imgArr.join(',')
}
@@ -130,7 +137,7 @@ import school from '../../../store/modules/school'
}
let schoolScore = [this.schoolInfo.serviceLevel,this.schoolInfo.schoolLevel,this.schoolInfo.teachLevel,this.schoolInfo.qualityLevel].some(item=>item*1>0)
let coachInfoScore = [this.coachInfo.serviceLevel,this.coachInfo.teachLevel,this.coachInfo.qualityLevel].some(item=>item*1>0)
- if(!schoolScore) return this.$u.toast('请对驾校评分')
+ if(this.subject==2&&!schoolScore) return this.$u.toast('请对驾校评分')
if(!coachInfoScore) return this.$u.toast('请对教练评分')
const res = await addSchoolComment(this.schoolInfo)
const res2 = await addCoachComment(this.coachInfo)
diff --git a/pages/carEntry/examineAppointment/comp/pickDate.vue b/pages/carEntry/examineAppointment/comp/pickDate.vue
index 9ab1069..44d6c68 100644
--- a/pages/carEntry/examineAppointment/comp/pickDate.vue
+++ b/pages/carEntry/examineAppointment/comp/pickDate.vue
@@ -179,6 +179,7 @@
this.currentDay = this.currentDay + num
this.chooseDay = this.dateArr[this.currentDay][0].date
this.FormData.courseIds = this.courseIds = ''
+ this.$emit('updatedForm', this.FormData)
this.examSimulationClassFn()
},
chooseCourse(item) {
@@ -186,6 +187,7 @@
this.FormData.courseIds = this.courseIds = item.id
this.FormData.classDate = item.classDate
this.FormData.classTime = item.classTime
+ this.$emit('updatedForm', this.FormData)
console.log(item)
},
diff --git a/pages/carEntry/examineAppointment/comp/step3.vue b/pages/carEntry/examineAppointment/comp/step3.vue
index 2b170fc..8b97731 100644
--- a/pages/carEntry/examineAppointment/comp/step3.vue
+++ b/pages/carEntry/examineAppointment/comp/step3.vue
@@ -1,7 +1,7 @@
-
+
返回上一步
@@ -76,6 +76,9 @@
},1500)
}
console.log(res)
+ },
+ updatedForm(val) {
+ this.$emit('updatedForm',val)
}
}
diff --git a/pages/carEntry/examineAppointment/comp/选择科目备份.vue b/pages/carEntry/examineAppointment/comp/选择科目备份.vue
deleted file mode 100644
index 3d8febd..0000000
--- a/pages/carEntry/examineAppointment/comp/选择科目备份.vue
+++ /dev/null
@@ -1,86 +0,0 @@
-
-
-
-
-
- {{ item.text }}
-
-
-
-
- 返回上一步
- 下一步
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/pages/carEntry/examineAppointment/examineAppointment.vue b/pages/carEntry/examineAppointment/examineAppointment.vue
index f0fa3ff..0e3815f 100644
--- a/pages/carEntry/examineAppointment/examineAppointment.vue
+++ b/pages/carEntry/examineAppointment/examineAppointment.vue
@@ -35,7 +35,7 @@
-
+
@@ -59,7 +59,7 @@
longitude: '',
latitude: ''
},
- carParams: { "pageNo": 1, "pageSize": 10, "carType": 'C1',},
+ carParams: { "pageNo": 1, "pageSize": 20, "carType": 'C1',},
FormData: {
examSiteId: '',
carId: '',
@@ -78,6 +78,8 @@
onLoad(options) {
if(options.subject) this.FormData.subject = options.subject
this.FormData.trainType = this.vuex_userInfo.trainType
+ this.siteParams.carType = this.vuex_userInfo.trainType
+ this.carParams.carType = this.vuex_userInfo.trainType
// this.carType =
let vuex_cityInfo = this.$store.state.user.vuex_cityInfo
if(!vuex_cityInfo.lat) {
@@ -100,6 +102,7 @@
chooseSite(item) {
this.FormData.examSiteId = item.id
this.FormData.siteName = item.name
+ this.carParams.pageNo = 1
this.examCarPageFn()
},
// 获得考场
@@ -118,6 +121,9 @@
changeStep(num) {
this.currentStep = num
+ },
+ updatedForm(val) {
+ this.FormData = val
}
}
}
diff --git a/pages/carEntry/operaAppointment/comp/coachInfo.vue b/pages/carEntry/operaAppointment/comp/coachInfo.vue
index dbd8e32..cdac5a6 100644
--- a/pages/carEntry/operaAppointment/comp/coachInfo.vue
+++ b/pages/carEntry/operaAppointment/comp/coachInfo.vue
@@ -2,7 +2,9 @@
-
+
+
+
@@ -23,6 +25,13 @@
handleImageError() {
console.log('图片加载失败')
this.FormData.photoPath = require('@/static/images/index/avatar.png')
+ },
+ isImagePath(path) {
+ // 定义常见的图片文件扩展名
+ const imageExtensions = /\.(jpg|jpeg|png|gif|bmp|svg)$/i;
+
+ // 使用正则表达式进行匹配
+ return imageExtensions.test(path);
}
}
}
diff --git a/pages/carEntry/operaAppointment/comp/pickDate.vue b/pages/carEntry/operaAppointment/comp/pickDate.vue
index 602968f..0962878 100644
--- a/pages/carEntry/operaAppointment/comp/pickDate.vue
+++ b/pages/carEntry/operaAppointment/comp/pickDate.vue
@@ -216,9 +216,12 @@
this.$u.toast('一天最多能约四节课')
}else {
this.FormData.courseArr.push(item)
+ // console.log(this.FormData.courseArr)
+ this.$emit('updatedForm', this.FormData)
}
}else {
this.FormData.courseArr.splice(index,1)
+ this.$emit('updatedForm', this.FormData)
}
},
diff --git a/pages/carEntry/operaAppointment/comp/step1.vue b/pages/carEntry/operaAppointment/comp/step1.vue
index 674d06a..1f690d3 100644
--- a/pages/carEntry/operaAppointment/comp/step1.vue
+++ b/pages/carEntry/operaAppointment/comp/step1.vue
@@ -2,22 +2,22 @@
预约时间
-
-
+
+
教练车
- {{FormData.carNumber}}
+ {{item}}
-
+
训练场地
-
+
- {{FormData.siteName}}
- {{FormData.siteAddress}}
+ {{item.siteName}}
+ {{item.siteAddress}}
@@ -46,7 +46,20 @@
}
},
-
+ computed: {
+ showSiteList() {
+ return this.FormData.courseArr.reduce((acc,obj)=>{
+ const found = acc.some(item => item.siteName == obj.siteName );
+ if (!found) {
+ acc.push(obj);
+ }
+ return acc;
+ },[])
+ },
+ showCarList() {
+ return [...new Set(this.FormData.courseArr.map(item=>item.carNumber))]
+ }
+ },
methods: {
openPopup(num) {
if(!this.FormData.courseArr.length) {
@@ -56,6 +69,9 @@
},
showStep2() {
this.$emit('showStep2')
+ },
+ updatedForm(val) {
+ this.$emit('updatedForm', val)
}
}
}
diff --git a/pages/carEntry/operaAppointment/comp/step2.vue b/pages/carEntry/operaAppointment/comp/step2.vue
index b953a45..1457701 100644
--- a/pages/carEntry/operaAppointment/comp/step2.vue
+++ b/pages/carEntry/operaAppointment/comp/step2.vue
@@ -77,6 +77,7 @@
this.FormData.coachId = item.id
this.FormData.coachName = item.name
this.FormData.photoPath = item.photoPath
+ this.$emit('updatedForm', this.FormData)
}
}
}
diff --git a/pages/carEntry/operaAppointment/comp/step3.vue b/pages/carEntry/operaAppointment/comp/step3.vue
deleted file mode 100644
index 5b3c893..0000000
--- a/pages/carEntry/operaAppointment/comp/step3.vue
+++ /dev/null
@@ -1,182 +0,0 @@
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/pages/carEntry/operaAppointment/comp/step4.vue b/pages/carEntry/operaAppointment/comp/step4.vue
deleted file mode 100644
index e243be2..0000000
--- a/pages/carEntry/operaAppointment/comp/step4.vue
+++ /dev/null
@@ -1,256 +0,0 @@
-
-
-
-
-
-
-
- 返回上一步
- 确认预约
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/pages/carEntry/operaAppointment/operaAppointment.vue b/pages/carEntry/operaAppointment/operaAppointment.vue
index e6a646d..fd53032 100644
--- a/pages/carEntry/operaAppointment/operaAppointment.vue
+++ b/pages/carEntry/operaAppointment/operaAppointment.vue
@@ -2,7 +2,7 @@
-
+
@@ -96,6 +96,9 @@
}
},
methods: {
+ updatedForm(val) {
+ this.FormData = val
+ },
changeStep(num) {
this.currentStep = num
},
diff --git a/pages/carEntry/simulateAppointment/comp/pickDate.vue b/pages/carEntry/simulateAppointment/comp/pickDate.vue
index 27e429d..3c6eedc 100644
--- a/pages/carEntry/simulateAppointment/comp/pickDate.vue
+++ b/pages/carEntry/simulateAppointment/comp/pickDate.vue
@@ -112,7 +112,8 @@
this.radioVal = 0
}
}
- }
+ },
+
},
methods: {
// 获得排课
@@ -174,8 +175,7 @@
this.FormData.courseIds = []
this.chooseDay = item.date
this.simulationClassFn()
- console.log('*****')
- console.log(item)
+ this.$emit('updatedForm', this.FormData)
},
changeDateIndex(num) {
if(this.currentDay==0&&num==-1) return this.$u.toast('已是可选最小日期')
@@ -183,6 +183,7 @@
this.currentDay = this.currentDay + num
this.chooseDay = this.dateArr[this.currentDay][0].date
this.FormData.courseIds = []
+ this.$emit('updatedForm', this.FormData)
this.simulationClassFn()
},
chooseCourse(item) {
@@ -190,7 +191,7 @@
this.FormData.courseIds = this.courseIds = item.id
this.FormData.classDate = item.classDate
this.FormData.classTime = item.classTime
- console.log(item)
+ this.$emit('updatedForm', this.FormData)
},
}
}
diff --git a/pages/carEntry/simulateAppointment/comp/step2.vue b/pages/carEntry/simulateAppointment/comp/step2.vue
index e5a1e83..88b6542 100644
--- a/pages/carEntry/simulateAppointment/comp/step2.vue
+++ b/pages/carEntry/simulateAppointment/comp/step2.vue
@@ -1,7 +1,7 @@
-
+
@@ -28,10 +28,13 @@
methods: {
changeStep(val) {
- if(!this.FormData.courseIds) return this.$u.toast('请选择预约时间段')
+ console.log(this.FormData.courseIds)
+ if(val==3&&!this.FormData.courseIds) return this.$u.toast('请选择预约时间段')
this.$emit('changeStep', val)
},
-
+ updatedForm(val) {
+ this.$emit('updatedForm',val)
+ }
}
}
diff --git a/pages/carEntry/simulateAppointment/comp/step3.vue b/pages/carEntry/simulateAppointment/comp/step3.vue
index 2e74bc2..13a30c1 100644
--- a/pages/carEntry/simulateAppointment/comp/step3.vue
+++ b/pages/carEntry/simulateAppointment/comp/step3.vue
@@ -3,7 +3,7 @@
- {{ item.seq }}
+ {{ item.seq }}
@@ -55,6 +55,16 @@
created() {
this.simulationDevicesFn()
},
+ watch: {
+ FormData: {
+ handler(newVal) {
+ if(newVal) {
+ this.$emit('updatedForm', newVal)
+ }
+ },
+ deep: true
+ }
+ },
methods: {
changeStep(val) {
this.$emit('changeStep', val)
@@ -68,6 +78,9 @@
},
chooseDevice(item) {
this.FormData.deviceNum = item.seq
+ this.$emit('updatedForm', this.FormData)
+ // this.$set(this.FormData, 'deviceNum', )
+ console.log(this.FormData.deviceNum)
// this.FormData.deviceName = item.seq
},
diff --git a/pages/carEntry/simulateAppointment/simulateAppointment.vue b/pages/carEntry/simulateAppointment/simulateAppointment.vue
index 62b5610..f01e3e6 100644
--- a/pages/carEntry/simulateAppointment/simulateAppointment.vue
+++ b/pages/carEntry/simulateAppointment/simulateAppointment.vue
@@ -24,8 +24,8 @@
-
-
+
+
@@ -49,7 +49,9 @@
deviceName: '',
classDate: '',
classTime: '',
- deviceNum: ''
+ deviceNum: '',
+ courseIds: '',
+ beginTime: '',
}
}
},
@@ -59,6 +61,9 @@
this.FormData.studentId = this.studentId
},
methods: {
+ updatedForm(val) {
+ this.FormData = val
+ },
changeStep(num) {
this.currentStep = num
},
diff --git a/pages/indexEntry/NonPlatformStudentInfo/NonPlatformStudentInfo.vue b/pages/indexEntry/NonPlatformStudentInfo/NonPlatformStudentInfo.vue
index 1159837..4537c69 100644
--- a/pages/indexEntry/NonPlatformStudentInfo/NonPlatformStudentInfo.vue
+++ b/pages/indexEntry/NonPlatformStudentInfo/NonPlatformStudentInfo.vue
@@ -123,7 +123,6 @@
.card {
padding: 10rpx 46rpx 10rpx 32rpx;
margin-bottom: 20rpx;
-
.row {
height: 100rpx;
display: flex;
diff --git a/pages/indexEntry/consult/pubComplaint/pubComplaint.vue b/pages/indexEntry/consult/pubComplaint/pubComplaint.vue
index 805e405..81635eb 100644
--- a/pages/indexEntry/consult/pubComplaint/pubComplaint.vue
+++ b/pages/indexEntry/consult/pubComplaint/pubComplaint.vue
@@ -83,7 +83,7 @@
联系电话
- {{ this.vuex_userInfo.phone }}
+ {{ vuex_userInfo.phone }}
diff --git a/pages/indexEntry/consult/pubConsult/pubConsult.vue b/pages/indexEntry/consult/pubConsult/pubConsult.vue
index 5f8e92b..431f032 100644
--- a/pages/indexEntry/consult/pubConsult/pubConsult.vue
+++ b/pages/indexEntry/consult/pubConsult/pubConsult.vue
@@ -34,7 +34,7 @@
联系电话
- {{ this.vuex_userInfo.phone }}
+ {{ vuex_userInfo.phone }}
diff --git a/pages/indexEntry/consult/record/comp/complaintItem.vue b/pages/indexEntry/consult/record/comp/complaintItem.vue
index 4e3f28c..ec82740 100644
--- a/pages/indexEntry/consult/record/comp/complaintItem.vue
+++ b/pages/indexEntry/consult/record/comp/complaintItem.vue
@@ -54,6 +54,10 @@
dealStatus: ['','未处理', '已处理', '已关闭' ],//处理状态：1、未处理，2、已处理，3、已关闭
}
},
+ created() {
+ console.log('this.item')
+ console.log(this.item)
+ },
methods: {
closeFn(id) {
uni.showModal({
diff --git a/pages/indexEntry/enroll/enroll.vue b/pages/indexEntry/enroll/enroll.vue
index 281be9a..721d432 100644
--- a/pages/indexEntry/enroll/enroll.vue
+++ b/pages/indexEntry/enroll/enroll.vue
@@ -138,7 +138,7 @@
this.showType = false
},
async getpersonfaceFn() {
- const {data: res} = await getpersonface({ ruleId: 1, RedirectUrl: website + '/pages/indexEntry/enroll/realName/realName'})
+ const {data: res} = await getpersonface({ ruleId: 1, RedirectUrl: website + '/pages/indexEntry/enroll/realName/realName',userId: this.userId})
let obj = JSON.parse(res)
this.link = obj.Url
this.$store.commit('updateBizToken', obj.BizToken)
diff --git a/pages/indexEntry/enroll/realName/realName.vue b/pages/indexEntry/enroll/realName/realName.vue
index fde042d..0a46626 100644
--- a/pages/indexEntry/enroll/realName/realName.vue
+++ b/pages/indexEntry/enroll/realName/realName.vue
@@ -8,7 +8,8 @@
import { GetDetectInfoEnhanced } from '@/config/api.js'
import { website } from '@/config/site.config.js'
export default {
- onShow() {
+ onLoad(options) {
+ alert(options.BizToken)
this.GetDetectInfoEnhancedFn()
},
onPullDownRefresh() {
@@ -16,7 +17,7 @@
},
methods: {
async GetDetectInfoEnhancedFn() {
- alert(this.$store.state.school.BizToken)
+ // alert(this.$store.state.school.BizToken)
uni.showLoading({
title: '正在检测中...'
})
@@ -30,10 +31,12 @@
bizToken: this.$store.state.school.BizToken,
userId: this.userId
}
- const {data: res} = await GetDetectInfoEnhanced(obj)
- let obj2 = JSON.parse(res)
+ const res = await GetDetectInfoEnhanced(obj)
+ // alert(res.msg)
+ // if(!res.msg) return false
+ let obj2 = JSON.parse(res.data)
await this.$store.dispatch('getUserInfo')
- uni.showLoading()
+ uni.hideLoading()
if(obj2.Text.ErrMsg=='成功') {
this.$goPage('/pages/indexEntry/enroll/registInfo/registInfo')
}
diff --git a/pages/indexEntry/findShcool/coachComment/coachComment.vue b/pages/indexEntry/findShcool/coachComment/coachComment.vue
index 316df63..1dba95f 100644
--- a/pages/indexEntry/findShcool/coachComment/coachComment.vue
+++ b/pages/indexEntry/findShcool/coachComment/coachComment.vue
@@ -34,7 +34,7 @@
onLoad(options) {
if(!options.item) return
let coachInfo = JSON.parse(decodeURIComponent(options.item))
- console.log(JSON.parse(options.item))
+ console.log(coachInfo)
this.coachList = [coachInfo]
this.params.coachId = coachInfo.coachId
this.getListCoachCommentFn()
diff --git a/pages/indexEntry/findShcool/comments/comments.vue b/pages/indexEntry/findShcool/comments/comments.vue
index 0134c1c..fe12591 100644
--- a/pages/indexEntry/findShcool/comments/comments.vue
+++ b/pages/indexEntry/findShcool/comments/comments.vue
@@ -42,6 +42,7 @@
.navBox {
padding: 32rpx 0 24rpx 0;
display: flex;
+ z-index: 9;
.nav {
padding: 10rpx 24rpx;
height: 60rpx;
diff --git a/pages/indexEntry/findShcool/comp/schoolItem.vue b/pages/indexEntry/findShcool/comp/schoolItem.vue
index 0a4c0ab..51561a7 100644
--- a/pages/indexEntry/findShcool/comp/schoolItem.vue
+++ b/pages/indexEntry/findShcool/comp/schoolItem.vue
@@ -9,7 +9,7 @@
{{item.stars}}分
- 行业信用{{item.creditrating}}
+ 行业信用 {{item.creditrating}}
距您{{ $u.utils.distanceFn(item.distance)}}
diff --git a/pages/indexEntry/findShcool/shcoolDetail/comp/tab3.vue b/pages/indexEntry/findShcool/shcoolDetail/comp/tab3.vue
index d333bc7..fc4a26b 100644
--- a/pages/indexEntry/findShcool/shcoolDetail/comp/tab3.vue
+++ b/pages/indexEntry/findShcool/shcoolDetail/comp/tab3.vue
@@ -1,9 +1,10 @@
-
+
-
+
+
@@ -13,7 +14,7 @@
- {{item.stars}}分
+ {{item.stars || 0}}分
报名
@@ -48,6 +49,13 @@
},
handleImageError(item) {
item.photoPath = require('@/static/images/index/avatar.png')
+ },
+ isImagePath(path) {
+ // 定义常见的图片文件扩展名
+ const imageExtensions = /\.(jpg|jpeg|png|gif|bmp|svg)$/i;
+
+ // 使用正则表达式进行匹配
+ return imageExtensions.test(path);
}
}
}
diff --git a/pages/indexEntry/findShcool/shcoolDetail/shcoolDetail.vue b/pages/indexEntry/findShcool/shcoolDetail/shcoolDetail.vue
index 7997eb1..847debc 100644
--- a/pages/indexEntry/findShcool/shcoolDetail/shcoolDetail.vue
+++ b/pages/indexEntry/findShcool/shcoolDetail/shcoolDetail.vue
@@ -11,7 +11,7 @@
-
+
@@ -27,7 +27,7 @@
-
+
diff --git a/pages/indexEntry/iIndustryInfo/detail/detail.vue b/pages/indexEntry/iIndustryInfo/detail/detail.vue
index 9e0ce1b..7e6e98f 100644
--- a/pages/indexEntry/iIndustryInfo/detail/detail.vue
+++ b/pages/indexEntry/iIndustryInfo/detail/detail.vue
@@ -26,6 +26,8 @@
onLoad(options) {
this.id = options.id
this.getarticleFn()
+ let obj = {a: 1}
+
},
methods: {
async getarticleFn() {
diff --git a/pages/indexEntry/publicVideo/comp/videoItem.vue b/pages/indexEntry/publicVideo/comp/videoItem.vue
index b408efe..8f7f3be 100644
--- a/pages/indexEntry/publicVideo/comp/videoItem.vue
+++ b/pages/indexEntry/publicVideo/comp/videoItem.vue
@@ -5,7 +5,7 @@
-
+
{{ item.title }}
diff --git a/pages/indexEntry/publicVideo/videoDetail/videoDetail.vue b/pages/indexEntry/publicVideo/videoDetail/videoDetail.vue
index ae6bb1a..7fe06a6 100644
--- a/pages/indexEntry/publicVideo/videoDetail/videoDetail.vue
+++ b/pages/indexEntry/publicVideo/videoDetail/videoDetail.vue
@@ -35,12 +35,13 @@
-
+
+
- 分享
+ 分享
@@ -118,7 +119,16 @@
const {data: res} = await createRetransmission(this.params)
this.getlikesCollection()
},
-
+ onShareAppMessage(res) {
+ this.createRetransmissionFn()
+ if (res.from === 'button') {// 来自页面内分享按钮
+ console.log(res.target)
+ }
+ return {
+ title: this.vdoDetail.title,
+ path: '/pages/indexEntry/publicVideo/videoDetail/videoDetail?id='+ this.id
+ }
+ }
}
}
@@ -158,6 +168,16 @@
flex-direction: column;
align-items: center;
justify-content: center;
+ position: relative;
+ button {
+ display: block;
+ width: 100%;
+ height: 100%;
+ position: absolute;
+ left: 0;
+ right: 0;
+ opacity: 0;
+ }
.icon {
width: 48rpx;
height: 48rpx;
diff --git a/pages/mineEntry/myCollect/myCollect.vue b/pages/mineEntry/myCollect/myCollect.vue
index b38da6c..51fc444 100644
--- a/pages/mineEntry/myCollect/myCollect.vue
+++ b/pages/mineEntry/myCollect/myCollect.vue
@@ -19,7 +19,7 @@
+
+
\ No newline at end of file
diff --git a/pages/mineEntry/myContract/myContract.vue b/pages/mineEntry/myContract/myContract.vue
index 1a11f51..a762e92 100644
--- a/pages/mineEntry/myContract/myContract.vue
+++ b/pages/mineEntry/myContract/myContract.vue
@@ -3,17 +3,59 @@
- 我的合同
+
+
+
\ No newline at end of file
diff --git a/pages/mineEntry/myOrder/comp/comp.scss b/pages/mineEntry/myOrder/comp/comp.scss
index af55205..9a88b69 100644
--- a/pages/mineEntry/myOrder/comp/comp.scss
+++ b/pages/mineEntry/myOrder/comp/comp.scss
@@ -8,17 +8,22 @@
border-bottom: 2rpx dashed #E8E9EC;
justify-content: space-between;
align-items: center;
-
+
.tag {
// width: 176rpx;
height: 60rpx;
- background: rgba(250, 149, 25, 0.1);
+ background: rgba(233, 243, 230, 1.0);
border-radius: 8rpx;
text-align: center;
font-size: 28rpx;
- color: #FA7919;
+ color: #6cbc9f;
margin-right: 24rpx;
padding: 10rpx 18rpx;
+ white-space: nowrap;
+ &.yellow {
+ color: #FA7919;
+ background: rgba(250, 149, 25, 0.1);
+ }
}
.schoolName {
@@ -30,7 +35,7 @@
.status {
display: flex;
align-items: center;
-
+ white-space: nowrap;
.text {
font-size: 28rpx;
color: $themC;
diff --git a/pages/mineEntry/myOrder/comp/opera.vue b/pages/mineEntry/myOrder/comp/opera.vue
index 083efad..4dddbeb 100644
--- a/pages/mineEntry/myOrder/comp/opera.vue
+++ b/pages/mineEntry/myOrder/comp/opera.vue
@@ -3,11 +3,11 @@
- 学费
- xx模拟驾驶馆
+ {{orderTypeTxt[item.orderType]}}
+ {{ $u.utils.truncateText(item.schoolName, 12) }}
- 待处理
+ {{orderStatusTxt[item.orderStatus]}}
@@ -21,7 +21,7 @@
学驾车型
- 000001
+ {{item.trainType}}
@@ -30,7 +30,7 @@
所选班型
- 2023/08/08 10:00:00
+ {{item.className}}
@@ -40,17 +40,26 @@
培训费总价
- ￥2000.02
+ ￥{{ $u.utils.priceTo(item.totalAmount) }}
实际支付
- ￥2000.02
+ ￥暂无字段
diff --git a/uni_modules/mumu-previewOffce/package.json b/uni_modules/mumu-previewOffce/package.json
new file mode 100644
index 0000000..d1ac8e5
--- /dev/null
+++ b/uni_modules/mumu-previewOffce/package.json
@@ -0,0 +1,85 @@
+{
+ "id": "mumu-previewOffce",
+ "displayName": "预览offce文件。可以打开 PDF WORD PPT EXCEL 文件",
+ "version": "1.0.3",
+ "description": "在程序中直接打开 offce 文件进行预览。可以打开 PDF WORD PPT EXCEL 文件",
+ "keywords": [
+ "PDF",
+ "WORD",
+ "PPT",
+ "EXCEL",
+ "offce"
+],
+ "repository": "",
+ "engines": {
+ "HBuilderX": "^3.1.0"
+ },
+"dcloudext": {
+ "sale": {
+ "regular": {
+ "price": "0.00"
+ },
+ "sourcecode": {
+ "price": "0.00"
+ }
+ },
+ "contact": {
+ "qq": ""
+ },
+ "declaration": {
+ "ads": "无",
+ "data": "无",
+ "permissions": "无"
+ },
+ "npmurl": "",
+ "type": "component-vue"
+ },
+ "uni_modules": {
+ "dependencies": [],
+ "encrypt": [],
+ "platforms": {
+ "cloud": {
+ "tcb": "y",
+ "aliyun": "y"
+ },
+ "client": {
+ "Vue": {
+ "vue2": "y",
+ "vue3": "y"
+ },
+ "App": {
+ "app-vue": "y",
+ "app-nvue": "n"
+ },
+ "H5-mobile": {
+ "Safari": "y",
+ "Android Browser": "y",
+ "微信浏览器(Android)": "y",
+ "QQ浏览器(Android)": "y"
+ },
+ "H5-pc": {
+ "Chrome": "y",
+ "IE": "n",
+ "Edge": "y",
+ "Firefox": "y",
+ "Safari": "y"
+ },
+ "小程序": {
+ "微信": "y",
+ "阿里": "y",
+ "百度": "y",
+ "字节跳动": "y",
+ "QQ": "y",
+ "钉钉": "y",
+ "快手": "u",
+ "飞书": "y",
+ "京东": "y"
+ },
+ "快应用": {
+ "华为": "u",
+ "联盟": "u"
+ }
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/uni_modules/mumu-previewOffce/readme.md b/uni_modules/mumu-previewOffce/readme.md
new file mode 100644
index 0000000..f823fcd
--- /dev/null
+++ b/uni_modules/mumu-previewOffce/readme.md
@@ -0,0 +1,85 @@
+# 插件介绍
+
+** 预览的文件地址必须是可以通过互联网访问的！！！ **
+
+** 预览的文件地址必须是可以直接复制在浏览器地址中访问的！！！ **
+
+## 本插件将于2023/11/30停止提供服务
+
+文档预览工具新版本已上线
+
+对比当前版本支持了手机端双手缩放操作，office文件不在依赖微软的解析接口，支持服务端完全私有化部署(内网部署)，UI界面有单独的电脑端、ios端、安卓端。
+
+新版地址：[h5office。预览office文件，预览文档，打开PDF WORD PPT EXCEL 文件 - DCloud 插件市场](https://ext.dcloud.net.cn/plugin?id=10895)
+
+## 插件原理
+
+> pdf 文件预览是通过 `pdf.js` 开源库，搭建了一个pdf预览的网站。前端只需要使用 iframe 加载这个网站即可。[pdf.js 官网](http://mozilla.github.io/pdf.js/api/draft/index.html)
+>
+> offce 文件的预览是通过微软offce在线接口进行解析的。offce在线地址：https://view.officeapps.live.com/op/embed.aspx?src=‘你的文件网络地址’
+>
+> 在微信小程序中，是通过小程序中的API进行预览的。[小程序文档](https://developers.weixin.qq.com/miniprogram/dev/api/file/wx.openDocument.html)
+
+## 使用环境
+
+** 不支持nvue 。小程序中使用官方提供的api。h5与其他环境是通过上面介绍的插件原理加载。**
+
+## 插件使用
+
+**插件已支持 uni_modules 支持组件easycom，以下代码演示的是普通使用**
+
+``` html
+
+
+
+
+```
+
+``` js
+ import MumuPreviewOffce from '@/uni_modules/mumu-previewOffce/components/mumu-previewOffce/mumu-previewOffce.vue'
+ export default {
+ components: {
+ MumuPreviewOffce
+ },
+ data() {
+ return {
+ showPreview: false,
+ fileUrl: 'https://h5plugin.mumudev.top/public/previewOffce/333.docx'
+ }
+ },
+ methods: {
+
+ },
+ }
+```
+
+## 相关 API
+
+### 可传属性（Props）
+
+| 参数 | 说明 | 类型 | 默认值 | 可选 |
+| ------- | ------------------------ | ------- | ------ | ------------ |
+| v-model | 双向绑定，显示或隐藏组件 | Boolean | false | false / true |
+| fileUrl | 预览文件的网络地址 | String | - | - |
+
+
+
+## 打开本地预览
+
+本地预览功能还在开发中...
+
+开发思路是：
+
+> 选择打开本地文件，上传到服务器。获取到服务器中的文件地址，传递给当前组件展示。
+
+没有办法直接在本地打开，所有采取这种方案。有条件的同学可以自己开发。我也会尽快把这个功能做出来。
+
+
+
+## 案例演示
+
+
+
+## 支持作者
+
+
\ No newline at end of file