Merge branch 'dev-market-20200813' into 'release'

地区回显优化 code reviewer:张平



See merge request !209

src/components/shop/change-info.vue

 <template>
-  <div class="order-manage-wrapper">
+  <div class="order-manage-wrapper" v-if="showChangeInfo">
     <el-dialog
         title="修改买家收货信息"
         :visible="changeInfoDialog"
@@ -51,6 +51,10 @@
     components: {
     },
     props: {
+      showChangeInfo: {
+        type: Boolean,
+        default: false,
+      },
       receiveInfo: {
         type: Object,
         required: true,
@@ -204,7 +208,14 @@
     },
     created() {
       vm = this;
+
+    },
+    watch: {
+      showChangeInfo(val) {
+        if (val) {
           this.initData();
+        }
+      },
     },
     methods: {
       async initData() {

src/components/shop/send-set-dialog.vue

@@ -61,7 +61,7 @@
         <el-button size="small" type="primary" @click="submitSendSet">完成</el-button>
       </span>
       </el-dialog>
-      <change-info v-if="showChangeInfo" @closeChangeInfo="closeChangeInfo" :receiveInfo="setReceiveInfo"></change-info>
+      <change-info :showChangeInfo="showChangeInfo" @closeChangeInfo="closeChangeInfo" :receiveInfo="setReceiveInfo"></change-info>
     </div>
 </template>
 <script>

src/views/goods/goods-manage.vue

@@ -199,7 +199,7 @@
     data(){
       return{
         curmbFirst: '云鹊店铺',
-        curmbSecond: '店铺管理',
+        curmbSecond: '商品管理',
         showAllFlag: false,
         showNewFlag: false,
         batchDialog:false,

src/views/shop/shop-list.vue

@@ -75,7 +75,7 @@
           <template slot-scope="scope">
             <div>
               <el-button @click="editShop(scope.row)" type="text" size="small">编辑</el-button>
-              <el-button @click="shopManage(scope.row)" type="text" size="small">店铺管理</el-button>
+              <el-button @click="shopManage(scope.row)" type="text" size="small">商品管理</el-button>
               <el-button @click="orderManage(scope.row)" type="text" size="small">订单管理</el-button>
             </div>
           </template>