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

抖音小程序上线

Browse Source
master
yujialong 5 months ago
parent 3123e5f30b
commit 26d4d20643
13 changed files with 188 additions and 156 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. 10
      apis/modules/user.js
  2. 4
      components/notAuth/notAuth.vue
  3. 2
      libs/uma.js
  4. 7
      order/addCourse/addCourse.vue
  5. 2
      order/curClient/curClient.vue
  6. 22
      order/orderDetail/orderDetail.vue
  7. 2
      order/productDetail/productDetail.vue
  8. 2
      order/shopCart/shopCart.vue
  9. 81
      pages/login/login.vue
  10. 4
      pages/orders/orders.vue
  11. 3
      pages/person/person.vue
  12. 17
      pages/reg/reg.vue
  13. 6
      team/qrcode/qrcode.vue

10
apis/modules/user.js
Unescape View File

@ -13,6 +13,10 @@ export const douYinLoginByOpenid = (data) => {
return post('users/users/user/douYinLoginByOpenid?openid=' + data) return post('users/users/user/douYinLoginByOpenid?openid=' + data)
} }
export const douYinUserBinding = (data) => {
return post('users/users/user/douYinUserBinding', data)
}
export const queryProvince = () => { export const queryProvince = () => {
return get('nakadai/nakadai/province/queryProvince') return get('nakadai/nakadai/province/queryProvince')
} }
@ -72,8 +76,8 @@ export const checkIfThePhoneNumberExists = phone => {
return post(`users/users/applets/mine/checkIfThePhoneNumberExists?phone=${phone}`) return post(`users/users/applets/mine/checkIfThePhoneNumberExists?phone=${phone}`)
} }
export const queryPartnerAccount = phone => { export const queryPartnerAccount = data => {
return post(`nakadai/nakadai/partnerAccount/queryPartnerAccount?phone=${phone}`) return post(`nakadai/nakadai/partnerAccount/queryPartnerAccount?phone=${data.phone}&openId=${data.openId}&douYinOpenId=${data.douYinOpenId}`)
} }
export const getSessionKey = data => { export const getSessionKey = data => {
@ -85,7 +89,7 @@ export const partnerAccountApplication = data => {
} }
export const loginByOpenid = openid => { export const loginByOpenid = openid => {
return post(`users/users/user/loginByOpenid?openid=` + openid) return post(`users/users/user/loginByOpenid?openid=${openid}`)
} }
export const checkWorkNumOrAccount = account => { export const checkWorkNumOrAccount = account => {

4
components/notAuth/notAuth.vue
Unescape View File

@ -3,7 +3,7 @@
<view class="mask"></view> <view class="mask"></view>
<view class="texts"> <view class="texts">
<view class="text">权限审核中，可联系下方平台运营加快审核进度</view> <view class="text">权限审核中，可联系下方平台运营加快审核进度</view>
<image class="qrcode" src="https://occupationlab.com/images/customer.png" mode="widthFix"></image> <image class="qrcode" :src="src" mode="widthFix"></image>
</view> </view>
</view> </view>
</template> </template>
@ -12,7 +12,7 @@
export default { export default {
data() { data() {
return { return {
src: uni.getSystemInfoSync().uniPlatform === 'mp-toutiao' ? 'https://occupationlab.com/images/dyQrcode.jpg' : 'https://occupationlab.com/images/customer.png'
} }
}, },
methods: { methods: {

2
libs/uma.js
Unescape View File

@ -1,5 +1,4 @@
// #ifdef MP-WEIXIN
import uma from 'umtrack-wx'; import uma from 'umtrack-wx';
uma.init({ uma.init({
appKey: '64cc98d5a1a164591b62da3e', // 由友盟分配的APP_KEY appKey: '64cc98d5a1a164591b62da3e', // 由友盟分配的APP_KEY
@ -17,4 +16,3 @@ uma.install = function(Vue) {
Vue.prototype.$uma = uma; Vue.prototype.$uma = uma;
} }
export default uma; export default uma;
// #endif

7
order/addCourse/addCourse.vue
Unescape View File

@ -67,7 +67,8 @@
value: 1 value: 1
}], }],
checked: uni.getStorageSync('courses') || [], // 已经勾选的集合 checked: uni.getStorageSync('courses') || [], // 已经勾选的集合
courses: uni.getStorageSync('courses') || [] courses: uni.getStorageSync('courses') || [],
submiting: false,
} }
}, },
watch: { watch: {
@ -259,6 +260,9 @@
submit() { submit() {
const list = this.checked // 已选产品 const list = this.checked // 已选产品
if (list.length) { if (list.length) {
if (this.submiting) return false
this.submiting = true
const result = this.courses const result = this.courses
const list1 = [] // 实训、理论 const list1 = [] // 实训、理论
const list0 = [] // 数据前瞻 const list0 = [] // 数据前瞻
@ -317,6 +321,7 @@
this.handleRenew(4, customerId, list4, result, resolve, reject) this.handleRenew(4, customerId, list4, result, resolve, reject)
})) }))
Promise.all(promises).then(_ => { Promise.all(promises).then(_ => {
this.submiting = false
uni.setStorageSync('courses', result) // 把选中的产品添加至缓存 uni.setStorageSync('courses', result) // 把选中的产品添加至缓存
uni.redirectTo({ uni.redirectTo({
url: `../editCourse/editCourse?customerId=${customerId}&orderType=${this.orderType}` url: `../editCourse/editCourse?customerId=${customerId}&orderType=${this.orderType}`

2
order/curClient/curClient.vue
Unescape View File

@ -216,8 +216,10 @@
margin-top: 20rpx; margin-top: 20rpx;
background-color: #fff; background-color: #fff;
.item { .item {
width: 100%;
padding: 20rpx 40rpx; padding: 20rpx 40rpx;
border-bottom: 1px solid #f1f1f1; border-bottom: 1px solid #f1f1f1;
box-sizing: border-box;
} }
.c-name { .c-name {
font-size: 30rpx; font-size: 30rpx;

22
order/orderDetail/orderDetail.vue
Unescape View File

@ -41,11 +41,11 @@
<uni-data-picker v-else class="picker-input" placeholder="请选择订单类型" popup-title="请选择订单类型" preload :clear-icon="false" :localdata="orderTypes" v-model="form.orderType" @change="calcTotal(1)"></uni-data-picker> <uni-data-picker v-else class="picker-input" placeholder="请选择订单类型" popup-title="请选择订单类型" preload :clear-icon="false" :localdata="orderTypes" v-model="form.orderType" @change="calcTotal(1)"></uni-data-picker>
</view> --> </view> -->
<template v-if="edited"> <template v-if="edited">
<view class="line"> <view v-if="form.orderNumber" class="line">
<view class="name">订单编号</view> <view class="name">订单编号</view>
<view class="val">{{ form.orderNumber }}</view> <view class="val">{{ form.orderNumber }}</view>
</view> </view>
<view class="line"> <view v-if="form.createTime" class="line">
<view class="name">订单时间</view> <view class="name">订单时间</view>
<view class="val">{{ form.createTime }}</view> <view class="val">{{ form.createTime }}</view>
</view> </view>
@ -57,8 +57,9 @@
</view> </view>
</view> </view>
<view id="products">
<template v-for="c in courseList"> <template v-for="c in courseList">
<view v-if="c.list.length" class="block pro-wrap" id="products"> <view v-if="c.list.length" class="block pro-wrap">
<view class="l-title">{{ c.name }}</view> <view class="l-title">{{ c.name }}</view>
<uni-icons class="arrow" type="top" size="20" color="#007EFF" @click="toggle(c)"></uni-icons> <uni-icons class="arrow" type="top" size="20" color="#007EFF" @click="toggle(c)"></uni-icons>
<ul class="pro-list" v-show="!c.shrink"> <ul class="pro-list" v-show="!c.shrink">
@ -133,6 +134,7 @@
</ul> </ul>
</view> </view>
</template> </template>
</view>
<view class="bottom"> <view class="bottom">
<template v-if="!edited && !orderId"> <template v-if="!edited && !orderId">
@ -293,6 +295,9 @@
} }
this.courseList = store this.courseList = store
this.courses = list this.courses = list
uni.pageScrollTo({
selector: '#products'
})
try { try {
uni.removeStorageSync('courses') uni.removeStorageSync('courses')
} catch (e) {} } catch (e) {}
@ -759,7 +764,18 @@
this.delShopCart(courses) this.delShopCart(courses)
uni.hideLoading() uni.hideLoading()
this.$util.sucMsg('添加成功') this.$util.sucMsg('添加成功')
// #ifdef MP-WEIXIN
this.publicNotice() this.publicNotice()
// #endif
// #ifdef MP-TOUTIAO
setTimeout(() => {
uni.switchTab({
url: '/pages/orders/orders'
})
}, 1500)
// #endif
}).catch(res => { }).catch(res => {
uni.hideLoading() uni.hideLoading()
}) })

2
order/productDetail/productDetail.vue
Unescape View File

@ -414,7 +414,7 @@
white-space: nowrap; white-space: nowrap;
} }
.des-html { .des-html {
width: 100%;; width: calc(100% - 140rpx);
font-size: 28rpx !important; font-size: 28rpx !important;
} }
.rich-text-content span { .rich-text-content span {

2
order/shopCart/shopCart.vue
Unescape View File

@ -259,10 +259,12 @@
li { li {
display: flex; display: flex;
align-items: center; align-items: center;
width: 100%;
padding: 30rpx 24rpx; padding: 30rpx 24rpx;
margin: 16rpx 24rpx; margin: 16rpx 24rpx;
background-color: #fff; background-color: #fff;
border-radius: 16rpx; border-radius: 16rpx;
box-sizing: border-box;
} }
.name { .name {
margin-bottom: 10rpx; margin-bottom: 10rpx;

81
pages/login/login.vue
Unescape View File

@ -26,7 +26,7 @@
</template> </template>
<script> <script>
import { login, userBinding, getSessionKey, queryPartnerAccount, douYinLogin, douYinLoginByOpenid } from '@/apis/modules/user.js' import { login, userBinding, getSessionKey, queryPartnerAccount, douYinLogin, douYinLoginByOpenid, douYinUserBinding } from '@/apis/modules/user.js'
import WXBizDataCrypt from '@/libs/WXBizDataCrypt' import WXBizDataCrypt from '@/libs/WXBizDataCrypt'
export default { export default {
data() { data() {
@ -75,40 +75,37 @@
if (code) { if (code) {
this.submiting = true this.submiting = true
let fn = login
let param = {
code,
avatarUrl: userInfo.avatarUrl
}
// 抖音登录 // 抖音登录
if (this.isDy) { if (this.isDy) {
fn = douYinLogin try {
param = code const res = await douYinLogin(code)
const res1 = await douYinLoginByOpenid('_000P6jr9bt8gW0ySNSzGsNBnCB0er4KtN3M') const { data, status } = res
uni.setStorageSync('token', res1.data.token) this.submiting = false
this.toIndex() this.sessionKey = data.sessionKey
// fn(param).then(async res => { this.openid = data.openid
// const { data, status } = res this.unionid = data.unionid
// this.submiting = false uni.setStorageSync('sessionKey', data.sessionKey)
// this.sessionKey = data.sessionKey uni.setStorageSync('openid', data.openid)
// this.openid = data.openid
// this.unionid = data.unionid
// uni.setStorageSync('sessionKey', data.sessionKey)
// uni.setStorageSync('openid', data.openid)
// const res1 = await douYinLoginByOpenid('_000P6jr9bt8gW0ySNSzGsNBnCB0er4KtN3M') // const res1 = await douYinLoginByOpenid('_000P6jr9bt8gW0ySNSzGsNBnCB0er4KtN3M')
// // 如果没有绑定手机号，则显示绑定按钮，引导用户绑定，否则，直接跳到首页 // 如果没有绑定手机号，则显示绑定按钮，引导用户绑定，否则，直接跳到首页
// // if (data.state === 'login') { if (data.state === 'login') {
// // this.toIndex() this.toIndex()
// // uni.setStorageSync('token', data.token) uni.setStorageSync('token', data.token)
// // } else {
// // this.isLogin = true
// // }
// }).catch(e => {
// this.submiting = false
// })
} else { } else {
fn(param).then((res) => { this.isLogin = true
// this.isReg = true
}
} catch (e) {
this.submiting = false
}
} else {
// 微信小程序登录
try {
const res = await login({
code,
avatarUrl: userInfo.avatarUrl
})
const { data, status } = res const { data, status } = res
this.submiting = false this.submiting = false
// 用户不存在，则让用户授权手机号，直接去注册 // 用户不存在，则让用户授权手机号，直接去注册
@ -141,11 +138,10 @@
this.isLogin = true this.isLogin = true
} }
} }
}).catch(e => { } catch (e) {
this.submiting = false this.submiting = false
})
} }
}
} else { } else {
this.submiting = false this.submiting = false
that.$util.errMsg('登录失败！') that.$util.errMsg('登录失败！')
@ -162,14 +158,12 @@
} }
}, },
// 绑定手机号 // 绑定手机号
onGetPhoneNumber(e){ async onGetPhoneNumber(e){
if (this.submiting) return false if (this.submiting) return false
const { encryptedData, iv } = e.detail const { encryptedData, iv } = e.detail
// 获取手机号有两种方法，1.前端使用js完成；2.使用接口完成 (抖音) // 获取手机号有两种方法，1.前端使用js完成；2.使用接口完成 (抖音)
const appId = this.isDy ? 'tt2192572fbea04fe601' : uni.getAccountInfoSync().miniProgram.appId const appId = this.isDy ? 'tt2192572fbea04fe601' : uni.getAccountInfoSync().miniProgram.appId
console.log(1121, appId, this.sessionKey)
const pc = new WXBizDataCrypt(appId , this.sessionKey) const pc = new WXBizDataCrypt(appId , this.sessionKey)
console.log(22, pc, encryptedData, e)
const data = pc.decryptData(encryptedData , iv) const data = pc.decryptData(encryptedData , iv)
this.submiting = true this.submiting = true
const phone = data.phoneNumber const phone = data.phoneNumber
@ -177,12 +171,14 @@
this.submiting = false this.submiting = false
this.$util.to(`../reg/reg?openid=${this.openid}&phone=${phone}`) this.$util.to(`../reg/reg?openid=${this.openid}&phone=${phone}`)
} else { // 登录绑定手机号 } else { // 登录绑定手机号
userBinding({ try {
const fn = this.isDy ? douYinUserBinding : userBinding
const res = await fn({
openid: this.openid, openid: this.openid,
phone, phone,
unionid: this.unionid, unionid: this.unionid,
platformId: 4 platformId: 4
}).then(res => { })
const { token, status } = res const { token, status } = res
if (status == 10014) { if (status == 10014) {
// 这里需要再调一次uni的login，因为code用过了一次，已经失效了 // 这里需要再调一次uni的login，因为code用过了一次，已经失效了
@ -203,13 +199,13 @@
uni.setStorageSync('token', token) uni.setStorageSync('token', token)
this.toIndex() this.toIndex()
} }
}).catch(e => { } catch (e) {
this.submiting = false this.submiting = false
uni.showToast({ uni.showToast({
title: e.message, title: e.message,
icon: 'none' icon: 'none'
}) })
}) }
} }
}, },
// 注册申请授权 // 注册申请授权
@ -221,7 +217,6 @@
lang: 'zh_CN', lang: 'zh_CN',
desc: '登录', desc: '登录',
success: ({ userInfo }) => { success: ({ userInfo }) => {
console.log(22, userInfo)
uni.setStorageSync('userName', userInfo.nickName) uni.setStorageSync('userName', userInfo.nickName)
uni.setStorageSync('avatar', userInfo.avatarUrl) uni.setStorageSync('avatar', userInfo.avatarUrl)
uni.login({ uni.login({
@ -231,12 +226,10 @@
getSessionKey({ getSessionKey({
code, code,
}).then(({ sessionKey }) => { }).then(({ sessionKey }) => {
console.log(11, sessionKey)
this.sessionKey = sessionKey.session_key this.sessionKey = sessionKey.session_key
this.openid = sessionKey.openid this.openid = sessionKey.openid
this.submiting = false this.submiting = false
this.isLogin = true this.isLogin = true
}).catch(e => { }).catch(e => {
this.submiting = false this.submiting = false
}) })
@ -256,7 +249,7 @@
} }
}, },
toAgreement(id) { toAgreement(id) {
this.$util.openFile(id) this.$util.to(id ? `/order/privacyAgreement/privacyAgreement` : `/order/serviceAgreement/serviceAgreement`)
}, },
// 跳转到首页 // 跳转到首页
toIndex() { toIndex() {

4
pages/orders/orders.vue
Unescape View File

@ -148,7 +148,6 @@
} }
}, },
onShow() { onShow() {
this.$uma.trackEvent('order') // 友盟统计
this.per = true this.per = true
// 清除订单缓存 // 清除订单缓存
try { try {
@ -156,6 +155,7 @@
uni.removeStorageSync('courses') uni.removeStorageSync('courses')
} catch (e) {} } catch (e) {}
this.initRole() this.initRole()
this.$uma.trackEvent('order') // 友盟统计
}, },
methods: { methods: {
// 初始化权限 // 初始化权限
@ -299,8 +299,10 @@
margin-top: 20rpx; margin-top: 20rpx;
background-color: #fff; background-color: #fff;
.item { .item {
width: 100%;
padding: 20rpx 40rpx; padding: 20rpx 40rpx;
border-bottom: 1px solid #f1f1f1; border-bottom: 1px solid #f1f1f1;
box-sizing: border-box;
} }
.c-name { .c-name {
font-size: 30rpx; font-size: 30rpx;

3
pages/person/person.vue
Unescape View File

@ -314,7 +314,10 @@
} }
.bg { .bg {
width: 100%; width: 100%;
height: calc(var(--status-bar-height) + 250rpx);
// #ifdef MP-WEIXIN
height: calc(var(--status-bar-height) + 317rpx); height: calc(var(--status-bar-height) + 317rpx);
// #endif
} }
.wrap { .wrap {
position: relative; position: relative;

17
pages/reg/reg.vue
Unescape View File

@ -33,6 +33,7 @@
export default { export default {
data() { data() {
return { return {
isDy: uni.getSystemInfoSync().uniPlatform === 'mp-toutiao', // 抖音小程序标识
openid: '', openid: '',
phone: '', phone: '',
my: false, my: false,
@ -60,7 +61,11 @@
// 检查登录状态 // 检查登录状态
checkLogin() { checkLogin() {
// 根据手机号获取是否注册过，如果有，则判断是否是队长（isTeam 1：队长，0：成员），如果没有返回team，则注册 // 根据手机号获取是否注册过，如果有，则判断是否是队长（isTeam 1：队长，0：成员），如果没有返回team，则注册
queryPartnerAccount(this.phone).then(({ team, username }) => { queryPartnerAccount({
phone: this.phone,
openId: this.isDy ? '' : this.openid,
douYinOpenId: this.isDy ? this.openid : '',
}).then(({ team, username }) => {
if (team) { if (team) {
team.teamId && uni.setStorageSync('teamId', team.teamId) team.teamId && uni.setStorageSync('teamId', team.teamId)
this.form.userName = team.userName this.form.userName = team.userName
@ -97,21 +102,20 @@
if (val) this.form.cityId = '' if (val) this.form.cityId = ''
}, },
// 提交 // 提交
submit() { async submit() {
const { form } = this const { form } = this
if (!form.userName) return this.$util.errMsg('请输入姓名！') if (!form.userName) return this.$util.errMsg('请输入姓名！')
if (!form.provinceId) return this.$util.errMsg('请选择意向省份！') if (!form.provinceId) return this.$util.errMsg('请选择意向省份！')
if (!form.cityId) return this.$util.errMsg('请选择意向城市！') if (!form.cityId) return this.$util.errMsg('请选择意向城市！')
form.phone = this.phone form.phone = this.phone
form.appOpenId = this.openid form[this.isDy ? 'douYinOpenId' : 'appOpenId'] = this.openid
form.uniqueIdentification = Date.now() form.uniqueIdentification = Date.now()
if (form.isTeam) { // 队长，直接登录 if (form.isTeam) { // 队长，直接登录
loginByOpenid(this.openid).then(({ data }) => { const { data } = await loginByOpenid(this.openid)
uni.setStorageSync('token', data.token) uni.setStorageSync('token', data.token)
this.toIndex() this.toIndex()
}).catch(res => {})
} else { // 新用户，注册。or 成员，创建自己的团队 } else { // 新用户，注册。or 成员，创建自己的团队
partnerAccountApplication(form).then(({ token, teamId }) => { const { token, teamId } = await partnerAccountApplication(form)
this.$util.sucMsg(form.isTeam === 0 ? '创建成功' : '注册成功') this.$util.sucMsg(form.isTeam === 0 ? '创建成功' : '注册成功')
// 如果返回了token，直接登录，并且把teamId存在缓存里，到了首页后直接选中该团队 // 如果返回了token，直接登录，并且把teamId存在缓存里，到了首页后直接选中该团队
if (token) { if (token) {
@ -127,7 +131,6 @@
}) })
}, 1500) }, 1500)
} }
}).catch(res => {})
} }
}, },
// 跳转到首页 // 跳转到首页

6
team/qrcode/qrcode.vue
Unescape View File

@ -11,7 +11,7 @@
</view> </view>
</view> </view>
<view class="com">{{ team.partnerClassificationName }}</view> <view class="com">{{ team.partnerClassificationName }}</view>
<u-qrcode class="qrcode" ref="qrcode" canvas-id="qrcode" isQueueLoadImage :size="size" :value="link" @complete="qrcodeComplete"></u-qrcode> <u-qrcode v-if="link" class="qrcode" ref="qrcode" canvas-id="qrcode" isQueueLoadImage :size="size" :value="link" @complete="qrcodeComplete"></u-qrcode>
<image class="qrcode-img" :src="qrcodeImg" show-menu-by-longpress @click="previewImage"></image> <image class="qrcode-img" :src="qrcodeImg" show-menu-by-longpress @click="previewImage"></image>
<view class="tips" style="margin-top: 20rpx;">扫一扫，加入我们吧</view> <view class="tips" style="margin-top: 20rpx;">扫一扫，加入我们吧</view>
@ -69,9 +69,13 @@
}, },
// 二维码组件生成完成钩子。生成后把图片导出给image组件，image组件才可以长按二维码转发 // 二维码组件生成完成钩子。生成后把图片导出给image组件，image组件才可以长按二维码转发
qrcodeComplete() { qrcodeComplete() {
console.log('complete', this.$refs.qrcode.toTempFilePath, this.link)
this.$refs.qrcode.toTempFilePath({ this.$refs.qrcode.toTempFilePath({
success: res => { success: res => {
this.qrcodeImg = res.tempFilePath this.qrcodeImg = res.tempFilePath
},
fail: res => {
console.log('fail', res)
} }
}); });
}, },

Write Preview
Loading…
Cancel
Save