li.shaoyi пре 2 година
родитељ
комит
f531573af0

+ 10 - 0
src/filters/index.ts

@@ -26,6 +26,16 @@ export function getFileUrl(filePath?: string) {
 }
 
 /**
+ * 获取html文件地址
+ * @param fileName 
+ * @returns 
+ */
+export function getHtmlFileUrl(fileName: string) {
+    const { mobileOpenUrl } = service.config
+    return mobileOpenUrl + '/html/' + fileName
+}
+
+/**
  * 获取资讯分享链接
  * @param filePath 
  */

+ 5 - 5
src/packages/mobile/views/mine/order/detail/purchasetrade/index.vue

@@ -13,8 +13,8 @@
                 <Cell title="每吨预付金" :value="handleNumberValue(detail.transferprice.toFixed(2), '元')" />
                 <Cell title="交收结算价"
                     :value="handleNumberValue(detail.lastprice.toFixed(2), '元/' + getGoodsUnitName(detail.unitid))" />
-                <Cell title="款" :value="handleNumberValue(detail.remainamount.toFixed(2), '元')" />
-                <Cell title="款支付截止日" label="河钢招标价公布后2个工作日内付款" />
+                <Cell title="款" :value="handleNumberValue(detail.remainamount.toFixed(2), '元')" />
+                <Cell title="款支付截止日" label="河钢招标价公布后2个工作日内付款" />
                 <Cell title="状态" :value="detail.thjorderstatusdisplay" />
                 <Cell title="采购时间" :value="formatDate(detail.tradetime)" />
                 <!-- <Cell title="合同转让截止日" :value="detail.enddate" /> -->
@@ -94,7 +94,7 @@ if (item) {
     detail.value = JSON.parse(item.toString())
 }
 
