Merge remote-tracking branch 'origin/release-201823-wangcz' into release-201823-wangcz

components/applyPurchase/ApplyInfo.vue

@@ -4,7 +4,7 @@
       <p>最新求购信息</p>
       <span>海量求购，一网打尽</span>
       <div class="search">
-        <search-header :outerKeyword="searchKeyWord" :type="'purchase'" @searchAction="searchList" :placeholder="user.logged ? '公司/品牌/物料名称/型号/规格' : '品牌/物料名称/型号/规格'"></search-header>
+        <search-header :outerKeyword="searchKeyWord" :type="'purchase'" @searchAction="searchList" :placeholder="user.logged ? '公司名/品牌/物料名称/型号/规格' : '品牌/物料名称/型号/规格'"></search-header>
       </div>
     </div>
     <div class="apply-info-list">

components/common/PcSearchHeader.vue

@@ -14,7 +14,7 @@
           <li class="text-ellipse" v-for="store in similarList.store.slice(0, 4)" @click="onSearch(store.name, 'store', $event)">{{store.name}}</li>
         </template>
         <template v-if="type=== 'purchase' && user.logged">
-          <li class="title text-ellipse" v-text="'公司'">公司</li>
+          <li class="title text-ellipse" v-text="'公司名'">公司</li>
           <li class="text-ellipse" v-for="store in similarList.store.slice(0, 4)" @click="onSearch(store.name, 'store', $event)">{{store.name}}</li>
         </template>
       </template>

components/mobile/base/addressEdit.vue

@@ -49,8 +49,8 @@
             </ul>
           </div>
           <div class="control clearfix">
-            <div class="cancel" @click="storeInfosave('cancel')">取消</div>
-            <div class="save" @click="storeInfosave()">保存</div>
+            <div v-show="!noClose" class="cancel" @click="storeInfosave('cancel')">取消</div>
+            <div class="save" :class="{width100 : noClose}" @click="storeInfosave()">保存</div>
           </div>
           <div style="height: 0.2rem;position:relative"></div>
         </div>
@@ -108,8 +108,7 @@
         isActive: false,
         addressShow: false,
         timeoutCount: 0,
-        collectResult: '',
-        noClose: false
+        collectResult: ''
       }
     },
     watch: {
@@ -124,12 +123,21 @@
       }
     },
     mounted () {
-      let data = this.baseUtils.deepCopy(this.$store.state.mobileAddress.address.data)
-      data && data.content.length > 0 ? this.noClose = false : this.noClose = true
+
       this.$nextTick(() => {
         this.refleshSc()
       })
     },
+    computed: {
+      noClose () {
+        let data = this.baseUtils.deepCopy(this.$store.state.mobileAddress.address.data)
+        if (data && data.content.length > 0) {
+          return false
+        } else {
+          return true
+        }
+      }
+    },
     methods: {
       editClick (data) {
         this.$emit('isEditEvent', data || {}, false)
@@ -209,6 +217,9 @@
       margin: 0.4rem auto 0rem;
       height: .88rem;
       line-height: 0.88rem;
+      .width100{
+        width: 100% !important;
+      }
       .save {
         border-radius: 3px;
         width: 48%;