From 6cafffd4fedfe5178206e435efec6093fb40cf76 Mon Sep 17 00:00:00 2001
From: weipengfei <2187978347@qq.com>
Date: Sat, 23 Sep 2023 11:37:52 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/task/taskItem.vue               |  18 +++
 pages.json                                 |   9 ++
 pages/oaExamine/oaExamine.vue              |  11 +-
 store/modules/app.js                       |   1 -
 subpkg/merchantDetails/merchantDetails.vue |  46 +++++++-
 subpkg/serviceTask/serviceTask.vue         | 124 +++++++++++++++++++++
 6 files changed, 201 insertions(+), 8 deletions(-)
 create mode 100644 subpkg/serviceTask/serviceTask.vue

diff --git a/components/task/taskItem.vue b/components/task/taskItem.vue
index e525e8c..9df0226 100644
--- a/components/task/taskItem.vue
+++ b/components/task/taskItem.vue
@@ -165,9 +165,27 @@
           case 35:
             this.navTo(`/subpkg/buyShare/buyShare?task_id=${this.$props.datas?.id}`);
             break;
+          case 44:
+            this.navTo(`/subpkg/serviceTask/serviceTask?task_id=${this.$props.datas?.id}`);
+            break;
+          case 45:
+            this.navTo(`/subpkg/serviceTask/serviceTask?task_id=${this.$props.datas?.id}`);
+            break;
+          case 46:
+            this.navTo(`/subpkg/serviceTask/serviceTask?task_id=${this.$props.datas?.id}`);
+            break;
           case 47:
             this.navTo(`/subpkg/serviceTask/serviceTask4?task_id=${this.$props.datas?.id}`);
             break;
+          case 48:
+            this.navTo(`/subpkg/serviceTask/serviceTask?task_id=${this.$props.datas?.id}`);
+            break;
+          case 49:
+            this.navTo(`/subpkg/serviceTask/serviceTask?task_id=${this.$props.datas?.id}`);
+            break;
+          case 50:
+            this.navTo(`/subpkg/serviceTask/serviceTask?task_id=${this.$props.datas?.id}`);
+            break;
           default:
             this.navTo('');
             break;
diff --git a/pages.json b/pages.json
index 4ea0caa..2627dd9 100644
--- a/pages.json
+++ b/pages.json
@@ -679,6 +679,15 @@
         "navigationBarBackgroundColor": "#0122C7",
         "navigationBarTextStyle": "white"
       }
