Преглед на файлове

Merge branch 'master' of http://47.101.159.18:3000/Muchinfo/MTP20_WEB_GLOBAL

li.shaoyi преди 2 години
родител
ревизия
b02f9782cd

+ 5 - 4
src/packages/mobile/views/ballot/list/Index.vue

@@ -8,6 +8,7 @@
             </app-navbar>
         </template>
         <Banner :data-list="bannerList" @click="onBannerClick" v-if="bannerList.length" />
+        <Divider>正在抢购</Divider>
         <template v-if="isWaterfall">
             <Waterfall class="g-goods-waterfall" :data-list="startList">
                 <template #default="{ item }">
@@ -18,7 +19,7 @@
                         <div class="goods-info">
                             <div class="goods-info__title">{{ item.goodsname }}</div>
                             <div class="goods-info__price">
-                                <Tag type="danger" plain>价</Tag>
+                                <Tag type="danger" plain>预售价</Tag>
                                 <span class="unit">¥</span>
                                 <span class="integer">{{ item.refprice }}</span>
                             </div>
@@ -36,7 +37,7 @@
                         <div class="goods-info">
                             <div class="goods-info__title">{{ item.goodsname }}</div>
                             <div class="goods-info__price">
-                                <Tag type="danger" plain>价</Tag>
+                                <Tag type="danger" plain>预售价</Tag>
                                 <span class="unit">¥</span>
                                 <span class="integer">{{ item.refprice }}</span>
                             </div>
@@ -53,7 +54,7 @@
                         <div class="title"><span>{{ item.goodscode }}/{{ item.goodsname }}</span></div>
                         <div class="desc"><span>{{ item.starttime }} - {{ item.endtime }}</span></div>
                         <div class="price">
-                            <Tag type="danger" plain>价</Tag>
+                            <Tag type="danger" plain>预售价</Tag>
                             <span class="unit">¥</span>
                             <span class="integer">{{ item.refprice }}</span>
                         </div>
@@ -68,7 +69,7 @@
                         <div class="title"><span>{{ item.goodscode }}/{{ item.goodsname }}</span></div>
                         <div class="desc"><span>{{ item.starttime }} - {{ item.endtime }}</span></div>
                         <div class="price">
-                            <Tag type="danger" plain>价</Tag>
+                            <Tag type="danger" plain>预售价</Tag>
                             <span class="unit">¥</span>
                             <span class="integer">{{ item.refprice }}</span>
                         </div>

+ 11 - 4
src/packages/mobile/views/bank/sign/Index.vue

@@ -14,22 +14,22 @@
         </div>
         <div class="bank-sign__empty" v-else>
             <Empty description="您还未添加签约账户" />
-            <Button type="danger" @click="openComponent('edit')" round>添加签约账户</Button>
+            <Button type="danger" @click="showComponent(false)" round>添加签约账户</Button>
         </div>
         <template #footer>
             <div class="g-form__footer inset" v-if="bankInfo">
                 <Button type="warning" round block @click="formSubmit"
                     v-if="bankInfo.signstatus === SignStatus.Signed">解约</Button>
-                <Button type="danger" round block @click="openComponent('edit')"
+                <Button type="danger" round block @click="showComponent(true)"
                     v-if="[SignStatus.Unsigned, SignStatus.Refuse, SignStatus.Signed].includes(bankInfo.signstatus)">修改</Button>
             </div>
         </template>
-        <component ref="componentRef" :is="componentMap.get(componentId)" @closed="closeComponent" v-if="componentId" />
+        <component ref="componentRef" v-bind="{ isedit }" :is="componentMap.get(componentId)" @closed="closeComponent" v-if="componentId" />
     </app-view>
 </template>
 
 <script lang="ts" setup>
-import { onActivated, defineAsyncComponent } from 'vue'
+import { onActivated, defineAsyncComponent, ref } from 'vue'
 import { CellGroup, Cell, Button, Empty, showFailToast } from 'vant'
 import { fullloading, dialog } from '@/utils/vant'
 import { useComponent } from '@/hooks/component'
@@ -44,6 +44,8 @@ const componentMap = new Map<string, unknown>([
 const { componentRef, componentId, openComponent, closeComponent } = useComponent(() => formRefresh())
 const { cancelSubmit, formRefresh, bankInfo } = useDoCancelBankSign()
 const { router } = useNavigation()
+/// 是否修改
+const isedit = ref(false)
 
 const formSubmit = () => {
     dialog({
@@ -63,6 +65,11 @@ const formSubmit = () => {
     })
 }
 
+const showComponent = (isEdit: boolean) => {
+    isedit.value = isEdit
+    openComponent('edit')
+}
+
 onActivated(() => formRefresh())
 </script>
 

+ 2 - 2
src/packages/mobile/views/presale/list/Index.vue

@@ -36,7 +36,7 @@
                         <div class="goods-info">
                             <div class="goods-info__title">{{ item.goodsname }}</div>
                             <div class="goods-info__price">
-                                <Tag type="danger" plain>预售价</Tag>
+                                <Tag type="danger" plain>起拍价</Tag>
                                 <span class="unit">¥</span>
                                 <span class="integer">{{ item.tradeprice }}</span>
                             </div>
@@ -67,7 +67,7 @@
                     <div class="info">
                         <div class="title">{{ item.goodscode }}/{{ item.goodsname }}</div>
                         <div class="price">
-                            <Tag type="danger" plain>预售价</Tag>
+                            <Tag type="danger" plain>起拍价</Tag>
                             <span class="unit">¥</span>
                             <span class="integer">{{ item.tradeprice }}</span>
                         </div>

+ 1 - 0
src/packages/pc/views/footer/capital/summary/withdraw/index.vue

@@ -10,6 +10,7 @@
             </el-form-item>
             <el-form-item label="提现金额" prop="Amount">
                 <el-input-number placeholder="请输入提现金额" :precision="2" v-model="formData.Amount" />
+                <el-button type="danger" @click="formData.Amount = fund.AvailableOutMoney">全部提现</el-button>
             </el-form-item>
             <template v-for="(item, index) in configs" :key="index">
                 <el-form-item :label="item.fieldname" :prop="item.fieldcode" v-if="item.usabletype === 1 || item.usabletype === userStore.userInfo?.userinfotype">