diff --git a/pages.json b/pages.json
index ffbacaab..fac0f28a 100644
--- a/pages.json
+++ b/pages.json
@@ -148,7 +148,8 @@
{
"path": "index",
"style": {
- "navigationBarTitleText": "优惠券"
+ "navigationBarTitleText": "优惠券",
+ "navigationBarBackgroundColor": "#ffffff"
}
}
]
diff --git a/pages/homeFn/myCoupon/index.vue b/pages/homeFn/myCoupon/index.vue
index 4b1dbb19..30ce7fe2 100644
--- a/pages/homeFn/myCoupon/index.vue
+++ b/pages/homeFn/myCoupon/index.vue
@@ -1,144 +1,58 @@
-
-
-
+
+
+
+ {{ item.label }}
+
+
-
-
-
-
-
-
-
-
-
- ¥
- {{ item.UseAmount }}
-
-
- {{ item.CouponPoint }}积分兑换
-
-
- {{
- item.WithAmount > 0
- ? "满" + item.WithAmount + "可用"
- : "无门槛使用"
- }}
-
-
-
-
-
{{ item.CouponName }}
-
- 有效期至{{ item.EndTime }}
- 活动至{{ item.EndTime }}
-
-
+
+
+
+
+
+ ¥
+ {{ item.UseAmount }}
+
-
- 点击领取
+ {{ item.CouponPoint }}积分兑换
+ {{
+ item.WithAmount > 0
+ ? "满" + item.WithAmount + "可用"
+ : "无门槛使用"
+ }}
+
-
-
-
-
-
-
-
+
+
+ {{ item.CouponName }}
+ 有效期至{{ item.EndTime }}
+ 活动至{{ item.EndTime }}
+
+ 使用规则
+
+
+
+
+ 去使用
+ 已使用
+ 已过期
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
- ¥
- {{ item.UseAmount }}
-
-
- {{ item.CouponPoint }}积分兑换
-
-
- {{
- item.WithAmount > 0
- ? "满" + item.WithAmount + "可用"
- : "无门槛使用"
- }}
-
-
-
-
-
{{ item.CouponName }}
-
- 有效期至{{ item.EndTime }}
- 活动至{{ item.EndTime }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+ {{ item.PayMethodText }}
+
+
+
+
+
+
+
@@ -162,6 +76,10 @@ export default {
specialCards: [], // 专享券
novalid: [],
isCustomLoading: false,
+ tabList: [{ label: "未使用", value: 1 }, { label: "已使用", value: 2 }, { label: "已过期", value: 3 }],// tab的列表
+ selectTab: 1,
+ allCouponList: [],// 全部类型的 列表
+ showCouponList: [],// 当前显示的列表
};
},
computed: {
@@ -173,10 +91,58 @@ export default {
components: {
NoData,
},
+ onUnload() {
+ this.novalid = [];
+ this.couponList = [];
+ this.pageMsg.isLoading = true;
+ this.pageMsg.activeTabs = 0;
+ },
+ // onHide () {
+ // this.couponOrder = {}
+ // this.couponList = []
+ // this.novalid = []
+ // },
+ onShow() {
+ // this.getList();
+ },
+ async onLoad(option) {
+ await this.handleGetData()
+ // this.setIsLoading(true)
+ // this.getUnList();
+ // this.$utils.addUserBehaviorNew();
+ },
+ // onReachBottom() {
+ // if (this.pageMsg.isLoadMore) {
+ // this.pageMsg.pageIndex += 1;
+ // this.getList();
+ // }
+ // },
+ // onPullDownRefresh() {
+ // this.pageMsg.pageIndex = 1;
+ // this.getList();
+ // this.getUnList();
+ // setTimeout(function () {
+ // uni.stopPullDownRefresh();
+ // }, 1000);
+ // },
methods: {
...mapMutations({
setIsLoading: "setIsLoading",
}),
+ // 修改 是否显示规则
+ handleShowRule(item) {
+ item.showRule = !item.showRule
+ this.$forceUpdate();
+ },
+ // 修改顶部的tab选择
+ handleChangeTab(value) {
+ this.selectTab = value
+ this.showCouponList = this.allCouponList[this.selectTab - 1]
+
+ console.log('this.showCouponList', this.showCouponList.length);
+
+ this.$forceUpdate();
+ },
handleGoCouponsList(obj) {
console.log('obj', obj);
// uni.navigateTo({
@@ -205,10 +171,41 @@ export default {
});
},
+ async handleGetData() {
+ const req = {
+ CouponStatus: "0,1,2"
+ }
+ const data = await this.$api.$get("/WeChat/GetMemberCouponList", req)
+ console.log('data', data);
+
+ let list = data.Result_Data.List
+
+ // 待使用
+ let toBeUsed = []
+ // 已使用
+ let usedAlready = []
+ // 已失效
+ let expired = []
+ if (list && list.length > 0) {
+ list.forEach((item) => {
+ item.showRule = false
+ if (item.CouponState === 0) {
+ toBeUsed.push(item)
+ } else if (item.CouponState === 1) {
+ usedAlready.push(item)
+ } else if (item.CouponState === 2) {
+ expired.push(item)
+ }
+ })
+ }
+
+ this.allCouponList = [toBeUsed, usedAlready, expired]
+ this.showCouponList = this.allCouponList[this.selectTab - 1]
+ },
getList() {
let _this = this;
this.$api
- .$get("/WeChat/GetMemberCouponList", { CouponStatus: 0 })
+ .$get("/WeChat/GetMemberCouponList", { CouponStatus: 0 }) // 未使用
.then((rs) => {
_this.pageMsg.isLoading = false;
if (rs.Result_Code === 100) {
@@ -229,494 +226,239 @@ export default {
this.isCustomLoading = true;
let _this = this;
_this.$api
- .$get("/WeChat/GetMemberCouponList", { CouponStatus: "1,2" })
+ .$get("/WeChat/GetMemberCouponList", { CouponStatus: "1,2" }) // 已使用、已过期
.then((rs) => {
if (rs.Result_Code === 100) {
+ console.log('rsrsrsrsrsrsrs', rs);
+
_this.novalid = rs.Result_Data.List;
}
_this.isCustomLoading = false;
});
},
},
- onUnload() {
- this.novalid = [];
- this.couponList = [];
- this.pageMsg.isLoading = true;
- this.pageMsg.activeTabs = 0;
- },
- // onHide () {
- // this.couponOrder = {}
- // this.couponList = []
- // this.novalid = []
- // },
- onShow() {
- this.getList();
- },
- onLoad(option) {
- // this.setIsLoading(true)
- this.getUnList();
- this.$utils.addUserBehaviorNew();
- },
- onReachBottom() {
- if (this.pageMsg.isLoadMore) {
- this.pageMsg.pageIndex += 1;
- this.getList();
- }
- },
- onPullDownRefresh() {
- this.pageMsg.pageIndex = 1;
- this.getList();
- this.getUnList();
- setTimeout(function () {
- uni.stopPullDownRefresh();
- }, 1000);
- },
};
-
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 104b7a83..7ddb1523 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -72,6 +72,7 @@
}}
营业中
+ 爆满
@@ -560,7 +561,11 @@ export default {
// this.getLocalServer();
if (currentService) {
- this.serviceDetail = this.handleMergeDetail(currentService);
+ let res = this.handleMergeDetail(currentService);
+ this.serviceDetail = {
+ ...this.serviceDetail,
+ ...res
+ }
console.log('onLoad', this.serviceDetail);
} else {
@@ -1430,6 +1435,7 @@ export default {
this.serverPartList = data.Result_Data.List;
let nearService = this.serverPartList[0];
+ console.log('nearServicenearServicenearService', nearService);
nearService.sumDetail = this.handleMergeDetail(nearService);
this.serviceDetail = nearService;
@@ -1871,6 +1877,21 @@ export default {
border-radius: 4rpx;
display: inline-block;
}
+
+ .bePacked {
+ font-family: PingFangSC, PingFang SC;
+ font-weight: 400;
+ font-size: 22rpx;
+ color: #FF5959;
+ line-height: 32rpx;
+ text-align: justify;
+ font-style: normal;
+ padding: 2rpx 6rpx;
+ background: #fbdada;
+ border-radius: 4rpx;
+ display: inline-block;
+ margin-left: 16rpx;
+ }
}
}
diff --git a/pages/order/buyOrder/index.vue b/pages/order/buyOrder/index.vue
index 8737768e..c664b353 100644
--- a/pages/order/buyOrder/index.vue
+++ b/pages/order/buyOrder/index.vue
@@ -18,31 +18,35 @@
- {{ item.label }}
-
+
+ {{ item.label }}
+
+
+ :style="{ height: `calc(100vh - ${menu.bottom}px - 42px - 35px - 35px)` }" @scrolltolower="handleScrollTolower">
- {{ item.SUPPLIER_NAME || "" }}
+ {{ item.SHOPNAME || "" }}
{{ item.SALEBILL_STATE_TEXT || "" }}
-
+
+ :src="subItem.IMAGE_URL ? subItem.IMAGE_URL.split(',')[0] : 'https://eshangtech.com/ShopICO/no-picture.png'" />
@@ -50,30 +54,46 @@
- ¥180.88
- x1
+ ¥{{ subItem.AVERAGE_PRICE || '-' }}
+ x{{ subItem.ORDER_COUNT || '-' }}
+
+
![]()
+ 共{{ item.GOODSList.length }}个品项
+
+
实付款:
¥{{ item.PAY_AMOUNT || "" }}
-
+
- 更多
+ 更多
评价
- 再次购买
+
+ 去付款
+ 确认收货
+
+
+ 我是有底线的
+
@@ -191,6 +211,60 @@ export default {
this.$utils.addUserBehaviorNew();
},
methods: {
+ // 确认收获
+ handleConfirmReceipt(obj) {
+ console.log('obj', obj);
+
+ let _this = this
+ uni.showModal({
+ title: '提示',
+ content: '确认已收货?',
+ success: async function (res) {
+ if (res.confirm) {
+ const req = {
+ action_type: "UpdateOrderState",
+ action_data: obj.SALEBILL_ID,
+ saleBillChildId: obj.SALEBILL_CHILD_ID || "",
+ SALEBILL_STATE: 3000,
+ }
+ const data = await _this.$api.getCoop(req)
+ console.log('data', data);
+ if (data.error !== 1) {
+ uni.showToast({
+ title: data.msg,
+ icon: 'none'
+ })
+ } else {
+ uni.showToast({
+ title: "收货成功!",
+ icon: 'none'
+ })
+ let type =
+ _this.currentTab === 1
+ ? "1005,1010,2010,3000,8000,8010,8020,8900,8999,9000,9999"
+ : _this.currentTab === 2
+ ? "1005"
+ : _this.currentTab === 3
+ ? "1010,2000"
+ : _this.currentTab === 4
+ ? "2010"
+ : _this.currentTab === 5
+ ? ""
+ : "";
+ _this.handleGetOrderList(type);
+ }
+
+ } else if (res.cancel) {
+ }
+ }
+ });
+ },
+ // 点击展开更多商品
+ handleClickShowMoreShop(obj) {
+ console.log('obj', obj);
+ obj.isShowMore = !obj.isShowMore
+ this.$forceUpdate()
+ },
// 点击再次跳转 工会商城 或 彩云驿商城
handleGoStore() {
@@ -204,6 +278,11 @@ export default {
// 大tab切换
handleBigTab(val) {
this.selectBigTab = val
+ console.log('this.currentTab', this.currentTab);
+
+ if (val === 3 && this.currentTab === 7) {
+ this.currentTab = 2
+ }
console.log('this.selectBigTab', this.selectBigTab);
this.orderList = []
@@ -225,6 +304,7 @@ export default {
? ""
: "";
this.handleGetOrderList(type);
+ this.$forceUpdate()
},
// 滚动到底部 加载更多
handleScrollTolower() {
@@ -244,24 +324,34 @@ export default {
this.handleGetOrderList(type);
},
handleTab(val) {
+ if (this.selectBigTab === 3 && val === 7) {
+ this.currentTab = 2
+ }
+
+
this.pageMsg = {
pageIndex: 1,
pageSize: 10,
isOver: false,
};
- this.currentTab = val;
+ if (this.currentTab === val) {
+ this.currentTab = ""
+ } else {
+ this.currentTab = val;
+ }
+
this.orderList = [];
let type =
- val === 1
+ this.currentTab === 1
? "1005,1010,2010,3000,8000,8010,8020,8900,8999,9000,9999"
- : val === 2
+ : this.currentTab === 2
? "1005"
- : val === 3
+ : this.currentTab === 3
? "1010,2000"
- : val === 4
+ : this.currentTab === 4
? "2010"
- : val === 5
+ : this.currentTab === 5
? ""
: "";
this.handleGetOrderList(type);
@@ -317,7 +407,7 @@ export default {
mask: true,
});
const req = {
- action_type: "GetMallOrderList",
+ action_type: "GetOrderList",
salebillType: this.searchType === "6" ?
this.selectBigTab === 1 ? '3001,3999' :
this.selectBigTab === 2 ? '3999' :
@@ -325,7 +415,7 @@ export default {
:
this.selectBigTab === 1 ? '3000,3001,3002,3999' :
this.selectBigTab === 2 ? '3000,3002,3999' :
- this.selectBigTab === 3 ? '3001,3999' : '',
+ this.selectBigTab === 3 ? '3001' : '',
salebillState: this.searchType === "6" ? "" : status || "",
// salebillType:
// this.searchType === "6"
@@ -391,6 +481,14 @@ export default {
item.SUPPLIER_NAME,
});
},
+ handleGoShopDetail(item, index) {
+ console.log('itemitemitemitem', item);
+ console.log('indexindexindexindex', index);
+ let obj = item.GOODSList[index]
+ uni.navigateTo({
+ url: `/pages/shopPages/shopDetail/index?id=${obj.COMMODITY_ID}`,
+ });
+ }
},
};
@@ -663,6 +761,24 @@ export default {
}
}
+ .is_more {
+ width: 400rpx;
+ height: 40rpx;
+ margin: auto;
+ text-align: center;
+ //display: flex;
+ //flex-direction: row;
+ //align-items: center;
+ color: #9fa3a8;
+ font-size: 28rpx;
+
+ .arrow_icon {
+ width: 26rpx;
+ height: 16rpx;
+ margin-right: 16rpx;
+ }
+ }
+
.orderItemMoneyBox {
width: 100%;
display: flex;
@@ -697,7 +813,7 @@ export default {
display: flex;
align-items: center;
justify-content: space-between;
- margin-top: 16rpx;
+ margin-top: 32rpx;
.orderItemBottomLeft {
.orderItemBottomLeftMore {
@@ -725,7 +841,7 @@ export default {
text-align: left;
font-style: normal;
text-transform: none;
- padding: 2rpx 26rpx;
+ padding: 4rpx 26rpx;
background: #F2F5F6;
border-radius: 4rpx;
margin-right: 34rpx;
@@ -740,13 +856,52 @@ export default {
text-align: left;
font-style: normal;
text-transform: none;
- padding: 2rpx 26rpx;
+ padding: 4rpx 26rpx;
background: #F2F5F6;
border-radius: 4rpx;
}
}
}
}
+
+ .inBottom {
+ width: 100%;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+
+ .bottomText {
+ font-family: PingFangSC, PingFang SC;
+ font-weight: 400;
+ font-size: 26rpx;
+ color: #d0d0d0;
+ line-height: 40rpx;
+ text-align: justify;
+ font-style: normal;
+ position: relative;
+ padding: 6rpx 0;
+ }
+
+ .bottomText::after {
+ content: "";
+ width: 30vw;
+ height: 2rpx;
+ background: #e0e0e0;
+ position: absolute;
+ left: -32vw;
+ top: 50%;
+ }
+
+ .bottomText::before {
+ content: "";
+ width: 30vw;
+ height: 2rpx;
+ background: #e0e0e0;
+ position: absolute;
+ right: -32vw;
+ top: 50%;
+ }
+ }
}
diff --git a/pages/shopPages/settlement/index.vue b/pages/shopPages/settlement/index.vue
index e2c06d9c..ed6046d6 100644
--- a/pages/shopPages/settlement/index.vue
+++ b/pages/shopPages/settlement/index.vue
@@ -47,12 +47,13 @@
-
![]()
共{{ shopOrder.length }}个品项,{{ shopCount }}件商品
@@ -146,10 +147,10 @@
{{
item.USER_NAME || ""
- }}
+ }}
{{
item.USER_SEX_TEXT || ""
- }}
+ }}
{{ item.MOBILEPHONE || "" }}
diff --git a/pages/shopPages/shopDetail/index.vue b/pages/shopPages/shopDetail/index.vue
index ac563962..b0c5819e 100644
--- a/pages/shopPages/shopDetail/index.vue
+++ b/pages/shopPages/shopDetail/index.vue
@@ -75,34 +75,38 @@
-
-
- ¥
-
- {{ good.bigNumber || "" }}.{{ good.smallNumber || "00" }}
-
-
-
+
+
+
+ ¥
+
+ {{ good.bigNumber || "" }}.{{ good.smallNumber || "00" }}
+
+
+
-
-
+
-
- 市场价:¥{{ good.COMMODITY_RETAILPRICE }}
-
+
+ 市场价:¥{{ good.COMMODITY_RETAILPRICE }}
+
+
+ 销量:{{ good.COMMODITY_EN || "0" }}
+
+
+
+
{{ good.COMMODITY_NAME || "-" }}
@@ -121,7 +129,7 @@
}} -->
库存:{{ good.COMMODITY_STOCK || "0" }}
-
销量:{{ good.COMMODITY_EN || "0" }}
+
规格:{{ good.COMMODITY_RULE || "" }}