Leadfyy.co
/
uniapp-shikongwang
11
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

样式修改 支付逻辑

master
Enzo 5 years ago
parent
86fb5931cb
commit
7a598a0395
5 changed files with 22 additions and 14 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      colorui/main.css
  2. 1
      pages/order/apply-details.vue
  3. 12
      pages/order/confirm-order.vue
  4. 15
      pages/order/index.vue
  5. 2
      pages/order/order-details.vue

6
colorui/main.css
View File

@ -455,6 +455,7 @@ radio.white.checked .uni-radio-input {
.solid, .solid,
.solid-top, .solid-top,
.solid-top1,
.solid-right, .solid-right,
.solid-bottom, .solid-bottom,
.solid-left, .solid-left,
@ -473,6 +474,7 @@ radio.white.checked .uni-radio-input {
.solid::after, .solid::after,
.solid-top::after, .solid-top::after,
.solid-top1::after,
.solid-right::after, .solid-right::after,
.solid-bottom::after, .solid-bottom::after,
.solid-left::after, .solid-left::after,
@ -509,6 +511,10 @@ radio.white.checked .uni-radio-input {
border-top: 1upx solid rgba(0, 0, 0, 0.1); border-top: 1upx solid rgba(0, 0, 0, 0.1);
} }
.solid-top1::after {
border-top: 1upx solid rgba(0, 0, 0, 0.1);
}
.solid-right::after { .solid-right::after {
border-right: 1upx solid rgba(0, 0, 0, 0.1); border-right: 1upx solid rgba(0, 0, 0, 0.1);
} }

1
pages/order/apply-details.vue
View File

@ -48,7 +48,6 @@
</view> </view>
</view> </view>
</skeleton> </skeleton>
<self-line/>
<!-- 表单 --> <!-- 表单 -->
<skeleton :loading="skeletonLoading" :row="2" :showAvatar="false" :showTitle="true"> <skeleton :loading="skeletonLoading" :row="2" :showAvatar="false" :showTitle="true">
<view class="bg-white"> <view class="bg-white">

12
pages/order/confirm-order.vue
View File

@ -2,7 +2,6 @@
<view> <view>
<!-- 商品信息 --> <!-- 商品信息 -->
<block v-if="isRight(orderDetails)"> <block v-if="isRight(orderDetails)">
<self-line/>
<view class="bg-white padding-tb-sm"> <view class="bg-white padding-tb-sm">
<skeleton :loading="skeletonLoading" :row="2" :showAvatar="false" :showTitle="true"> <skeleton :loading="skeletonLoading" :row="2" :showAvatar="false" :showTitle="true">
@ -39,7 +38,7 @@
<self-line/> <self-line/>
<skeleton :loading="skeletonLoading" :row="1" :showAvatar="false" :showTitle="true"> <skeleton :loading="skeletonLoading" :row="1" :showAvatar="false" :showTitle="true">
<view class="bg-white"> <view class="bg-white">
<view class="cu-bar padding-lr solid-bottom">
<view class="cu-bar padding-lr">
<text class="text-gray lf-font-32">优惠</text> <text class="text-gray lf-font-32">优惠</text>
<text class="lf-font-32 text-black1">暂无优惠</text> <text class="lf-font-32 text-black1">暂无优惠</text>
</view> </view>
@ -59,7 +58,7 @@
请认真阅读并同意<text @tap="$routerGo('/pages/agreement/agreement?id='+orderDetails.agreement.article_id)">《{{orderDetails.agreement.title}}》</text>，在小程序下单购买即表示您已默认同意<text @tap="$routerGo('/pages/agreement/agreement?id='+orderDetails.agreement.article_id)">《{{orderDetails.agreement.title}}》</text>的所有条款。 请认真阅读并同意<text @tap="$routerGo('/pages/agreement/agreement?id='+orderDetails.agreement.article_id)">《{{orderDetails.agreement.title}}》</text>，在小程序下单购买即表示您已默认同意<text @tap="$routerGo('/pages/agreement/agreement?id='+orderDetails.agreement.article_id)">《{{orderDetails.agreement.title}}》</text>的所有条款。
</view> </view>
</view> </view>
<view class="padding-lr padding-tb-sm bg-white flex justify-between align-center solid-top shadow">
<view class="padding-lr padding-tb-sm bg-white flex justify-between align-center shadow">
<view class="flex align-center"> <view class="flex align-center">
<text class="lf-font-28 text-gray">应付款：</text> <text class="lf-font-28 text-gray">应付款：</text>
<view class="text-red text-price lf-font-42 lf-font-bold"> <view class="text-red text-price lf-font-42 lf-font-bold">
@ -97,7 +96,8 @@
ifCheck: true, ifCheck: true,
type: 0, type: 0,
order_id: 0, order_id: 0,
ifDo: 1
ifDo: 1,
ifPay: true
} }
}, },
computed: { computed: {
@ -170,6 +170,8 @@
} }
}); });
}else { }else {
if(!this.ifPay) return;
this.ifPay = false;
if(this.type == 1){ if(this.type == 1){
this.pay(); this.pay();
return; return;
@ -188,9 +190,11 @@
signType: res.data.signType, signType: res.data.signType,
paySign: res.data.paySign, paySign: res.data.paySign,
success: (res) => { success: (res) => {
this.ifPay = true
this.$url('/pages/order/pay-success?ifSuccess=1&order_id='+this.order_id,{type: 'redirect'}) this.$url('/pages/order/pay-success?ifSuccess=1&order_id='+this.order_id,{type: 'redirect'})
}, },
fail: (err) => { fail: (err) => {
this.ifPay = true
this.$url('/pages/order/pay-success?ifSuccess=2&order_id='+this.order_id,{type: 'redirect'}) this.$url('/pages/order/pay-success?ifSuccess=2&order_id='+this.order_id,{type: 'redirect'})
}, },
}) })

