Merge branch 'demo' of http://47.97.1.152:5880/r/wms_app into demo

whycq

2024-03-28 e17108966ccfcaee2bef8d981601c79c8716e304

 components/z-input/z-input.vue

@@ -3,6 +3,13 @@
      <view class="main">
         <view class="inner1">{{desc}}</view>
         <view class="put inner2">
            <uni-icons class="p-icon"
               type="scan" 
               size="16" 
               color="#a6a6a6" 
               @click="scanCode"
               >
            </uni-icons>
            <input class="p-input" 
               type="text" 
               :placeholder="placeholder" 
@@ -78,6 +85,7 @@
               return
            }
            if (val.length != this.lenCheck) {
               console.log(val);
               setTimeout(()=>{
                  this.data = ''
                  this.$emit('input','')
@@ -108,7 +116,17 @@
            this.$emit('clickBtn');
         },
         inputVal() {
            this.$emit('inputVal',[this.data,this.name]);
            this.$emit('inputVal',{title:this.name,value:this.data});
         },
         scanCode() {
            let _this = this
            uni.scanCode({
               onlyFromCamera: true,
               success(res) {
                  _this.data = res.result
                  _this.$emit('inputVal',{title:_this.name,value:_this.data})
               }
            })
         }
      }
   }
@@ -118,10 +136,8 @@
   .main {
      display: flex;
      align-items: center;
      min-height: 35px;
      background-color: #FFF;
      margin: 8px;
      /* border-bottom: 1px solid darkgray; */
      min-height: 50px;
      background-color: #fff;
   }
   .put {
      display: flex;
@@ -129,31 +145,32 @@
   }
   
   .inner1 {
      width: 65px;
      width: 55px;
      padding-left: 8px;
      color: #606164;
      font-weight: 900;
      font-family:'Helvetica Neue';
   }
   .inner2 {
      background-color: #f1f3f4;
      background-color: #f8f8f8;
      flex: 1;
      display: flex;
      align-items: center;
      justify-content: center;
      border-radius: 5px;
      margin-right: 32rpx;
      color: #606266;
   }
   .p-input {
      flex:1;
      padding-left: 8px;
      padding: 4px;
   }
   .p-icon {
      margin-left: 8px;
      margin-right: 8px;
      margin-left: 4px;
      margin-right: 4px;
   }
   .inner3 {
      width: 100px;
      width: 90px;
      display: flex;
      align-items: center;
      justify-content: center;