huoran
/
FE_nakadai_miniProgram
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Compare commits

base: huoran:V1.0.1
Branches Tags
huoran:master
..
compare: huoran:master
Branches Tags
huoran:master

5 Commits
V1.0.1 ... master

Author SHA1 Message Date
yujialong 872f96d9d4 fix
2 weeks ago
yujialong 1a7f42cc24 fix
6 months ago
yujialong b1b7840730 fix
1 year ago
yujialong 045748284c 订单修改
1 year ago
yujialong bb1ed11a1d fix
1 year ago
13 changed files with 226 additions and 195 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
  1. 4
      apis/modules/user.js
  2. 25
      apis/request.js
  3. 4
      config/request.js
  4. 10
      libs/util.js
  5. 9
      order/addCourse/addCourse.vue
  6. 5
      order/curClient/curClient.vue
  7. 27
      order/editCourse/editCourse.vue
  8. 80
      order/orderDetail/orderDetail.vue
  9. 5
      order/orders/orders.vue
  10. 8
      order/products/products.vue
  11. 2
      pages/index/index.vue
  12. 6
      pages/login/login.vue
  13. 2
      team/setting/setting.vue

4
apis/modules/user.js
Unescape View File

@ -9,6 +9,10 @@ export const userBinding = (data) => {
return post('users/users/user/userBinding', data) return post('users/users/user/userBinding', data)
} }
export const sendPhoneOrEmailCode = (data) => {
return post('users/users/userAccount/sendPhoneOrEmailCode', data)
}
export const queryProvince = () => { export const queryProvince = () => {
return get('nakadai/nakadai/province/queryProvince') return get('nakadai/nakadai/province/queryProvince')
} }

25
apis/request.js
Unescape View File

@ -1,16 +1,7 @@
import config from '@/config/request' import config from '@/config/request'
let HTTP_COUNT = 0 // loading次数 let logouted = 0
const request = options => { const request = options => {
HTTP_COUNT++
if (config.showLoading) {
// 请求数据时的loading
// uni.showToast({
// title: '加载中',
// duration: 200,
// icon: 'loading'
// })
}
const header = Object.assign({}, config.headers, { const header = Object.assign({}, config.headers, {
token: uni.getStorageSync('token') token: uni.getStorageSync('token')
}) })
@ -29,6 +20,7 @@ const request = options => {
if (status === 200) { if (status === 200) {
resolve(data) resolve(data)
} else if (status == 401) { } else if (status == 401) {
if (!logouted) {
// 登录过期 // 登录过期
uni.clearStorageSync() uni.clearStorageSync()
uni.showToast({ uni.showToast({
@ -36,11 +28,14 @@ const request = options => {
icon: 'none' icon: 'none'
}) })
setTimeout(() => { setTimeout(() => {
uni.navigateTo({ logouted = 0
url: '../login/login' uni.reLaunch({
url: '/pages/index/index'
}) })
}, 1500) }, 1500)
reject(data) reject(data)
logouted = 1
}
} else if (!status) { } else if (!status) {
resolve(data) resolve(data)
} else { } else {
@ -58,12 +53,6 @@ const request = options => {
}) })
reject(err) reject(err)
}, },
complete: () => {
if (config.showLoading) {
// HTTP_COUNT--
// HTTP_COUNT || uni.hideLoading()
}
}
}) })
}) })
} }

4
config/request.js
Unescape View File

