commit

src/main/resources/views/mobile/activity/unionActivity/sign.html

@@ -15,6 +15,7 @@ layout("/mobile/platform.html"){
         max-width: 100%;
         height: calc(100vh - 46px - 44px);
         overflow-y: auto;
+        padding: 10px;
     }
 
     .remark-content *{

src/main/resources/views/mobile/activity/unionActivity/singleReg.html

@@ -15,6 +15,7 @@ layout("/mobile/platform.html"){
         max-width: 100%;
         height: calc(100vh - 46px - 44px);
         overflow-y: auto;
+        padding: 10px;
     }
 
     .remark-content *{
@@ -58,6 +59,14 @@ layout("/mobile/platform.html"){
         </van-button>
     </div>
 
+    <div v-else style="margin: 20px 20px 10px 20px">
+        <van-button color="red" disabled
+                    block style="border-radius: 10px"
+                    type="info">
+            报名已结束
+        </van-button>
+    </div>
+
     <!--<div style="margin: 20px 20px 10px 20px"
          v-if="isRegister && moment().valueOf() < moment(o.endTime).valueOf() && moment().valueOf() > moment(o.startTime).valueOf()">
         <van-button

src/main/resources/views/mobile/activity/unionActivity/unionReg.html

@@ -45,6 +45,7 @@ layout("/mobile/platform.html"){
         max-width: 100%;
         height: calc(100vh - 46px - 44px);
         overflow-y: auto;
+        padding: 10px;
     }
 
     .remark-content *{
@@ -135,6 +136,13 @@ layout("/mobile/platform.html"){
             <van-button @click="doCancel" block color="red" style="border-radius: 10px; margin-top: 10px" type="info">取消报名</van-button>
         </template>
     </div>
+    <div v-else style="margin: 20px 20px 10px 20px">
+        <van-button color="red" disabled
+                    block style="border-radius: 10px"
+                    type="info">
+            报名已结束
+        </van-button>
+    </div>
 
     <van-popup class="joinPopup" position="right" v-model:show="showActivityInfoPopup">
         <van-nav-bar @click-left="showActivityInfoPopup = false" fixed left-arrow placeholder title="活动内容"></van-nav-bar>

src/main/resources/views/mobile/platform.html

@@ -13,7 +13,7 @@
 
     <link rel="stylesheet" href="${base!}/assets/mobile/css/theme.css">
     <link rel="stylesheet" href="${base!}/assets/mobile/css/main.css">
-    <link rel="stylesheet" href="${base!}/assets/platform/plugins/vant/vant.css">
+    <link rel="stylesheet" href="${base!}/assets/platform/plugins/vant/vant.css?v=1.0.1">
 
     <script>
         window._AMapSecurityConfig = {

src/main/resources/views/mobile/proposal/analysis.html

@@ -15,7 +15,7 @@ layout("/mobile/platform.html"){
             left-arrow
             placeholder
             fixed
-            @click-left="history.back()"
+            @click-left="pjaxReplace('/mobile/index')"
     ></van-nav-bar>
     <van-dropdown-menu>
         <van-dropdown-item v-model="pageForm.sessionId" :options="sessionList"
@@ -203,4 +203,4 @@ layout("/mobile/platform.html"){
 
 <!--#
 }
-#-->
+#-->

src/main/resources/views/mobile/proposal/delegate/info.html

@@ -12,11 +12,11 @@ layout("/mobile/platform.html"){
             left-arrow
             placeholder
             fixed
-            @click-left="history.back()"
+            @click-left="pjaxReplace('/mobile/index')"
             safe-area-inset-top
     ></van-nav-bar>
 
-    <div class="van-cell-group__title">
+    <div class="van-cell-group__title" style="padding: 5px 0 0 0 !important;">
         <div class="van-sidebar-item van-sidebar-item--select">
             基本信息
         </div>
@@ -32,7 +32,7 @@ layout("/mobile/platform.html"){
         <van-cell title="职称">{{ viewData.zc }}</van-cell>
         <van-cell title="职务">{{ viewData.zw }}</van-cell>
     </van-cell-group>
-    <div class="van-cell-group__title">
+    <div class="van-cell-group__title" style="padding: 5px 0 0 0 !important;">
         <div class="van-sidebar-item van-sidebar-item--select">
             个人简历
         </div>
@@ -79,4 +79,4 @@ layout("/mobile/platform.html"){
 
 <!--#
 }
-#-->
+#-->

src/main/resources/views/mobile/proposal/delegate/list.html

@@ -15,7 +15,7 @@ layout("/mobile/platform.html"){
             left-arrow
             placeholder
             fixed
-            @click-left="history.back()"
+            @click-left="pjaxReplace('/mobile/index')"
             safe-area-inset-top
     ></van-nav-bar>
     <div class="search-fixed">
@@ -141,4 +141,4 @@ layout("/mobile/platform.html"){
 
 <!--#
 }
-#-->
+#-->

src/main/resources/views/mobile/proposal/delegation/audit.html

@@ -3,11 +3,11 @@ layout("/mobile/platform.html"){
 #-->
 
 <div id="app" v-cloak>
-    <van-nav-bar title="团长审核" fixed placeholder safe-area-inset-top @click-left="history.back()"
+    <van-nav-bar title="团长审核" fixed placeholder safe-area-inset-top @click-left="pjaxReplace('/mobile/index')"
                  :left-arrow="leftArrow"></van-nav-bar>
     <proposal-info :proposal_id="proposalId" title="团长审核" :handle="handle" ref="info">
         <template #handle>
-            <div class="van-cell-group__title">
+            <div class="van-cell-group__title" style="padding: 5px 0 0 0 !important;">
                 <div class="van-sidebar-item van-sidebar-item--select">
                     团长审核
                 </div>
@@ -134,4 +134,4 @@ layout("/mobile/platform.html"){
 
 <!--#
 }
-#-->
+#-->

src/main/resources/views/mobile/proposal/delegation/list.html

@@ -43,7 +43,7 @@ layout("/mobile/platform.html"){
             left-arrow
             placeholder
             fixed
-            @click-left="history.back()"
+            @click-left="pjaxReplace('/mobile/index')"
     ></van-nav-bar>
 
     <div class="search-fixed">

src/main/resources/views/mobile/proposal/mine/index.html

@@ -78,7 +78,7 @@ layout("/mobile/platform.html"){
             left-arrow
             placeholder
             fixed
-            @click-left="history.back()"
+            @click-left="pjaxReplace('/mobile/index')"
             safe-area-inset-top
     ></van-nav-bar>
 

src/main/resources/views/mobile/proposal/proposalInfo.html

@@ -3,7 +3,7 @@ layout("/mobile/platform.html"){
 #-->
 <div id="app" v-cloak>
   <van-nav-bar title="提案信息" fixed placeholder :left-arrow="leftArrow" safe-area-inset-top
-               @click-left="history.back()"></van-nav-bar>
+               @click-left="pjaxReplace('/mobile/index')"></van-nav-bar>
   <proposal-info :proposal_id="proposalId" ref="pi"></proposal-info>
 </div>
 
@@ -39,4 +39,4 @@ layout("/mobile/platform.html"){
 
 <!--#
 }
-#-->
+#-->

src/main/resources/views/mobile/proposal/search/index.html

@@ -12,7 +12,7 @@ layout("/mobile/platform.html"){
           left-arrow
           placeholder
           fixed
-          @click-left="history.back()"
+          @click-left="pjaxReplace('/mobile/index')"
   ></van-nav-bar>
 
   <div class="search-fixed">

src/main/resources/views/mobile/proposal/seconded/audit.html

@@ -3,11 +3,11 @@ layout("/mobile/platform.html"){
 #-->
 <div id="app" v-cloak>
     <van-nav-bar title="附议提案" fixed placeholder :left-arrow="leftArrow" safe-area-inset-top
-                 @click-left="history.back()"></van-nav-bar>
+                 @click-left="pjaxReplace('/mobile/proposal/seconded')"></van-nav-bar>
     <proposal-info :proposal_id="proposalId" ref="pi"></proposal-info>
 
     <van-row v-if="secondedInfo.isAgree==null">
-        <div class="van-cell-group__title">
+        <div class="van-cell-group__title" style="padding: 5px 0 0 0 !important;">
             <div class="van-sidebar-item van-sidebar-item--select">
                 附议提案
             </div>
@@ -59,18 +59,16 @@ layout("/mobile/platform.html"){
                         proposalId: this.proposalId,
                         flag: flag
                     })
-
                     if (resp.code === 0) {
                         setTimeout(async () => {
-                            loading.type = 'success'
-                            loading.message = '提交成功'
                             loading.close()
                             this.$refs.pi.openView(this.proposalId)
                             this.getSecondedCount()
+                            this.$toast.success("操作成功")
                         }, 1200)
                     } else {
-                        loading.type = 'fail'
-                        loading.message = '提交失败，请联系管理员'
+                        loading.close()
+                        this.$toast.fail("操作失败，请及时联系管理员")
                     }
 
                 })

src/main/resources/views/mobile/proposal/seconded/list.html

@@ -43,7 +43,7 @@ layout("/mobile/platform.html"){
             left-arrow
             placeholder
             fixed
-            @click-left="history.back()"
+            @click-left="pjaxReplace('/mobile/index')"
     ></van-nav-bar>
 
     <div class="search-fixed">

src/main/resources/views/mobile/proposal/write/index.html

@@ -7,7 +7,7 @@ layout("/mobile/platform.html"){
 </style>
 
 <div id="app" v-cloak>
-    <van-nav-bar @click-left="history.back()" fixed left-arrow placeholder
+    <van-nav-bar @click-left="pjaxReplace('/mobile/index')" fixed left-arrow placeholder
                  title="撰写提案"></van-nav-bar>
     <van-form :show-error-message="false" input-align="right" ref="addForm">
 

src/main/resources/views/mobile/welfare/list/receive.html

@@ -228,7 +228,7 @@ layout("/mobile/platform.html"){
                         <van-image :src="FILE_STREAM_PREVIEW_ADDRESS+'?id='+option.imgUrl"
                                    fit="contain"
                                    style="width: 100px;height: 100px;border-radius: 10px"></van-image>
-                        <span style="position: absolute; bottom: 0;left: 10px;right: 10px;height: 20px;background: rgb(0 0 0 / 50%);text-align:center;color: #FFF;">{{option.selectCount}}人已选</span>
+                        <!--<span style="position: absolute; bottom: 0;left: 10px;right: 10px;height: 20px;background: rgb(0 0 0 / 50%);text-align:center;color: #FFF;">{{option.selectCount}}人已选</span>-->
                         <!--                        @click="vant.ImagePreview([CREATE_PREVIEW_URL(option.imgUrl)])"-->
                     </div>
 
@@ -355,9 +355,26 @@ layout("/mobile/platform.html"){
                             desc=""
                             style="border-radius: 8px;background: #FFFFFF"
                             :thumb="FILE_STREAM_PREVIEW_ADDRESS+'?id='+item.imgUrl"
-                            v-for="item in selectedOptions"
-                    ></van-card>
+                            v-for="(item,index) in selectedOptions"
+                    >
+                        <template #price>
+                            <span v-if="item.specs && item.specs.length > 0" style="font-size: 15px;color: #0a84ff"
+                                  @click="openSelectSpecs(item)">
+                                {{ item.selectSpecs ? ('规格：' + item.selectSpecs) : '点我选择规格参数' }}
+                            </span>
+                        </template>
+                    </van-card>
                 </van-cell>
+
+                <van-popup v-model="selectSpecsPopup" position="bottom">
+                    <van-picker
+                        title="规格选择"
+                        show-toolbar
+                        :columns="specsPickerOptions"
+                        @confirm="specsSelectConfirm"
+                        @cancel="selectSpecsPopup = false"
+                    ></van-picker>
+                </van-popup>
             </div>
 
             <!--邮寄到家 填写收货地址-->
@@ -427,7 +444,12 @@ layout("/mobile/platform.html"){
                 descPopup: false,
                 signData: null,
 
-                clickUpOrDown: false
+                clickUpOrDown: false,
+
+                // 选择规格相关
+                selectSpecsPopup: false,
+                specsPickerOptions: [],
+                selectedOptionsId: null,
             }
         },
         computed: {
@@ -490,6 +512,32 @@ layout("/mobile/platform.html"){
             }
         },
         methods: {
+            /**
+             * 选择规格
+             * @param item
+             */
+            openSelectSpecs(item) {
+                this.specsPickerOptions = []
+                this.selectedOptionsId = item.id
+                if (item.specs && item.specs.length > 0) {
+                    this.specsPickerOptions = item.specs.map(v => {
+                        return {text: v.value, value: v.value}
+                    })
+                }
+                this.selectSpecsPopup = true
+            },
+            specsSelectConfirm(value) {
+                debugger
+                this.selectSpecsPopup = false
+                if (value) {
+                    this.projectInfo.welfareProjectSubjects[0].options.forEach(v => {
+                        if (v.id === this.selectedOptionsId) {
+                            v.selectSpecs = value.value
+                        }
+                    })
+                    // this.projectInfo.welfareProjectSubjects[0].options[this.selectedOptionsIndex].selectSpecs = value.value
+                }
+            },
             editAddress(item) {
                 pjaxReplace('/mobile/welfare/mine/addressEdit?projectId=' + this.projectId + '&id=' + item.id)
                 window.sessionStorage.setItem('welfareProjectId', this.projectId)
@@ -629,14 +677,29 @@ layout("/mobile/platform.html"){
                     }
                 }
 
-                const formData = this.projectInfo.welfareProjectSubjects[0].options.filter(v => v.selectNum >= 1).map(v => {
+                const options = this.projectInfo.welfareProjectSubjects[0].options.filter(v => v.selectNum >= 1)
+
+                for (const option of options) {
+                    // 检查是否有 specs
+                    if (option.specs) {
+                        // 检查 selectSpecs 是否为空或未定义
+                        if (!option.selectSpecs) {
+                            this.$toast.fail('请选择' + option.optionName + '的规格')
+                            return
+                        }
+                    }
+                }
+
+
+                const formData = options.map(v => {
                     return {
                         welfareId: this.projectId,
                         subjectId: v.subjectId,
                         selectOptionId: v.id,
                         receiveAddress: this.selectAddress,
                         userSign: this.signData,
-                        selectNum: v.selectNum
+                        selectNum: v.selectNum,
+                        selectSpecs: v.selectSpecs
                     }
                 })
                 const {
@@ -655,7 +718,7 @@ layout("/mobile/platform.html"){
                     } else {
                         vant.Dialog.alert({
                             title: '温馨提示',
-                            message: "您已完成本次福利选择。",
+                            message: "您已完成本次选择。",
                         }).then(async () => {
                             this.confirmPopup = false
                             await this.getProjectInfo()
@@ -739,6 +802,9 @@ layout("/mobile/platform.html"){
                     if (option) {
                         v.selectNum = option.selectNum
                         selectNum = Number(selectNum) + Number(v.selectNum)
+                        if (option.selectSpecs) {
+                            v.selectSpecs = option.selectSpecs
+                        }
                     }
                 })
                 this.selectNum = selectNum