前端

fuintAdmin/.env.development

@@ -11,7 +11,7 @@ VUE_APP_BASE_API = '/dev-api'
 VUE_APP_PUBLIC_PATH = '/'
 
 # 后端接口地址
-VUE_APP_SERVER_URL = 'http://192.168.31.54:8085/'
+VUE_APP_SERVER_URL = 'http://192.168.31.72:8081/'
 
 
 # http://192.168.0.121:8080/

fuintAdmin/src/components/TopNav/index.vue

@@ -2,15 +2,15 @@
   <el-menu
     :default-active="activeMenu"
     mode="horizontal"
+    menu-trigger="click"
     @select="handleSelect"
   >
     <template v-for="(item, index) in topMenus">
-      <el-menu-item :style="{'--theme': theme}" :index="item.path" :key="index" v-if="index < visibleNumber"
+      <el-menu-item menu-trigger="click" :style="{'--theme': theme}" :index="item.path" :key="index" v-if="index < visibleNumber"
         ><svg-icon :icon-class="item.meta.icon" />
         {{ item.meta.title }}</el-menu-item
       >
     </template>
-
     <!-- 顶部菜单超出数量折叠 -->
     <el-submenu :style="{'--theme': theme}" index="more" v-if="topMenus.length > visibleNumber">
       <template slot="title">更多菜单</template>

fuintAdmin/src/views/tool/build/index.vue

@@ -75,7 +75,6 @@
         </div>
       </el-scrollbar>
     </div>
-
     <div class="center-board">
       <div class="action-bar">
         <el-button icon="el-icon-download" type="text" @click="download">

fuintBackend/fuint-application/src/main/resources/application.properties

@@ -2,7 +2,7 @@
 server.port=8081
 env.profile=dev
 #env.properties.path=D:/workspaces/oilSystem/fuintBackend/configure/
-env.properties.path=D:/code/oilSystem/fuintBackend/configure/
+env.properties.path=D:/oil/new-oil/oilSystem/fuintBackend/configure/
 #env.properties.path=/www/wwwroot/shenlanshuke/oilAdmin/
 
 # \u6570\u636E\u5E93\u914D\u7F6E

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

