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

Merge branch 'master' of http://8.134.10.79:3000/Leadfyy.co/uniapp-shikongwang

master
邓平艺 4 years ago
parent
2f72647b0e 7a598a0395
commit
3e8048c124
8 changed files with 48 additions and 28 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. 14
      colorui/main.css
  2. 2
      components/me-tabs/me-tabs.vue
  3. 12
      pages/order/apply-details.vue
  4. 2
      pages/order/apply-refund.vue
  5. 14
      pages/order/confirm-order.vue
  6. 21
      pages/order/index.vue
  7. 6
      pages/order/order-details.vue
  8. 5
      pages/order/unpay-details.vue

14
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);
} }
@ -3396,7 +3402,7 @@ scroll-view.cu-steps .cu-item {
float: right; float: right;
} }
.border { .border {
border: 1px solid #ccc;
border: 1px solid #777!important;
} }
/* ================== /* ==================
@ -3465,7 +3471,7 @@ scroll-view.cu-steps .cu-item {
.line-gray::after, .line-gray::after,
.lines-gray::after { .lines-gray::after {
border-color: #aaaaaa;
border-color: #777777!important;
} }
.line-black::after, .line-black::after,
@ -3559,7 +3565,7 @@ scroll-view.cu-steps .cu-item {
.bg-white { .bg-white {
background-color: #ffffff; background-color: #ffffff;
color: #666666;
color: #777;
} }
.bg-shadeTop { .bg-shadeTop {
@ -3980,7 +3986,7 @@ scroll-view.cu-steps .cu-item {
.text-gray, .text-gray,
.line-gray, .line-gray,
.lines-gray { .lines-gray {
color: #777777;
color: #777777!important;
} }
.text-black, .text-black,

2
components/me-tabs/me-tabs.vue
View File

@ -145,7 +145,7 @@
} }
.tabs-item { .tabs-item {
margin-left: 4rpx;
margin:0 4rpx;
border-radius: 16px; border-radius: 16px;
display: flex; display: flex;
position: relative; position: relative;

12
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">
@ -68,7 +67,7 @@
<view class="padding-lr bg-white" style="padding-top: 30rpx;"> <view class="padding-lr bg-white" style="padding-top: 30rpx;">
<view class="cu-self menu"> <view class="cu-self menu">
<view class="text-gray lf-font-28"> <view class="text-gray lf-font-28">
由于产品的特殊性，在申请的过程中，供应商会向您收取部分费用。如有疑问可参与产品的<text class="text-orange">《{{checkArea}}》</text>或咨询客服
由于产品的特殊性，在申请的过程中，供应商会向您收取部分费用。如有疑问可参与产品的<text @tap="$routerGo('/pages/agreement/agreement?id='+checkAreaId)" class="text-orange">《{{checkArea}}》</text>或咨询客服
</view> </view>
</view> </view>
</view> </view>
@ -80,11 +79,14 @@
<view class="cu-self menu"> <view class="cu-self menu">
<view class="lf-font-32 text-black1">退款说明</view> <view class="lf-font-32 text-black1">退款说明</view>
</view> </view>
<view class="cu-self menu" style="margin-top: 20rpx;padding-bottom: 20rpx;border-bottom: 1px solid #F5F5F5;">
<view class="cu-self menu" style="margin-top: 20rpx;padding-bottom: 20rpx;border-bottom: 1px solid #F5F5F5;" v-if="images.length == 0">
<view class="text-gray lf-font-32">{{orderDetails.comment}}</view>
</view>
<view class="cu-self menu" style="margin-top: 20rpx;" v-else>
<view class="text-gray lf-font-32">{{orderDetails.comment}}</view> <view class="text-gray lf-font-32">{{orderDetails.comment}}</view>
</view> </view>
</view> </view>
<view class="cu-form-group">
<view class="cu-form-group solid-bottom" style="padding-bottom: 20rpx;" v-if="images.length != 0">
<view class="grid col-4 grid-square flex-sub"> <view class="grid col-4 grid-square flex-sub">
<view style="width: 212rpx;height: 212rpx;border-radius: 10rpx;" class="bg-img" v-for="(item,index) of images" :key="index"> <view style="width: 212rpx;height: 212rpx;border-radius: 10rpx;" class="bg-img" v-for="(item,index) of images" :key="index">
<image :src="item.path" @tap="showImg(item.path)" style="width: 216rpx;height: 216rpx;" mode="aspectFill"></image> <image :src="item.path" @tap="showImg(item.path)" style="width: 216rpx;height: 216rpx;" mode="aspectFill"></image>
@ -111,6 +113,7 @@
order_id:1, order_id:1,
orderDetails: {}, orderDetails: {},
checkArea: '', checkArea: '',
checkAreaId: 1,
images: [] images: []
} }
}, },
@ -130,6 +133,7 @@
this.orderDetails = res.data.refund this.orderDetails = res.data.refund
this.checkArea = res.data.agreement.title this.checkArea = res.data.agreement.title
this.images = res.data.refund.images this.images = res.data.refund.images
this.checkAreaId = res.data.agreement.article_id
this.skeletonLoading = false this.skeletonLoading = false
} }

2
pages/order/apply-refund.vue
View File

@ -67,7 +67,7 @@
<view class="padding-top padding-lr bg-white"> <view class="padding-top padding-lr bg-white">
<view class="cu-self menu"> <view class="cu-self menu">
<view class="text-gray lf-font-28"> <view class="text-gray lf-font-28">
由于产品的特殊性，在申请的过程中，供应商会向您收取部分费用。如有疑问可参与产品的<text class="text-orange">《{{applyDetails.agreement.title}}》</text>或咨询客服
由于产品的特殊性，在申请的过程中，供应商会向您收取部分费用。如有疑问可参与产品的<text class="text-orange" @tap="$routerGo('/pages/agreement/agreement?id='+applyDetails.agreement.article_id)">《{{applyDetails.agreement.title}}》</text>或咨询客服
</view> </view>
</view> </view>
</view> </view>

14
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>
@ -56,10 +55,10 @@
</view> </view>
</checkbox-group> </checkbox-group>
<view class="lf-font-24 text-gray"> <view class="lf-font-24 text-gray">
请认真阅读并同意<text>《{{orderDetails.agreement.title}}》</text>，在小程序下单购买即表示您已默认同意<text>《{{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">
@ -100,7 +99,8 @@
ifCheck: true, ifCheck: true,
type: 0, type: 0,
order_id: 0, order_id: 0,
ifDo: 1
ifDo: 1,
ifPay: true
} }
}, },
computed: { computed: {
@ -177,6 +177,8 @@
} }
}); });
}else { }else {
if(!this.ifPay) return;
this.ifPay = false;
if(this.type == 1){ if(this.type == 1){
this.pay(); this.pay();
return; return;
@ -195,9 +197,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'})
}, },
}) })

21
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,13 +18,14 @@
<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>
</text> </text>
<button v-if="item.state==1" @tap.stop="$routerGo('/pages/order/confirm-order?type=1&goods_id='+item.goods_id+'&goods_specs_id='+item.goods_specs_id +'&order_id='+ item.id)">立即付款</button> <button v-if="item.state==1" @tap.stop="$routerGo('/pages/order/confirm-order?type=1&goods_id='+item.goods_id+'&goods_specs_id='+item.goods_specs_id +'&order_id='+ item.id)">立即付款</button>
<button v-if="item.state==2" class="cu-btn bg-green round margin-left-sm" @tap="$routerGo('/pages/order/order-details?order_id='+item.id)">立即使用</button> <button v-if="item.state==2" class="cu-btn bg-green round margin-left-sm" @tap="$routerGo('/pages/order/order-details?order_id='+item.id)">立即使用</button>
<button v-if="item.state==4" class="cu-btn1 border round margin-left-sm">等待审核</button>
</view> </view>
</view> </view>
</view> </view>
@ -33,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>
@ -223,6 +224,11 @@
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.cu-btn1 {
background-color: white!important;
color: #777!important;
border: 1px solid #777!important;
}
.font-400 { .font-400 {
font-weight: 400; font-weight: 400;
} }
@ -236,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
@ -254,7 +260,7 @@
.list { .list {
border-radius: 10rpx; border-radius: 10rpx;
overflow: hidden; overflow: hidden;
margin: 20rpx 32rpx;
margin: 30rpx 32rpx;
background-color: #FFFFFF; background-color: #FFFFFF;
// box-shadow: 0 0 10px 5px #e5e5e5; // box-shadow: 0 0 10px 5px #e5e5e5;
box-shadow: 0 10rpx 20rpx 0 rgba(0, 0, 0, 0.1); box-shadow: 0 10rpx 20rpx 0 rgba(0, 0, 0, 0.1);
@ -273,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;
} }
@ -306,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;

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

@ -46,7 +46,7 @@
<text class="text-gray lf-font-32">付款时间</text> <text class="text-gray lf-font-32">付款时间</text>
<text class="lf-font-32 text-black1">{{orderDetails.payment_at_text}}</text> <text class="lf-font-32 text-black1">{{orderDetails.payment_at_text}}</text>
</view> </view>
<view class="cu-bar padding-lr solid-bottom" v-if="orderDetails.payment_type != ''">
<view class="cu-bar padding-lr" v-if="orderDetails.payment_type != ''">
<text class="text-gray lf-font-32">支付方式</text> <text class="text-gray lf-font-32">支付方式</text>
<text class="lf-font-32 text-black1">{{orderDetails.payment_type}}</text> <text class="lf-font-32 text-black1">{{orderDetails.payment_type}}</text>
</view> </view>
@ -54,7 +54,7 @@
<self-line/> <self-line/>
<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" v-if="orderDetails.coupons == null">暂无优惠</text> <text class="lf-font-32 text-black1" v-if="orderDetails.coupons == null">暂无优惠</text>
</view> </view>
@ -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">

5
pages/order/unpay-details.vue
View File

@ -48,7 +48,7 @@
<text class="text-gray lf-font-32">付款时间</text> <text class="text-gray lf-font-32">付款时间</text>
<text class="lf-font-32 text-black1">{{orderDetails.payment_at_text}}</text> <text class="lf-font-32 text-black1">{{orderDetails.payment_at_text}}</text>
</view> </view>
<view class="cu-bar padding-lr solid-bottom" v-if="orderDetails.payment_type != ''">
<view class="cu-bar padding-lr" v-if="orderDetails.payment_type != ''">
<text class="text-gray lf-font-32">支付方式</text> <text class="text-gray lf-font-32">支付方式</text>
<text class="lf-font-32 text-black1">{{orderDetails.payment_type}}</text> <text class="lf-font-32 text-black1">{{orderDetails.payment_type}}</text>
</view> </view>
@ -56,11 +56,12 @@
<self-line/> <self-line/>
<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" v-if="orderDetails.coupons == null">暂无优惠</text> <text class="lf-font-32 text-black1" v-if="orderDetails.coupons == null">暂无优惠</text>
</view> </view>
</view> </view>
<self-line/>
</skeleton> </skeleton>
</block> </block>
</view> </view>

Write Preview
Loading…
Cancel
Save