Merge branch 'master' of https://gitee.com/nny_1/oilSystem

# Conflicts:
#	fuintAdmin_zt/.env.development
#	fuintBackend/configure/dev/application.properties
#	fuintBackend/fuint-application/src/main/resources/application.properties
#	gasStation-uni/config.js
#	gasStation-uni/pages/index/index.vue

fuintAdmin/package.json

@@ -42,6 +42,7 @@
     "bignumber.js": "^9.1.2",
     "clipboard": "2.0.8",
     "core-js": "3.25.3",
+    "crypto-js": "^4.2.0",
     "echarts": "4.9.0",
     "element-tiptap": "^1.27.1",
     "element-ui": "2.15.12",

fuintAdmin/src/components/Fuint/Doc/index.vue

@@ -6,18 +6,21 @@
 </template>
 
 <script>
+import { getToken, setToken, removeToken } from '@/utils/auth'
+import CryptoJS from "crypto-js";
 export default {
   name: 'FuintDoc',
   data() {
     return {
       // url: 'https://www.fuint.cn/docs/index/'
-      url: 'http://192.168.0.181:82/#/homeindex?id=0'
+      url: ''
 
     }
   },
   methods: {
     goto() {
-      window.open(this.url)
+      console.log( getToken())
+      window.open('http://127.0.0.1:5500/index.html?id='+ getToken())
     }
   }
 }

fuintAdmin/src/layout/components/Sidebar/index.vue

@@ -17,7 +17,6 @@
                 mode="vertical"
                 style="margin-bottom: 80px;"
             >
-
                 <sidebar-item
                     v-for="(route, index) in sidebarRouters"
                     :key="route.path  + index"

fuintAdmin/src/views/login.vue

@@ -59,7 +59,7 @@
             </el-input>
           </div>
                 <div class="login-code">
-                  <img :src="codeUrl" @click="getCode" class="login-code-img"/>
+                  <img :src="codeUrl" @click="getCodeimg" class="login-code-img"/>
                 </div>
             </div>
           </el-form-item>
@@ -132,22 +132,6 @@
       </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>-->
-<!--      </div>-->
   </div>
 </template>
 

fuintAdmin_zt/.env.development

@@ -15,4 +15,3 @@ VUE_APP_SERVER_URL = 'http://192.168.0.178:8008'
 
 # # cp端地址
 # VUE_PC_SERVER_URL = 'http://192.168.1.6:82/'
-

fuintAdmin_zt/src/assets/styles/variables.scss

@@ -11,14 +11,14 @@ $panGreen: #30B08F;
 // 默认菜单主题风格
 $base-menu-color:#ffffff;// 菜单全部字体颜色
 $base-menu-color-active:#ffffff;// 父级菜单激活的字体颜色
-$base-menu-background:#1a5982;
+$base-menu-background:#5a91ff;
 $base-logo-title-color: #ffffff;
 
 $base-menu-light-color:#ffffff;
 $base-menu-light-background:#ffffff;
 $base-logo-light-title-color: #1a5982;
 
-$base-sub-menu-background:#18547a;//展开的背景色
+$base-sub-menu-background: #4e77cc;//展开的背景色
 $base-sub-menu-hover:#001528;
 
 $base-sidebar-width: 200px;

fuintAdmin_zt/src/layout/components/Navbar.vue

