update: 小程序配置修改

src/components/common/gic-select-group-auth.vue

@@ -10,6 +10,7 @@
   选择门店分组组件：
   <gic-select-group
   :selectData="selectData"
+  :checkedList="checkedList"
   @checkGroupIds="checkGroupIds">
   </gic-select-group>
 

src/components/set/app-set.vue

@@ -11,11 +11,11 @@
   import appSet from '@/components/set/app-set.vue';
  -->
 <template>
-  <el-dialog :title="editRow.type === 'edit' ? '编辑' : '新建'" :visible.sync="dialogVisible" width="600px" :before-close="handleClose">
+  <el-dialog :title="editRow.type === 'edit' ? '编辑' : '获取小程序'" :visible.sync="dialogVisible" width="600px" :before-close="handleClose">
     <div class="">
       <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="120px" class="demo-ruleForm">
         <el-form-item label="授权商户" prop="enterpriseId">
-          <el-select v-model="ruleForm.enterpriseId" placeholder="请选择授权商户">
+          <el-select v-model="ruleForm.enterpriseId" placeholder="请选择授权商户" :disabled="editRow.type === 'edit'" @change="chooseEnterprise">
             <el-option v-for="item in options" :key="item.value" :label="item.enterpriseName" :value="item.enterpriseId"> </el-option>
           </el-select>
         </el-form-item>
@@ -36,7 +36,7 @@
     </div>
     <div slot="footer" class="dialog-footer">
       <el-button @click="toCancel">取消</el-button>
-      <el-button type="primary" @click="submitForm('ruleForm')">{{ editRow.type === 'edit' ? '保存' : '新建' }}</el-button>
+      <el-button type="primary" @click="submitForm('ruleForm')">{{ editRow.type === 'edit' ? '保存' : '确定' }}</el-button>
     </div>
   </el-dialog>
 </template>
