huoran
/
FE_CRM
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 3 Wiki Activity

bug修复

Browse Source
master
yujialong 2 years ago
parent 8e1f5fa658
commit a346cc0db3
16 changed files with 72 additions and 47 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      apis/modules/user.js
  2. 2
      apis/request.js
  3. 8
      components/empty/empty.vue
  4. 6
      order/addCourse/addCourse.vue
  5. 5
      order/editCourse/editCourse.vue
  6. 11
      order/orderDetail/orderDetail.vue
  7. 2
      order/ordered/ordered.vue
  8. 2
      order/orders/orders.vue
  9. 9
      pages.json
  10. 2
      pages/addStaff/addStaff.vue
  11. 18
      pages/clientDetail/clientDetail.vue
  12. 4
      pages/clients/clients.vue
  13. 31
      pages/phone/phone.vue
  14. 6
      pages/qrcode/qrcode.vue
  15. 1
      pages/teams/teams.vue
  16. 8
      styles/common.scss

4
apis/modules/user.js
Unescape View File

@ -45,4 +45,8 @@ export const checkIfAnAccountExists = account => {
return post(`users/applets/mine/checkIfAnAccountExists?account=${account}`)
}
export const checkIfThePhoneNumberExists = phone => {
return post(`users/applets/mine/checkIfThePhoneNumberExists?phone=${phone}`)
}
export const updateUserAvatars = `http://39.108.250.202:9000/users/users/userAccount/updateUserAvatars`

2
apis/request.js
Unescape View File

