1004749546@qq.com 4 yıl önce
ebeveyn
işleme
109505bc3f

+ 1 - 1
api/login.js

@@ -36,7 +36,7 @@ export const checkLogin = () => {
 // 获取登录用户信息
 export const getUserInfo = params => {
   return axios.request({
-    url: `customer/detail`,
+    url: `user/userInfo`,
     method: 'get'
   })
 };

+ 10 - 28
api/user.js

@@ -17,35 +17,17 @@ export const sendVerifyCode = params => {
   }, true)
 }
 
-// 乐豆使用明细
-export const ldUsedQuery = params => { 
-  let url = `customerGoldLog/queryByMonth/${params.pageNo}/${params.pageSize}`
-  delete params.pageNo
-  delete params.pageSize
+// 修改密码
+export const changePwd = params => {
   return axios.request({
-    url: url,
-    data: params,
-    method: 'post'
-  })
-}
-
-// 核销
-export const sellerReceive = params => { 
-  let url = `seller/receive`
-  return axios.request({
-    url: url,
-    data: params,
-    method: 'post'
-  })
-}
-// 查询销售商信息
-export const sellerFindByPartnerNo = params => { 
-  let url = `seller/findByPartnerNo?encryptedPartnerNo=${params.officialPartnerNo}`
-  return axios.request({
-    url: url,
-    method: 'get'
-  })
-}
+    url: 'user/updatePwd',
+    method: 'post',
+    data: {
+      oldPassword: params.oldPassword,
+      password: params.password
+    }
+  }).then(res => res)
+} 
 // 手机号登录 校验用户账号状态
 export const checkCustomerState = params => { 
   let url = `checkCustomerState/${params.phone}`

+ 5 - 6
components/m-input.vue

@@ -6,8 +6,10 @@
 		<view v-if="clearable&&!displayable&&value.length" class="m-input-icon">
 			<uni-icons color="#666666" type="clear" @click="clear"></uni-icons>
 		</view>
-		<view v-if="displayable" class="m-input-icon">
-			<uni-icons :style="{color:showPassword?'#666666':'#cccccc'}" type="eye" @click="display"></uni-icons>
+		<view v-if="displayable" class="m-input-icon" @click="display">
+			<u-icon v-show="showPassword" name="eye-fill" size="30"></u-icon>
+			<u-icon v-show="!showPassword" name="eye-off" size="30"></u-icon>
+			<!-- <uni-icons :style="{color:showPassword?'#666666':'#cccccc'}" type="eye" @click="display"></uni-icons> -->
 		</view>
 	</view>
 </template>
@@ -105,7 +107,6 @@
 		/* width: 100%; */
 		flex: 1;
 		padding: 0 10px;
-		margin-top: 20rpx;
 	}
 
 	.m-input-input {
@@ -117,9 +118,7 @@
 	}
 
 	.m-input-icon {
-		width: 20px;
-		font-size: 20px;
-		line-height: 20px;
 		color: #666666;
+		padding: 10upx 20upx;
 	}
 </style>

+ 17 - 0
libs/tools.js

@@ -46,6 +46,23 @@ export const saveImgToAliOss = function(src,callback){
 		}
 	});
 }
+// 小数点后两位
+export const numberToFixed = function (val, num, max) {
+  let maxNums = max || 100000000
+  let _value = val + ''
+  _value = _value.replace(/[^\d.]/g, '')// 清楚数字和.以外的字数
+  _value = _value.replace(/^\./g, '')
+  _value = _value.replace(/\.{2,}/g, '')// 保留第一个,清楚多余的
+
+  if (num == 1)_value = _value.replace(/^(\-)*(\d+)\.(\d).*$/, '$1$2.$3')
+  else if (num == 3)_value = _value.replace(/^(\-)*(\d+)\.(\d\d\d).*$/, '$1$2.$3')
+  else if (num == 4)_value = _value.replace(/^(\-)*(\d+)\.(\d\d\d\d).*$/, '$1$2.$3')
+  else if (num == 5)_value = _value.replace(/^(\-)*(\d+)\.(\d\d\d\d\d).*$/, '$1$2.$3')
+  else if (num == 0)_value = _value.indexOf('.') >= 0 ? _value.split('.')[0] : _value
+  else _value = _value.replace(/^(\-)*(\d+)\.(\d\d).*$/, '$1$2.$3')
+  // console.log(_value,maxNums,Number(_value)>Number(maxNums),'_value')
+  return Number(_value)>Number(maxNums) ? maxNums : _value
+}
 
 
   

+ 18 - 7
pages/index/addData.vue

@@ -4,22 +4,22 @@
 			<view class="form-data">
 				<u-form :model="form" ref="uForm" :label-width="140" :error-type="['toast']">
 						<u-form-item prop="gatherNum_other" label="其他垃圾:" >
-							<u-input :disabled="isView" type="number" placeholder="请输入" v-model="form.gatherNum_other" />
+							<u-input :disabled="isView" @input="numberToFixed('gatherNum_other',0,999999)" type="number" placeholder="请输入" v-model="form.gatherNum_other" />
 							<text slot="right" style="color: #000000;">桶(约{{form.gatherNum_other*240}}kg)</text>
 						</u-form-item>
 						<u-form-item prop="gatherNum_chuyu" label="厨余垃圾:" >
