Merge branch 'master' of https://git.yuzhankeji.cn/TmOct5/dou_fire

App.vue

@@ -1,4 +1,64 @@
-<script></script>
+<script>
+	import { getVersions } from './apis/interfaces/versions'
+	export default {
+	    onLaunch: function() {
+	        //#ifdef APP-PLUS
+	        // 获取系统版本号
+	        getVersions({
+	            platform: plus.os.name,
+	            version	: plus.runtime.version
+	        }).then(res => {
+	            if (res.update) {
+	                uni.showModal({
+	                    title		: "更新提示",
+	                    content		: res.note || '版本更新信息',
+	                    confirmText	: "更新",
+						showCancel	: !res.info.must,
+	                    success		: modalRes => {
+	                        if (modalRes.confirm) {
+	                            if (plus.os.name == "Android") {
+	                                uni.showToast({
+	                                    title: '新版本下载中，将在下载完成后自动为您安装更新包',
+	                                    icon: 'none'
+	                                })
+	                                uni.downloadFile({
+	                                    url: res.info.download,
+	                                    success: apkPick => {
+	                                        plus.runtime.install(apkPick
+	                                            .tempFilePath, '',
+	                                            installRES => {
+	                                                // 安装完成用于提示新版本引导，暂时无用
+	                                            }, installERR => {
+	                                                // 安装失败
+	                                            })
+	                                    },
+	                                    fail(err) {
+	                                        uni.showToast({
+	                                            title: '安装包下载失败，请检查您的网络或稍后重试',
+	                                            icon: 'none'
+	                                        })
+	                                    }
+	                                })
+	                            } else {
+									uni.showToast({
+									    title: '暂无ios版本',
+									    icon: 'none'
+									})
+	                            }
+	                        }
+	                    }
+	                })
+	            }
+	        }).catch(err => {
+	            uni.showToast({
+	                title: err.message,
+	                icon: 'none'
+	            })
+	        })
+	        //#endif
+	    }
+	}
+</script>
 
 <style lang="scss">
 	@import "uview-ui/index.scss";

apis/interfaces/order.js

@@ -142,6 +142,46 @@ const refunds = data => {
 	})
 }
 
+// 完善基础资料使用历史数据
+const historyBase = (business_order_user_id, user_base_id) => {
+	return request({
+		url: 'business/' + business_order_user_id + '/user/base/' + user_base_id,
+		method: 'POST'
+	})
+}
+
+// 完善机构资料使用历史数据
+const historyBank = (business_order_user_bank_id, user_bank_id) => {
+	return request({
+		url: 'business/' + business_order_user_bank_id + '/user/bank/' + user_bank_id,
+		method: 'POST',
+	})
+}
+
+// 个人订单确认方案列表
+const getConfirmScheme = data => {
+	return request({
+		url: 'business/close_schemes',
+		data
+	})
+}
+
+// 个人订单确认方案详情
+const getConfirmSchemeInfo = business_order_scheme_id => {
+	return request({
+		url: 'business/close_schemes/' + business_order_scheme_id,
+	})
+}
+
+// 提交确认或拒绝
+const sbuConfirmScheme = (type, business_order_close_scheme_id, data) => {
+	return request({
+		url: 'business/close_schemes/' + business_order_close_scheme_id + '/' + type,
+		data,
+		method: 'POST'
+	})
+}
+
 // 支付订单
 export {
 	lists,
@@ -160,5 +200,10 @@ export {
 	orderSign,
 	getOrderSignStatus,
 	getSchemes,
-	refunds
+	refunds,
+	historyBase,
+	historyBank,
+	getConfirmScheme,
+	getConfirmSchemeInfo,
+	sbuConfirmScheme
 }

apis/interfaces/public.js

@@ -0,0 +1,20 @@
+
+/**
+ * Web唐明明
+ * 匆匆数载恍如梦，岁月迢迢华发增。
+ * 碌碌无为枉半生，一朝惊醒万事空。
+ * moduleName: 公共的
+ */
+
+import { request } from '../index'
+
+// 协议
+const cms = id => {
+	return request({
+		url		: 'cms/pages/' + id,
+	})
+}
+
+export {
+	cms
+}

apis/interfaces/versions.js

@@ -0,0 +1,23 @@
+
+/**
+ * Web唐明明
+ * 匆匆数载恍如梦，岁月迢迢华发增。
+ * 碌碌无为枉半生，一朝惊醒万事空。
+ * moduleName: 版本信息
+ */
+
+
+import { request } from '../index'
+
+// 版本检测
+const getVersions = data => {
+	return request({
+		url: 'app/version',
+		method: 'POST',
+	    data 
+	})
+}
+
+export {
+	getVersions
+}

manifest.json

@@ -2,7 +2,7 @@
     "name" : "抖火",
     "appid" : "__UNI__C305C03",
     "description" : "",
-    "versionName" : "1.0.6",
+    "versionName" : "1.1.4",
     "versionCode" : "100",
     "transformPx" : false,
     /* 5+App特有相关 */

pages.json

@@ -22,6 +22,7 @@
 	}, {
 		"path": "pages/index/free",
 		"name": "FreeService",
+		"auth": true,
 		"style": {
 			"navigationStyle": "custom",
 			"navigationBarTitleText": "自由服务包介绍",
@@ -465,18 +466,48 @@
 		"name": "WorkExpress",
 		"style": {
 			"navigationBarTitleText": "邮寄状态",
-			"enablePullDownRefresh": false,
+			"enablePullDownRefresh": false,
 			"navigationBarBackgroundColor": "#ffffff"
 		}
 	}, {
-		"path": "pages/work/expressInfo",
+		"path": "pages/work/expressInfo",
-		"auth": true,
+		"auth": true,
 		"name": "WorkExpressInfo",
 		"style": {
 			"navigationBarTitleText": "快递详情",
-			"enablePullDownRefresh": false,
+			"enablePullDownRefresh": false,
 			"navigationBarBackgroundColor": "#ffffff"
 		}
+	}, {
+		"path": "pages/work/confirmScheme",
+		"auth": true,
+		"name": "ConfirmScheme",
+		"style": {
+			"navigationBarTitleText": "结案方案",
+			"enablePullDownRefresh": false,
+			"navigationBarBackgroundColor": "#ffffff"
+		}
+	}, {
+		"path": "pages/work/confirmSchemeInfo",
+		"auth": true,
+		"name": "ConfirmSchemeInfo",
+		"style": {
+			"navigationBarTitleText": "方案详情",
+			"enablePullDownRefresh": false,
+			"navigationBarTextStyle": "white",
+			"navigationBarBackgroundColor": "#446EFE"
+		}
+	}, {
+		"path": "pages/user/salesmanCode",
+		"auth": true,
+		"name": "SalesmanCode",
+		"style": {
+			"navigationBarTitleText": "业务员邀请码",
+			"enablePullDownRefresh": false,
+			"navigationBarTextStyle": "white",
+			"navigationBarBackgroundColor": "#446EFE"
+		}
+
 	}],
 	"globalStyle": {
 		"navigationBarTextStyle": "black",

pages/auth/auth.vue

@@ -10,7 +10,7 @@
 			<view class="hello">欢迎使用抖火法律</view>
 			<view class="input input-phone">
 				<label>+86</label>
-				<input type="number" v-model="phone" placeholder="请输入手机号码">
+				<input type="number" v-model="phone" maxlength="11" placeholder="请输入手机号码">
 			</view>
 			<view class="input">
 				<input type="safe-password" password v-model="password" placeholder="请输入密码">
@@ -25,8 +25,8 @@
 				>
 					<u-checkbox shape="circle" name="agreement" activeColor="#446EFE"></u-checkbox>
 					我已阅读并同意
-					<my-link class="agreement-nav" :to="{name: 'richText', params: {id: 1}}">服务协议</my-link>、
+					<my-link class="agreement-nav" :to="{name: 'RichText', params: {id: 1}}">服务协议</my-link>、
-					<my-link class="agreement-nav" :to="{name: 'richText', params: {id: 2}}">隐私权政策</my-link>
+					<my-link class="agreement-nav" :to="{name: 'RichText', params: {id: 2}}">隐私权政策</my-link>
 				</u-checkbox-group>
 			</view>
 		</view>

pages/auth/registered.vue

@@ -5,7 +5,7 @@
 		<view class="from">
 			<view class="from-inpus from-input-phoen">
 				<label>+86</label>
-				<input type="number" v-model="username" placeholder="输入手机号码">
+				<input type="number" v-model="username" maxlength="11" placeholder="输入手机号码">
 			</view>
 			<view class="from-inpus">
 				<label>登录密码</label>
@@ -15,6 +15,10 @@
 				<label>确认密码</label>
 				<input type="safe-password" password v-model="confirmation" placeholder="请确认登录密码">
 			</view>
+			<view class="from-inpus">
+				<label>邀请码</label>
+				<input type="text" v-model="parentId" placeholder="请输入邀请码" :disabled="isDisabled">
+			</view>
 			<view class="from-inpus from-input-code">
 				<label>验证码</label>
 				<input type="number" v-model="code" maxlength="4" placeholder="短信验证码">
@@ -55,9 +59,22 @@
 				captcha		: '',
 				captchaImg	: '',
 				captchaKey	: '',
-				captchaShow	: false
+				captchaShow	: false,
+				parentId	: '',
+				isDisabled	: false,
 			};
 		},
