Browse Source

2023-4-24

cmy 1 year ago
parent
commit
3936986858
9 changed files with 509 additions and 122 deletions
  1. 3 3
      App.vue
  2. 34 0
      api/model.js
  3. 1 0
      pages.json
  4. 470 118
      pages/user/model/mymodel.vue
  5. BIN
      static/icon/dom.png
  6. BIN
      static/icon/goodsExit.png
  7. BIN
      static/icon/gpsW.png
  8. BIN
      static/image/followButtom.png
  9. 1 1
      utils/newRequest.js

+ 3 - 3
App.vue

@@ -265,12 +265,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;

+ 34 - 0
api/model.js

@@ -0,0 +1,34 @@
+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
+	});
+}

+ 1 - 0
pages.json

@@ -161,6 +161,7 @@
 					"navigationBarTitleText": "模板页"
 				}
 			}
+			
 		]
 	}, {
 		"root": "pages/set",

+ 470 - 118
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/upload', //仅为示例,非真实的接口地址
 						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>

BIN
static/icon/dom.png


BIN
static/icon/goodsExit.png


BIN
static/icon/gpsW.png


BIN
static/image/followButtom.png


+ 1 - 1
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) {