From d9368b75143dec95125cdeb20f83013656461bb4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?lemon=E6=A9=AA?= <17633066053@163.com>
Date: Fri, 18 Jun 2021 17:11:18 +0800
Subject: [PATCH] =?UTF-8?q?=E5=95=86=E5=93=81=E5=88=86=E7=B1=BB=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E7=BB=91=E5=AE=9A=E8=A7=84=E6=A0=BC=E5=85=AB=E9=98=BF?=
 =?UTF-8?q?=E5=93=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 buyer/src/api/shopentry.js                    |   2 +-
 buyer/src/pages/shopEntry/shop-entry.vue      | 122 +++++++-----------
 manager/src/config/index.js                   |   8 +-
 .../src/views/goods/goods-manage/category.vue |  26 +---
 4 files changed, 61 insertions(+), 97 deletions(-)

diff --git a/buyer/src/api/shopentry.js b/buyer/src/api/shopentry.js
index 82020595..ae8e6309 100644
--- a/buyer/src/api/shopentry.js
+++ b/buyer/src/api/shopentry.js
@@ -61,7 +61,7 @@ export function getCateById (id) {
 //  店铺入驻协议
 export function agreement () {
   return request({
-    url: `/buyer/article/get/1349291301250293760`,
+    url: `/buyer/article/type/STORE_REGISTER`,
     needToken: true,
     method: Method.GET
   })
diff --git a/buyer/src/pages/shopEntry/shop-entry.vue b/buyer/src/pages/shopEntry/shop-entry.vue
index f522377f..fb112e49 100644
--- a/buyer/src/pages/shopEntry/shop-entry.vue
+++ b/buyer/src/pages/shopEntry/shop-entry.vue
@@ -9,23 +9,11 @@
         <Step title="其他信息"></Step>
         <Step title="提交审核"></Step>
       </Steps>
-      <first-apply
-        v-if="currentIndex == 0 && dataReview"
-        :content="firstData"
-        @change="nextPage"
-      ></first-apply>
+      <first-apply v-if="currentIndex == 0 && dataReview" :content="firstData" @change="nextPage"></first-apply>
 
-      <second-apply
-        v-if="currentIndex == 1 && dataReview"
-        :content="secondData"
-        @change="nextPage"
-      ></second-apply>
+      <second-apply v-if="currentIndex == 1 && dataReview" :content="secondData" @change="nextPage"></second-apply>
 
-      <third-apply
-        v-if="currentIndex == 2 && dataReview"
-        :content="thirdData"
-        @change="nextPage"
-      ></third-apply>
+      <third-apply v-if="currentIndex == 2 && dataReview" :content="thirdData" @change="nextPage"></third-apply>
 
       <div class="success-page" v-if="currentIndex == 3">
         <span v-if="storeDisable == '' || storeDisable == 'APPLYING'">入驻申请提交成功，等待平台审核</span>
@@ -37,62 +25,51 @@
       <Button type="primary" @click='currentIndex = 0' v-if="storeDisable === 'REFUSED' && currentIndex === 3">重新申请</Button>
     </div>
 
-    <Modal
-      title="店铺入驻协议"
-      v-model="showAgreement"
-      width="1200"
-      :closable="false"
-      :mask-closable="false"
-    >
+    <Modal title="店铺入驻协议" v-model="showAgreement" width="1200" :closable="false" :mask-closable="false">
       <div class="agreeent-con" v-html="agreementCon"></div>
 
       <div slot="footer" style="text-align: center">
-        <p><Checkbox v-model="checked">我已同意以上协议</Checkbox></p>
-        <Button
-          type="primary"
-          :disabled="!checked"
-          class="margin"
-          @click="showAgreement = false"
-          >同意协议填写资质信息</Button
-        >
+        <p>
+          <Checkbox v-model="checked">我已同意以上协议</Checkbox>
+        </p>
+        <Button type="primary" :disabled="!checked" class="margin" @click="showAgreement = false">同意协议填写资质信息</Button>
       </div>
     </Modal>
   </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) => {
-        console.log(res);
-        this.agreementCon = res.result;
+        this.agreementCon = res.result.content;
       });
     },
