diff --git a/components/task/taskItem.vue b/components/task/taskItem.vue
index 3cf4f85..a31c9f7 100644
--- a/components/task/taskItem.vue
+++ b/components/task/taskItem.vue
@@ -21,6 +21,7 @@
{{(datas.extend.transaction.arr.total_price?datas.extend.transaction.arr.total_price:0)+'元/'+(datas.extend.transaction.arr.day_money?datas.extend.transaction.arr.day_money:0)+'元'}}
+ {{(datas.extend.transaction.transaction_pool?datas.extend.transaction.transaction_pool:0)+'元'}}
抵达终点
diff --git a/pages/oaHome/oaHome.vue b/pages/oaHome/oaHome.vue
index 241fe7d..d51e2ae 100644
--- a/pages/oaHome/oaHome.vue
+++ b/pages/oaHome/oaHome.vue
@@ -250,6 +250,7 @@ export default {
label_name: "",
},
ApproveList: [],
+ showOaHomeData: false, //更新首页计算的值
};
},
onLoad () {
@@ -266,7 +267,6 @@ export default {
}
});
// #endif
-
},
onShow () {
// this.getUserIndex()
@@ -276,6 +276,12 @@ export default {
this.showToask();
// this.initOaHomeDada();
this.getOrderList();
+ // console.log(this.oaHomeData, this.oaHomeData.length==0);
+ if(this.oaHomeData.length==0){
+ this.$nextTick(()=>{
+ this.$store.dispatch('initConfig');
+ })
+ }
},
computed: {
oaHomeData(){
@@ -299,7 +305,6 @@ export default {
this.$refs.globalPopup.showPopu();
},
async getOrderList () {
- console.log("列表")
let id = JSON.parse(uni.getStorageSync("USER_INFO")).id || "";
let res = await getList({
user_id: id,
@@ -448,6 +453,7 @@ export default {
},
onPullDownRefresh () {
this.getOrderList();
+ this.$store.dispatch('initConfig');
// this.getIndexList()
uni.stopPullDownRefresh();
},
diff --git a/pages/oaTask/oaTask.vue b/pages/oaTask/oaTask.vue
index c938936..7220a83 100644
--- a/pages/oaTask/oaTask.vue
+++ b/pages/oaTask/oaTask.vue
@@ -1,12 +1,17 @@
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
+
@@ -23,6 +28,7 @@
},
data() {
return {
+ skeleton: false,
loadConfig:{
page: 1,
limit: 15,
@@ -44,8 +50,10 @@
},
methods: {
async loadList(){
+ this.skeleton = true;
let res = await taskLists({limit: 15, page: 1});
this.list = res.data;
+ this.$u.sleep(500).then(()=>{this.skeleton = false})
}
},
onPullDownRefresh() {
@@ -61,4 +69,8 @@
.task_list{
padding-top: 28rpx;
}
+ .loading{
+ padding: 28rpx;
+ margin-top: 28rpx;
+ }
diff --git a/store/modules/config.js b/store/modules/config.js
index be53b06..eaaa59d 100644
--- a/store/modules/config.js
+++ b/store/modules/config.js
@@ -4,7 +4,7 @@ import { getConfig } from "@/api/config.js";
const state = {
eyeType: Cache.get('eyeType') || true, // 小眼睛
request: Cache.get('request') || true, // 网络请求
- config: Cache.get('config') || {}
+ config: JSON.parse(Cache.get('config')||'{}')
};
const mutations = {
@@ -18,7 +18,7 @@ const mutations = {
},
SET_CONFIG(state, data){
state.config = {...data};
- Cache.set('config', state.config);
+ Cache.set('config', JSON.stringify(state.config));
}
};
diff --git a/subpkg/blockTransaction/blockTransaction.vue b/subpkg/blockTransaction/blockTransaction.vue
index 4b0531b..ccdb330 100644
--- a/subpkg/blockTransaction/blockTransaction.vue
+++ b/subpkg/blockTransaction/blockTransaction.vue
@@ -2,17 +2,21 @@
- 当日完成金额(元)
+ 当日完成金额
{{c_money(card.total_price)}}
- 目标完成金额(元)
+ 目标完成金额
{{c_money(card.day_money)}}
+
+ 交易金额剩余池
+ {{c_money(card.transaction_pool)}}
+
@@ -72,7 +76,8 @@
card: {
total_price: "0.00",
status: 1,
- day_money: "0.00"
+ day_money: "0.00",
+ transaction_pool: "0.00"
},
list: [],
task_id: '',
@@ -129,6 +134,7 @@
Object.keys(this.card).forEach((key)=>{
if(extend?.transaction?.arr[key]!=null&&extend?.transaction?.arr[key]!=undefined)this.card[key] = extend?.transaction?.arr[key];
})
+ this.card.transaction_pool = extend?.transaction.transaction_pool;
this.list = [...this.list, ...res.data?.list]
} catch (e) {
this.loadConfig.status = "nomore"
@@ -142,7 +148,7 @@
}catch(e){
str = '0.00'
}
- return str;
+ return '¥'+str;
}
},
onPullDownRefresh() {
@@ -161,7 +167,7 @@
background: #0122c7;
border-radius: 18rpx 18rpx 18rpx 18rpx;
opacity: 1;
- padding: 28rpx;
+ padding: 28rpx 12rpx;
display: flex;
justify-content: space-around;
color: #fff;
@@ -173,13 +179,14 @@
justify-content: space-between;
font-size: 28rpx;
flex: 1;
+ border-right: 1px solid #fff;
- &:nth-child(1) {
- border-right: 1px solid #fff;
+ &:last-child {
+ border-right: none;
}
.price {
- font-size: 49rpx;
+ font-size: 42rpx;
font-weight: 500;
}
}
diff --git a/subpkg/companyInfo/companyInfo.vue b/subpkg/companyInfo/companyInfo.vue
index 9673299..267ce58 100644
--- a/subpkg/companyInfo/companyInfo.vue
+++ b/subpkg/companyInfo/companyInfo.vue
@@ -234,7 +234,7 @@
.cards {
- margin: 28rpx 0;
+ margin-top: 28rpx;
width: 694rpx;
background: #ffffff;
border-radius: 30rpx;
@@ -363,7 +363,7 @@
}
.company_list {
- padding-bottom: 32rpx;
+ padding-bottom: 160rpx;
// margin-top: 190rpx;
display: flex;
flex-direction: column;
diff --git a/subpkg/shareCapital/shareCapital.vue b/subpkg/shareCapital/shareCapital.vue
index d622849..04e8f31 100644
--- a/subpkg/shareCapital/shareCapital.vue
+++ b/subpkg/shareCapital/shareCapital.vue
@@ -5,6 +5,32 @@
30000.00元
+
+
+
+
+ 《入股合同》
+
+
+ {{'2023-03-03'}}
+
+
+
+
+
+ 查看
+
+
+
+
+ 账单记录
+
+
+
+
+
+
+
退股
上交
@@ -39,6 +65,19 @@ import { Toast } from '../../libs/uniApi';
};
},
methods:{
+ navToContract(contract_no) {
+ if(!contract_no) return Toast('暂无合同')
+ download_file({
+ applyNo: contract_no
+ }).then(res => {
+ if (res.code != 1) {
+ Toast(res.msg)
+ }
+ uni.navigateTo({
+ url: `/subpkg/pdfView/pdfView?url=${res.data.url}`
+ })
+ })
+ },
retreat(){
Toast('开发中')
},
@@ -152,4 +191,64 @@ import { Toast } from '../../libs/uniApi';
font-size: 32rpx;
}
}
+.contract {
+ display: flex;
+ justify-content: space-between;
+ padding: 28rpx;
+
+ .left {
+ display: flex;
+
+ .contract_img {
+ width: 102rpx;
+ height: 102rpx;
+ background: #f5f5f5;
+ border-radius: 14rpx 14rpx 14rpx 14rpx;
+ margin-right: 21rpx;
+ }
+
+ .text {
+ display: flex;
+ flex-direction: column;
+ justify-content: space-around;
+
+ .name {
+ font-size: 32rpx;
+ font-weight: 500;
+ color: rgba(0, 0, 0, 0.8);
+ line-height: 35rpx;
+ }
+
+ .nickname {
+ margin-right: 35rpx;
+ }
+
+ text {
+ height: 39rpx;
+ font-size: 28rpx;
+ font-weight: 400;
+ color: #666666;
+ line-height: 35rpx;
+ }
+ }
+ }
+
+ .right {
+ font-size: 28rpx;
+ font-weight: 500;
+ color: $theme-oa-color;
+ line-height: 35rpx;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+
+ .icon {
+ width: 35rpx;
+ height: 39rpx;
+ background-color: $theme-oa-color;
+ opacity: 1;
+ margin-right: 10rpx;
+ }
+ }
+ }