+		created() {
+			uni.getClipboardData({
+				success: res => {
+					let code = res.data
+					if(code.substring(0,11) === '~dOo0T0^5$*'){
+						this.parentId = code.substring(11)
+						this.isDisabled = true
+					}
+				}
+			})
+		},
 		methods: {
 			// 提交注册信息
 			onRegistered(){
@@ -69,7 +86,8 @@
 					username				: this.username,
 					password				: this.password,
 					password_confirmation	: this.confirmation,
-					code					: this.code
+					code					: this.code,
+					parent_id				: this.parentId
 				}).then(res => {
 					// 重置验证码与计时器
 					this.getSms   = false;

pages/auth/resetPassword.vue

@@ -5,7 +5,7 @@
 		<view class="from">
 			<view class="from-inpus from-input-phoen">
 				<label>+86</label>
-				<input type="number" v-model="username" placeholder="输入手机号码">
+				<input type="number" v-model="username" maxlength="11" placeholder="输入手机号码">
 			</view>
 			<view class="from-inpus">
 				<label>新密码</label>

pages/index/index.vue

@@ -207,7 +207,6 @@
             },
             // 点击轮播图跳转自由服务包
             clickFree(){
-                console.log('clickFree.....')
                 uni.navigateTo({
                     url:'/pages/index/free'
                 })

pages/pay/pay.vue

@@ -104,7 +104,7 @@
 				coinPay(this.orderId).then(res => {
 					wx.showModal({
 						title		: '提示',
-						content 	: '待缴费成功，请提醒用户尽快签约并完善资料',
+						content 	: '代缴费成功，请提醒用户尽快签约并完善资料',
 						showCancel	: false,
 						confirmColor: '#446EFE',
 						success		: () => {

pages/richText/richText.vue

@@ -1,25 +1,39 @@
 <template>
-	<view>
+	<view class="richText">
-		
+		<rich-text :nodes="content"></rich-text>
 	</view>
 </template>
 
 <script>
+	import { cms } from '@/apis/interfaces/public.js'
 	export default {
 		data() {
 			return {
-				
+				content: ''
 			};
 		},
 		created() {
-			console.log(this.$Route.query.id)
 			uni.setNavigationBarTitle({
 				title: '服务协议'
 			})
+			cms(this.$Route.query.id).then(res => {
+				let { content, title } = res
+				this.content = content;
+				uni.setNavigationBarTitle({
+					title
+				})
+			}).catch(err => {
+				uni.showToast({
+					title: err.message,
+					icon : 'none'
+				})
+			})
 		}
 	}
 </script>
 
 <style lang="scss">
-
+	.richText{
+		padding: 30rpx;
+	}
 </style>

pages/transfers/lists.vue

@@ -55,10 +55,10 @@
 					</view>
 					<view class="btns">
 						<block v-if="type == 'in' && tabsCurrent == 0">
-							<view class="btns-item btns-red" @click="onRefused(item.business_order_id)">拒绝</view>
+							<view class="btns-item btns-red" @click="onRefused(item.business_order_transfer_id)">拒绝</view>
-							<view class="btns-item btns-border" @click="onAgree(item.business_order_id)">接收</view>
+							<view class="btns-item btns-border" @click="onAgree(item.business_order_transfer_id)">接收</view>
 						</block>
-						<view class="btns-item" @click="$Router.push({name: 'OrderInfo', params: {orderId: item.business_order_id}})">查看</view>
+						<view class="btns-item" @click="$Router.push({name: 'OrderInfo', params: {orderId: item.business_order_transfer_id}})">查看</view>
 					</view>
 				</view>
 			</view>
@@ -98,12 +98,13 @@
 			// 切换列表
 			onTabs(e){
 				this.tabsCurrent = e.index
+				this.orders = []
 				this.getList()
 			},
 			// 变更当前列表状态
 			removeListVal(id){
 				let ListArr 	= this.orders
-				let ListIndex 	= ListArr.findIndex(val => val.business_order_id == id)
+				let ListIndex 	= ListArr.findIndex(val => val.business_order_transfer_id == id)
 				if(ListIndex >= 0){
 					this.orders.splice(ListIndex, 1)
 				}
@@ -127,6 +128,8 @@
 								})
 								// 移出操作后的订单
 								this.removeItem(id)
+							}).catch(err => {
+								console.log(err)
 							})
 						}
 					}
@@ -146,6 +149,8 @@
 								})
 								// 移出操作后的订单
 								this.removeItem(id)
+							}).catch(err => {
+								console.log(err)
 							})
 						}
 					}

pages/user/certification.vue

@@ -24,13 +24,13 @@
 				<view class="identity-inpus" v-if="provinces.length > 0">
 					<label>经营省份</label>
 					<picker class="city-picker" :value="provincesVal" :range="provinces" range-key="name" @change="onPickerChange($event, 'provincesVal')">
