Browse Source

Merge branch 'master' of ssh://gitlab.frkj.cc:222/php/ZhiHuiJiaoWu_UniApp

master
王泽彦 10 months ago
parent
commit
d2084e8f28
  1. 2
      pages/coach/class/info.vue
  2. 2
      pages/coach/class/list.vue
  3. 2
      pages/coach/course/list.vue
  4. 2
      pages/coach/job/list.vue
  5. 2
      pages/coach/my/arrival_statistics.vue
  6. 2
      pages/coach/my/my_attendance.vue
  7. 2
      pages/coach/student/info.vue
  8. 14
      pages/common/im_chat_info.vue
  9. 2
      pages/common/my_attendance.vue
  10. 2
      pages/common/sys_msg_list.vue
  11. 4
      pages/market/clue/add_clues.vue
  12. 93
      pages/market/clue/edit_clues.vue
  13. 2
      pages/market/clue/edit_clues_log.vue
  14. 3
      pages/market/clue/index.vue
  15. 2
      pages/market/my/signed_client_list.vue
  16. 2
      pages/student/index/job_list.vue
  17. 2
      pages/student/index/physical_examination.vue
  18. 2
      pages/student/my/lesson_consumption.vue
  19. 2
      pages/student/timetable/index.vue

2
pages/coach/class/info.vue

