From 3800e6e0c8f64ff548a20788d00f0acce39295dc Mon Sep 17 00:00:00 2001 From: whycq <10027870+whycq@user.noreply.gitee.com> Date: 星期三, 29 十一月 2023 15:02:47 +0800 Subject: [PATCH] # --- pages/business/goBusiness/reimburseOnlineDetl.vue | 2 pages/business/saleManage/cstmrDetls.vue | 2 pages/login/login.vue | 70 ++++++++++++++++++++++++++-------- static/js/common.js | 4 +- pages/business/plan/planDetails.vue | 2 pages/business/cstmr/cstmrDetails.vue | 2 main.js | 3 + pages/business/goBusiness/businessTripOtherDetl.vue | 2 pages/business/goBusiness/goBusinessDetil.vue | 2 pages/business/saleManage/saleManageDetails.vue | 2 10 files changed, 64 insertions(+), 27 deletions(-) diff --git a/main.js b/main.js index 5ea0157..ba4f953 100644 --- a/main.js +++ b/main.js @@ -5,7 +5,8 @@ import Vue from 'vue' Vue.use(uView) Vue.config.productionTip = false -Vue.prototype.baseUrl = 'http://crm.zoneyung.net' +// Vue.prototype.baseUrl = 'http://crm.zoneyung.net' +Vue.prototype.baseUrl = 'http://192.168.4.188:9528' App.mpType = 'app' const app = new Vue({ ...App diff --git a/pages/business/cstmr/cstmrDetails.vue b/pages/business/cstmr/cstmrDetails.vue index 96d12ea..a69ba8c 100644 --- a/pages/business/cstmr/cstmrDetails.vue +++ b/pages/business/cstmr/cstmrDetails.vue @@ -62,7 +62,7 @@ </scroll-view> <view class="foot"> <button size="mini" type="primary" @click="edite(id)">淇敼</button> - <button size="mini" type="warn" @click="del(id)" v-show="isDel">鍒犻櫎</button> + <!-- <button size="mini" type="warn" @click="del(id)" v-show="isDel">鍒犻櫎</button> --> </view> <!-- 杈撳叆妗嗙ず渚� --> diff --git a/pages/business/goBusiness/businessTripOtherDetl.vue b/pages/business/goBusiness/businessTripOtherDetl.vue index 776ba9d..8167c7b 100644 --- a/pages/business/goBusiness/businessTripOtherDetl.vue +++ b/pages/business/goBusiness/businessTripOtherDetl.vue @@ -16,7 +16,7 @@ </view> <view class="floor"> - <view class="wran">鍒犻櫎</view> + <!-- <view class="wran">鍒犻櫎</view> --> <view class="default" v-show="settle == 1" @click="edit()">淇敼</view> <view class="primary" @click="submit()">{{subTitle}}</view> </view> diff --git a/pages/business/goBusiness/goBusinessDetil.vue b/pages/business/goBusiness/goBusinessDetil.vue index df6eb00..68dbb17 100644 --- a/pages/business/goBusiness/goBusinessDetil.vue +++ b/pages/business/goBusiness/goBusinessDetil.vue @@ -16,7 +16,7 @@ </view> <view class="floor"> - <view class="wran">鍒犻櫎</view> + <!-- <view class="wran">鍒犻櫎</view> --> <view class="default" v-show="settle == 1" @click="edit()">淇敼</view> <view class="primary" @click="submit()">{{subTitle}}</view> </view> diff --git a/pages/business/goBusiness/reimburseOnlineDetl.vue b/pages/business/goBusiness/reimburseOnlineDetl.vue index 9c7f223..5697442 100644 --- a/pages/business/goBusiness/reimburseOnlineDetl.vue +++ b/pages/business/goBusiness/reimburseOnlineDetl.vue @@ -154,7 +154,7 @@ </uni-popup> <view class="floor"> - <view class="wran" @click="del()">鍒犻櫎</view> + <!-- <view class="wran" @click="del()">鍒犻櫎</view> --> <view class="default" @click="modiReimburse()">缂栬緫</view> <view class="primary" @click="submit()">瀹℃壒</view> </view> diff --git a/pages/business/plan/planDetails.vue b/pages/business/plan/planDetails.vue index 9ed69a2..2a03161 100644 --- a/pages/business/plan/planDetails.vue +++ b/pages/business/plan/planDetails.vue @@ -73,7 +73,7 @@ <view class="foot"> <button size="mini" type="primary" @click="edite(id)">淇敼</button> - <button size="mini" type="warn" @click="del(id)">鍒犻櫎</button> + <!-- <button size="mini" type="warn" @click="del(id)">鍒犻櫎</button> --> </view> </view> </template> diff --git a/pages/business/saleManage/cstmrDetls.vue b/pages/business/saleManage/cstmrDetls.vue index bec1086..d9bcc10 100644 --- a/pages/business/saleManage/cstmrDetls.vue +++ b/pages/business/saleManage/cstmrDetls.vue @@ -51,7 +51,7 @@ </scroll-view> <view class="foot"> - <button size="mini" type="warn" @click="del(id)">鍒犻櫎</button> + <!-- <button size="mini" type="warn" @click="del(id)">鍒犻櫎</button> --> </view> <view> diff --git a/pages/business/saleManage/saleManageDetails.vue b/pages/business/saleManage/saleManageDetails.vue index 7e1ac08..64fb518 100644 --- a/pages/business/saleManage/saleManageDetails.vue +++ b/pages/business/saleManage/saleManageDetails.vue @@ -42,7 +42,7 @@ </scroll-view> <view class="foot"> <button size="mini" type="default" @click="modi(id)" v-show="cstmr.status = 0">淇敼</button> - <button size="mini" type="warn" @click="del(id)" v-show="cstmr.status = 0">鍒犻櫎</button> + <!-- <button size="mini" type="warn" @click="del(id)" v-show="cstmr.status = 0">鍒犻櫎</button> --> <button size="mini" type="primary" @click="goBusiness(id)">鍑哄樊</button> </view> diff --git a/pages/login/login.vue b/pages/login/login.vue index 1d24776..e7dfe8d 100644 --- a/pages/login/login.vue +++ b/pages/login/login.vue @@ -7,23 +7,27 @@ <view class="icons"> <uni-icons type="person" size="20"></uni-icons> </view> - <text>璐﹀彿锛�</text> - <input type="text" placeholder="璇疯緭鍏ヨ处鍙�!" v-model="user.userName" + <text>鎵嬫満鍙凤細</text> + <input type="text" placeholder="璇疯緭鍏ヨ处鍙�!" v-model="user.phone" placeholder-style="font-size:14px;color:#ccc;"> </view> <view class="user-info-item shadow-warp"> <view class="icons"> <uni-icons type="locked" size="20"></uni-icons> </view> - <text>瀵嗙爜锛�</text> - <input :password="!showPassword" v-model="user.password" placeholder="璇疯緭鍏ュ瘑鐮�!" + <text>楠岃瘉鐮侊細</text> + <input :password="!showPassword" v-model="user.code" placeholder="璇疯緭鍏ラ獙璇佺爜!" placeholder-style="font-size:14px;color:#ccc;"> - <view class="showPassword" v-if="showPassword" @click="changePassword"> + <view style="font-size: 24rpx;" > + <text @click="getCode" v-show="!codeTimeShow">鑾峰彇楠岃瘉鐮�</text> + <text v-show="codeTimeShow">{{codeTime}}绉掑悗閲嶈幏</text> + </view> + <!-- <view class="showPassword" v-if="showPassword" @click="changePassword"> <uni-icons type="eye" size="20"></uni-icons> </view> <view class="showPassword" v-if="!showPassword" @click="changePassword"> <uni-icons type="eye-slash" size="20"></uni-icons> - </view> + </view> --> </view> </view> <!-- 鐧诲綍鎸夐挳 --> @@ -53,10 +57,10 @@ data() { return { version: '', - showPassword: false, + showPassword: true, user: { - userName: '', - password: '', + phone: '', + code: '', }, load: { loading: false, @@ -64,7 +68,9 @@ }, msgType: 'success', filename: '', - dialogContent: '' + dialogContent: '', + codeTime: 60, + codeTimeShow: false } }, onLoad: function() { @@ -81,6 +87,30 @@ this.getVersion() }, methods: { + // 鑾峰彇楠岃瘉鐮� + getCode() { + let _this = this + uni.request({ + url: `${_this.baseUrl}/smsCode/sendCode`, + header: {'content-type': 'application/x-www-form-urlencoded;charset=UTF-8'}, + data: {phone: _this.user.phone}, + sslVerify: false, + method: 'POST', + success(res) { + res = res.data + console.log(res); + _this.codeTimeShow = true + let time = setInterval(()=>{ + _this.codeTime-- + },1000) + setTimeout(()=>{ + _this.codeTimeShow = false + clearTimeout(time); + _this.codeTime = 60 + },60000) + } + }) + }, changePassword: function() { this.showPassword = !this.showPassword; }, @@ -203,8 +233,16 @@ }, onLogin() { let that = this + if (that.user.phone == '') { + uni.showToast({ title: '璇疯緭鍏ユ墜鏈哄彿', icon: "none" }) + return + } + if (that.user.code == '') { + uni.showToast({ title: '楠岃瘉鐮佷笉鑳戒负绌�', icon: "none" }) + return + } uni.request({ - url: that.baseUrl + '/login.action', + url: that.baseUrl + '/smsLogin.action', fail(result) { uni.showToast({ icon: 'error', @@ -212,12 +250,10 @@ }) }, data: { - username: that.user.userName, - password: md5.hex_md5(that.user.password) + phone: that.user.phone, + code: that.user.code }, - header: { - "content-type": "application/json" - }, + header: { "content-type": "application/json" }, success(result) { if (result.statusCode === 404) { uni.showToast({ @@ -297,7 +333,7 @@ } .user-info-item>input { - width: 400rpx; + width: 300rpx; color: #606266; font-weight: 500; caret-color: #606266; // 鍏夋爣棰滆壊 diff --git a/static/js/common.js b/static/js/common.js index 7928e00..e7655c8 100644 --- a/static/js/common.js +++ b/static/js/common.js @@ -1,5 +1,5 @@ -const baseUrl = 'http://crm.zoneyung.net' - +// const baseUrl = 'http://crm.zoneyung.net' +const baseUrl = 'http://192.168.4.188:9528' export default { baseUrl } \ No newline at end of file -- Gitblit v1.9.1