Merge branch 'master' of http://git.liuniu946.com/cmy/newmyj

App.vue

@@ -27,14 +27,17 @@ export default {
 		// 加载缓存中的用户信息
 		const userInfo = uni.getStorageSync('userInfo') || '';
 		// 判断是否拥有用户信息
-		if (userInfo.uid) {
+		if (userInfo) {
 			//更新登陆状态
 			uni.getStorage({
 				key: 'userInfo',
 				success: res => {
 					obj.setUserInfo(res.data);
 					obj.login();
+				},fail(res) {
+					console.log(res,'res.data');
 				}
+				
 			});
 		}
 		// 获取当前位置附近商店数据
@@ -265,12 +268,12 @@ uni-rich-text img {
 }
 // 基础按钮
 .base-buttom {
-	background-color: $color-green;
+	background-color: $base-color;
 	font-size: 32rpx;
 	padding: 30rpx;
 	color: #FFFFFF;
-	margin: 0 50rpx;
-	border-radius: 100rpx;
+	margin: 0 30rpx;
+	border-radius: 10rpx;
 	margin-top: 100rpx;
 	text-align: center;
 	z-index: 95;

api/model.js

@@ -0,0 +1,43 @@
+import request from '@/utils/request'
+// 获取服务时间类型
+export function getServiceTimeTypeList(data) {
+	return request({
+		url: '/api/pub/getServiceTimeTypeList',
+		method: 'post',
+		data
+	});
+}
+// 获取服务内容列表
+export function getServiceTypeList(data) {
+	return request({
+		url: '/api/pub/getServiceTypeList',
+		method: 'post',
+		data
+	});
+}
+// 获取服务职称
+export function getUserWorkTypeList(data) {
+	return request({
+		url: '/api/pub/getUserWorkTypeList',
+		method: 'post',
+		data
+	});
+}
+
+// 提交资料审核
+export function subInfoAudit(data) {
+	return request({
+		url: '/api/user/subInfoAudit',
+		method: 'post',
+		data
+	});
+}
+
+// 提交平台审核
+export function subTypeAudit(data) {
+	return request({
+		url: '/api/user/subTypeAudit',
+		method: 'post',
+		data
+	});
+}

pages.json

@@ -160,7 +160,20 @@
 				"style": {
 					"navigationBarTitleText": "模板页"
 				}
+			},
+			{
+				"path": "model/defaultmodel",
+				"style": {
+					"navigationBarTitleText": "当前模板"
+				}
+			},
+			{
+				"path": "model/shoprz",
+				"style": {
+					"navigationBarTitleText": "平台认证"
+				}
 			}
+			
 		]
 	}, {
 		"root": "pages/set",
@@ -305,7 +318,7 @@
 	},
 	"tabBar": {
 		"color": "#666666",
-		"selectedColor": "#5DBC7C",
+		"selectedColor": "#F65486",
 		"borderStyle": "black",
 		"backgroundColor": "#ffffff",
 		"list": [{

pages/user/model/defaultmodel.vue

@@ -0,0 +1,265 @@
+<template>
+	<view class="content ">
+		<view class="item-name">
+			工资认证
+		</view>
+		<view class="listBox">
+			<view class="con_box">
+				<view class="con_image" v-for="(item,ind) in updata.service_audit_imgs">
+					<image class="img" @click="navCroper(400,400,'audit',ind)"
+						:src="item"></image>
+					<image @click="updata.service_audit_imgs.splice(ind,1)" class="tip" src="../../../static/icon/goodsExit.png" mode="scaleToFill"></image>
+				</view>
+				<view class="con_image">
+					<image class="img" @click="navCroper(400,400,'auditall')"
+						src="../../../static/image/upImg.png"></image>
+				</view>
+			</view>
+		</view>
+		<view class="base-buttom" :class="{ 'bg-gray': loding }" @click="loding ? '' : confirm()">提交</view>
+	</view>
+</template>
+
+<script>
+	import {
+		subTypeAudit
+	} from '@/api/model.js';
+
+	import {
+		mapState
+	} from "vuex"
+	export default {
+		data() {
+			return {
+				// 上传数据
+				updata:{
+					service_audit_imgs: [], //服务图片
+				},
+				loding: false, //是否载入中
+
+			};
+		},
+		onLoad(options) {
+			this.init()
+		},
+		computed: {
+			// #ifdef H5
+			...mapState(['urlFile']),
+			// #endif
+			...mapState(['baseURL']),
+		},
+		methods: {
+			// 初始化
+			init() {
+				const that = this;
+			},
+			upLoad(path) {
+				// #ifdef H5
+				console.log(path, 'h5');
+				// #endif
+				uni.showLoading({
+					title: '图片上传中',
+					mask: true
+				});
+				return new Promise((resolve, error) => {
+					uni.uploadFile({
+						url: this.baseURL + '/api/user/upload', //仅为示例，非真实的接口地址
+						filePath: path,
+						name: 'file',
+						header: {
+							"token": uni.getStorageSync('token')
+						},
+						success: (uploadFileRes) => {
+							if ("string" === typeof uploadFileRes.data) {
+								resolve(JSON.parse(uploadFileRes.data).data)
+							} else {
+								resolve(uploadFileRes.data.data)
+							}
+						},
+						complete() {
+							uni.hideLoading()
+						}
+					});
+				})
+			},
+			// 图片裁切
+			/**
+			 * @param {Number} w 裁切宽度比例
+			 * @param {Number} h 裁切高度比例
+			 * @param {Number} mw 图片最小宽度
+			 * @param {Number} mh 图片最小高度
+			 * @param {String} url url修改
+			 */
+			navCroper(w, h, type, ind) {
+				let that = this;
+				let tt = (type == 'upimg' ? 2 : 1)
+				this.onImg(tt).then((url) => {
+					uni.navigateTo({
+						url: `../realName/cropper?width=${w}&height=${h}`,
+						events: {
+							uploadSuccess(res) {
+								that.upLoad(res).then((urldata) => {
+									 if (type == 'audit') {
+										that.updata.service_audit_imgs.splice(ind, 1, urldata.img)
+									}else if (type == 'auditall') {
+										that.updata.service_audit_imgs.push( urldata.img)
+									}
+								})
+							}
+						},
+						success: function(res) {
+							// 通过eventChannel向被打开页面传送数据
+							res.eventChannel.emit('urlNext', {
+								url
+							})
+						}
+					})
+				})
+			},
+			onImg(type) {
+				const _this = this
+				return new Promise((ok, erro) => {
+					// 判断是否需要选择
+					if (type == 1) {
+						uni.showActionSheet({
+							itemList: ['拍照', '选择一张照片'],
+							success: function(res) {
+								_this.chooseImage(res.tapIndex).then((url) => {
+									ok(url)
+								}).catch((res) => {
+									erro(res)
+								})
+							},
+							fail: function(res) {
+								erro(res)
+								console.log(res.errMsg);
+							}
+						});
+					}
+					// 判断是否只需要拍照
+					if (type == 2) {
+						_this.chooseImage(0).then((url) => {
+							ok(url)
+						}).catch((res) => {
+							erro(res)
+						})
+					}
+				})
+
+			},
+			chooseImage: function(index) {
+				const _this = this
+				return new Promise((ok, error) => {
+					// 从相册/相机选择
+					// 如需直接开相机或直接选相册，请只使用一个选项
+					const sourceType = index === 0 ? ['camera'] : ['album']
+					uni.chooseImage({
+						count: 1, //默认9
+						sizeType: ['original', 'compressed'], //可以指定是原图还是压缩图，默认二者都有
+						sourceType: sourceType,
+						success: function(res) {
+							ok(res.tempFilePaths[0])
+						},
+						fail(e) {
+							uni.showModal({
+								title: '文件打开错误',
+								content: '请设置授权文件存储权限',
+								showCancel: false,
+							});
+							error(e)
+						}
+					});
+				})
+
+			},
+
+			// 实名认证
+			confirm(e) {
+				const that = this;
+				if (that.updata.service_audit_imgs.length==0) {
+					uni.showModal({
+						title: '错误',
+						content: '请选择上传认证图片',
+						showCancel: false,
+					});
+					return
+				}
+				that.loding = true;
+				subTypeAudit({
+						user_work_type_id:that.updata.word.id,
+					})
+					.then((e) => {
+						that.loding = false;
+						this.$api.msg(e.msg);
+					})
+					.catch(err => {
+						this.loding = false;
+						console.log(err);
+					});
+			}
+		}
+	};
+</script>
+
+<style lang="scss">
+	.content,
+	page {
+		min-height: 100%;
+	}
+
+	.content {
+		padding-bottom: 150rpx;
+	}
+
+	.item-name {
+		margin: $page-row-spacing;
+		font-size: $font-lg;
+		font-weight: bold;
+		color: $font-color-dark;
+	}
+
+	.con_box {
+		margin: $page-row-spacing;
+
+		.con_image {
+			width: 150rpx;
+			height: 150rpx;
+			display: inline-block;
+			margin-right: 20rpx;
+			position: relative;
+
+			.img {
+				width: 100%;
+				height: 100%;
+			}
+
+			.tip {
+				position: absolute;
+				top: -10rpx;
+				right: -10rpx;
+				width: 30rpx;
+				height: 30rpx;
+				background-color: #FFF;
+				border-radius: 99rpx;
+			}
+		}
+	}
+
+	.listBox {
+		margin: $page-row-spacing;
+		margin-top: 30rpx;
+		border-radius: 20rpx;
+		overflow: hidden;
+		background-color: #FFFFFF;
+	}
+	.bg-gray {
+		background-color: $color-gray;
+	}
+
+	.base-buttom {
+		position: fixed;
+		bottom: 30rpx;
+		right: 0rpx;
+		left: 0rpx;
+	}
+</style>

pages/user/model/mymodel.vue

@@ -1,89 +1,231 @@
 <template>
-	<view class="content padding-b-30">
-		<view class="listBox" @click="navCroper(480,640,'upimg')">
+	<view class="content ">
+
+		<view class="item-name">
+			上传头像
+		</view>
+		<view class="con_box">
+			<view class="con_image">
+				<image class="img" @click="navCroper(400,400,'one')" :src="updata.avatar||`../../../static/image/upImg.png`">
+				</image>
+			</view>
+		</view>
+		<view class="item-name">
+			基本信息
+		</view>
+		<view class="listBox">
 			<view class="list">
 				<view class="flex listItem">
-					<view class="titleBox">
-						<view class="title">正面照</view>
-						<view class="font-color-gray font-size-sm">
-							上传您的正面照
-						</view>
+					<view class="flex titleBox">
+						<text class="font-color-red font-size-sm">✲</text> <text class="title">真实姓名</text>
 					</view>
 					<view class="right flex">
-						<!-- #ifdef H5 -->
-						<image class="userRenzheng" :src="upimg||this.urlFile + '/static/image/realUser.png'"
-							mode="widthFix"></image>
-						<!-- #endif -->
-						<!-- #ifndef H5 -->
-						<image class="userRenzheng" :src="upimg||'/static/image/realUser.png'" mode="widthFix"></image>
-						<!-- #endif -->
+						<input class="input" v-model="updata.name" type="text" placeholder="请填写真实姓名"
+							placeholder-class="placeholder" />
 					</view>
 				</view>
-			</view>
-		</view>
-		<view class="listBox" @click="navCroper(400,300,'sfzZm')">
-			<view class="list">
 				<view class="flex listItem">
-					<view class="titleBox">
-						<view class="title">身份证正面</view>
-						<view class="font-color-gray font-size-sm">
-							上传您的身份证正面
-						</view>
+					<view class="flex titleBox">
+						<text class="font-color-red font-size-sm">✲</text><text class="title">手机号</text>
 					</view>
 					<view class="right flex">
-						<!-- #ifdef H5 -->
-						<image class="userRenzheng" :src="sfzZm||this.urlFile + '/static/image/realZm.png'"
-							mode="widthFix"></image>
-						<!-- #endif -->
-						<!-- #ifndef H5 -->
-						<image class="userRenzheng" :src="sfzZm||'/static/image/realZm.png'" mode="widthFix"></image>
-						<!-- #endif -->
+						<input class="input" v-model="updata.phone" type="text" placeholder="请填写手机号"
+							placeholder-class="placeholder" />
 					</view>
 				</view>
-			</view>
-		</view>
-		<view class="listBox" @click="navCroper(400,300,'sfzFm')">
-			<view class="list">
 				<view class="flex listItem">
-					<view class="titleBox">
-						<view class="title">身份证反面</view>
-						<view class="font-color-gray font-size-sm">
-							上传您的身份证反面
-						</view>
+					<view class="flex titleBox">
+						<text class="font-color-red font-size-sm">✲</text><text class="title">身份证号</text>
 					</view>
 					<view class="right flex">
-						<!-- #ifdef H5 -->
-						<image class="userRenzheng" :src="sfzFm||this.urlFile + '/static/image/realBm.png'"
-							mode="widthFix"></image>
-						<!-- #endif -->
-						<!-- #ifndef H5 -->
-						<image class="userRenzheng" :src="sfzFm||'/static/image/realBm.png'" mode="widthFix"></image>
-						<!-- #endif -->
+						<input class="input" v-model="updata.cardId" type="text" placeholder="请填写身份证号"
+							placeholder-class="placeholder" />
+					</view>
+				</view>
+				<view class="flex listItem">
+					<view class="flex titleBox">
+						<text class="title">从业时长</text>
+					</view>
+					<view class="right flex">
+						<input class="input" v-model="updata.work_year" type="number" placeholder="请填写从业时长"
+							placeholder-class="placeholder" />
+					</view>
+				</view>
+				<view class="flex listItem">
+					<view class="flex titleBox">
+						<text class="title">籍贯</text>
+					</view>
+					<view class="right flex">
+						<input class="input" v-model="updata.ancestral_place" type="number" placeholder="请填写籍贯"
+							placeholder-class="placeholder" />
 					</view>
 				</view>
-			</view>
-		</view>
-    
-		<view class="listBox">
-			<view class="list">
 				<view class="flex listItem">
 					<view class="flex titleBox">
-						<text class="title">真实姓名</text>
+						<text class="title">学历</text>
 					</view>
 					<view class="right flex">
-						<input class="input" v-model="name" type="text" placeholder="请填写真实姓名"
+						<input class="input" v-model="updata.education" type="number" placeholder="请填写学历"
 							placeholder-class="placeholder" />
 					</view>
 				</view>
 				<view class="flex listItem">
 					<view class="flex titleBox">
-						<text class="title">身份证号</text>
+						<text class="title">民族</text>
 					</view>
 					<view class="right flex">
-						<input class="input" v-model="cardId" type="text" placeholder="请填写身份证号"
+						<input class="input" v-model="updata.minority" type="number" placeholder="请填写民族"
 							placeholder-class="placeholder" />
 					</view>
 				</view>
+				<view class="flex listItem">
+					<view class="flex titleBox">
+						<text class="title">出生日期</text>
+					</view>
+					<view class="right flex">
+						<picker class="input" value='2000-01-01' mode="date" @change="changetime">
+							<view>
+								{{updata.time||'请选择日期'}}
+							</view>
+						</picker>
+					</view>
+				</view>
+				<view class="flex listItem">
+					<view class="flex titleBox">
+						<text class="font-color-red font-size-sm">✲</text><text class="title">职业</text>
+					</view>
+					<view class="right flex">
+						<picker class="input" :range='workTypeList' range-key='title' mode="selector"
+							@change="changeWorkType">
+							<view>
+								{{updata.word.title||'选择职业'}}
+							</view>
+						</picker>
+					</view>
+				</view>
+				<view class="flex listItem">
+					<view class="flex titleBox">
+						<text class="font-color-red font-size-sm">✲</text><text class="title">收费类型</text>
+					</view>
+					<view class="right flex">
+						<picker class="input" :range='timeTypeList' range-key='title' mode="selector"
+							@change="changetimetype">
+							<view>
+								{{updata.timetype.title||'收费时间类型'}}
+							</view>
+						</picker>
+					</view>
+				</view>
+				<view class="flex listItem">
+					<view class="flex titleBox">
+						<text class="font-color-red font-size-sm">✲</text><text class="title">最低价</text>
+					</view>
+					<view class="right flex">
+						<input class="input" v-model="updata.minMoney" type="number" placeholder="请输入最低收费价"
+							placeholder-class="placeholder" />
+					</view>
+				</view>
+				<view class="flex listItem">
+					<view class="flex titleBox">
+						<text class="font-color-red font-size-sm">✲</text><text class="title">最高价</text>
+					</view>
+					<view class="right flex">
+						<input class="input" v-model="updata.maxMoney" type="number" placeholder="请输入最高收费价"
+							placeholder-class="placeholder" />
+					</view>
+				</view>
+				<view class="flex listItem">
+					<view class="flex titleBox">
+						<text class="font-color-red font-size-sm">✲</text><text class="title">服务区域</text>
+					</view>
+					<view class="right">
+						<view class="citylist">
+							<view class="flex margin-b-20" v-for="(item,ind) in updata.onCity" :key="ind">
+								<view></view>
+								<view>
+									{{item.province+item.city+item.district}}
+									<text class="margin-l-10 del" @click="updata.onCity.splice(ind,1)">
+										删除
+									</text>
+								</view>
+							</view>
+							<view class="flex">
+								<view></view>
+								<pickerAddress class="buttom" @change="onCityClick">添加地区</pickerAddress>
+							</view>
+						</view>
+
+					</view>
+				</view>
+				<view class="flex listItem">
+					<view class="flex titleBox">
+						<text class="font-color-red font-size-sm">✲</text><text class="title">服务内容</text>
+					</view>
+					<view class="right">
+						<checkbox-group @change="checkTypeChange">
+							<label class="flex timetype margin-b-10" v-for="(item,ind) in typeList" :key="item.id">
+								<view class="margin-r-10">{{item.title}}</view>
+								<view>
+									<checkbox :value="`${item.id}`" :checked="item.checked" />
+								</view>
+							</label>
+						</checkbox-group>
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="item-name">
+			自评
+		</view>
+		<view class="listBox">
+			<view class="list">
+				<view class="listItem">
+					<textarea auto-height :maxlength='-1' v-model="updata.mymask" type="text" placeholder="请填写自评内容"
+						placeholder-class="placeholder" />
+				</view>
+			</view>
+			<view class="con_box">
+				<view class="con_image" v-for="(item,ind) in updata.imageList">
+					<image class="img" @click="navCroper(400,400,'tab',ind)"
+						:src="item"></image>
+					<image @click="updata.imageList.splice(ind,1)" class="tip" src="../../../static/icon/goodsExit.png" mode="scaleToFill"></image>
+				</view>
+				<view class="con_image">
+					<image class="img" @click="navCroper(400,400,'all')"
+						src="../../../static/image/upImg.png"></image>
+				</view>
+			</view>
+		</view>
+		<view class="item-name">
+			我的证书
+		</view>
+		<view class="listBox">
+			<view class="con_box">
+				<view class="con_image" v-for="(item,ind) in updata.service_audit_imgs">
+					<image class="img" @click="navCroper(400,400,'audit',ind)"
+						:src="item"></image>
+					<image @click="updata.service_audit_imgs.splice(ind,1)" class="tip" src="../../../static/icon/goodsExit.png" mode="scaleToFill"></image>
+				</view>
+				<view class="con_image">
+					<image class="img" @click="navCroper(400,400,'auditall')"
+						src="../../../static/image/upImg.png"></image>
+				</view>
+			</view>
+		</view>
+		<view class="item-name">
+			服务展示
+		</view>
+		<view class="listBox">
+			<view class="con_box">
+				<view class="con_image" v-for="(item,ind) in updata.service_imgs">
+					<image class="img" @click="navCroper(400,400,'service',ind)"
+						:src="item"></image>
+					<image @click="updata.service_imgs.splice(ind,1)" class="tip" src="../../../static/icon/goodsExit.png" mode="scaleToFill"></image>
+				</view>
+				<view class="con_image">
+					<image class="img" @click="navCroper(400,400,'serviceall')"
+						src="../../../static/image/upImg.png"></image>
+				</view>
 			</view>
 		</view>
 		<view class="base-buttom" :class="{ 'bg-gray': loding }" @click="loding ? '' : confirm()">提交</view>
@@ -92,24 +234,67 @@
 
 <script>
 	import {
-		real_name
-	} from '@/api/user.js';
+		getServiceTimeTypeList,
+		getServiceTypeList,
+		subInfoAudit,
+		getUserWorkTypeList
+	} from '@/api/model.js';
+
+	import {
+		isCardNo
+	} from '@/utils/rocessor.js';
 	import {
 		mapState
 	} from "vuex"
+
+	import pickerAddress from '@/components/wangding-pickerAddress/wangding-pickerAddress.vue';
+
 	export default {
+		components: {
+			pickerAddress
+		},
 		data() {
 			return {
-				name: '', //用户名称
-				cardId: '', //身份证号
-				upimg: '', //图片地址
-				xyfImg: '', //信用分图片
-				sfzZm: '', //身份证正面
-				sfzFm: '', //身份证反面
+				// 上传数据
+				updata:{
+					avatar: '', //用户头像
+					name: '', //用户名称
+					phone: '', //手机号
+					cardId: '', //身份证号
+					minMoney: '',//最低价
+					maxMoney: '',//最高价
+					checkedType: [], //选中的服务类型
+					time: '', //出生日期
+					timetype: {
+						title: '',
+						code:''
+					}, //选中的时间类型
+					onCity: [], //选中的城市
+					mymask:'',//自评
+					imageList: [], //自评上传图片列表
+					ancestral_place:'',//籍贯
+					education:'',//学历
+					ancestral_place:'',//籍贯
+					minority:'',//民族
+					
+					work_year:'',//从业时长
+					word: {
+						title: '',
+						id:''
+					},
+					service_audit_imgs: [], //我的证书
+					service_imgs: [], //服务展示
+				},
+				typeList: [], //服务类型
+				timeTypeList: [], //时间类型
+				workTypeList: [], //工作类型
 				loding: false, //是否载入中
+
 			};
 		},
-		onLoad(options) {},
+		onLoad(options) {
+			this.init()
+		},
 		computed: {
 			// #ifdef H5
 			...mapState(['urlFile']),
@@ -117,9 +302,75 @@
 			...mapState(['baseURL']),
 		},
 		methods: {
+			// 初始化
+			init() {
+				const that = this;
+				getServiceTimeTypeList().then(
+					(res) => {
+						that.timeTypeList = res.data.list
+						that.updata.timetype=that.timeTypeList[0];
+						console.log(res);
+					}
+				).catch(
+					(res) => {
+						console.log(res);
+					}
+				)
+				getServiceTypeList().then(
+					(res) => {
+						that.typeList = res.data.list
+						console.log(res);
+					}
+				).catch(
+					(res) => {
+						console.log(res);
+					}
+				)
+				getUserWorkTypeList().then(
+					(res) => {
+						console.log(res);
+						that.workTypeList = res.data.list
+						that.updata.word=that.workTypeList[0]
+					}
+				).catch(
+					(res) => {
+						console.log(res);
+					}
+				)
+			},
+			// 选中的服务类型
+			checkTypeChange(type) {
+				this.updata.checkedType = type.detail.value;
+				console.log(type)
+			},
+			// 选中的工作类型
+			changeWorkType(type){
+				this.updata.word =  this.workTypeList[type.detail.value];
+				console.log(this.updata.word)
+			},
+			// 选择时间类型
+			changetimetype(res) {
+				this.updata.timetype = this.timeTypeList[res.detail.value];
+			},
+			// 时间选择
+			changetime(time) {
+				this.updata.time = time.detail.value;
+				console.log(time);
+			},
+			// 选择省市区
+			onCityClick({
+				data
+			}) {
+				let address = {};
+				address.province = data[0];
+				address.city = data[1];
+				address.district = data[2];
+				this.updata.onCity.push(address)
+				console.log(this.onCity, 'cs');
+			},
 			upLoad(path) {
 				// #ifdef H5
-				console.log(path,'h5');
+				console.log(path, 'h5');
 				// #endif
 				uni.showLoading({
 					title: '图片上传中',
@@ -127,11 +378,11 @@
 				});
 				return new Promise((resolve, error) => {
 					uni.uploadFile({
-						url: this.baseURL + '/api/upload/image', //仅为示例，非真实的接口地址
+						url: this.baseURL + '/api/user/qiniuUpload', //仅为示例，非真实的接口地址
 						filePath: path,
 						name: 'file',
 						header: {
-							"Authori-zation": 'Bearer ' + uni.getStorageSync('token')
+							"token": uni.getStorageSync('token')
 						},
 						success: (uploadFileRes) => {
 							if ("string" === typeof uploadFileRes.data) {
@@ -154,18 +405,32 @@
 			 * @param {Number} mh 图片最小高度
 			 * @param {String} url url修改
 			 */
-			navCroper(w, h, type) {
+			navCroper(w, h, type, ind) {
 				let that = this;
-				let tt = (type=='upimg'?2:1)
+				let tt = (type == 'upimg' ? 2 : 1)
 				this.onImg(tt).then((url) => {
 					uni.navigateTo({
 						url: `../realName/cropper?width=${w}&height=${h}`,
 						events: {
 							uploadSuccess(res) {
 								that.upLoad(res).then((urldata) => {
-									that[type] = urldata.url;
+									console.log(urldata);
+									if (type == 'one') {
+										that.updata.avatar = urldata.img
+									} else if (type == 'all') {
+										that.updata.imageList.push(urldata.img)
+									} else if (type == 'tab') {
+										that.updata.imageList.splice(ind, 1, urldata.img)
+									}else if (type == 'audit') {
+										that.updata.service_audit_imgs.splice(ind, 1, urldata.img)
+									}else if (type == 'auditall') {
+										that.updata.service_audit_imgs.push( urldata.img)
+									}else if (type == 'service') {
+										that.updata.service_imgs.splice(ind, 1, urldata.img)
+									}else if (type == 'serviceall') {
+										that.updata.service_imgs.push( urldata.img)
+									}
 								})
-								// console.log(e, '接受数据');
 							}
 						},
 						success: function(res) {
@@ -181,7 +446,7 @@
 				const _this = this
 				return new Promise((ok, erro) => {
 					// 判断是否需要选择
-					if(type==1){
+					if (type == 1) {
 						uni.showActionSheet({
 							itemList: ['拍照', '选择一张照片'],
 							success: function(res) {
@@ -198,16 +463,13 @@
 						});
 					}
 					// 判断是否只需要拍照
-					if(type==2){
+					if (type == 2) {
 						_this.chooseImage(0).then((url) => {
 							ok(url)
 						}).catch((res) => {
 							erro(res)
 						})
 					}
-					
-					
-
 				})
 
 			},
@@ -239,7 +501,17 @@
 
 			// 实名认证
 			confirm(e) {
-				if (!this.name) {
+				const that = this;
+				if (!that.updata.avatar) {
+					uni.showModal({
+						title: '错误',
+						content: '请上传头像',
+						showCancel: false,
+					});
+					return
+				}
+				
+				if (!that.updata.name) {
 					uni.showModal({
 						title: '错误',
 						content: '请填写姓名',
@@ -247,73 +519,95 @@
 					});
 					return
 				}
-				if (!this.cardId) {
+				if (!that.updata.cardId) {
 					uni.showModal({
 						title: '错误',
 						content: '请填写身份证号',
 						showCancel: false,
 					});
 					return
+				}else if(!isCardNo(that.updata.cardId)){
+					uni.showModal({
+						title: '错误',
+						content: '请填写正确的身份证号',
+						showCancel: false,
+					});
+					return
 				}
-				if (!this.upimg) {
+				if (!that.updata.phone) {
 					uni.showModal({
 						title: '错误',
-						content: '请上传正面照',
+						content: '请填写手机号',
 						showCancel: false,
 					});
 					return
 				}
-				if (!this.sfzZm) {
+				if (!that.updata.timetype.code) {
 					uni.showModal({
 						title: '错误',
-						content: '请上传身份证正面照',
+						content: '请选择收费时间类型',
 						showCancel: false,
 					});
 					return
 				}
-				if (!this.sfzFm) {
+				if (!that.updata.minMoney) {
 					uni.showModal({
 						title: '错误',
-						content: '请上传身份证反面照',
+						content: '请填写最低收费价',
 						showCancel: false,
 					});
 					return
 				}
-				/*
-				if (!this.xyfImg) {
+				if (!that.updata.maxMoney) {
 					uni.showModal({
 						title: '错误',
-						content: '上传您的信用分截图',
+						content: '请填写最高收费价',
 						showCancel: false,
 					});
 					return
-				}*/
-				this.loding = true;
-				real_name({
-						real_name: this.name,
-						id_card: this.cardId,
-						face_image: this.upimg.replace('data:image/jpeg;base64,', ''),
-						id_card_front_image: this.sfzZm.replace('data:image/jpeg;base64,', ''),
-						id_card_back_image: this.sfzFm.replace('data:image/jpeg;base64,', ''),
-						pay_points: this.xyfImg.replace('data:image/jpeg;base64,', ''),
-
+				}
+				if (that.updata.onCity.length==0) {
+					uni.showModal({
+						title: '错误',
+						content: '请选择服务区域',
+						showCancel: false,
+					});
+					return
+				}
+				if (that.updata.checkedType.length==0) {
+					uni.showModal({
+						title: '错误',
+						content: '请选择服务内容',
+						showCancel: false,
+					});
+					return
+				}
+				that.loding = true;
+				subInfoAudit({
+						avatar:that.updata.avatar,
+						name:that.updata.name,
+						mobile:that.updata.phone,
+						idcard:that.updata.cardId,
+						service_type:that.updata.timetype.code,
+						service_min_price:that.updata.minMoney,
+						service_max_price:that.updata.maxMoney,
+						service_area:that.updata.onCity.map((arr)=>{
+							return arr.district
+						}),
+						service_project:that.updata.checkedType,
+						service_intro_content:that.updata.mymask,
+						service_intro_imgs:that.updata.imageList,
+						work_year:that.updata.work_year,
+						ancestral_place:that.updata.ancestral_place,
+						education:that.updata.education,
+						minority:that.updata.minority,
+						service_audit_imgs:that.updata.service_audit_imgs,
+						service_imgs:that.updata.service_imgs,
+						user_work_type_id:that.updata.word.id,
 					})
 					.then((e) => {
-						this.loding = false;
-						if (e.msg == '已实名') {
-							uni.showModal({
-								title: '提示',
-								content: '恭喜您实名认证成功',
-								showCancel: false,
-								complete: () => {
-									uni.switchTab({
-										url: '/pages/userhome/user'
-									})
-								}
-							});
-						} else {
-							this.$api.msg('认证失败');
-						}
+						that.loding = false;
+						this.$api.msg(e.msg);
 					})
 					.catch(err => {
 						this.loding = false;
@@ -330,6 +624,44 @@
 		min-height: 100%;
 	}
 
+	.content {
+		padding-bottom: 150rpx;
+	}
+
+	.item-name {
+		margin: $page-row-spacing;
+		font-size: $font-lg;
+		font-weight: bold;
+		color: $font-color-dark;
+	}
+
+	.con_box {
+		margin: $page-row-spacing;
+
+		.con_image {
+			width: 150rpx;
+			height: 150rpx;
+			display: inline-block;
+			margin-right: 20rpx;
+			position: relative;
+
+			.img {
+				width: 100%;
+				height: 100%;
+			}
+
+			.tip {
+				position: absolute;
+				top: -10rpx;
+				right: -10rpx;
+				width: 30rpx;
+				height: 30rpx;
+				background-color: #FFF;
+				border-radius: 99rpx;
+			}
+		}
+	}
+
 	.listBox {
 		margin: $page-row-spacing;
 		margin-top: 30rpx;
@@ -361,13 +693,33 @@
 			flex-grow: 1;
 			justify-content: flex-end;
 
-			.userRenzheng {
-				width: 400rpx;
+			.timetype {
+				width: 100%;
+				justify-content: flex-end;
+			}
+
+			.citylist {
+				.del {
+					color: $color-red;
+					font-size: $font-sm;
+					border: 1px solid $color-red;
+					border-radius: 10rpx;
+					line-height: 1;
+					padding: 5rpx 15rpx;
+				}
 			}
 
 			.img {
 				width: 26rpx;
 			}
+
+			.buttom {
+				color: $base-color;
+				border: 1px solid $base-color;
+				border-radius: 10rpx;
+				line-height: 1;
+				padding: 10rpx 20rpx;
+			}
 		}
 
 		.titleBox {
@@ -383,9 +735,9 @@
 	}
 
 	.base-buttom {
-		position: relative;
-		bottom: auto;
-		right: auto;
-		left: auto;
+		position: fixed;
+		bottom: 30rpx;
+		right: 0rpx;
+		left: 0rpx;
 	}
 </style>

pages/user/model/shoprz.vue

@@ -0,0 +1,326 @@
+<template>
+	<view class="content ">
+		<view class="item-name">
+			工资认证
+		</view>
+		<view class="listBox">
+			<view class="con_box">
+				<view class="con_image" v-for="(item,ind) in updata.service_audit_imgs">
+					<image class="img" @click="navCroper(400,400,'audit',ind)"
+						:src="item"></image>
+					<image @click="updata.service_audit_imgs.splice(ind,1)" class="tip" src="../../../static/icon/goodsExit.png" mode="scaleToFill"></image>
+				</view>
+				<view class="con_image">
+					<image class="img" @click="navCroper(400,400,'auditall')"
+						src="../../../static/image/upImg.png"></image>
+				</view>
+			</view>
+		</view>
+		<view class="base-buttom" :class="{ 'bg-gray': loding }" @click="loding ? '' : confirm()">提交</view>
+	</view>
+</template>
+
+<script>
+	import {
+		subTypeAudit
+	} from '@/api/model.js';
+
+	import {
+		mapState
+	} from "vuex"
+	export default {
+		data() {
+			return {
+				// 上传数据
+				updata:{
+					service_audit_imgs: [], //服务图片
+				},
+				loding: false, //是否载入中
+
+			};
+		},
+		onLoad(options) {
+			this.init()
+		},
+		computed: {
+			// #ifdef H5
+			...mapState(['urlFile']),
+			// #endif
+			...mapState(['baseURL']),
+		},
+		methods: {
+			// 初始化
+			init() {
+				const that = this;
+			},
+			upLoad(path) {
+				// #ifdef H5
+				console.log(path, 'h5');
+				// #endif
+				uni.showLoading({
+					title: '图片上传中',
+					mask: true
+				});
+				return new Promise((resolve, error) => {
+					uni.uploadFile({
+						url: this.baseURL + '/api/user/qiniuUpload', //仅为示例，非真实的接口地址
+						filePath: path,
+						name: 'file',
+						header: {
+							"token": uni.getStorageSync('token')
+						},
+						success: (uploadFileRes) => {
+							if ("string" === typeof uploadFileRes.data) {
+								resolve(JSON.parse(uploadFileRes.data).data)
+							} else {
+								resolve(uploadFileRes.data.data)
+							}
+						},
+						complete() {
+							uni.hideLoading()
+						}
+					});
+				})
+			},
+			// 图片裁切
+			/**
+			 * @param {Number} w 裁切宽度比例
+			 * @param {Number} h 裁切高度比例
+			 * @param {Number} mw 图片最小宽度
+			 * @param {Number} mh 图片最小高度
+			 * @param {String} url url修改
+			 */
+			navCroper(w, h, type, ind) {
+				let that = this;
+				let tt = (type == 'upimg' ? 2 : 1)
+				this.onImg(tt).then((url) => {
+					uni.navigateTo({
+						url: `../realName/cropper?width=${w}&height=${h}`,
+						events: {
+							uploadSuccess(res) {
+								that.upLoad(res).then((urldata) => {
+									 if (type == 'audit') {
+										that.updata.service_audit_imgs.splice(ind, 1, urldata.img)
+									}else if (type == 'auditall') {
+										that.updata.service_audit_imgs.push( urldata.img)
+									}
+								})
+							}
+						},
+						success: function(res) {
+							// 通过eventChannel向被打开页面传送数据
+							res.eventChannel.emit('urlNext', {
+								url
+							})
+						}
+					})
+				})
+			},
+			onImg(type) {
+				const _this = this
+				return new Promise((ok, erro) => {
+					// 判断是否需要选择
+					if (type == 1) {
+						uni.showActionSheet({
+							itemList: ['拍照', '选择一张照片'],
+							success: function(res) {
+								_this.chooseImage(res.tapIndex).then((url) => {
+									ok(url)
+								}).catch((res) => {
+									erro(res)
+								})
+							},
+							fail: function(res) {
+								erro(res)
+								console.log(res.errMsg);
+							}
+						});
+					}
+					// 判断是否只需要拍照
+					if (type == 2) {
+						_this.chooseImage(0).then((url) => {
+							ok(url)
+						}).catch((res) => {
+							erro(res)
+						})
+					}
+				})
+
+			},
+			chooseImage: function(index) {
+				const _this = this
+				return new Promise((ok, error) => {
+					// 从相册/相机选择
+					// 如需直接开相机或直接选相册，请只使用一个选项
+					const sourceType = index === 0 ? ['camera'] : ['album']
+					uni.chooseImage({
+						count: 1, //默认9
+						sizeType: ['original', 'compressed'], //可以指定是原图还是压缩图，默认二者都有
+						sourceType: sourceType,
+						success: function(res) {
+							ok(res.tempFilePaths[0])
+						},
+						fail(e) {
+							uni.showModal({
+								title: '文件打开错误',
+								content: '请设置授权文件存储权限',
+								showCancel: false,
+							});
+							error(e)
+						}
+					});
+				})
+
+			},
+
+			// 实名认证
+			confirm(e) {
+				const that = this;
+				if (that.updata.service_audit_imgs.length==0) {
+					uni.showModal({
+						title: '错误',
+						content: '请上传工资截图',
+						showCancel: false,
+					});
+					return
+				}
+				that.loding = true;
+				subTypeAudit({
+						user_work_type_id:that.updata.word.id,
+					})
+					.then((e) => {
+						that.loding = false;
+						this.$api.msg(e.msg);
+					})
+					.catch(err => {
+						this.loding = false;
+						console.log(err);
+					});
+			}
+		}
+	};
+</script>
+
+<style lang="scss">
+	.content,
+	page {
+		min-height: 100%;
+	}
+
+	.content {
+		padding-bottom: 150rpx;
+	}
+
+	.item-name {
+		margin: $page-row-spacing;
+		font-size: $font-lg;
+		font-weight: bold;
+		color: $font-color-dark;
+	}
+
+	.con_box {
+		margin: $page-row-spacing;
+
+		.con_image {
+			width: 150rpx;
+			height: 150rpx;
+			display: inline-block;
+			margin-right: 20rpx;
+			position: relative;
+
+			.img {
+				width: 100%;
+				height: 100%;
+			}
+
+			.tip {
+				position: absolute;
+				top: -10rpx;
+				right: -10rpx;
+				width: 30rpx;
+				height: 30rpx;
+				background-color: #FFF;
+				border-radius: 99rpx;
+			}
+		}
+	}
+
+	.listBox {
+		margin: $page-row-spacing;
+		margin-top: 30rpx;
+		border-radius: 20rpx;
+		overflow: hidden;
+		background-color: #FFFFFF;
+	}
+
+	.list {
+		.input {
+			text-align: right;
+			font-size: $font-base;
+			color: $color-gray;
+			width: 100%;
+		}
+
+		.listItem {
+			padding: 35rpx 40rpx;
+			border-bottom: 1px solid $page-color-light;
+		}
+
+		.listIconImg {
+			width: 36rpx;
+		}
+
+		.right {
+			color: $font-color-light;
+			font-size: $font-base;
+			flex-grow: 1;
+			justify-content: flex-end;
+
+			.timetype {
+				width: 100%;
+				justify-content: flex-end;
+			}
+
+			.citylist {
+				.del {
+					color: $color-red;
+					font-size: $font-sm;
+					border: 1px solid $color-red;
+					border-radius: 10rpx;
+					line-height: 1;
+					padding: 5rpx 15rpx;
+				}
+			}
+
+			.img {
+				width: 26rpx;
+			}
+
+			.buttom {
+				color: $base-color;
+				border: 1px solid $base-color;
+				border-radius: 10rpx;
+				line-height: 1;
+				padding: 10rpx 20rpx;
+			}
+		}
+
+		.titleBox {
+			.title {
+				color: $font-color-base;
+				font-size: $font-base;
+			}
+		}
+	}
+
+	.bg-gray {
+		background-color: $color-gray;
+	}
+
+	.base-buttom {
+		position: fixed;
+		bottom: 30rpx;
+		right: 0rpx;
+		left: 0rpx;
+	}
+</style>

pages/userhome/user.vue

@@ -12,30 +12,30 @@
 								<text class="clamp padding-r-20">
 									{{ user.nickname || '游客' }}
 								</text>
-								
+
 								<view class="tipLevel flex-shrink-false">
 								</view>
 							</view>
 							<view class="flex-start flex">
 								<view class="authentication"
-									@click="navTo('/pages/user/realName/realNameAuthentication')"
-									v-if="!user.mobile"></view>
+									@click="navTo('/pages/user/realName/realNameAuthentication')" v-if="!user.mobile">
+								</view>
 								<view class="authentication" v-else>{{user.mobile}}</view>
 							</view>
 						</view>
 						<view class="righ-tbox flex">
-							<image class="right-tip" src="../../static/icon/ye.png" mode="scaleToFill"></image>
-							<block>
+							<image class="right-tip" src="../../static/icon/tiptop.png" mode="scaleToFill"></image>
+							<block v-if="!user.work_type_title">
 								普通用户
 							</block>
+							<block v-else>
+								{{user.work_type_title}}
+							</block>
 						</view>
 					</view>
 				</view>
 			</view>
-			<navigator url="/pages/user/model/mymodel">
-				
-			<view class="nav-model flex">
-				<image class="img" src="../../static/error/emptyList.png" mode="scaleToFill"></image>
+			<view class="nav-model flex" @click="navcard">
 				<view class="right-card">
 					<view class="title">
 						我的名片
@@ -44,50 +44,86 @@
 						认证成功即可获得母婴师名片
 					</view>
 				</view>
-				<view class="right">
-					
+				<image class="next" src="../../static/icon/next2.png" mode="scaleToFill"></image>
+			</view>
+			<view class="nav-model-rz flex" v-if="user.work_type_id>0&&user.type_audit_status!=1" @click="navTo('/pages/user/model/shoprz')">
+				<view class="tiptext" v-if="user.type_audit_status==-2">
+					您未完成平台认证，请立即认证>>
+				</view>
+				<view class="tiptext" v-if="user.type_audit_status==-1">
+					您平台认证失败，请重新认证>>
+				</view>
+				<view class="tiptext" v-if="user.type_audit_status==-3">
+					您平台认证已失效，请重新认证>>
+				</view>
+				<view class="rztext" v-if="user.type_audit_status==-2">
+					立即认证
+				</view>
+				<view class="rztext" v-else>
+					重新认证
 				</view>
 			</view>
-			</navigator>
 			<view class="cover-container">
 				<view class="listBox">
 					<view class="list">
+						<!-- <view class="flex listItem" @click="navTo('/pages/user/myCart/myCart')">
+							<view class="flex titleBox">
+								<image class="listIconImg" src="../../static/icon/mymoney.png" mode="widthFix"></image>
+								<text class="title">我的钱包</text>
+							</view>
+							<view class="right flex">
+								<text></text>
+								<image class="img" src="../../static/icon/next1.png" mode="widthFix"></image>
+							</view>
+						</view> -->
 						<view class="flex listItem" @click="navTo('/pages/user/myCart/myCart')">
 							<view class="flex titleBox">
-								<image class="listIconImg" src="../../static/icon/myCart.png" mode="widthFix"></image>
-								<text class="title">我的车辆</text>
+								<image class="listIconImg" src="../../static/icon/mymodel.png" mode="widthFix"></image>
+								<text class="title">已购模板</text>
 							</view>
 							<view class="right flex">
 								<text></text>
 								<image class="img" src="../../static/icon/next1.png" mode="widthFix"></image>
 							</view>
 						</view>
-						<view class="flex listItem" @click="navTo('/pages/user/repair/userRepair')">
+						<!-- <view class="flex listItem" @click="navTo('/pages/user/myCart/myCart')">
 							<view class="flex titleBox">
-								<image class="listIconImg" src="../../static/icon/myWx.png" mode="widthFix"></image>
-								<text class="title">维修历史</text>
+								<image class="listIconImg" src="../../static/icon/myaddress.png" mode="widthFix"></image>
+								<text class="title">收货地址</text>
 							</view>
 							<view class="right flex">
 								<text></text>
-								<!-- <image class="img" src="../../static/icon/next1.png" mode="widthFix"></image> -->
+								<image class="img" src="../../static/icon/next1.png" mode="widthFix"></image>
 							</view>
-						</view>
+						</view> -->
+						<!-- #ifdef MP -->
+						<button hover-class="none" class="flex listItem" open-type='contact'>
+							<view class="flex titleBox">
+								<image class="listIconImg" src="../../static/icon/myserve.png" mode="widthFix"></image>
+								<text class="title">客服中心</text>
+							</view>
+							<view class="right flex">
+								<text></text>
+								<image class="img" src="../../static/icon/next1.png" mode="widthFix"></image>
+							</view>
+						</button>
+						<!-- #endif -->
 						<!-- #ifndef APP -->
-						<view class="flex listItem" @click="navTo('/pages/user/shareQrCode')">
+						<!-- <view class="flex listItem" @click="navTo('/pages/user/shareQrCode')">
 							<view class="flex titleBox">
-								<image class="listIconImg" src="../../static/icon/myitem.png" mode="widthFix"></image>
+								<image class="listIconImg" src="../../static/icon/myshare.png" mode="widthFix"></image>
 								<text class="title">邀请好友</text>
 							</view>
 							<view class="right flex">
 								<text></text>
 								<image class="img" src="../../static/icon/next1.png" mode="widthFix"></image>
 							</view>
-						</view>
+						</view> -->
 						<!-- #endif -->
 						<!-- #ifdef APP -->
 						<view class="flex listItem" @click="shareDomApp">
 							<view class="flex titleBox">
-								<image class="listIconImg" src="../../static/icon/myitem.png" mode="widthFix"></image>
+								<image class="listIconImg" src="../../static/icon/myshare.png" mode="widthFix"></image>
 								<text class="title">邀请好友</text>
 							</view>
 							<view class="right flex">
@@ -99,7 +135,7 @@
 						<!-- #ifndef MP -->
 						<view class="flex listItem" @click="navTo('/pages/public/workwork')">
 							<view class="flex titleBox">
-								<image class="listIconImg" src="../../static/icon/myServer.png" mode="widthFix"></image>
+								<image class="listIconImg" src="../../static/icon/myinfo.png" mode="widthFix"></image>
 								<text class="title">关于我们</text>
 							</view>
 							<view class="right flex">
@@ -110,7 +146,7 @@
 						<!-- #endif -->
 						<view class="flex listItem" @click="navTo('/pages/set/set')">
 							<view class="flex titleBox">
-								<image class="listIconImg" src="../../static/icon/mySet.png" mode="widthFix"></image>
+								<image class="listIconImg" src="../../static/icon/myset.png" mode="widthFix"></image>
 								<text class="title">设置</text>
 							</view>
 							<view class="right flex">
@@ -149,16 +185,6 @@
 				user: {
 					avatar: '', //头像
 					nickname: '', //昵称
-					now_money: 0, //余额
-					brokerage_price: 0, //佣金
-					record_sum: 0, //行程
-					notice_sum: 0, //报警信息
-					question_sum: 0, //系统消息
-					// 订单数据类型
-					orderStatusNum: {
-						unpaid_count: 0, //待付款
-						received_count: 0, //待收货
-					},
 				},
 				shareData: {}
 			};
@@ -184,13 +210,27 @@
 			this.getUser();
 		},
 		methods: {
+			// 跳转卡片页面
+			navcard() {
+				// 判断是否已经认证
+				if (this.user.work_type_id <=0) {
+					this.navTo('/pages/user/model/mymodel')
+				} else {
+					if (this.user.show_template_code) {
+						this.navTo('/pages/user/model/defaultmodel?code=' + this.user.show_template_code)
+					}else{
+						this.navTo('/pages/user/model/defaultmodel')
+					}
+				}
+			},
+
 			//#ifdef APP
 			shareDomApp() {
 				uni.share({
 					provider: 'weixin',
 					type: 0,
 					title: '母婴界严选',
-					summary: '新一代智能电动车，手机开关锁、智能防盗、卫星定位，时刻掌握爱车位置。品牌大厂生产，质量好，款式多，售后优，所有车辆支持0元购新车！',
+					summary: '',
 					imageUrl: this.shareData.img,
 					href: this.baseURL + this.urlFile + '/pages/public/register?spread=' + this.userInfo.uid
 				})
@@ -203,7 +243,7 @@
 				getUser({}).then((e) => {
 					this.user = e.data;
 				}).catch((e) => {
-					console.log(e,'sj');
+					console.log(e, 'sj');
 				})
 				// 系统消息
 				// articleList({}, 1).then((e) => {
@@ -223,6 +263,7 @@
 				this.$emit('tab', true)
 			},
 			navTo(url) {
+				console.log(this.hasLogin,'this.hasLogin');
 				if (!this.hasLogin) {
 					// 保存地址
 					saveUrl();
@@ -244,6 +285,7 @@
 	page {
 		height: 100%;
 	}
+
 	.listBox {
 		margin-top: 20rpx;
 		overflow: hidden;
@@ -255,8 +297,13 @@
 			margin-bottom: 15rpx;
 			background-color: #FFFFFF;
 			border-radius: 20rpx;
+			border: none;
+			line-height: 1;
+			&::after{
+				border: none;
+			}
 		}
-
+		
 		.listIconImg {
 			width: 36rpx;
 			height: 36rpx;
@@ -289,7 +336,8 @@
 	.user-section {
 		padding: 15rpx 30rpx 0;
 		position: relative;
-		background-color: $base-color;
+		background: url('https://api.myjie.cn/resource/appimage/userbg.png');
+		background-size: 100% 100%;
 		padding-top: 100rpx;
 		height: 350rpx;
 	}
@@ -307,7 +355,7 @@
 			height: 130rpx;
 			flex-grow: 1;
 			overflow: hidden;
-			
+
 			.portrait-box {
 				height: 100%;
 
@@ -343,14 +391,16 @@
 					float: left;
 				}
 			}
-			.righ-tbox{
-				padding:10rpx 20rpx  ;
+
+			.righ-tbox {
+				padding: 10rpx 20rpx;
 				border-radius: 12rpx;
-				font-size: 25rpx ;
+				font-size: 25rpx;
 				line-height: 1;
 				color: $base-color;
 				background-color: #FFF;
-				.right-tip{
+
+				.right-tip {
 					width: 25rpx;
 					height: 33rpx;
 					margin-right: 10rpx;
@@ -358,26 +408,61 @@
 			}
 		}
 	}
-	.nav-model{
-		background: linear-gradient(270deg, #FF99B8, #FF86AB);
+	.nav-model-rz{
+		background-color:#FFD7E3 ;
+		border-radius: 20rpx;
+		margin: 0 auto;
+		padding: 30rpx;
+		padding-bottom: 15rpx;
+		padding-top: 50rpx;
+		line-height: 1;
+		width: 690rpx;
+		margin-top: -38rpx;
+		.tiptext{
+			color:#F65486 ;
+			font-size: 26rpx;
+			font-weight: bold;
+		}
+		.rztext{
+			color: #FFF;
+			background-color: #F65486;
+			border-radius: 100rpx;
+			padding: 15rpx 20rpx;
+			font-size: 22rpx;
+		}
+	}
+
+	.nav-model {
+		background: url('https://api.myjie.cn/resource/appimage/uservip.png');
+		background-size: 100% 100%;
 		color: #FFF;
 		border-radius: 20rpx;
-		width: 710rpx;
+		width: 690rpx;
+		height: 157rpx;
 		margin: 0 auto;
-		margin-top: -50rpx;
+		margin-top: -80rpx;
 		font-weight: bold;
 		z-index: 1;
 		position: relative;
-		.img{
-			height: 157rpx;
+
+		.next {
+			width: 26rpx;
+			height: 28rpx;
+			margin-right: 40rpx;
 		}
-		.title{
+
+		.right-card {
+			padding-left: 170rpx;
+		}
+
+		.title {
 			font-size: 35rpx;
 		}
-		.tip{
+
+		.tip {
 			font-size: 26rpx;
 		}
-		
+
 	}
 
 	.cover-container {

uni_modules/ksp-cropper/changelog.md

@@ -1,3 +1,11 @@
+## 1.1.9（2023-03-24）
+修护bug
+## 1.1.8（2023-03-24）
+修护bug
+## 1.1.7（2022-12-08）
+修护bug
+## 1.1.6（2022-11-18）
+修好app无法拖动问题
 ## 1.1.5（2022-06-14）
 填新版HBuilderX的坑，简单测试是没问题了。
 ## 1.1.4（2022-02-15）

uni_modules/ksp-cropper/components/ksp-cropper/ksp-cropper.vue

@@ -1,5 +1,5 @@
 <template>
-<view v-show="url" :mode="modeValue" :change:mode="mwx.changeMode" :rotate="rotate" :change:rotate="mwx.changeRotate">
+<view v-if="url" :mode="modeValue" :change:mode="mwx.changeMode" :rotate="rotate" :change:rotate="mwx.changeRotate">
 	<!-- #ifdef MP-WEIXIN -->
 	<canvas type="2d" class="canvas" :style="{width: target.width + 'px', height: target.height + 'px'}"></canvas>
 	<!-- #endif -->
@@ -289,8 +289,8 @@ export default {
 			context.restore();
 			wx.canvasToTempFilePath({
 				canvas: canvas,
-				destWidth: mx.tw,
-				destHeight: mx.th,
+				// destWidth: mx.tw,
+				// destHeight: mx.th,
 				success: (rst) => {
 					var path = rst.tempFilePath;
 					this.$emit("ok", {
@@ -511,8 +511,12 @@ export default {
     }
 	function touchstart(event, oi) {
 		// #ifdef APP-PLUS || H5
-		event.preventDefault();
-		event.stopPropagation();
+        if (event.preventDefault) {
+            event.preventDefault();
+        }
+        if (event.stopPropagation) {
+            event.stopPropagation();
+        }
 		// #endif
 		touches = event.touches;
 		var instance = event.instance;
@@ -538,7 +542,7 @@ export default {
 		return false;
 	}
 	function touchmove(event, oi) {
-		// #ifdef APP-PLUS || H5
+		// #ifdef H5
 		event.preventDefault();
 		event.stopPropagation();
 		// #endif

uni_modules/ksp-cropper/package.json

@@ -1,22 +1,17 @@
 {
   "id": "ksp-cropper",
   "displayName": "ksp-cropper",
-  "version": "1.1.5",
-  "description": "高性能图片裁剪工具",
+  "version": "1.1.9",
+  "description": "高性能图片裁剪工具，采用wxs技术开发，拖动丝滑。",
   "keywords": [
     "头像",
     "图片",
     "裁剪"
 ],
   "repository": "",
-  "engines": {
-    "HBuilderX": "^3.1.0"
+"engines": {
   },
-  "dcloudext": {
-    "category": [
-        "前端组件",
-        "通用组件"
-    ],
+"dcloudext": {
     "sale": {
       "regular": {
         "price": "0.00"
@@ -33,7 +28,8 @@
       "data": "插件不采集任何数据",
       "permissions": "无"
     },
-    "npmurl": ""
+    "npmurl": "",
+    "type": "component-vue"
   },
   "uni_modules": {
     "dependencies": [],

uni_modules/ksp-cropper/readme.md

@@ -70,4 +70,8 @@
 		}
 	}
 </script>
-```
+```
+
+### 注意
+微信小程序从基础库 2.21.0 开始， wx.chooseImage 停止维护，请使用 uni.chooseMedia 代替。
+微信小程序真机调试会报错，但正常运行是不会有问题的。

utils/newRequest.js

@@ -148,7 +148,7 @@ let service = {
 							filePath: path,
 							name: 'file',
 							header: {
-								"Authori-zation": 'Bearer ' + uni.getStorageSync('token')
+								"token": uni.getStorageSync('token')
 							},
 							success: (uploadFileRes) => {
 								if ("string" === typeof uploadFileRes.data) {