Merge branch 'master' of https://git.dayouqiantu.cn/uniapp/yshop-uniapp
This commit is contained in:
20
api/order.js
20
api/order.js
@ -97,9 +97,9 @@ export function postOrderRefund(data) {
|
||||
* 确认收货
|
||||
* @returns {*}
|
||||
*/
|
||||
export function takeOrder(orderId) {
|
||||
export function takeOrder(uni) {
|
||||
return request.post("/order/take", {
|
||||
orderId
|
||||
uni
|
||||
});
|
||||
}
|
||||
|
||||
@ -107,9 +107,9 @@ export function takeOrder(orderId) {
|
||||
* 删除订单
|
||||
* @returns {*}
|
||||
*/
|
||||
export function delOrder(orderId) {
|
||||
export function delOrder(uni) {
|
||||
return request.post("/order/del", {
|
||||
orderId
|
||||
uni
|
||||
});
|
||||
}
|
||||
|
||||
@ -125,9 +125,9 @@ export function express(params) {
|
||||
* 订单查询物流信息
|
||||
* @returns {*}
|
||||
*/
|
||||
export function payOrder(orderId, paytype, from) {
|
||||
export function payOrder(uni, paytype, from) {
|
||||
return request.post("order/pay", {
|
||||
orderId,
|
||||
uni,
|
||||
paytype,
|
||||
from
|
||||
});
|
||||
@ -136,9 +136,7 @@ export function payOrder(orderId, paytype, from) {
|
||||
* 订单核销
|
||||
* @returns {*}
|
||||
*/
|
||||
export function orderVerific(verifyCode, orderVerific) {
|
||||
return request.post("order/order_verific", {
|
||||
verifyCode,
|
||||
orderVerific
|
||||
});
|
||||
|
||||
export function orderVerific(verifyCode, isConfirm) {
|
||||
return request.post("order/order_verific", { verifyCode, isConfirm });
|
||||
}
|
||||
|
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@ -194,7 +194,7 @@ page {
|
||||
height: 0.36*100rpx;
|
||||
line-height: 0.46*100rpx;
|
||||
font-size: 0.26*100rpx;
|
||||
color:#ea3526;
|
||||
color: #ea3526;
|
||||
border-radius: 0.24*100rpx 0.03*100rpx 0.24*100rpx 0.03*100rpx;
|
||||
}
|
||||
|
||||
@ -1437,7 +1437,8 @@ page {
|
||||
width: 5.3*100rpx;
|
||||
text-align: left;
|
||||
}
|
||||
.index .wrapper .title .text-center .name{
|
||||
|
||||
.index .wrapper .title .text-center .name {
|
||||
justify-content: center;
|
||||
}
|
||||
|
||||
@ -8584,3 +8585,16 @@ page {
|
||||
.text .name .icon-shoucang {
|
||||
color: #ea3526 !important;
|
||||
}
|
||||
|
||||
rich-text {
|
||||
width: 100%;
|
||||
display: block;
|
||||
|
||||
img,
|
||||
image {
|
||||
display: block;
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
@ -196,6 +196,9 @@ export default {
|
||||
z-index: 1502;
|
||||
position: relative;
|
||||
height: 800rpx;
|
||||
padding-bottom: 0;
|
||||
padding-bottom: constant(safe-area-inset-bottom);
|
||||
padding-bottom: env(safe-area-inset-bottom);
|
||||
.cityScroll {
|
||||
height: 100%;
|
||||
}
|
||||
|
@ -369,6 +369,10 @@ export default {
|
||||
var that = this;
|
||||
getBargainDetail(that.bargainId)
|
||||
.then(res => {
|
||||
res.data.bargain = res.data.bargain.replace(
|
||||
/\<img/gi,
|
||||
'<img style="max-width:100%;height:auto;"'
|
||||
);
|
||||
that.bargain = res.data.bargain;
|
||||
that.datatime = that.bargain.stopTime / 1000;
|
||||
that.getBargainHelpCount();
|
||||
|
@ -242,6 +242,10 @@ export default {
|
||||
let id = that.$yroute.query.id;
|
||||
getCombinationDetail(id).then(res => {
|
||||
that.userCollect = res.data.userCollect;
|
||||
res.data.storeInfo.description = res.data.storeInfo.description.replace(
|
||||
/\<img/gi,
|
||||
'<img style="max-width:100%;height:auto;"'
|
||||
);
|
||||
that.$set(that, "storeInfo", res.data.storeInfo);
|
||||
that.$set(that, "imgUrls", res.data.storeInfo.sliderImageArr);
|
||||
that.$set(that, "itemNew", res.data.pinkOkList);
|
||||
|
@ -131,6 +131,10 @@ export default {
|
||||
let id = that.$yroute.query.id;
|
||||
that.datatime = parseInt(that.$yroute.query.time);
|
||||
getSeckillDetail(id).then(res => {
|
||||
res.data.storeInfo.description = res.data.storeInfo.description.replace(
|
||||
/\<img/gi,
|
||||
'<img style="max-width:100%;height:auto;"'
|
||||
);
|
||||
that.$set(that, "storeInfo", res.data.storeInfo);
|
||||
that.$set(that, "imgUrls", res.data.storeInfo.sliderImageArr);
|
||||
that.$set(that, "replyCount", res.data.replyCount);
|
||||
|
@ -129,7 +129,7 @@
|
||||
that.getIndex();
|
||||
},
|
||||
onReachBottom() {
|
||||
!that.loading && that.getIndex();
|
||||
!this.loading && this.getIndex();
|
||||
},
|
||||
methods: {
|
||||
goGoodsDeliver(item) {
|
||||
|
@ -41,12 +41,13 @@
|
||||
<view class="iconfont icon-jiantou"></view>
|
||||
</view>
|
||||
</view>
|
||||
<div class="attribute acea-row row-between-wrapper">
|
||||
<div>
|
||||
运费:<span class="atterTxt">{{ tempName }}</span>
|
||||
<div class="attribute acea-row row-between-wrapper">
|
||||
<div>
|
||||
运费:
|
||||
<span class="atterTxt">{{ tempName }}</span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<view class="attribute acea-row row-between-wrapper" @click="selecAttrTap">
|
||||
<view>
|
||||
<text>{{ attrTxt }}:</text>
|
||||
@ -274,8 +275,7 @@ export default {
|
||||
systemStore: {},
|
||||
qqmapsdk: null,
|
||||
productConClass: "product-con",
|
||||
tempName: '全国包邮'
|
||||
|
||||
tempName: "全国包邮"
|
||||
};
|
||||
},
|
||||
computed: mapGetters(["isLogin", "location"]),
|
||||
@ -354,7 +354,10 @@ export default {
|
||||
uni.showLoading({ title: "加载中", mask: true });
|
||||
getProductDetail(that.id, from)
|
||||
.then(res => {
|
||||
console.log(res);
|
||||
res.data.storeInfo.description = res.data.storeInfo.description.replace(
|
||||
/\<img/gi,
|
||||
'<img style="max-width:100%;height:auto;"'
|
||||
);
|
||||
that.$set(that, "storeInfo", res.data.storeInfo);
|
||||
// 给 attr 赋值,将请求回来的规格赋值给 attr
|
||||
that.$set(that.attr, "productAttr", res.data.productAttr);
|
||||
|
@ -313,6 +313,7 @@ export default {
|
||||
});
|
||||
return;
|
||||
}
|
||||
console.log(this.userInfo)
|
||||
if (url === "/pages/orderAdmin/OrderCancellation/index" && !this.userInfo.checkStatus) {
|
||||
uni.showToast({
|
||||
title: "您没有核销权限,请后台店员设置!!",
|
||||
|
@ -70,7 +70,7 @@ export default {
|
||||
that.getIndex();
|
||||
},
|
||||
onReachBottom() {
|
||||
!that.loading && that.getIndex();
|
||||
!this.loading && this.getIndex();
|
||||
},
|
||||
methods: {
|
||||
code: function() {
|
||||
|
@ -14,7 +14,7 @@ const dialog = {
|
||||
uni.showModal({
|
||||
title: '提示',
|
||||
content: options.mes,
|
||||
success() {
|
||||
success(res) {
|
||||
if (res.confirm) {
|
||||
opts()
|
||||
} else if (res.cancel) {}
|
||||
|
Reference in New Issue
Block a user