Bladeren bron

Merge remote-tracking branch 'origin/feature-201830-wangcz' into feature-201830-wangcz

wangcz 7 jaren geleden
bovenliggende
commit
a1a28cf433

+ 2 - 2
components/mobile/center/upoff-material.vue

@@ -111,12 +111,12 @@
                              <!--maxlength="9"/>-->
                     </div>
                     <div class="pull-right">
-                      <input v-show="chooseItem.goods.currencyName === 'RMB'"
+                      <input v-show="storeInfoStore.enType !== 'HK'"
                              class="priceM" type="text"
                              placeholder="单价(¥)"
                              v-model.lazy="item.rMBPrice"
                              @blur="rMBPriceBlur(item, 'rMBPrice')"/>
-                      <input v-show="chooseItem.goods.currencyName !== 'RMB'"
+                      <input v-show="storeInfoStore.enType === 'HK'"
                              class="priceM" type="text"
                              placeholder="单价($)"
                              v-model.lazy="item.uSDPrice"

+ 1 - 1
pages/mobile/center/vendor/index.vue

@@ -85,7 +85,7 @@
       }
     },
     fetch ({ store }) {
-     let user = store.state.option.user.data
+       let user = store.state.option.user.data
       return Promise.all([
         store.dispatch('loadStoreStatus', { op: 'check' }),
         // store.dispatch('messageShow/loadMessageCount', {receiverUu: user.userUU, receiverEnuu: user.enterprise.uu, consumerApp: 'MALL', isRead: 0})

+ 5 - 0
pages/mobile/center/vendor/material.vue

@@ -318,6 +318,11 @@
       }
     },
     created() {
+      this.$http.get('/store-service/stores', { params: { op: 'check' } }).then(response => {
+        this.$store.commit('option/REQUEST_STORE_STATUS_SUCCESS', response.data)
+      }, err => {
+        this.$store.commit('option/REQUEST_STORE_STATUS_FAILURE', err)
+      })
       this.getResourceProvidor()
       // this.MaterielItem.packaging = this.packObj[0]
     },