@@ -129,7 +129,7 @@ export default {
     getTableList(val) {
       const that = this;
       let para = {};
-      getRequest('/haoban-manage3-web/wx-enterprise-list', para)
+      getRequest('/haoban-manage3-web/wxa-enterprise-list', para)
         .then(res => {
           let resData = res.data;
           if (resData.errorCode == 1) {
@@ -144,6 +144,14 @@ export default {
             message: error.message
           });
         });
+    },
+    chooseEnterprise(val) {
+      const that = this;
+      const item = that.options.filter(item => item.enterpriseId === val)[0];
+      that.ruleForm.miniprogramName = item.miniprogramName;
+      that.ruleForm.appId = item.appId;
+      that.ruleForm.title = item.title;
+      that.ruleForm.imageUrl = item.imageUrl;
     }
   },
   watch: {

src/views/business/authMerchant-form.vue

@@ -71,7 +71,8 @@
                   </p>
                 </el-form-item>
                 <el-form-item label="企业类型"> <el-radio v-model="partForm.wxEnterpriseType" :label="0" :disabled="type === 'edit'">总部</el-radio> <el-radio v-model="partForm.wxEnterpriseType" :label="1" :disabled="type === 'edit'">代理</el-radio> </el-form-item>
-                <el-button type="primary" style="display:block;margin:38px 0 0 128px;" @click="addShow = true">授权校验并{{ type === 'edit' ? '保存' : '新建' }}</el-button>
+                <el-button type="primary" style="display:block;margin:38px 0 0 128px;" @click="addShow = true" :disabled="!(enterpriseId && partForm.storeGroup.length)">授权校验并{{ type === 'edit' ? '保存' : '新建' }}</el-button>
+                {{ partForm.storeGroup }}
               </el-form>
             </div>
           </div>
@@ -298,6 +299,7 @@ export default {
     this.getCompanyName();
     if (this.$route.query.enterprise) {
       this.type = 'edit';
+      this.enterpriseId = this.$route.query.enterprise;
       this.getDeatil(this.$route.query.enterprise);
     } else {
       this.type = 'add';

src/views/business/authMerchant.vue

@@ -23,7 +23,7 @@
                   </div>
                 </div>
               </div>
-              <div><span class="color-909399 font-13 m-r-19">最多授权 10 个商户</span><el-button type="primary" @click="AddAuthMerchant">新建授权</el-button></div>
+              <div><span class="color-909399 font-13 m-r-19">最多授权 10 个商户</span><el-button v-if="tableData.length < 10" type="primary" @click="AddAuthMerchant">新建授权</el-button></div>
             </div>
             <div class="m-t-20">
               <el-table class="select-table" ref="multipleTable" v-loading="loading" :data="tableData" tooltip-effect="dark" :style="{ width: '100%', minHeight: tableH }">

src/views/enterprise/enterpriseSet.vue

@@ -124,7 +124,10 @@
       </div>
     </div>
     <div class="company-set-content border-box">
-      <div class="company-title m-b-20 m-t-30"><span class="color-303133 font-14 font-w-600">小程序添加</span></div>
+      <div class="company-title m-b-20 m-t-26 flex flex-space-between flex-align-center">
+        <p class="color-303133 font-14 font-w-600">小程序添加</p>
+        <el-button type="primary" @click="addApp">获取小程序</el-button>
+      </div>
       <div class="company-info-body">
         <div class="table-cell m-t-10">
           <el-table class="no-empty-icon-table" ref="multipleTable" :data="appTableData" tooltip-effect="dark" :style="{ width: '100%', minHeight: tableH }">

src/views/login/login-more.vue

@@ -10,11 +10,12 @@
   <div class="login-wrap">
     <section>
       <div class="login-body-head border-box flex">
-        <img class="login-body-logo" src="../../assets/logo.png" alt="logo" />
-        <span class="login-body-title">好办管理后台</span>
+        <img class="login-body-logo" src="../../assets/logo-text.png" alt="logo" />
       </div>
       <div class="login-body">
-        <el-carousel arrow="always" height="262px" :autoplay="false" @change="changeEnterprise">
+        <i class="iconfont iconpre" @click="arrowClick('left')"></i>
+        <i class="iconfont iconnext" @click="arrowClick('right')"></i>
+        <el-carousel arrow="never" ref="cardShow" height="262px" indicator-position="none" :autoplay="false" @change="changeEnterprise">
           <el-carousel-item v-for="item in enterpriseList" :key="item.wxEnterpriseId">
             <div class="info flex">
               <p class="info_img"><img :src="item.corpSquareLogoUrl" alt="" /></p>
@@ -88,6 +89,10 @@ export default {
           let resData = res.data;
           if (resData.errorCode == 1) {
             this.enterpriseList = resData.result;
+            if (resData.result.length === 1) {
+              this.toLogin();
+              return;
+            }
             return;
           }
           errMsg.errorMsg(resData);
@@ -98,6 +103,13 @@ export default {
             message: error.message
           });
         });
+    },
+    arrowClick(val) {
+      if (val === 'right') {
+        this.$refs.cardShow.next();
+      } else {
+        this.$refs.cardShow.prev();
+      }
     }
   },
   mounted() {
@@ -118,14 +130,15 @@ export default {
   min-height: 100vh;
   padding-top: 178px;
   box-sizing: border-box;
-  background-image: linear-gradient(180deg, rgba(142, 166, 236, 0.11) 0%, rgba(142, 166, 236, 0) 100%);
+  background: url('../../assets/BG.png') no-repeat;
+  background-size: cover;
 
   .login-body-head {
     justify-content: center;
     align-items: center;
     margin-bottom: 34px;
     .login-body-logo {
-      width: 26px;
+      height: 32px;
       margin-right: 13px;
     }
     .login-body-title {
@@ -136,20 +149,34 @@ export default {
     }
   }
   .login-body {
+    position: relative;
     width: 430px;
     height: 283px;
     background: #ffffff;
     box-shadow: 0px 6px 8px 0px rgba(215, 218, 231, 0.49);
     border-radius: 8px;
     margin: 0 auto;
-    >>> .el-carousel__indicators {
-      display: none;
+    .iconfont {
+      position: absolute;
+      top: 116px;
+      z-index: 4;
+      font-size: 30px;
+      color: #ebecf0;
+    }
+    .iconpre {
+      left: 26px;
+    }
+    .iconnext {
+      right: 30px;
     }
     .info {
       padding-top: 70px;
       flex-direction: column;
       align-items: center;
       .info_img {
+        display: flex;
+        justify-content: center;
+        align-items: center;
         width: 46px;
         height: 46px;
         border-radius: 100%;
@@ -175,6 +202,7 @@ export default {
     margin: 0 auto;
     width: 281px;
     height: 40px;
+    font-size: 16px;
     background: #2f54eb;
     border-radius: 2px;
   }

static/font/demo_index.html

@@ -32,6 +32,18 @@
           <ul class="icon_lists dib-box">
 
             <li class="dib">
+              <span class="icon iconfont">&#xe641;</span>
+                <div class="name">pre</div>
+                <div class="code-name">&amp;#xe641;</div>
+              </li>
+
+            <li class="dib">
+              <span class="icon iconfont">&#xe640;</span>
+                <div class="name">next</div>
+                <div class="code-name">&amp;#xe640;</div>
+              </li>
+
+            <li class="dib">
               <span class="icon iconfont">&#xe60d;</span>
                 <div class="name">欢迎辞</div>
                 <div class="code-name">&amp;#xe60d;</div>
@@ -478,6 +490,24 @@
         <ul class="icon_lists dib-box">
 
           <li class="dib">
+            <span class="icon iconfont iconpre"></span>
+            <div class="name">
+              pre
+            </div>
+            <div class="code-name">.iconpre
+            </div>
+          </li>
+
+          <li class="dib">
+            <span class="icon iconfont iconnext"></span>
+            <div class="name">
+              next
+            </div>
+            <div class="code-name">.iconnext
+            </div>
+          </li>
+
+          <li class="dib">
             <span class="icon iconfont iconhuanyingci"></span>
             <div class="name">
               欢迎辞
@@ -1102,6 +1132,22 @@
 
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#iconpre"></use>
+                </svg>
+                <div class="name">pre</div>
+                <div class="code-name">#iconpre</div>
+            </li>
+
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#iconnext"></use>
+                </svg>
+                <div class="name">next</div>
+                <div class="code-name">#iconnext</div>
+            </li>
+
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#iconhuanyingci"></use>
                 </svg>
                 <div class="name">欢迎辞</div>

static/font/iconfont.json

@@ -6,6 +6,20 @@
   "description": "",
   "glyphs": [
     {
+      "icon_id": "21128396",
+      "name": "pre",
+      "font_class": "pre",
+      "unicode": "e641",
+      "unicode_decimal": 58945
+    },
+    {
+      "icon_id": "21128379",
+      "name": "next",
+      "font_class": "next",
+      "unicode": "e640",
+      "unicode_decimal": 58944
+    },
+    {
       "icon_id": "9702150",
       "name": "欢迎辞",
       "font_class": "huanyingci",

static/font/iconfont.svg

@@ -20,6 +20,12 @@ Created by iconfont
   />
     <missing-glyph />
 
+    <glyph glyph-name="pre" unicode="&#58945;" d="M512 876.544c-272.384 0-492.544-220.16-492.544-492.544s220.672-492.544 492.544-492.544 492.544 220.672 492.544 492.544-220.16 492.544-492.544 492.544zM431.104 587.776c11.776-12.288 12.288-31.232 0.512-43.008L309.248 422.4h480.256c16.896 0 30.208-13.824 30.208-30.72s-13.312-30.72-30.208-30.72H307.2l123.904-123.904c11.776-11.776 11.776-31.232-0.512-43.008-12.288-11.776-31.232-12.288-43.008-0.512l-175.104 174.592c-6.144 6.144-9.216 14.336-8.704 22.528v1.024 0.512c0 2.048 0 3.584 0.512 5.632 0 0.512 0 0.512 0.512 1.024l1.536 4.608c0.512 1.024 1.024 1.536 1.024 2.048l1.536 3.072c1.536 2.048 3.072 3.584 4.608 5.632l174.08 174.08c11.776 11.264 31.232 11.264 43.52-0.512z"  horiz-adv-x="1024" />
+
+
+    <glyph glyph-name="next" unicode="&#58944;" d="M19.456 384c0-272.384 220.672-492.544 492.544-492.544s492.544 220.672 492.544 492.544-220.16 492.544-492.544 492.544S19.456 656.384 19.456 384z m616.96 203.776l174.08-174.08c1.536-1.536 3.072-3.584 4.608-5.632l1.536-3.072c0.512-0.512 1.024-1.536 1.024-2.048l1.536-4.608c0-0.512 0-0.512 0.512-1.024 0.512-2.048 0.512-3.584 0.512-5.632V390.144c0.512-8.192-2.56-16.384-8.704-22.528l-175.104-174.592c-11.776-11.776-31.232-11.776-43.008 0.512-12.288 11.776-12.288 31.232-0.512 43.008l123.904 123.904H234.496c-16.896 0-30.208 13.824-30.208 30.72s13.312 30.72 30.208 30.72h480.256l-121.856 121.856c-11.776 11.776-11.776 31.232 0.512 43.008 11.776 12.8 31.232 12.8 43.008 1.024z"  horiz-adv-x="1024" />
+
+
     <glyph glyph-name="huanyingci" unicode="&#58893;" d="M378.119626 229.885971c-1.985498-16.313832-16.682275-27.914666-32.837472-25.918933-16.144962 2.005967-27.628099 16.866496-25.647718 33.190563l31.911247 262.730479c1.985498 16.324067 16.687392 27.9249 32.837472 25.924051 16.144962-2.011084 27.628099-16.866496 25.642601-33.190564l-31.90613-262.735596zM557.899284 229.885971c-1.98038-16.313832-16.687392-27.914666-32.832355-25.918933-16.144962 2.005967-27.622982 16.866496-25.642601 33.190563l31.90613 262.730479c1.98038 16.324067 16.687392 27.9249 32.832355 25.924051 16.155197-2.011084 27.633216-16.866496 25.652836-33.190564l-31.916365-262.735596zM552.239592 367.535209c0-14.998696-12.010215-27.141959-26.834923-27.141959H391.675254c-14.824709 0-26.840041 12.143263-26.840041 27.141959 0 14.983344 12.015332 27.126607 26.840041 27.126607h133.729415c14.814474 0.005117 26.834923-12.143263 26.834923-27.126607zM676.225739 231.866352c-1.903622-17.055835-17.127477-29.347499-34.019559-27.423409-16.871614 1.924091-29.040463 17.311698-27.131725 34.39312L632.974639 399.62556c1.903622 17.060952 17.137711 29.347499 34.019559 27.423409 16.886965-1.918973 29.035346-17.311698 27.141959-34.388003l-17.910418-160.794614zM699.872608 472.208808c-1.596586-15.935155-15.66394-27.546223-31.425107-25.939402-15.761168 1.611938-27.254539 15.827692-25.652836 31.767964l2.123664 21.313397c1.591469 15.930037 15.658823 27.546223 31.41999 25.934285 15.771402-1.60682 27.254539-15.832809 25.66307-31.767964l-2.128781-21.30828zM511.659702 896C229.529682 896 0 667.237908 0 386.054581c0-281.17821 229.529682-509.935185 511.639233-509.935185 1.60682-0.010235 8.648173-0.189339 19.604232-0.48614 42.800782-1.074625 143.022363-3.633256 217.007741-3.633256h0.025586c78.770018 0 92.642916 2.650742 100.226699 7.517258 15.699761 7.522376 18.99016 20.591863 19.670756 26.174797 2.824729 23.293778-17.204236 36.854523-40.405903 52.5594-5.639223 3.822595-14.328334 9.702329-20.837492 14.850296 146.553274 133.171633 220.200913 236.530096 216.383435 413.254748C1023.1403 667.406777 793.687377 896 511.659702 896z m244.835413-894.569086l-2.921957-2.609803-2.087843-3.336455c-17.188884-27.612747 3.254579-50.988401 25.350918-68.269396-8.13133-0.102345-17.593148-0.148401-28.569676-0.148401h-0.025586c-73.304782 0-173.035106 2.538162-215.641432 3.612787a1773.92455 1773.92455 0 0 1-20.944954 0.496375c-252.096808 0-457.19668 204.071302-457.19668 454.883677 0 250.827727 205.099872 454.883677 457.19668 454.883677s457.191563-204.05595 457.191562-454.883677v-0.608954c3.582084-161.961351-65.613537-252.85928-212.351032-384.01983z"  horiz-adv-x="1024" />