fix

2 years ago · 08bce81031
parent 851b60ec81
commit 08bce81031
18 changed files with 304 additions and 112 deletions
--- a/apis/modules/parner.js
+++ b/apis/modules/parner.js
@ -36,3 +36,7 @@ export const teamPartnerList = (data) => {
 export const queryTeamMembers = (data) => {
  return post('nakadai/nakadai/partnerAccount/queryTeamMembers', data)
 }
+
+export const updatePartner = (data) => {
+  return post('nakadai/nakadai/partnerClassification/update', data)
+}
--- a/config/request.js
+++ b/config/request.js
@ -5,9 +5,9 @@
 */

 export default {
-  // baseURL: 'https://huorantech.cn/',
+  baseURL: 'https://huorantech.cn/',
  // baseURL: 'http://192.168.31.151:9000/',
-  baseURL: 'http://121.37.12.51/',
+  // baseURL: 'http://121.37.12.51/',
  headers: {
    'Content-Type': 'application/json;charset=UTF-8'
  },
--- a/manifest.json
+++ b/manifest.json
@ -1,5 +1,5 @@
 {
-    "name" : "或然crm",
+    "name" : "或然科技产业平台运营版",
    "appid" : "__UNI__2E89BA6",
    "description" : "",
    "versionName" : "1.0.0",
@ -54,7 +54,10 @@
            "es6" : true,
            "minified" : true
        },
-        "usingComponents" : true
+        "usingComponents" : true,
+        "optimization" : {
+            "subPackages" : true
+        }
    },
    "vueVersion" : "2"
 }
--- a/order/editCourse/editCourse.vue
+++ b/order/editCourse/editCourse.vue
@ -47,7 +47,10 @@
 							</view>
 							<view class="line">
 								<view class="name">结算价</view>
-								<view class="val">{{ item.settlementPrice }}元</view>
+								<view class="inline">
+									<input type="number" v-model="item.settlementPrice" placeholder="请输入" @change="handleErr(item, 'settlementPrice')">
+									元
+								</view>
 							</view>
 							<view class="line">
 								<view class="name">折扣率</view>
@ -359,6 +362,11 @@
 						msg = '请输入数量！'
 						break
 					}
+					if (e.settlementPrice === '') {
+						this.err = 'settlementPrice' + suf
+						msg = '请输入结算价！'
+						break
+					}
 					if (e.finalPrice === '') {
 						this.err = 'finalPrice' + suf
 						msg = '请输入成交价！'
--- a/order/orderDetail/orderDetail.vue
+++ b/order/orderDetail/orderDetail.vue
@ -85,7 +85,7 @@
 							</view>
 							<view class="line">
 								<view class="label">市场价（元）</view>
-								<view class="val">{{ item.marketValue }}元</view>
+								<view class="val">{{ item.marketValue || 0 }}元</view>
 							</view>
 							<view class="line">
 								<view class="label">结算价</view>
@ -139,6 +139,29 @@
 			</view>
 		</view>
 		
+		<view v-if="isDetail" class="action">
+			<template v-if="form.isDel !== 1">
+				<template v-if="form.orderStatus === 1">
+					<view class="item" @click="toAction(`../orderDetail/orderDetail?orderId=${orderId}&action=edit`)">
+						<uni-icons class="icon" custom-prefix="iconfont" type="icon-edit" size="30" color="#959595"></uni-icons>
+						<view class="text">修改</view>
+					</view>
+					<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>
+						<view class="text">续费</view>
+					</view>
+				</template>
+				<view v-else class="item" @click="toAction(`../orderDetail/orderDetail?orderId=${orderId}&action=handle`)">
+					<uni-icons class="icon" custom-prefix="iconfont" type="icon-edit" size="30" color="#959595"></uni-icons>
+					<view class="text">处理</view>
+				</view>
+			</template>
+			<view class="item" @click="del">
+				<uni-icons class="icon" type="trash-filled" size="30" color="#959595"></uni-icons>
+				<view class="text">删除</view>
+			</view>
+		</view>
+		
 		<view class="popup-mask" v-show="customerVisible" @click="closeCustomer"></view>
 		<view class="popup" v-show="customerVisible">
 			<view class="top">请选择客户</view>
@ -153,7 +176,7 @@

 <script>
 	import { queryCustomer, queryCustomerDetails } from '@/apis/modules/client.js'
-	import { add, update, getDetail, renew, ship, miniProgramOrderRecord, bulkShipping } from '@/apis/modules/order.js'
+	import { add, update, del, getDetail, renew, ship, miniProgramOrderRecord, bulkShipping } from '@/apis/modules/order.js'
 	import { teamList, getAllTeam } from '@/apis/modules/parner.js'
 	export default {
 		data() {
@ -226,11 +249,12 @@
 			const { options } = pages[pages.length - 1]
 			this.orderId = options.orderId
 			this.isDetail = !!options.show
-			this.isEdit = options.text === '修改'
-			this.isHandle = options.text === '处理'
-			this.isRenew = options.text === '续费'
-			this.getTeam()
+			const { action } = options
+			this.isEdit = action === 'edit'
+			this.isHandle = action === 'handle'
+			this.isRenew = action === 'renew'
 			const store = uni.getStorageSync('courses')
+			this.getTeam(!store)
 			if (store) {
 				// 新增取缓存，取了删除
 				const list = []
@ -244,7 +268,6 @@
 						selector: '#products',
 					})
 				})
