11.21前端

fuintAdmin/src/views/EventMarketing/SaveBlock/index.vue

@@ -173,7 +173,7 @@
               </el-radio-group>
             </el-form-item>
             <el-form-item label="会员等级"  prop="region" v-if="form.groupOriented == '2' " >
-              <el-select v-model="form.membershipLevel"  placeholder="会员等级"  >
+              <el-select v-model="form.membershipLevel"  multiple  placeholder="会员等级"  >
                 <el-option v-for="(item,index) in vipname" :key="index" :label="item.name" :value="item.name"></el-option>
               </el-select>
             </el-form-item>
@@ -657,7 +657,7 @@
           activeStatus:'1',
           paymentValue:'1',
           amountCommission:'',
-          membershipLevel:'',
+          membershipLevel:[],
           percentageCommissions:'',
           fringeBenefit:'',
           cardValueChildList:[],
@@ -823,7 +823,7 @@
       chongzhi(){
         this.form = {
           sort:1,
-          membershipLevel:'',
+          membershipLevel:[],
           groupOriented: '1',
           rechargeBalance:'',
           giftBalance:'',

fuintAdmin/src/views/EventMarketing/activeConsumption/index.vue

@@ -340,9 +340,6 @@
           </el-col>
 
         </el-row>
-
-
-
         <el-form-item label="参与条件" prop="participationCondition">
           <el-select v-model="form.participationCondition" clearable placeholder="请选择天参与条件">
             <el-option label="不限制" value="0"></el-option>
@@ -765,12 +762,13 @@ export default {
         this.$message.error("该商品已存在")
         return
       }
-      this.pdswidlist.push( this.shopdata.goodsId.id)
+      this.pdswidlist.push( this.shopdata.goodsId.id,)
       let data = {
         activeGift: 4,
         goodsIds : this.shopdata.goodsId.id,
         goodsName: this.shopdata.goodsId.name,
-        goodsTotal:1
+
+        goodsTotal:this.shopdata.count
       }
       this.form.shiwudata.push(data)
 

fuintAdmin/src/views/login.vue

@@ -1,17 +1,24 @@
 <template>
   <div class="login">
-      <div class="login-main">
+    <div class="box-center">
-        <div class="caption">
+      <div class="box-left">
-            <h4 class="caption-title">{{ systemName }}</h4>
+        <div class="bai-size">蓝鲸智慧加油站</div>
-            <p class="caption-remark">欢迎使用 {{ systemName }}，您的卡券、储值卡、计次卡等会员营销小管家！</p>
+        <div class="bact-box">
+          <div class="sanhh">活动营销</div>
+          <div class="sanhh">节省人力</div>
+          <div class="sanhh">精准定位</div>
         </div>
       </div>
-      <div class="login-form">
+      <div class="box-right">
+        <div class="box-title">
+          登录
+        </div>
         <el-form ref="loginForm" :model="loginForm" :rules="loginRules">
-          <div class="title">
+<!--          <div class="title">-->
-            <img class="logo" src="@/assets/logo/logo.png"/>
+<!--            <img class="logo" src="@/assets/logo/logo.png"/>-->
-            <span class="name">{{ systemName }}</span>
+<!--            <span class="name">{{ systemName }}</span>-->
-          </div>
+<!--          </div>-->
+
           <el-form-item prop="username">
             <el-input
               v-model="loginForm.username"
@@ -36,19 +43,30 @@
             </el-input>
           </el-form-item>
           <el-form-item prop="captchaCode" v-if="captchaOnOff">
+            <div style="display: flex;align-items: center">
+
+          <div>
             <el-input
               v-model="loginForm.captchaCode"
               auto-complete="off"
               placeholder="请输入验证码"
-              style="width: 63%"
+              style="width: 90%"
               clearable
               @keyup.enter.native="handleLogin"
             >
               <svg-icon slot="prefix" icon-class="validCode" class="el-input__icon input-icon" />
             </el-input>
+          </div>
+
+
                 <div class="login-code">
                   <img :src="codeUrl" @click="getCode" class="login-code-img"/>
                 </div>
+            </div>
+
+
+
+
           </el-form-item>
           <el-checkbox v-model="loginForm.rememberMe" style="margin:0px 0px 25px 0px;">记住密码</el-checkbox>
           <el-form-item style="width:100%;">
@@ -64,6 +82,21 @@
             </el-button>
           </el-form-item>
         </el-form>
+      </div>
+    </div>
+
+
+
+<!--      <div class="login-main">-->
+<!--        <div class="caption">-->
+<!--            <h4 class="caption-title">{{ systemName }}</h4>-->
+<!--            <p class="caption-remark">欢迎使用 {{ systemName }}，您的卡券、储值卡、计次卡等会员营销小管家！</p>-->
+<!--        </div>-->
+<!--      </div>-->
+
+
+      <div class="login-form">
+
          <div class="copy-right">
            <span>Copyright © 2020-2023 <a class="link" href="https://www.fuint.cn">fuint.cn</a> All Rights Reserved.</span>
           </div>
@@ -75,9 +108,11 @@
 import { getCodeImg } from "@/api/login";
 import Cookies from "js-cookie";
 import { encrypt, decrypt } from '@/utils/jsencrypt'
+import BalanceRecharge from "@/views/member/balanceRecharge.vue";
 
 export default {
   name: "Login",
+  components: {BalanceRecharge},
   data() {
     return {
       codeUrl: "",
@@ -171,9 +206,78 @@ export default {
 
 <style rel="stylesheet/scss" lang="scss">
 .login {
-  height: 100%;
+  height: 100vh;
   width: 100%;
   position: relative;
+  background-image: url("../assets/images/loginback.png");
+  overflow: hidden;
+  background-size: cover;
+  background-repeat: no-repeat;
+  background-position: center;
+  .box-center{
+    width: 1000px;
+    height: 580px;
+    border-radius: 8px;
+    background: #FFFFFF;
+    box-shadow: 0px 4px 10px 0px rgba(20,61,129,0.1);
+    border-radius: 16px 16px 16px 16px;
+    opacity: 1;
+    margin: 150px auto;
+    overflow: hidden;
+    display: flex;
+
+  }
+  .box-left{
+    width: 50%;
+    height: 100%;
+    background: #00aaff;
+    background-image: url("../assets/images/box-left.png");
+    background-size: cover;
+    background-repeat: no-repeat;
+    background-position: center;
+  }
+  .box-right{
+    width: 50%;
+    box-sizing: border-box;
+    padding: 80px;
+  }
+  .box-title{
+    width: 100%;
+    text-align: center;
+    margin-bottom: 20px;
+  }
+  .bai-size{
+    width: 100%;
+    text-align: center;
+    font-size: 40px;
+    font-weight: bold;
+    color: #FFFFFF;
+    margin-top: 65px;
+
+  }
+  .bact-box{
+    width: 85%;
+    margin: 15px auto;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    margin-top: 40px;
+
+  }
+  .sanhh{
+    width: 112px;
+    height: 34px;
+    background: linear-gradient(90deg, #E1EBFF 0%, #FFFFFF 100%);
+    border-radius: 2px 2px 2px 2px;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    font-size: 16px;
+    font-family: PingFang SC, PingFang SC;
+    font-weight: 400;
+    color: #1755D0;
+      }
+
   .login-main {
       background-image: url("../assets/images/login-bg.png");
       position: fixed;