9.9

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

@@ -22,7 +22,7 @@
                 </div>
               </div>
               <div class="nr-bottom">
-                <div class="left-bt">进行中1个</div>
+                <div class="left-bt" @click="indexType(6)" >进行中N个</div>
                 |
                 <div class="right-bt" @click="routerPush(1)">创建活动</div>
               </div>
@@ -319,9 +319,9 @@
               <el-select v-model="queryParams.type" placeholder="请选择活动类型"  style=" width: 260px; margin-right: 15px">
                 <el-option
                   v-for="item in options"
-                  :key="item.value"
+                  :key="item.value.toString()"
                   :label="item.label"
-                  :value="item.value">
+                  :value="item.value.toString()">
                 </el-option>
               </el-select>
             </div>
@@ -522,6 +522,12 @@ export default {
   },
 
   methods: {
+    indexType(id){
+      this.queryParams.type = id
+      this.tabindex = 1
+      this.handleQuery()
+
+    },
     /**
      * 查询列表
      */
@@ -574,7 +580,10 @@ export default {
     routerPush(id){
       this.$router.push({
         path: '/EventMarketing/openCardGift/index',
-        query: { id: id }
+        query: {
+          id: id,
+
+        }
       });
       // this.$router.push('/EventMarketing/openCardGift/index')
     },
@@ -620,7 +629,6 @@ export default {
 <style scoped lang="scss">
 .app-containers{
   width: 100%;
-  height: 100vh;
   background: #f9f9f9;
 }
 .qr-code{

fuintCashierWeb/src/router/index.js

@@ -84,6 +84,11 @@ export const constantRoutes = [
             name: 'homeindex',
             component: () => import('@/views/cashier/NewComponents/homeindex'),
           },
+          {
+            path: '/newHome',
+            name: 'newHome',
+            component: () => import('@/views/cashier/NewComponents/newHome'),
+          },
           {
             path: '/Recharge',
             name: 'Recharge',

fuintCashierWeb/src/views/cashier/NewComponents/newHome.vue

@@ -0,0 +1,18 @@
+<template>
+   <div class="new-contoner">
+
+   </div>
+</template>
+
+<script>
+
+</script>
+
+<style scoped lang="scss">
+.new-contoner{
+  width: 100%;
+  box-sizing: border-box;
+  background: #0ECB98;
+  height: 100vh;
+}
+</style>

fuintCashierWeb/src/views/cashier/index.vue

@@ -10,12 +10,8 @@
         <div class="app-left-title">百业兴油站收银 </div>
       </div>
       <div class="app-left-box" v-for="(item,index) in tabarr" v-if="item.name !== '积分'" :class="{'bule': leftindex == item.index1}" :key="index" @click="gocomponents(index,item.path)">
-
           <i :class="item.icon" style="font-size: 18px" ></i> <div style="cursor: pointer;margin-left: 10px">{{item.name}}</div>
-
       </div>
-
-
       <div class="app-left-box2"  v-for="(item,index) in tabarr" v-if="item.name === '积分'"  :key="index">
         <div class="app-left-box"  @click="isClickMethod()" :class="{'bule':  leftindex == item.index1 }">
           <i :class="item.icon" style="font-size: 18px" ></i> <div style="cursor: pointer;margin-left: 10px">{{item.name}}</div>
@@ -32,49 +28,14 @@
             </div>
           </div>
         </el-collapse-transition>
-<!--        </transition>-->
-
       </div>
-
-
-
-
-<!--      <el-collapse>-->
-<!--        <el-collapse-item title="v3.8.7 - 2023-12-08" title-class="no-border">-->
-<!--          <ol>-->
-<!--            <li>操作日志记录部门名称</li>-->
-<!--            <li>全局数据存储用户编号</li>-->
-<!--            <li>新增编程式判断资源访问权限</li>-->
-<!--          </ol>-->
-<!--        </el-collapse-item>-->
-<!--      </el-collapse>-->
-
-
       <div class="app-left-box" @click="logout">
       <div style="cursor: pointer;margin-left: 10px">退出登录</div>
       </div>
     </div>
-
-<!--    <homeindex v-if="leftindex == 0"></homeindex>-->
-<!--    <Recharge v-if="leftindex == 1"></Recharge>-->
-<!--    <Order v-if="leftindex == 2"></Order>-->
-<!--    <vip v-if="leftindex == 3"></vip>-->
-<!--    <WriteOff v-if="leftindex == 4"></WriteOff>-->
-<!--    <credit v-if="leftindex == 5"></credit>-->
-<!--    <Integral v-if="leftindex == 6"></Integral>-->
-<!--    <Handover v-if="leftindex == 7"></Handover>-->
-
     <div class="app-right">
       <router-view/>
     </div>
-
-
-<!--    <div style="width: 100%;padding:200px " v-if="leftindex != 0 && leftindex != 1 && leftindex != 2  && leftindex != 3  && leftindex != 4 && leftindex != 5 && leftindex != 6 && leftindex != 7  && leftindex != 9">-->
-<!--      <el-empty  description="暂未开发"></el-empty>-->
-<!--    </div>-->
-
-
-
   </div>
 </template>
 
@@ -121,23 +82,19 @@ export default {
     credit,
     Integral,
     Handover
-
-
   },
   data() {
     return {
       isClick:false,
       activeName: 'second',
       tabarr:[
-        {name:'收银台',icon:'el-icon-s-platform',path:'/homeindex' ,index1:0},
+        {name:'收银台',icon:'el-icon-s-platform',path:'/newHome' ,index1:0},
-        // {name:'充值',icon: 'el-icon-s-finance',path:'/Recharge'},
         {name:'订单',icon: 'el-icon-s-order',path:'/Order',index1:1},
         {name:'会员',icon: 'el-icon-s-custom',path:'/Vip',index1:2},
         {name:'核销',icon: 'el-icon-s-check',path:'/WriteOff',index1:3},
         {name:'挂账管理',icon:'el-icon-s-claim',path:'/credit',index1:4},
         {name:'积分',icon:'el-icon-s-data',path:'/Integral',index1:5},
         {name:'交班',icon: 'el-icon-s-flag',path:'/Handover',index1:6},
-        // {name:'切换油站',icon: 'el-icon-s-flag',path:'/homeindex',index1:7},
       ],
       tabarr2:[
         {name:'积分',icon:'el-icon-s-data',path:'/Integral'},

fuintCashierWeb/src/views/cashier/vipComponents/balanceList.vue

@@ -20,16 +20,6 @@
                   <el-input v-model="queryParams.orderNo" clearable placeholder="订单号检索"></el-input>
                 </el-form-item>
                 <el-form-item label="">
-<!--                  <el-date-picker-->
-<!--                    v-model="dateRange"-->
-<!--                    style="width: 240px"-->
-<!--                    size="medium"-->
-<!--                    value-format="yyyy-MM-dd"-->
-<!--                    type="daterange"-->
-<!--                    range-separator="至"-->
-<!--                    start-placeholder="开始日期"-->
-<!--                    end-placeholder="结束日期"-->
-<!--                  ></el-date-picker>-->
                   <el-date-picker
                     v-model="beginTime"
                     style="width: 160px"