-				
 				try {
 					uni.removeStorageSync('courses')
 				} catch (e) {}
@ -379,6 +402,31 @@
 					})
                }))
 			},
+			toAction(url) {
+				uni.redirectTo({
+					url
+				})
+			},
+			// 删除
+			del() {
+				const that = this
+				uni.showModal({
+					title: '提示',
+					content: '确定要删除吗？',
+					success(res) {
+						if (res.confirm) {
+							del({
+								ids: [that.orderId]
+							}).then(res => {
+								that.$util.sucMsg('删除成功')
+								setTimeout(() => {
+									uni.navigateBack()
+								}, 1000)
+							}).catch(res => {})
+						}
+					}
+				})
+			},
 			// 获取客户列表
 			getCustomer() {
 				queryCustomer({
@ -427,10 +475,10 @@
 				this.closeCustomer()
 			},
 			// 获取团队
-			getTeam() {
+			getTeam(getInfo) {
 				getAllTeam().then(({ team }) => {
 					this.teams = team
-					this.orderId && this.getInfo()
+					this.orderId && getInfo && this.getInfo() // 直接从列表里点订单进来的才需要查询详情
 				}).catch(res => {})
 			},
 			// 获取商务经理
@ -568,7 +616,6 @@
 				}
 				this.courses = courses
 				this.isEdit && bulkShipping({orderOthers: courses}).then(res => {}).catch(res => {}) // 编辑的情况下，需要调接口去直接发货
-				console.log(11, this.courses)
 			},
 			// 提交
 			submit() {
@ -586,9 +633,15 @@
 					courses.push(...this.courseList[i].list)
 				}
 				if (!courses.length) return this.$util.errMsg('请选择课程权限或数据权限后再确认订单！')
-				courses.map(e => {
+				let invalid = 0
+				courses.forEach(e => {
+					if (!e.periodOfUse) {
+						invalid = 1
+						return this.$util.errMsg('请输入使用期限！')
+					}
 					e.startTime = this.$util.formatDate(new Date(e.startTime), 'yyyy-MM-dd')
 				})
+				if (invalid) return false
 				if (this.isRenew || courses.some(e => e.renew)) form.orderNature = 2
 				uni.showLoading({
 					title: '提交中'
@ -603,6 +656,7 @@
 						uni.hideLoading()
 						this.$util.sucMsg('编辑成功')
 						setTimeout(() => {
+							// this.$util.to(`../orders/orders`)
 							uni.navigateBack()
 						}, 1500)
 					}).catch(res => {
@ -614,6 +668,7 @@
 						uni.hideLoading()
 						this.$util.sucMsg('添加成功')
 						setTimeout(() => {
+							// this.$util.to(`../orders/orders`)
 							uni.navigateBack()
 						}, 1500)
 					}).catch(res => {
@ -630,7 +685,10 @@
 	padding-bottom: 420rpx;
 }
 .show {
-	padding-bottom: 280rpx;
+	padding-bottom: 380rpx;
+	.bottom {
+		bottom: 100rpx;
+	}
 }
 .pro-wrap {
 	position: relative;
--- a/order/orders/orders.vue
+++ b/order/orders/orders.vue
@ -12,8 +12,8 @@
 					<uni-swipe-action-item
 					    v-for="item in list"
 						:threshold="0"
-						:right-options="item.ops"
-						@click="e => handle(e, item)"
+						:right-options="ops"
+						@click="e => handle(item)"
 					>
 						<view class="item" @click="toDetail(item)">
 							<view class="c-name">{{ item.orderNumber }}</view>
@ -112,23 +112,11 @@
 				pageSize: 10,
 				ops: [
 					{
-						text: '处理',
+						text: '删除',
 						style: {
-							backgroundColor: '#e08443'
+							backgroundColor: '#F56C6C'
 						}
-					},
-					{
-						text: '修改',
-						style: {
-							backgroundColor: '#46c58b'
-						}
-					},
-					{
-						text: '续费',
-						style: {
-							backgroundColor: '#34b3fd'
-						}
-					},
+					}
 				],
 			}
 		},
@ -180,21 +168,7 @@
 					uni.hideLoading()
 					// 未加载完所有数据，并且不是筛选，则拼接list，否则直接赋值
 					const list = orderPage.orders
-					const { ops } = this
 					list.map(e => {
-						// 处理左滑按钮逻辑（参考pc中台订单列表，pc的订单不是本人写的，所以也不知道这些isDel代表什么）
-						const op = []
-						if (e.isDel !== 1) {
-							op.push(ops[e.orderStatus === 1 ? 1 : 0])
-							e.orderStatus === 1 && op.push(ops[2])
-						}
-						op.push({
-							text: '删除',
-							style: {
-								backgroundColor: '#F56C6C'
-							}
-						})
-						e.ops = op
 						e.toggle = e.orderContent.length < 14 // 超过了14个字才需要显示展开按钮
 					})
 					this.list = this.reachBottom > 0 ? [...this.list, ...list] : list
@ -236,27 +210,22 @@
 				this.$util.to(`../orderDetail/orderDetail?orderId=${item.orderId}&show=1`)
 			},
 			// 删除
-			handle(e, row) {
-				const { text } = e.content
-				if (text === '删除') {
-					const that = this
-					uni.showModal({
-						title: '提示',
-						content: '确定要删除吗？',
-						success(res) {
-							if (res.confirm) {
-								del({
-									ids: [row.orderId]
-								}).then(res => {
-									that.$util.sucMsg('删除成功')
-									that.initList()
-								}).catch(res => {})
-							}
+			handle(row) {
+				const that = this
+				uni.showModal({
+					title: '提示',
+					content: '确定要删除吗？',
+					success(res) {
+						if (res.confirm) {
+							del({
+								ids: [row.orderId]
+							}).then(res => {
+								that.$util.sucMsg('删除成功')
+								that.initList()
+							}).catch(res => {})
 						}
-					})
-				} else {
-					this.$util.to(`../orderDetail/orderDetail?orderId=${row.orderId}&text=${text}`)
-				}
+					}
+				})
 			},
 		}
 	}
--- a/pages.json
+++ b/pages.json
@ -136,6 +136,15 @@
                "enablePullDownRefresh": false
            }
        }
