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

9.23

Browse Source
This commit is contained in:
xvv 2024-09-23 17:41:41 +08:00
parent 3cd4b240c7
commit c8c285118d
9 changed files with 454 additions and 159 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
gasStation-uni/pages.json
View File

@ -136,7 +136,12 @@
"path": "myPointsOrder/myPointsOrder",
"style": {
"navigationBarTitleText": "我的订单"
}
},
{
"path": "myPointsOrder/details",
"style": {
"navigationBarTitleText": "订单详情"
}
},
{
@ -163,8 +168,8 @@
{
"path": "PointsMall/PointsMall",
"style": {
"navigationBarTitleText": "积分商城",
"navigationStyle": "custom"
"navigationBarTitleText": "积分商城"
}
},
{
@ -393,4 +398,4 @@
"backgroundColor": "#F8F8F8"
},
"uniIdRouter": {}
}
}

9
gasStation-uni/pages/my/my.vue
View File

@ -79,7 +79,7 @@
消费记录
</view>
</view>
<view class="centenr-sx">
<view class="centenr-sx" @click="goPagesmy(3)">
<view class="centenr-img">
<image src="@/static/icon/icon/newmy3.png"></image>
</view>
@ -248,6 +248,11 @@
url: '/pagesMy/myorder/myorder'
})
}
if (num == 3) {
uni.navigateTo({
url: '/pagesHome/myPointsOrder/myPointsOrder'
})
}
},
// 查询全部充值订单
getAllOrderList() {
@ -606,4 +611,4 @@
height: 100%;
}
}
</style>
</style>

158
gasStation-uni/pagesHome/PointsMall/PointsMall.vue
View File

