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

Dockerfile

@@ -6,6 +6,6 @@ RUN chmod +x run.sh
 #RUN npm install -g cnpm --registry=https://registry.npm.taobao.org
 #RUN cnpm install -g node-gyp
 #RUN cnpm install -g yarn
-RUN yarn config set sass-binary-site http://npm.taobao.org/mirrors/node-sass -g
-RUN yarn
+RUN /opt/yarn-v1.5.1/bin/yarn config set sass-binary-site http://npm.taobao.org/mirrors/node-sass -g
+RUN /opt/yarn-v1.5.1/bin/yarn
 CMD [ "bash", "run.sh" ]

components/mobile/center/outOfStorage/otherStorage.vue

@@ -56,11 +56,6 @@
         default: 'INBOUND'
       }
     },
-    fetch({route, store}) {
-      return Promise.all([
-        store.dispatch('loadCurrencyData')
-      ])
-    },
     data () {
       return {
         remindText: '',

components/mobile/staffManagement/StaffList.vue

@@ -176,8 +176,7 @@
           if (val && val.content) {
             this.AuditList = [...this.AuditList, ...val.content]
           }
-        },
-        immediate: true
+        }
       }
     },
     computed: {

pages/mobile/center/vendor/outOfStorage/index.vue

@@ -54,6 +54,11 @@
   export default {
     middleware: 'authenticated',
     layout: 'mobile',
+    fetch({store}) {
+      return Promise.all([
+        store.dispatch('loadCurrencyData')
+      ])
+    },
     data () {
       return {
         remindText: '',