+        ,{
+            "path" : "pages/editTeam/editTeam",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "",
+                "enablePullDownRefresh": false
+            }
+            
+        }
    ],
 	"subPackages": [{
 		"root": "order",
@ -191,9 +200,9 @@
        ]
 	}],
 	"preloadRule": {
-		"order/orders/orders": {
+		"pages/index/index": {
 			"network": "all",
-			"packages": ["__APP__"]
+			"packages": ["order"]
 		}
 	},
 	"condition": { //模式配置，仅开发期间生效
--- a/pages/addStaff/addStaff.vue
+++ b/pages/addStaff/addStaff.vue
@ -33,15 +33,9 @@
 			// 获取组织
 			getOrg() {
 				treeList().then(({ treeList }) => {
-					this.handleOrg(treeList)
 					this.orgs = treeList
 				}).catch(e => {})
 			},
-			// 递归把isTeam=1的分类去掉（isTeam=1是团队，只能选择分类）
-			handleOrg(list) {
-				list.forEach(e => {
-				})
-			},
 			// 组织点击回调
 			orgClick(e) {
 				this.orgTemp = e.id
--- a/pages/clientDetail/clientDetail.vue
+++ b/pages/clientDetail/clientDetail.vue
@ -355,25 +355,4 @@
 		margin-right: 10rpx;
 	}
 }
-.action {
-	z-index: 2;
-	position: fixed;
-	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-shadow: 0 -2px 2px #f5f5f5;
-	box-sizing: border-box;
-	.item {
-		text-align: center;
-	}
-	.text {
-		font-size: 10px;
-		color: #959595;
-	}
-}
 </style>
--- a/pages/editTeam/editTeam.vue
+++ b/pages/editTeam/editTeam.vue
@ -0,0 +1,91 @@
+<template>
+	<view>
+		<uni-section title="组织架构" type="line">
+			<view class="page">
+				<view class="org-picker">
+					<uni-data-picker class="picker-input" placeholder="请选择组织" popup-title="请选择组织" preload :localdata="orgs" :map="{text: 'partnerClassificationName', value: 'id'}" v-model="org" @nodeclick="orgClick" @popupclosed="orgClose"></uni-data-picker>
+				</view>
+				<button type="primary" @click="submit">确定</button>
+			</view>
+		</uni-section>
+	</view>
+</template>
+
+<script>
+	import { treeList, updatePartner } from '@/apis/modules/parner.js'
+	export default {
+		data() {
+			return {
+				id: '',
+				areaId: '',
+				orgs: [],
+				org: '',
+				orgTemp: '',
+				extraIcon: {
+					color: '#007eff',
+					size: '22',
+					type: 'icon-qrcode'
+				}
+			}
+		},
+		onShow() {
+			const pages = getCurrentPages()
+			const { options } = pages[pages.length - 1]
+			this.id = options.id
+			this.org = +options.areaId || ''
+			this.getOrg()
+		},
+		methods: {
+			// 获取组织
+			getOrg() {
+				treeList().then(({ treeList }) => {
+					this.orgs = treeList
+				}).catch(e => {})
+			},
+			// 组织点击回调
+			orgClick(e) {
+				this.orgTemp = e.id
+			},
+			// 组织关闭回调
+			orgClose(e) {
+				this.org = this.orgTemp
+			},
+			// 提交
+			submit() {
+				if(!this.org) return this.$util.errMsg('请选择区域')
+				updatePartner({
+					id: this.id,
+					isTeam: 1,
+					parentId: this.org
+				}).then(res => {
+					this.$util.sucMsg('修改成功！')
+					setTimeout(() => {
+						uni.navigateBack()
+					}, 1000)
+				}).catch(e => {})
+			}
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+.page {
+	padding: 0 20px 20px;
+	.org-picker {
+		margin-bottom: 20px;
+	}
+}
+.slot-box {
+	display: flex;
+	flex-direction: row;
+	align-items: center;
+}
+.icon {
+	width: 25px;
+	height: 25px;
+	margin-right: 10px;
+}
+.text {
+	font-size: 14px;
+}
+</style>
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@ -28,7 +28,6 @@
 				<view class="text">产品</view>
 			</li>
 		</ul>
-		
 		<view class="panel">
 			<view class="title" @click="toPanel(1)">
 				<view class="left">
--- a/pages/products/products.vue
+++ b/pages/products/products.vue
@ -178,6 +178,7 @@
 		border-bottom: 1px solid #E6E8ED;
 		.icon {
 			width: 52rpx;
+			height: 52rpx;
 			margin-right: 20rpx;
 		}
 	}
--- a/pages/qrcode/qrcode.vue
+++ b/pages/qrcode/qrcode.vue
@ -10,8 +10,11 @@
 						</view>
 					</view>
 				</view>
-				<u-qrcode ref="qrcode" canvas-id="qrcode" :size="size" :value="link"></u-qrcode>
-				<view class="tips">扫一扫，加入我们吧</view>
+				<u-qrcode 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>
+				
+				<view class="tips" style="margin-top: 20rpx;">扫一扫，加入我们吧</view>
+				<view class="tips">长按可转发至微信好友和保存图片</view>
 			</view>
 			<view class="warn">邀请二维码失效日期：{{ expireTime }}</view>
 		</view>
@ -32,6 +35,7 @@
 				qrcode: '',
 				link: '',
 				size: uni.upx2px(420),
+				qrcodeImg: ''
 			}
 		},
 		onShow() {
@ -55,10 +59,38 @@
 				generateInvitationCode(accountId).then(({ expireTime }) => {
 					const date = new Date(Date.now() + expireTime * 1000) // 返回的秒，要*1000
 					this.expireTime = `${date.getFullYear()}-${this.$util.preZero(date.getMonth() + 1)}-${this.$util.preZero(date.getDate())} ${this.$util.preZero(date.getHours())}:${this.$util.preZero(date.getMinutes())}:${this.$util.preZero(date.getMinutes())}`
-					// this.link = `https://huorantech.cn/#/join?accountId=${accountId}&id=${this.id}&isTeam=0`
-					this.link = `http://121.37.12.51/backstage/#/join?accountId=${accountId}&id=${this.id}&isTeam=0`
+					this.link = `https://huorantech.cn/#/join?accountId=${accountId}&id=${this.id}&isTeam=1`
+					// this.link = `http://121.37.12.51/backstage/#/join?accountId=${accountId}&id=${this.id}&isTeam=1`
 				}).catch(e => {})
 			},
