修改测试bug

components/mobile/common/RemindBox.vue

@@ -26,11 +26,11 @@
       setTimer: function () {
         let _this = this
         _this.showBox = true
-        let timeout = 1000
+        let timeout = 10000
         if (_this.title === '收藏成功' || _this.title === '取消成功') {
-          timeout = 1000
+          timeout = 10000
         } else {
-          timeout = 1500
+          timeout = 10000
         }
         _this.timer = setTimeout(function () {
           _this.showBox = false

pages/mobile/center/vendor/material.vue

@@ -127,149 +127,148 @@
           </div>
         </div>
       </div>
-      <remind-box :title="collectResult" :timeoutCount="timeoutCount"></remind-box>
-      <pull-up :fixId="'provider-wrapper'" :searchMore="isSearchSearchingMore" :allPage="EnterprisePage" :page="seekPage" @pullUpAction="getMoreSearch"></pull-up>
+
 
     </div>
     <!-- 编辑物料 -->
     <div class="update-materiel" v-show="showMateriel">
-      <div class="mobile-nav">
-        <div class="mobile-header mobile-center-header">
-          <a @click="showMateriel = false; showdropmenu(' ')"><i class="iconfont icon-fanhui"></i></a>
-          <p>编辑物料</p>
-          <p class="en-name">
-            <img :src="`/images/mobile/center/${user.data.enterprise && user.data.enterprise.uu ? 'en' : 'self'}.png`" alt="">{{currentEnName}}
-          </p>
-        </div>
+    <div class="mobile-nav">
+      <div class="mobile-header mobile-center-header">
+        <a @click="showMateriel = false; showdropmenu(' ')"><i class="iconfont icon-fanhui"></i></a>
+        <p>编辑物料</p>
+        <p class="en-name">
+          <img :src="`/images/mobile/center/${user.data.enterprise && user.data.enterprise.uu ? 'en' : 'self'}.png`" alt="">{{currentEnName}}
+        </p>
       </div>
-      <div class="update-materiel-wrapper" @click="clearInfo()">
-        <template v-if="MaterielItem.standard === 1">
-          <img class="imgUrl" src="/images/mobile/@2x/productDetail/Strand.png" />
-        </template>
-        <template v-else>
-          <img class="imgUrl" src="/images/mobile/@2x/productDetail/isStrand.png" />
-        </template>
-        <div ref="scroll" style="height: 100%;overflow-y:scroll">
-          <div>
-            <div style="background: #fff;border: 1px solid #dcdcdc;padding-bottom: 0.5rem;">
-              <div class="update-materiel-wrapper-list clearfix" :class="{'overHidden': MaterielItem.standard === 1}">
-                <div class="name pull-left"><a class="red">*</a>品牌：</div>
-                <template v-if="MaterielItem.standard === 1">
-                  {{MaterielItem.pbranden}}
-                </template>
-                <template v-else>
-                  <div class="input pull-left clearfix" :class="{'overHidden': MaterielItem.standard === 1}">
-                    <input type="text" v-model="MaterielItem.pbranden" placeholder="请勿填中文符号" @blur.stop="checkBrand" @input.stop="onBrandChange"/>
-                    <ul class="similar brand-similar-list" v-show="showSimilarBrandList && MaterielItem.pbranden">
-                      <li v-for="sBrand in similarBrand" @click.stop="setBrand(sBrand.nameEn)">{{sBrand.nameEn}}</li>
-                    </ul>
-                    <i class="iconfont icon-guanbi1" @click.stop="MaterielItem.pbranden = ''"></i>
-                  </div>
-                </template>
-              </div>
-              <div class="update-materiel-wrapper-list clearfix" :class="{'overHidden': MaterielItem.standard === 1}">
-                <div class="name pull-left"><a class="red">*</a>物料名称：</div>
-                <template v-if="MaterielItem.standard === 1">
-                  {{MaterielItem.kind}}
-                </template>
-                <template v-else>
-                  <div class="input pull-left clearfix"  style="width: 4.44rem">
-                    <!--<input type="text" v-model="MaterielItem.kind" @blur="checkCode" @input="onCodeChange" placeholder="请勿填中文符号">-->
-                    <input type="text" placeholder="请输入物料名称" v-model="MaterielItem.kind"/>
-                    <i class="iconfont icon-guanbi1" @click.stop="MaterielItem.kind = ''"></i>
-                  </div>
-                </template>
-              </div>
-              <div class="update-materiel-wrapper-list clearfix">
-                <div class="name pull-left"><a class="red">*</a>型号：</div>
-                <template v-if="MaterielItem.standard === 1">
-                  {{MaterielItem.pcmpcode}}
-                </template>
-                <template v-else>
-                  <div class="input pull-left clearfix">
-                    <input type="text" v-model="MaterielItem.pcmpcode" @blur.stop="checkCode" @input.stop="onCodeChange" placeholder="请勿填中文符号">
-                    <ul class="similar" v-show="showSimilarCodeList && MaterielItem.pcmpcode">
-                      <li v-for="sCode in similarCode" @click.stop="setCode(sCode.code)">{{sCode.code}}</li>
-                    </ul>
-                    <!--<input type="text" placeholder="请输入型号" v-model="MaterielItem.pcmpcode"/>-->
-                    <i class="iconfont icon-guanbi1" @click.stop="MaterielItem.pcmpcode = ''"></i>
-                  </div>
-                </template>
-              </div>
-              <div class="update-materiel-wrapper-list clearfix">
-                <div class="name pull-left"><a class="red" style="opacity: 0">*</a>规格：</div>
-                <div class="input pull-left clearfix">
-                  <input type="text" placeholder="请输入规格" v-model="MaterielItem.spec" @blur="checkSpec" @input="onSpecInput" maxlength="50"/>
-                  <i class="iconfont icon-guanbi1" @click.stop="MaterielItem.spec = ''"></i>
+    </div>
+    <div class="update-materiel-wrapper" @click="clearInfo()">
+      <template v-if="MaterielItem.standard === 1">
+        <img class="imgUrl" src="/images/mobile/@2x/productDetail/Strand.png" />
+      </template>
+      <template v-else>
+        <img class="imgUrl" src="/images/mobile/@2x/productDetail/isStrand.png" />
+      </template>
+      <div ref="scroll" style="height: 100%;overflow-y:scroll">
+        <div>
+          <div style="background: #fff;border: 1px solid #dcdcdc;padding-bottom: 0.5rem;">
+            <div class="update-materiel-wrapper-list clearfix" :class="{'overHidden': MaterielItem.standard === 1}">
+              <div class="name pull-left"><a class="red">*</a>品牌：</div>
+              <template v-if="MaterielItem.standard === 1">
+                {{MaterielItem.pbranden}}
+              </template>
+              <template v-else>
+                <div class="input pull-left clearfix" :class="{'overHidden': MaterielItem.standard === 1}">
+                  <input type="text" v-model="MaterielItem.pbranden" placeholder="请勿填中文符号" @blur.stop="checkBrand" @input.stop="onBrandChange"/>
+                  <ul class="similar brand-similar-list" v-show="showSimilarBrandList && MaterielItem.pbranden">
+                    <li v-for="sBrand in similarBrand" @click.stop="setBrand(sBrand.nameEn)">{{sBrand.nameEn}}</li>
+                  </ul>
+                  <i class="iconfont icon-guanbi1" @click.stop="MaterielItem.pbranden = ''"></i>
                 </div>
-              </div>
-              <div class="update-materiel-wrapper-list clearfix">
-                <div class="name pull-left"><a class="red">*</a>最小包装数：</div>
-                <div class="input pull-left clearfix" style="width: 4.15rem;">
-                  <input type="number" placeholder="请输入最小包装数" v-model="MaterielItem.minPackQty" maxlength="6" oninput="if(value.length>6)value=value.slice(0,6)"/>
-                  <i class="iconfont icon-guanbi1" @click.stop="MaterielItem.minPackQty = ''"></i>
+              </template>
+            </div>
+            <div class="update-materiel-wrapper-list clearfix" :class="{'overHidden': MaterielItem.standard === 1}">
+              <div class="name pull-left"><a class="red">*</a>物料名称：</div>
+              <template v-if="MaterielItem.standard === 1">
+                {{MaterielItem.kind}}
+              </template>
+              <template v-else>
+                <div class="input pull-left clearfix"  style="width: 4.44rem">
+                  <!--<input type="text" v-model="MaterielItem.kind" @blur="checkCode" @input="onCodeChange" placeholder="请勿填中文符号">-->
+                  <input type="text" placeholder="请输入物料名称" v-model="MaterielItem.kind"/>
+                  <i class="iconfont icon-guanbi1" @click.stop="MaterielItem.kind = ''"></i>
                 </div>
-              </div>
-              <div class="update-materiel-wrapper-list clearfix">
-                <div class="name pull-left"><a class="red" style="opacity: 0">*</a>包装方式：</div>
-                <div class="selectInput pull-left" @click.stop="showdropmenu('pack')">
-                  <span>{{MaterielItem.packaging || '无包装信息'}}</span>
-                  <img src="/images/mobile/product/drop_icon.png"/>
-                  <ul :class="{active : showDrop === 'pack' }">
-                    <li v-for="item in packObj" @click.stop="choosePack(item)">{{item}}</li>
+              </template>
+            </div>
+            <div class="update-materiel-wrapper-list clearfix">
+              <div class="name pull-left"><a class="red">*</a>型号：</div>
+              <template v-if="MaterielItem.standard === 1">
+                {{MaterielItem.pcmpcode}}
+              </template>
+              <template v-else>
+                <div class="input pull-left clearfix">
+                  <input type="text" v-model="MaterielItem.pcmpcode" @blur.stop="checkCode" @input.stop="onCodeChange" placeholder="请勿填中文符号">
+                  <ul class="similar" v-show="showSimilarCodeList && MaterielItem.pcmpcode">
+                    <li v-for="sCode in similarCode" @click.stop="setCode(sCode.code)">{{sCode.code}}</li>
                   </ul>
+                  <!--<input type="text" placeholder="请输入型号" v-model="MaterielItem.pcmpcode"/>-->
+                  <i class="iconfont icon-guanbi1" @click.stop="MaterielItem.pcmpcode = ''"></i>
                 </div>
+              </template>
+            </div>
+            <div class="update-materiel-wrapper-list clearfix">
+              <div class="name pull-left"><a class="red" style="opacity: 0">*</a>规格：</div>
+              <div class="input pull-left clearfix">
+                <input type="text" placeholder="请输入规格" v-model="MaterielItem.spec" @blur="checkSpec" @input="onSpecInput" maxlength="50"/>
+                <i class="iconfont icon-guanbi1" @click.stop="MaterielItem.spec = ''"></i>
               </div>
-              <div class="update-materiel-wrapper-list clearfix">
-                <div class="name pull-left"><a class="red" style="opacity: 0">*</a>规格书：</div>
+            </div>
+            <div class="update-materiel-wrapper-list clearfix">
+              <div class="name pull-left"><a class="red">*</a>最小包装数：</div>
+              <div class="input pull-left clearfix" style="width: 4.15rem;">
+                <input type="number" placeholder="请输入最小包装数" v-model="MaterielItem.minPackQty" maxlength="6" oninput="if(value.length>6)value=value.slice(0,6)"/>
+                <i class="iconfont icon-guanbi1" @click.stop="MaterielItem.minPackQty = ''"></i>
               </div>
-              <div class="clearfix">
-                <div class="update-materiel-wrapper-image">
-                  <a v-if="MaterielItem.IsSave" @click.stop="WinOpen(MaterielItem.Regulpic)">
-                   <img src="/images/mobile/openStore/pdf.png"  style='width: 0.49rem; height: 0.49rem;display:block;margin: 0.2rem auto 0'/>
-                  </a>
-                  <img v-else src="/images/mobile/openStore/upload.png"  style='width: 0.49rem; height: 0.49rem;display:block;margin: 0.2rem auto 0'/>
-                  <!--v-if="MaterielItem.standard !== 1"-->
-                  <input type="file" class="com-input" @change.stop="update" accept="*.pdf" v-if="!MaterielItem.IsSave"/>
-                  <span style="position: relative" v-if="MaterielItem.Regulpic === ''">上传规格书</span>
-                </div>
-                <span class="uploadImgInfo pull-left">
+            </div>
+            <div class="update-materiel-wrapper-list clearfix">
+              <div class="name pull-left"><a class="red" style="opacity: 0">*</a>包装方式：</div>
+              <div class="selectInput pull-left" @click.stop="showdropmenu('pack')">
+                <span>{{MaterielItem.packaging || '无包装信息'}}</span>
+                <img src="/images/mobile/product/drop_icon.png"/>
+                <ul :class="{active : showDrop === 'pack' }">
+                  <li v-for="item in packObj" @click.stop="choosePack(item)">{{item}}</li>
+                </ul>
+              </div>
+            </div>
+            <div class="update-materiel-wrapper-list clearfix">
+              <div class="name pull-left"><a class="red" style="opacity: 0">*</a>规格书：</div>
+            </div>
+            <div class="clearfix">
+              <div class="update-materiel-wrapper-image">
+                <a v-if="MaterielItem.IsSave" @click.stop="WinOpen(MaterielItem.Regulpic)">
+                  <img src="/images/mobile/openStore/pdf.png"  style='width: 0.49rem; height: 0.49rem;display:block;margin: 0.2rem auto 0'/>
+                </a>
+                <img v-else src="/images/mobile/openStore/upload.png"  style='width: 0.49rem; height: 0.49rem;display:block;margin: 0.2rem auto 0'/>
+                <!--v-if="MaterielItem.standard !== 1"-->
+                <input type="file" class="com-input" @change.stop="update" accept="*.pdf" v-if="!MaterielItem.IsSave"/>
+                <span style="position: relative" v-if="MaterielItem.Regulpic === ''">上传规格书</span>
+              </div>
+              <span class="uploadImgInfo pull-left">
                   <div class="name"><a class="red">*</a>仅支持PDF格式文件，大小不超过20M：</div>
                   <div class="name"><a class="red">*</a>规格书上传后，将在两个工作日内完成审核</div>
                   <div class="name"><a class="red">*</a>如审核不通过，将会以消息的形式通知您</div>
                   <div class="name"><a class="red">*</a>已有原厂规格书的器件暂不开放上传</div>
                   <div class="name"><a class="red">*</a>更新规格书需重新审核</div>
                 </span>
-                <div style="clear:both"></div>
-                <div class="uploadImgBtn pull-left" v-if="MaterielItem.standard !== 1">上传规格书<input type="file" class="com-input" @change.stop="update" accept=".pdf" /></div>
-                <div style="color: #ea0f42;font-size: 0.2rem;line-height: 0.47rem;margin-left: 0.2rem" class="pull-left" v-if="(MaterielItem.productAttachSubmit && MaterielItem.productAttachSubmit.uploadAttach) && MaterielItem.standard !== 1 && MaterielItem.Regulpic !== '' && MaterielItem.IsSave" >该规格书正在审核中</div>
-              </div>
+              <div style="clear:both"></div>
+              <div class="uploadImgBtn pull-left" v-if="MaterielItem.standard !== 1">上传规格书<input type="file" class="com-input" @change.stop="update" accept=".pdf" /></div>
+              <div style="color: #ea0f42;font-size: 0.2rem;line-height: 0.47rem;margin-left: 0.2rem" class="pull-left" v-if="(MaterielItem.productAttachSubmit && MaterielItem.productAttachSubmit.uploadAttach) && MaterielItem.standard !== 1 && MaterielItem.Regulpic !== '' && MaterielItem.IsSave" >该规格书正在审核中</div>
+            </div>
 
-              <div class="update-materiel-wrapper-list clearfix">
-                <div class="name pull-left"><a class="red" style="opacity: 0">*</a>物料图片：</div>
+            <div class="update-materiel-wrapper-list clearfix">
+              <div class="name pull-left"><a class="red" style="opacity: 0">*</a>物料图片：</div>
+            </div>
+            <div class="clearfix">
+              <div class="update-materiel-wrapper-image">
+                <img  :src="MaterielItem.cmpImg || '/images/mobile/openStore/upload.png'"  style='width: 0.49rem; height: 0.49rem;display:block;margin: 0.2rem auto 0'/>
+                <input type="file" class="com-input" @change.stop="update2" accept="image/jpeg,image/jpg,image/png" />
+                <span style="position: relative" v-if="MaterielItem.cmpImg === ''">上传图片</span>
               </div>
-              <div class="clearfix">
-                <div class="update-materiel-wrapper-image">
-                  <img  :src="MaterielItem.cmpImg || '/images/mobile/openStore/upload.png'"  style='width: 0.49rem; height: 0.49rem;display:block;margin: 0.2rem auto 0'/>
-                  <input type="file" class="com-input" @change.stop="update2" accept="image/jpeg,image/jpg,image/png" />
-                  <span style="position: relative" v-if="MaterielItem.cmpImg === ''">上传图片</span>
-                </div>
-                <span class="uploadImgInfo pull-left" style="line-height: 1.09rem">
+              <span class="uploadImgInfo pull-left" style="line-height: 1.09rem">
                   <div class="name"><a class="red">*</a>仅支持JPG、PNG格式文件，大小不超过1M</div>
                 </span>
-                <div style="clear:both"></div>
-                <div class="uploadImgBtn pull-left" style="margin-top: 0.15rem">上传图片<input type="file" class="com-input" @change.stop="update2" accept="image/jpeg,image/jpg,image/png" /></div>
-              </div>
-            </div>
-            <div class="update-materiel-wrapper-controll clearfix">
-              <div class="pull-left" @click.stop="saveMateriel()">保存</div>
-              <div class="pull-right" @click.stop="saveMateriel('a')">取消</div>
+              <div style="clear:both"></div>
+              <div class="uploadImgBtn pull-left" style="margin-top: 0.15rem">上传图片<input type="file" class="com-input" @change.stop="update2" accept="image/jpeg,image/jpg,image/png" /></div>
             </div>
-            <div style="height: 1rem;position:relative"></div>
           </div>
+          <div class="update-materiel-wrapper-controll clearfix">
+            <div class="pull-left" @click.stop="saveMateriel()">保存</div>
+            <div class="pull-right" @click.stop="saveMateriel('a')">取消</div>
+          </div>
+          <div style="height: 1rem;position:relative"></div>
         </div>
       </div>
     </div>
+  </div>
 
     <!-- 物料上下架 -->
     <div>
@@ -278,6 +277,9 @@
       </upoff-material>
     </div>
     <!-- /end 物料上下架 -->
+
+    <remind-box :title="collectResult" :timeoutCount="timeoutCount"></remind-box>
+    <pull-up :fixId="'provider-wrapper'" :searchMore="isSearchSearchingMore" :allPage="EnterprisePage" :page="seekPage" @pullUpAction="getMoreSearch"></pull-up>
   </div>
 </template>
 
@@ -736,7 +738,7 @@
   background: #f1f3f6;
   /*margin: 1.26rem 0 0.98rem 0;*/
   /*height: calc(100vh - 1.26rem - 0.98rem);*/
-  position: fixed;
+  position: absolute;
   width: 100%;
   top: 1.26rem;
   bottom: 0.98rem;
@@ -994,7 +996,7 @@
 }
 .update-materiel {
   position: fixed;
-  z-index: 1000;
+  z-index: 102;
   background: #f1f3f6;
   /*background: red;*/
   top: 0;