15
pages/order/index.vue
View File

@ -8,7 +8,7 @@
<view class="com" v-for="(tab, tabIndex) in tab_list" v-if="tabIndex == current" :key="tab.id"> <view class="com" v-for="(tab, tabIndex) in tab_list" v-if="tabIndex == current" :key="tab.id">
<view class="flex-direction justify-around list" v-for="(item, index) in tab.list" :key="item.id" @tap="goDetails(tabIndex,index)"> <view class="flex-direction justify-around list" v-for="(item, index) in tab.list" :key="item.id" @tap="goDetails(tabIndex,index)">
<view class="lf-row-between"> <view class="lf-row-between">
<view class="left" style="position: relative;">
<view class="left" style="position: relative;display: flex;">
<image :src="item.goods.cover" mode=""></image> <image :src="item.goods.cover" mode=""></image>
<view class="cu-tag badge tag-self lf-font-28 font-400" :style="{'background-color':item.state_text.bg_color,'color':item.state_text.color}">{{item.state_text.text}}</view> <view class="cu-tag badge tag-self lf-font-28 font-400" :style="{'background-color':item.state_text.bg_color,'color':item.state_text.color}">{{item.state_text.text}}</view>
</view> </view>
@ -18,7 +18,7 @@
<text class="progress margin-right-xs">数量</text> <text class="progress margin-right-xs">数量</text>
<text class="bought">x {{item.number}}</text> <text class="bought">x {{item.number}}</text>
</view> </view>
<view class="lf-row-between price">
<view class="lf-row-between price" style="padding-right: 14rpx;">
<text class="lf-font-bold"> <text class="lf-font-bold">
<text class="lf-font-24">￥</text> <text class="lf-font-24">￥</text>
<text class="lf-font-42">{{item.selling_price}}</text> <text class="lf-font-42">{{item.selling_price}}</text>
@ -34,7 +34,7 @@
<view class="text-gray lf-font-28" style="padding: 20rpx;"> <view class="text-gray lf-font-28" style="padding: 20rpx;">
{{item.created_at_text}} {{item.created_at_text}}
</view> </view>
<view class="text-orange" v-if="item.state==1" style="padding: 20rpx;">
<view class="text-orange" v-if="item.state==1" style="padding: 20rpx 40rpx 20rpx 20rpx;">
{{item.comment_text}} {{item.comment_text}}
</view> </view>
</view> </view>
@ -227,7 +227,7 @@
.cu-btn1 { .cu-btn1 {
background-color: white!important; background-color: white!important;
color: #777!important; color: #777!important;
border: 1px solid #777;
border: 1px solid #777!important;
} }
.font-400 { .font-400 {
font-weight: 400; font-weight: 400;
@ -242,7 +242,7 @@
.title { .title {
font-size: 28rpx; font-size: 28rpx;
color: $u-content-color; color: $u-content-color;
height: 80rpx;
height: 98rpx;
} }
// tab // tab
@ -279,10 +279,10 @@
.right { .right {
overflow: hidden; overflow: hidden;
width: 64%;
width: 67%;
.title { .title {
margin: 0rpx 20rpx 10rpx 0;
margin: 0rpx 20rpx 0rpx 0;
color: #222222; color: #222222;
font-size: 32rpx; font-size: 32rpx;
} }
@ -312,7 +312,6 @@
.price { .price {
overflow: hidden; overflow: hidden;
color: #FF0000; color: #FF0000;
margin-top: 10rpx;
button { button {
width: 176rpx; width: 176rpx;
height: 60rpx; height: 60rpx;

2
pages/order/order-details.vue
View File

@ -82,7 +82,7 @@
{{orderDetails.confirm_code_text}} {{orderDetails.confirm_code_text}}
</view> </view>
</view> </view>
<view class="padding-lr padding-tb-sm bg-white flex justify-between align-center solid-top btn-bottom">
<view class="padding-lr padding-tb-sm bg-white flex justify-between align-center solid-top1 btn-bottom">
<view class="flex align-center"> <view class="flex align-center">
<text class="text-gray lf-font-28" style="margin-right: 20rpx;">实付款</text> <text class="text-gray lf-font-28" style="margin-right: 20rpx;">实付款</text>
<view class="text-red text-price lf-font-42 lf-font-bold"> <view class="text-red text-price lf-font-42 lf-font-bold">

Write Preview
Loading…
Cancel
Save