-						<view class="city-picker-text">{{provinces[provincesVal].name}}<uni-icons class="city-icon" type="bottom" color="gray"></uni-icons></view>
+						<view class="city-picker-text" :class="{'text-gray': provincesVal === 0}">{{provinces[provincesVal].name}}<uni-icons class="city-icon" type="bottom" color="gray"></uni-icons></view>
 					</picker>
 				</view>
 				<view class="identity-inpus" v-if="citys.length > 0">
 					<label>经营城市</label>
 					<picker class="city-picker" :value="citysVal" :range="citys" range-key="name" @change="onPickerChange($event, 'citysVal')">
-						<view class="city-picker-text">{{citys[citysVal].name}}<uni-icons class="city-icon" type="bottom" color="gray"></uni-icons></view>
+						<view class="city-picker-text" :class="{'text-gray': citysVal === 0}">{{citys[citysVal].name}}<uni-icons class="city-icon" type="bottom" color="gray"></uni-icons></view>
 					</picker>
 				</view>
 			</view>
@@ -100,9 +100,12 @@
 		},
 		created() {
 			getRegion().then(res => {
-				this.provinces = res
+				this.provinces = [{
-				this.getCity()
+					id	: '',
+					name: '请选择经营省份'
+				}, ...res]
 				this.getCertified()
+				this.getCity()
 			}).catch(err => {
 				uni.showToast({
 					title: err.message,
@@ -149,7 +152,13 @@
 					mask : true
 				})
 				getRegion(this.provinces[this.provincesVal].id).then(res => {
-					this.citys = res
+					this.citys = [
+						{
+							id	: '',
+							name: '请选择经营城市'
+						},
+						...res
+					]
 					if(id){
 						this.citysVal = this.citys.findIndex(val => val.id === id)
 					}else{
@@ -163,7 +172,7 @@
 					})
 				})
 			},
-			// 提交真实信息
+			// 获取实名信息
 			getInfo(){
 				uni.showLoading({
 					title: '加载中...',
@@ -208,7 +217,8 @@
 					front_card: this.frontCard.path,
 					back_card : this.backCard.path,
 					redirect_url: 'http://web.douhuofalv.com/app/e-sign?sign_type=personal',
-					app_scheme: 'doufire://'
+					app_scheme: 'doufire://',
+					channel: 'app'
 				}).then(res => {
 					let certificationData = res;
 					this.idCard	= true
@@ -337,6 +347,9 @@
 						position: absolute;
 						right: 0;
 					}
+					&.text-gray{
+						color: gray;
+					}
 				}
 			}
 		}

pages/user/code.vue

@@ -10,74 +10,220 @@
 			</view>
 			<view class="block">
 				<view class="qrcode">
-					<l-painter class="qrcode-src">
+					<l-painter class="qrcode-src">
-						<l-painter-qrcode
+						<l-painter-qrcode
-							:text="'http://web.douhuofalv.com/login/register?invite_code=' + invite"
+							:text="'https://web.douhuofalv.com/login/register?invite_code=' + invite"
-							css="width: 130px; height: 130px; background-color:white; padding: 10px;  border-radius: 10rpx;"
+							css="width: 130px; height: 130px; background-color:white; padding: 10px;  border-radius: 10rpx;"
-						/>
+						/>
 					</l-painter>
 					<view class="qrcode-text" @click="copyInvite">邀请码{{invite}}</view>
 				</view>
 				<image class="btn" src="@/static/code/code_btn.png" mode="widthFix" @click="onWx"></image>
 			</view>
 			<image class="footer" src="@/static/code/code_footer.png" mode="widthFix"></image>
-		</view>
+		</view>
+		<!-- 绘制二维码 -->
+		<l-painter ref="painter" class="code-canvas" />
 	</view>
 </template>
 