+			// 二维码组件生成完成钩子。生成后把图片导出给image组件，image组件才可以长按二维码转发
+			qrcodeComplete() {
+				this.$refs.qrcode.toTempFilePath({
+				  success: res => {
+					this.qrcodeImg = res.tempFilePath
+				  }
+				});
+			},
+			previewImage(e){
+				uni.previewImage({
+					// 需要预览的图片链接列表。若无需预览，可以注释urls
+					urls: [e.target.src],
+					// 为当前显示图片的链接/索引值
+					current: e.target.src,
+					// 图片指示器样式	
+					indicator:'default',
+					// 是否可循环预览
+					loop:false,
+					// 长按图片显示操作菜单，如不填默认为保存相册
+					// longPressActions:{
+					// 	itemList:[this.l('发送给朋友'),this.l]
+					// },
+					success: res => {
+						console.log('previewImage res', res);
+					}, 
+					fail: err => {}
+				})
+			},
 		}
 	}
 </script>
@ -76,6 +108,7 @@
 	text-align: center;
 	background-color: #fff;
 	.inner {
+		position: relative;
 		display: flex;
 		flex-direction: column;
 		justify-content: center;
@ -106,12 +139,20 @@
 		margin: 20rpx 0;
 		font-size: 30rpx;
 	}
