dianliang/oil-station
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
@QQNZX 2024-01-23 09:47:04 +08:00
commit 6dada2c04f
9 changed files with 157 additions and 94 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
fuintAdmin_zt/src/views/indexBanner/index.vue
View File

@ -3,7 +3,7 @@
<el-card class="card">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="68px">
<el-form-item label="店铺" prop="storeId">
<el-select v-model="queryParams.storeId" placeholder="请选择店铺" style="width: 100%">
<el-select v-model="queryParams.storeId" filterable placeholder="请选择店铺" clearable style="width: 100%">
<el-option v-for="item in storeList"
:key="item.id" clearable
:label="item.name" :value="item.id"
@ -87,10 +87,10 @@
:visible.sync="dialogVisible">
<el-form ref="form" :model="form" :rules="rules" label-width="120px">
<el-form-item label="店铺" prop="storeId">
<el-select v-model="form.storeId" placeholder="请选择店铺" style="width: 100%">
<el-select v-model="form.storeId" filterable placeholder="请选择店铺" style="width: 100%">
<el-option v-for="item in storeList"
:key="item.id"
:label="item.name" :value="item.id"></el-option>
:label="item.name" :value="item.id+''"></el-option>
</el-select>
</el-form-item>
<el-form-item label="轮播图" prop="bannerUrl">
@ -235,18 +235,17 @@ export default {
if (valid) {
if (this.form.id){
updateIndexBanner(this.form).then(res => {
console.log(res)
if (res.data==1){
this.$modal.msgSuccess("修改成功")
this.dialogVisible = false
this.flag = false
this.queryParams.page = 1
this.getList()
this.getStoreList()
}
})
}else {
addIndexBanner(this.form).then(res => {
console.log(res)
if (res.data==1){
this.$modal.msgSuccess("添加成功")
this.dialogVisible = false

2
fuintBackend/fuint-application/src/main/java/com/fuint/business/indexBanner/controller/IndexBannerController.java
View File

@ -56,7 +56,7 @@ public class IndexBannerController extends BaseController {
*/
@PostMapping
public ResponseObject add(@RequestBody IndexBanner indexBanner){
return getSuccessResult(indexBannerService.insertIndexBanner(indexBanner,null));
return getSuccessResult(indexBannerService.insertIndexBanner(indexBanner,indexBanner.getStoreId()));
}
/**

2
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeExchange/service/impl/ActiveExchangeServiceImpl.java
View File

@ -666,6 +666,7 @@ public class ActiveExchangeServiceImpl implements ActiveExchangeService {
if (StringUtils.isNotEmpty(gradeId)) {
LJStore store = iljStoreService.selectStoreByStoreId(storeId);
ChainStoreConfig chainStoreConfig = chainStoreConfigService.selectChainStoreById(store.getChainStoreId());
if (ObjectUtils.isNotEmpty(chainStoreConfig)) {
String isEnableLevel = chainStoreConfig.getIsEnableLevel();
if (isEnableLevel.equals("yes")) {
@ -759,6 +760,7 @@ public class ActiveExchangeServiceImpl implements ActiveExchangeService {
}
}
}
}
return paymentActiveVO;
}

2
fuintBackend/fuint-application/src/main/java/com/fuint/business/member/service/impl/LJStaffServiceImpl.java
View File

@ -95,8 +95,10 @@ public class LJStaffServiceImpl extends ServiceImpl<LJStaffMapper, LJStaff> impl
*/
@Override
public LJStaff selectStaffByMobile(String mobile) {
AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
QueryWrapper queryWrapper = new QueryWrapper();
queryWrapper.eq("mobile",mobile);
queryWrapper.eq("store_id",nowAccountInfo.getStoreId());
LJStaff staff = baseMapper.selectOne(queryWrapper);
return staff;
}

14
fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/impl/ChainStoreConfigServiceImpl.java
View File

@ -96,6 +96,18 @@ public class ChainStoreConfigServiceImpl extends ServiceImpl<ChainStoreConfigMap
LJStore store = storeService.selectStoreByStoreId(storeId);
QueryWrapper queryWrapper = new QueryWrapper<>();
queryWrapper.eq("chain_store_id",store.getChainStoreId());
return baseMapper.selectOne(queryWrapper);
ChainStoreConfig chainStoreConfig = baseMapper.selectOne(queryWrapper);
if (ObjectUtil.isEmpty(chainStoreConfig)){
ChainStoreConfig chainStoreConfig1 = new ChainStoreConfig();
chainStoreConfig1.setChainStoreId(store.getChainStoreId());
chainStoreConfig1.setIsEnableLevel("no");
chainStoreConfig1.setIsMonthClear("clear_month");
chainStoreConfig1.setGasGrowthValue("1");
chainStoreConfig1.setDieselGrowthValue("1");
chainStoreConfig1.setNaturalGrowthValue("1");
baseMapper.insert(chainStoreConfig1);
}
chainStoreConfig = baseMapper.selectOne(queryWrapper);
return chainStoreConfig;
}
}

19
gasStation-uni/pages/index/index.vue
View File

@ -9,9 +9,11 @@
<swiper class="swiper" style="width: 100%;height: 300px;" circular :indicator-dots="indicatorDots"
:autoplay="autoplay" :interval="interval" :duration="duration">
<swiper-item v-for="(item,index) in list1" :key="index" @click="goPage(item.routeUrl)">
<view class="swiper-item uni-bg-red"></view>
<!-- <image style="width: 100%;" :src="item.bannerUrl"></image> -->
<image style="width: 100%;" :src="getBannerUrl(item.bannerUrl)"></image>
<view class="swiper-item uni-bg-red">
<image style="width: 100%;" :src="item.bannerUrl"></image>
</view>
<!-- <image style="width: 100%;" :src="getBannerUrl(item.bannerUrl)"></image> -->
</swiper-item>
</swiper>
</view>
@ -257,12 +259,21 @@ import { callWithErrorHandling } from "vue"
},
// 获取首页轮播图信息
getIndexBanner() {
let _this = this
if (uni.getStorageSync("storeId")) {
request({
url: 'business/indexBanner/list/' + uni.getStorageSync("storeId"),
method: 'get',
}).then(res => {
this.list1 = res.data
_this.list1 = res.data
for (let i = 0;i<res.data.length;i++){
if (res.data[i].bannerUrl.includes("http")){
_this.list1[i].bannerUrl = res.data[i].bannerUrl
}else{
_this.list1[i].bannerUrl = _this.baseUrl + res.data[i].bannerUrl
}
}
console.log(_this.list1);
})
}
},

2
gasStation-uni/pages/refuel/refuel.vue
View File

@ -8,7 +8,7 @@
<view class="top-box">
<view class="dis" style="width: 78%;">
<view class="top-img">
<image v-if="store.logo==''||store.logo==null||store.logo==undefined" src="../../static/logo.png" mode="aspectFit"></image>
<image v-if="!store.logo" src="../../static/logo.png" mode="aspectFit"></image>
<image v-else :src="baseUrl+store.logo" mode="aspectFit"></image>
</view>
<view style="width: 80%;">

8
gasStation-uni/pagesMy/myorder/myorder.vue
View File

@ -60,7 +60,7 @@
<text>评价有礼</text>
</view>
</view>
<view v-else-if="item.orderStatus=='unpaid'" class="end-box" @click="goPayment()">
<view v-else-if="item.orderStatus=='unpaid'" class="end-box" @click="goPayment(item.orderNo)">
<view class="anniu">
<text>去支付</text>
</view>
@ -403,8 +403,10 @@
// this.getBalanceOrder()
}
},
goPayment(){
goPayment(orderNo){
uni.navigateTo({
url: '/pagesRefuel/orderDetail/index?orderNo=' + orderNo,
})
},
goComment() {
uni.navigateTo({

35
gasStation-uni/pagesMy/setup/index.vue
View File

@ -7,6 +7,7 @@
<view class="my-icons"></view>
</view>
<!-- 顶部区域 -->
<!-- #ifdef MP-WEIXIN -->
<button class="box-hang" open-type="chooseAvatar" @chooseavatar="onChooseAvatar">
<view class="">头像</view>
<view class="touxiang">
@ -14,6 +15,16 @@
<image class="touxiang" v-else src="@/static/imgs/myx.png" mode="aspectFit"></image>
</view>
</button>
<!-- #endif -->
<!-- #ifdef MP-ALIPAY -->
<button class="box-hang" @click="onChooseAvatar1">
<view class="">头像</view>
<view class="touxiang">
<image class="touxiang" v-if="user.avatar!='' && user.avatar!=null && user.avatar!=undefined" :src="baseUrl + user.avatar" mode="aspectFit"></image>
<image class="touxiang" v-else src="@/static/imgs/myx.png" mode="aspectFit"></image>
</view>
</button>
<!-- #endif -->
<view class="box-hang" @click="goEdit(0)">
<view class="">昵称</view>
<view class="dis">
@ -99,6 +110,30 @@
},
})
},
// 用户选择头像
onChooseAvatar1(e){
let _this = this;
//从本地相册选择图片或使用相机拍照
uni.chooseImage({
sourceType: ['album', 'camera'],//选择方式相册或者相机
success: (res) => {
console.log('图片', res)
var tempFilePath = res.tempFilePaths;
var filePath = tempFilePath[0];
console.log(filePath);//输出本地头像路径
//调用上传下载api
// 将图片上传服务器
upload({
url: '/clientApi/file/upload',
filePath: filePath,
}).then((res) => {
console.log('images', res.data.fileName);
_this.user.avatar = res.data.fileName
_this.editUser()
})
}
});
},
// 修改用户信息
editUser(){
request({