diff --git a/buyer/src/components/addressManage/index.vue b/buyer/src/components/addressManage/index.vue
index b5e1a904..ea4df620 100644
--- a/buyer/src/components/addressManage/index.vue
+++ b/buyer/src/components/addressManage/index.vue
@@ -153,7 +153,7 @@ export default {
         if (v) {
           this.getAddrById(v);
         } else {
-          this.formData = {}
+          this.formData = {isDefault: false}
           this.$refs.form.resetFields();
         }
       }
diff --git a/buyer/src/pages/shopEntry/first-apply.vue b/buyer/src/pages/shopEntry/first-apply.vue
index 808bc6db..91ca0608 100644
--- a/buyer/src/pages/shopEntry/first-apply.vue
+++ b/buyer/src/pages/shopEntry/first-apply.vue
@@ -269,11 +269,12 @@ export default {
       });
     },
     selectedRegion (item) {
+      console.log(item);
       // 地址选择回显
       this.$set(this.form, 'storeAddressIdPath', item[0].toString());
       this.$set(
         this.form,
-        'companyAddressPath',
+        'storeAddressPath',
         item[1].toString().replace(/\s/g, '')
       );
     },
diff --git a/manager/src/views/login.vue b/manager/src/views/login.vue
index 605cf9e5..e5c43a0d 100644
--- a/manager/src/views/login.vue
+++ b/manager/src/views/login.vue
@@ -27,7 +27,7 @@
       </div>
       <Footer />
       </Col>
-      <LangSwitch />
+      <!-- <LangSwitch /> -->
     </Row>
   </div>
 </template>
