Browse Source

【优化】 个人中心电话样式修改 订单状态按钮修改 支付状态按钮修改 订单和首页图片显示格式修改

dev
Enzo 5 years ago
parent
commit
1997a3ec80
  1. 2
      manifest.json
  2. 2
      pages/contactService/index.vue
  3. 2
      pages/index/index.vue
  4. 4
      pages/order/confirm-atonce.vue
  5. 21
      pages/order/confirm-order.vue
  6. 8
      pages/order/index.vue
  7. 8
      pages/order/order-details.vue
  8. 6
      pages/order/pay-success.vue
  9. 1
      pages/order/unpay-details.vue

2
manifest.json

@ -62,7 +62,7 @@
"quickapp" : {},
/* */
"mp-weixin" : {
"appid" : "wxb35ef055a4dd8ad4",
"appid" : "wx1031981885c80917",
"setting" : {
"urlCheck" : false,
"postcss" : true,

2
pages/contactService/index.vue

@ -10,7 +10,7 @@
</view>
<view class="lf-row-between item" @click="makePhoneCall">
<view class="lf-color-gray">客服电话</view>
<view>{{ info.phone }}</view>
<view style="color: #1E89FF!important;">{{ info.phone }}</view>
</view>
<view class="lf-row-between item">
<view class="lf-color-gray">联系地址</view>

2
pages/index/index.vue

@ -6,7 +6,7 @@
<view class="com" v-for="(tab, tabIndex) in tab_list" v-if="tabIndex == current" :key="tab.id">
<view class="lf-row-between list" v-for="(item, index) in tab.list" :key="item.id" @click="toDetail(item)">
<view class="left">
<image :src="item.cover" mode="aspectFit"></image>
<image :src="item.cover" mode="aspectFill"></image>
</view>
<view class="right">
<view class="lf-line-2 title">{{ item.name }}</view>

4
pages/order/confirm-atonce.vue

@ -111,9 +111,8 @@
this.order_id = e.order_id;
this.goods_specs_id = e.goods_specs_id
this.num = e.order_number
if(this.goods_id && this.goods_specs_id) {
if(this.goods_id && this.goods_specs_id && this.order_id) {
this.getConfirmOrder()
this.submit()
}
},
@ -189,7 +188,6 @@
});
},
pay(){
console.log("this.order_id", this.order_id)
this.$http(this.API.API_PAYMENT_DIRECT, {order_id: this.order_id}).then(res => {
this.order_id = res.data.order_id
uni.requestPayment({

21
pages/order/confirm-order.vue

@ -8,7 +8,7 @@
<view class="flex justify-between align-start padding-top-sm padding-lr">
<image :src="orderDetails.goods.cover" mode="aspectFill" style="width: 240rpx; height: 240rpx;border-radius: 10rpx;"></image>
<view class="flex-sub padding-left-sm">
<view class="bref-box margin-top-xs lf-font-32 lf-font-bold" style="height: 88rpx;line-height: 44rpx;color: #222;">
<view class="bref-box lf-font-32 lf-font-bold" style="height: 88rpx;line-height: 44rpx;color: #222;">
{{orderDetails.goods.name}}
</view>
<view class="flex justify-between align-center text-center">
@ -66,7 +66,8 @@
{{ total(num, orderDetails.goods.specs[0].selling_price) }}
</view> -->
</view>
<button class="cu-btn block bg-orange round shadow" @tap="submit">
<button class="btn" @tap="submit">
<text class="lf-font-32 text-white" v-if="type == 1">立即付款</text>
<text class="lf-font-32 text-white" v-else>下单付款</text>
</button>
@ -132,7 +133,7 @@
methods: {
changeNum(num) {
if(num > this.limit) {
this.$msg('该商品限购数量'+this.limit)
this.$msg('该商品限购'+this.limit+'件')
this.num = this.limit
return
}else if(num < 1) {
@ -155,7 +156,7 @@
if(this.num < this.limit) {
this.num++
}else {
this.$msg('该商品限购数量'+this.limit)
this.$msg('该商品限购'+this.limit+'件')
this.num = this.limit
return
}
@ -229,7 +230,6 @@
}
},
pay(){
console.log("this.order_id", this.order_id)
this.$http(this.API.API_PAYMENT_DIRECT, {order_id: this.order_id}).then(res => {
this.order_id = res.data.order_id
uni.requestPayment({
@ -267,6 +267,17 @@
</script>
<style lang="scss" scoped>
.btn{
margin: 0;
padding: 0;
width: 208rpx;
height: 80rpx;
background-color: #FE9903;
color: #FFFFFF;
line-height: 80rpx;
font-size: 32rpx;
border-radius: 42rpx;
}
.bref-box {
text-overflow: -o-ellipsis-lastline;
overflow: hidden;

8
pages/order/index.vue

@ -8,7 +8,7 @@
<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="left" style="position: relative;display: flex;">
<image :src="item.goods.cover" mode=""></image>
<image :src="item.goods.cover" mode="aspectFill"></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>
<view class="right">
@ -19,9 +19,9 @@
</view>
<view class="lf-row-between price" style="padding-right: 6rpx;">
<lf-price :price="item.selling_price" style="margin-top: 10rpx;" />
<button v-if="item.state==1" class="lf-font-28" @tap.stop="$routerGo('/pages/order/confirm-atonce?type=1&goods_id='+item.goods_id+'&goods_specs_id='+item.goods_specs_id +'&order_id='+ item.id+'&order_number='+item.number)">立即付款</button>
<button v-if="item.state==2" class="cu-btn bg-green round margin-left-sm lf-font-28" @tap.stop="$routerGo('/pages/order/order-details?order_id='+item.id)">立即使用</button>
<button v-if="item.state==4" class="cu-btn1 border round margin-left-sm lf-font-28">等待审核</button>
<button v-if="item.state==1" class="lf-font-28" style="border-radius: 30rpx;" @tap.stop="$routerGo('/pages/order/confirm-atonce?type=1&goods_id='+item.goods_id+'&goods_specs_id='+item.goods_specs_id +'&order_id='+ item.id+'&order_number='+item.number)">立即付款</button>
<button v-if="item.state==2" style="border-radius: 30rpx;" class="cu-btn bg-green round margin-left-sm lf-font-28" @tap.stop="$routerGo('/pages/order/order-details?order_id='+item.id)">立即使用</button>
<button v-if="item.state==4" class="cu-btn1 border margin-left-sm lf-font-28" style="border-radius: 30rpx;">等待审核</button>
</view>
</view>
</view>

8
pages/order/order-details.vue

@ -17,7 +17,8 @@
<view>
<button v-if="orderDetails.state == 2" class="cu-btn line-orange text-orange round margin-left-sm lf-font-28" @tap="$routerGo('/pages/order/apply-refund?order_id='+orderDetails.id)">申请退款</button>
<button v-if="orderDetails.state == 1" class="cu-btn line-orange text-orange round margin-left-sm lf-font-28" @tap.stop="$routerGo('/pages/order/confirm-atonce?type=1&goods_id='+orderDetails.goods_id+'&goods_specs_id='+orderDetails.goods_specs_id +'&order_id='+ orderDetails.id+'&order_number='+orderDetails.number)">立即付款</button>
<button v-if="orderDetails.state != 1 && orderDetails.state != 2" class="cu-btn1 border round margin-left-sm lf-font-28">{{orderDetails.state_text.text}}</button>
<button v-if="orderDetails.state == 3" class="cu-btn1 margin-left-sm lf-font-28" style="width: 176rpx;height: 60rpx;line-height: 60rpx;border-radius: 30rpx;background: none;border: 1px solid #1E89FF;color: #1E89FF;">{{orderDetails.state_text.text}}</button>
<button v-if="orderDetails.state != 1 && orderDetails.state != 2 && orderDetails.state != 3" class="cu-btn1 border round margin-left-sm lf-font-28 text-gray" style="width: 176rpx;height: 60rpx;line-height: 60rpx;border-radius: 30rpx;background: none;">{{orderDetails.state_text.text}}</button>
</view>
</view>
</view>
@ -69,11 +70,14 @@
<view class="lf-font-32 text-black1">{{checkArea}} <text style="position: relative;left: 216rpx;top: -42rpx;display: inherit;" v-if="orderDetails.state == 2" class="text-orange lf-font-28" @tap="copy(checkArea)">复制</text></view>
</view>
<view v-if="orderDetails.state == 5 || orderDetails.state == 6" style="margin-top: 46rpx;" class="text-gray lf-font-28">
{{orderDetails.refund_text}}
已使用
</view>
<view v-else style="margin-top: 10rpx;" class="text-gray lf-font-28">
{{orderDetails.refund_text}}
</view>
<view v-if="orderDetails.state == 3" style="margin-top: 46rpx;" class="text-gray lf-font-28">
已使用
</view>
<view style="margin-top: 10rpx;">
<view class="text-green lf-font-32" v-if="orderDetails.state == 2">
{{orderDetails.confirm_code_text}}

6
pages/order/pay-success.vue

@ -21,12 +21,12 @@
<view class="margin-top flex flex-direction justify-around">
<view class="padding-top padding-lr-lg">
<button class="cu-btn block bg-orange lg margin-top round" @tap="$url('/pages/order/order-details?order_id='+order_id,{type: 'launch'})">
<text class="text-df text-white">查看订单</text>
<text class="lf-font-32 text-white">查看订单</text>
</button>
</view>
<view class="padding-top-sm padding-lr-lg">
<button class="cu-btn block bg-white border lg margin-top round" @tap="$url('/pages/index/index',{type: 'switch'})">
<text class="text-df text-black">返回首页</text>
<button class="cu-btn block bg-white lg margin-top round" style="border: 1px solid #555;" @tap="$url('/pages/index/index',{type: 'switch'})">
<text class="lf-font-32" style="color: #555!important;">返回首页</text>
</button>
</view>
</view>

1
pages/order/unpay-details.vue

@ -2,7 +2,6 @@
<view>
<!-- 商品信息 -->
<block v-if="isRight(orderDetails)">
<self-line/>
<view class="bg-white">
<skeleton :loading="skeletonLoading" :row="2" :showAvatar="false" :showTitle="true">

Loading…
Cancel
Save