-    getData () {
+    getData() {
       applyStatus().then((res) => {
         if (res.success) {
           if (!res.result) {
@@ -101,34 +78,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'
+              "addressIdPath",
+              "addressPath",
+              "companyAddress",
+              "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;
@@ -143,7 +120,7 @@ export default {
               this.thirdData[e] = data[e];
             });
 
-            if (this.storeDisable === 'APPLY') {
+            if (this.storeDisable === "APPLY") {
               this.currentIndex = 0;
             } else {
               this.currentIndex = 3;
@@ -154,13 +131,14 @@ export default {
         }
       });
     },
-    nextPage (step) {
+    nextPage(step) {
       this.currentIndex = step;
-    }
+    },
   },
-  mounted () {
+  mounted() {
     this.getData();
-  }
+    this.getArticle();
+  },
 };
 </script>
 <style lang="scss" scoped>
diff --git a/manager/src/config/index.js b/manager/src/config/index.js
index d9727bc5..e8363c9d 100644
--- a/manager/src/config/index.js
+++ b/manager/src/config/index.js
@@ -21,10 +21,10 @@ export default {
     // 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: "http://192.168.0.109:8890",
+    buyer: "http://192.168.0.109:8888",
+    seller: "http://192.168.0.109:8889",
+    manager: "http://192.168.0.109:8887"
 
   },
   api_prod: {
diff --git a/manager/src/views/goods/goods-manage/category.vue b/manager/src/views/goods/goods-manage/category.vue
index f2b70e07..1bcc3217 100644
--- a/manager/src/views/goods/goods-manage/category.vue
+++ b/manager/src/views/goods/goods-manage/category.vue
@@ -106,7 +106,7 @@
 
     <Modal :title="modalSpecTitle" v-model="modalSpecVisible" :mask-closable="false" :width="500">
       <Form ref="specForm" :model="specForm" :label-width="100">
-        <Select v-model="specForm.category_specs" multiple>
+        <Select v-model="specForm.categorySpecs" multiple>
           <Option v-for="item in specifications" :value="item.id" :key="item.id" :label="item.specName">
           </Option>
         </Select>
@@ -134,7 +134,6 @@ import {
 } from "@/api/goods";
 import TreeTable from "@/views/my-components/tree-table/Table/Table";
 import uploadPicInput from "@/views/my-components/lili/upload-pic-input";
-import * as filters from "@/utils/filters";
 
 export default {
   name: "lili-components",
@@ -153,7 +152,7 @@ export default {
       specifications: [], //规格集合
       categoryId: "", // 分类id
       category_brands: [], //已经选择的品牌
-      category_specs: [], //已经选择的规格
+      categorySpecs: [], //已经选择的规格
       expandLevel: 1, // 展开层级
       modalType: 0, // 添加或编辑标识
       modalVisible: false, // 添加或编辑显示
@@ -240,7 +239,8 @@ export default {
     //获取所有规格
     getSpecList() {
       getSpecificationList().then((res) => {
-        if (res.success) {
+        if (res.length != 0) {
+
           this.specifications = res;
         }
       });
@@ -261,7 +261,8 @@ export default {
       getCategorySpecListData(v.id).then((res) => {
         this.categoryId = v.id;
         this.modalSpecTitle = "规格关联";
-        this.specForm.category_specs = res.map((item) => item.id);
+        console.log(res);
+        this.specForm.categorySpecs = res.map((item) => item.id);
         this.modalSpecVisible = true;
       });
     },
@@ -396,7 +397,6 @@ export default {
 
           this.categoryList = res.result;
 
-
           this.$nextTick(() => {
             this.$set(this, "tableData", [res.result[this.categoryIndex]]);
           });
@@ -459,22 +459,8 @@ export default {
   background: #fff;
   padding: 20px;
 }
-.article {
-  font-size: 16px;
-  font-weight: 400;
-  margin: 12px 0;
-}
-
-.href-text {
-  font-size: 12px;
-}
 
 .operation {
   margin-bottom: 2vh;
 }
-
-.select-count {
-  font-weight: 600;
-  color: #40a9ff;
-}
 </style>