Merge branch 'master' of http://192.168.31.244:3000/byx/oilSystem

2024-06-24 09:50:33 +08:00 · 2024-06-24 09:50:33 +08:00 · 5a6f6f63cf
commit 5a6f6f63cf
parent aecf29f0d3 503f1f4f73
21 changed files with 132 additions and 226 deletions
--- a/fuintAdmin/.env.development
+++ b/fuintAdmin/.env.development
@ -11,7 +11,7 @@ VUE_APP_BASE_API = '/dev-api'
 VUE_APP_PUBLIC_PATH = '/'

 # 后端接口地址
-VUE_APP_SERVER_URL = 'http://localhost:8081/'
+VUE_APP_SERVER_URL = 'http://192.168.31.72:8081/'


 # http://192.168.0.121:8080/
--- a/fuintAdmin/src/assets/styles/variables.scss
+++ b/fuintAdmin/src/assets/styles/variables.scss
@ -9,16 +9,16 @@ $yellow:#FEC171;
 $panGreen: #30B08F;

 // 默认菜单主题风格
-$base-menu-color:#144a6e;// 菜单全部字体颜色
-$base-menu-color-active:#144a6e;// 父级菜单激活的字体颜色
+$base-menu-color:#5393ff;// 菜单全部字体颜色
+$base-menu-color-active:#5393ff;// 父级菜单激活的字体颜色
 $base-menu-background:#fff;
-$base-logo-title-color: #144a6e;
+$base-logo-title-color: #5393ff;

 $base-menu-light-color:#ffffff;
 $base-menu-light-background:#ffffff;
-$base-logo-light-title-color: #1a5982;
+$base-logo-light-title-color: #5393ff;

-$base-sub-menu-background: #c6c6c6;//展开的背景色
+$base-sub-menu-background: #f8f8f8;//展开的背景色
 $base-sub-menu-hover: #adadad;

 $base-sidebar-width: 200px;
