xxxxx

src/packages/mobile/views/ballot/list/Index.vue

@@ -50,7 +50,7 @@
                 <li class="list-item g-block--bg" v-for="(item, index) in startList" :key="index" @click="toDetail(item)">
                     <div class="img"><img :src="getFirstImage(item.attachmenturl)" /></div>
                     <div class="info">
-                        <div class="title"><span>{{ item.goodsname }}</span></div>
+                        <div class="title"><span>{{ item.goodscode }}/{{ item.goodsname }}</span></div>
                         <div class="price">
                             <Tag type="danger" plain>卖价</Tag>
                             <span class="unit">￥</span>
@@ -64,7 +64,7 @@
                 <li class="list-item g-block--bg" v-for="(item, index) in endList" :key="index" @click="toDetail(item)">
                     <div class="img"><img :src="getFirstImage(item.attachmenturl)" /></div>
                     <div class="info">
-                        <div class="title"><span>{{ item.goodsname }}</span></div>
+                        <div class="title"><span>{{ item.goodscode }}/{{ item.goodsname }}</span></div>
                         <div class="price">
                             <Tag type="danger" plain>卖价</Tag>
                             <span class="unit">￥</span>

src/packages/mobile/views/presale/list/Index.vue

@@ -50,7 +50,7 @@
                 <li class="list-item g-block--bg" v-for="(item, index) in startList" :key="index" @click="toDetail(item)">
                     <div class="img"><img :src="getFirstImage(item.attachmenturl)" /></div>
                     <div class="info">
-                        <div class="title">{{ item.goodsname }}</div>
+                        <div class="title">{{ item.goodscode }}/{{ item.goodsname }}</div>
                         <div class="desc">开始：{{ formatDate(item.starttime) }}-结束：{{ formatDate(item.endtime) }}</div>
                         <div class="price">
                             <Tag type="danger" plain>起拍价</Tag>
@@ -65,7 +65,7 @@
                 <li class="list-item g-block--bg" v-for="(item, index) in endList" :key="index" @click="toDetail(item)">
                     <div class="img"><img :src="getFirstImage(item.attachmenturl)" /></div>
                     <div class="info">
-                        <div class="title">{{ item.goodsname }}</div>
+                        <div class="title">{{ item.goodscode }}/{{ item.goodsname }}</div>
                         <div class="price">
                             <Tag type="danger" plain>预售价</Tag>
                             <span class="unit">￥</span>

src/packages/qxst/views/account/certification/components/certification-next/Index.vue

@@ -21,12 +21,7 @@
                 </Field>
             </CellGroup>
             <CellGroup inset>
-                <Cell v-for="(item, index) in dataList" :key="index" @click="signer(item)">
-                    <template #title>
-                        <Icon color="#CC0000" :name="iconName(item.recordstatus)"></Icon>
-                        <Button :disable="item.recordstatus === 2">{{ item.templatename }}</Button>
-                    </template>
-                </Cell>
+                <Cell v-for="(item, index) in dataList" :key="index" :title="item.templatename" :icon="iconName(item.recordstatus)" :disable="[2, 4].includes(item.recordstatus)" @click="signer(item)" />
             </CellGroup>
             <template #footer>
                 <div class="g-form__footer inset">
@@ -39,7 +34,7 @@
 
 <script lang="ts" setup>
 import { shallowRef, computed, PropType} from 'vue'
-import { CellGroup, Button, Cell, Field, Icon, showFailToast, Image } from 'vant'
+import { CellGroup, Button, Cell, Field, showFailToast, Image } from 'vant'
 import { fullloading, dialog } from '@/utils/vant';
 import { getAQCertificateTypeListName } from "@/constants/account";
 import { useRequest } from '@/hooks/request'
@@ -109,7 +104,13 @@ const completed = () => {
 
 const signer = (item: Model.UserESignRecordRsq) => {
     ///  如果是已签署
-    if (item.recordstatus === 3) { 
+    if (item.recordstatus === 2) {
+        if (item.signurl != '') {
+            openURL(item.signurl)
+        } else {
+            showFailToast('合同地址错误')
+        }
+    } else if (item.recordstatus === 3) { 
         if (item.contractfileaddr != '') {
             openURL(item.contractfileaddr)
         } else {
@@ -139,7 +140,7 @@ onMounted(() => {
                 })
             }
             /// 只有全部签署才可以进行下一步
-            canAdd.value = dataList.value.some(obj => { [1, 2, 4].includes(obj.recordstatus) })
+            canAdd.value = dataList.value.some(obj => { [1, 4].includes(obj.recordstatus) })
         },
         onError: () => {
             error.value = true