@@ -108,7 +108,7 @@ export default {
   overflow: hidden;
   position: relative;
   background: #144a6e;
-  background-image: url("../../assets/images/bolang.png") ;
+  background-image: url("../../assets/images/kkx.png") ;
   background-size: 100% 100%;
   background-size: cover;
   background-repeat: no-repeat;

fuintAdmin_zt/src/views/login.vue

@@ -1,17 +1,25 @@
 <template>
   <div class="login">
-      <div class="login-main">
-        <div class="caption">
-            <h4 class="caption-title">{{ systemName }}</h4>
-            <p class="caption-remark">欢迎使用 {{ systemName }}，您的卡券、储值卡、计次卡等会员营销小管家！</p>
+    <div class="box-center">
+      <div class="box-left">
+        <div class="bai-size">蓝鲸智慧加油站-中台</div>
+        <div class="bact-box">
+          <div class="sanhh">活动营销</div>
+          <div class="sanhh">节省人力</div>
+          <div class="sanhh">精准定位</div>
         </div>
       </div>
-      <div class="login-form">
-         <el-form ref="loginForm" :model="loginForm" :rules="loginRules">
-          <div class="title">
-            <img class="logo" src="@/assets/logo/logo.png"/>
-            <span class="name">{{ systemName }}</span>
+      <div class="box-right">
+        <div class="box-title">
+          <div style="margin-right: 15px;cursor: pointer " v-for="(item,index) in dlyzm" :key="index" @click="actindex = item.type " >
+            <div>{{item.text}}</div>
+            <div class="gangs" v-if="item.type == actindex " ></div>
           </div>
+
+        </div>
+        <el-form ref="loginForm" :model="loginForm" :rules="loginRules" v-if="actindex == 0" >
+
+
           <el-form-item prop="username">
             <el-input
               v-model="loginForm.username"
@@ -36,18 +44,23 @@
             </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"/>
+                <img :src="codeUrl" @click="getCodeimg" class="login-code-img"/>
+              </div>
             </div>
           </el-form-item>
           <el-checkbox v-model="loginForm.rememberMe" style="margin:0px 0px 25px 0px;">记住密码</el-checkbox>
@@ -64,26 +77,90 @@
             </el-button>
           </el-form-item>
         </el-form>
-         <div class="copy-right">
-           <span>Copyright © 2020-2023 <a class="link" href="https://www.fuint.cn">fuint.cn</a> All Rights Reserved.</span>
+        <!--        验证码-->
+
+        <el-form ref="loginForm" :model="loginForm" :rules="loginRules" v-if="actindex == 1" >
+
+          <el-form-item prop="username">
+            <el-input
+              v-model="loginForm.tel"
+              type="number"
+              auto-complete="off"
+              clearable
+              placeholder="手机号"
+            >
+              <svg-icon slot="prefix" icon-class="user" class="el-input__icon input-icon" />
+            </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.telcode"
+                  auto-complete="off"
+                  placeholder="请输入验证码"
+                  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>
+                <span class="anniulan" v-show="show" @click="getCodet" >获取验证码</span>
+                <span style="cursor: pointer;color: #00aaff " v-show="!show" class="count">{{count}}s后重新获取</span>
+              </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%;">
+            <el-button
+              :loading="loading"
+              size="medium"
+              type="primary"
+              style="width:100%;line-height: 24px;font-size: 16px;"
+              @click.native.prevent="posttelcode()"
+            >
+              <span v-if="!loading">立即登录</span>
+              <span v-else>登 录 中...</span>
+            </el-button>
+          </el-form-item>
+        </el-form>
       </div>
     </div>
+
   </div>
 </template>
 
 <script>
-import { getCodeImg } from "@/api/login";
+import {getCodeImg, gettelcode, gettellogin,} from "@/api/login";
 import Cookies from "js-cookie";
 import { encrypt, decrypt } from '@/utils/jsencrypt'
+import BalanceRecharge from "@/views/member/balanceRecharge.vue";
+import {setToken} from "@/utils/auth";
 
 export default {
   name: "Login",
+  components: {BalanceRecharge},
   data() {
     return {
+      show: true,
+      count: '',
+      timer: null,
+      dlyzm:[
+        {text:'登录',type:'0'},
+        {text: "验证码",type:'1'}
+      ],
+      actindex:0,
       codeUrl: "",
       systemName : process.env.VUE_APP_TITLE,
       loginForm: {
-        username: "fuint",
+        tel:null,
+        telcode:null,
+        username: "oil_admin",
         password: "123456",
         rememberMe: false,
         captchaCode: "",
@@ -115,11 +192,44 @@ export default {
     }
   },
   created() {
-    this.getCode();
+    this.getCodeimg();
     this.getCookie();
   },
   methods: {
-    getCode() {
+
+    getCodet() {
+
+      if(!this.loginForm.tel){
+        this.$message.error("手机号不能为空")
+        return
+      }
+
+      const TIME_COUNT = 60;
+      if (!this.timer) {
+        this.count = TIME_COUNT;
+        this.show = false;
+        this.timer = setInterval(() => {
+          if (this.count > 0 && this.count <= TIME_COUNT) {
+            this.count--;
+          } else {
+            this.show = true;
+            clearInterval(this.timer);
+            this.timer = null;
+          }
+        }, 1000)
+      }
+      let data = {
+        mobile:this.loginForm.tel
+      }
+      gettelcode(data).then(res =>{
+        if(res.code == 200){
+          this.$message.success("操作成功")
+        }else{
+          this.$message.error("操作失败请稍后再试")
+        }
+      })
+    },
+    getCodeimg() {
       const app = this
       getCodeImg().then(response => {
         app.codeUrl = response.data.captcha
@@ -137,6 +247,20 @@ export default {
         uuid: this.loginForm.uuid
       };
     },
+
+    posttelcode(){
+      const data = {
+        mobile:this.loginForm.tel,
+        code:this.loginForm.telcode
+      }
+      this.$store.dispatch("codeLogin", data).then(() => {
+        this.$router.push({ path: this.redirect || "/" }).catch(()=>{});
+      }).catch(() => {
+        this.loading = false;
+
+      });
+
+    },
     handleLogin() {
       const app = this;
       if (app.loading) {
@@ -171,9 +295,86 @@ export default {
 
 <style rel="stylesheet/scss" lang="scss">
 .login {
-  height: 100%;
+  height: 100vh;
   width: 100%;
   position: relative;
+  background-image: url("../assets/images/backbbj.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;
+
+  }
+  .gangs{
+    width: 100%;
+    height: 5px;
+    background: #00aaff;
+    border-radius: 50px;
+  }
+  .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;
+    display: flex;
+    align-items: 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;
@@ -267,4 +468,15 @@ export default {
     }
   }
 }
+.anniulan{
+  width: 100px;
+  height: 40px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  //border: 1px solid #00aaff;
+  border-radius: 6px;
+  color: #00aaff;
+  cursor: pointer;
+}
 </style>

fuintBackend/db/待优化项

@@ -1,2 +1,17 @@
 1、	transaction_id存储
 2、
+
+
+20231219
+1.中台组织架构删除有遮挡
+2.油站管理 滚动异样
+3.VueX页面刷新丢失缓存
+4.编辑油站 》 图片上传
+5.支付通道查询
+6.支付通道发布
+7.注意 进入油站配置链接
+8.进入油站错误提示
+9.首页没对齐
+10.门店二维码 收款二维码
+11.门店信息保存按钮
+12.角色组问题

fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFule/service/impl/CardFuelRecordServiceImpl.java

@@ -218,7 +218,6 @@ public class CardFuelRecordServiceImpl implements CardFuelRecordService {
             map.put("privateKey", merchantConfig.getPrivateKey());
             map.put("type", "CFR");
             map.put("orderId", cardFuelRecordDTO.getId().toString());
-            map.put("storeId", nowAccountInfo.getStoreId().toString());
             // 调用支付接口
             try {
                 fyPayService.pay(map);
@@ -483,12 +482,21 @@ public class CardFuelRecordServiceImpl implements CardFuelRecordService {
                 String refuelMoney = userBalance.getRefuelMoney();
                 List<JSONObject> jsonObjectList = JSONArray.parseArray(refuelMoney, JSONObject.class);
                 for (JSONObject jsonObject : jsonObjectList) {
+                    if (cardFuleOrders.getOilType().equals(jsonObject.getString("oilType"))){
+                        double refuelMoney1 = jsonObject.getDouble("refuelMoney");
+                        refuelMoney1 = (cardFuleOrders.getIncomeLitres() + refuelMoney1);
+                        jsonObject.put("refuelMoney", refuelMoney1).toString();
 
+                    }else {
+                        JSONObject jsonObject1 = new JSONObject();
+                        jsonObject1.put("type",cardFuleOrders.getType());
+                        jsonObject1.put("oilType",cardFuleOrders.getOilType());
+                        jsonObject1.put("incomeLitres",cardFuleOrders.getIncomeLitres());
+                        jsonObjectList.add(jsonObject1);
                     }
-                //String type = json.getString("type");
-
-                //afterLitres = userBalance.getRefuelMoney() + cardFuleOrders.getIncomeLitres();
-                //userBalance.setCardBalance(afterBalance);
+                }
+                String userBnlancce = jsonObjectList.toString();
+                userBalance.setRefuelMoney(userBnlancce);
             }
             userBalanceService.updateUserBalance(userBalance);
         }else {

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

@@ -5,6 +5,7 @@ env.profile=dev
 env.properties.path=D:/code/oilSystem/fuintBackend/configure/
 
 
+
 # \u6570\u636E\u5E93\u914D\u7F6E
 spring.datasource.type=com.zaxxer.hikari.HikariDataSource
 spring.datasource.driverClassName=com.mysql.cj.jdbc.Driver

gasStation-uni/components/tabbar/tabbar.vue

@@ -67,13 +67,16 @@
 		height: 60px;
 		background-color: white;
 		position: fixed;
-		bottom: 0px;
+
+		left: 50%;
+		transform: translate(-50%, -50%);
 		display: flex;
 		align-items: center;
 		justify-content: space-around;
 		font-size: 12px;
 		font-weight: 400;
 		color: #666666;
+		bottom: -30px;
 	}
 
 	.barbox {

gasStation-uni/config.js

@@ -4,6 +4,7 @@ module.exports = {
 	// baseUrl: 'http://192.168.0.196:8081/',
 	// baseUrl: 'http://192.168.1.4:8080/',
 	baseUrl: 'http://localhost:8008/',
+
 	// baseUrl: 'http://192.168.1.5:8002/cdJdc',
 
 	imagesUrl: 'http://www.nuoyunr.com/lananRsc',

gasStation-uni/pages/index/index.vue

@@ -185,7 +185,9 @@
 			if (query.q) {
 				let str = q.split("?")[1];
 				let arr = str.split("&");
+
 				let storeId = "12";
+
 				let staffId = "";
 				arr.forEach(item => {
 					if (item.includes("storeId")) {
@@ -233,7 +235,6 @@
 						url: 'business/indexBanner/list/' + uni.getStorageSync("storeId"),
 						method: 'get',
 					}).then(res => {
-						console.log(res)
 						this.list1 = res.data
 					})
 				}

gasStation-uni/pagesHome/activeIn/index.vue

@@ -201,11 +201,17 @@
 		},
 		onLoad(option) {
 			this.title = option.name
-
+			console.log(option.name);
 			this.getData(option.name);
 		},
 		methods: {
 			goTopup() {
+				// pagesMy/invite/invite
+				if (this.title == '推荐有礼活动') {
+					uni.navigateTo({
+						url: '/pagesMy/invite/invite'
+					})
+				}
 				uni.navigateTo({
 					url: '/pagesHome/oilRecharge/oilRecharge'
 				})

gasStation-uni/pagesHome/oilRecharge/oilRecharge.vue

@@ -43,8 +43,8 @@
 					<!-- 底部 -->
 
 				</view>
-				<view class="bottom-box" @click="addValueCarRecords()">
-					<view class="anniu">
+				<view class="bottom-box">
+					<view class="anniu" @click="addValueCarRecords()">
 						<text>立即充值</text>
 					</view>
 					<view class="dibu" @click="goRechargeRecords()">
@@ -124,7 +124,7 @@
 					<view class="anniu" @click="exchangeGift()">
 						<text>立即兑换</text>
 					</view>
-					<view class="dibu" @click="goRechargeRecords()">
+					<view class="dibu" @click="golpk()">
 						<view class="">兑换记录</view>
 						<uni-icons type="right" color="#1678ff" size="14"></uni-icons>
 					</view>
@@ -393,6 +393,12 @@
 					console.log("columns", this.columns);
 
 				})
+			},
+			golpk() {
+				uni.navigateTo({
+					url: '/pagesHome/RechargeRecords/RechargeRecords'
+				})
+
 			}
 		}
 	}

gasStation-uni/pagesHome/order/order.vue

@@ -115,7 +115,6 @@
 <script>
 	import config from '@/config'
 	import request from '../../utils/request'
-	import BigNumber from 'bignumber.js';
 
 	export default {
 

gasStation-uni/pagesMy/invite/invite.vue

@@ -29,7 +29,8 @@
 						</view>
 						<view class="r-naniu">
 							<u-icon name="share-fill" color="#E9312F" size="18"></u-icon>
-							<text>分享给好友</text>
+
+							<button class="qiangzhi" open-type="share"><text>分享给好友</text></button>
 						</view>
 					</view>
 
@@ -79,12 +80,25 @@
 
 		components: {
 
+		},
+		onShareAppMessage() {
+			return {
+				title: '来个油惠',
+
+				success() {
+					console.log('分享成功');
+				},
+				fail(err) {
+					console.error('分享失败', err);
+				}
+			};
 		},
 		onShow() {
 			this.getAllAmount();
 			this.getActiveRecommendRecords();
 		},
 		methods: {
+
 			getAllAmount() {
 				request({
 					url: 'business/marketingActivity/activeRecommendRecords/selectAllAmount',
@@ -312,4 +326,10 @@
 		font-weight: 400;
 		color: #999999;
 	}
+
+	.qiangzhi {
+		background: transparent;
+		border: none;
+		box-shadow: 0px
+	}
 </style>