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

9.24

Browse Source
This commit is contained in:
xvv 2024-09-24 09:56:46 +08:00
parent 713e06c1e5
commit dfc84612dd
3 changed files with 44 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -87,7 +87,7 @@
我的订单
</view>
</view>
<view class="centenr-sx">
<view class="centenr-sx" @click="goPagesmy(4)">
<view class="centenr-img">
<image src="@/static/icon/icon/newmy4.png"></image>
</view>
@ -253,6 +253,11 @@
url: '/pagesHome/myPointsOrder/myPointsOrder'
})
}
if (num == 4) {
uni.navigateTo({
url: '/pagesHome/PointsMall/PointsMall'
})
}
},
// 查询全部充值订单
getAllOrderList() {

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

@ -15,9 +15,9 @@
</scroll-view> -->
<view class="box-bai" v-if="qhindex == 0">
<view class="dis">
<view class="boximg">
<image src="../../static/imgs/telicon.png" style="width: 30px; height: 30px; "></image>
<image src="../../static/imgs/telicon.png"
style="width: 30px; height: 30px;margin-right: 10px; "></image>
</view>
<view style="display: flex;align-items: center;">
<view class="">收货人姓名</view>
@ -62,7 +62,7 @@
</view>
<view class="">
<view class="">{{goodsInfo.giftName}}</view>
<view class="huyi">市场价：{{goodsInfo.market}}</view>
<view class="huyi">数量：{{value}}</view>
<view class="btwo">
<view class="">
<span
@ -73,56 +73,39 @@
v-if="goodsInfo.exchangeMethod == '金额' || goodsInfo.exchangeMethod == '积分+金额'">￥{{goodsInfo.exchangeAmount}}</span>
</view>
<view class="">
<u-number-box v-model="value" @change="valChange" button-size="18"
:disablePlus="flag"></u-number-box>
</view>
</view>
</view>
</view>
<view class="endbox">
<view style="color: #666666;font-size: 14px;">共{{value}}件商品，合计:</view>
<view v-if="allPoints>0" style="color: red;"> <text
style="font-weight: bold;font-size: 20px;">{{allPoints}}</text> 积分
</view>
<span v-if="allAmout>0 && allPoints>0">+</span>
<view v-if="allAmout>0" style="color: red;"> <text
style="font-weight: bold;font-size: 20px;">￥{{allAmout}}</text>
</view>
</view>
<view
v-if="shippingType == '物流配送' && goodsInfo.expressShippingFee == '统一运费' && goodsInfo.shippingFeeAmount && goodsInfo.shippingFeeAmount>0"
class="endbox">
<view style="color: #666666;font-size: 14px;">统一运费: </view>
<view style="color: red;"> <text
style="font-weight: bold;font-size: 18px;">￥{{goodsInfo.shippingFeeAmount}}</text>
</view>
</view>
</view>
</view>
<view class="beizhu">
<view style="margin-right: 15px;">备注</view>
<view style="margin-right: 15px;">订单备注</view>
<input type="text" placeholder="选填,请输入备注信息" />
</view>
<view class="bottom-box">
<view class="">
<view style="color: red;">
<text v-if="allPoints>0" style="font-weight: bold;font-size: 20px;">{{allPoints}}</text> 积分
<span v-if="allAmout>0 && allPoints>0">+</span>
<text v-if="allAmout>0" style="font-weight: bold;font-size: 20px;">￥{{allAmout}}</text>
</view>
<view style="color: #9d9d9d; font-size: 12px; ">积分账户{{myPoints}}</view>
</view>
<view @click="choose()" class="andeniu">
<text>兑换</text>
</view>
</view>
</view>
<view class="bottom-box">
<view class="">
<view style="font-weight: 600;font-size: 20px;color: #FA6400;">
<text v-if="allPoints>0" style="font-weight: bold;font-size: 20px;">{{allPoints}}</text> 积分
<span v-if="allAmout>0 && allPoints>0">+</span>
<text v-if="allAmout>0" style="font-weight: bold;font-size: 20px;">￥{{allAmout}}</text>
</view>
<!-- <view style="color: #9d9d9d; font-size: 12px; ">积分账户{{myPoints}}</view> -->
</view>
<view @click="choose()" class="andeniu">
<text>立即支付</text>
</view>
</view>
</view>
</view>
</template>
@ -757,7 +740,7 @@
width: 100%;
display: flex;
align-items: center;
justify-content: flex-end;
}
.btwo {
@ -806,7 +789,7 @@
align-items: center;
justify-content: center;
color: #ffffff;
border-radius: 4px;
background: #1678ff;
border-radius: 50px;
background: #FF9655;
}
</style>

11
gasStation-uni/pagesMy/fleetInfo/fund.vue
View File

@ -8,7 +8,7 @@
</view>
</view>
<view v-if="type==0">
<view class="card_box">
<view class="card_box c-url">
<view style="margin: 13px 0px;">可用余额（元）</view>
<view class="r-num">1299.00</view>
@ -260,14 +260,19 @@
.card_box {
width: 100%;
height: 90px;
background: url('../../static/imgs/zj.png') no-repeat;
background-size: 100% 100%;
box-sizing: border-box;
padding: 10px;
color: #fff;
font-size: 14px;
}
.c-url {
background: url('../../static/imgs/jf.png') no-repeat;
background-size: 100% 100%;
}
.r-size {
width: 100%;
display: flex;