Selaa lähdekoodia

1、修改发票,付款,收款接口对接

shenjj 7 vuotta sitten
vanhempi
commit
ed2647a85a

+ 2 - 3
components/mobile/base/addressEdit.vue

@@ -77,7 +77,7 @@
         type: Boolean
       },
       isPersonal: {
-        default: true,
+        default: false,
         type: Boolean
       },
       inFix: {
@@ -123,7 +123,6 @@
       }
     },
     mounted () {
-
       this.$nextTick(() => {
         this.refleshSc()
       })
@@ -131,7 +130,7 @@
     computed: {
       noClose () {
         let data = this.baseUtils.deepCopy(this.$store.state.mobileAddress.address.data)
-        if (data && data.content.length > 0) {
+        if (data && data.content && data.content.length > 0) {
           return false
         } else {
           return true

+ 10 - 3
pages/mobile/center/user/pay/_orderId.vue

@@ -304,7 +304,7 @@
     </modal-wrapper>-->
     <div class="mobile-modal addr-modal" v-if="showAddrModal" @click="showAddrModal = false">
       <div class="mobile-modal-box addr-modal-wrapper" @click="stopPropagation($event)">
-        <div class="mobile-modal-header">收货地址<i @click="showAddrModal = false" class="icon-guanbi iconfont"></i></div>
+        <div class="mobile-modal-header">收货地址<i @click="showAddrModal = false;editAddr = false" class="icon-guanbi iconfont"></i></div>
         <div style="height: 100%;overflow-y: auto;background: #fff;padding-bottom: .3rem;">
           <template v-if="!editAddr">
             <div class="addr-list-wrap">
@@ -330,7 +330,7 @@
               <button class="add-addr-btn" @click="addAddress()"><i class="iconfont icon-add"></i>添加新地址</button>
             </div>
           </template>
-          <address-edit v-else="editAddr" :className="'inWrap'" :data="currentAddress" :isPersonal="true" :isSend="false" @isEditEvent="editClick"></address-edit>
+          <address-edit ref="refleshSc" v-show="editAddr" :className="'inWrap'" :data="currentAddress" :isPersonal="false" :isSend="false" @isEditEvent="editClick"></address-edit>
         </div>
       </div>
     </div>
@@ -492,6 +492,10 @@
         return this.baseUtils.deepCopy(this.$store.state.userCenter.list.pay.data)
       },
       addressData () {
+        let _item = {
+          content: this.$store.state.userCenter.list.address.data
+        }
+        this.$store.commit('mobileAddress/REQUEST_ADDRESS_SUCCESS', _item)
         return this.$store.state.userCenter.list.address.data
       },
       invoiceData () {
@@ -972,6 +976,9 @@
           this.currentAddress = item
         }
         this.editAddr = true
+        this.$nextTick(() => {
+          this.$refs.refleshSc.refleshSc()
+        })
       },
       deleteAddress (item) {
         this.$http.put(`/trade/address/delete/${item.id}`).then(res => {
@@ -1635,7 +1642,7 @@
   .addr-modal {
     .addr-modal-wrapper {
       top: 1.5rem;
-      bottom: 1.5rem;
+      bottom: 3rem;
       left: .2rem;
       right: .2rem;
       background: #fff;

+ 1 - 1
pages/mobile/user/index.vue

@@ -250,7 +250,7 @@
               }
             }
           }
-        } else if (url === '/mobile/user/address') {
+        } else if (url === '/mobile/user/address' || url === '/mobile/center/user/payCenter?switchType=account&type=frompage' || url === '/mobile/center/user/invoice?type=frompage') {
           this.$router.push(url)
         } else if (!this.user.data.enterprise.uu || this.user.data.enterprise.isVendor !== 313) {
           this.setRemindText('请点击【开店申请】完善信息')