Merge branch 'dev' of panhui/raex_saas into master

src/views/activity/ChooseProduct.vue

@@ -72,6 +72,7 @@
 </template>
 
 <script>
+import { mapState } from 'vuex';
 import product from '../../mixins/product';
 export default {
     mixins: [product],
@@ -88,6 +89,7 @@ export default {
         };
     },
     computed: {
+        ...mapState(['companyId']),
         canNext() {
             return this.needChoose === 0 || this.chooseIds.length === this.needChoose;
         },
@@ -123,7 +125,8 @@ export default {
                     page: 0,
                     size: 9999,
                     mintActivityId: this.activityId,
-                    refresh
+                    refresh,
+                    companyId: this.companyId
                 })
                 .then(res => {
                     this.list = res.content;

src/views/activity/Submit.vue

@@ -5,7 +5,7 @@
                 <div class="van-cell van-cell--borderless">
                     <div class="van-cell__value van-cell__value--alone van-address-item__value">
                         <div role="radio" class="van-radio" tabindex="0" aria-checked="false">
-                            <span class="van-radio__label" v-if="addressInfo.id">
+                            <span class="van-radio__label" v-if="showAddress.id">
                                 <div class="van-address-item__name">{{ showAddress.name }} {{ showAddress.tel }}</div>
                                 <div class="van-address-item__address">{{ showAddress.address }}</div>
                             </span>
@@ -152,8 +152,12 @@ export default {
     },
     mounted() {
         this.emitter.on('updateChoose', info => {
-            // console.log(id);
-            this.addressInfo = info;
+            console.log(info.id);
+            this.addressInfo = { ...info };
+            console.log(this.addressInfo);
+            this.$nextTick(() => {
+                console.log(this.showAddress);
+            });
         });
 
         if (this.$route.query.assets) {
@@ -465,7 +469,7 @@ export default {
         }
     },
     beforeRouteLeave(to, from, next) {
-        if (to.path === '/mineAddress') {
+        if (to.name === 'mineAddress') {
             this.setKeeps(['activitySubmit']);
         } else {
             this.setKeeps(['activitySubmit'], false);