-							<u-input :disabled="isView" placeholder="请输入" type="number" v-model="form.gatherNum_chuyu" />
+							<u-input :disabled="isView" @input="numberToFixed('gatherNum_chuyu',0,999999)" placeholder="请输入" type="number" v-model="form.gatherNum_chuyu" />
 							<text slot="right" style="color: #000000;">桶(约{{form.gatherNum_chuyu*240}}kg)</text>
 						</u-form-item>
 						<u-form-item prop="gatherNum_jianzhu" label="建筑垃圾:" >
-							<u-input :disabled="isView" placeholder="请输入" type="number" v-model="form.gatherNum_jianzhu" />
+							<u-input :disabled="isView" @input="numberToFixed('gatherNum_jianzhu',2,999999)" placeholder="请输入" type="number" v-model="form.gatherNum_jianzhu" />
 							<text slot="right" style="color: #000000;">吨(约{{form.gatherNum_jianzhu*1000}}kg)</text>
 						</u-form-item>
 				</u-form>
 			</view>
 			<view class="form-data remark">
 				<text>信息备注</text>
-				<textarea :disabled="isView" :auto-height="true" :maxlength="500" v-model="form.remark" class="receiveAddress"/>
+				<textarea :disabled="isView" :auto-height="true" :maxlength="30" v-model="form.remarks" class="receiveAddress"/>
 			</view>
 			<view class="form-data qyImg">
 				<text>清运照片</text>
@@ -51,6 +51,7 @@
 	import uniPopup from '@/components/uni-popup/uni-popup.vue'
 	import uniPopupDialog from '@/components/uni-popup/uni-popup-dialog.vue'
 	import {gatherSave} from '@/api/index.js'
+	import {numberToFixed} from '@/libs/tools.js'
 	export default {
 		components: {
 			uniPopup,uniPopupDialog
@@ -64,7 +65,7 @@
 					gatherNum_other: '', // 其它垃圾
 					gatherNum_chuyu: '', // 厨余垃圾
 					gatherNum_jianzhu: '', // 建筑垃圾
-					remark: '' // 备注
+					remarks: '' // 备注
 				},
 				isView: false // 是否是查看详情
 			};
@@ -77,13 +78,22 @@
 			}else {
 				console.log('--------新增')
 				this.photograph = []
+				this.form.remarks = ''
 				this.$refs.uForm.resetFields()
 			}
 		},
 		onUnload() {
 		},
 		methods: {
-			//  签到拍照
+			// 保留几位小数
+			numberToFixed: function (key, num, max) {
+			  let val = this.form[key]
+			  let ret = numberToFixed(val, num, max)
+			  this.$nextTick(() => {
+			  	this.form[key] = ret
+			  })
+			},
+			// 拍照或从相册选图片
 			goPhotograph() {
 				uni.chooseImage({
 				    count: 3, //默认9
@@ -126,7 +136,8 @@
 				this.$refs.openModal.close()
 				let params = {
 					rubbishEntityList: [],
-					imageUrlList: this.photograph
+					imageUrlList: this.photograph,
+					remarks: this.form.remarks
 				}
 				if(this.form.gatherNum_other) {
 					params.rubbishEntityList.push({

+ 3 - 2
pages/userCenter/changePwd.vue

@@ -5,7 +5,7 @@
 			<view class="input-group">
 				<view class="input-row border">
 					<text class="title">原密码:</text>
-					<m-input class="m-input" :maxlength="30"  type="password"  displayable v-model="formCustom.oldPwd" placeholder="请输入原密码"></m-input>
+					<m-input class="m-input" :maxlength="12"  type="password"  displayable v-model="formCustom.oldPwd" placeholder="请输入原密码"></m-input>
 				</view>
 				<view class="input-row">
 					<text class="title">新密码:</text>
@@ -27,7 +27,8 @@
 
 <script>
 	import mInput from '../../components/m-input.vue'
-	import { changePwd, logout } from '@/api/user.js'
+	import { changePwd } from '@/api/user.js'
+	import { logout } from '@/api/login.js'
 	export default{
 		name:'changePwd',
 		components: {

+ 2 - 2
pages/userCenter/index.vue

@@ -7,8 +7,8 @@
 				<u-image v-show="!hasLogin" src="/static/logo.png" width="100" height="100"></u-image>
 			</view>
 			<view class="user-info">
-				<view v-if="hasLogin" class="user-info-item">长庆石化小区</view>
-				<view v-if="hasLogin" class="user-info-item">李文 {{user.mobile}}</view>
+				<view v-if="hasLogin" class="user-info-item">{{userData.stationName}}</view>
+				<view v-if="hasLogin" class="user-info-item">{{userData.gatherName||''}} {{userData.gatherPhone}}</view>
 				<u-button v-else="!hasLogin" plain size="mini" shape="circle" @click="toLoginPage">立即登录</u-button>
 			</view>
 		</view>