From c3bd727694c3f211215f2c736be4cac093572c76 Mon Sep 17 00:00:00 2001
From: mabo <mailmabo@126.com>
Date: Mon, 28 Jun 2021 11:23:22 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BA=97=E9=93=BA=E5=85=A5=E9=A9=BBbug?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 buyer/src/pages/forgetPassword.vue            |  2 +-
 buyer/src/pages/shopEntry/first-apply.vue     |  8 +-
 buyer/src/pages/shopEntry/shop-entry.vue      | 95 ++++++++++---------
 buyer/src/pages/shopEntry/third-apply.vue     | 17 +++-
 buyer/src/pages/user/Home.vue                 | 11 +--
 .../src/views/my-components/verify/index.vue  |  5 +-
 6 files changed, 73 insertions(+), 65 deletions(-)

diff --git a/buyer/src/pages/forgetPassword.vue b/buyer/src/pages/forgetPassword.vue
index 322c6e50..c955c89e 100644
--- a/buyer/src/pages/forgetPassword.vue
+++ b/buyer/src/pages/forgetPassword.vue
@@ -280,7 +280,7 @@ export default {
 .login-container {
   position: relative;
   margin: 10px auto;
-  width: 1200px;
+  width: 600px;
   background-color: #fff;
   padding: 20px;
   .login-btn{
diff --git a/buyer/src/pages/shopEntry/first-apply.vue b/buyer/src/pages/shopEntry/first-apply.vue
index 91ca0608..7b82e101 100644
--- a/buyer/src/pages/shopEntry/first-apply.vue
+++ b/buyer/src/pages/shopEntry/first-apply.vue
@@ -10,7 +10,6 @@
         />
       </FormItem>
       <FormItem prop="storeAddressIdPath" label="公司所在地">
-        <!-- <Input type="text" v-model="form.storeAddressIdPath" placeholder="请选择公司所在地" /> -->
         <region
           style="width: 250px"
           @selected="selectedRegion"
@@ -32,6 +31,13 @@
           ><span slot="append">人</span>
           </Input>
       </FormItem>
+      <FormItem prop="linkPhone" label="公司电话">
+        <Input
+          type="text"
+          v-model="form.companyPhone"
+          placeholder="请填写公司电话"
+          ></Input>
+      </FormItem>
       <FormItem prop="registeredCapital" label="注册资金">
         <Input
           type="text"
diff --git a/buyer/src/pages/shopEntry/shop-entry.vue b/buyer/src/pages/shopEntry/shop-entry.vue
index fb112e49..1cd50f9a 100644
--- a/buyer/src/pages/shopEntry/shop-entry.vue
+++ b/buyer/src/pages/shopEntry/shop-entry.vue
@@ -3,7 +3,7 @@
     <div style="height: 20px"></div>
     <div class="content">
       <h3>店铺入驻</h3>
-      <Steps :current="currentIndex" size="small" class="margin">
+      <Steps :current="currentIndex" class="margin">
         <Step title="企业资质信息"></Step>
         <Step title="财务资质信息"></Step>
         <Step title="其他信息"></Step>
@@ -21,6 +21,9 @@
         <span v-if="storeDisable == 'CLOSED'">店铺已关闭，重申请联系管理员</span>
         <span v-if="storeDisable == 'REFUSED'">审核未通过,请修改资质信息，如有疑问请联系管理员</span>
       </div>
+      <Button @click="currentIndex = 0">上一步</Button>
+      <Button @click="currentIndex = 1">下一步</Button>
+      <Button @click="currentIndex = 2">第三步</Button>
       <Button v-if="currentIndex === 3" @click="$router.push('/')">返回</Button>
       <Button type="primary" @click='currentIndex = 0' v-if="storeDisable === 'REFUSED' && currentIndex === 3">重新申请</Button>
     </div>
@@ -38,38 +41,37 @@
   </div>
 </template>
 <script>
-import { agreement, applyStatus } from "@/api/shopentry";
-import firstApply from "./first-apply";
-import secondApply from "./second-apply";
-import thirdApply from "./third-apply";
+import { agreement, applyStatus } from '@/api/shopentry';
+import firstApply from './first-apply';
+import secondApply from './second-apply';
+import thirdApply from './third-apply';
 export default {
   components: {
     firstApply,
     secondApply,
-    thirdApply,
+    thirdApply
   },
-  data() {
+  data () {
     return {
       currentIndex: 0, // 当前步骤
       showAgreement: false, // 协议显示
-      agreementCon: "", // 协议内容
+      agreementCon: '', // 协议内容
       checked: false, // 选中协议
-      applyData: {}, // 申请数据
       firstData: {}, // 第一步数据
       secondData: {}, // 第二步数据
       thirdData: {}, // 第三步数据
-      storeDisable: "", // APPLY OPEN 开店中 CLOSED 关闭 REFUSED 拒绝 APPLYING 申请中，审核
-      dataReview: true, // 根据接口返回判断是否可展示数据
+      storeDisable: '', // APPLY OPEN 开店中 CLOSED 关闭 REFUSED 拒绝 APPLYING 申请中，审核
+      dataReview: true // 根据接口返回判断是否可展示数据
     };
   },
   methods: {
-    getArticle() {
+    getArticle () {
       // 入驻协议
       agreement().then((res) => {
         this.agreementCon = res.result.content;
       });
     },
-    getData() {
+    getData () { // 获取已填写店铺信息
       applyStatus().then((res) => {
         if (res.success) {
           if (!res.result) {
@@ -78,34 +80,34 @@ export default {
             this.dataReview = false;
             let data = res.result;
             let first = [
-              "addressIdPath",
-              "addressPath",
-              "companyAddress",
-              "companyEmail",
-              "companyName",
-              "employeeNum",
-              "legalId",
-              "legalName",
-              "licencePhoto",
-              "legalPhoto",
-              "licenseNum",
-              "linkName",
-              "linkPhone",
-              "registeredCapital",
-              "scope",
+              'storeAddressIdPath',
+              'storeAddressPath',
+              'storeAddressDetail',
+              'companyEmail',
+              'companyName',
+              'employeeNum',
+              'legalId',
+              'legalName',
+              'licencePhoto',
+              'legalPhoto',
+              'licenseNum',
+              'linkName',
+              'linkPhone',
+              'registeredCapital',
+              'scope'
             ];
             let second = [
-              "settlementBankAccountName",
-              "settlementBankAccountNum",
-              "settlementBankBranchName",
-              "settlementBankJointName",
+              'settlementBankAccountName',
+              'settlementBankAccountNum',
+              'settlementBankBranchName',
+              'settlementBankJointName'
             ];
             let third = [
-              "goodsManagementCategory",
-              "storeCenter",
-              "storeDesc",
-              "storeLogo",
-              "storeName",
+              'goodsManagementCategory',
+              'storeCenter',
+              'storeDesc',
+              'storeLogo',
+              'storeName'
             ];
 
             this.storeDisable = data.storeDisable;
@@ -120,25 +122,28 @@ export default {
               this.thirdData[e] = data[e];
             });
 
-            if (this.storeDisable === "APPLY") {
+            if (this.storeDisable === 'APPLY') {
               this.currentIndex = 0;
             } else {
               this.currentIndex = 3;
             }
-            this.dataReview = true;
-            this.$forceUpdate();
+            this.$nextTick(() => {
+              this.dataReview = true;
+              this.$forceUpdate();
+            })
           }
+          console.log(33333333333333);
         }
       });
     },
-    nextPage(step) {
+    nextPage (step) {
       this.currentIndex = step;
-    },
+    }
   },
-  mounted() {
+  mounted () {
     this.getData();
     this.getArticle();
-  },
+  }
 };
 </script>
 <style lang="scss" scoped>
@@ -159,7 +164,7 @@ export default {
 }
 
 .margin {
-  margin: 10px 0;
+  margin: 30px 0;
 }
 .agreeent-con {
   max-height: 500px;
diff --git a/buyer/src/pages/shopEntry/third-apply.vue b/buyer/src/pages/shopEntry/third-apply.vue
index 6cf566a9..739721d8 100644
--- a/buyer/src/pages/shopEntry/third-apply.vue
+++ b/buyer/src/pages/shopEntry/third-apply.vue
@@ -60,17 +60,23 @@
           >
         </Select>
       </FormItem>
-      <FormItem prop="storeCenter" label="经纬度">
-        <Input
+      <FormItem prop="storeCenter" label="店铺定位">
+        <!-- <Input
           type="text"
           v-model="form.storeCenter"
           readonly
           placeholder="点击右侧按钮选择店铺位置"
-        />
+        /> -->
         <Button
-          icon="ios-locate-outline"
+          type="info"
+          v-if="!form.storeCenter"
           @click="$refs.liliMap.showMap = true"
-        ></Button>
+        >点击获取店铺定位</Button>
+        <Button
+          type="success"
+          v-else
+          @click="$refs.liliMap.showMap = true"
+        >已定位</Button>
       </FormItem>
       <FormItem prop="storeDesc" label="店铺简介">
         <Input
@@ -84,6 +90,7 @@
       </FormItem>
 
       <FormItem>
+        
         <Button @click="$emit('change', 1)">返回</Button>
         <Button type="primary" :loading="loading" @click="next"
           >提交平台审核</Button
diff --git a/buyer/src/pages/user/Home.vue b/buyer/src/pages/user/Home.vue
index 28f9eb7f..5ddc9c7b 100644
--- a/buyer/src/pages/user/Home.vue
+++ b/buyer/src/pages/user/Home.vue
@@ -15,7 +15,8 @@
           >
             <div class="user-icon">
               <div class="user-img">
-                <img :src="userInfo.face" />
+                <img :src="userInfo.face" v-if="userInfo.face" alt />
+                <Avatar icon="ios-person" class="mb_10" v-else size="96" />
               </div>
               <p>{{userInfo.nickName}}</p>
             </div>
@@ -125,10 +126,6 @@ export default {
   align-items: center;
 }
 
-.user-icon span {
-  font-size: 96px;
-}
-
 .user-img {
   margin-bottom: 15px;
   width: 96px;
@@ -137,10 +134,6 @@ export default {
   overflow: hidden;
 }
 
-.user-img img {
-  width: 100%;
-}
-
 .layout-footer-center {
   padding: 0px 15px;
 
diff --git a/manager/src/views/my-components/verify/index.vue b/manager/src/views/my-components/verify/index.vue
index 34f07f36..136c3160 100644
--- a/manager/src/views/my-components/verify/index.vue
+++ b/manager/src/views/my-components/verify/index.vue
@@ -18,7 +18,7 @@
 import { getVerifyImg, postVerifyImg } from './verify.js';
 export default {
   props: {
-    verifyType: {
+    verifyType: { // 验证方式，登录，注册等
       defalut: 'LOGIN',
       type: String
     }
@@ -97,9 +97,6 @@ export default {
       });
     }
   },
-  created () {
-    // this.getImg();
-  },
   watch: {
     verifyType: {
       immediate: true,