+	.qrcode {
+		display: none;
+	}
+	.qrcode-img {
+		width: 420rpx;
+		height: 420rpx;
+	}
 	.tips {
-		margin: 30rpx 0 20rpx;
+		margin-bottom: 10rpx;
 		font-size: 24rpx;
 		color: #333;
 	}
 	.warn {
+		margin-top: 10rpx;
 		font-size: 24rpx;
 		color: #f00;
 	}
--- a/pages/teamDetail/teamDetail.vue
+++ b/pages/teamDetail/teamDetail.vue
@ -42,7 +42,7 @@
 			keyword () {
 				clearTimeout(this.searchTimer)
 				this.searchTimer = setTimeout(() => {
-					this.initList()
+					this.getList()
 				}, 500)
 			}
 		},
--- a/pages/teams/teams.vue
+++ b/pages/teams/teams.vue
@ -4,11 +4,10 @@
 			<uni-search-bar class="search" radius="30" placeholder="请输入团队、合伙人名字" clearButton="auto" cancelButton="none" v-model="keyword" />
 			
 			<view class="org-picker">
-				<uni-data-picker class="picker-input" placeholder="请选择组织" popup-title="请选择组织" preload :localdata="orgs" :map="{text: 'partnerClassificationName', value: 'id'}" v-model="org" @nodeclick="orgClick" @change="initList" @popupclosed="orgClose"></uni-data-picker>
+				<uni-data-picker class="picker-input" placeholder="请选择组织" popup-title="请选择组织" preload :localdata="orgs" :map="{text: 'partnerClassificationName', value: 'id'}" v-model="org" @change="initList" @nodeclick="orgClick" @popupclosed="orgClose"></uni-data-picker>
 			</view>
 		</uni-card>
 		
