diff --git a/api/order.js b/api/order.js
index 39d9e3d..0555284 100644
--- a/api/order.js
+++ b/api/order.js
@@ -136,9 +136,9 @@ export function payOrder(uni, paytype, from) {
* 订单核销
* @returns {*}
*/
-export function orderVerific(verify_code, is_confirm) {
+export function orderVerific(verifyCode, orderVerific) {
return request.post("order/order_verific", {
- verify_code,
- is_confirm
+ verifyCode,
+ orderVerific
});
-}
+}
diff --git a/assets/css/style.less b/assets/css/style.less
index a12adba..35ade0d 100644
--- a/assets/css/style.less
+++ b/assets/css/style.less
@@ -4414,6 +4414,8 @@ page {
.bargain .wrapper .pictxt .pictrue {
width: 1.8*100rpx;
height: 1.8*100rpx;
+ position: relative;
+
}
.bargain .wrapper .pictxt .pictrue image {
@@ -4484,7 +4486,7 @@ page {
font-size: 0.3*100rpx;
font-weight: bold;
color: #fff;
- width: 6*100rpx;
+ width: 100%;
height: 0.8*100rpx;
border-radius: 0.4*100rpx;
background-image: linear-gradient(to right, #f67a38 0%, #f11b09 100%);
diff --git a/pages/activity/DargainDetails/index.vue b/pages/activity/DargainDetails/index.vue
index 028ad76..5f832f5 100644
--- a/pages/activity/DargainDetails/index.vue
+++ b/pages/activity/DargainDetails/index.vue
@@ -369,8 +369,7 @@ export default {
var that = this;
getBargainDetail(that.bargainId)
.then(res => {
- that.$set(that, "bargain", res.data.bargain);
- that.updateTitle();
+ that.bargain = res.data.bargain;
that.datatime = that.bargain.stopTime;
that.getBargainHelpCount();
})
@@ -503,9 +502,16 @@ export default {
})
.then(() => {})
.catch(() => {
- // that.$yrouter.push({
- // path: "/pages/activity/DargainDetails/index",
- // query: { id: that.bargainId, partake: that.userInfo.uid }
+ this.$yrouter.push({
+ path: "/pages/activity/DargainDetails/index",
+ query: { id: that.bargainId, partake: that.userInfo.uid }
+ });
+ // that.$router.push({
+ // path:
+ // "/activity/dargain_detail/" +
+ // that.bargainId +
+ // "/" +
+ // that.userInfo.uid
// });
});
},
@@ -522,6 +528,7 @@ export default {
that.alreadyPrice = res.data.alreadyPrice;
that.pricePercent = res.data.pricePercent;
that.price = (that.bargain.price - that.alreadyPrice).toFixed(2);
+ console.log(that);
})
.catch(() => {
that.bargainPartake = that.userInfo.uid;
@@ -566,31 +573,32 @@ page {
background-color: #00c17b;
}
.bargainBnt_hui {
- font-size: 0.3rem;
+ font-size: 0.3*100rpx;
font-weight: bold;
color: #fff;
- width: 6rem;
- height: 0.8rem;
- border-radius: 0.4rem;
+ width: 6*100rpx;
+ height: 0.8*100rpx;
+ border-radius: 0.4*100rpx;
background: #bbb;
text-align: center;
- line-height: 0.8rem;
- margin-top: 0.32rem;
+ line-height: 0.8*100rpx;
+ margin-top: 0.32*100rpx;
}
.bargain_view {
- width: 1.8rem;
- height: 0.48rem;
+ left:0;
+ right:0;
+ height: 0.48*100rpx;
background: rgba(0, 0, 0, 0.5);
opacity: 1;
- border-radius: 0 0 0.06rem 0.06rem;
+ border-radius: 0 0 0.06*100rpx 0.06*100rpx;
position: absolute;
bottom: 0;
- font-size: 0.22rem;
+ font-size: 0.22*100rpx;
color: #fff;
text-align: center;
- line-height: 0.48rem;
+ line-height: 0.48*100rpx;
}
.iconfonts {
- font-size: 0.22rem;
+ font-size: 0.22*100rpx;
}
diff --git a/pages/activity/Poster/index.vue b/pages/activity/Poster/index.vue
index 28c7528..0c9e232 100644
--- a/pages/activity/Poster/index.vue
+++ b/pages/activity/Poster/index.vue
@@ -8,12 +8,6 @@
-
-
+
+
diff --git a/pages/orderAdmin/OrderCancellation/index.vue b/pages/orderAdmin/OrderCancellation/index.vue
index 282415c..7fdb82c 100644
--- a/pages/orderAdmin/OrderCancellation/index.vue
+++ b/pages/orderAdmin/OrderCancellation/index.vue
@@ -88,9 +88,22 @@ export default {
uni.hideLoading();
this.orderInfo = res.data;
this.iShidden = false;
+ uni.showToast({
+ title: res.msg,
+ icon: "success",
+ duration: 2000
+ });
})
- .catch(() => {
+ .catch(error => {
uni.hideLoading();
+ uni.showToast({
+ title:
+ error.msg ||
+ error.response.data.msg ||
+ error.response.data.message,
+ icon: "none",
+ duration: 2000
+ });
});
},
openQRCode: function() {
@@ -106,10 +119,9 @@ export default {
width: 100%;
height: 3 * 100rpx;
background-size: 100% 100%;
- image{
+ image {
width: 100%;
- height: 3 * 100rpx;
-
+ height: 3 * 100rpx;
}
}
@@ -133,7 +145,7 @@ export default {
.OrderCancellation .whiteBg .input input {
padding-bottom: 0.25 * 100rpx;
font-size: 0.6 * 100rpx;
- height:auto;
+ height: auto;
color: #282828;
width: 100%;
text-align: center;
diff --git a/pages/user/User/index.vue b/pages/user/User/index.vue
index c67beab..2a9b190 100644
--- a/pages/user/User/index.vue
+++ b/pages/user/User/index.vue
@@ -121,7 +121,6 @@
class="item"
:key="MyMenusIndex"
@click="goPages(MyMenusIndex)"
- v-if="item.url&&item.id!='230'"
>
diff --git a/pages/user/UserAccount/index.vue b/pages/user/UserAccount/index.vue
index 17852a7..9000191 100644
--- a/pages/user/UserAccount/index.vue
+++ b/pages/user/UserAccount/index.vue
@@ -8,7 +8,7 @@
总资产(元)
{{ now_money }}
- 充值
+
@@ -31,12 +31,12 @@
消费记录
-
+