更新
This commit is contained in:
weipengfei
parent
0d1435e226
commit
4f39a6ba29
@ -39,21 +39,21 @@
|
||||
</view>
|
||||
<view class="cards_content">
|
||||
<view class="right">
|
||||
<view class="">
|
||||
<text>公司名称 :</text>
|
||||
<text> {{company.company_name}}</text>
|
||||
<view class="right_item">
|
||||
<view class="right_item_title">公司名称︰</view>
|
||||
<view> {{company.company_name}}</view>
|
||||
</view>
|
||||
<view class="" @click="copyPhone(company.master_email, '社会代码')">
|
||||
<text>社会代码 :</text>
|
||||
<text>{{company.organization_code}}</text>
|
||||
<view class="right_item" @click="copyPhone(company.master_email, '社会代码')">
|
||||
<view class="right_item_title">社会代码︰</view>
|
||||
<view>{{company.organization_code}}</view>
|
||||
</view>
|
||||
<view class="">
|
||||
<text>公司类型 :</text>
|
||||
<text>{{company.company_type_name||company.company_type}}</text>
|
||||
<view class="right_item">
|
||||
<view class="right_item_title">公司类型︰</view>
|
||||
<view>{{company.company_type_name||company.company_type}}</view>
|
||||
</view>
|
||||
<view class="">
|
||||
<text>负责区域 :</text>
|
||||
<text> {{c_address}} </text>
|
||||
<view class="right_item">
|
||||
<view class="right_item_title">负责区域︰</view>
|
||||
<view> {{c_address}} </view>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
@ -69,21 +69,21 @@
|
||||
</view>
|
||||
<view class="cards_content">
|
||||
<view class="right">
|
||||
<view class="">
|
||||
<text>法人姓名 :</text>
|
||||
<text> {{company.master_name}}</text>
|
||||
<view class="right_item">
|
||||
<view class="right_item_title">法人姓名︰</view>
|
||||
<view>{{company.master_name}}</view>
|
||||
</view>
|
||||
<view class="" @click="copyPhone(company.master_email, '社会代码')">
|
||||
<text>担任职务 :</text>
|
||||
<text>{{company.master_position}}</text>
|
||||
<view class="right_item" @click="copyPhone(company.master_email, '社会代码')">
|
||||
<view class="right_item_title">担任职务︰</view>
|
||||
<view>{{company.master_position}}</view>
|
||||
</view>
|
||||
<view class="" @click="copyPhone(company.master_email, '电话')">
|
||||
<text>联系电话 :</text>
|
||||
<text>{{company.master_phone}}</text>
|
||||
<view class="right_item" @click="copyPhone(company.master_email, '电话')">
|
||||
<view class="right_item_title">联系电话︰</view>
|
||||
<view>{{company.master_phone}}</view>
|
||||
</view>
|
||||
<view class="" @click="copyPhone(company.master_email, '邮箱')">
|
||||
<text>电子邮箱 :</text>
|
||||
<text> {{company.master_email}}</text>
|
||||
<view class="right_item" @click="copyPhone(company.master_email, '邮箱')">
|
||||
<view class="right_item_title">电子邮箱︰</view>
|
||||
<view>{{company.master_email}}</view>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
@ -154,21 +154,21 @@
|
||||
</view>
|
||||
<view class="cards_content">
|
||||
<view class="right">
|
||||
<view class="">
|
||||
<text>甲方 :</text>
|
||||
<text> {{contract.party_a_name}}</text>
|
||||
<view class="right_item">
|
||||
<view class="right_item_title">甲方︰</view>
|
||||
<view> {{contract.party_a_name}}</view>
|
||||
</view>
|
||||
<view class="" @click="copyPhone(company.master_email, '社会代码')">
|
||||
<text>乙方 :</text>
|
||||
<text>{{contract.party_b_name}}</text>
|
||||
<view class="right_item" @click="copyPhone(company.master_email, '社会代码')">
|
||||
<view class="right_item_title">乙方︰</view>
|
||||
<view>{{contract.party_b_name}}</view>
|
||||
</view>
|
||||
<view class="">
|
||||
<text>合同类型 :</text>
|
||||
<text>{{contract.contract_type_name}}</text>
|
||||
<view class="right_item">
|
||||
<view class="right_item_title">合同类型︰</view>
|
||||
<view>{{contract.contract_type_name}}</view>
|
||||
</view>
|
||||
<view class="">
|
||||
<text>合同编号 :</text>
|
||||
<text> {{contract.contract_no}} </text>
|
||||
<view class="right_item">
|
||||
<view class="right_item_title">合同编号︰</view>
|
||||
<view> {{contract.contract_no}} </view>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
@ -183,7 +183,6 @@
|
||||
<view class="text">
|
||||
<view class="name">合同</view>
|
||||
<view>
|
||||
|
||||
<text>{{contract.create_time}}</text>
|
||||
</view>
|
||||
</view>
|
||||
@ -531,14 +530,15 @@
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
justify-content: space-between;
|
||||
word-break: break-all;
|
||||
|
||||
view {
|
||||
margin-bottom: 10rpx;
|
||||
|
||||
text:nth-child(2) {
|
||||
margin-left: 20rpx;
|
||||
}
|
||||
}
|
||||
.right_item{
|
||||
display: flex;
|
||||
margin-bottom: 10rpx;
|
||||
.right_item_title{
|
||||
flex-shrink: 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -572,7 +572,7 @@
|
||||
.text {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
justify-content: space-between;
|
||||
justify-content: space-around;
|
||||
|
||||
.name {
|
||||
font-size: 32rpx;
|
||||
|
||||
@ -2,6 +2,25 @@ import Cache from '@/utils/cache';
|
||||
import { getConfig } from "@/api/config.js";
|
||||
import Updater from '@/uni_modules/guyue-updater/index';
|
||||
|
||||
|
||||
function compareVersions(version1, version2) {
|
||||
const arr1 = version1.split('.').map(Number);
|
||||
const arr2 = version2.split('.').map(Number);
|
||||
|
||||
for (let i = 0; i < Math.max(arr1.length, arr2.length); i++) {
|
||||
const num1 = i < arr1.length ? arr1[i] : 0;
|
||||
const num2 = i < arr2.length ? arr2[i] : 0;
|
||||
|
||||
if (num1 > num2) {
|
||||
return 1;
|
||||
} else if (num1 < num2) {
|
||||
return -1;
|
||||
}
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
const state = {
|
||||
eyeType: Cache.get('eyeType') || true, // 小眼睛
|
||||
request: Cache.get('request') || true, // 网络请求
|
||||
@ -27,18 +46,11 @@ const actions = {
|
||||
async initConfig({ state, commit }) {
|
||||
let res = await getConfig();
|
||||
commit('SET_CONFIG', res.data);
|
||||
let os = uni.getSystemInfoSync();
|
||||
// 版本更新
|
||||
if(res.data.newVersion){
|
||||
if(compareVersions(res.data.version, os.appVersion)==1){
|
||||
try{
|
||||
let info = res.data.versionInfo||{};
|
||||
// Updater.update({
|
||||
// title: '发现新版本',
|
||||
// content: '1. 我们更新了新的UI设计\n2. 我们更新了新的UI设计\n3. 我们更新了新的UI设计\n4. 我们更新了新的UI设计\n',
|
||||
// versionName: '1.3.6',
|
||||
// downUrl: 'https://lihai001.oss-cn-chengdu.aliyuncs.com/__UNI__B5B1EDD__20230816174515.apk',
|
||||
// force: false, // 是否强制更新
|
||||
// quiet: false // 是否静默更新
|
||||
// })
|
||||
info = {
|
||||
title: info.title||'发现新版本',
|
||||
content: info.content||'修复了部分BUG',
|
||||
@ -47,7 +59,7 @@ const actions = {
|
||||
force: info.force||false, // 是否强制更新
|
||||
quiet: info.quiet||false // 是否静默更新
|
||||
}
|
||||
Updater.update(info)
|
||||
Updater.update(info);
|
||||
}catch(e){
|
||||
console.log(e);
|
||||
}
|
||||
@ -55,6 +67,7 @@ const actions = {
|
||||
}
|
||||
};
|
||||
|
||||
|
||||
export default {
|
||||
state,
|
||||
mutations,
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user