-		
 		<template v-if="list.length">
 			<ul class="list">
 				<li v-for="item in list" @click="toTeam(item)">
@ -44,6 +43,7 @@
 							<text class="val">{{ item.invitationAccount }}</text>
 						</view>
 					</view>
+					<view class="iconfont icon-edit" @click.stop="toEdit(item)"></view>
 				</li>
 			</ul>
 			<uni-load-more :status="status" />
@ -68,7 +68,8 @@
 				keyword: '',
 				list: [],
 				page: 1,
-				pageSize: 10
+				pageSize: 10,
+				isClose: 0
 			}
 		},
 		watch: {
@ -107,14 +108,17 @@
 			},
 			orgClick(e) {
 				this.orgTemp = e.id
+				this.org = e.id
+				this.initList()
 			},
 			// 组织关闭回调
-			orgClose(e) {
-				this.org = this.orgTemp
-				this.initList()
+			orgClose() {
+				// this.org = this.orgTemp
+				// this.isClose = 1
+				// this.initList()
 			},
 			// 获取列表
-			getList() {
+			async getList() {
 				uni.showLoading({
 					title: '加载中'
 				})
@ -145,6 +149,10 @@
 			// 查看团队成员
 			toTeam(e) {
 				this.$util.to(`../teamDetail/teamDetail?id=${e.teamId}`)
+			},
+			// 编辑区域
+			toEdit(e) {
+				this.$util.to(`../editTeam/editTeam?id=${e.teamId}&areaId=${e.partnerClassificationId}`)
 			}
 		}
 	}
@ -159,6 +167,7 @@
 	margin-top: 20rpx;
 	background-color: #fff;
 	li {
+		position: relative;
 		display: flex;
 		align-items: center;
 		padding: 20rpx 40rpx;
@ -192,6 +201,12 @@
 		font-size: 28rpx;
 		color: #333;
 	}
+	.iconfont {
+		position: absolute;
+		right: 50rpx;
+		font-size: 52rpx;
+		color: #0196ff;
+	}
 }
 .plus {
 	position: fixed;
--- a/static/image/1.jpg
+++ b/static/image/1.jpg
--- a/static/image/wechat-code.jpeg
+++ b/static/image/wechat-code.jpeg
--- a/styles/common.scss
+++ b/styles/common.scss
@ -219,3 +219,24 @@ ul {
 	-webkit-user-select: none;
 	user-select: none;
 }
+.action {
+	z-index: 2;
+	position: fixed;
+	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-shadow: 0 -2px 2px #f5f5f5;
+	box-sizing: border-box;
+	.item {
+		text-align: center;
+	}
+	.text {
+		font-size: 10px;
+		color: #959595;
+	}
+}