@ -276,7 +276,7 @@ export default {
}
//
if (this.filteredData.page * this.filteredData.limit > this.filteredData.total || this.filteredData.limit > this.filteredData.total) {
if ((this.filteredData.page - 1) * this.filteredData.limit >= this.filteredData.total) {
this.loading = false
uni.showToast({
title: '暂无更多',

2
pages/coach/class/list.vue

@ -116,7 +116,7 @@ export default {
console.log(111,(this.filteredData.page * this.filteredData.limit) ,(this.filteredData.total))
//
if(this.filteredData.page * this.filteredData.limit > this.filteredData.total){
if ((this.filteredData.page - 1) * this.filteredData.limit >= this.filteredData.total) {
this.loading = false
uni.showToast({
title: '暂无更多',

2
pages/coach/course/list.vue

@ -328,7 +328,7 @@ export default {
let data = {...this.filteredData}
//
if (this.filteredData.page * this.filteredData.limit > this.filteredData.total || this.filteredData.limit > this.filteredData.total) {
if ((this.filteredData.page - 1) * this.filteredData.limit >= this.filteredData.total) {
this.loading = false
uni.showToast({
title: '暂无更多',

2
pages/coach/job/list.vue

@ -96,7 +96,7 @@ export default {
let data = {...this.filteredData}
//
if(this.filteredData.page * this.filteredData.limit > this.filteredData.total){
if ((this.filteredData.page - 1) * this.filteredData.limit >= this.filteredData.total) {
this.loading = false
uni.showToast({
title: '暂无更多',

2
pages/coach/my/arrival_statistics.vue

@ -114,7 +114,7 @@ export default {
}
//
if (this.filteredData.page * this.filteredData.limit > this.filteredData.total || this.filteredData.limit > this.filteredData.total) {
if ((this.filteredData.page - 1) * this.filteredData.limit >= this.filteredData.total) {
this.loading = false
uni.showToast({
title: '暂无更多',

2
pages/coach/my/my_attendance.vue

@ -355,7 +355,7 @@ export default {
let data = {...this.filteredData}
//
if(this.filteredData.page * this.filteredData.limit > this.filteredData.total){
if ((this.filteredData.page - 1) * this.filteredData.limit >= this.filteredData.total) {
this.loading = false
uni.showToast({
title: '暂无更多',

2
pages/coach/student/info.vue

@ -239,7 +239,7 @@ export default {
let data = {...this.filteredData}
//
if(this.filteredData.page * this.filteredData.limit > this.filteredData.total){
if ((this.filteredData.page - 1) * this.filteredData.limit >= this.filteredData.total) {
this.loading = false
uni.showToast({
title: '暂无更多',

14
pages/common/im_chat_info.vue

@ -8,14 +8,14 @@
scroll-y="true"
:scroll-top="scrollTop"
:lower-threshold="lowerThreshold"
style="height: 80vh;"
style="height: 78vh;"
>
<view class="ul">
<view class="item_box" v-for="(v,k) in tableList" :key="k" :id="'item_' + v.id">
<view class="time_section" v-if="v.created_at">{{v.created_at}}</view>
<view class="li" v-if="v.direction == `left`">
<view class="item left_item" :style="v.message_type == 'text' ? { backgroundColor: '#f4f6f9' } : {}">
<view class="item left_item" :style="{ backgroundColor: v.message_type === 'text' ? '#f4f6f9' : '' }">
<!--文本内容-->
<view class="text_box" v-if="v.message_type == 'text'">{{v.content}}</view>
<!-- 图片内容 -->
@ -28,7 +28,7 @@
<view class="li" v-if="v.direction == `right`">
<view class="item"></view>
<view class="item right_item" :style="v.message_type == 'text' ? { backgroundColor: '#1684fc' } : {}">
<view class="item right_item" :style="{ backgroundColor: v.message_type === 'text' ? '#1684fc' : '' }">
<view class="text_box" v-if="v.message_type == 'text'">{{v.content}}</view>
<!-- 图片内容 -->
<view class="img_box" v-if="v.message_type == 'img'" @click="previewImage(v.content)">
@ -40,6 +40,7 @@
</view>
</scroll-view>
</view>
<view class="input_section">
<view class="left_box">
<input class="input" v-model="formData.content" type="text" placeholder="请输入">
@ -416,8 +417,8 @@ export default {
min-height: 100vh;
background: #292929 100%;
padding: 0 0rpx;
padding-top: 32rpx;
padding-bottom: 150rpx;
padding-top: 120rpx;
padding-bottom: 120rpx;
font-size: 28rpx;
display: flex;
flex-direction: column;
@ -480,7 +481,8 @@ export default {
position: fixed;
bottom: 0;
padding: 50rpx 30rpx;
padding: 30rpx;
padding-bottom: 50rpx;
display: flex;
justify-content:space-between;
align-items: center;

2
pages/common/my_attendance.vue

@ -469,7 +469,7 @@ export default {
let data = {...this.filteredData}
//
if(this.filteredData.page * this.filteredData.limit > this.filteredData.total){
if ((this.filteredData.page - 1) * this.filteredData.limit >= this.filteredData.total) {
this.loading = false
uni.showToast({
title: '暂无更多',

2
pages/common/sys_msg_list.vue

@ -98,7 +98,7 @@ export default {
let data = {...this.filteredData}
//
if(this.filteredData.page * this.filteredData.limit > this.filteredData.total){
if ((this.filteredData.page - 1) * this.filteredData.limit >= this.filteredData.total) {
this.loading = false
uni.showToast({
title: '暂无更多',

4
pages/market/clue/add_clues.vue

@ -416,7 +416,7 @@
<!-- 年月日-选择时间 -->
<fui-date-picker :show="date_picker_show" type="5" @change="change_date" @cancel="cancel_date"></fui-date-picker>
<fui-date-picker :show="date_picker_show" type="3" @change="change_date" @cancel="cancel_date"></fui-date-picker>
<!-- 选择器 -->
<fui-picker
@ -1103,7 +1103,7 @@ export default {
//
let val = (e.result ?? '')
if(val){
val = val + ':00'
val = val
}
let input_name = this.data_picker_input_name

93
pages/market/clue/edit_clues.vue

@ -233,6 +233,23 @@
></fui-input>
</view>
</fui-form-item>
</view>
</fui-form>
</view>
<view class="fui-btn__box">
<fui-button background="#434544" color="#24BA9F" borderColor="#24BA9F" @click="nextStep('1')">下一步</fui-button>
</view>
</view>
<!-- 添加六要素-->
<view style="margin-top: 20rpx;" v-if="optionTableId == 1">
<view class="form-style">
<fui-form ref="form" top="0" :model="formData" :show="false">
<view class="title" style="margin-top: 20rpx;">六要素信息</view>
<view class="input-style">
<!--客户初步意向度-->
<fui-form-item
label="客户初步意向度"
@ -271,22 +288,6 @@
</view>
</view>
</fui-form-item>
</view>
</fui-form>
</view>
<view class="fui-btn__box">
<fui-button background="#434544" color="#24BA9F" borderColor="#24BA9F" @click="nextStep('1')">下一步</fui-button>
</view>
</view>
<!-- 添加六要素-->
<view style="margin-top: 20rpx;" v-if="optionTableId == 1">
<view class="form-style">
<fui-form ref="form" top="0" :model="formData" :show="false">
<view class="title" style="margin-top: 20rpx;">六要素信息</view>
<view class="input-style">
<!--购买力-->
<fui-form-item
label="购买力"
@ -405,6 +406,51 @@
></fui-input>
</view>
</fui-form-item>
<!--一访情况-->
<fui-form-item
label="一访情况"
asteriskPosition="right"
labelSize='26'
prop="title"
background='#434544'
labelColor='#fff'
:bottomBorder='false'>
<view class="input-title" style="margin-right:14rpx;">
<fui-textarea placeholder="点击填写" style="text-align: left;" v-model="formData.first_visit_status" ></fui-textarea>
<!-- <fui-input-->
<!-- :borderBottom="false"-->
<!-- :padding="[0]"-->
<!-- placeholder="点击填写"-->
<!-- v-model="formData.first_visit_status"-->
<!-- backgroundColor="#434544"-->
<!-- size="26"-->
<!-- color="#fff"-->
<!-- ></fui-input>-->
</view>
</fui-form-item>
<!--二访情况-->
<fui-form-item
label="二访情况"
asteriskPosition="right"
labelSize='26'
prop="title"
background='#434544'
labelColor='#fff'
:bottomBorder='false'>
<view class="input-title" style="margin-right:14rpx;">
<fui-textarea placeholder="点击填写" borderColor="#292929" style="text-align: left;" v-model="formData.second_visit_status"></fui-textarea>
<!-- <fui-input-->
<!-- :borderBottom="false"-->
<!-- :padding="[0]"-->
<!-- placeholder="点击填写"-->
<!-- v-model="formData.second_visit_status"-->
<!-- backgroundColor="#434544"-->
<!-- size="26"-->
<!-- color="#fff"-->
<!-- ></fui-input>-->
</view>
</fui-form-item>
</view>
</fui-form>
</view>
@ -416,7 +462,7 @@
<!-- 年月日-选择时间 -->
<fui-date-picker :show="date_picker_show" type="5" @change="change_date" @cancel="cancel_date"></fui-date-picker>
<fui-date-picker :show="date_picker_show" type="3" @change="change_date" @cancel="cancel_date"></fui-date-picker>
<!-- 选择器 -->
<fui-picker
@ -610,6 +656,8 @@ export default {
staff_id:'',//ID
distance:'',//
optional_class_time:'',//
first_visit_status:'',//访
second_visit_status:'',//访
},
//
@ -740,6 +788,7 @@ export default {
let customerResource = res.data.customerResource || {}//
let sixSpeed = res.data.customerResource.sixSpeed || {}//
console.log('12313',sixSpeed)
console.log('详情',res.data)
@ -765,11 +814,13 @@ export default {
staff_id: sixSpeed.staff_id || '',//ID
distance: sixSpeed.distance || '',//
promised_visit_time: sixSpeed.promised_visit_time || '',//访
optional_class_time: sixSpeed.preferred_class_time || ''//
optional_class_time: sixSpeed.preferred_class_time || '',//
first_visit_status:sixSpeed.first_visit_status || '',//访
second_visit_status:sixSpeed.second_visit_status || '',//访
}
this.formData.promised_visit_time = this.$util.formatToDateTime(sixSpeed.promised_visit_time, 'Y-m-d H:i');//(Y-m-d H:i)
this.formData.optional_class_time = this.$util.formatToDateTime(sixSpeed.promised_visit_time, 'Y-m-d H:i');//(Y-m-d H:i)
this.formData.promised_visit_time = this.$util.formatToDateTime(sixSpeed.promised_visit_time, 'Y-m-d');//(Y-m-d H:i)
this.formData.optional_class_time = this.$util.formatToDateTime(sixSpeed.promised_visit_time, 'Y-m-d');//(Y-m-d H:i)
//
this.picker_config.source_channel.text = customerResource.source_channel_name || '点击选择'//
@ -1150,7 +1201,7 @@ export default {
//
let val = (e.result ?? '')
if(val){
val = val + ':00'
val = val
}
let input_name = this.data_picker_input_name

2
pages/market/clue/edit_clues_log.vue

@ -227,7 +227,7 @@ export default {
let data = {...this.filteredData}
//
if(this.filteredData.page * this.filteredData.limit > this.filteredData.total){
if ((this.filteredData.page - 1) * this.filteredData.limit >= this.filteredData.total) {
this.loading = false
uni.showToast({
title: '暂无更多',

3
pages/market/clue/index.vue

@ -59,8 +59,9 @@
</view>
</view>
</view>
<!--只有注册了member表的账号才可操作IM对话-->
<view style="width: 15%;">
<image src="@/static/images/index/message.png" class="image" @click="openViewMyMessage(v)"></image>
<image v-if="v.customerResource.member_id" src="@/static/images/index/message.png" class="image" @click="openViewMyMessage(v)"></image>
</view>
<view style="width: 15%;">
<image v-if="v.customerResource.phone_number" src="@/static/images/index/phone.png" class="image" @click="dialTel(v)"></image>

2
pages/market/my/signed_client_list.vue

@ -113,7 +113,7 @@ export default {
let data = {...this.filteredData}
//
if(this.filteredData.page * this.filteredData.limit > this.filteredData.total){
if ((this.filteredData.page - 1) * this.filteredData.limit >= this.filteredData.total) {
this.loading = false
uni.showToast({
title: '暂无更多',

2
pages/student/index/job_list.vue

@ -104,7 +104,7 @@ import memberApi from '@/api/member.js';
let data = {...this.filteredData}
//
if(this.filteredData.page * this.filteredData.limit > this.filteredData.total){
if ((this.filteredData.page - 1) * this.filteredData.limit >= this.filteredData.total) {
this.loading = false
uni.showToast({
title: '暂无更多',

2
pages/student/index/physical_examination.vue

@ -102,7 +102,7 @@ import memberApi from '@/api/member.js';
let data = {...this.filteredData}
//
if(this.filteredData.page * this.filteredData.limit > this.filteredData.total){
if ((this.filteredData.page - 1) * this.filteredData.limit >= this.filteredData.total) {
this.loading = false
uni.showToast({
title: '暂无更多',

2
pages/student/my/lesson_consumption.vue

@ -92,7 +92,7 @@ import memberApi from '@/api/member.js';
let data = {...this.filteredData}
//
if(this.filteredData.page * this.filteredData.limit > this.filteredData.total){
if ((this.filteredData.page - 1) * this.filteredData.limit >= this.filteredData.total) {
this.loading = false
uni.showToast({
title: '暂无更多',

2
pages/student/timetable/index.vue

@ -232,7 +232,7 @@ export default {
let data = {...this.filteredData}
//
if (this.filteredData.page * this.filteredData.limit > this.filteredData.total || this.filteredData.limit > this.filteredData.total) {
if ((this.filteredData.page - 1) * this.filteredData.limit >= this.filteredData.total) {
this.loading = false
uni.showToast({
title: '暂无更多',

Loading…
Cancel
Save