Browse Source

修复支付&修复样式

master
zhengshuiqi 3 years ago
parent
commit
32994e4856
  1. 2
      manifest.json
  2. 4
      pages/account/index.vue
  3. 5
      pages/account/myOrders.vue
  4. 8
      pages/account/myReview.vue
  5. 4
      pages/account/wishlist.vue
  6. 6
      pages/index/index.vue
  7. 6
      pages/productDetails/index.vue

2
manifest.json

@ -76,7 +76,7 @@
], ],
"autoSdkPermissions" : true, "autoSdkPermissions" : true,
"minSdkVersion" : 26, "minSdkVersion" : 26,
"targetSdkVersion" : 31, "targetSdkVersion" : 29,
"abiFilters" : [ "armeabi-v7a", "arm64-v8a" ] "abiFilters" : [ "armeabi-v7a", "arm64-v8a" ]
}, },
/* ios */ /* ios */

4
pages/account/index.vue

@ -535,7 +535,7 @@
align-items: center; align-items: center;
position: absolute; position: absolute;
width: 100%; width: 100%;
top: 15.5%; top: 13.5%;
// left: 15%; // left: 15%;
// z-index: 1111; // z-index: 1111;
@ -553,7 +553,7 @@
color: #F7F7F7; color: #F7F7F7;
margin-bottom: 57px; margin-bottom: 57px;
position: absolute; position: absolute;
padding: 100px 50px 0; padding: 150px 50px 0;
} }
} }

5
pages/account/myOrders.vue

@ -19,8 +19,7 @@
<!-- 已取消订单 --> <!-- 已取消订单 -->
<text v-else-if="item.order_status_code==2">cancelled</text> <text v-else-if="item.order_status_code==2">cancelled</text>
<!-- 待发货订单 --> <!-- 待发货订单 -->
<text v-else-if="item.pay_status_code==2 && item.shipping_status_code==0">To be <text v-else-if="item.pay_status_code==2 && item.shipping_status_code==0">To be shipped</text>
shipped</text>
<!-- 运输中订单 --> <!-- 运输中订单 -->
<text <text
v-else-if="item.pay_status_code==2 && item.shipping_status_code==1 || item.shipping_status_code==4">Shipped</text> v-else-if="item.pay_status_code==2 && item.shipping_status_code==1 || item.shipping_status_code==4">Shipped</text>
@ -678,7 +677,7 @@
}) })
} }
}) })
} else if (this.pay_index == 0) { } else if (this.pay_index == 1) {
let data = { let data = {
_action: 'payorder', _action: 'payorder',
order_id: this.payQuery.order_id, order_id: this.payQuery.order_id,

8
pages/account/myReview.vue

@ -131,6 +131,13 @@
} }
</style> </style>
<style lang="scss" scoped> <style lang="scss" scoped>
.reviews_item {
// height: auto !important;
// box-sizing: border-box !important;
white-space: nowrap;
height: auto !important;
width: 100%;
}
.body{ .body{
padding: 0 32rpx; padding: 0 32rpx;
} }
@ -144,6 +151,7 @@
} }
.more_delete{ .more_delete{
background-image: url(@/static/img/more_bf.png); background-image: url(@/static/img/more_bf.png);
background-repeat:no-repeat;
background-size: 100% 100%; background-size: 100% 100%;
width: 102.67rpx; width: 102.67rpx;
height: 67.33rpx; height: 67.33rpx;

4
pages/account/wishlist.vue

@ -929,14 +929,14 @@
} }
} }
.bootom_last{ .bootom_last{
height: 200rpx; height: 100rpx;
width: 100%; width: 100%;
color: #fff; color: #fff;
background-color: #000; background-color: #000;
font-size: 25rpx; font-size: 25rpx;
padding-bottom:40rpx; padding-bottom:40rpx;
line-height: 200rpx; line-height: 100rpx;
text-align: center; text-align: center;
} }

6
pages/index/index.vue

@ -57,7 +57,7 @@
isbest: 0, isbest: 0,
popImg: '', popImg: '',
countdownTime: 10, countdownTime: 10,
countdownTime2: 5, countdownTime2: 8,
popUrl: '', popUrl: '',
myMes: { myMes: {
_action: 'getmessagelist', _action: 'getmessagelist',
@ -241,7 +241,7 @@
} }
}) })
s++; s++;
}, 1); }, 5000);
// //
}, },
@ -2637,7 +2637,7 @@
opacity: 0.5; opacity: 0.5;
text-align: center; text-align: center;
position: absolute; position: absolute;
z-index: 99; z-index: 10000;
border-radius: 5rpx; border-radius: 5rpx;
} }

6
pages/productDetails/index.vue

@ -2219,9 +2219,9 @@
line-height: 50px; line-height: 50px;
text-align: center; text-align: center;
} }
uni-image { // uni-image {
margin-top: -2px !important; // margin-top: -2px !important;
} // }
/deep/.nav_left .uni-image .data-v-af9236d6{ /deep/.nav_left .uni-image .data-v-af9236d6{
background-size: 0% !important; background-size: 0% !important;
} }

Loading…
Cancel
Save