- + 选择截止时间即将到期,请尽快选择!
@@ -567,26 +568,37 @@ layout("/layouts/platform_h5.html"){
- {{ projectInfo.isCheckBox === "radio" ? "请选择一项福利" : "您可以选择多项福利,最多可选 " + (projectInfo.multiSelectNum || + {{ projectInfo.isCheckBox === "radio" ? "请选择一项福利" : "您可以选择多项福利,最多可选 " + + (projectInfo.multiSelectNum || projectInfo.options.length) + " 项" }}
-
-
- - 项目信息 -
-
-
- - - + + + + + +
+ + + +
+
-
+
@@ -594,7 +606,7 @@ layout("/layouts/platform_h5.html"){
- + 福利选项 共 {{ projectInfo.options.length }} 项
@@ -603,15 +615,16 @@ layout("/layouts/platform_h5.html"){
-
+
已选择
@@ -621,34 +634,34 @@ layout("/layouts/platform_h5.html"){
- + 查看详情
@@ -658,13 +671,15 @@ layout("/layouts/platform_h5.html"){ - +
确认选择
@@ -672,24 +687,26 @@ layout("/layouts/platform_h5.html"){
@@ -713,7 +730,9 @@ layout("/layouts/platform_h5.html"){
请签字确认
-
{{ formData.userSign ? '您已完成签名' : '请在上方空白区域完成签名' }}
+
{{ formData.userSign ? '您已完成签名' : '请在上方空白区域完成签名' + }} +
重新签名
@@ -721,14 +740,19 @@ layout("/layouts/platform_h5.html"){
- 取消 - {{ hasSubmittedBefore ? '确认修改' : '确认提交' }} + 取消 + + + {{ hasSubmittedBefore ? '确认修改' : '确认提交'}} +
- +
{{ selectedOption.optionName }}
@@ -739,25 +763,29 @@ layout("/layouts/platform_h5.html"){
- {{ address.userName }} {{ address.tel }} + 收货人:{{ address.userName }}{{ address.tel }}
- {{ address.province }}{{ address.city }}{{ address.county }}{{ address.addressDetail }} + 收货地址: {{ address.province }}{{ address.city }}{{ address.county }} + {{address.addressDetail }}
- 默认 + 默认 +
-
暂无收货地址
+
+ 暂无收货地址 +
收货地址管理 @@ -772,6 +800,7 @@ layout("/layouts/platform_h5.html"){ store, data() { return { + activeNames: [], projectInfo: {}, userSelection: [], welfareProvideMode: [], @@ -879,7 +908,7 @@ layout("/layouts/platform_h5.html"){ } }, getProjectInfo() { - this.$axios.post("/platform/welfare/common/projectInfo", { id: this.projectId }).then((res) => { + this.$axios.post("/platform/welfare/common/projectInfo", {id: this.projectId}).then((res) => { if (res.code === 0) { this.projectInfo = res.data @@ -904,7 +933,7 @@ layout("/layouts/platform_h5.html"){ // 获取用户选择的数据 getUserSelection() { - this.$axios.post("/platform/welfare/userSelect/getUserSelection", { projectId: this.projectId }).then((resp) => { + this.$axios.post("/platform/welfare/userSelect/getUserSelection", {projectId: this.projectId}).then((resp) => { if (resp.code === 0) { this.userSelection = resp.data this.hasSubmittedBefore = this.userSelection.length > 0 @@ -1170,7 +1199,7 @@ layout("/layouts/platform_h5.html"){ // 选择收货地址 selectAddress(address) { this.formData.receiveAddress = - address.userName + " " + address.tel + " " + address.province + address.city + address.county + address.addressDetail + "收货人:" + address.userName + ",联系电话:" + address.tel + ",收货地址:" + address.province + address.city + address.county + address.addressDetail this.showAddressSheet = false }, diff --git a/src/main/resources/views/platform/zhghh5/welfare/select/list.html b/src/main/resources/views/platform/zhghh5/welfare/select/list.html index 46437c6..a00c055 100644 --- a/src/main/resources/views/platform/zhghh5/welfare/select/list.html +++ b/src/main/resources/views/platform/zhghh5/welfare/select/list.html @@ -86,11 +86,11 @@ layout("/layouts/platform_h5.html"){
{{row.name}}
开始时间: - {{row.choiceTimeStart}} + {{$moment(row.choiceTimeStart).format('YYYY-MM-DD HH:mm')}}
结束时间: - {{row.choiceTimeEnd}} + {{$moment(row.choiceTimeEnd).format('YYYY-MM-DD HH:mm')}}