li.shaoyi před 2 roky
rodič
revize
7f388f6177

+ 2 - 2
oem/qxst/manifest.json

@@ -5,9 +5,9 @@
     "name" : "贵茶数字化",
     /*应用名称,程序桌面图标名称*/
     "version" : {
-        "name" : "1.0.8",
+        "name" : "1.0.9",
         /*应用版本名称*/
-        "code" : 100008
+        "code" : 100009
     },
     "description" : "",
     /*应用描述信息*/

Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 826 - 16
package-lock.json


+ 1 - 0
package.json

@@ -73,6 +73,7 @@
     "compression-webpack-plugin": "^10.0.0",
     "copy-webpack-plugin": "^11.0.0",
     "electron": "^22.0.0",
+    "electron-builder": "^24.6.4",
     "eslint": "^7.32.0",
     "eslint-plugin-vue": "^8.0.3",
     "fork-ts-checker-webpack-plugin": "^8.0.0",

+ 12 - 2
src/packages/mobile/views/bank/sign/Index.vue

@@ -9,7 +9,7 @@
                 <Cell title="银行卡号" :value="bankInfo.bankaccountno" />
                 <template v-if="bankInfo.signstatus === SignStatus.Signed">
                     <Cell title="姓名" :value="bankInfo.bankaccountname" />
-                    <Cell title="手机号码" :value="bankInfo.mobilephone" />
+                    <Cell title="手机号码" :value="bankInfo.mobilephone" v-if="bankInfo.mobilephone" />
                 </template>
                 <Cell title="支行名称" v-if="bankInfo.branchbankname != ''" :value="bankInfo.branchbankname" />
                 <Cell title="状态" :value="getSignStatusName(bankInfo.signstatus)" />
@@ -25,7 +25,7 @@
                     v-if="[SignStatus.Unsigned, SignStatus.Refuse].includes(bankInfo.signstatus)">重新签约</Button>
                 <Button type="warning" round block @click="formSubmit"
                     v-if="bankInfo.signstatus === SignStatus.Signed && cusBank?.canrelease === 1">解约</Button>
-                <Button type="danger" round block @click="showComponent(true)"
+                <Button type="danger" round block @click="beforeShowComponent"
                     v-if="bankInfo.signstatus === SignStatus.Signed && cusBank?.canmodifysigninfo === 1">修改</Button>
             </div>
         </template>
@@ -92,6 +92,16 @@ const showComponent = (isEdit: boolean) => {
     openComponent('edit')
 }
 
+const beforeShowComponent = () => {
+    if (bankInfo.value?.cusbankid === 'jdjs') {
+        dialog('请先发函到结算中心修改信息后再修改,否则将会影响出入金。').then(() => {
+            showComponent(true)
+        })
+    } else {
+        showComponent(true)
+    }
+}
+
 onActivated(() => {
     useStore.getUserData()
     formRefresh()

+ 3 - 15
src/packages/mobile/views/rules/yszc/Index.vue

@@ -1,27 +1,15 @@
 <template>
-    <app-view class="rules">
+    <app-view>
         <template #header>
             <app-navbar title="隐私政策" />
         </template>
-        <Tabs>
-            <Tab title="隐私政策">
-                <component :is="asyncComponent" :url="getHtmlFileUrl('yszc.htm')" />
-            </Tab>
-            <Tab title="物流隐私条款">
-                <component :is="asyncComponent" :url="getHtmlFileUrl('wlystk.htm')" />
-            </Tab>
-        </Tabs>
+        <component :is="asyncComponent" :url="getHtmlFileUrl('yszc.htm')" />
     </app-view>
 </template>
 
 <script lang="ts" setup>
 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>
-
-<style lang="less">
-@import './index.less';
-</style>
+</script>

+ 2 - 2
src/packages/pc/components/layouts/header/index.vue

@@ -10,7 +10,7 @@
                 <el-badge type="danger" :is-dot="noticeStore.unreadList.length > 0">
                     <app-icon icon="g-icon--notice" @click="openComponent('notice')" />
                 </el-badge>
-                <app-icon icon="Tickets" @click="openComponent('report')" />
+                <!-- <app-icon icon="Tickets" @click="openComponent('report')" /> -->
                 <app-icon icon="Setting" @click="openComponent('setting')" />
                 <span class="g-icon--minimize" @click="exitFullSreen" v-if="fullScreen"></span>
                 <span class="g-icon--maximize" @click="setFullSreen" v-else></span>
@@ -80,7 +80,7 @@ const exitFullSreen = () => {
 onMounted(() => {
     /// 如果未同意 或者跨天
     if (!localData.getValue('isReportAgree') || diffDays(localData.getValue('reportTime')) > 0) {
-        openComponent('report')
+        //openComponent('report')
     }
     // 监听全屏变化
     window.addEventListener('fullscreenchange', () => {

+ 2 - 2
src/packages/pc/components/layouts/page/index.vue

@@ -86,10 +86,10 @@ const handleComponent = (component: Record<'type', { name: RouteRecordName | und
 const checkServerTime = () => {
   getServerTime().then((res) => {
     serverTime.value = moment.parseZone(res.data)
-    // 每5分钟同步一次服务器时间
+    // 每1分钟同步一次服务器时间
     timerTask.setTimeout(() => {
       checkServerTime()
-    }, 5 * 60 * 1000, 'getServerTime')
+    }, 60 * 1000, 'getServerTime')
   })
 }
 

Některé soubory nejsou zobrazeny, neboť je v těchto rozdílových datech změněno mnoho souborů