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

前端

Browse Source
This commit is contained in:
@QQNZX 2024-01-15 11:39:48 +08:00
parent 70e988e9a8
commit 89d2d71152
11 changed files with 42 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fuintAdmin/.env.development
View File

@ -11,6 +11,6 @@ VUE_APP_BASE_API = '/dev-api'
VUE_APP_PUBLIC_PATH = '/'
# 后端接口地址
VUE_APP_SERVER_URL = 'http://192.168.0.178:8008/'
VUE_APP_SERVER_URL = 'http://192.168.0.138:8008/'
# http://192.168.1.6:8008/

1
fuintAdmin/src/main.js
View File

@ -49,6 +49,7 @@ Vue.prototype.addDateRange = addDateRange
Vue.prototype.getName = getName
Vue.prototype.download = download
Vue.prototype.handleTree = handleTree
Vue.prototype.imgurl = 'http://192.168.0.138:8008'
// 全局组件挂载
Vue.component('DictTag', DictTag)
Vue.component('Pagination', Pagination)

18
fuintAdmin/src/views/EventMarketing/cardExchangeRecord/index.vue
View File

@ -49,16 +49,17 @@
<!-- </el-row>-->
<el-table v-loading="loading" :data="recordList" @selection-change="handleSelectionChange">
<!-- <el-table-column type="selection" width="55" align="center" />-->
<!-- <el-table-column label="主键id" align="center" prop="id" />-->
<!-- <el-table-column label="员工id" align="center" prop="mtStaffId" />-->
<!-- <el-table-column label="兑换券id" align="center" prop="cardExchangeId" />-->
<!-- <el-table-column label="员工手机号码" align="center" prop="staffMobile" />-->
<!-- <el-table-column label="员工姓名" align="center" prop="realName" />-->
<el-table-column label="序号" align="center" prop="mtUserId" />
<el-table-column label="手机号码" align="center" prop="mobile" />
<el-table-column label="名字" align="center" prop="name" />
<el-table-column label="头像" align="center" prop="photo" />
<el-table-column label="头像" align="center" prop="photo" >
<template slot-scope="scope">
<el-avatar size="medium" :src="imgUrl + scope.row.photo"></el-avatar>
</template>
</el-table-column>
<el-table-column label="开始时间" align="center" prop="startTime" width="180">
<template slot-scope="scope">
<span>{{ scope.row.startTime }}</span>
@ -202,6 +203,7 @@ export default {
name: "Record",
data() {
return {
imgUrl:this.imgurl,
// 遮罩层
loading: true,
// 选中数组
@ -250,6 +252,8 @@ export default {
},
created() {
this.getList();
console.log(this.imgUrl)
console.log(this.imgurl)
},
methods: {
/** 查询兑换券领取记录列表 */

10
fuintAdmin/src/views/EventMarketing/storeOilBlock/index.vue
View File

@ -369,19 +369,13 @@
methods:{
//
radiovalue(lable){
/*this.queryParamss.type = lable;
console.log("222222222222"+queryParamss)
getList(this.queryParamss).then(res=>{
if(res.code == 200){
this.tableData = res.data.records
this.total = res.data.total;
}
})*/
this.oilList = []
oilName(this.queryParams.type).then(res=>{
this.oilList = res.data.records
console.log('我的油站' ,res)
})
this.getlist()
},
getlist(){

5
fuintAdmin_zt/.env.development
View File

@ -11,7 +11,6 @@ VUE_APP_BASE_API = '/dev-api'
VUE_APP_PUBLIC_PATH = '/'
# 后端接口地址
VUE_APP_SERVER_URL = 'http://192.168.0.178:8008/'
VUE_APP_SERVER_URL = 'http://192.168.0.138:8008/'
# cp端地址
VUE_PC_SERVER_URL = 'http://192.168.0.178:82/'

BIN
fuintCashierWeb/.env.development
View File

Binary file not shown.

5
gasStation-uni/config.js
View File

@ -4,10 +4,7 @@ module.exports = {
// baseUrl: 'http://192.168.0.196:8081/',
// baseUrl: 'http://192.168.1.4:8080/',
baseUrl: 'http://192.168.0.138:8008/',
// baseUrl: 'http://192.168.1.5:8002/cdJdc',
imagesUrl: 'http://www.nuoyunr.com/lananRsc',
// 应用信息
appInfo: {
@ -30,4 +27,4 @@ module.exports = {
}
]
}
}
}

3
gasStation-uni/pagesHome/MyCard/MyCard.vue
View File

@ -176,13 +176,12 @@
console.log(res)
if (res.code == 200) {
this.cardsList = res.data.records
console.log(this.toil);
}
})
},
getUserBalance() {
this.cardsList = []
request({
url: '/business/userManager/user/getUserBalanceApplet',
method: 'get',

7
gasStation-uni/pagesHome/oilRecharge/oilRecharge.vue
View File

@ -35,8 +35,9 @@
</view>
<view class="box-gang" @click="show = true">
<view class="">推荐员工</view>
<view class=""></view>
<view class="">
<view style="display: flex;align-items: center;">
<view class="">{{yname}}</view>
<uni-icons type="right" size="14"></uni-icons>
</view>
@ -152,6 +153,7 @@
query: {
storeId: ''
},
yname: '',
chainStoreId: '',
cardRecordId: '',
cardFavorableId: '',
@ -368,6 +370,7 @@
confirm(e) {
console.log(e);
this.staffId = e.value[0].id
this.yname = e.value[0].realName
this.show = false
},
cancel() {

19
gasStation-uni/pagesMy/Coupons/Coupons.vue
View File

@ -18,14 +18,17 @@
</view>
<view class="card-box" v-for="(item,index) in cardsList" :key="index">
<view class="left-img">
<view class="huiz">￥{{item.couponAmount}}</view>
<view class="huiz" v-if="item.couponType == '优惠券'">￥{{item.couponAmount}}</view>
<view class="hui-icon" v-if="item.couponType != '优惠券'">
<image src="../../static/imgs/iconcar.png" mode=""></image>
</view>
<view class="cbai">{{item.couponType}}</view>
</view>
<view class="right-box">
<view class="title">{{item.couponName}}</view>
<view class="hui-size">{{item.couponContent}}</view>
<view class="dis-bt">
<view class="hui-size">有效期：2023-11-30</view>
<view class="hui-size">有效期：{{item.createTime || ''}}</view>
<view class="anniu" v-if="item.couponType == '优惠券'"
@click="goRecharge(item.id,item.cardRecordId)">
<text>立即使用</text>
@ -224,6 +227,8 @@
if (res.code == 200) {
this.cardsList = res.data.records
}
console.log(res.data.records);
console.log(this.cardsList);
})
}
}
@ -331,6 +336,16 @@
color: #8F5624;
}
.hui-icon {
text-align: center;
image {
width: 34px;
height: 26px;
margin: 6px 0px;
}
}
.cbai {
font-size: 14px;
color: #ffffff;

BIN
gasStation-uni/static/imgs/iconcar.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.4 KiB