+    }, {
+      "path": "serviceTask/serviceTask",
+      "style": {
+        "navigationBarTitleText": "任务",
+        "enablePullDownRefresh": false,
+        "navigationBarBackgroundColor": "#0122C7",
+        "navigationBarTextStyle": "white"
+      }
+
     }]
   }],
   "globalStyle": {
diff --git a/pages/oaExamine/oaExamine.vue b/pages/oaExamine/oaExamine.vue
index 25d0094..628625d 100644
--- a/pages/oaExamine/oaExamine.vue
+++ b/pages/oaExamine/oaExamine.vue
@@ -49,7 +49,7 @@
         list: [],
         loadConfig: {
         	page: 1,
-        	limit: 15,
+        	limit: 10,
         	lastpage: '',
         	loadingText: '努力加载中',
         	loadmoreText: '轻轻上拉',
@@ -62,7 +62,14 @@
       this.initType();
     },
     onShow() {
-      if(this.typeTabLists.length>0)this.initList();
+      if(this.typeTabLists.length>0){
+        this.loadConfig.page = 1;
+        this.loadConfig.status = "loading";
+        this.list = [];
+        this.$u.sleep(200).then(()=>{
+          this.loadList();
+        })
+      }
     },
     async onPullDownRefresh() {
       await this.initList();
diff --git a/store/modules/app.js b/store/modules/app.js
index 57363f2..bb3aab9 100644
--- a/store/modules/app.js
+++ b/store/modules/app.js
@@ -59,7 +59,6 @@ const actions = {
   RE_LOGIN({ state, commit }, data) {
     return new Promise((resolve, reject) => {
       let fromData = encrypt.decode('ACT');
-      console.log(fromData);
       if(fromData) {
         loginAccount({ ...fromData }, true).then((res) => {
           commit('SET_TOKEN', res.data);
diff --git a/subpkg/merchantDetails/merchantDetails.vue b/subpkg/merchantDetails/merchantDetails.vue
index 32fc983..b75a40d 100644
--- a/subpkg/merchantDetails/merchantDetails.vue
+++ b/subpkg/merchantDetails/merchantDetails.vue
@@ -71,12 +71,46 @@
         </view>
         <view class="body">
           <block v-for="(item, index) in extend.qualification">
-            <image @click="priview(item)"
-              :src="item"></image>
-            <view v-if="index<extend.qualification.length-1" style="border-top: 1px dashed #0022c7;margin: 28rpx 0;"></view>
+            <image @click="priview(item)" :src="item"></image>
+            <view v-if="index<extend.qualification.length-1" style="border-top: 1px dashed #0022c7;margin: 28rpx 0;">
+            </view>
           </block>
         </view>
       </view>
+      <view v-if="is_transaction" class="card">
+        <view class="nav_bar">
+          <view class="left">
+            <image src="../../static/img/company/SHZZ.png"></image>
+            <view>身份证明信息</view>
+          </view>
+        </view>
+        <view class="body">
+          <view class="b_item">
+            <view>银行账户姓名:</view>
+            <view>{{extend.bank_username}}</view>
+          </view>
+          <view class="b_item">
+            <view>开户行:</view>
+            <view>{{extend.bank_opening}}</view>
+          </view>
+          <view class="b_item">
+            <view>银行卡正面:</view>
+          </view>
+          <image @click="priview(extend.bank_front)" :src="extend.bank_front"></image>
+          <view class="b_item">
+            <view>银行卡反面:</view>
+          </view>
+          <image @click="priview(extend.bank_back)" :src="extend.bank_back"></image>
+          <view class="b_item">
+            <view>身份证正面:</view>
+          </view>
+          <image @click="priview(extend.cardno_front)" :src="extend.cardno_front"></image>
+          <view class="b_item">
+            <view>身份证反面:</view>
+          </view>
+          <image @click="priview(extend.cardno_back)" :src="extend.cardno_back"></image>
+        </view>
+      </view>
     </view>
     <block v-if="formData.check_status!=2&&formData.check_status!=3&&formData.check_status">
       <button class="btn" @click="tipShow = true">通过</button>
@@ -128,6 +162,7 @@
         extend: {
 
         },
+        is_transaction: false, // 是否为交易申请
         rules: {
           remark: {
             type: 'string',
@@ -143,6 +178,7 @@
       options.name ? uni.setNavigationBarTitle({
         title: options.name
       }) : null;
+      if (options.name.includes('交易')) this.is_transaction = true;
       this.initData();
     },
     onShow() {},
@@ -373,8 +409,8 @@
       }
     }
   }
-  
-  .refuse{
+
+  .refuse {
     width: 694rpx;
     padding: 28rpx;
     margin: 0 auto;
diff --git a/subpkg/serviceTask/serviceTask.vue b/subpkg/serviceTask/serviceTask.vue
new file mode 100644
index 0000000..9b1aa81
--- /dev/null
+++ b/subpkg/serviceTask/serviceTask.vue
@@ -0,0 +1,124 @@
+<template>
+  <view class="task_page">
+    <view class="card">
+      <view class="c_title">{{`任务名称: ${taskInfo.title||''}`}}</view>
+      <view>{{taskInfo.content||''}}</view>
+    </view>
+    <view class="card">
+      <view class="c_title">{{`判断条件: ${taskInfo.title||''}`}}</view>
+      <view>{{taskInfo.content||''}}</view>
+    </view>
+  </view>
+</template>
+
+<script>
+  import { Toast } from "../../libs/uniApi";
+  import { serviceTaskDetails } from "@/api/task.js"
+  export default {
+    data() {
+      return {
+        taskInfo:{
+          id: '',
+          title: '',
+          content: '',
+          extend: {}
+        },
+      }
+    },
+    onLoad(options) {
+      options.task_id?this.taskInfo.task_id=options.task_id:null;
+      this.initTask();
+    },
+    onShow() {},
+    methods: {
+      async initTask(){
+        let res = await serviceTaskDetails({
+          id: this.taskInfo.id
+        });
+        console.log(res);
+        this.taskInfo = res.data;
+      },
+    },
+  }
+</script>
+
+<style lang="scss">
+  .task_page {
+    padding-top: 30rpx;
+
+    .card {
+      margin: 0 auto;
+      margin-bottom: 28rpx;
+      width: 694rpx;
+      background-color: #fff;
+      border-radius: 26rpx;
+      padding: 28rpx;
+
+      .c_title {
+        font-size: 32rpx;
+        font-weight: bold;
+        color: #333333;
+        margin-bottom: 20rpx;
+      }
+
+      .file {
+        display: flex;
+        justify-content: left;
+        flex-wrap: wrap;
+
+        &_item {
+          flex-shrink: 0;
+          width: 200rpx;
+          height: 200rpx;
+          margin: 0 auto;
+          margin-bottom: 16rpx;
+          border: 2px solid #ccc;
+          border-radius: 10rpx;
+          overflow: hidden;
+          position: relative;
+
+          .image {
+            width: 100%;
+            height: 100%;
+          }
+
+          .del {
+            position: absolute;
+            height: 40rpx;
+            width: 40rpx;
+            top: 10rpx;
+            right: 10rpx;
+          }
+        }
+
+        &_btn {
+          flex-shrink: 0;
+          width: 200rpx;
+          height: 200rpx;
+          margin: 0 auto;
+          margin-bottom: 16rpx;
+          border: 2px solid #ccc;
+          display: flex;
+          justify-content: center;
+          align-items: center;
+          flex-direction: column;
+          border-radius: 10rpx;
+
+          image {
+            width: 100rpx;
+            height: 100rpx;
+          }
+        }
+
+        &_empty {
+          flex-shrink: 0;
+          width: 200rpx;
+          height: 200rpx;
+          margin: 0 auto;
+          margin-bottom: 16rpx;
+          border: 2px solid transparent;
+        }
+      }
+    }
+  }
+</style>
\ No newline at end of file