--- a/fuintAdmin/src/components/TopNav/index.vue
+++ b/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>
--- a/fuintAdmin/src/layout/components/Navbar.vue
+++ b/fuintAdmin/src/layout/components/Navbar.vue
@ -146,7 +146,7 @@ export default {
  height: 90px;
  overflow: hidden;
  position: relative;
-  background: #144a6e;
+  background: #5393ff;
  //background-image: url("../../assets/images/kkx.png") ;
  background-size: 100% 100%;
  background-size: cover;
--- a/fuintAdmin/src/layout/components/Sidebar/index.vue
+++ b/fuintAdmin/src/layout/components/Sidebar/index.vue
@ -84,7 +84,7 @@ export default {

  padding-top: 2px;
  text-align: center;
-  background: #3f5050;
+  background: #5393ff;
  overflow: hidden;
  border: 1px #ffffff solid;
  border-radius: 2px;
--- a/fuintAdmin/src/views/tool/build/index.vue
+++ b/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">
--- a/fuintAdmin_zt/.env.development
+++ b/fuintAdmin_zt/.env.development
@ -13,7 +13,7 @@ VUE_APP_PUBLIC_PATH = '/'
 # 后端接口地址
 #VUE_APP_SERVER_URL = 'http://192.168.31.96:8080/'
 #VUE_APP_SERVER_URL = 'http://192.168.31.178:8081'
-VUE_APP_SERVER_URL = 'http://localhost:8081/'
+VUE_APP_SERVER_URL = 'http://192.168.31.54:8085/'

 # cp端地址
 # VUE_PC_SERVER_URL = 'http://47.95.206.185:85/'
--- a/fuintAdmin_zt/src/assets/styles/variables.scss
+++ b/fuintAdmin_zt/src/assets/styles/variables.scss
@ -9,16 +9,16 @@ $yellow:#FEC171;
 $panGreen: #30B08F;

 // 默认菜单主题风格
-$base-menu-color:#144a6e;// 菜单全部字体颜色
-$base-menu-color-active:#144a6e;// 父级菜单激活的字体颜色
+$base-menu-color:#5393ff;// 菜单全部字体颜色
+$base-menu-color-active:#5393ff;// 父级菜单激活的字体颜色
 $base-menu-background:#fff;
-$base-logo-title-color: #455ced;
+$base-logo-title-color: #5393ff;

 $base-menu-light-color:#ffffff;
 $base-menu-light-background:#ffffff;
-$base-logo-light-title-color: #1a5982;
+$base-logo-light-title-color: #5393ff;

-$base-sub-menu-background: #c6c6c6;//展开的背景色
+$base-sub-menu-background: #f8f8f8;//展开的背景色
 $base-sub-menu-hover: #adadad;

 $base-sidebar-width: 200px;
--- a/fuintAdmin_zt/src/layout/components/Navbar.vue
+++ b/fuintAdmin_zt/src/layout/components/Navbar.vue
@ -105,7 +105,7 @@ export default {
  height: 90px;
  overflow: hidden;
  position: relative;
-  background: #455ced;
+  background: #5393ff;
  //background-image: url("../../assets/images/kkx.png") ;
  background-size: 100% 100%;
  background-size: cover;
--- a/fuintAdmin_zt/src/store/modules/settings.js
+++ b/fuintAdmin_zt/src/store/modules/settings.js
@ -5,7 +5,7 @@ const { sideTheme, showSettings, topNav, tagsView, fixedHeader, sidebarLogo, dyn
 const storageSetting = JSON.parse(localStorage.getItem('layout-setting')) || ''
 const state = {
  title: '',
-  theme:  '#072d50',
+  theme:  '#5393ff',
  sideTheme: storageSetting.sideTheme || sideTheme,
  showSettings: showSettings,
  topNav: storageSetting.topNav === undefined ? topNav : storageSetting.topNav,
--- a/fuintAdmin_zt/src/views/financialStatement/reconciliation/tab/trading.vue
+++ b/fuintAdmin_zt/src/views/financialStatement/reconciliation/tab/trading.vue
@ -127,7 +127,7 @@
          <el-table-column type="index" width="50" align="center" label="序号"/>
          <el-table-column prop="payTime" align="center" label="支付时间" width="220"> </el-table-column>
          <el-table-column prop="orderNo" align="center" label="订单号" width="220"> </el-table-column>
-          <el-table-column prop="storeName" align="center" label="门店"> </el-table-column>
+          <el-table-column prop="storeName" align="center" label="门店" width="150"> </el-table-column>
          <el-table-column prop="createBy" align="center" label="收银员"> </el-table-column>
          <el-table-column prop="payChannel" align="center" label="支付渠道">
            <template slot-scope="scope">
@ -139,9 +139,9 @@
            </template>

          </el-table-column>
-          <el-table-column prop="mchntCd" align="center" label="商户号"> </el-table-column>
-          <el-table-column prop="amount" align="center" label="费率"> </el-table-column>
-          <el-table-column prop="type" align="center" label="订单来源">
+          <el-table-column prop="mchntCd" align="center" label="商户号" width="150"> </el-table-column>
+<!--          <el-table-column prop="amount" align="center" label="费率"> </el-table-column>-->
+          <el-table-column prop="type" align="center" label="订单来源" width="150">
            <template slot-scope="scope">
              <span v-if="scope.row.type=='1'">油品</span>
              <span v-else-if="scope.row.type=='2'">商品</span>
@ -177,7 +177,7 @@
            </template>

          </el-table-column>
-          <el-table-column prop="payMoney" align="center" label="优惠后应付金额"> </el-table-column>
+          <el-table-column prop="payMoney" align="center" label="优惠后应付金额" width="150"> </el-table-column>
          <el-table-column prop="refMoney" align="center" label="退款金额">
            <template slot-scope="scope">
              <span v-if="scope.row.status == 'refund'">{{scope.row.payMoney}}</span>
@ -186,7 +186,7 @@
          </el-table-column>
          <el-table-column prop="payMoney" align="center" label="实收金额"> </el-table-column>
 <!--          <el-table-column prop="payAmount" align="center" label="手续费"> </el-table-column>-->
-          <el-table-column prop="userName" align="center" label="付款用户" > </el-table-column>
+          <el-table-column prop="userName" align="center" label="付款用户" width="135"> </el-table-column>
          <el-table-column prop="content" align="content" label="备注" > </el-table-column>
          <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
            <template slot-scope="scope">
--- a/fuintAdmin_zt/src/views/tag/tagCode/index.vue
+++ b/fuintAdmin_zt/src/views/tag/tagCode/index.vue
@ -63,6 +63,7 @@
 <!--      <el-table-column label="码牌二维码：域名+字符串" align="center" prop="tagCodeSn" />-->
 <!--      <el-table-column label="二维码ID" align="center" prop="id" />-->
      <el-table-column label="二维码ID" align="center" prop="tagCodeSn" />
+      <el-table-column label="创建时间" align="center" prop="createTime" />
      <el-table-column label="二维码" align="center" prop="imageUrl" >
        <template slot-scope="scope">

--- a/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/controller/OilConfigController.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/controller/OilConfigController.java
@ -60,7 +60,7 @@ public class OilConfigController extends BaseController {
        int result = 2;
 //        isOpen=1开启规则
        if (isOpen.equals("1")){
-            result = oilConfigService.judgmentProportion();
+            result = oilConfigService.judgmentProportion(storeId);
            if (result==1){
                oilConfigService.oilRule(storeId);
 //                开启定时关闭规则
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/OilConfigService.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/OilConfigService.java
@ -19,7 +19,7 @@ public interface OilConfigService extends IService<OilConfig> {
     * 判断占比相加是否为100% 是返回1 不是返回0
     * @return
     */
-    public int judgmentProportion();
+    public int judgmentProportion(Integer storeId);

    /**
     * 规则周期是否为当日
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/impl/OilConfigServiceImpl.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/impl/OilConfigServiceImpl.java
@ -68,12 +68,11 @@ public class OilConfigServiceImpl extends ServiceImpl<OilConfigMapper, OilConfig
    }

    @Override
-    public int judgmentProportion() {
+    public int judgmentProportion(Integer storeId) {
        int result = 0;
        int percentage = 0;
-        AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
        QueryWrapper queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("store_id",nowAccountInfo.getStoreId());
+        queryWrapper.eq("store_id",storeId);
        List<OilConfig> list = baseMapper.selectList(queryWrapper);
        for (OilConfig config : list) {
            percentage += config.getProportion();
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/member/utils/QrCodeUtils.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/member/utils/QrCodeUtils.java
@ -106,6 +106,88 @@ public class QrCodeUtils {
            }


+//            // 将码牌编号文字绘制到指定位置
+//            g.drawString(storeNumber, 200, 800);
+            g.dispose();
+            // 输出图片
+            String urlsss = "/temp/qrCode/";
+            if (ObjectUtils.isNotEmpty(urls)){
+                urlsss = urls;
+            }
+            File file1 = new File(urlsss);
+            // 判断目录是否存在
+            if (!file1.exists()) {
+                file1.mkdirs();
+            }
+
+            FileOutputStream outImgStream = new FileOutputStream(outImgPath);
+            ImageIO.write(bufImg, "jpg", outImgStream);
+            outImgStream.flush();
+            outImgStream.close();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    public void createLogoCodePictures(InputStream backgroundStream, InputStream logoStream, String url, String outImgPath, Integer staffId, Integer storeId,String urls) {
+        try {
+            // 读取原图片信息
+            //得到文件
+////            File file = ResourceUtils.getFile(roundImage);
+//            ClassPathResource resource = new ClassPathResource(roundImage);
+//            ClassPathResource logoResource = new ClassPathResource(logoImage);
+//            File file = resource.getFile();
+
+            //文件转化为图片
+            Image srcImg = ImageIO.read(backgroundStream);
+            //获取图片的宽
+            int srcImgWidth = srcImg.getWidth(null);
+            //获取图片的高
+            int srcImgHeight = srcImg.getHeight(null);
+            // 加水印
+            BufferedImage bufImg = new BufferedImage(srcImgWidth, srcImgHeight, BufferedImage.TYPE_INT_RGB);
+            Graphics2D g = bufImg.createGraphics();
+            g.drawImage(srcImg, 0, 0, srcImgWidth, srcImgHeight, null);
+            //使用工具类生成二维码
+            Image image = createQrCode(logoStream, url, 360, 360);
+            //将小图片绘到大图片上,500,300 .表示你的小图片在大图片上的位置。
+            g.drawImage(image, (bufImg.getWidth()-360)/2, 320, null);
+            // 设置字体，样式，字体大小
+//            g.setFont(new Font("TimesRoman", Font.BOLD, 40));
+            g.setFont(chineseFont());
+            //设置颜色。
+            g.setColor(Color.BLACK);
+
+//            查询当前店铺信息
+            if (ObjectUtils.isNotEmpty(storeId)){
+                LJStore store = storeService.selectStoreByStoreId(storeId);
+//            查询加油员信息
+                LJStaff staff = null;
+                if (ObjectUtil.isNotEmpty(staffId)){
+                    staff = staffService.selectStaffById(staffId);
+                }
+                LJStaff staff1 = staffService.selectStaffByStoreId(storeId);
+
+                // 店铺名称位置文字绘制到指定位置
+                g.drawString(store.getName(), returnX(g,bufImg.getWidth(),store.getName()), 300);
+                // 加油员姓名位置文字绘制到指定位置
+                if (ObjectUtil.isNotEmpty(staff)) {
+                    g.drawString("加油员："+staff.getRealName(), returnX(g, bufImg.getWidth(), "加油员："+staff.getRealName()), 750);
+                }
+                // 站长名称位置文字绘制到指定位置
+                g.drawString("站长名称："+staff1.getRealName(), returnX(g, bufImg.getWidth(), "站长名称："+staff1.getRealName()), 810);
+                // 服务监督电话位置文字绘制到指定位置
+                g.drawString("服务监督电话："+staff1.getMobile(), returnX(g, bufImg.getWidth(), "服务监督电话："+staff1.getMobile()), 870);
+                // 店铺地址位置文字绘制到指定位置
+//            g.drawString(store.getAddress(), returnX(g,bufImg.getWidth(),store.getAddress()), 900);
+                drawStringWithMultiLine(g,store.getAddress(), bufImg.getWidth()-20,20,940,10 );
+            }else {
+                drawStringWithMultiLine(g,"欢迎光临", bufImg.getWidth()-20,20,940,10 );
+                g.drawString("欢迎光临：", returnX(g, bufImg.getWidth(), "服务监督电话："), 870);
+
+            }
+
+
 //            // 将码牌编号文字绘制到指定位置
 //            g.drawString(storeNumber, 200, 800);
            g.dispose();
@ -148,7 +230,7 @@ public class QrCodeUtils {
            g.setFont(chineseFont());
            //设置颜色。
            g.setColor(Color.BLACK);
-            g.drawString("SN："+tagCodeSn, returnX(g, bufImg.getWidth(), "SN："+tagCodeSn), 440);
+            g.drawString("ID："+tagCodeSn, returnX(g, bufImg.getWidth(), "SN："+tagCodeSn), 440);
            g.dispose();
            // 输出图片
            String urlsss = "/temp/qrCode/";
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/OilOrderServiceImpl.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/OilOrderServiceImpl.java
@ -1479,10 +1479,12 @@ public class OilOrderServiceImpl extends ServiceImpl<OilOrderMapper, OilOrder> i
        oilOrder.setUserId(nowAccountInfo.getId());
        oilOrder.setOilTagSn(oilOrder.getOilTagSn());
        TagCode tagCode = tagCodeService.selectByTagCodeSn(oilOrder.getOilTagSn());
-        String collection = tagCode.getCollection();
-        if (collection.contains("staffId")){
-            String[] split = collection.split("staffId=");
-            oilOrder.setStaffId(Integer.parseInt(split[1]));
+        if (ObjectUtil.isNotEmpty(tagCode)) {
+            String collection = tagCode.getCollection();
+            if (collection.contains("staffId")) {
+                String[] split = collection.split("staffId=");
+                oilOrder.setStaffId(Integer.parseInt(split[1]));
+            }
        }
        //        判断当前店铺是否存在此用户的会员信息，没有的话进行添加
        LJStore store = storeService.selectStoreByStoreId(oilOrder.getStoreId());
@ -1542,6 +1544,7 @@ public class OilOrderServiceImpl extends ServiceImpl<OilOrderMapper, OilOrder> i
        String isUseChildCard = map.get("isUseChildCard");

 //        根据订单号查询订单信息
+        log.info("订单号1547：" + orderNo);
        OilOrder oilOrder = this.selectOilOrderByOrderNo(orderNo);
 //        获取油品信息
        OilNumber oilNumber = oilNumberService.selectOilNumberByOilName(oilOrder.getOils(), oilOrder.getStoreId());
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/storeInformation/service/impl/QRCodeServiceImpl.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/storeInformation/service/impl/QRCodeServiceImpl.java
@ -7,7 +7,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fuint.business.indexBanner.entity.IndexBanner;
 import com.fuint.business.indexBanner.service.IndexBannerService;
-import com.fuint.business.member.entity.LJStaff;
 import com.fuint.business.member.utils.QrCodeUtils;
 import com.fuint.business.storeInformation.entity.LJStore;
 import com.fuint.business.storeInformation.entity.QRCode;
@ -63,7 +62,7 @@ public class QRCodeServiceImpl extends ServiceImpl<QRCodeMapper, QRCode> impleme
        if (type.equals("0")){
            backgroundImage = "static/qrCodeImg/laigeyouhui_bg.jpg";
        }else {
-            backgroundImage = "static/qrCodeImg/laigeyouhui_bg1.png";
+            backgroundImage = "static/qrCodeImg/laigeyouhui_bg2.png";
        }

        String logoImage = "static/qrCodeImg/logo.png";
--- a/fuintBackend/fuint-application/src/main/resources/application.properties
+++ b/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
--- a/fuintCashierWeb/src/views/cashier/NewComponents/credit.vue
+++ b/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;

--- a/fuintCashierWeb/src/views/cashier/index.vue
+++ b/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>-->
-    <router-view/>
+
+    <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,18 +747,22 @@ 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;
  //  color: #81b0ff !important;
  //}
  .app-left{
-    width: 180px;
+    width:180px;
    height: 100vh;
    background: #ffffff;
    box-shadow: 0 4px 4px 4px rgba(0,21,41,.08);