diff --git a/packages/shop/goods/index.css b/packages/shop/goods/index.css
index 93c9f068..a44411e3 100644
--- a/packages/shop/goods/index.css
+++ b/packages/shop/goods/index.css
@@ -111,6 +111,18 @@ image {
text-decoration: line-through;
}
+.integral{
+ float: right;
+ font-size: 26rpx;
+ color: #fff;
+ position: absolute;
+ right: 20rpx;
+ width: auto;
+ padding: 5rpx 10rpx;
+ background-color: #FF370B;
+ border-radius: 10rpx;
+}
+
.GGBox {
margin: 0 20rpx;
display: flex;
diff --git a/packages/shop/goods/index.vue b/packages/shop/goods/index.vue
index 262647d5..04e966be 100644
--- a/packages/shop/goods/index.vue
+++ b/packages/shop/goods/index.vue
@@ -28,6 +28,7 @@
/{{ currentGG.goods_unit }}
¥{{ currentGG.market_price }}
+ 可得{{ currentGG.available_points_count }}个积分
diff --git a/packages/shop/goodsSubmit/index.vue b/packages/shop/goodsSubmit/index.vue
index d4d0e168..bab8a8c0 100644
--- a/packages/shop/goodsSubmit/index.vue
+++ b/packages/shop/goodsSubmit/index.vue
@@ -382,7 +382,8 @@ export default {
receiving_phone: this.defAddress.phone,
receiving_address: this.defAddress.address + this.defAddress.house_number,
merchant_id: this.defAddress.address_id,
- goods_and_count: []
+ goods_and_count: [],
+ get_points: item.commodity_goods_info.available_points_count,
};
}
acc[supplierId].goods_and_count.push({
diff --git a/packages/shopEnter/index/index.vue b/packages/shopEnter/index/index.vue
index a2b86fa5..1ea3d242 100644
--- a/packages/shopEnter/index/index.vue
+++ b/packages/shopEnter/index/index.vue
@@ -68,8 +68,7 @@
-
上传图片
@@ -83,8 +82,7 @@
-
上传图片
@@ -98,8 +96,7 @@
-
上传图片
@@ -377,7 +374,7 @@ export default {
that.confirmClassify = ''
NavgateTo("../sucess/index")
}).catch(res => {
- if(res.message.includes("agent_nil")) {
+ if (res.message.includes("agent_nil")) {
uni.showToast({
title: '未找到对应的代理商信息',
icon: 'none',
@@ -388,21 +385,21 @@ export default {
// 省市区
getPro() {
- return request(MapApi.getArea, "POST", {}).then(res => {
+ return request(MapApi.getArea, "POST", {}, {}, false).then(res => {
this.pro = res.rows
})
},
getCity(e) {
return request(MapApi.getArea, "POST", {
parent_ad_code: e
- }).then(res => {
+ }, {}, false).then(res => {
this.city = res.rows
})
},
getBuss(e) {
return request(MapApi.getArea, "POST", {
parent_ad_code: e
- }).then(res => {
+ }, {}, false).then(res => {
this.buss = res.rows
})
},
@@ -410,7 +407,7 @@ export default {
const params = {
is_shop: 1,
}
- return request(apiArr.getMerChantCateList, "POST", params).then(res => {
+ return request(apiArr.getMerChantCateList, "POST", params, {}, false).then(res => {
this.classify = res.rows
})
},