@ -5,8 +5,8 @@
*/ */
export default { export default {
baseURL: 'https://huorantech.cn/', baseURL: 'https://www.occupationlab.com/',
// baseURL: 'http://192.168.31.151:9000/', // baseURL: 'http://192.168.31.51:9000/',
// baseURL: 'http://121.37.12.51/', // baseURL: 'http://121.37.12.51/',
headers: { headers: {
'Content-Type': 'application/json;charset=UTF-8' 'Content-Type': 'application/json;charset=UTF-8'

10
libs/util.js
Unescape View File

@ -1,11 +1,11 @@
import Product from '@/config/product' import Product from '@/config/product'
const files = [ const files = [
'https://huorantech.cn/%E7%94%A8%E6%88%B7%E6%9C%8D%E5%8A%A1%E5%8D%8F%E8%AE%AE.docx', // 用户服务协议 'https://huoran.oss-cn-shenzhen.aliyuncs.com/1709798714897.docx', // 用户服务协议
'https://huorantech.cn/%E7%94%A8%E6%88%B7%E9%9A%90%E7%A7%81%E5%8D%8F%E8%AE%AE.docx', // 用户隐私协议 'https://huoran.oss-cn-shenzhen.aliyuncs.com/1709798737175.docx', // 用户隐私协议
'https://huorantech.cn/%E4%BA%BA%E5%B7%A5%E6%99%BA%E8%83%BD%E5%AE%9E%E9%AA%8C%E5%AE%A4%E5%BB%BA%E8%AE%BE%E6%96%B9%E6%A1%88-2020.1.docx', // 人工智能 'https://huoran.oss-cn-shenzhen.aliyuncs.com/1709798668435.docx', // 人工智能
'https://huorantech.cn/%E5%A4%A7%E6%95%B0%E6%8D%AE%E7%AE%A1%E7%90%86%E4%B8%8E%E5%BA%94%E7%94%A8%E4%B8%93%E4%B8%9A%E5%BB%BA%E8%AE%BE%E6%96%B9%E6%A1%88.docx', // 大数据 'https://huoran.oss-cn-shenzhen.aliyuncs.com/1709798621083.docx', // 大数据
'https://huorantech.cn/%E9%87%91%E8%9E%8D%E7%A7%91%E6%8A%80%E5%AE%9E%E9%AA%8C%E5%AE%A4%E5%BB%BA%E8%AE%BE%E6%96%B9%E6%A1%88V2.0.docx', // 金融科技 'https://huoran.oss-cn-shenzhen.aliyuncs.com/1709798646462.docx', // 金融科技
] ]
export default { export default {
// 路由跳转 // 路由跳转

9
order/addCourse/addCourse.vue
Unescape View File

@ -18,7 +18,7 @@
<li v-for="(item, i) in list"> <li v-for="(item, i) in list">
<uni-data-checkbox v-if="item.check" class="check" multiple :value="[1]" :localdata="item.checkData" @change="e => checkChange(e, i)"></uni-data-checkbox> <uni-data-checkbox v-if="item.check" class="check" multiple :value="[1]" :localdata="item.checkData" @change="e => checkChange(e, i)"></uni-data-checkbox>
<uni-data-checkbox v-else class="check" multiple v-model="item.check" :localdata="item.checkData" @change="e => checkChange(e, i)"></uni-data-checkbox> <uni-data-checkbox v-else class="check" multiple v-model="item.check" :localdata="item.checkData" @change="e => checkChange(e, i)"></uni-data-checkbox>
<image class="icon" :src="$util.getIcon(item)" mode="widthFix"></image> <image class="icon" :src="$util.getIcon(item)"></image>
{{ item.productName }} {{ item.productName }}
</li> </li>
</ul> </ul>
@ -214,6 +214,7 @@
dataOrCourseId: e.associatedProduct, // id dataOrCourseId: e.associatedProduct, // id
mallId: e.mallId, mallId: e.mallId,
productName: e.productName, // 名称 productName: e.productName, // 名称
typeName: e.typeName, // 产品类型
periodOfUse: '', // 使用期限 periodOfUse: '', // 使用期限
startTime: this.$util.formatDate(new Date(), 'yyyy-MM-dd'), // 开始 startTime: this.$util.formatDate(new Date(), 'yyyy-MM-dd'), // 开始
endTime: '', // 终止 endTime: '', // 终止
@ -233,7 +234,8 @@
settlementPrice: trial ? 0 : '', // 结算价 settlementPrice: trial ? 0 : '', // 结算价
settlementPriceUnit: e.settlementPrice || 0, // 结算单价 settlementPriceUnit: e.settlementPrice || 0, // 结算单价
serviceFee: 0, // 平台服务费（前端计算后展示，不入库） serviceFee: 0, // 平台服务费（前端计算后展示，不入库）
mallNonAssociatedLinks: e.mallNonAssociatedLinks // 产品链接 mallNonAssociatedLinks: e.mallNonAssociatedLinks, // 产品链接
typeName: e.typeName
} }
}, },
// 判断是否为客户已有的课程 // 判断是否为客户已有的课程
@ -361,7 +363,10 @@
} }
.icon { .icon {
width: 80rpx; width: 80rpx;
min-width: 80rpx;
height: 80rpx;
margin: 0 20rpx; margin: 0 20rpx;
border-radius: 4px;
} }
} }
/deep/.check { /deep/.check {

5
order/curClient/curClient.vue
Unescape View File

@ -134,6 +134,11 @@
this.customerId = options.customerId this.customerId = options.customerId
this.customerName = options.name this.customerName = options.name
this.initList() this.initList()
// 清除订单缓存
try {
uni.removeStorageSync('courses')
uni.removeStorageSync('orderEdited')
} catch (e) {}
}, },
methods: { methods: {
getList() { getList() {

27
order/editCourse/editCourse.vue
Unescape View File

@ -1,11 +1,12 @@
<template> <template>
<view class="page"> <view class="page">
<template v-for="c in courses"> <template v-for="c in courses">
<view v-if="c.list.length" class="block"> <view v-if="c.list.length && c.list.filter(e => !e.edited).length" class="block">
<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>
<view v-show="!c.shrink"> <view v-show="!c.shrink">
<view v-for="(item, i) in c.list"> <template v-for="(item, i) in c.list">
<view v-if="!item.edited" :key="i">
<view class="pro-name"> <view class="pro-name">
<view class="left"> <view class="left">
<image class="icon" :src="$util.getIcon(item)" mode="widthFix"></image> <image class="icon" :src="$util.getIcon(item)" mode="widthFix"></image>
@ -16,7 +17,7 @@
<view class="form-list"> <view class="form-list">
<view class="line"> <view class="line">
<view class="name">产品类型</view> <view class="name">产品类型</view>
<view class="val">{{ productTypes.find(e => e.id === item.productType).name }}</view> <view class="val">{{ item.typeName }}</view>
</view> </view>
<view :class="['line', {err: err === 'periodOfUse' + item.dataOrCourseId + item.authority}]"> <view :class="['line', {err: err === 'periodOfUse' + item.dataOrCourseId + item.authority}]">
<view class="name">使用期限</view> <view class="name">使用期限</view>
@ -74,6 +75,7 @@
</view> </view>
</view> </view>
</view> </view>
</template>
</view> </view>
</view> </view>
</template> </template>
@ -86,7 +88,7 @@
<script> <script>
import { getOrderOtherTime } from '@/apis/modules/order.js' import { getOrderOtherTime } from '@/apis/modules/order.js'
import { getPartnerTeamRates } from '@/apis/modules/parner.js' import { getPartnerTeamRates } from '@/apis/modules/parner.js'
import { productCategoryList } from '@/apis/modules/product.js' import { productCategoryList, productTypeList } from '@/apis/modules/product.js'
export default { export default {
data() { data() {
return { return {
@ -133,23 +135,22 @@
methods: { methods: {
// 转换产品列表 // 转换产品列表
handleProduct() { handleProduct() {
// 产品类型
productTypeList().then(res => {
this.productTypes = res.typeList
}).catch(e => {})
const list = uni.getStorageSync('courses') const list = uni.getStorageSync('courses')
let courses = {} let courses = {}
// 产品分类 // 产品分类
productCategoryList().then(res => { productCategoryList().then(res => {
const typeList = []
res.classificationList.forEach(e => { res.classificationList.forEach(e => {
typeList.push({
id: e.classificationId,
name: e.classificationName
})
courses['list' + this.$util.getOrderType(e.classificationId)] = { courses['list' + this.$util.getOrderType(e.classificationId)] = {
shrink: false, shrink: false,
name: e.classificationName, name: e.classificationName,
list: [] list: []
} }
}) })
this.productTypes = typeList
list.map(e => { list.map(e => {
courses['list' + e.authority].list.push(e) courses['list' + e.authority].list.push(e)
}) })
@ -249,9 +250,9 @@
}, },
// 计算结算价及平台服务费 // 计算结算价及平台服务费
dealSettlePrice(row) { dealSettlePrice(row) {
// 如果是试用，结算价和平台服务费都是0 // 如果是试用或者没选择，结算价和平台服务费都是0
console.log('dealSettlePrice=>', row, this.orderType) console.log('dealSettlePrice=>', row, this.orderType)
if (this.orderType == 2) { if (this.orderType != 1) {
row.settlementPrice = 0 row.settlementPrice = 0
row.serviceFee = 0 row.serviceFee = 0
} else { } else {
@ -365,10 +366,12 @@
msg = '请输入成交价！' msg = '请输入成交价！'
break break
} }
e.edited = 1 // 未编辑过的标识，编辑过了的产品在编辑产品页不再显示
} }
if (msg) return this.$util.errMsg(msg) if (msg) return this.$util.errMsg(msg)
if (this.orderRepeat.length) return this.$util.errMsg(this.repeatMsg) // 有重复订单不能提交 if (this.orderRepeat.length) return this.$util.errMsg(this.repeatMsg) // 有重复订单不能提交
uni.setStorageSync('courses', this.courses) uni.setStorageSync('courses', this.courses)
uni.setStorageSync('orderEdited', 1)
uni.navigateBack() uni.navigateBack()
}, },
} }

80
order/orderDetail/orderDetail.vue
Unescape View File

@ -8,7 +8,6 @@
<view v-if="orderId" class="val">{{ form.customerName }}</view> <view v-if="orderId" class="val">{{ form.customerName }}</view>
<view v-else class="customer-wrap"> <view v-else class="customer-wrap">
<view :class="['ph', {val: form.customerName}]" @click="customerVisible = true">{{ form.customerName || '请选择客户' }}</view> <view :class="['ph', {val: form.customerName}]" @click="customerVisible = true">{{ form.customerName || '请选择客户' }}</view>
<view class="create" @click="toClient">找不到客户？马上创建</view>
</view> </view>
</view> </view>
<view class="line" v-if="form.customerName"> <view class="line" v-if="form.customerName">
@ -46,6 +45,7 @@
<view v-if="isDetail" class="val">{{ form.businessManagerName }}</view> <view v-if="isDetail" class="val">{{ form.businessManagerName }}</view>
<uni-data-picker v-else class="picker-input" placeholder="请选择商务经理" popup-title="请选择商务经理" preload :localdata="bms" :map="{text: 'userName', value: 'partnerId'}" v-model="form.businessManagerId" :readonly="form.teamId ? false : true"></uni-data-picker> <uni-data-picker v-else class="picker-input" placeholder="请选择商务经理" popup-title="请选择商务经理" preload :localdata="bms" :map="{text: 'userName', value: 'partnerId'}" v-model="form.businessManagerId" :readonly="form.teamId ? false : true"></uni-data-picker>
</view> </view>
<template v-if="edited">
<view class="line"> <view class="line">
<view class="name">订单编号</view> <view class="name">订单编号</view>
<view class="val">{{ form.orderNumber }}</view> <view class="val">{{ form.orderNumber }}</view>
@ -58,6 +58,7 @@
<view class="name">订单金额（元）</view> <view class="name">订单金额（元）</view>
<view class="val">{{ form.orderAmount }}</view> <view class="val">{{ form.orderAmount }}</view>
</view> </view>
</template>
</view> </view>
</view> </view>
@ -81,7 +82,7 @@
<button v-if="auth('订单管理:发货')" class="course-btn" type="primary" @click.stop="handleDeliver(n, i)">{{ item.ship ? '取消' : ''}}发货</button> <button v-if="auth('订单管理:发货')" class="course-btn" type="primary" @click.stop="handleDeliver(n, i)">{{ item.ship ? '取消' : ''}}发货</button>
</template> </template>
<button v-else-if="!isDetail && auth('订单管理:启用')" class="course-btn" type="primary" @click.stop="handleEnable(n, i)">{{ item.isEnable ? '禁用' : '启用'}}</button> <button v-else-if="!isDetail && auth('订单管理:启用')" class="course-btn" type="primary" @click.stop="handleEnable(n, i)">{{ item.isEnable ? '禁用' : '启用'}}</button>
<button v-if="auth('订单管理:发货') && (item.authority == 3 || item.authority == 4) && (!isDetail || (isDetail && item.shipContent))" class="course-btn mg" type="primary" @click.stop="showShip(item)">发货信息</button> <button v-if="auth('订单管理:发货') && (item.authority == 0 || item.authority == 3 || item.authority == 4) && (!isDetail || (isDetail && item.shipContent))" class="course-btn mg" type="primary" @click.stop="showShip(item)">发货信息</button>
<image v-if="!orderId || isRenew || isHandle" class="del" src="@/static/image/trash.png" mode="widthFix" @click.stop="delCourse(c, i)"></image> <image v-if="!orderId || isRenew || isHandle" class="del" src="@/static/image/trash.png" mode="widthFix" @click.stop="delCourse(c, i)"></image>
</view> </view>
</view> </view>
@ -137,7 +138,7 @@
</view> </view>
<view :class="['line req', {err: err === 'finalPrice' + item.dataOrCourseId + item.authority}]"> <view :class="['line req', {err: err === 'finalPrice' + item.dataOrCourseId + item.authority}]">
<view class="label">成交价</view> <view class="label">成交价</view>
<view v-if="isDetail || (isEdit && !item.authority)" class="ph">{{ item.finalPrice }}</view> <view v-if="isDetail" class="ph">{{ item.finalPrice }}</view>
<view class="inline" v-else> <view class="inline" v-else>
<input type="number" v-model="item.finalPrice" placeholder="请输入" @input="calcFinalValue(item)" @change="handleErr(item, 'finalPrice')"> <input type="number" v-model="item.finalPrice" placeholder="请输入" @input="calcFinalValue(item)" @change="handleErr(item, 'finalPrice')">
元 元
@ -150,8 +151,14 @@
</template> </template>
<view class="bottom"> <view class="bottom">
<template v-if="!edited && !orderId">
<view class="next-wrap">
<view class="lg-btn next" @click="toAdd(0)">下一步</view>
</view>
</template>
<template v-else>
<view v-if="!orderId || isHandle" class="add-wrap"> <view v-if="!orderId || isHandle" class="add-wrap">
<view class="add-btn" @click="toAdd"> <view class="lg-btn" @click="toAdd">
<uni-icons class="icon" type="plus" color="#007FFF"></uni-icons> <uni-icons class="icon" type="plus" color="#007FFF"></uni-icons>
添加产品 添加产品
</view> </view>
@ -177,6 +184,7 @@
<view v-if="auth('订单管理:发货') && (isHandle || (!orderId && courses.length))" class="btn" @click="batchDeliver">{{ courses.find(e => !e.ship) ? '一键发货' : '取消全部发货' }}</view> <view v-if="auth('订单管理:发货') && (isHandle || (!orderId && courses.length))" class="btn" @click="batchDeliver">{{ courses.find(e => !e.ship) ? '一键发货' : '取消全部发货' }}</view>
</view> </view>
</view> </view>
</template>
</view> </view>
<view v-if="isDetail" class="action"> <view v-if="isDetail" class="action">
@ -186,7 +194,7 @@
<uni-icons class="icon" custom-prefix="iconfont" type="icon-edit" size="30" color="#959595"></uni-icons> <uni-icons class="icon" custom-prefix="iconfont" type="icon-edit" size="30" color="#959595"></uni-icons>
<view class="text">修改</view> <view class="text">修改</view>
</view> </view>
<view class="item" v-if="auth('订单管理:续费')" @click="toAction(`../orderDetail/orderDetail?orderId=${orderId}&action=renew`)"> <view class="item" @click="toAction(`../orderDetail/orderDetail?orderId=${orderId}&action=renew`)">
<uni-icons class="icon" custom-prefix="iconfont" type="icon-product" size="30" color="#959595"></uni-icons> <uni-icons class="icon" custom-prefix="iconfont" type="icon-product" size="30" color="#959595"></uni-icons>
<view class="text">续费</view> <view class="text">续费</view>
</view> </view>
@ -207,6 +215,7 @@
<view class="top">请选择客户</view> <view class="top">请选择客户</view>
<uni-icons class="close" type="closeempty" size="20" @click="closeCustomer"></uni-icons> <uni-icons class="close" type="closeempty" size="20" @click="closeCustomer"></uni-icons>
<uni-search-bar class="search" radius="5" placeholder="请输入客户名称" v-model="keyword" clearButton="auto" cancelButton="none" /> <uni-search-bar class="search" radius="5" placeholder="请输入客户名称" v-model="keyword" clearButton="auto" cancelButton="none" />
<view class="create" @click="toClient">找不到客户？马上创建</view>
<view class="list"> <view class="list">
<view class="item" v-for="item in customerList" @click="customerChange(item)">{{ item.customerName }}</view> <view class="item" v-for="item in customerList" @click="customerChange(item)">{{ item.customerName }}</view>
</view> </view>
@ -242,6 +251,7 @@
isEdit: 0, // 编辑 isEdit: 0, // 编辑
isHandle: 0, // 处理 isHandle: 0, // 处理
isRenew: 0, // 续费 isRenew: 0, // 续费
edited: false,
orderId: '', orderId: '',
orderTypes: [{ orderTypes: [{
text: '正式', text: '正式',
@ -328,6 +338,7 @@
this.isEdit = action === 'edit' this.isEdit = action === 'edit'
this.isHandle = action === 'handle' this.isHandle = action === 'handle'
this.isRenew = action === 'renew' this.isRenew = action === 'renew'
this.edited = uni.getStorageSync('orderEdited')
const store = uni.getStorageSync('courses') const store = uni.getStorageSync('courses')
this.getTeam(!store) this.getTeam(!store)
if (store) { if (store) {
@ -338,11 +349,11 @@
} }
this.courseList = store this.courseList = store
this.courses = list this.courses = list
this.$nextTick(() => { // this.$nextTick(() => {
uni.pageScrollTo({ // uni.pageScrollTo({
selector: '#products', // selector: '#products',
}) // })
}) // })
try { try {
uni.removeStorageSync('courses') uni.removeStorageSync('courses')
} catch (e) {} } catch (e) {}
@ -382,7 +393,7 @@
const item = this.teams.find(e => e.id == teamId) const item = this.teams.find(e => e.id == teamId)
if (item) this.form.partnerClassificationName = item.partnerClassificationName if (item) this.form.partnerClassificationName = item.partnerClassificationName
if (!this.isDetail) { if (!this.isDetail) {
this.form.businessManagerId = +this.form.businessManagerId if (this.form.businessManagerId) this.form.businessManagerId = +this.form.businessManagerId
this.getBm() this.getBm()
} }
} }
@ -837,8 +848,8 @@
}, 500) }, 500)
}, },
dealSettlePrice(row) { dealSettlePrice(row) {
// 如果是试用，结算价和平台服务费都是0 // 如果是试用或者没选择，结算价和平台服务费都是0
if (this.form.orderType == 2) { if (this.form.orderType != 1) {
row.settlementPrice = 0 row.settlementPrice = 0
row.serviceFee = 0 row.serviceFee = 0
} else { } else {
@ -997,11 +1008,12 @@
.customer-wrap { .customer-wrap {
text-align: right; text-align: right;
} }
.create { }
margin-top: 10rpx; .create {
padding: 0 20rpx;
font-size: 20rpx; font-size: 20rpx;
text-align: right;
color: #f00; color: #f00;
}
} }
.pro-wrap { .pro-wrap {
position: relative; position: relative;
@ -1059,13 +1071,16 @@
.line { .line {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
padding: 12rpx 0; padding: 28rpx 0;
margin: 5px 0;
font-size: 12px; font-size: 12px;
border-bottom: 1px solid #E6E8ED;
&:last-child {
border-bottom: 0;
}
} }
.label { .label {
font-size: 28rpx; font-size: 28rpx;
color: #999; color: #333;
} }
.ph { .ph {
font-size: 28rpx; font-size: 28rpx;
@ -1086,6 +1101,12 @@
font-size: 32rpx; font-size: 32rpx;
color: #007EFF; color: #007EFF;
} }
.period {
flex: none;
width: 100rpx;
font-size: 28rpx;
text-align: center;
}
} }
.bottom { .bottom {
z-index: 2; z-index: 2;
@ -1096,12 +1117,14 @@
background-color: #fff; background-color: #fff;
box-shadow: 0 -2px 2px #f5f5f5; box-shadow: 0 -2px 2px #f5f5f5;
box-sizing: border-box; box-sizing: border-box;
} .add-wrap {
.add-wrap {
padding: 16rpx 24rpx 40rpx; padding: 16rpx 24rpx 40rpx;
background-color: #f5f5f5; background-color: #f5f5f5;
} }
/deep/.add-btn { .next-wrap {
padding: 24rpx 24rpx 0;
}
/deep/.lg-btn {
display: flex; display: flex;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
@ -1117,6 +1140,11 @@
.uni-icons { .uni-icons {
font-size: 38rpx !important; font-size: 38rpx !important;
} }
&.next {
color: #fff;
background-color: #007EFF;
}
}
} }
.product { .product {
display: flex; display: flex;
@ -1220,12 +1248,6 @@
margin-left: 10rpx; margin-left: 10rpx;
} }
} }
.period {
flex: none;
width: 100rpx;
font-size: 28rpx;
text-align: center;
}
.ship-info { .ship-info {
height: 400rpx; height: 400rpx;
padding: 30rpx; padding: 30rpx;

5
order/orders/orders.vue
Unescape View File

@ -145,9 +145,10 @@
} }
}, },
onShow() { onShow() {
// 清除产品缓存 // 清除订单缓存
try { try {
uni.removeStorageSync('courses') uni.removeStorageSync('courses')
uni.removeStorageSync('orderEdited')
} catch (e) {} } catch (e) {}
this.initList() this.initList()
}, },
@ -214,7 +215,7 @@
}, },
// 跳转详情 // 跳转详情
toDetail(item) { toDetail(item) {
if(!this.auth('订单管理:查看')) return // if(!this.auth('订单管理:查看')) return
this.$util.to(`../orderDetail/orderDetail?orderId=${item.orderId}&show=1`) this.$util.to(`../orderDetail/orderDetail?orderId=${item.orderId}&show=1`)
}, },
// 删除 // 删除

8
order/products/products.vue
Unescape View File

@ -18,7 +18,7 @@
<ul class="list"> <ul class="list">
<li v-for="item in list"> <li v-for="item in list">
<view class="pro-name"> <view class="pro-name">
<image class="icon" :src="$util.getIcon(item)" mode="widthFix"></image> <image class="icon" :src="$util.getIcon(item)"></image>
{{ item.productName }} {{ item.productName }}
</view> </view>
<view class="info"> <view class="info">
@ -188,11 +188,13 @@
align-items: center; align-items: center;
padding: 18rpx 0; padding: 18rpx 0;
font-size: 30rpx; font-size: 30rpx;
font-weight: 600;
color: #333; color: #333;
border-bottom: 1px solid #E6E8ED; border-bottom: 1px solid #E6E8ED;
.icon { .icon {
width: 52rpx; width: 58rpx;
height: 52rpx; min-width: 58rpx;
height: 58rpx;
margin-right: 20rpx; margin-right: 20rpx;
} }
} }

2
pages/index/index.vue
Unescape View File

@ -19,7 +19,7 @@
<image class="icon" src="@/static/image/index/index4.png" mode="widthFix"></image> <image class="icon" src="@/static/image/index/index4.png" mode="widthFix"></image>
<view class="text">方案</view> <view class="text">方案</view>
</li> </li>
<li v-if="auth('订单管理')" @click="$util.to('/order/orders/orders')"> <li @click="$util.to('/order/orders/orders')">
<image class="icon" src="@/static/image/index/index5.png" mode="widthFix"></image> <image class="icon" src="@/static/image/index/index5.png" mode="widthFix"></image>
<view class="text">订单</view> <view class="text">订单</view>
</li> </li>

6
pages/login/login.vue
Unescape View File

@ -9,8 +9,8 @@
</button> </button>
<template v-else> <template v-else>
<view class="btn wechat" @click="login"> <view class="btn wechat" @click="login">
<image src="@/static/image/wechat.png" mode="widthFix"></image> <!-- <image src="@/static/image/wechat.png" mode="widthFix"></image> -->
微信授权登录 快捷登录
</view> </view>
</template> </template>
@ -75,7 +75,7 @@
this.submiting = true this.submiting = true
login({ login({
code, code,
avatarUrl: userInfo.avatarUrl // avatarUrl: userInfo.avatarUrl
}).then(({ data }) => { }).then(({ data }) => {
const e = data.sessionKey const e = data.sessionKey
this.sessionKey = e.session_key this.sessionKey = e.session_key

2
team/setting/setting.vue
Unescape View File

@ -65,7 +65,7 @@
success(res) { success(res) {
if (res.confirm) { if (res.confirm) {
uni.clearStorageSync() uni.clearStorageSync()
that.$util.to('../login/login') that.$util.to('/pages/login/login')
} }
} }
}) })

Write Preview
Loading…
Cancel
Save