update

public/html/fwrx.htm

@@ -15,15 +15,15 @@ xmlns="http://www.w3.org/TR/REC-html40">
   <o:Author>XP C</o:Author>
   <o:LastAuthor>dyp</o:LastAuthor>
   <o:Revision>2</o:Revision>
-  <o:TotalTime>0</o:TotalTime>
-  <o:Created>2022-11-12T01:04:00Z</o:Created>
-  <o:LastSaved>2022-11-12T01:04:00Z</o:LastSaved>
+  <o:TotalTime>38</o:TotalTime>
+  <o:Created>2022-11-17T06:43:00Z</o:Created>
+  <o:LastSaved>2022-11-17T06:43:00Z</o:LastSaved>
   <o:Pages>1</o:Pages>
   <o:Words>34</o:Words>
-  <o:Characters>194</o:Characters>
+  <o:Characters>195</o:Characters>
   <o:Lines>1</o:Lines>
   <o:Paragraphs>1</o:Paragraphs>
-  <o:CharactersWithSpaces>227</o:CharactersWithSpaces>
+  <o:CharactersWithSpaces>228</o:CharactersWithSpaces>
   <o:Version>15.00</o:Version>
  </o:DocumentProperties>
  <o:OfficeDocumentSettings>
@@ -850,8 +850,15 @@ lang=EN-US>:<o:p></o:p></span></span></p>
 mso-char-indent-count:2.0;line-height:150%;mso-pagination:widow-orphan;
 vertical-align:top'><span style='mso-bidi-font-size:10.5pt;line-height:150%;
 font-family:宋体;mso-bidi-font-family:宋体;mso-font-kerning:0pt'>人工热线：<b><span
-lang=EN-US>021-63138889</span>，客服时间：工作日早<span lang=EN-US>9</span>点至下午<span
-lang=EN-US>17:30</span>点</b><span lang=EN-US><o:p></o:p></span></span></p>
+lang=EN-US>021-63138889</span>，<span lang=EN-US><o:p></o:p></span></b></span></p>
+
+<p class=MsoNormal align=left style='text-align:left;text-indent:21.0pt;
+mso-char-indent-count:2.0;line-height:150%;mso-pagination:widow-orphan;
+vertical-align:top'><span style='mso-bidi-font-size:10.5pt;line-height:150%;
+font-family:宋体;mso-bidi-font-family:宋体;mso-font-kerning:0pt;mso-bidi-font-weight:
+bold'>客服时间：<b>工作日早<span lang=EN-US>9</span>点至下午<span lang=EN-US>17:30</span>点</b></span><span
+lang=EN-US style='mso-bidi-font-size:10.5pt;line-height:150%;font-family:宋体;
+mso-bidi-font-family:宋体;mso-font-kerning:0pt'><o:p></o:p></span></p>
 
 <p class=MsoNormal align=left style='text-align:left;text-indent:21.0pt;
 mso-char-indent-count:2.0;line-height:150%;mso-pagination:widow-orphan;

src/business/goods/index.ts