-const { componentRef, componentId, openComponent, closeComponent } = useComponent(() => {
+const { componentRef, componentId, closeComponent } = useComponent(() => {
     router.back()
 })
 
@@ -121,7 +121,7 @@ const spotPricingSubmit = () => {
     const { priceflag, ystspotgoodsprice, todayspotgoodsprice, diffprice } = spotgoods.value ?? {}
 
     if (pointflag) {
-        dialog('采购当日不能点价或当日已点价,请明天再试')
+        dialog('采购当日不能点价或当日已点价,请明天再试')
     } else if (priceflag) {
         let message = `今日差价${diffprice}元/吨(昨结${ystspotgoodsprice},今开${todayspotgoodsprice}),是否点价?\n`
         message += `<span style="color:red;">剩余点价次数${availabletime}/${pointtimes}</span>`
@@ -180,7 +180,7 @@ const spotApplySubmit = () => {
             fullloading((hideLoading) => {
                 applySubmit(param.wrtradedetailid).then(() => {
                     hideLoading()
-                    dialog('违约提交成功,请耐心等待审核').then(() => {
+                    dialog('违约提交成功,请耐心等待审核').then(() => {
                         router.back()
                     })
                 }).catch((err) => {

+ 1 - 1
src/packages/mobile/views/mine/order/detail/transfer/index.vue

@@ -14,7 +14,7 @@
                 <Cell title="付款比例" :value="parsePercent(details.depositrate)" />
                 <Cell title="状态" :value="getTHJTransferStatusName(details.transferstatus)" />
                 <Cell title="转让时间" :value="formatDate(details.createtime)" />
-                <Cell title="合同转让截止日" :value="details.enddate" />
+                <!-- <Cell title="合同转让截止日" :value="details.enddate" /> -->
             </CellGroup>
             <CellGroup title="交收信息">
                 <Cell title="交收方式" :value="getTHJDeliveryModeName(details.thjdeliverymode)" />

+ 1 - 1
src/packages/mobile/views/mine/order/his/purchasetrade/index.vue

@@ -43,7 +43,7 @@
                                 <span>{{ handleNumberValue(item.lastprice, '元') }}</span>
                             </li>
                             <li>
-                                <span>款</span>
+                                <span>款</span>
                                 <span>{{ handleNumberValue(item.remainamount, '元') }}</span>
                             </li>
                         </ul>

+ 1 - 1
src/packages/mobile/views/mine/order/list/components/purchasetrade/index.vue

@@ -40,7 +40,7 @@
                             <span>{{ handleNumberValue(item.lastprice, '元/' + getGoodsUnitName(item.unitid)) }}</span>
                         </li>
                         <li>
-                            <span>款</span>
+                            <span>款</span>
                             <span>{{ handleNumberValue(item.remainamount, '元') }}</span>
                         </li>
                     </ul>

+ 1 - 1
src/packages/mobile/views/navigation/ptgz/index.vue

@@ -19,7 +19,7 @@
         <Cell title="点价规则" :to="{ name: 'rules-dj' }" is-link />
         <Cell title="积分规则" :to="{ name: 'rules-jf' }" is-link />
         <Cell title="采购合同" :to="{ name: 'rules-cght' }" is-link />
-        <Cell title="合同转让" :to="{ name: 'rules-zrht' }" is-link />
+        <!-- <Cell title="合同转让" :to="{ name: 'rules-zrht' }" is-link /> -->
         <Cell title="现货合同" :to="{ name: 'rules-xhht' }" is-link />
         <Cell title="风险告知" :to="{ name: 'rules-yhkhfxgzs' }" is-link />
       </CellGroup>

+ 2 - 2
src/packages/mobile/views/purchase/detail/index.vue

@@ -107,7 +107,7 @@
 import { shallowRef, computed, defineAsyncComponent } from 'vue'
 import { CellGroup, Button, Dialog, Field, Form, FormInstance, showSuccessToast, showFailToast, FieldRule, Icon } from 'vant'
 import { fullloading } from '@/utils/vant'
-import { getFileUrl, parsePercent } from '@/filters'
+import { getFileUrl, getHtmlFileUrl, parsePercent } from '@/filters'
 import { getGoodsUnitName } from '@/constants/unit'
 import { useComponent } from '@/hooks/component'
 import { useNavigation } from '@/hooks/navigation'
@@ -129,7 +129,7 @@ const accountStore = useAccountStore()
 const wrstandardid = getQueryStringToNumber('wrstandardid')
 const formRef = shallowRef<FormInstance>()
 const showDialog = shallowRef(false)
-const htmlContext = '<img src="./html/cght.gif" />'
+const htmlContext = `<img src="${getHtmlFileUrl('cght.gif')}" />`
 
 const { loading, details, customDeposits, chartData, getWrstandardDetails, getTHJinvesotrdeposit } = useWrstandardDetails(wrstandardid)
 const { formData, formSubmit } = usePurchaseOrderDesting()

+ 2 - 1
src/packages/mobile/views/rules/buyrule/index.vue

@@ -3,12 +3,13 @@
     <template #header>
       <app-navbar title="买方规则" />
     </template>
-    <component :is="asyncComponent" url="./html/mjgz_b.htm" />
+    <component :is="asyncComponent" :url="getHtmlFileUrl('mjgz_b.htm')" />
   </app-view>
 </template>
 
 <script lang="ts" setup>
 import { defineAsyncComponent } from 'vue'
+import { getHtmlFileUrl } from '@/filters'
 
 const asyncComponent = defineAsyncComponent(() => import('@mobile/components/base/html-panel/index.vue'))
 </script>

+ 4 - 4
src/packages/mobile/views/rules/ccwl/index.vue

@@ -13,7 +13,7 @@
                 </div>
             </Tab>
             <Tab title="仓储服务">
-                <component :is="asyncComponent" url="./html/ccfw.htm" />
+                <component :is="asyncComponent" :url="getHtmlFileUrl('ccfw.htm')" />
             </Tab>
         </Tabs>
     </app-view>
@@ -22,14 +22,14 @@
 <script lang="ts" setup>
 import { Tab, Tabs, Button } from 'vant'
 import { defineAsyncComponent } from 'vue'
-import service from '@/services'
+import { getHtmlFileUrl } from '@/filters'
 import plus from '@/utils/h5plus'
 
 const asyncComponent = defineAsyncComponent(() => import('@mobile/components/base/html-panel/index.vue'))
 
 const download = () => {
-    const url = service.getConfig('mobileOpenUrl')
-    plus.openURL(url + '/html/yswtmb.docx')
+    const url = getHtmlFileUrl('yswtmb.docx')
+    plus.openURL(url)
 }
 </script>
 

+ 2 - 1
src/packages/mobile/views/rules/djgz/index.vue

@@ -3,12 +3,13 @@
     <template #header>
       <app-navbar title="点价规则" />
     </template>
-    <component :is="asyncComponent" url="./html/djgz.htm" />
+    <component :is="asyncComponent" :url="getHtmlFileUrl('djgz.htm')" />
   </app-view>
 </template>
 
 <script lang="ts" setup>
 import { defineAsyncComponent } from 'vue'
+import { getHtmlFileUrl } from '@/filters'
 
 const asyncComponent = defineAsyncComponent(() => import('@mobile/components/base/html-panel/index.vue'))
 </script>

+ 2 - 1
src/packages/mobile/views/rules/fpsm/index.vue

@@ -3,12 +3,13 @@
         <template #header>
             <app-navbar title="发票说明" />
         </template>
-        <component :is="asyncComponent" url="./html/fpsm.htm" />
+        <component :is="asyncComponent" :url="getHtmlFileUrl('fpsm.htm')" />
     </app-view>
 </template>
 
 <script lang="ts" setup>
 import { defineAsyncComponent } from 'vue'
+import { getHtmlFileUrl } from '@/filters'
 
 const asyncComponent = defineAsyncComponent(() => import('@mobile/components/base/html-panel/index.vue'))
 </script>

+ 2 - 1
src/packages/mobile/views/rules/fwrx/index.vue

@@ -3,12 +3,13 @@
         <template #header>
             <app-navbar title="服务热线" />
         </template>
-        <component :is="asyncComponent" url="./html/fwrx.htm" />
+        <component :is="asyncComponent" :url="getHtmlFileUrl('fwrx.htm')" />
     </app-view>
 </template>
 
 <script lang="ts" setup>
 import { defineAsyncComponent } from 'vue'
+import { getHtmlFileUrl } from '@/filters'
 
 const asyncComponent = defineAsyncComponent(() => import('@mobile/components/base/html-panel/index.vue'))
 </script>

+ 2 - 1
src/packages/mobile/views/rules/fxgzs/index.vue

@@ -3,12 +3,13 @@
         <template #header>
             <app-navbar title="用户开户风险告知书" />
         </template>
-        <component :is="asyncComponent" url="./html/yhkhfxgzs.htm" />
+        <component :is="asyncComponent" :url="getHtmlFileUrl('yhkhfxgzs.htm')" />
     </app-view>
 </template>
 
 <script lang="ts" setup>
 import { defineAsyncComponent } from 'vue'
+import { getHtmlFileUrl } from '@/filters'
 
 const asyncComponent = defineAsyncComponent(() => import('@mobile/components/base/html-panel/index.vue'))
 </script>

+ 2 - 1
src/packages/mobile/views/rules/gywm/index.vue

@@ -3,12 +3,13 @@
         <template #header>
             <app-navbar title="关于我们" />
         </template>
-        <component :is="asyncComponent" url="./html/gywm.htm" />
+        <component :is="asyncComponent" :url="getHtmlFileUrl('gywm.htm')" />
     </app-view>
 </template>
 
 <script lang="ts" setup>
 import { defineAsyncComponent } from 'vue'
+import { getHtmlFileUrl } from '@/filters'
 
 const asyncComponent = defineAsyncComponent(() => import('@mobile/components/base/html-panel/index.vue'))
 </script>

+ 2 - 1
src/packages/mobile/views/rules/jfgz/index.vue

@@ -3,12 +3,13 @@
     <template #header>
       <app-navbar title="积分规则" />
     </template>
-    <component :is="asyncComponent" url="./html/jfgz.htm" />
+    <component :is="asyncComponent" :url="getHtmlFileUrl('jfgz.htm')" />
   </app-view>
 </template>
 
 <script lang="ts" setup>
 import { defineAsyncComponent } from 'vue'
+import { getHtmlFileUrl } from '@/filters'
 
 const asyncComponent = defineAsyncComponent(() => import('@mobile/components/base/html-panel/index.vue'))
 </script>

+ 4 - 3
src/packages/mobile/views/rules/myrz/index.vue

@@ -8,15 +8,16 @@
             <Tab title="仓单质押" />
             <Tab title="联名互保" />
         </Tabs>
-        <component :is="asyncComponent" url="./html/yhsxzc.htm" v-show="active === 0" />
-        <component :is="asyncComponent" url="./html/cdzyzc.htm" v-show="active === 1" />
-        <component :is="asyncComponent" url="./html/lmhbzc.htm" v-show="active === 2" />
+        <component :is="asyncComponent" :url="getHtmlFileUrl('yhsxzc.htm')" v-show="active === 0" />
+        <component :is="asyncComponent" :url="getHtmlFileUrl('cdzyzc.htm')" v-show="active === 1" />
+        <component :is="asyncComponent" :url="getHtmlFileUrl('lmhbzc.htm')" v-show="active === 2" />
     </app-view>
 </template>
 
 <script lang="ts" setup>
 import { shallowRef, defineAsyncComponent } from 'vue'
 import { Tab, Tabs } from 'vant'
+import { getHtmlFileUrl } from '@/filters'
 
 const asyncComponent = defineAsyncComponent(() => import('@mobile/components/base/html-panel/index.vue'))
 const active = shallowRef(0)

+ 2 - 1
src/packages/mobile/views/rules/ptgz/index.vue

@@ -3,12 +3,13 @@
     <template #header>
       <app-navbar title="平台规则" />
     </template>
-    <component :is="asyncComponent" url="./html/ptgz.htm" />
+    <component :is="asyncComponent" :url="getHtmlFileUrl('ptgz.htm')" />
   </app-view>
 </template>
 
 <script lang="ts" setup>
 import { defineAsyncComponent } from 'vue'
+import { getHtmlFileUrl } from '@/filters'
 
 const asyncComponent = defineAsyncComponent(() => import('@mobile/components/base/html-panel/index.vue'))
 </script>

+ 2 - 1
src/packages/mobile/views/rules/sellrule/index.vue

@@ -3,12 +3,13 @@
     <template #header>
       <app-navbar title="卖方规则" />
     </template>
-    <component :is="asyncComponent" url="./html/mjgz_s.htm" />
+    <component :is="asyncComponent" :url="getHtmlFileUrl('mjgz_s.htm')" />
   </app-view>
 </template>
 
 <script lang="ts" setup>
 import { defineAsyncComponent } from 'vue'
+import { getHtmlFileUrl } from '@/filters'
 
 const asyncComponent = defineAsyncComponent(() => import('@mobile/components/base/html-panel/index.vue'))
 </script>

+ 4 - 3
src/packages/mobile/views/rules/yszc/index.vue

@@ -5,18 +5,19 @@
         </template>
         <Tabs>
             <Tab title="隐私政策">
-                <component :is="asyncComponent" url="./html/yszc.htm" />
+                <component :is="asyncComponent" :url="getHtmlFileUrl('yszc.htm')" />
             </Tab>
             <Tab title="物流隐私条款">
-                <component :is="asyncComponent" url="./html/wlystk.htm" />
+                <component :is="asyncComponent" :url="getHtmlFileUrl('wlystk.htm')" />
             </Tab>
         </Tabs>
     </app-view>
 </template>
 
 <script lang="ts" setup>
-import {  defineAsyncComponent } from 'vue'
+import { defineAsyncComponent } from 'vue'
 import { Tab, Tabs } from 'vant'
+import { getHtmlFileUrl } from '@/filters'
 
 const asyncComponent = defineAsyncComponent(() => import('@mobile/components/base/html-panel/index.vue'))
 </script>

+ 2 - 1
src/packages/mobile/views/rules/zcxy/index.vue

@@ -3,12 +3,13 @@
         <template #header>
             <app-navbar title="用户注册协议" />
         </template>
-        <component :is="asyncComponent" url="./html/yhzcxy.htm" />
+        <component :is="asyncComponent" :url="getHtmlFileUrl('yhzcxy.htm')" />
     </app-view>
 </template>
 
 <script lang="ts" setup>
 import { defineAsyncComponent } from 'vue'
+import { getHtmlFileUrl } from '@/filters'
 
 const asyncComponent = defineAsyncComponent(() => import('@mobile/components/base/html-panel/index.vue'))
 </script>