@@ -1746,7 +1746,7 @@ import {getLodop} from "@/api/LodopFuncs";
 
 <style scoped>
   .app-center{
-    width: 90%;
+    width: 100%;
     box-sizing: border-box;
     padding: 10px;
 

fuintCashierWeb/src/views/cashier/index.vue

@@ -1,181 +1,5 @@
 <template>
-<!--   <div id="app" class="app-container">-->
-<!--     <el-drawer-->
-<!--       :withHeader="false"-->
-<!--       :visible.sync="isOpen"-->
-<!--       direction="ttb"-->
-<!--       size="100%"-->
-<!--       :show-close="false">-->
-<!--       <div class="main">-->
-<!--         <div class="left-side">-->
-<!--           <div class="logo">-->
-<!--             <i class="logout el-icon-d-arrow-left" @click="logout"></i>-->
-<!--             <div class="title">收银台</div>-->
-<!--             <div class="store" v-if="storeInfo">({{ storeInfo.name }})</div>-->
-<!--             <div class="account">您好，{{ accountInfo.realName }}！</div>-->
-<!--           </div>-->
-<!--           <div class="cate">-->
-<!--             <ul class="nav">-->
-<!--               <li class="nav-item" v-for="menu in menuList">-->
-<!--                 <a :class="'nav-link' + (activeMenu == menu.key ? ' active' : '')" href="javascript:;" @click="switchMenu(menu.key)">-->
-<!--                    <img class="cate-logo" :src="menu.logo">-->
-<!--                    <span>{{ menu.name }}</span>-->
-<!--                 </a>-->
-<!--               </li>-->
-<!--             </ul>-->
-<!--           </div>-->
-<!--         </div>-->
-<!--&lt;!&ndash;         翻新&ndash;&gt;-->
-<!--         <div class="cart-container" v-if="activeMenu == 'cashier'">-->
-<!--              <div class="container-top">-->
-<!--                <div class="vip-bottom" @click="switchMember()">-->
-<!--                  <span>会员登录</span>-->
-<!--                </div>-->
-<!--              </div>-->
-<!--         </div>-->
-<!--&lt;!&ndash;         中间部分&ndash;&gt;-->
-<!--&lt;!&ndash;         <div class="cart-container" v-if="activeMenu == 'cashier'">&ndash;&gt;-->
 
-<!--&lt;!&ndash;           <div class="title">&ndash;&gt;-->
-<!--&lt;!&ndash;           &ndash;&gt;-->
-<!--&lt;!&ndash;             <div class="logo">&ndash;&gt;-->
-<!--&lt;!&ndash;               <img class="avatar" v-if="!memberInfo || !memberInfo.avatar" src="@/assets/images/avatar.png" />&ndash;&gt;-->
-<!--&lt;!&ndash;               <img class="avatar" v-else :src="memberInfo.avatar"/>&ndash;&gt;-->
-<!--&lt;!&ndash;             </div>&ndash;&gt;-->
-<!--&lt;!&ndash;             <div class="member-info">&ndash;&gt;-->
-<!--&lt;!&ndash;               <span class="name" v-if="memberInfo">{{ memberInfo.mobile ? memberInfo.mobile : memberInfo.name }}</span>&ndash;&gt;-->
-<!--&lt;!&ndash;               <span class="none" v-if="!memberInfo">身份</span>&ndash;&gt;-->
-<!--&lt;!&ndash;               <el-button size="mini" class="switch" type="danger" icon="el-icon-refresh" @click="switchMember()">关联会员</el-button>&ndash;&gt;-->
-<!--&lt;!&ndash;             </div>&ndash;&gt;-->
-<!--&lt;!&ndash;           </div>&ndash;&gt;-->
-
-<!--&lt;!&ndash;           <div class="carts">&ndash;&gt;-->
-<!--&lt;!&ndash;             <div>&ndash;&gt;-->
-<!--&lt;!&ndash;               <div class="tab">&ndash;&gt;-->
-<!--&lt;!&ndash;                 <div class="cart-list" v-if="cartList.length > 0">&ndash;&gt;-->
-<!--&lt;!&ndash;                   <div class="cart-item" v-for="cartInfo in cartList">&ndash;&gt;-->
-<!--&lt;!&ndash;                     <img class="image" :src="cartInfo.logo"/>&ndash;&gt;-->
-<!--&lt;!&ndash;                     <div class="info">&ndash;&gt;-->
-<!--&lt;!&ndash;                       <div class="name">{{ cartInfo.name }}</div>&ndash;&gt;-->
-<!--&lt;!&ndash;                       <div class="spec" v-if="cartInfo.specList && cartInfo.specList.length > 0">&ndash;&gt;-->
-<!--&lt;!&ndash;                         <span class="item" v-for="spec in cartInfo.specList" :title="spec.value">{{ spec.value }}</span>&ndash;&gt;-->
-<!--&lt;!&ndash;                       </div>&ndash;&gt;-->
-<!--&lt;!&ndash;                       <div class="num"><el-input-number class="input" @change="changeBuyNum(cartInfo)" v-model="cartInfo.buyNum" :min="1" :max="1000"/></div>&ndash;&gt;-->
-<!--&lt;!&ndash;                     </div>&ndash;&gt;-->
-<!--&lt;!&ndash;                     <div class="option">&ndash;&gt;-->
-<!--&lt;!&ndash;                       <div class="remove el-icon-delete" @click="removeFromCart(cartInfo.cartId)"></div>&ndash;&gt;-->
-<!--&lt;!&ndash;                       <div class="total">￥{{ (cartInfo.price * cartInfo.buyNum).toFixed(2) }}</div>&ndash;&gt;-->
-<!--&lt;!&ndash;                     </div>&ndash;&gt;-->
-<!--&lt;!&ndash;                   </div>&ndash;&gt;-->
-<!--&lt;!&ndash;                 </div>&ndash;&gt;-->
-<!--&lt;!&ndash;                 <div class="empty" v-if="cartList.length < 1">&ndash;&gt;-->
-<!--&lt;!&ndash;                     <el-empty description="暂无结算商品" :image-size="40"></el-empty>&ndash;&gt;-->
-<!--&lt;!&ndash;                 </div>&ndash;&gt;-->
-<!--&lt;!&ndash;               </div>&ndash;&gt;-->
-<!--&lt;!&ndash;             </div>&ndash;&gt;-->
-<!--&lt;!&ndash;           </div>&ndash;&gt;-->
-<!--&lt;!&ndash;           <div class="footer">&ndash;&gt;-->
-<!--&lt;!&ndash;             <div class="number">&ndash;&gt;-->
-<!--&lt;!&ndash;               <div class="total-num">总件数：<b class="num">{{ cartTotalNum }}</b></div>&ndash;&gt;-->
-<!--&lt;!&ndash;               <div class="total-price">总金额：<b class="num">￥{{ cartTotalPrice.toFixed(2) }}</b></div>&ndash;&gt;-->
-<!--&lt;!&ndash;             </div>&ndash;&gt;-->
-<!--&lt;!&ndash;             <div class="options">&ndash;&gt;-->
-<!--&lt;!&ndash;               <div class="cash" @click="hangUp()">挂单 / 取单</div>&ndash;&gt;-->
-<!--&lt;!&ndash;               <div class="submit" v-if="cartTotalNum > 0" @click="doSettlement()">提交结算</div>&ndash;&gt;-->
-<!--&lt;!&ndash;               <div class="submit" v-if="cartTotalNum == 0" @click="doCashier()">无商品收款</div>&ndash;&gt;-->
-<!--&lt;!&ndash;             </div>&ndash;&gt;-->
-<!--&lt;!&ndash;           </div>&ndash;&gt;-->
-<!--&lt;!&ndash;         </div>&ndash;&gt;-->
-<!--&lt;!&ndash;         右侧部分&ndash;&gt;-->
-<!--         <div class="main-list" v-if="activeMenu == 'cashier'">-->
-<!--            <div class="title">-->
-<!--              <el-form class="search-form" ref="searchForm" :inline="true" :model="searchForm">-->
-<!--                <el-form-item class="form-item" label="" prop="keyword">-->
-<!--                  <el-input v-model="searchForm.keyword" prefix-icon="el-icon-full-screen" class="input-item" placeholder="请输入商品关键字：商品名称、条码、商品ID..." clearable maxlength="100" />-->
-<!--                </el-form-item>-->
-<!--                <el-button class="search-goods" @click="doQueryGoods()" icon="el-icon-search">查询商品</el-button>-->
-<!--              </el-form>-->
-<!--              <el-tabs class="tab-box" type="card" v-model="navTab" @tab-click="switchTab">-->
-<!--                <el-tab-pane label="全部" name="0"></el-tab-pane>-->
-<!--                <el-tab-pane v-for="tab in tabList" :label="tab.name" :key="tab.id+''" :name="tab.id+''"></el-tab-pane>-->
-<!--              </el-tabs>-->
-<!--            </div>-->
-<!--            <div class="goods-list">-->
-<!--              <div class="goods-item" v-for="goodsInfo in activeGoodsList">-->
-<!--                  <div class="item" @click="clickGoods(goodsInfo)">-->
-<!--                    <img class="image" lazy :src="imagePath + goodsInfo.logo">-->
-<!--                    <div class="goods-name">{{ goodsInfo.name }}</div>-->
-<!--                    <div class="goods-price">￥{{ goodsInfo.price }}</div>-->
-<!--                  </div>-->
-<!--              </div>-->
-<!--              <el-empty v-if="activeGoodsList.length == 0" description="暂无商品..."></el-empty>-->
-<!--            </div>-->
-<!--         </div>-->
-
-<!--         &lt;!&ndash; 订单列表组件 start&ndash;&gt;-->
-<!--         <orderList v-if="activeMenu == 'order'" @doPayOrder="doPayOrder"></orderList>-->
-<!--         &lt;!&ndash; 订单列表组件 end&ndash;&gt;-->
-
-<!--         &lt;!&ndash; 会员列表组件 start&ndash;&gt;-->
-<!--         <memberList v-if="activeMenu == 'member'"></memberList>-->
-<!--         &lt;!&ndash; 会员列表组件 end&ndash;&gt;-->
-
-<!--         &lt;!&ndash; 卡券核销组件 start&ndash;&gt;-->
-<!--         <couponConfirm v-if="activeMenu == 'coupon'"></couponConfirm>-->
-<!--         &lt;!&ndash; 卡券核销组件 end&ndash;&gt;-->
-<!--       </div>-->
-<!--     </el-drawer>-->
-
-<!--     &lt;!&ndash; 规格详情 start&ndash;&gt;-->
-<!--     <el-dialog title="选择商品规格" :visible.sync="openGoodsDialog" class="common-dialog" append-to-body>-->
-<!--       <div class="goods-info">-->
-<!--         <div class="name">{{ goodsInfo.name }}</div>-->
-<!--         <div class="price">￥{{ goodsInfo.price }}</div>-->
-<!--         <div class="num"><el-input-number class="input" v-model="goodsNum" :min="1" :max="1000"/></div>-->
-<!--         <div class="spec-list" v-if="goodsInfo.isSingleSpec == 'N'">-->
-<!--             <div class="spec-item" v-for="specInfo in goodsInfo.specList">-->
-<!--                <div class="spec-name">{{ specInfo.name }}</div>-->
-<!--                <div class="values">-->
-<!--                  <span v-for="value in specInfo.child" :class="goodsSpecIds.includes(value.id) ? 'value active' : 'value'" @click="selectGoodsSpec(value.id)">{{ value.name }}</span>-->
-<!--                </div>-->
-<!--             </div>-->
-<!--         </div>-->
-<!--       </div>-->
-<!--       <div slot="footer" class="dialog-footer">-->
-<!--         <el-button type="primary" class="main-button" @click="addToCart()">加入结算</el-button>-->
-<!--         <el-button @click="closeGoodsDialog()">取 消</el-button>-->
-<!--       </div>-->
-<!--     </el-dialog>-->
-<!--     &lt;!&ndash; 规格详情 end&ndash;&gt;-->
-
-<!--     &lt;!&ndash;关联会员对话框 start&ndash;&gt;-->
-<!--     <switchMemberDialog :show-dialog="openSwitchMemberDialog" @doSwitchMember="doSwitchMember"/>-->
-<!--     &lt;!&ndash;关联会员对话框 end&ndash;&gt;-->
-
-<!--     &lt;!&ndash;结算对话框 start&ndash;&gt;-->
-<!--     <settlementDialog :show-dialog="openSettlementDialog" :memberInfo="memberInfo" :totalPrice="cartTotalPrice" :remarks="cartRemark" :orderInfo="orderInfo" :couponList.vue="couponList.vue" @submit="submitSettlement" @switchMember="switchMember" @closeDialog="closeDialog"/>-->
-<!--     &lt;!&ndash;结算对话框 end&ndash;&gt;-->
-
-<!--     &lt;!&ndash;扫码付款对话框 start&ndash;&gt;-->
-<!--     <scanPayCodeDialog ref="scanPayCodeDialog" :show-dialog="openScanPayCodeDialog" :memberInfo="memberInfo" :orderId="orderId" :payType="payType" :payAmount="payAmount" @closeDialog="closeDialog" @showPayResult="showPayResult"/>-->
-<!--     &lt;!&ndash;扫码付款对话框 end&ndash;&gt;-->
-
-<!--     &lt;!&ndash;支付结果对话框 start&ndash;&gt;-->
-<!--     <payResultDialog :show-dialog="openPayResultDialog" :payResult="payResult" @showOrderPrint="showOrderPrint" @closeDialog="closeDialog"/>-->
-<!--     &lt;!&ndash;支付结果对话框 end&ndash;&gt;-->
-
-<!--     &lt;!&ndash;打印订单对话框 start&ndash;&gt;-->
-<!--     <orderPrintDialog :show-dialog="openOrderPrintDialog" :storeInfo="storeInfo" :orderInfo="orderInfo" @closeDialog="closeDialog"/>-->
-<!--     &lt;!&ndash;打印订单对话框 end&ndash;&gt;-->
-
-<!--     &lt;!&ndash;挂单对话框 start&ndash;&gt;-->
-<!--     <hangUpDialog :show-dialog="openHangUpDialog" :memberInfo="memberInfo" :cartList="cartList" @getHangNo="getHangNo" @doHangUp="doHangUp" @closeDialog="closeDialog"/>-->
-<!--     &lt;!&ndash;挂单对话框 end&ndash;&gt;-->
-
-<!--     &lt;!&ndash; 无商品收款组件 start&ndash;&gt;-->
-<!--     <noGoodsCashier :show-dialog="openNoGoodsCashierDialog" @submit="submitCashier" @closeDialog="closeDialog"></noGoodsCashier>-->
-<!--     &lt;!&ndash; 无商品收款组件 end&ndash;&gt;-->
-<!--   </div>-->
 <!--  👇 均为新建-->
   <div class="app-containers">
     <div class="app-left">
@@ -187,15 +11,6 @@
       </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)">
 
-<!--        <template v-if="item.name === '积分'">-->
-<!--          <i :class="item.icon" style="font-size: 18px" ></i> <div style="cursor: pointer;margin-left: 10px">{{item.name}}</div>-->
-<!--          <template v-if="isClick">-->
-<!--            <br/>-->
-<!--            <div style="cursor: pointer;margin-left: 10px">积分商城</div>-->
-<!--            <br/>-->
-<!--            <div style="cursor: pointer;margin-left: 10px">积分订单</div>-->
-<!--          </template>-->
-<!--        </template>-->
           <i :class="item.icon" style="font-size: 18px" ></i> <div style="cursor: pointer;margin-left: 10px">{{item.name}}</div>
 
       </div>
@@ -249,7 +64,11 @@
 <!--    <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>-->
@@ -928,11 +747,15 @@ export default {
     height: 100%;
     background: #f6f8f9;
     display: flex;
+    justify-content: space-between;
   }
   .bule{
     font-weight: 700;
     color: #5393ff !important;
   }
+  .app-right{
+    width: 89% !important;
+  }
 
   //.bule1{
   //  font-weight: 700;