gjy 2 vuotta sitten
vanhempi
commit
6bbbb71f3f

+ 3 - 2
components/MyNumberInput.vue

@@ -1,8 +1,8 @@
 <template>
 	<view>
 		<view class="uni-input Numberinput" :class="{'inputdis':Isedit}" @click="maskShow" :id="'input_'+myevent">
-			<text>{{myvalue}}</text>
-			<text class="myfous" v-if="IsShow"></text>
+			<text class="myfous" v-if="IsShow"></text><text>{{myvalue}}</text>
+			
 		</view>
 
 		<view class="mybrankmask" v-if="IsShow">
@@ -118,6 +118,7 @@
 	.Numberinput {
 		display: flex;
 		align-items: center;
+		flex-direction: row-reverse;
 	}
 
 	.myfous {

+ 2 - 2
config/index.js

@@ -4,13 +4,13 @@ const dev = {
 	// baseUrlNew: 'http://192.168.110.67:9100/',
 	// baseUrlNew: 'http://192.168.1.118:8090/',
 	// baseUrlNew: 'http://192.168.110.9:9100/',
-	// baseUrlNew: 'http://192.168.110.138:8090/',
+	baseUrlNew: 'http://192.168.110.138:8090/',
 	// baseUrlNew: 'http://192.168.110.82:8099/',
 	 // baseUrlNew: 'http://192.168.110.82:8090/',
 	// baseUrlNew: 'http://192.168.110.202:8090/',
 	// baseUrlNew: 'http://192.168.110.138:8090/',
 	// 上传图片的
-	baseUrlNew: 'https://api2.eliangeyun.com/',
+	// baseUrlNew: 'https://api2.eliangeyun.com/',
 	h5Appid: 'wxb66b599f7f61b46f',
 	debug: false
 }

+ 64 - 2
pages/erpbusiness/add_quality_testing.vue

@@ -300,6 +300,13 @@
 				<view class="c-row ">
 					<view class="title">水分(%)</view>
 					<view class="con-list">
+						<!-- <MyNumberInput :myvalue="gridList.waterContent" :Isedit="Isedit" :IsShow="MykeywordShow"
+												:myevent="'waterContent'"
+												@setValue="mykeywordset"  v-if="InputEvent=='waterContent'" 
+												@Cancelword="Cancelword" 
+												@goNext="goNext('bulkDensity')"></MyNumberInput>
+							<input v-else v-model='gridList.waterContent' @click="SetInputKey('waterContent')" placeholder="初检水分" @input="waterContentChange"
+									name="input" type="digit"></input> -->
 						<input v-model='gridList.waterContent' placeholder="初检水分" @input="waterContentChange"
 							name="input" type="digit"></input>
 					</view>
@@ -308,7 +315,13 @@
 					<view v-show='gridList.goodsName!="大豆"' class="title">容重(克/升)</view>
 					<view v-show='gridList.goodsName=="大豆"' class="title">蛋白</view>
 					<view class="con-list">
-						<input v-model='gridList.bulkDensity' placeholder="请输入容重" name="input" type="digit" @input="obtainPrice"></input>
+						<!-- <MyNumberInput :myvalue="gridList.bulkDensity" :Isedit="Isedit" :IsShow="MykeywordShow"
+												:myevent="'bulkDensity'"
+												@setValue="mykeywordset"  v-if="InputEvent=='bulkDensity'" 
+												@Cancelword="Cancelword" 
+												@goNext="goNext('waterContent')"></MyNumberInput>
+						<input v-model='gridList.bulkDensity' placeholder="请输入容重" @click="SetInputKey('bulkDensity')" name="input" type="digit" @input="obtainPrice"></input> -->
+					<input v-model='gridList.bulkDensity' placeholder="请输入容重" name="input" type="digit" @input="obtainPrice"></input>
 					</view>
 				</view>
 				<view class="c-row ">
@@ -433,8 +446,10 @@
 </template>
 
 <script>
+	const Equ_List=['ktv','ktv2'];
 	import dragButton from "@/components/drag-button/drag-button.vue";
 	import keyboard from "@/components/master-keyboard/master-keyboard.vue";
+	import MyNumberInput from "@/components/MyNumberInput.vue";
 	import {
 		mapState
 	} from 'vuex';
@@ -444,7 +459,8 @@
 	export default {
 		components: {
 			dragButton,
-			keyboard
+			keyboard,
+			MyNumberInput
 		},
 		data() {
 			return {
@@ -458,6 +474,12 @@
 					month: true,
 					day: true,
 				},
+				Data:{
+					ktv:'111111'
+				},
+				Isedit:false,
+				MykeywordShow:false,
+				InputEvent:'',
 				dryGrainPrice:0,
 				tidalGrainPrice:0,
 				modalName: '',
@@ -873,6 +895,46 @@
 			}
 		},
 		methods: {
+			Cancelword(){
+							this.bottomHeight = '10rpx';
+							this.MykeywordShow =false;
+							this.InputEvent = '';
+						},
+						goNext(val){
+							var inputList = Equ_List;
+							if(this.menuIndex==1){
+								inputList = Sign_List;
+							}
+							var index = inputList.indexOf(val);
+							this.setScrollTops(val);
+							if(index<inputList.length-1){
+								this.InputEvent = inputList[index+1];
+							}else{
+								this.bottomHeight = '10rpx';
+								this.MykeywordShow = false;
+							}
+						},
+						mykeywordset(datatxt){
+							var arr = JSON.parse(datatxt);
+							this.gridList[arr.even] = arr.value;
+							if(arr.even=='waterContent'){
+								this.waterContentChange()
+							}
+						},
+						SetInputKey(even){
+							uni.hideKeyboard();
+							this.InputEvent = even;
+							this.setScrollTops(even);
+							if(!this.MykeywordShow){
+								this.bottomHeight = '320rpx';
+								this.MykeywordShow = true;
+							}
+						},
+						setScrollTops(even){
+							var inputList = Equ_List;
+							var index = inputList.indexOf(even);
+							this.viewTop = (index + 1) * 60 + 100;
+						},
 			pricefocus(e,status){
 				console.log(e)
 				if(status==1){

+ 2 - 0
pages/task/my_task.vue

@@ -210,6 +210,8 @@
 		},
 		onShow() {
 			if(this.statusFlag==1){
+				this.taskInfo=[]
+				this.pages=1
 				this.getIndexBuyData(1,this.keyword)
 			}
 			// this.warehouseInOutInfo.phone = this.userInfo.phone

+ 1 - 0
pages/user/setUp.vue

@@ -135,6 +135,7 @@
 				this.version = info.version;
 				console.log("当前版本为:", this.version)
 				this.checkVersion()
+				})
 			// #endif
 		},
 		onLoad() {},