@@ -157,7 +157,7 @@ export function useQueryTHJProductLists() {
         await queryTHJProduct({
             data: {
                 userid: getUserId(),
-                favoriteflag: active.value === 0,
+                favoriteflag: false,
                 page: pageIndex.value,
                 pagesize: pageSize.value,
             },

src/packages/mobile/views/contract/details/index.vue

@@ -5,24 +5,29 @@
         </template>
         <Form ref="formRef" class="goods-details__form" @submit="onSubmit">
             <CellGroup>
-                <Field name="PresaleApplyID" label="交割日期" :rules="formRules.TransferID" is-link>
+                <Field name="TransferID" label="交割日期" :rules="formRules.TransferID" is-link>
                     <template #input>
                         <app-select :options="deliveryDate" @confirm="onDateChange" />
                     </template>
                 </Field>
                 <Field label="原定金价" v-if="selectedDate?.tradeprice">
                     <template #input>
-                        <span>{{ selectedDate.enddate }}</span>
+                        <span>{{ selectedDate.tradeprice }}</span>
                     </template>
                 </Field>
                 <Field label="数量" v-if="selectedDate?.tradeqty">
                     <template #input>
-                        <span>{{ selectedDate.enddate }}</span>
+                        <span>{{ selectedDate.tradeqty }}</span>
                     </template>
                 </Field>
                 <Field label="转让价格" v-if="selectedDate?.transferprice">
                     <template #input>
-                        <span>{{ selectedDate.enddate }}</span>
+                        <span>{{ selectedDate.transferprice }}</span>
+                    </template>
+                </Field>
+                <Field label="转让金额" v-if="selectedDate?.transferamount">
+                    <template #input>
+                        <span>{{ selectedDate.transferamount }}</span>
                     </template>
                 </Field>
             </CellGroup>
@@ -51,7 +56,7 @@
 import { shallowRef, computed, defineAsyncComponent } from 'vue'
 import { CellGroup, Button, Field, Form, FormInstance, Toast, FieldRule, Divider } from 'vant'
 import { fullloading } from '@/utils/vant'
-import { getImageUrl } from '@/filters'
+import { getImageUrl, formatDate } from '@/filters'
 import { useNavigation } from '@/hooks/navigation'
 import { useContractDetails } from '@/business/contract'
 import { useSpotPresaleTransferDesting } from '@/business/trade'
@@ -86,7 +91,7 @@ const formRules: { [key in keyof Proto.SpotPresaleTransferDestingReq]?: FieldRul
     TransferID: [{
         message: '请选择交割日期',
         validator: () => {
-            return !!formData.TransferID?.equals(0)
+            return !formData.TransferID?.equals(0)
         }
     }],
 }
@@ -95,14 +100,17 @@ const formRules: { [key in keyof Proto.SpotPresaleTransferDestingReq]?: FieldRul
 const deliveryDate = computed(() => {
     const list = details.value.deliverydate ?? []
     return list.map((e) => ({
-        label: `${e.enddate} ${(e.depositrate * 100).toFixed(0)}%`,
+        label: `${formatDate(e.enddate, 'YYYY-MM-DD')} ${(e.depositrate * 100).toFixed(0)}%`,
         value: e.transferid,
     }))
 })
 
 // 切换交割日期
-const onDateChange = (value: string) => {
-    formData.TransferID = Long.fromString(value)
+const onDateChange = (value: number) => {
+    const list = details.value.deliverydate ?? []
+    selectedDate.value = list.find((e) => e.transferid === value)
+
+    formData.TransferID = Long.fromString(value.toString())
     formRef.value?.validate('TransferID')
 }
 

src/packages/mobile/views/product/detail/index.vue

@@ -16,7 +16,7 @@
                     <span class="red">{{ goodsinfo.spotgoodsprice ?? 0.00 }}</span>
                     <span>元/{{ getGoodsUnitName(goodsinfo.unitid) }}</span>
                 </div>
-                <Icon class="goods-favorite" :name="isFavorite ? 'star-o' : 'star'" @click="favorite" />
+                <!-- <Icon class="goods-favorite" :name="isFavorite ? 'star-o' : 'star'" @click="favorite" /> -->
             </div>
             <div class="chart" v-if="chartData.price.length">
                 <component :is="componentMap.get('chart')" :loading="loading" :data-list="chartData" />

src/packages/mobile/views/product/list/index.less

@@ -1,27 +1,25 @@
 .product {
-    &__container {
-        padding-top: .2rem;
-
-        .van-cell {
-            &__value {
-                display    : flex;
-                align-items: center;
+    &__header {
+        .van-search {
+            padding-top: 0;
+        }
+    }
 
-                img {
-                    width        : 1rem;
-                    height       : 1rem;
-                    object-fit   : cover;
-                    border-radius: .16rem;
-                    margin-right : .4rem;
-                }
+    &__container {
+        .van-cell__title {
+            display    : flex;
+            align-items: center;
 
-                span {
-                    flex: 1;
-                }
+            img {
+                width        : 1.8rem;
+                height       : 1.8rem;
+                object-fit   : cover;
+                border-radius: .16rem;
+                margin-right : .4rem;
+            }
 
-                .van-button {
-                    width: 2rem;
-                }
+            span {
+                flex: 1;
             }
         }
     }

src/packages/mobile/views/product/list/index.vue

@@ -1,22 +1,16 @@
 <template>
-  <app-view class="product" flex>
+  <app-view class="product">
     <template #header>
-      <app-navbar title="产品介绍" />
+      <app-navbar title="合同转让" />
     </template>
-    <Tabs class="product__tabs" v-model:active="active" @change="onClickTab">
-      <Tab title="已关注" :name="0" />
-      <Tab title="未关注" :name="1" />
-    </Tabs>
-    <app-pull-refresh ref="pullRefreshRef" class="product__container" v-model:error="error"
-      v-model:pageIndex="pageIndex" :page-count="pageCount" @refresh="onRefresh">
-      <Empty v-if="dataList.length === 0" />
+    <app-pull-refresh class="product__container" v-model:error="error" v-model:pageIndex="pageIndex"
+      :page-count="pageCount" @refresh="onRefresh">
       <template v-for="(item, index) in dataList" :key="index">
-        <Cell>
-          <template #value>
+        <Cell
+          @click="$router.push({ name: 'product-detail', query: { favorite: active, wrstandardid: item.wrstandardid } })">
+          <template #title>
             <img :src="getFirstImage(item.thumurls)" />
             <span>{{ item.wrstandardname }}</span>
-            <Button type="primary" round size="small"
-              @click="$router.push({ name: 'product-detail', query: { favorite: active, wrstandardid: item.wrstandardid } })">立即进入</Button>
           </template>
         </Cell>
       </template>
@@ -26,13 +20,12 @@
   
 <script lang="ts" setup>
 import { shallowRef } from 'vue'
-import { Cell, Tabs, Tab, Button, Empty } from 'vant'
+import { Cell } from 'vant'
 import { getImageUrl } from '@/filters'
 import { useQueryTHJProductLists } from '@/business/goods'
 import AppPullRefresh from '@mobile/components/base/pull-refresh/index.vue'
 
 const { pageIndex, pageCount, getQueryTHJProductLists, active } = useQueryTHJProductLists()
-const pullRefreshRef = shallowRef()
 const dataList = shallowRef<Model.THJProductRsp[]>([])
 const error = shallowRef(false)
 
@@ -42,11 +35,6 @@ const getFirstImage = (url: string) => {
   return images[0] ?? ''
 }
 
-// Tab触发
-const onClickTab = () => {
-  pullRefreshRef.value?.refresh()
-}
-
 const onRefresh = (finish: () => void) => {
   /// 获取产品列表
   getQueryTHJProductLists().then((res) => {