✨ feat: 完善商家入驻

src/views/home/index.vue

@@ -24,12 +24,8 @@
           </div>
           <!-- 申请跳转按钮 -->
           <div class="entranceBtn">
-            <div
-              class="btnContainer"
-              v-for="item in pcBtnList"
-              :key="item.value"
-              @click="goToApplication(type = item.type)"
-            >
+            <div class="btnContainer" v-for="item in pcBtnList" :key="item.value"
+              @click="goToApplication(type = item.type)">
               <img :src="item.img" alt="">
               <span>{{ item.label }}</span>
             </div>
@@ -57,9 +53,7 @@
       </div>
       <div class="wapCent">
         <div class="wapCentBox">
-          <div class="wapItemBox"
-            v-for="item in mbBtnList"
-            :key="item.value">
+          <div class="wapItemBox" v-for="item in mbBtnList" :key="item.value">
             <span>
               <img :src="item.img">{{ item.label }}
             </span>
@@ -76,7 +70,7 @@ import { Decrypt } from '@/util/secret.js'
 import Cookie from 'js-cookie'
 export default {
   name: 'login',
-  data () {
+  data() {
     return {
       userName: '',
       // newPcBtnList: [
@@ -161,9 +155,15 @@ export default {
       ]
     }
   },
-  created () {
+  created() {
+    localStorage.removeItem('INVITATION_CODE')
     if (this.userName === '') {
       let data = this.getQueryString('user')
+      const invitationCode = this.getQueryString('code')
+      if (invitationCode) {
+        localStorage.setItem('INVITATION_CODE', invitationCode)
+      }
+
       if (data !== '' && data !== undefined) {
         let user = Decrypt(data)
         console.log(user, 'token')
@@ -177,45 +177,45 @@ export default {
     }
   },
   methods: {
-    goToApplication (type) {
+    goToApplication(type) {
       if (type === 'IndividualBusiness') {
-        this.$router.push({path: '/individualBusiness'})
+        this.$router.push({ path: '/individualBusiness' })
       }
       if (type === 'personal') {
-        this.$router.push({path: '/personal'})
+        this.$router.push({ path: '/personal' })
       }
       if (type === 'enterprisesApply') {
-        this.$router.push({path: '/enterprisesApply'})
+        this.$router.push({ path: '/enterprisesApply' })
       }
       if (type === 'organization') {
-        this.$router.push({path: '/organization'})
+        this.$router.push({ path: '/organization' })
       }
       if (type === 'planner') {
-        this.$router.push({path: '/planner'})
+        this.$router.push({ path: '/planner' })
       }
       if (type === 'SubsidiaryCompany') {
-        this.$router.push({path: '/SubsidiaryCompany'})
+        this.$router.push({ path: '/SubsidiaryCompany' })
       }
       if (type === 'mUinitBusiness') {
-        this.$router.push({path: '/mUinitBusiness'})
+        this.$router.push({ path: '/mUinitBusiness' })
       }
       if (type === 'mEnterprise') {
-        this.$router.push({path: '/mEnterprise'})
+        this.$router.push({ path: '/mEnterprise' })
       }
       if (type === 'mPersonal') {
-        this.$router.push({path: '/mPersonal'})
+        this.$router.push({ path: '/mPersonal' })
       }
       if (type === 'mOtherOrg') {
-        this.$router.push({path: '/mOtherOrg'})
+        this.$router.push({ path: '/mOtherOrg' })
       }
       if (type === 'mPlanner') {
-        this.$router.push({path: '/mPlanner'})
+        this.$router.push({ path: '/mPlanner' })
       }
       if (type === 'mSubsidiaryCompany') {
-        this.$router.push({path: '/mSubsidiaryCompany'})
+        this.$router.push({ path: '/mSubsidiaryCompany' })
       }
     },
-    getQueryString (name) {
+    getQueryString(name) {
       const reg = new RegExp('(^|&)' + name + '=([^&]*)(&|$)', 'i')
       const urlObj = window.location
       const url = window.location.href
@@ -237,11 +237,13 @@ export default {
   align-items: center;
   justify-content: center;
   border-radius: 10px;
+
   .smallImg {
     width: 55px !important;
     height: 55px !important;
   }
 }
+
 .login {
   height: 100%;
   min-height: 870px;
@@ -250,24 +252,29 @@ export default {
   background-image: url('../../assets/images/background.webp');
   background-repeat: no-repeat;
   background-size: 100% 100%;
+
   .loginTop {
     background-color: #333333;
     position: relative;
     z-index: 999;
+
     .loginLogo {
       height: 50px;
       color: #fff;
       display: flex;
       align-items: center;
       justify-content: space-between;
+
       img {
         width: 180px;
         margin-right: 30px;
       }
+
       span {
         font-size: 18px;
         color: $fontColor;
       }
+
       .loginImgBox {
         width: 51px;
         height: 40px;
@@ -275,17 +282,21 @@ export default {
         display: flex;
         margin-right: 20px;
         cursor: pointer;
+
         img {
           width: 100%;
         }
       }
+
       .leftBox {
         display: flex;
         align-items: center;
         font-weight: 400;
       }
+
       .rightBox {
         font-size: 16px;
+
         span {
           color: #C5AA7B;
           padding-left: 10px;
@@ -294,20 +305,23 @@ export default {
       }
     }
   }
+
   .loginCent {
     margin-top: 100px;
     font-family: Microsoft YaHei;
     display: flex;
     justify-content: center;
     align-items: center;
+
     .entrance {
-      .entranceInfo{
-        img{
+      .entranceInfo {
+        img {
           display: block;
           width: 480px;
           margin: auto;
         }
-        p{
+
+        p {
           margin: 30px 0;
           font-size: 16px;
           text-align: center;
@@ -315,21 +329,25 @@ export default {
         }
       }
     }
+
     .entranceBtn {
       width: 700px;
       display: grid;
       grid-template-columns: repeat(2, 2fr);
       justify-items: center;
       margin-bottom: 18px;
-      .btnContainer{
+
+      .btnContainer {
         width: 80px;
         cursor: pointer;
-        img{
+
+        img {
           display: block;
           width: 80px;
           height: 80px;
         }
-        span{
+
+        span {
           display: block;
           margin-top: 18px;
           text-align: center;
@@ -338,9 +356,11 @@ export default {
       }
     }
   }
+
   .wap {
     display: none;
   }
+
   .pc {
     height: 100%;
     display: flex;
@@ -348,10 +368,12 @@ export default {
     min-height: 768px;
   }
 }
+
 @media screen and (max-width: 750px) {
   .warp {
     width: 100%;
   }
+
   .login {
     background: #F8F8F8;
     position: relative;
@@ -371,21 +393,25 @@ export default {
         font-size: 18px;
         text-align: center;
       }
+
       .wapBan {
         width: 100%;
         background: url("../../assets/images/mb-background.png") no-repeat top center;
         background-size: contain;
         height: 300px;
       }
+
       .wapCent {
         position: absolute;
         top: 25%;
         width: 100%;
+
         .wapCentBox {
           width: 94%;
           margin: -50px auto 0 auto;
           padding: 5%;
           background: #FFFFFF;
+
           // box-shadow: 0px 1px 32px 2px #F4F4F4;
           // border-radius: 10px;
           .wapItemBox {
@@ -395,19 +421,23 @@ export default {
             justify-content: space-between;
             width: 100%;
             border-bottom: 1px solid #F6F4F7;
-            >>> .el-button--primary {
+
+            >>>.el-button--primary {
               width: 80px;
               color: #FFEBC4;
               background-color: #333333;
               border-radius: 0;
             }
           }
+
           .wapItemBox:last-child {
             border-bottom: none;
           }
+
           span {
             display: flex;
             align-items: center;
+
             img {
               width: 35px;
               height: 35px;

src/views/moblie/mUinitBusiness.vue

@@ -29,6 +29,11 @@
               <div class="labelTit"><label><i>*</i>负责人电话：</label></div>
               <input type="text" v-model="personalForm.chargePersonPhone" placeholder="请输入负责人电话">
             </div>
+
+            <div class="inputItem">
+              <div class="labelTit"><label>邀请码：</label></div>
+              <input type="text" v-model="personalForm.invitationCode" placeholder="请输入邀请码">
+            </div>
             <!-- <div class="inputItem arrow">
              <div class="labelTit"><label><i>*</i>店铺地址：</label></div>
              <input @click="showPopup" @focus="noBomBox" v-model="shopAdress" type="text" placeholder="请选择所在地区">
@@ -69,7 +74,7 @@
 
             <div class="inputItem">
               <div class="labelTit"><label><i>*</i>店铺分类</label></div>
-              <input type="text" placeholder="请选择店铺所属分类" v-model="selectShopCategoryStr" @click="show2 = true">
+              <input @focus="noBomBox" type="text" placeholder="请选择店铺所属分类" v-model="selectShopCategoryStr" @click="show2 = true">
               <van-popup v-model="show2" round position="bottom">
 
                 <div v-show="isQueryShopCategory" class="loading-container"><van-loading color="#ee0a24" type="spinner" />
@@ -101,8 +106,17 @@
             </div>
 
             <div class="inputItem arrow" style="margin-top: 20px;">
+              <div class="labelTit"><label><i>*</i>人均消费</label></div>
+              <div class="voucher-wrapper">
+                <input type="number" v-model.number="personalForm.perCapita" placeholder="人均消费额">
+                元
+              </div>
+            </div>
+
+
+            <div class="inputItem arrow" style="margin-top: 20px;">
               <div class="labelTit"><label><i>*</i>广告图</label></div>
-              <van-uploader style="margin-top: 20px;" v-model="advertisementList"
+              <van-uploader style="margin-top: 20px;" v-model="advertisementList" @delete="handleDeleteAdvertisement"
                 :after-read="(file) => { return afterRead(file, type = 'advertisement') }" />
             </div>
             <!-- <div class="inputItem">
@@ -392,6 +406,9 @@ export default {
         areaId: '', // 区域ID
         packageId: '',
         classificationId: '', // 商家所属分类
+        perCapita: "", // 人均消费
+        invitationCode: localStorage.getItem('INVITATION_CODE'), // 邀请码
+        advertisement: [],
       },
       show1: false,
       show3: false,
@@ -419,6 +436,7 @@ export default {
   },
   mounted() {
     this.getDictList()
+    console.log(localStorage.getItem('INVITATION_CODE'));
   },
   created() {
     this.sendReq({
@@ -609,6 +627,8 @@ export default {
           } else if (type === 'advertisement') {
             self.personalForm.advertisement.push(res.data.url)
           }
+
+          // console.log("这是为什么呢？", this.advertisementList, res.data);
         } else {
           Toast.fail(res.message)
         }
@@ -662,6 +682,18 @@ export default {
         return false
       }
 
+      if (subData.chargePersonName === '') {
+        Toast.fail('请输入店铺负责人')
+        return false
+      }
+      if (subData.chargePersonPhone === '') {
+        Toast.fail('请输入负责人电话')
+        return false
+      } else if (!reg.test(subData.chargePersonPhone)) {
+        Toast.fail('负责人电话式错误')
+        return false
+      }
+
       if (subData.shopType === '2') {
         if (!subData.startTime) {
           Toast.fail('请选择营业开始时间')
@@ -674,12 +706,21 @@ export default {
         }
       }
 
-      if (!subData.personalForm.classificationId) {
+      if (subData.shopAdress === '') {
+        Toast.fail('请选择所在地区')
+        return false
+      }
+      if (subData.storeAddressDetail === '') {
+        Toast.fail('请输入详细地址')
+        return false
+      }
+
+      if (!subData.classificationId) {
         Toast.fail('请选择店铺所属分类')
         return
       }
 
-      if (!subData.voucherReturn) {
+      if (!subData.voucherReturn && subData.voucherReturn != 0) {
         Toast.fail('请输入代金券返回比例')
         return
       } else {
@@ -689,32 +730,21 @@ export default {
         }
       }
 
-      if (!this.advertisementList.length) {
+      if (!subData.perCapita) {
+        Toast.fail('请填写人均消费额')
+        return
+      } else if (isNaN(subData.perCapita) || subData.perCapita <= 0) {
+        Toast.fail('人均消费额不能小于等于0元')
+        return
+      }
+
+      if (!subData.advertisement.length) {
         Toast.fail('请上传广告图')
         return
       } else {
-        subData.advertisement = this.advertisementList.join(",")
+        subData.advertisement = subData.advertisement.join(",")
       }
 
-      if (subData.chargePersonName === '') {
-        Toast.fail('请输入店铺负责人')
-        return false
-      }
-      if (subData.chargePersonPhone === '') {
-        Toast.fail('请输入负责人电话')
-        return false
-      } else if (!reg.test(subData.chargePersonPhone)) {
-        Toast.fail('负责人电话式错误')
-        return false
-      }
-      if (subData.shopAdress === '') {
-        Toast.fail('请选择所在地区')
-        return false
-      }
-      if (subData.storeAddressDetail === '') {
-        Toast.fail('请输入详细地址')
-        return false
-      }
       if (subData.subjectName === '') {
         Toast.fail('请输入商户名称')
         return false
@@ -889,7 +919,6 @@ export default {
 
     // 店铺所属分类change
     async onShopCategoryChange(e, finishCB) {
-      console.log("change事件", e);
       try {
         this.isQueryShopCategory = true
         let cacheArray = []
@@ -931,6 +960,11 @@ export default {
           resolve(res.data)
         })
       })
+    },
+
+    // 删除广告图
+    handleDeleteAdvertisement(_, { index }) {
+      this.personalForm.advertisement.splice(index, 1)
     }
   }
 }