diff --git a/seller/src/config/index.js b/seller/src/config/index.js
index 16512d47..a4549075 100644
--- a/seller/src/config/index.js
+++ b/seller/src/config/index.js
@@ -18,14 +18,14 @@ export default {
    * @description api请求基础路径
    */
   api_dev: {
-    // common: 'https://common-api.pickmall.cn',
-    // buyer: 'https://buyer-api.pickmall.cn',
-    // seller: 'https://store-api.pickmall.cn',
-    // manager: 'https://admin-api.pickmall.cn'
-    common: 'http://192.168.0.100:8890',
-    buyer: 'http://192.168.0.100:8888',
-    seller: 'http://192.168.0.100:8889',
-    manager: 'http://192.168.0.100:8887'
+    common: 'https://common-api.pickmall.cn',
+    buyer: 'https://buyer-api.pickmall.cn',
+    seller: 'https://store-api.pickmall.cn',
+    manager: 'https://admin-api.pickmall.cn'
+    // common: 'http://192.168.0.100:8890',
+    // buyer: 'http://192.168.0.100:8888',
+    // seller: 'http://192.168.0.100:8889',
+    // manager: 'http://192.168.0.100:8887'
   },
   api_prod: {
     common: 'https://common-api.pickmall.cn',
diff --git a/seller/src/main.js b/seller/src/main.js
index c288d27c..837264e7 100644
--- a/seller/src/main.js
+++ b/seller/src/main.js
@@ -6,6 +6,7 @@ import "./styles/theme.less";
 
 import "core-js/stable";
 import "regenerator-runtime/runtime";
+import vueQr from 'vue-qr'
 
 import App from "./App";
 import { router } from "./router/index";
@@ -42,6 +43,7 @@ Vue.use(ViewUI, {
 });
 
 Vue.use(VueClipboard);
+Vue.component(vueQr)
 
 // 挂载全局使用的方法
 Vue.prototype.getRequest = getRequest;
diff --git a/seller/src/styles/common.scss b/seller/src/styles/common.scss
index 63488166..fa9a7b96 100644
--- a/seller/src/styles/common.scss
+++ b/seller/src/styles/common.scss
@@ -88,6 +88,9 @@ ul,li{
     text-overflow:ellipsis;
     white-space: nowrap;
 }
+.hover-pointer {
+  cursor: pointer;
+}
 
 /*
  * @Author: LMR
diff --git a/seller/src/views/distribution/distributionGoods.vue b/seller/src/views/distribution/distributionGoods.vue
index d04523b1..386074f0 100644
--- a/seller/src/views/distribution/distributionGoods.vue
+++ b/seller/src/views/distribution/distributionGoods.vue
@@ -23,16 +23,22 @@
           <Row>
             <Table :loading="loading" border :columns="columns" :data="data" ref="table" sortable="custom" @on-sort-change="changeSort" @on-selection-change="changeSelect">
               <!-- 商品栏目格式化 -->
-              <template slot="goodsSlot" slot-scope="scope">
+              <template slot="goodsSlot" slot-scope="{row}">
                 <div style="margin-top: 5px;height: 70px; display: flex;">
                   <div style="">
-                    <img :src="scope.row.thumbnail" style="height: 60px;margin-top: 3px;width: 60px">
+                    <img :src="row.thumbnail" style="height: 60px;margin-top: 3px;width: 60px">
                   </div>
 
                   <div style="margin-left: 13px;">
-                    <div class="div-zoom" >
-                      <a @click="linkTo(scope.row.id,scope.row.skuId)">{{scope.row.goodsName}}</a>
+                    <div class="div-zoom">
+                      <a @click="linkTo(row.id,row.skuId)">{{row.goodsName}}</a>
                     </div>
+                    <Poptip trigger="hover" title="扫码APP查看" transfer>
+                      <div slot="content">
+                        <vue-qr :text="wapLinkTo(row.id,row.skuId)"  :margin="0" colorDark="#000" colorLight="#fff" :size="150"></vue-qr>
+                      </div>
+                      <img src="../../assets/qrcode.svg" class="hover-pointer" width="20" height="20" alt="">
+                    </Poptip>
                   </div>
                 </div>
 
diff --git a/seller/src/views/goods/goods-seller/goodsOperation.vue b/seller/src/views/goods/goods-seller/goodsOperation.vue
index 034f70cc..f1f56865 100644
--- a/seller/src/views/goods/goods-seller/goodsOperation.vue
+++ b/seller/src/views/goods/goods-seller/goodsOperation.vue
@@ -527,10 +527,10 @@
                 @on-change="logisticsTemplateChange"
                 v-model="baseInfoForm.freightPayer"
               >
-                <Radio label="BUYER">
+                <Radio label="STORE">
                   <span>卖家承担运费</span>
                 </Radio>
-                <Radio label="STORE">
+                <Radio label="BUYER">
                   <span>使用物流规则</span>
                 </Radio>
               </RadioGroup>
@@ -709,7 +709,7 @@ export default {
         this.baseInfoForm = {
           salesModel: "RETAIL",
           goodsParamsList: [],
-          freightPayer: "BUYER",
+          freightPayer: "STORE",
           weight: "",
           goodsGalleryFiles: [],
           release: "true",
@@ -853,7 +853,7 @@ export default {
         /** 商品参数列表 */
         goodsParamsList: [],
         /** 运费承担者 */
-        freightPayer: "BUYER",
+        freightPayer: "STORE",
         /** 商品重量 */
         weight: "",
         /** 商品相册列表 */
@@ -1016,7 +1016,7 @@ export default {
       this.baseInfoForm = {
         salesModel: "RETAIL",
         goodsParamsList: [],
-        freightPayer: "BUYER",
+        freightPayer: "STORE",
         weight: "",
         goodsGalleryFiles: [],
         release: "true",
diff --git a/seller/src/views/login.vue b/seller/src/views/login.vue
index c8052feb..8f9dd33d 100644
--- a/seller/src/views/login.vue
+++ b/seller/src/views/login.vue
@@ -56,7 +56,7 @@
         </Row>
         <Footer />
       </Col>
-      <LangSwitch />
+      <!-- <LangSwitch /> -->
     </Row>
   </div>
 </template>
@@ -65,8 +65,6 @@
 import {
   login,
   userMsg,
-  initCaptcha,
-  drawCodeImage,
 } from "@/api/index";
 import { validateMobile } from "@/libs/validate";
 import Cookies from "js-cookie";
@@ -135,13 +133,6 @@ export default {
       // 获取用户信息
       userMsg().then((res) => {
         if (res.success) {
-          // 避免超过大小限制
-         /*  delete res.result.permissions;
-          let roles = [];
-          res.result.roles.forEach((e) => {
-            roles.push(e.name);
-          });
-          this.setStore("roles", roles); */
           this.setStore("saveLogin", this.saveLogin);
           if (this.saveLogin) {
             // 保存7天
@@ -180,11 +171,7 @@ export default {
         }
       })
     },
-
-  },
-  mounted() {
-    // this.getCaptchaImg();
-  },
+  }
 };
 </script>
 <style lang="scss" scoped>