@ -19,7 +19,7 @@ const request = options => {
const { url } = options
uni.request({
header,
url: (otherUrl.find(e => url.includes(e)) ? 'http://192.168.31.137:9000/' : config.baseURL) + url,
url: (otherUrl.find(e => url.includes(e)) ? 'http://192.168.31.151:9000/' : config.baseURL) + url,
method: options.method || 'GET', // 请求类型，默认为GET
data: options.data || {}, // 请求参数，默认空对象
success: ({ data }) => {

8
components/empty/empty.vue
Unescape View File

@ -1,12 +1,18 @@
<template>
<view class="none">
<image src="../../static/image/none.png" mode="widthFix"></image>
<view class="text">暂无数据</view>
<view class="text">{{ text }}</view>
</view>
</template>
<script>
export default {
props: {
text: {
type: String,
default: '暂无数据'
},
},
data() {
return {

6
order/addCourse/addCourse.vue
Unescape View File

@ -155,6 +155,7 @@
},
// 生成产品参数
createParam(e) {
const { orderType } = this
return {
dataOrCourseId: e.id, // id
productName: e.productName, // 名称
@ -164,7 +165,7 @@
remainingPeriod: '', // 剩余期限
marketValue: '', // 市场价
marketPrice: e.marketPrice, // 市场单价
finalPrice: this.orderType === 2 ? 0 : '', // 成交价
finalPrice: orderType == 2 ? 0 : '', // 成交价
discountRate: '', // 折扣率
accountNum: e.productType === 2 ? '' : 1, // 账号数
totalAmount: '', // 总价
@ -174,7 +175,7 @@
productType: e.productType, // 课程分类 (0->理论 1-实训 2 数据产品)
options: 1,
miniProgramPictureAddress: e.miniProgramPictureAddress, // 图标
settlementPrice: '', // 结算价
settlementPrice: orderType == 2 ? 0 : '', // 结算价
settlementMethod: e.settlementMethod, // 结算方式，0为单价，1为分成
settlementPriceUnit: e.settlementPrice, // 结算单价
businessProportion: e.businessProportion, // 商务占比
@ -273,6 +274,7 @@
}
}
.btn-wrap {
position: fixed;
justify-content: space-between;
.btn {
width: 340rpx;

5
order/editCourse/editCourse.vue
Unescape View File

@ -309,8 +309,9 @@
<style scoped lang="scss">
.page {
height: calc(100vh - 140rpx - env(safe-area-inset-bottom));
overflow: auto;
padding-bottom: 130rpx;
// height: calc(100vh - 140rpx - env(safe-area-inset-bottom));
// overflow: auto;
-webkit-overflow-scrolling: touch;
}
.block {

11
order/orderDetail/orderDetail.vue
Unescape View File

@ -400,12 +400,10 @@
<style scoped lang="scss">
.page {
height: calc(100vh - 300rpx - env(safe-area-inset-bottom));
overflow: auto;
-webkit-overflow-scrolling: touch;
padding-bottom: 400rpx;
}
.show {
height: calc(100vh - 130rpx - env(safe-area-inset-bottom));
padding-bottom: 260rpx;
}
.pro-wrap {
position: relative;
@ -471,8 +469,11 @@
}
.bottom {
position: fixed;
bottom: env(safe-area-inset-bottom);
bottom: 0;
padding-bottom: env(safe-area-inset-bottom);
width: 100%;
background-color: #fff;
box-sizing: border-box;
}
/deep/.add-btn {
display: flex;

2
order/ordered/ordered.vue
Unescape View File

@ -2,7 +2,7 @@
<view>
<view class="filter">
<uni-search-bar class="search" radius="30" placeholder="请输入产品名称" v-model="keyword" clearButton="auto" cancelButton="none" />
<uni-icons class="icon" custom-prefix="iconfont" type="icon-filter" size="18" color="#007eff" @click="popup = true"></uni-icons>
<uni-icons class="icon" custom-prefix="iconfont" type="icon-filter" size="22" color="#007eff" @click="popup = true"></uni-icons>
</view>
<ul class="tab">

2
order/orders/orders.vue
Unescape View File

@ -3,7 +3,7 @@
<view class="filter">
<uni-search-bar class="search" radius="30" placeholder="请输入姓名、订单号" v-model="keyword" clearButton="auto" cancelButton="none" />
<view :class="['sort', sort]" @click="switchSort"></view>
<uni-icons class="icon" custom-prefix="iconfont" type="icon-filter" size="18" color="#007eff" @click="popup = true"></uni-icons>
<uni-icons class="icon" custom-prefix="iconfont" type="icon-filter" size="22" color="#007eff" @click="popup = true"></uni-icons>
</view>
<ul class="tab">
<li v-for="(tab, i) in tabs" :class="{active: curTab === tab.id}" @click="tabChange(tab)">{{ tab.name }}</li>

9
pages.json
Unescape View File

@ -52,7 +52,7 @@
"path" : "pages/addStaff/addStaff",
"style" :
{
"navigationBarTitleText": "添加成员",
"navigationBarTitleText": "邀请成员",
"enablePullDownRefresh": false
}
},
@ -189,7 +189,7 @@
},
"globalStyle": {
"navigationBarTextStyle": "white",
"navigationBarTitleText": "或然CRM系统",
"navigationBarTitleText": "或然合伙人运营管理平台",
"navigationBarBackgroundColor": "#007EFF",
"backgroundColor": "#f5f5f5",
"app-plus": {
@ -201,6 +201,8 @@
"selectedColor": "#007FFF",
"borderStyle": "white",
"backgroundColor": "#ffffff",
"fontSize": "16px",
"iconWidth": "30px",
"list": [{
"pagePath": "pages/index/index",
"iconPath": "static/image/tab1.png",
@ -210,8 +212,7 @@
"pagePath": "pages/teams/teams",
"iconPath": "static/image/tab2.png",
"selectedIconPath": "static/image/tab2-1.png",
"text": "团队",
"visible": false
"text": "团队"
}, {
"pagePath": "pages/person/person",
"iconPath": "static/image/tab3.png",

2
pages/addStaff/addStaff.vue
Unescape View File

@ -1,6 +1,6 @@
<template>
<view>
<uni-section title="邀请员工" type="line">
<uni-section title="邀请成员" type="line">
<uni-list>
<uni-list-item thumb-size="sm" showArrow title="二维码邀请" clickable :to="`../qrcode/qrcode`">
<template v-slot:header>

18
pages/clientDetail/clientDetail.vue
Unescape View File

@ -59,11 +59,11 @@
<view v-if="isDetail" class="val">{{ form.email }}</view>
<input v-else type="text" placeholder="请输入" v-model="form.email">
</view>
<view class="line">
<view v-if="customerId" class="line">
<view class="name">产品到期时间</view>
<view class="val">{{ form.expireDate }}</view>
</view>
<view class="line">
<view v-if="customerId" class="line">
<view class="name">客户类型</view>
<view class="val">{{ customerType }}</view>
</view>
@ -215,8 +215,8 @@
// 客户名称选择回调
schoolChange(school) {
const { form } = this
const { schoolId } = form
form.schoolId = school.schoolId
const { schoolId } = school
form.schoolId = schoolId
form.customerName = school.schoolName
form.provinceId = school.provinceId
form.provinceName = school.provinceName
@ -269,7 +269,7 @@
}).catch(res => {})
} else {
addCustomer(form).then(res => {
this.$util.sucMsg('添加成功')
this.$util.sucMsg('创建客户成功！你现在可以去订单给客户下单了。')
setTimeout(() => {
uni.navigateBack()
}, 1500)
@ -282,8 +282,9 @@
<style scoped lang="scss">
.page {
height: calc(100vh - 120rpx - env(safe-area-inset-bottom));
overflow: auto;
padding-bottom: 170rpx;
// height: calc(100vh - 120rpx - env(safe-area-inset-bottom));
// overflow: auto;
-webkit-overflow-scrolling: touch;
}
.info {
@ -296,11 +297,12 @@
.action {
z-index: 2;
position: fixed;
bottom: env(safe-area-inset-bottom);
bottom: 0;
display: flex;
justify-content: space-around;
width: 100%;
padding: 5px 10px;
padding-bottom: env(safe-area-inset-bottom);
background-color: #fff;
border-top: 1px solid #f3f3f3;
box-sizing: border-box;

4
pages/clients/clients.vue
Unescape View File

@ -2,7 +2,7 @@
<view class="page">
<view class="filter">
<uni-search-bar class="search" radius="30" placeholder="请输入客户名称" v-model="keyword" clearButton="auto" cancelButton="none" />
<uni-icons class="icon" custom-prefix="iconfont" type="icon-filter" size="18" color="#007eff" @click="popup = true"></uni-icons>
<uni-icons class="icon" custom-prefix="iconfont" type="icon-filter" size="22" color="#007eff" @click="popup = true"></uni-icons>
</view>
<ul class="tab">
<li v-for="(tab, i) in tabs" :class="{active: curTab === tab.id}" @click="tabChange(tab)">{{ tab.name }}</li>
@ -39,7 +39,7 @@
</ul>
<uni-load-more :status="status" />
</template>
<empty v-else></empty>
<empty v-else text="您当前暂无有下单的客户，请快去给客户下订单吧"></empty>
<uni-icons class="plus" type="plus-filled" size="60" color="#007eff" @click="$util.to('../clientDetail/clientDetail')"></uni-icons>
<filter-popup :data="filterData" :form.sync="filterForm" v-model="popup" title="全部筛选" height="1104rpx" @finsh="subFinsh"></filter-popup>

31
pages/phone/phone.vue
Unescape View File

@ -1,10 +1,10 @@
<template>
<view class="page">
<view class="input">
<uni-easyinput v-model="form.phone" placeholder="请填写你的手机号" :clearable="false" />
<uni-easyinput v-model="form.phone" placeholder="请填写你的手机号" maxlength="11" :clearable="false" />
</view>
<view class="input code-wrap">
<uni-easyinput class="code" v-model="form.code" placeholder="验证码" :clearable="false" />
<uni-easyinput class="code" v-model="form.code" placeholder="验证码" maxlength="6" :clearable="false" />
<view class="send-code" @click="sendCode" :disabled="codeDisabled">{{ btnText }}</view>
</view>
<button type="primary" @click="submit">确认</button>
@ -12,7 +12,7 @@
</template>
<script>
import { sendPhoneOrEmailCode, changePhoneNumber } from '@/apis/modules/user.js'
import { sendPhoneOrEmailCode, changePhoneNumber, checkIfThePhoneNumberExists } from '@/apis/modules/user.js'
export default {
data() {
return {
@ -36,17 +36,20 @@
const { phone } = this.form
if (!phone) return this.$util.errMsg('请输入手机号')
if (!/^1[3456789]\d{9}$/.test(phone) && !/^([a-zA-Z]|[0-9])(\w|\-)+@[a-zA-Z0-9]+\.([a-zA-Z]{2,4})$/.test(phone)) return this.$util.errMsg('请输入正确的手机号')
sendPhoneOrEmailCode({
userId: this.userId,
phone,
types: 2
}).then(({ message }) => {
if (message.opener) {
this.phoneCountdown()
this.phoneOpener = message.opener
} else {
this.$util.errMsg(message)
}
// 手机号判重
checkIfThePhoneNumberExists(phone).then(() => {
sendPhoneOrEmailCode({
userId: this.userId,
phone,
types: 2
}).then(({ message }) => {
if (message.opener) {
this.phoneCountdown()
this.phoneOpener = message.opener
} else {
this.$util.errMsg(message)
}
}).catch(res => {})
}).catch(res => {})
},
// 验证码倒计时

6
pages/qrcode/qrcode.vue
Unescape View File

@ -6,7 +6,7 @@
<image class="avatar" :src="avatar" mode=""></image>
<view class="text">
<view class="invite">
<text class="name">{{ userName }}</text> 邀请你加入
<text class="name">{{ userName }}</text> 邀请你加入城市合伙人计划
</view>
<view class="com">{{ team.partnerClassificationName }}</view>
</view>
@ -66,6 +66,10 @@
text-align: center;
background-color: #fff;
.inner {
display: flex;
flex-direction: column;
justify-content: center;
align-items: center;
padding: 40rpx 80rpx 0;
}
.info {

1
pages/teams/teams.vue
Unescape View File

@ -84,6 +84,7 @@
// 获取列表
getList() {
teamList({
type: 1,
pageNum: this.page,
pageSize: this.pageSize,
keyWord: this.keyword,

8
styles/common.scss
Unescape View File

@ -49,13 +49,13 @@ ul {
content: '';
display: block;
margin-bottom: 5rpx;
border: 11rpx solid transparent;
border: 15rpx solid transparent;
border-bottom-color: #B9B9B9;
}
&:after {
content: '';
display: block;
border: 11rpx solid transparent;
border: 15rpx solid transparent;
border-top-color: #B9B9B9;
}
&.desc:before {
@ -175,9 +175,9 @@ ul {
}
}
.btn-wrap {
z-index: 2;
z-index: 10;
position: fixed;
// bottom: env(safe-area-inset-bottom);
bottom: env(safe-area-inset-bottom);
bottom: 0;
display: flex;
justify-content: flex-end;

Write Preview
Loading…
Cancel
Save