-<script>
+<script>
-	import { code } from '@/apis/interfaces/user.js'
+	import {
+		code
+	} from '@/apis/interfaces/user.js'
 	export default {
 		data() {
 			return {
-				invite: ''
+				invite : '',
+				codeLay: false,
+				codeImg: ''
 			};
-		},
+		},
-		created() {
+		created() {
-			code().then( res => {
+			code().then(res => {
-				let { invite } = res;
+				let {
-				this.invite = invite
+					invite
-			}).catch(err => {
+				} = res;
-				uni.showToast({
+				this.invite = invite
-					title: err.message,
+			}).catch(err => {
-					icon : 'none'
+				uni.showToast({
-				})
+					title: err.message,
+					icon: 'none'
+				})
 			})
 		},
-		methods: {
+		methods: {
-			copyInvite(){
+			copyInvite() {
-				uni.setClipboardData({
+				uni.setClipboardData({
-					data: this.invite,
+					data: this.invite,
-					success() {
+					success() {
+						uni.showToast({
+							title: '邀请码已复制',
+							icon: 'none'
+						})
+					}
+				})
+			},
+			onWx() {
+				uni.showLoading({
+					title: '保存二维码...',
+					mask : true
+				})
+				if(this.codeImg != ''){
+					this.onDowCode()
+					return
+				}
+				this.$refs.painter.render({
+					css: {
+						width: "600rpx",
+						height: "1218rpx",
+						background: "#1F25AE",
+						position: "relative"
+					},
+					views: [
+						{
+							type: "image",
+							src: require('@/static/code/code_back.png'),
+							css: {
+								width: "600rpx",
+								height: "679rpx",
+								marginTop: "200rpx"
+							}
+						},{
+							type: "image",
+							src: require('@/static/code/code_header.png'),
+							css: {
+								width: "600rpx",
+								height: "415rpx",
+								position: "absolute",
+								top: 0,
+								zIndex: 1
+							}
+						},{
+							type: "image",
+							src: require('@/static/code/code_img_lay.png'),
+							css: {
+								width: "200rpx",
+								height: "277rpx",
+								position: "absolute",
+								bottom: 0,
+								zIndex: 1
+							}
+						},{
+							type: "image",
+							src: require('@/static/code/code_footer.png'),
+							css: {
+								width: "400rpx",
+								height: "84rpx",
+								position: "absolute",
+								bottom: "50rpx",
+								left: "100rpx",
+								zIndex: 1
+							}
+						},{
+							type: "image",
+							src: require('@/static/code/code_sign.png'),
+							css: {
+								width: "460rpx",
+								height: "164rpx",
+								position: "absolute",
+								top: "50rpx",
+								left: "70rpx",
+								zIndex: 1
+							}
+						},{
+							type: "image",
+							src: require('@/static/code/code_logo.png'),
+							css: {
+								width: "160rpx",
+								height: "160rpx",
+								position: "absolute",
+								top: "230rpx",
+								left: "220rpx",
+								zIndex: 1
+							}
+						},{
+							type: "view",
+							css: {
+								borderWidth: '1rpx',
+								borderColor: '#ffe2c2',
+								borderRadius: '20rpx',
+								height: '450rpx',
+								width: '360rpx',
+								position: "absolute",
+								top: "450rpx",
+								left: "120rpx",
+								background: "#0a2763"
+							},
+							views: [
+								{
+									text: "https://web.douhuofalv.com/login/register?invite_code=" + this.invite,
+									type: "qrcode",
+									css: {
+										width: "280rpx",
+										height: "280rpx",
+										background: "#FFF",
+										padding: "20rpx",
+										borderRadius: "10rpx",
+										marginLeft: "21rpx",
+										marginTop: "20rpx"
+									},
+								},{
+									type: "text",
+									text: "邀请码" + this.invite,
+									css: {
+										width: "320rpx",
+										marginLeft: "21rpx",
+										marginTop: "20rpx",
+										lineClamp: "1",
+										lineHeight: "80rpx",
+										textAlign: "center",
+										color: "#ffffeb",
+										fontSize: "32rpx"
+									},
+								}
+							]
+						}
+					]
+				});
+				this.$refs.painter.canvasToTempFilePathSync({
+					fileType: "jpg",
+					quality: 1,
+					success: (res) => {
+						this.codeLay = true;
+						this.codeImg = res.tempFilePath
+						this.onDowCode()
+					}
+				});
+			},
+			onDowCode(){
+				uni.saveImageToPhotosAlbum({
+					filePath: this.codeImg,
+					success: ()=>  {
 						uni.showToast({
-							title: '邀请码已复制',
+							title: '二维码已保存到您的相册',
 							icon : 'none'
 						})
-					}
+					},
-				})
-			},
-			onWx(){
-				uni.share({
-					title	: "抖火法律",
-					provider: "weixin",
-					scene	: "WXSceneSession",
-					imageUrl: require('@/static/logo.png'),
-					href	: "http://web.douhuofalv.com/login/register?invite_code=" + this.invite,
-					type	: 0,
-					summary: "法律问题我们'抖'懂",
 					fail: err => {
 						uni.showToast({
-							title: err.message,
+							title: '保存失败，请检查您的App[访问您的系统相册]系统权限',
 							icon : 'none'
 						})
 					}
 				});
-			}
+			}
 		}
 	}
 </script>
 
-<style lang="scss">
+<style lang="scss">
+	.code-canvas{
+		position: absolute;
+		left: -100%;
+		top:  -100%;
+	}
+	// 二维码
 	.code {
 		background: #1F25AE;
 		height: 100vh;
@@ -132,23 +278,23 @@
 
 			.block {
 				text-align: center;
-				margin-bottom: 30rpx;
+				margin-bottom: 30rpx;
-				width: 100%;
+				width: 100%;
 				.qrcode {
 					display: inline-block;
 					border: solid 2rpx #ECC997;
 					background: #0E2660;
 					border-radius: 20rpx;
-					padding: 30rpx;
+					padding: 30rpx;
-					.qrcode-src{
+					.qrcode-src{
-						width: 150px;
+						width: 150px;
-						height: 150px;
+						height: 150px;
-					}
+					}
 					.qrcode-text {
 						text-align: center;
 						color: #FFF5C6;
 						line-height: 50rpx;
-						padding-top: 30rpx;
+						padding-top: 30rpx;
 						font-size: 30rpx;
 					}
 				}

pages/user/index.vue

@@ -116,7 +116,20 @@
 			// 分享码
 			onUserCode(){
 				if(this.identity.order > 1){
-					this.$Router.push({ name: 'UserCode' })
+					uni.showActionSheet({
+						itemList: ['客户邀请码', '业务员邀请码'],
+						success: res => {
+							switch (res.tapIndex){
+								case 0:
+									this.$Router.push({ name: 'UserCode' })
+									break;
+								case 1:
+									this.$Router.push({ name: 'SalesmanCode' })
+									break;
+							}
+						}
+					})
+					// 
 					return
 				}
 				uni.showModal({

pages/user/salesmanCode.vue

@@ -0,0 +1,250 @@
+<template>
+	<view class="code" :style="'background-image: url(' + require('@/static/code/back.png') + ')'">
+		<image class="code-back code-logo" src="@/static/code/logo.png" mode="widthFix"></image>
+		<image class="code-back code-heder" src="@/static/code/header.png" mode="widthFix"></image>
+		<view class="block">
+			<view class="qrcode" :style="'background-image: url(' + require('@/static/code/code.png') + ')'">
+				<view class="qrcode-column">
+					<l-painter class="qrcode-src">
+						<l-painter-qrcode
+							:text="'https://app.douhuofalv.com/app?invite_code=' + invite"
+							css="width: 250rpx; height: 250rpx;"
+						/>
+					</l-painter>
+					<view class="qrcode-text" @click="copyInvite">邀请码{{invite}}</view>
+				</view>
+			</view>
+			<image class="btn" src="@/static/code/btn.png" mode="widthFix" @click="onWx"></image>
+		</view>
+		<!-- 绘制二维码 -->
+		<l-painter ref="painter" class="code-canvas" />
+	</view>
+</template>
+
+<script>
+	import {
+		code
+	} from '@/apis/interfaces/user.js'
+	export default {
+		data() {
+			return {
+				invite : '',
+				codeLay: false,
+				codeImg: ''
+			};
+		},
+		created() {
+			code().then(res => {
+				let {
+					invite
+				} = res;
+				this.invite = invite
+			}).catch(err => {
+				uni.showToast({
+					title: err.message,
+					icon: 'none'
+				})
+			})
+		},
+		methods: {
+			copyInvite() {
+				uni.setClipboardData({
+					data: this.invite,
+					success() {
+						uni.showToast({
+							title: '邀请码已复制',
+							icon: 'none'
+						})
+					}
+				})
+			},
+			onWx() {
+				uni.showLoading({
+					title: '保存二维码...',
+					mask : true
+				})
+				if(this.codeImg != ''){
+					this.onDowCode()
+					return
+				}
+				this.$refs.painter.render({
+					css: {
+						width: "600rpx",
+						height: "1300rpx",
+						background: "#1F25AE",
+						position: "relative"
+					},
+					views: [
+						{
+							type: "image",
+							src: require('@/static/code/back.png'),
+							css: {
+								width: "600rpx",
+								height: "1300rpx",
+							}
+						},{
+							type: "image",
+							src: require('@/static/code/logo.png'),
+							css: {
+								width: "200rpx",
+								height: "55rpx",
+								position: "absolute",
+								top: "80rpx",
+								left: "50rpx",
+								zIndex: 1
+							}
+						},{
+							type: "image",
+							src: require('@/static/code/header.png'),
+							css: {
+								width: "400rpx",
+								height: "160rpx",
+								position: "absolute",
+								top: "200rpx",
+								left: "100rpx",
+								zIndex: 1
+							}
+						},{
+							type: "image",
+							src: require('@/static/code/code.png'),
+							css: {
+								width: "360rpx",
+								height: "325rpx",
+								position: "absolute",
+								top: "440rpx",
+								left: "120rpx",
+								zIndex: 1
+							}
+						}, {
+							type: "view",
+							css: {
+								height: '325rpx',
+								width: '360rpx',
+								position: "absolute",
+								top: "440rpx",
+								left: "120rpx",
+							},
+							views: [
+								{
+									text: "https://app.douhuofalv.com/app?invite_code=" + this.invite,
+									type: "qrcode",
+									css: {
+										width: "220rpx",
+										height: "220rpx",
+										background: "#FFF",
+										marginLeft: "70rpx",
+										marginTop: "40rpx"
+									},
+								},{
+									type: "text",
+									text: "邀请码" + this.invite,
+									css: {
+										width: "300rpx",
+										marginLeft: "30rpx",
+										marginTop: "10rpx",
+										lineClamp: "1",
+										lineHeight: "40rpx",
+										textAlign: "center",
+										color: "gray",
+										fontSize: "28rpx"
+									},
+								}
+							]
+						}
+					]
+				});
+				this.$refs.painter.canvasToTempFilePathSync({
+					fileType: "jpg",
+					quality: 1,
+					success: (res) => {
+						this.codeLay = true;
+						this.codeImg = res.tempFilePath
+						this.onDowCode()
+					}
+				});
+			},
+			onDowCode(){
+				uni.saveImageToPhotosAlbum({
+					filePath: this.codeImg,
+					success: ()=>  {
+						uni.showToast({
+							title: '二维码已保存到您的相册',
+							icon : 'none'
+						})
+					},
+					fail: err => {
+						uni.showToast({
+							title: '保存失败，请检查您的App[访问您的系统相册]系统权限',
+							icon : 'none'
+						})
+					}
+				});
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	.code-canvas{
+		position: absolute;
+		left: -100%;
+		top: -100%;
+	}
+	// 二维码
+	.code {
+		background: #1F25AE;
+		position: relative;
+		height: 100vh;
+		background-position: center bottom;
+		background-size: cover;
+		padding: 50rpx;
+		box-sizing: border-box;
+		.code-back{
+			&.code-logo{
+				width: 240rpx;
+			}
+			&.code-heder{
+				width: 90%;
+				margin: 40rpx 5%;
+			}
+		}
+		.block{
+			text-align: center;
+			.qrcode{
+				display: inline-block;
+				width: 70%;
+				padding-top: 63%;
+				position: relative;
+				background-size: cover;
+				margin-bottom: 30rpx;
+				.qrcode-column{
+					position: absolute;
+					top: 0;
+					left: 0;
+					width: 100%;
+					height: 100%;
+					display: flex;
+					flex-direction: column;
+					justify-content: center;
+					align-items: center;
+					.qrcode-src{
+						width: 250rpx;
+						height: 250rpx;
+						margin-top: 20rpx;
+					}
+					.qrcode-text{
+						margin-top: 20rpx;
+						line-height: 40rpx;
+						font-size: 28rpx;
+						width: 100%;
+						text-align: center;
+						color: gray;
+					}
+				}
+			}
+			.btn{
+				width: 70%;
+			}
+		}
+	}
+</style>

pages/work/confirmScheme.vue

@@ -0,0 +1,288 @@
+<template>
+	<view class="content">
+		<view class="scheme-item" v-for="(item, index) in list" :key="index">
+			<view class="no">
+				<view class="no-text nowrap">{{item.order.order_no}}</view>
+				<text class="no-status nowrap">{{item.status.text}}</text>
+			</view>
+			<view class="scheme-content">
+				<view class="scheme-flex" @click="item.is_show_type = !item.is_show_type">
+					<label>业务类型</label>
+					<view class="value nowrap">
+						<view class="value-type">
+							<text class="type-tag" v-for="(citem, cindex) in item.order.item_type" :key="cindex" v-if="citem.number > 0">{{citem.title}}x{{citem.number}}</text>
+						</view>
+						<uni-icons class="orders-content-icon" :type="item.is_show_type ? 'top': 'bottom'" size="14" color="gray"></uni-icons>
+					</view>
+				</view>
+				<view class="scheme-block" v-show="item.is_show_type">
+					<view class="item-flex" v-for="(citem, cindex) in item.order.items" :key="cindex">
+						<view class="item-flex-title">{{citem.institution.title}}({{citem.business_type.title}})</view>
+						<view class="item-flex-value">￥{{citem.price}}</view>
+					</view>
+				</view>
+				<view class="scheme-flex">
+					<label>当前方案</label>
+					<view class="value nowrap">{{item.institution.title}}<text class="tag">{{item.business_type.title}}</text></view>
+				</view>
+				<view class="scheme-flex">
+					<label>下单日期</label>
+					<view class="value nowrap">{{item.order.created_at}}</view>
+				</view>
+			</view>
+			<view class="orders-flex">
+				<view class="user" @click="makePhone(item.order.manager.username)">
+					<image class="user-cover" :src="item.order.manager.avatar" mode="aspectFill"></image>
+					<view class="user-name">{{item.order.manager.nickname}}</view>
+				</view>
+				<view class="btns">
+					<view class="btns-item" v-if="item.status.value === 1" @click="$Router.push({name: 'ConfirmSchemeInfo', params: {schemeId: item.business_order_close_scheme_id}})">确认方案</view>
+				</view>
+			</view>
+		</view>
+		<u-loadmore v-if="pagesShow" :status="status" />
+	</view>
+</template>
+
+<script>
+	import { getConfirmScheme } from '@/apis/interfaces/order.js'
+	export default {
+		data() {
+			return {
+				list		: [],
+				page		: {
+					current	: 1,
+					has_more: false,
+				},
+				pagesShow	: false,
+				status   	: ''
+			};
+		},
+		onShow() {
+			this.page = {
+				current	: 1,
+				has_more: false,
+			}
+			this.$store.commit('setOrderId', this.$Route.query.orderId)
+			this.getList()
+		},
+		methods: {
+			getList(){
+				uni.showLoading({
+					title: '加载中...',
+					mask : true
+				})
+				getConfirmScheme({
+					business_order_id: this.$Route.query.orderId,
+					page: this.page.current
+				}).then(res => {
+					let { data, page } = res;
+					data.map(val => {
+						val.is_show_type = false
+					})
+					let atList   = page.current == 1 ? [] : this.list
+					this.list  		= atList.concat(data)
+					this.page  		= page
+					this.pagesShow 	= false
+				}).catch(err => {
+					uni.showToast({
+						title: err.message,
+						icon : 'none'
+					})
+				})
+			},
+			// 拨打电话
+			makePhone(phone){
+				uni.makePhoneCall({
+					phoneNumber: phone
+				})
+			}
+		},
+		onReachBottom() {
+			this.pagesShow = true;
+			if(this.page.has_more){
+				this.status    = 'loading';
+				this.page.current++
+				this.getList()
+				return
+			}
+			this.status    = 'nomore';
+		}
+	}
+</script>
+
+<style lang="scss">
+	.content{
+		padding: 30rpx 30rpx 0 30rpx;
+		box-sizing: border-box;
+	}
+	.scheme-item{
+		background: white;
+		margin-bottom: 30rpx;
+		border-radius: 20rpx;
+		.no{
+			padding: 0 30rpx;
+			line-height: 90rpx;
+			border-bottom: solid 1rpx #f6f6f6;
+			font-size: 30rpx;
+			display: flex;
+			justify-content: space-between;
+			.no-text{
+				width: calc(100% - 200rpx);
+			}
+			.no-status{
+				width: 200rpx;
+				text-align: right;
+				color: $main-color;
+				font-weight: bold;
+			}
+		}
+		.scheme-content{
+			padding: 20rpx 30rpx;
+			.scheme-flex{
+				line-height: 70rpx;
+				font-size: 30rpx;
+				display: flex;
+				justify-content: space-between;
+				label{
+					color: gray;
+					width: 200rpx;
+				}
+				.value{
+					width: calc(100% - 200rpx);
+					text-align: right;
+					.value-type{
+						display: inline-block;
+						text{
+							margin-right: 30rpx;
+							position: relative;
+							display: inline-block;
+							&::after{
+								position: absolute;
+								content: "/";
+								width: 30rpx;
+								text-align: center;
+								font-size: 30rpx;
+								top: 0;
+								right: -30rpx;
+							}
+							&:last-child{
+								margin-right: 0;
+								&::after{
+									display: none;
+								}
+							}
+						}
+					}
+					.tag{
+						color: $main-color;
+						border:solid 1rpx $main-color;
+						font-size: 26rpx;
+						height: 40rpx;
+						line-height: 40rpx;
+						padding: 0 15rpx;
+						border-radius: 20rpx;
+						display: inline-block;
+						box-sizing: border-box;
+						margin-left: 20rpx;
+					}
+				}
+			}
+		}
+		.scheme-block{
+			background: rgba(68, 110, 254, .03);
+			padding: 20rpx;
+			font-size: 28rpx;
+			border-radius: 10rpx;
+			margin: 10rpx 0;
+			.item-flex{
+				display: flex;
+				justify-content: space-between;
+				line-height: 50rpx;
+			}
+		}
+		.orders-flex{
+			border-bottom: solid 1rpx #F6F6F6;
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+			padding: 20rpx $padding;
+			&:last-child{
+				border-top: solid 1rpx #F6F6F6;
+				border-bottom: none;
+			}
+			.orders-tag{
+				display: inline-block;
+				background: $main-color;
+				font-size: 26rpx;
+				color: white;
+				border-radius: 10rpx;
+				padding: 0 10rpx;
+				height: 40rpx;
+				line-height: 40rpx;
+				margin-right: 10rpx;
+				&.order-tag-my{
+					background: $text-price;
+				}
+			}
+			.no{
+				font-size: 30rpx;
+				color: #111;
+				line-height: 60rpx;
+				width: calc(100% - 150rpx);
+			}
+			.state{
+				color: $main-color;
+				font-weight: bold;
+				font-size: 30rpx;
+				line-height: 60rpx;
+				width: 150rpx;
+				text-align: right;
+			}
+			.user{
+				padding-left: 90rpx;
+				position: relative;
+				min-height: 70rpx;
+				box-sizing: border-box;
+				width: calc(100% - 400rpx);
+				.user-cover{
+					position: absolute;
+					left: 0;
+					top: 0;
+					width: 70rpx;
+					height: 70rpx;
+					border-radius: 50%;
+					background: #ddd;
+				}
+				.user-name{
+					line-height: 70rpx;
+					font-size: 30rpx;
+					font-weight: bold;
+				}
+			}
+			.btns{
+				width: 400rpx;
+				text-align: right;
+				.btns-item{
+					display: inline-block;
+					height: 70rpx;
+					
+					line-height: 70rpx;
+					background: $main-color;
+					color: white;
+					border-radius: 35rpx;
+					padding: 0 30rpx;
+					font-size: 30rpx;
+					&.btns-border{
+						line-height: 68rpx;
+						box-sizing: border-box;
+						border:solid 1rpx $main-color;
+						background: white;
+						color: $main-color;
+						margin-right: 20rpx;
+					}
+				}
+			}
+		}
+	}
+</style>

pages/work/confirmSchemeInfo.vue

@@ -0,0 +1,285 @@
+<template>
+	<view class="content" v-if="user.nickname">
+		<view class="greet">
+			<view class="name">您好！{{user.nickname}}{{user.sex === '女'? '女士': '先生'}}</view>
+			<view>您名下的{{closeScheme.institution.title}}账户{{closeScheme.business_type.title}}洽谈协商服务已完成。</view>
+		</view>
+		<!-- 卡片信息 -->
+		<view class="schemes-block">
+			<view class="schemes-info">
+				<view class="schemes-flex">
+					<view class="schemes-title">{{closeScheme.institution.title}}</view>
+					<text class="schemes-type">{{closeScheme.business_type.title}}</text>
+				</view>
+				<block v-if="closeScheme.params.length > 0">
+					<view class="schemes-flex" v-for="(item, index) in closeScheme.params" :key="index">
+						<view class="schemes-label">{{item.title}}</view>
+						<text class="schemes-value">{{item.value || '-'}}</text>
+					</view>
+				</block>
+				<block v-else>
+					<view class="params-null">
+						<u-empty
+							mode="coupon"
+							icon="http://cdn.uviewui.com/uview/empty/coupon.png"
+							text="暂无结案方案"
+						>
+						</u-empty>
+					</view>
+				</block>
+			</view>
+		</view>
+		<!-- 温馨提示 -->
+		<view class="notic">
+			<text>{{closeScheme.business_type.sweet_notic}}</text>
+		</view>
+		<!-- 确认方案 -->
+		<view class="footer-btns">
+			<view class="btn-item" @click="show = true">不同意</view>
+			<view class="btn-item" @click="onAgree">同意并确认</view>
+		</view>
+		<!-- 弹出层 -->
+		<u-popup
+			:show="show"
+			round="20rpx"
+			closeable
+			@close="show = false"
+			:closeOnClickOverlay="false"
+		>
+			<view class="remove-from">
+				<view class="title">不同意原因</view>
+				<view class="textarea">
+					<textarea placeholder="请输入不同意原因" maxlength="500" v-model="remove"></textarea>
+					<view class="remove-number">{{remove.length}}/500</view>
+				</view>
+				<button class="btn" :disabled="remove.length <= 0" @click="onScheme('refuse', { 'remark': remove })">提交</button>
+			</view>
+		</u-popup>
+	</view>
+</template>
+
+<script>
+	import { getConfirmSchemeInfo, sbuConfirmScheme } from '@/apis/interfaces/order.js'
+	export default {
+		data() {
+			return {
+				show		: false,
+				user		: '',
+				closeScheme	: '',
+				remove		: ''
+			};
+		},
+		created() {
+			uni.showLoading({
+				title: '加载中...',
+				mask : true
+			})
+			getConfirmSchemeInfo(this.$Route.query.schemeId).then(res => {
+				let { close_scheme, user } = res;
+				this.closeScheme = close_scheme
+				this.user = user
+				uni.hideLoading()
+			}).catch(err => {
+				uni.showToast({
+					title: err.message,
+					icon : 'none'
+				})
+			})
+		},
+		methods: {
+			// 提示信息
+			onAgree(){
+				uni.showModal({
+					title		: '提示',
+					content		: '是确认接受当前结案方案?',
+					cancelText	: '再想一想',
+					confirmText	: '确认方案',
+					success		: res => {
+						if(res.confirm){
+							this.onScheme('agree')
+						}
+					}
+				})
+			},
+			// 提交方案
+			onScheme(type, parms){
+				uni.showLoading({
+					title: '加载中...',
+					mask : true
+				})
+				let data = parms || {}
+				sbuConfirmScheme(type, this.$Route.query.schemeId, data).then(res => {
+					if(type === 'refuse'){
+						this.show = false
+						this.remove = ''
+					}
+					uni.showModal({
+						title: '提示',
+						content: res,
+						showCancel: false,
+						success: () => {
+							this.$Router.back()
+						}
+					})
+				}).catch(err => {
+					uni.showToast({
+						title: err.message,
+						icon : 'none'
+					})
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	.content{
+		padding-bottom: 200rpx;
+		box-sizing: border-box;
+	}
+	// 拒绝方案弹出层
+	.remove-from{
+		padding: 30rpx 30rpx 50rpx;
+		.title{
+			text-align: center;
+			font-size: 34rpx;
+			padding-bottom: 30rpx;
+		}
+		.textarea{
+			background: #F6F6F6;
+			border-radius: 20rpx;
+			padding: 30rpx;
+			textarea{
+				font-size: 30rpx;
+				line-height: 40rpx;
+				height: 200rpx;
+			}
+		}
+		.remove-number{
+			text-align: right;
+			font-size: 28rpx;
+			color: gray;
+		}
+		.btn{
+			margin-top: 30rpx;
+			border-radius: 20rpx;
+			background: $main-color;
+			color: white;
+			font-size: 34rpx;
+			color: white;
+			height: 100rpx;
+			line-height: 100rpx;
+			padding: 0;
+			&[disabled]{
+				background-color: $main-color;
+				color: white;
+				opacity: .5;
+			}
+		}
+	}
+	// 同意方案
+	.footer-btns{
+		position: fixed;
+		bottom: 0;
+		left: 0;
+		right: 0;
+		padding: 30rpx 15rpx 50rpx;
+		background: white;
+		z-index: 3;
+		display: flex;
+		justify-content: space-between;
+		.btn-item{
+			width: calc(50% - 30rpx);
+			margin: 0 15rpx;
+			text-align: center;
+			line-height: 90rpx;
+			border:solid 1rpx $main-color;
+			color: $main-color;
+			border-radius: 20rpx;
+			&:last-child{
+				background-color: $main-color;
+				color: white;
+			}
+		}
+	}
+	// 欢迎
+	.greet{
+		background: $main-color;
+		padding: 30rpx 30rpx 200rpx 30rpx;
+		color: white;
+		font-size: 30rpx;
+		line-height: 40rpx;
+		.name{
+			padding-bottom: 20rpx;
+		}
+	}
+	// 温馨提示
+	.notic{
+		padding: 30rpx;
+		color: #FBAF3B;
+		font-size: 28rpx;
+		line-height: 40rpx;
+	}
+	// 方案
+	.schemes-block{
+		border-radius: 20rpx;
+		background: white;
+		margin: -140rpx 30rpx 0;
+		position: relative;
+		.schemes-info{
+			padding: 30rpx;
+			box-sizing: border-box;
+			position: relative;
+			.params-null{
+				padding: 30rpx 0 50rpx;
+			}
+			.schemes-flex{
+				display: flex;
+				justify-content: space-between;
+				align-items: center;
+				.schemes-title{
+					font-weight: bold;
+					font-size: 40rpx;
+					line-height: 70rpx;
+				}
+				.schemes-type{
+					background: white;
+					color: $main-color;
+					border:solid 1rpx $main-color;
+					font-size: 28rpx;
+					padding: 0 20rpx;
+					line-height: 40rpx;
+					border-radius: 20rpx;
+				}
+				.schemes-label{
+					line-height: 70rpx;
+					font-size: 30rpx;
+					width: 200rpx;
+					color: #999999;
+				}
+				.schemes-value{
+					width: calc( 100% - 200rpx );
+					font-size: 30rpx;
+					text-align: right;
+				}
+			}
+			// 提示信息
+			.schemes-tips{
+				background: #F6F6F6;
+				border-radius: 20rpx;
+				margin-top: 30rpx;
+				padding: 30rpx;
+				font-size: 28rpx;
+				color: #666;
+				.schemes-tips-title{
+					font-weight: bold;
+					color: #111;
+					padding-bottom: 20rpx;
+				}
+				text{
+					line-height: 40rpx;
+				}
+			}
+		}
+	}
+</style>

pages/work/orders.vue

@@ -75,11 +75,15 @@
 						<view class="btns-item btns-border" v-if="item.status.value == 4 && item.is_my" @click="onSign(item.business_order_id)">签约</view>
 						<view class="btns-item btns-border" v-if="item.status.value == 3" @click="$Router.push({name: 'Pay', params: {orderId: item.business_order_id, type: 'acting', paytype: 'price'}})">缴费</view>
 						<view class="btns-item btns-border" v-if="item.status.value == 5" @click="$Router.push({name: 'WorkPerfectChoose', params: {orderId: item.business_order_id, type: 'perfect'}})">完善</view>
-						<view class="btns-item btns-border" v-if="item.status.value == 6" @click="$Router.push({name: 'WorkPerfectChoose', params: {orderId: item.business_order_id, type: 'perfect'}})">查看资料</view>
+						<view class="btns-item btns-border" v-if="item.status.value == 6" @click="$Router.push({name: 'WorkPerfectChoose', params: {orderId: item.business_order_id }})">查看资料</view>
+						<!-- type: 'perfect' -->
+						<view class="btns-item btns-border" v-if="item.can.confirm && item.is_my" @click="$Router.push({name: 'ConfirmScheme', params: {orderId: item.business_order_id,}})">去确认</view>
 						<view class="btns-item" @click="$Router.push({name: 'OrderInfo', params: {orderId: item.business_order_id}})">查看</view>
 					</view>
 				</view>
 			</view>
+			<!-- 分页 -->
+			<u-loadmore v-if="pagesShow" :status="status" />
 		</view>
 		<!-- 订单是空的 -->
 		<view class="order-null" v-else>
@@ -128,6 +132,14 @@
 				actionLevels: [],
 				getSignState: false,
 				getNextTab	: false,
+				// 分页
+				page		: {
+					current	: 1,
+					has_more: false,
+				},
+				pagesShow	: false,
+				status   	: ''
+				
 			};
 		},
 		created() {
@@ -150,7 +162,6 @@
 					this.tabType = this.tabs[this.tabsCurrent].val
 					this.getList()
 					this.getNextTab = false;
-					this.$store.commit('setOrderId', null)
 					return
 				}
 				this.getList()
@@ -162,6 +173,8 @@
 			onTabs(e){
 				this.tabsCurrent = e.index
 				this.tabType = e.val
+				this.page = { current: 1, has_more: false }
+				this.orders = []
 				this.getList()
 			},
 			// 变更当前列表状态
@@ -175,15 +188,27 @@
 			},
 			// 获取列表
 			getList(){
-				this.$store.commit('setOrderId', null)
+				uni.showLoading({
+					title: '加载中...',
+					mask : true
+				})
+				if(this.$store.getters.getOrderId != null){
+					this.page = { current: 1, has_more: false }
+					this.$store.commit('setOrderId', null)
+				}
 				lists({
-					status: this.tabType
+					status: this.tabType,
+					page  : this.page.current 
 				}).then(res => {
-					let { data } = res;
+					let { data, page } = res;
 					data.map(val => {
 						val.is_show_type = false
 					})
-					this.orders = data
+					let atList   = page.current == 1 ? [] : this.orders
+					this.orders 	= atList.concat(data)
+					this.page  		= page
+					this.pagesShow 	= false
+					uni.hideLoading()
 				}).catch(err => {
 					uni.showToast({
 						title: err.message,
@@ -310,6 +335,16 @@
 					phoneNumber: phone
 				})
 			}
+		},
+		onReachBottom() {
+			this.pagesShow = true;
+			if(this.page.has_more){
+				this.status    = 'loading';
+				this.page.current++
+				this.getList()
+				return
+			}
+			this.status    = 'nomore';
 		}
 	}
 </script>

pages/work/perfectBasis.vue

@@ -51,7 +51,7 @@
 				<view class="from-item from-item-50">
 					<label>
 						<text>*</text>学历
-						<uni-icons v-if="baseInfo.check_params.marriage" class="from-icon" type="info" size="18" color="red" @click="modifyToast(baseInfo.check_params.education.description)"></uni-icons>
+						<uni-icons v-if="baseInfo.check_params.education" class="from-icon" type="info" size="18" color="red" @click="modifyToast(baseInfo.check_params.education.description)"></uni-icons>
 					</label>
 					<picker class="from-picker" :range="baseInfo.educations" :value="baseInfo.education"  @change="baseInfo.education = $event.detail.value">
 						<view class="from-picker-text">
@@ -110,7 +110,7 @@
 </template>
 
 <script>
-	import { perfectBase, updPerfectBase } from '@/apis/interfaces/order.js'
+	import { perfectBase, updPerfectBase, historyBase } from '@/apis/interfaces/order.js'
 	import { region } from '@/apis/interfaces/address.js'
 	export default {
 		data() {
@@ -211,6 +211,53 @@
 					showCancel	: false,
 				})
 			}
+		},
+		onNavigationBarButtonTap() {
+			let { userBankId, isMy} = this.$Route.query
+			if(!isMy) {
+				uni.showToast({
+					title: '非个人订单无法使用账户信息',
+					icon : 'none'
+				})
+				return
+			}
+			if(!userBankId.user_base_id) {
+				uni.showToast({
+					title: '暂无历史记录，无法使用账户历史信息，请手动填写',
+					icon : 'none'
+				})
+				return
+			}
+			uni.showModal({
+				title		: '提示',
+				content		: '确认使用历史基础信息快捷提交审核吗？提交后在审核期间不可更改',
+				confirmText	: '提交审核',
+				cancelText	: '取消',
+				success		: res => {
+					if(res.confirm){
+						uni.showLoading({
+							title: '提交中...',
+							mask : true
+						})
+						historyBase(this.baseInfo.business_order_user_id, userBankId.user_base_id).then(res => {
+							uni.hideLoading()
+							uni.showModal({
+								title		: '提示',
+								content		: '资料已保存',
+								showCancel	: false,
+								success		: ModalRes => {
+									this.$Router.back()
+								}
+							})
+						}).catch(err => {
+							uni.showToast({
+								title: err.message,
+								icon : 'none'
+							})
+						})
+					}
+				} 
+			})
 		}
 	}
 </script>

pages/work/perfectChoose.vue

@@ -7,7 +7,7 @@
 			<image class="cover" src="@/static/background/info_back.png" mode="widthFix"></image>
 		</view>
 		<view class="perfect-list">
-			<view class="perfect-item" @click="onPerfect('WorkPerfectBasis', baseInfo.is_finish, baseInfo.business_order_user_id)">
+			<view class="perfect-item" @click="onPerfect('WorkPerfectBasis', baseInfo.is_finish, baseInfo.business_order_user_id, baseInfo.is_my, baseInfo.user_base)">
 				<view class="cover">
 					<image class="cover-src" src="@/static/icons/tabs_show_01.png" mode="aspectFit"></image>
 				</view>
@@ -21,7 +21,7 @@
 			</view>
 			<!-- 机构列表 -->
 			<block v-for="(item, index) in businessArr" :key="index">
-				<view class="perfect-item" @click="onPerfect('WorkPerfectInstitutions', item.is_finish, item.business_order_item_id)">
+				<view class="perfect-item" @click="onPerfect('WorkPerfectInstitutions', item.is_finish, item.business_order_item_id, item.is_my, item.user_bank)">
 					<view class="cover">
 						<image class="cover-src" :src="item.institution.cover" mode="aspectFit"></image>
 					</view>
@@ -81,17 +81,19 @@
 				})
 			},
 			// 资料导航
-			onPerfect(name, finish, itemId){
+			onPerfect(name, finish, itemId, isMy, user){
 				if(finish == 1) {
-					if(name === 'WorkPerfectBasis') this.$Router.push({name: 'OrderPerfectBasisInfo', params: {orderId: this.orderId} })
+					if(name === 'WorkPerfectBasis') this.$Router.push({ name: 'OrderPerfectBasisInfo',  params: { orderId: this.orderId, }})
-					if(name === 'WorkPerfectInstitutions') this.$Router.push({name: 'OrderPerfectInstitutionsInfo', params: { itemId } })
+					if(name === 'WorkPerfectInstitutions') this.$Router.push({ name: 'OrderPerfectInstitutionsInfo', params: { itemId }})
 					return
 				}
 				this.$Router.push({
 					name,
 					params: {
 						itemId : itemId,
-						orderId: this.orderId
+						orderId: this.orderId,
+						isMy,
+						userBankId: user,
 					}
 				})
 			}

pages/work/perfectInstitutions.vue

@@ -114,7 +114,7 @@
 </template>
 
 <script>
-	import { baseBase, updBaseBase } from '@/apis/interfaces/order.js'
+	import { baseBase, updBaseBase, historyBank } from '@/apis/interfaces/order.js'
 	export default {
 		data() {
 			return {
@@ -269,6 +269,54 @@
 					showCancel	: false,
 				})
 			}
+		},
+		onNavigationBarButtonTap() {
+			console.log(this.$Route.query)
+			let { userBankId, isMy} = this.$Route.query
+			if(!isMy) {
+				uni.showToast({
+					title: '非个人订单无法使用账户信息',
+					icon : 'none'
+				})
+				return
+			}
+			if(!userBankId.user_bank_id) {
+				uni.showToast({
+					title: '暂无历史记录，无法使用账户历史信息，请手动填写',
+					icon : 'none'
+				})
+				return
+			}
+			uni.showModal({
+				title		: '提示',
+				content		: '确认使用历史基础信息快捷提交审核吗？提交后在审核期间不可更改',
+				confirmText	: '提交审核',
+				cancelText	: '取消',
+				success		: res => {
+					if(res.confirm){
+						uni.showLoading({
+							title: '提交中...',
+							mask : true
+						})
+						historyBank(this.submitId, userBankId.user_bank_id).then(res => {
+							uni.hideLoading()
+							uni.showModal({
+								title		: '提示',
+								content		: '资料已保存',
+								showCancel	: false,
+								success		: ModalRes => {
+									this.$Router.back()
+								}
+							})
+						}).catch(err => {
+							uni.showToast({
+								title: err.message,
+								icon : 'none'
+							})
+						})
+					}
+				} 
+			})
 		}
 	}
 </script>

pages/work/refundOrder.vue

@@ -9,7 +9,7 @@
 						<text class="orders-tag order-tag-my" v-else>个人</text>
 						{{item.order_no}}
 					</view>
-					<view class="state">{{item.status.text}}</view>
+					<view class="state">{{item.refund_status.text}}</view>
 				</view>
 				<view class="orders-content">
 					<view class="orders-content-item">