diff --git a/src/main/java/com/budwk/app/zhgh/pointsmall/supplier/service/impl/PointsMallSupplierServiceImpl.java b/src/main/java/com/budwk/app/zhgh/pointsmall/supplier/service/impl/PointsMallSupplierServiceImpl.java index 0060c8f6..01371ac7 100644 --- a/src/main/java/com/budwk/app/zhgh/pointsmall/supplier/service/impl/PointsMallSupplierServiceImpl.java +++ b/src/main/java/com/budwk/app/zhgh/pointsmall/supplier/service/impl/PointsMallSupplierServiceImpl.java @@ -12,6 +12,7 @@ import org.nutz.dao.Cnd; import org.nutz.dao.Dao; import org.nutz.ioc.loader.annotation.IocBean; +import java.util.Date; import java.util.List; @IocBean(args = {"refer:dao"}) @@ -46,6 +47,7 @@ public class PointsMallSupplierServiceImpl extends BaseServiceImpl listByMallType(Integer mallType) { Cnd cnd = Cnd.where("delFlag", "=", false); + cnd.and(Cnd.exps("cooperationExpTime", "is", null).or("cooperationExpTime", ">=", new Date())); if (mallType != null) { cnd.and("mallType", "=", mallType); } diff --git a/src/main/resources/rebel.xml b/src/main/resources/rebel.xml new file mode 100644 index 00000000..82ed5d55 --- /dev/null +++ b/src/main/resources/rebel.xml @@ -0,0 +1,16 @@ + + + + + + zhgh_cug_v4 + + + + + + + diff --git a/src/main/resources/static/assets/mobile/img/mall/order/my-order.png b/src/main/resources/static/assets/mobile/img/mall/order/my-order.png new file mode 100644 index 00000000..f9a49d2c Binary files /dev/null and b/src/main/resources/static/assets/mobile/img/mall/order/my-order.png differ diff --git a/src/main/resources/static/assets/mobile/img/mall/supplier-banner/supplier-banner-daily.png b/src/main/resources/static/assets/mobile/img/mall/supplier-banner/supplier-banner-daily.png new file mode 100644 index 00000000..d73d796e Binary files /dev/null and b/src/main/resources/static/assets/mobile/img/mall/supplier-banner/supplier-banner-daily.png differ diff --git a/src/main/resources/static/assets/mobile/img/mall/supplier-banner/supplier-banner-quality.png b/src/main/resources/static/assets/mobile/img/mall/supplier-banner/supplier-banner-quality.png new file mode 100644 index 00000000..bf53ff51 Binary files /dev/null and b/src/main/resources/static/assets/mobile/img/mall/supplier-banner/supplier-banner-quality.png differ diff --git a/src/main/resources/static/assets/mobile/img/mall/supplier-banner/supplier-banner-welfare.png b/src/main/resources/static/assets/mobile/img/mall/supplier-banner/supplier-banner-welfare.png new file mode 100644 index 00000000..3d79e254 Binary files /dev/null and b/src/main/resources/static/assets/mobile/img/mall/supplier-banner/supplier-banner-welfare.png differ diff --git a/src/main/resources/views/platform/zhgh/points-mall/supplier/index.html b/src/main/resources/views/platform/zhgh/points-mall/supplier/index.html index d520a63a..81ca2bf5 100644 --- a/src/main/resources/views/platform/zhgh/points-mall/supplier/index.html +++ b/src/main/resources/views/platform/zhgh/points-mall/supplier/index.html @@ -140,13 +140,15 @@ layout("/layouts/platform.html"){ - - - - - - - + + @@ -201,7 +203,6 @@ layout("/layouts/platform.html"){ supplierReturnOrderUrl: null, supplierApiUrl: null, supplierPic: null, - supplierPicPath: null, contactInfo: null, sroNo: null, cooperationExpTime: null, @@ -250,6 +251,7 @@ layout("/layouts/platform.html"){ }, openEdit(row) { this.formData = Object.assign(this.defaultForm(), row) + delete this.formData.supplierPicPath this.editDialogVisible = true this.$nextTick(() => { this.$refs.form && this.$refs.form.clearValidate() @@ -262,7 +264,9 @@ layout("/layouts/platform.html"){ } this.submitLoading = true const url = this.formData.id ? "/doEdit" : "/doAdd" - const resp = await this.$axios.post(loc() + url, this.formData) + const formData = Object.assign({}, this.formData) + delete formData.supplierPicPath + const resp = await this.$axios.post(loc() + url, formData) this.submitLoading = false if (resp.code === 0) { this.$message.success(resp.msg) diff --git a/src/main/resources/views/platform/zhghh5/points-mall/index.html b/src/main/resources/views/platform/zhghh5/points-mall/index.html index 4b9c36a2..9a6f0e50 100644 --- a/src/main/resources/views/platform/zhghh5/points-mall/index.html +++ b/src/main/resources/views/platform/zhghh5/points-mall/index.html @@ -2,88 +2,126 @@ layout("/layouts/platform_h5.html"){ #-->
- + + -
-
-
-
积分商城
-
好物兑换,积分随心用
-
-
- 可用积分 - {{ userPoints }} -
-
- -
-
- -
- 我的订单 - 查看兑换记录 -
-
-
- -
- 我的积分 - 账户积分概览 -
-
-
- -
-
- -
-
-
互助关爱基金
-
自愿参与,互助共济,专款专用
-
- -
-
- 查看基金介绍 - 我的爱心记录 -
- -
- - -
- - -
-
- - - - - - -
-
我的爱心记录
- - 关闭 -
-
-
- - - diff --git a/src/main/resources/views/platform/zhghh5/points-mall/me/index.html b/src/main/resources/views/platform/zhghh5/points-mall/me/index.html deleted file mode 100644 index 86cb90bf..00000000 --- a/src/main/resources/views/platform/zhghh5/points-mall/me/index.html +++ /dev/null @@ -1,74 +0,0 @@ - -
- -
-
-
{{ avatarText }}
-
- {{ displayName }} - 工号:{{ userInfo.loginname || userInfo.username || userInfo.userId || "-" }} -
-
-
-
- 我的积分 - {{ userPoints }} -
- -
- - - - - -
-
- - - diff --git a/src/main/resources/views/platform/zhghh5/points-mall/movies/index.html b/src/main/resources/views/platform/zhghh5/points-mall/movies/index.html deleted file mode 100644 index 15efb270..00000000 --- a/src/main/resources/views/platform/zhghh5/points-mall/movies/index.html +++ /dev/null @@ -1,73 +0,0 @@ - -
- -
-
-
-
影票专区
-
精选观影权益,积分兑换更轻松
-
- -
-
-
影票供应商
- - -
-
- -
- {{ item.supplierName }} - 点击进入兑换 -
- -
-
-
-
-
-
- - - diff --git a/src/main/resources/views/platform/zhghh5/points-mall/order/index.html b/src/main/resources/views/platform/zhghh5/points-mall/order/index.html index d62e5107..98e63682 100644 --- a/src/main/resources/views/platform/zhghh5/points-mall/order/index.html +++ b/src/main/resources/views/platform/zhghh5/points-mall/order/index.html @@ -3,37 +3,81 @@ layout("/layouts/platform_h5.html"){ #-->
-
- 剩余积分 - {{ userPoints }} -
- - - - - - -
-
- {{ item.supplierName || "积分商城" }} - {{ orderStateName(item.orderState) }} +
+
+
+
剩余积分
+
+ ¥ + {{ userPoints }} +
-
- +
+ + +
+ + +
-
-
订单号{{ item.orderId }}
-
消费积分{{ item.pointsPrice || 0 }}
-
运费{{ item.freightCost || 0 }}
-
创建时间{{ item.orderCreateTime || "-" }}
-
-
- 确认收货 - 查看订单 -
-
- - + + + +
+
+
+ {{ item.supplierName || "积分商城" }} + +
+ {{ orderStateName(item.orderState) }} +
+ +
+ +
+ +
+
+ 订单号: + {{ item.orderId }} +
+
+ 消费积分: + {{ item.pointsPrice || 0 }} +
+
+ 运费: + ¥ {{ item.freightCost }} +
+
+ 创建时间: + {{ item.orderCreateTime || "-" }} +
+
+ +
+ 确认收货 + 查看订单 +
+
+ +
+ +