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

产品等

Browse Source
master
yujialong 3 years ago
parent c607d0b894
commit 9c5e42e25b
9 changed files with 218 additions and 59 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      apis/modules/client.js
  2. 6
      apis/modules/parner.js
  3. 2
      apis/request.js
  4. 2
      config/request.js
  5. 18
      pages.json
  6. 5
      pages/clientDetail/clientDetail.vue
  7. 37
      pages/invite/invite.vue
  8. 201
      pages/ordered/ordered.vue
  9. 2
      pages/orders/orders.vue

4
apis/modules/client.js
Unescape View File

@ -31,4 +31,8 @@ export const addCustomer = (data) => {
export const updateCustomer = (data) => { export const updateCustomer = (data) => {
return post('nakadai/nakadai/customer/updateCustomer', data) return post('nakadai/nakadai/customer/updateCustomer', data)
}
export const getProductsSubscribedByCustomers = (data) => {
return get('nakadai/nakadai/customer/getProductsSubscribedByCustomers', data)
} }

6
apis/modules/parner.js
Unescape View File

@ -0,0 +1,6 @@
import request from '@/apis/request.js'
const { get, post } = request
export const savePartnerAccount = (data) => {
return post('nakadai/partnerAccount/savePartnerAccount', data)
}

2
apis/request.js
Unescape View File

@ -12,7 +12,7 @@ const request = options => {
}) })
} }
const header = Object.assign({}, config.headers, { const header = Object.assign({}, config.headers, {
token: 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJzdWIiOiJ1c2VyIiwiaWF0IjoxNjUyMzIxMzkwLCJleHAiOjE2NTIzNjQ1OTAsImFjY291bnRJZCI6IjEifQ.TbdyqfODzJngOzLavF3Pb79eGzhuiCDeviRbj8ClU30' token: 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJzdWIiOiJ1c2VyIiwiaWF0IjoxNjUzMDEyOTQ1LCJleHAiOjE2NTMwNTYxNDUsImFjY291bnRJZCI6IjEifQ.wlon-ETOzb3GvveRnetICH5Joa4u7XzaywGcDEbfqtU'
}) })
return new Promise((resolve, reject)=>{ return new Promise((resolve, reject)=>{
uni.request({ uni.request({

2
config/request.js
Unescape View File

@ -5,7 +5,7 @@
*/ */
export default { export default {
baseURL: 'http://39.108.250.202:9000/', baseURL: 'http://192.168.31.137:9000/',
headers: { headers: {
'Content-Type': 'application/json;charset=UTF-8' 'Content-Type': 'application/json;charset=UTF-8'
}, },

18
pages.json
Unescape View File

@ -1,5 +1,13 @@
{ {
"pages": [ "pages": [
{
"path" : "pages/invite/invite",
"style" :
{
"navigationBarTitleText": "加入团队",
"enablePullDownRefresh": false
}
},
{ {
"path" : "pages/clients/clients", "path" : "pages/clients/clients",
"style" : "style" :
@ -32,14 +40,6 @@
"enablePullDownRefresh": false "enablePullDownRefresh": false
} }
}, },
{
"path" : "pages/invite/invite",
"style" :
{
"navigationBarTitleText": "加入团队",
"enablePullDownRefresh": false
}
},
{ {
"path" : "pages/addStaff/addStaff", "path" : "pages/addStaff/addStaff",
"style" : "style" :
@ -122,7 +122,7 @@
"path" : "pages/ordered/ordered", "path" : "pages/ordered/ordered",
"style" : "style" :
{ {
"navigationBarTitleText": "产品订阅", "navigationBarTitleText": "已订阅产品",
"enablePullDownRefresh": false "enablePullDownRefresh": false
} }

5
pages/clientDetail/clientDetail.vue
Unescape View File

@ -62,7 +62,7 @@
<uni-icons class="icon" custom-prefix="iconfont" type="icon-edit" size="20" color="#959595"></uni-icons> <uni-icons class="icon" custom-prefix="iconfont" type="icon-edit" size="20" color="#959595"></uni-icons>
<view class="text">编辑</view> <view class="text">编辑</view>
</view> </view>
<view class="item" @click="toPage('../ordered/ordered')"> <view class="item" @click="toPage(`../ordered/ordered?customerId=${customerId}`)">
<uni-icons class="icon" custom-prefix="iconfont" type="icon-product" size="20" color="#959595"></uni-icons> <uni-icons class="icon" custom-prefix="iconfont" type="icon-product" size="20" color="#959595"></uni-icons>
<view class="text">已订阅产品</view> <view class="text">已订阅产品</view>
</view> </view>
@ -276,9 +276,10 @@
this.$util.to(path) this.$util.to(path)
}, },
// 提交 // 提交
submit(ref) { submit() {
const refs = this.$refs const refs = this.$refs
const { form } = this const { form } = this
// 有大量数据的情况下，input输入用v-model会有bug，所以给每个input加ref来手动取值赋值
form.name = refs.nameInput.val form.name = refs.nameInput.val
form.account = refs.accountInput.val form.account = refs.accountInput.val
form.position = refs.positionInput.val form.position = refs.positionInput.val

37
pages/invite/invite.vue
Unescape View File

@ -8,28 +8,29 @@
<view class="des">或然科技城市合伙人计划</view> <view class="des">或然科技城市合伙人计划</view>
<view class="des">加入并自动为你创建一个团队群组</view> <view class="des">加入并自动为你创建一个团队群组</view>
<view class="input"> <view class="input">
<uni-easyinput v-model="form.contact" placeholder="请填写你的真实姓名" :clearable="false" /> <uni-easyinput v-model="form.userName" placeholder="请填写你的真实姓名" :clearable="false" />
</view> </view>
<view class="input"> <view class="input">
<uni-easyinput v-model="form.contact" placeholder="请填写你的手机号" :clearable="false" /> <uni-easyinput v-model="form.phone" placeholder="请填写你的手机号" :clearable="false" />
</view> </view>
<view class="input code-wrap"> <view class="input code-wrap">
<uni-easyinput class="code" v-model="form.contact" placeholder="验证码" :clearable="false" /> <uni-easyinput class="code" v-model="form.code" placeholder="验证码" :clearable="false" />
<view class="send-code" @click="sendCode" :disabled="codeDisabled">{{ btnText }}</view> <view class="send-code" @click="sendCode" :disabled="codeDisabled">{{ btnText }}</view>
</view> </view>
<button class="submit" type="primary" @click="submit('valiForm')">立即加入</button> <button class="submit" type="primary" size="10" @click="submit">立即加入</button>
</view> </view>
</view> </view>
</template> </template>
<script> <script>
import { savePartnerAccount } from '@/apis/modules/parner.js'
export default { export default {
data() { data() {
return { return {
form: { form: {
name: '', userName: '',
provience: '', phone: '',
city: '', code: '',
}, },
codeDisabled: false, codeDisabled: false,
phoneTimer: null, phoneTimer: null,
@ -41,15 +42,17 @@
}, },
methods: { methods: {
submit(ref) { // 提交
this.$refs[ref].validate().then(res => { submit() {
console.log('success', res); const { userName, phone } = this.form
uni.showToast({ if (!userName) return this.$util.errMsg('请输入姓名！')
title: `校验通过` if (!phone) return this.$util.errMsg('请输入手机号！')
}) savePartnerAccount(this.form).then(res => {
}).catch(err => { this.$util.sucMsg('加入成功')
console.log('err', err); setTimeout(() => {
}) // uni.navigateBack()
}, 1500)
}).catch(res => {})
}, },
// 验证码倒计时 // 验证码倒计时
phoneCountdown() { phoneCountdown() {
@ -70,7 +73,7 @@
} }
}, },
// 发送验证码 // 发送验证码
sendPhoneCode(bind) { sendCode() {
const { phone } = this.form const { phone } = this.form
if (!phone) return this.$util.errMsg('请填写手机号！') 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('请填写正确的手机号！') 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('请填写正确的手机号！')

201
pages/ordered/ordered.vue
Unescape View File

@ -1,8 +1,11 @@
<template> <template>
<view> <view>
<view class="top"> <uni-card :is-shadow="false" :border="false" padding="0" is-full>
<uni-search-bar class="search" radius="5" placeholder="请输入产品名称" clearButton="auto" cancelButton="none" @confirm="search" /> <uni-search-bar class="search" radius="5" placeholder="请输入产品名称" clearButton="auto" cancelButton="none" v-model="keyword" />
<uni-icons class="icon" custom-prefix="iconfont" type="icon-filter" size="18" color="#007eff"></uni-icons> </uni-card>
<view class="filter">
<sl-filter :independence="true" :menuList="menuList" @result="result"></sl-filter>
</view> </view>
<ul class="tab"> <ul class="tab">
@ -10,7 +13,7 @@
</ul> </ul>
<ul class="list"> <ul class="list">
<li @click="toDetail"> <li v-for="item in list" @click="toDetail">
<view class="line thead"> <view class="line thead">
<view class="text">产品名称</view> <view class="text">产品名称</view>
<view class="text">起止日期</view> <view class="text">起止日期</view>
@ -18,10 +21,10 @@
<view class="text">产品状态</view> <view class="text">产品状态</view>
</view> </view>
<view class="line tbody"> <view class="line tbody">
<view class="text">数据平台</view> <view class="text">{{ item.productName }}</view>
<view class="text">2022-01-01 ~ 2022-02-02</view> <view class="text">{{ item.startAndEndTime }}</view>
<view class="text uni-success">生效</view> <view class="text uni-success">{{ item.status }}</view>
<view class="text uni-error">禁用</view> <view class="text uni-error">{{ item.isEnable }}</view>
</view> </view>
</li> </li>
</ul> </ul>
@ -29,14 +32,59 @@
</template> </template>
<script> <script>
import { getProductsSubscribedByCustomers } from '@/apis/modules/client.js'
import slFilter from '@/components/sl-filter/sl-filter.vue'
export default { export default {
data() { data() {
return { return {
curTab: 0, customerId: '',
menuList: [
{
'title': '订阅状态',
'detailTitle': '请选择订阅状态',
'key': 'orderStatus',
'isMutiple': false,
'detailList': [
{
'title': '全部',
'value': ''
},
{
'title': '生效',
'value': 1
},
{
'title': '过期',
'value': 2
}
]
},
{
'title': '产品状态',
'detailTitle': '请选择产品状态',
'key': 'productStatus',
'isMutiple': false,
'detailList': [
{
'title': '全部',
'value': ''
},
{
'title': '启用',
'value': 1
},
{
'title': '禁用',
'value': 2
}
]
}
],
curTab: '',
tabs: [ tabs: [
{ {
name: '全部', name: '全部',
id: 0 id: ''
}, },
{ {
name: '实训课程', name: '实训课程',
@ -44,44 +92,137 @@
}, },
{ {
name: '理论课程', name: '理论课程',
id: 2 id: 0
}, },
{ {
name: '数据产品', name: '数据产品',
id: 3 id: 3
} }
] ],
searchTimer: null,
orderStatus: '',
productStatus: '',
keyword: '',
list: [],
listAll: [],
page: 1,
pageSize: 10
} }
}, },
components: {
slFilter
},
watch: {
keyword () {
clearTimeout(this.searchTimer)
this.searchTimer = setTimeout(() => {
this.filter()
}, 500)
}
},
// 下拉刷新
onPullDownRefresh() {
this.getList()
setTimeout(() => {
uni.stopPullDownRefresh()
}, 1500)
},
onShow() {
const pages = getCurrentPages()
this.customerId = pages[pages.length - 1].options.customerId
this.getList()
},
methods: { methods: {
search(res) { getList() {
uni.showToast({ getProductsSubscribedByCustomers({
title: '搜索：' + res.value, customeId: this.customerId
icon: 'none' }).then(({ data }) => {
}) const { tabs } = this
data.map(e => {
const list = e.startAndEndTimeList
let connect = true // 每个订单的开始结束日期是否连续
list.map((n, i) => {
// 第一个不用计算。用当前订单的开始日期跟上一个订单的结束日期做比较，只差一天，就表示是连续订单
if (i) {
if (new Date(n.startTime).getTime() - 86400000 !== new Date(list[i - 1].endTime).getTime()) connect = false
}
})
// 如果是连续订单，则取第一个订单的开始日期和最后一个订单的结束日期
const now = Date.now()
if (now < list[0].startTime) {
e.startTime = list[0].startTime
e.endTime = connect ? list[list.length - 1].endTime : list[0].endTime
e.status = '未生效'
} else if (now > list[list.length - 1].endTime) {
e.status = '已过期'
} else {
// 连续订单
if (connect) {
e.startTime = list[0].startTime
e.endTime = list[list.length - 1].endTime
e.status = '生效中'
e.orderEnable = list[0].isEnable
} else {
for (const i in list) {
const n = list[i]
if (now >= new Date(n.startTime).getTime() && now <= new Date(n.endTime).getTime()) {
// 生效中的订单，直接取该订单的开始结束日期
e.startTime = n.startTime
e.endTime = n.endTime
e.status = '生效中'
e.orderEnable = n.isEnable
break
} else if (i && now > new Date(list[i - 1].endTime).getTime() && now < new Date(n.startTime).getTime()) {
// 当前时间位于两个订单时间之间，则取次订单的开始结束日期，并且为未生效
e.startTime = n.startTime
e.endTime = n.endTime
e.status = '未生效'
e.orderEnable = n.isEnable
break
}
}
}
}
const date = new Date()
date.setHours(0)
date.setMinutes(0)
date.setSeconds(0)
e.startAndEndTime = e.startTime + ' ~ ' + e.endTime
// 1开启 0禁用（已过期的订单，或者当前生效的订单为禁用，则显示为禁用，否则是启用）
e.isEnable = (e.status === '已过期' || !e.orderEnable) ? '禁用' : '启用'
})
this.list = data
this.listAll = data
}).catch(e => {})
},
// 筛选
filter() {
const list = this.listAll
const { orderStatus, productStatus, keyword, curTab } = this
this.list = list.filter(e => (orderStatus === '' || ((orderStatus === 2 && e.status === '已过期') || (orderStatus === 1 && e.status === '生效中'))) && (productStatus === '' || ((productStatus === 2 && e.isEnable === '禁用') || (productStatus === 1 && e.isEnable === '启用'))) && e.productName.includes(keyword) && (curTab === '' || (curTab === e.productType)))
},
// 筛选确定回调
result(val) {
this.orderStatus = val.orderStatus || ''
this.productStatus = val.productStatus || ''
this.filter()
}, },
// tab切换 // tab切换
tabChange(tab) { tabChange(tab) {
this.curTab = tab.id this.curTab = tab.id
this.filter()
}, },
// 跳转详情 // 跳转详情
toDetail() { toDetail(item) {
this.$util.to('../clientDetail/clientDetail') this.$util.to(`../clientDetail/clientDetail?customerId=${item.customerId}&show=1`)
} }
} }
} }
</script> </script>
<style scoped lang="scss"> <style scoped lang="scss">
.top { .filter {
display: flex;
align-items: center;
padding: 5px 15px 5px 5px;
margin-bottom: 10px; margin-bottom: 10px;
background-color: #fff;
.search {
flex: 1;
}
} }
.list { .list {
background-color: #fff; background-color: #fff;
@ -95,9 +236,13 @@
margin-bottom: 10px; margin-bottom: 10px;
} }
.text { .text {
width: 25%; width: 30%;
font-size: 14px; font-size: 14px;
&:first-child {
margin-right: 10px;
}
&:nth-child(3), &:last-child { &:nth-child(3), &:last-child {
width: 20%;
text-align: center; text-align: center;
} }
} }

2
pages/orders/orders.vue
Unescape View File

@ -5,7 +5,7 @@
</ul> </ul>
<uni-card :is-shadow="false" :border="false" padding="0" is-full> <uni-card :is-shadow="false" :border="false" padding="0" is-full>
<uni-search-bar class="search" radius="5" placeholder="请输入姓名、订单号" clearButton="auto" cancelButton="none" @confirm="search" /> <uni-search-bar class="search" radius="5" placeholder="请输入姓名、订单号" clearButton="auto" cancelButton="none" />
</uni-card> </uni-card>
<view class="filter"> <view class="filter">

Write Preview
Loading…
Cancel
Save