@ -1,67 +1,23 @@
<template>
<view class="content">
<view class="container">
<view class="my-header">
<view class="my-icons" @click="goback"> <uni-icons type="left" color="#ffffff" size="16"></uni-icons>
<scroll-view scroll-x="true" class="tap-top">
<view class="sz" @click="transferIndex(-1)">
<view class="box" :class="{'xztap': qhindex === -1}">全部</view>
<view class="gang" v-if="qhindex === -1"></view>
</view>
<view class="my-text">积分商城</view>
<view class="my-icons"></view>
</view>
<view class="sz" v-for="(item, index) in categoryList" :key="index"
@click="transferIndex(index,item.id)">
<view class="box" :class="{'xztap': qhindex === index}">{{item.categoryName}}</view>
<view class="gang" v-if="qhindex === index"></view>
</view>
</scroll-view>
<!-- 顶部区域 -->
<view class="top-lanmu">
<view class="hby">
<view class="">
<view class="title-bai">{{myPoints}} <text style="font-size: 16px;">积分</text> </view>
<view class="size-bai">
<uni-icons type="location" color="#ffffff" size="16"></uni-icons>
<text>{{storeName}}</text>
<!-- <uni-icons type="right" color="#ffffff" size="16"></uni-icons> -->
</view>
</view>
<view class="tp">
<image src="../../static/imgs/hby.png" mode="aspectFit"></image>
</view>
</view>
<view class="box-bai">
<view class="box-box" @click="gojg(1)">
<view class="img-jg">
<uni-icons type="calendar-filled" color="#ffffff" size="40"></uni-icons>
</view>
<view class="">积分签到</view>
</view>
<view class="box-box" @click="gojg(2)">
<view class="img-jg" style="background: #fa801c;">
<u-icon name="coupon-fill" color="#ffffff" size="40"></u-icon>
</view>
<view class="">积分明细</view>
</view>
<view class="box-box" @click="gojg(3)">
<view class="img-jg" style="background: #1fcabc;">
<u-icon name="info-circle-fill" color="#ffffff" size="40"></u-icon>
</view>
<view class="">积分规则</view>
</view>
<view class="box-box" @click="gojg(4)">
<view class="img-jg" style="background: #f76b17;">
<u-icon name="file-text-fill" color="#ffffff" size="40"></u-icon>
</view>
<view class="">我的订单</view>
</view>
</view>
<view class="bai-center">
<scroll-view scroll-x="true" class="tap-top">
<view class="sz" @click="transferIndex(-1)">
<view class="box" :class="{'xztap': qhindex === -1}">全部</view>
<view class="gang" v-if="qhindex === -1"></view>
</view>
<view class="sz" v-for="(item, index) in categoryList" :key="index"
@click="transferIndex(index,item.id)">
<view class="box" :class="{'xztap': qhindex === index}">{{item.categoryName}}</view>
<view class="gang" v-if="qhindex === index"></view>
</view>
</scroll-view>
<u-empty v-if="integralGiftList.length == 0" style="margin: 5px auto;" mode="data"
icon="http://cdn.uviewui.com/uview/empty/data.png">
</u-empty>
@ -76,33 +32,34 @@
{{item.giftName}}
</view>
<view class="hui-time">
库存:{{item.remainingInventory === -1?"不限":item.remainingInventory}}
</view>
<view class="good-red">
<view style="display: flex;align-items: center;">
<view class="bi" v-if="item.exchangeMethod != '金额'">
<image src="../../static/imgs/jb.png" mode="aspectFit"></image>
</view>
<view style="color: #FC1708;font-weight: bold;">
<span
v-if="item.exchangeMethod == '积分' || item.exchangeMethod == '积分+金额' || item.exchangeMethod == '积分+加钱购'">{{item.exchangePoints}}</span>
<span v-if="item.exchangeMethod == '积分+金额'">+</span>
<span
v-if="item.exchangeMethod == '金额' || item.exchangeMethod == '积分+金额'">￥{{item.exchangeAmount}}</span>
</view>
<view style="color: #FC1708; font-size: 14px;">
<span
v-if="item.exchangeMethod == '积分' || item.exchangeMethod == '积分+金额' || item.exchangeMethod == '积分+加钱购'">{{item.exchangePoints}}</span>
<span v-if="item.exchangeMethod == '积分+金额'">+</span>
<span
v-if="item.exchangeMethod == '金额' || item.exchangeMethod == '积分+金额'">￥{{item.exchangeAmount}}</span>
<span>积分</span>
</view>
</view>
<view class="anniux">
<text v-if="!item.remainingInventory || item.remainingInventory==0"
style="color: darkgray;">库存不足</text>
<text v-else-if="(
item.exchangeMethod == '积分' ||
item.exchangeMethod == '积分+金额' ) &&
item.exchangePoints>myPoints" style="color: darkgray;">积分不足</text>
<text v-else-if="item.ifRedemptionIsOnline" style="color: darkgray;">达到兑换上限</text>
<text v-else>立即兑换</text>
<view style="display: flex;align-items: center;justify-content: space-between;">
<view class="hui_">
￥3.5
</view>
<view class="anniux">
<text v-if="!item.remainingInventory || item.remainingInventory==0"
style="color: darkgray;">库存不足</text>
<text v-else-if="(
item.exchangeMethod == '积分' ||
item.exchangeMethod == '积分+金额' ) &&
item.exchangePoints>myPoints" style="color: darkgray;">积分不足</text>
<text v-else-if="item.ifRedemptionIsOnline" style="color: darkgray;">达到兑换上限</text>
<text v-else>立即兑换</text>
</view>
</view>
</view>
</view>
</view>
@ -303,7 +260,7 @@
<style scoped lang="scss">
.content {
background-color: #ffd8d8;
background: #f4f5f6;
width: 100%;
height: 100vh;
@ -312,9 +269,7 @@
.container {
width: 100%;
box-sizing: border-box;
padding-top: 88px;
background: linear-gradient(180deg, #ff5c28 0%, #ff5c28 20%, #ffd8d8 37%, #ffd8d8 100%);
background: #f4f5f6;
padding-bottom: 40px;
}
@ -394,13 +349,13 @@
}
.bai-center {
width: 90%;
width: 100%;
border-radius: 8px;
background-color: #ffffff;
// background-color: #ffffff;
margin: 0 auto;
box-sizing: border-box;
padding: 10px;
margin-top: 15px;
}
.tap-top {
@ -410,6 +365,7 @@
box-sizing: border-box;
// border-bottom: 1px solid #EEEEEE;
white-space: nowrap;
background: #fff;
@ -441,7 +397,7 @@
.gang {
width: 50%;
margin: 0 auto;
height: 8rpx;
height: 4rpx;
background: #ff5c28;
border-radius: 14rpx;
@ -458,7 +414,12 @@
.box-goods {
width: 49%;
margin-bottom: 15px;
margin-bottom: 10px;
background: #fff;
box-sizing: border-box;
padding: 10px;
border-radius: 8px;
}
.goods-img {
@ -472,18 +433,11 @@
}
.anniux {
background-color: #ecf5ff;
display: flex;
align-items: center;
justify-content: center;
border-radius: 8px;
box-sizing: border-box;
padding: 10px;
width: 100%;
margin: 10px auto;
color: #1678ff;
color: #FA6400;
font-size: 14px;
// color: #a2a2a2;
font-weight: bold;
// font-weight: bold;
}
.goods-title {
@ -533,4 +487,10 @@
height: 100%;
}
}
</style>
.hui_ {
font-size: 12px;
color: #999;
text-decoration: line-through
}
</style>

73
gasStation-uni/pagesHome/goodsDetails/goodsDetails.vue
View File

@ -12,38 +12,25 @@
</view>
<view class="bai-box">
<view class="box-title">{{goodsInfo.giftName}}</view>
<view class="box-jg">
<span
v-if="goodsInfo.exchangeMethod == '积分' || goodsInfo.exchangeMethod == '积分+金额' || goodsInfo.exchangeMethod == '积分+加钱购'">{{goodsInfo.exchangePoints}}积分</span>
<span v-if="goodsInfo.exchangeMethod == '积分+金额'">+</span>
<span
v-if="goodsInfo.exchangeMethod == '金额' || goodsInfo.exchangeMethod == '积分+金额'">￥{{goodsInfo.exchangeAmount}}</span>
</view>
<view class="price_num">100积分</view>
<view class="dt-box">
<view class="" v-if="deliveryMethod"><u-tag :text='deliveryMethod' type="error"
shape="circle"></u-tag></view>
<view class="hui-time">市场价：{{goodsInfo.market}}</view>
<view class="hui_">
￥3.5
</view>
<view class="or_size">
门店自提
</view>
</view>
</view>
<view class="bai-box">
<view style="margin-bottom: 10px;">商品详情</view>
<!-- <u-line v-html="goodsInfo.detailedDescription"></u-line> -->
<!-- <view class="" v-html="html" ></view> -->
<u-line></u-line>
<u-parse :content="goodsInfo.detailedDescription"></u-parse>
<view class="bai_box">
<view class="">兑换数量</view>
<u-number-box v-model="value" @change="valChange"></u-number-box>
</view>
<!-- <view class="centen-siez"> -->
</view>
<view class="bottom-d">
<view class="anniux" @click="goorder()">
<text>立即兑换</text>
<text>立即购买</text>
</view>
</view>
@ -62,6 +49,7 @@
baseUrl: config.baseUrl,
deliveryMethod: '',
giftImages: [],
value: 0
}
},
@ -79,6 +67,9 @@
},
methods: {
valChange(e) {
console.log('当前值为: ' + e.value)
},
change() {},
click() {},
// 配送信息
@ -232,13 +223,41 @@
.anniux {
width: 90%;
background: #1678ff;
background: #FF9655;
color: white;
display: flex;
align-items: center;
justify-content: center;
color: white;
border-radius: 50px;
height: 50px;
height: 40px;
}
</style>
.or_size {
font-weight: 500;
color: #FA6400;
}
.hui_ {
color: #999;
text-decoration: line-through
}
.price_num {
font-size: 14px;
color: #E02020;
margin: 5px 0px;
}
.bai_box {
background: #fff;
box-sizing: border-box;
padding: 15px;
width: 100%;
display: flex;
align-items: center;
justify-content: space-between;
}
</style>

264
gasStation-uni/pagesHome/myPointsOrder/details.vue Normal file
View File

@ -0,0 +1,264 @@
<template>
<view class="content">
<view class="container">
<view class="box_f">
<view class="box_top">
<view class="">订单号：xxxxxxxxxxxxxxxxxxxx</view>
<view class="">未使用</view>
</view>
<view class="box_cont">
<view class="">
<image src="../../static/logo.png" style="width: 60px; height: 60px; "></image>
</view>
<view class="r-bas">
<view style="font-size: 16px;color: #333333; margin-bottom: 5px;">虚拟产品</view>
<view class="">x1</view>
<view class="b-bs">
<view class="size1">实付： <text style="color: #E02020;">100积分</text> </view>
</view>
</view>
</view>
</view>
<view class="box_">
<view class="">请向商家出示此码使用</view>
<view style="display: flex;align-items: center;justify-content: center; margin: 10px auto;">
<w-qrcode :options="options"></w-qrcode>
</view>
<view class="">核销码：6688172293684182</view>
</view>
<view class="box_" style="font-size: 14px;">
<view class="title_">自提信息</view>
<view class="b-s">
<view class="">油站名称</view>
<view class="">中建锦绣二期站</view>
</view>
<view class="b-s">
<view class="">油站地址</view>
<view class="">济南市槐荫区xxxxxx</view>
</view>
<view class="b-s">
<view class="">预留信息</view>
<view class="">张三 13964068390</view>
</view>
</view>
<view class="box_" style="font-size: 14px;">
<view class="title_">金额信息</view>
<view class="b-s">
<view class="">订单金额</view>
<view class="r-size">￥0.00</view>
</view>
<view class="b-s">
<view class="">订单积分</view>
<view class="r-size">100积分</view>
</view>
<view class="b-s">
<view class="">共1件商品</view>
<view class="r-size">实付：100积分</view>
</view>
</view>
<view class="box_" style="font-size: 14px;">
<view class="title_">订单信息</view>
<view class="b-s">
<view class="">订单编号</view>
<view class="">xxxxxxxxxxxxxxxxxxxx</view>
</view>
<view class="b-s">
<view class="">下单油站</view>
<view class="">中建锦绣二期站</view>
</view>
<view class="b-s">
<view class="">下单时间</view>
<view class="">2024-08-09 10:44:02</view>
</view>
<view class="b-s">
<view class="">支付方式</view>
<view class="">微信</view>
</view>
<view class="b-s">
<view class="">支付时间</view>
<view class="">2024-08-09 10:45:02</view>
</view>
</view>
</view>
</view>
</template>
<script>
import request from '../../utils/request';
export default {
data() {
return {
title: '',
List: [],
pageNo: 1,
pageSize: 10,
totalPage: '',
options: {
code: 'https://qm.qq.com/cgi-bin/qm/qr?k=LKqML292dD2WvwQfAJXBUmvgbiB_TZWF&noverify=0', // 生成二维码的值
size: 300, // 460代表生成的二维码的宽高均为460rpx
},
}
},
onLoad() {
},
onPullDownRefresh() {
//下拉刷新
this.resetting() //重置方法
this.getList() //调用请求
uni.stopPullDownRefresh()
},
onReachBottom() {
// 触底加载
if (this.pageNo >= this.totalPage) {
uni.showToast({
title: '没有下一页数据',
icon: 'none'
})
} else {
this.pageNo++
this.getList()
}
},
components: {
},
methods: {
//滞空方法
resetting() {
this.pageNo = 1
this.pageSize = 10
this.totalPage = ''
this.List = []
},
// 分页——网络请求
async getList() {
uni.showLoading({
title: '加载中'
});
let res = await request({
url: '网络请求',
method: 'get',
data: {
pageNo: this.pageNo,
pageSize: this.pageSize,
}
})
if (res.code == 200) {
uni.hideLoading(); //交互反馈
if (this.pageNo != 1) {
this.List = this.ruleList.concat(res.result.records)
} else {
this.List = res.result.records
}
this.totalPage = res.result.pages
}
},
goback() {
uni.navigateBack()
}
}
}
</script>
<style scoped lang="scss">
.content {
width: 100%;
height: 100vh;
box-sizing: border-box;
background: #f4f5f6;
}
.container {
background: #f4f5f6;
box-sizing: border-box;
padding-top: 1px;
}
.box_f {
width: 95%;
border-radius: 8px;
background: #ffffff;
margin: 15px auto;
}
.box_ {
width: 95%;
border-radius: 8px;
background: #ffffff;
margin: 15px auto;
box-sizing: border-box;
padding: 10px;
text-align: center;
}
.box_top {
width: 100%;
box-sizing: border-box;
padding: 10px;
display: flex;
align-items: center;
justify-content: space-between;
font-size: 14px;
border-bottom: 1px;
border-bottom: 1px dashed #eee;
}
.box_cont {
width: 100%;
box-sizing: border-box;
padding: 10px;
display: flex;
align-items: center;
justify-content: space-between;
}
.r-bas {
width: 80%;
font-size: 12px;
}
.b-bs {
display: flex;
align-items: center;
justify-content: space-between;
}
.anniu {
width: 80px;
height: 25px;
background: #FF9655;
color: #fff;
display: flex;
align-items: center;
justify-content: center;
font-size: 14px;
border-radius: 50px;
}
.title_ {
font-weight: 600;
font-size: 16px;
color: #333333;
text-align: left;
}
.b-s {
width: 100%;
display: flex;
align-items: center;
justify-content: space-between;
margin: 10px auto;
}
.r-size {
color: #E02020;
}
</style>

63
gasStation-uni/pagesHome/myPointsOrder/myPointsOrder.vue
View File

@ -12,14 +12,27 @@
</view>
<u-empty text="积分订单" v-if="orderList.length == 0" icon="http://cdn.uviewui.com/uview/empty/list.png">
<u-empty text="您当前没有订单～" style="margin-top: 25px;" v-if="orderList.length == 0"
icon="http://47.94.122.58:83/queshengye.png">
</u-empty>
<view class="box_f">
<view class="box_f" @click="goDetails()">
<view class="box_top">
<view class="">订单号：xxxxxxxxxxxxxxxxxxxx</view>
<view class="">未使用</view>
</view>
<view class="box_cont"></view>
<view class="box_cont">
<view class="">
<image src="../../static/logo.png" style="width: 60px; height: 60px; "></image>
</view>
<view class="r-bas">
<view style="font-size: 16px;color: #333333;">虚拟产品</view>
<view class="">x1</view>
<view class="b-bs">
<view class="size1">实付： <text style="color: #E02020;">100积分</text> </view>
<view class="anniu">立即使用</view>
</view>
</view>
</view>
</view>
<!-- <view class="goods-box" v-for="(item,index) in orderList" :key="item.id" @click="orderDetails(item)">
@ -45,7 +58,7 @@
<text>确认收货</text>
</view>
</view>
</view> -->
<u-empty v-if="arrList.length == 0" mode="list" icon="http://cdn.uviewui.com/uview/empty/list.png">
@ -95,6 +108,11 @@
// this.getIntegralOrderList()
},
methods: {
goDetails() {
uni.navigateTo({
url: '/pagesHome/myPointsOrder/details'
})
},
getindex(index) {
this.actinput = index
if (index != 0) {
@ -306,5 +324,40 @@
align-items: center;
justify-content: space-between;
font-size: 14px;
border-bottom: 1px;
border-bottom: 1px dashed #eee;
}
</style>
.box_cont {
width: 100%;
box-sizing: border-box;
padding: 10px;
display: flex;
align-items: center;
justify-content: space-between;
}
.r-bas {
width: 80%;
font-size: 12px;
}
.b-bs {
display: flex;
align-items: center;
justify-content: space-between;
}
.anniu {
width: 80px;
height: 25px;
background: #FF9655;
color: #fff;
display: flex;
align-items: center;
justify-content: center;
font-size: 14px;
border-radius: 50px;
}
</style>

33
gasStation-uni/pagesHome/order/order.vue
View File

@ -7,28 +7,28 @@
<view class="my-icons"></view>
</view>
<!-- 顶部区域 -->
<scroll-view scroll-x="true" class="tap-top">
<!-- <scroll-view scroll-x="true" class="tap-top">
<view class="sz" v-for="(item,index) in tapList" :key="index" @click="transferIndex(index) ">
<view class="box" :class="{'xztap': qhindex == index}">{{item.text }}</view>
<view class="gang" v-if="qhindex == index"></view>
</view>
</scroll-view>
</scroll-view> -->
<view class="box-bai" v-if="qhindex == 0">
<view class="dis">
<!-- <uni-icons type="location-filled" size="20"></uni-icons> -->
<view class="boximg">
<image :src="logo?baseUrl+logo:'../../static/logo.png'" mode="aspectFit"></image>
<image src="../../static/imgs/telicon.png" style="width: 30px; height: 30px; "></image>
</view>
<view class="">
<view class="">{{storeName}}</view>
<view style="display: flex;align-items: center;">
<view class="">收货人姓名</view>
<view class="hui-time">
{{storeAddress}}
13583028521
</view>
</view>
</view>
<view class="">
<!-- <uni-icons type="right" size="20"></uni-icons> -->
<uni-icons type="right" size="20"></uni-icons>
</view>
</view>
<view class="box-bai" v-if="qhindex == 1" @click="goAdd()">
@ -208,7 +208,7 @@
methods: {
// 创建订单并 付款
// 创建订单并 付款
async choose() {
let _this = this
let integralOrdersList = []
@ -728,18 +728,7 @@
margin: 20px auto;
}
.boximg {
width: 40px;
height: 40px;
border-radius: 8px;
background-color: #1678ff;
margin-right: 10px;
image {
width: 100%;
height: 100%;
}
}
.boximg {}
.hui-time {
font-size: 14px;
@ -820,4 +809,4 @@
border-radius: 4px;
background: #1678ff;
}
</style>
</style>

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.7 KiB

BIN
gasStation-uni/static/new/queshengye.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 18 KiB