Merge branch 'master' of http://1.14.104.71:10880/root/ylrz_his_scrm_companyUI

src/views/hisStore/storeOrder/list.vue

@@ -323,8 +323,10 @@
            <el-form-item label="会员信息" >
                 <el-row  >
                   <el-col >
-                      <el-input placeholder="请输入会员手机号" style="width:240px;cursor:pointer" v-model="phone">
-                      </el-input>
+<!--                      <el-input placeholder="请输入会员手机号" style="width:240px;cursor:pointer" v-model="phone">-->
+<!--                      </el-input>-->
+                    <el-input placeholder="请输入会员手机号/会员ID/昵称" style="width:270px;cursor:pointer" v-model="keywords">
+                    </el-input>
                       <el-button plain style="margin-left:10px;"    @click="searchUser()">查询</el-button>
                       <el-button plain style="margin-left:10px;" icon="el-icon-plus"  type="primary" @click="handleAddUser()">添加会员</el-button>
                   </el-col>
@@ -516,6 +518,7 @@ export default {
       tablekey:false,
       totalMoney:0.00,
       phone:null,
+      keywords: null,
       products:[],
       product:{
         open:false,
@@ -743,10 +746,14 @@ export default {
       this.product.open=true;
     },
     searchUser(){
-      if(this.phone==null||this.phone==""){
+      // if(this.phone==null||this.phone==""){
+      //   return;
+      // }
+      // var data={phone:this.phone}
+      if(this.keywords==null||this.keywords==""){
         return;
       }
-      var data={phone:this.phone}
+      var data={keywords:this.keywords}
       this.userloading = true;
       this.users=[];
       this.address=[];