From 7af24e2656ddae37f03f1ae62b439f1bbf6a9dc4 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 06 六月 2025 18:28:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0.1' into 2.0.1

---
 company/src/components/enterprise/onlineReporting.vue                                                   |   77 ++++++++-------
 company/src/components/business/OpearaCaseEntryWindow.vue                                               |   21 ++++
 wx/unpackage/dist/dev/mp-weixin/common/main.js                                                          |    2 
 wx/unpackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map                                           |    2 
 wx/unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-checkbox-group/u-checkbox-group.json |    4 
 wx/main.js                                                                                              |    2 
 company/src/components/business/adjustment.vue                                                          |   12 ++
 company/.env.developmentCom                                                                             |    4 
 company/src/views/business/caseEntry.vue                                                                |   14 +-
 company/src/views/business/settleClaims.vue                                                             |    4 
 company/src/views/enterprise/settleClaimsCom.vue                                                        |   45 ++++----
 company/.env.production                                                                                 |    2 
 company/src/components/business/OperaSettleClaimsWindow.vue                                             |   49 +++++++--
 company/.env.productionCom                                                                              |    2 
 company/src/components/business/caseProgress.vue                                                        |    4 
 company/src/components/common/upload.vue                                                                |    7 +
 wx/unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-checkbox/u-checkbox.json             |    4 
 wx/unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-toast/u-toast.json                   |    4 
 company/.env.development                                                                                |    4 
 19 files changed, 167 insertions(+), 96 deletions(-)

diff --git a/company/.env.development b/company/.env.development
index c8e723c..62955cc 100644
--- a/company/.env.development
+++ b/company/.env.development
@@ -9,9 +9,9 @@
 VUE_APP_COOKIE_NAME='dmplat-auth-token'
 
 # 娴嬭瘯鏈�
-# VUE_APP_API = 'https://dmtest.ahapp.net/yyb_admin_api/'
+VUE_APP_API = 'https://test.doumee.cn:8088/yyb_admin_api/'
 
 # 浠诲悍
-VUE_APP_API = 'http://192.168.0.131:10030/'
+# VUE_APP_API = 'http://192.168.0.131:10030/'
 
 # VUE_APP_API = 'http://192.168.0.131:10031/'
diff --git a/company/.env.developmentCom b/company/.env.developmentCom
index 12e6d6b..199e4b7 100644
--- a/company/.env.developmentCom
+++ b/company/.env.developmentCom
@@ -7,10 +7,10 @@
 VUE_APP_CONTEXT_PATH = '/yyb_web'
 VUE_APP_COOKIE_NAME='doumee-auth-token'
 
-# VUE_APP_API = 'https://dmtest.ahapp.net/yyb_web_api/'
+VUE_APP_API = 'https://test.doumee.cn:8088/yyb_web_api/'
 
 # VUE_APP_API = 'http://localhost:10031/'
 
-VUE_APP_API = 'http://192.168.0.131:10031/'
+# VUE_APP_API = 'http://192.168.0.131:10031/'
 
 # VUE_APP_API = 'https://www.yyb.red/yyb_web_api/'
diff --git a/company/.env.production b/company/.env.production
index 663a10b..983987d 100644
--- a/company/.env.production
+++ b/company/.env.production
@@ -8,7 +8,7 @@
 VUE_APP_CONTEXT_PATH = '/yyb_admin'
 
 # 骞冲彴绔�
-VUE_APP_API = 'https://test.doumee.cn/yyb_admin_api/'
+VUE_APP_API = 'https://test.doumee.cn:8088/yyb_admin_api/'
 
 # 浼佷笟绔�
 # VUE_APP_API = 'https://www.yyb.red/yyb_admin_api/'
diff --git a/company/.env.productionCom b/company/.env.productionCom
index b4b1899..9609418 100644
--- a/company/.env.productionCom
+++ b/company/.env.productionCom
@@ -12,7 +12,7 @@
 VUE_APP_SYSTEM_TITLE = '浜戞槗淇濆鎴锋湇鍔$郴缁�-浼佷笟绔�'
 
 # 浼佷笟绔�
-VUE_APP_API = 'https://test.doumee.cn/yyb_web_api/'
+VUE_APP_API = 'https://test.doumee.cn:8088/yyb_web_api/'
 
 # 浼佷笟绔�
 # VUE_APP_API = 'https://www.yyb.red/yyb_web_api/'
diff --git a/company/src/components/business/OpearaCaseEntryWindow.vue b/company/src/components/business/OpearaCaseEntryWindow.vue
index 785aabb..dab49d4 100644
--- a/company/src/components/business/OpearaCaseEntryWindow.vue
+++ b/company/src/components/business/OpearaCaseEntryWindow.vue
@@ -51,6 +51,7 @@
                                 <el-date-picker
                                     v-model="ruleForm.extData.memberBirthday"
                                     type="date"
+                                    @change="changeMemberBirthday"
                                     placeholder="閫夋嫨鏃ユ湡"
                                     format="yyyy 骞� MM 鏈� dd 鏃�"
                                     value-format="yyyy-MM-dd">
@@ -982,6 +983,26 @@
       }
       this.getCompensations()
     },
+      changeMemberBirthday(e) {
+          if (!e) {
+              this.ruleForm.extData.memberAge = ''
+          } else {
+              this.ruleForm.extData.memberAge = this.calculateAge(e)
+          }
+      },
+      calculateAge(birthDate) {
+          const today = new Date();
+          const birthDateObject = new Date(birthDate);
+
+          let age = today.getFullYear() - birthDateObject.getFullYear();
+          const monthDiff = today.getMonth() - birthDateObject.getMonth();
+
+          if (monthDiff < 0 || (monthDiff === 0 && today.getDate() < birthDateObject.getDate())) {
+              age--;
+          }
+
+          return age;
+      },
     confirm () {
       this.$refs.ruleForm.validate((valid) => {
         if (!valid) return
diff --git a/company/src/components/business/OperaSettleClaimsWindow.vue b/company/src/components/business/OperaSettleClaimsWindow.vue
index ec348b6..a652802 100644
--- a/company/src/components/business/OperaSettleClaimsWindow.vue
+++ b/company/src/components/business/OperaSettleClaimsWindow.vue
@@ -37,7 +37,11 @@
                         <div class="box_dk_list_row_label">鎵撴鍑瘉锛�</div>
                         <div class="box_dk_list_row_l" v-if="info.payFileList">
                             <div class="box_dk_list_row_l_img" v-for="(item, index) in info.payFileList" :key="index">
-                                <img :src="item.fileurlFull" alt="">
+                                <el-image
+                                    style="width: 80px; height: 80px"
+                                    :src="item.fileurlFull"
+                                    :preview-src-list="[item.fileurlFull]">
+                                </el-image>
                             </div>
                         </div>
                     </div>
@@ -51,7 +55,7 @@
                     <div class="box_tui_info">浜哄憳锛氬钩鍙扮悊璧斾汉鍛�-{{info.refuseSettleClaimsLog.creatorName}}</div>
                     <div class="box_tui_row"><div class="yuan"></div>{{info.refuseSettleClaimsLog.content}}</div>
                 </div>
-                <div class="box_tui" v-if="[6].includes(info.status)">
+                <div class="box_tui" v-if="[6,8].includes(info.status)">
                     <span class="box_tui_status">宸叉嫆缁�</span>
                     <div class="box_tui_title">鎷掔粷鍘熷洜</div>
                     <div class="box_tui_info">鏃堕棿锛歿{info.refuseSettleClaimsLog.createDate}}</div>
@@ -166,7 +170,7 @@
                             <span>椋庨櫓妗堜欢</span>
                         </div>
                         <template v-if="userInfo.type === 0">
-                            <el-select v-model="info.caseType" @change="setCaseType" style="width: 100px;" placeholder="妗堜欢绫诲瀷" v-if="[9,10,11].includes(info.status)">
+                            <el-select v-model="info.caseType" @change="setCaseType" style="width: 100px;" placeholder="妗堜欢绫诲瀷" v-if="[9,10,11,12].includes(info.status)">
                                 <el-option label="鍖荤枟" :value="1"></el-option>
                                 <el-option label="浼ゆ畫" :value="2"></el-option>
                                 <el-option label="姝讳骸" :value="3"></el-option>
@@ -182,8 +186,8 @@
                             <el-button type="danger" @click="returnCase" v-if="[1,2].includes(info.status)">閫�鍥�</el-button>
                             <el-button type="primary" @click="register" v-if="[1,2].includes(info.status)">绔嬫</el-button>
                             <el-button type="primary" @click="$refs.acceptance.open('妗堜欢鍙楃悊', info.id)" v-if="[3,5].includes(info.status)">鍙楃悊</el-button>
-                            <el-button type="primary" @click="addRemark" v-if="![0,1,2,4,13,14].includes(info.status)">澶囨敞</el-button>
-                            <el-button type="primary" @click="addReport(1)" v-if="[3,7,9].includes(info.status) && info.reportNumStatus === 0">娣诲姞鎶ユ鍙�</el-button>
+                            <el-button type="primary" @click="addRemark" v-if="![0,1,2,4,14].includes(info.status)">澶囨敞</el-button>
+                            <el-button type="primary" @click="addReport(1)" v-if="[3,9].includes(info.status) && info.reportNumStatus === 0">娣诲姞鎶ユ鍙�</el-button>
                             <el-button type="primary" @click="addReport(2)" v-if="[9].includes(info.status) && info.reportNumStatus === 1">缂栬緫鎶ユ鍙�</el-button>
                             <el-button type="primary" @click="$refs.adjustment.open('鐞嗙畻', info.id, 1)" v-if="[9].includes(info.status)">鐞嗙畻</el-button>
                             <el-button type="primary" @click="$refs.adjustment.open('閲嶆柊鐞嗙畻', info.id, 1)" v-if="[10].includes(info.status)">閲嶆柊鐞嗙畻</el-button>
@@ -205,7 +209,7 @@
                         鎶ユ鍙凤細{{info.code}}
                     </div>
                     <div class="box_desc_list_row">
-                        淇濆徃鎶ユ鍙凤細{{info.reportNum || 's'}}
+                        淇濆徃鎶ユ鍙凤細{{info.reportNum}}
                     </div>
                     <div class="box_desc_list_row">
                         鎵�灞炰繚鍗曪細{{info.applyCode}}
@@ -301,6 +305,22 @@
                         </div>
                     </div>
                 </div>
+                <div class="box_desc_head" style="margin-top: 30px;">
+                    <div class="box_desc_title">
+                        <span class="box_desc_title_val">鏀舵淇℃伅</span>
+                    </div>
+                </div>
+                <div class="box_desc_list">
+                    <div class="box_desc_list_row">
+                        鏀舵閾惰锛歿{info.receiveBank}}
+                    </div>
+                    <div class="box_desc_list_row">
+                        鏀舵浜猴細{{info.receiveUserName}}
+                    </div>
+                    <div class="box_desc_list_row">
+                        鏀舵璐﹀彿锛歿{info.receiveAccount}}
+                    </div>
+                </div>
             </div>
             <div class="box_desc">
                 <div class="box_desc_head">
@@ -393,14 +413,15 @@
 <script>
 import BaseOpera from '@/components/base/BaseOpera'
 import GlobalWindow from '@/components/common/GlobalWindow'
-import { findById, returnSettle } from '@/api/business/settleClaims'
+import { findById } from '@/api/business/settleClaims'
 import {
   register,
   addReportNum,
   addRemark,
   saveSupplementDescribe,
   updCaseType,
-  confirmFee
+  confirmFee,
+  returnSettle
 } from '@/api/business/settleRisk'
 import RiskCaseReminder from '@/components/business/riskCaseReminder'
 import CaseProgress from '@/components/business/caseProgress'
@@ -447,6 +468,9 @@
       updCaseType({ id: this.id, caseType: e })
         .then(res => {
           this.getDetail()
+        })
+        .catch(err => {
+            this.$message.error(err.message)
         })
     },
     supplementaryMaterials () {
@@ -606,16 +630,19 @@
         })
     },
     // 鎾ら攢
-    revoke (id) {
+    revoke () {
       this.$confirm('鎾ら攢鍚庯紝妗堜欢鐩存帴缁撴潫锛屾棤娉曠户缁繘琛岀悊璧旀搷浣滐紒', '鏄惁鎾ら攢鎶ユ锛�', {
         confirmButtonText: '纭畾鎾ら攢',
         cancelButtonText: '鎴戝啀鎯虫兂',
-        type: 'warning'
+        type: 'warning',
       }).then(() => {
         returnSettle({ id: this.info.id })
           .then(res => {
             this.getDetail()
-          })
+          }).catch(err => {
+              console.log(err)
+            this.$message.error(err.message)
+        })
       }).catch(() => {
 
       })
diff --git a/company/src/components/business/adjustment.vue b/company/src/components/business/adjustment.vue
index 03fef14..4007357 100644
--- a/company/src/components/business/adjustment.vue
+++ b/company/src/components/business/adjustment.vue
@@ -26,7 +26,7 @@
                         <div class="box_item_list_row" style="width: 50%;" v-for="(item, index) in list2" :key="index">
                             <el-form-item :label="item.name">
                                 <div style="display: flex; flex-direction: column;">
-                                    <el-input v-model="item.fee" @input="changeFee" type="number" placeholder="璇疯緭鍏ラ噾棰�"></el-input>
+                                    <el-input v-model="item.fee" @input="changeFee()" type="number" placeholder="璇疯緭鍏ラ噾棰�"></el-input>
                                     <el-input v-model="item.describe" placeholder="璇疯緭鍏ヨ垂鐢ㄨ鏄�"></el-input>
                                 </div>
                             </el-form-item>
@@ -93,13 +93,21 @@
             },
             changeFee() {
                 let arr = [...this.list1, ...this.list2]
+
+                for (let i = 0; i < arr.length; i++) {
+                    if (!/^\d+(\.\d{1,2})?$/.test(arr[i].fee)) {
+                        arr[i].fee = 0
+                        this.$message.warning('鍙兘杈撳叆姝f暟锛屾渶澶氬彧鑳借緭鍏ヤ袱浣嶅皬鏁�')
+                    }
+                }
+
                 let price = 0
                 arr.forEach(item => {
                     if (item.fee) {
                         price += Number(item.fee)
                     }
                 })
-                this.totalPrice = price
+                this.totalPrice = Math.round(price * 100) / 100;
             },
             confirm() {
                 this.$refs.form.validate((valid) => {
diff --git a/company/src/components/business/caseProgress.vue b/company/src/components/business/caseProgress.vue
index e68e24a..56d89c9 100644
--- a/company/src/components/business/caseProgress.vue
+++ b/company/src/components/business/caseProgress.vue
@@ -3,7 +3,7 @@
         :title="title"
         width="50%"
         :withFooter="false"
-        :visible.sync="visible"鏄惁
+        :visible.sync="visible"
         :confirm-working="isWorking"
     >
         <el-timeline reverse>
@@ -11,7 +11,7 @@
                 <div style="display: flex; flex-direction: column;">
                     <span class="a">{{item.title}}</span>
                     <span class="b">{{item.creatorName}} {{item.companyName || '骞冲彴鐞嗚禂鍛�'}} {{item.createDate }}</span>
-                    <span class="c" v-if="index>0">璇存槑锛歿{item.content}}</span>
+                    <span class="c" v-if="index >0 && item.content">璇存槑锛歿{item.content}}</span>
                 </div>
             </el-timeline-item>
         </el-timeline>
diff --git a/company/src/components/common/upload.vue b/company/src/components/common/upload.vue
index b15d398..a0fcf08 100644
--- a/company/src/components/common/upload.vue
+++ b/company/src/components/common/upload.vue
@@ -57,6 +57,12 @@
     },
     getFile (e) {
       if (e.target && e.target.files.length > 0) {
+          const loading = this.$loading({
+              lock: true,
+              text: '涓婁紶涓紝璇风瓑寰�',
+              spinner: 'el-icon-loading',
+              background: 'rgba(0, 0, 0, 0.7)'
+          });
         this.$emit('loading')
         const formdate = new FormData()
         formdate.append('file', e.target.files[0])
@@ -69,6 +75,7 @@
             this.$message.error(e)
           })
           .finally(() => {
+              loading.close();
             this.$refs.file.value = null
           })
       }
diff --git a/company/src/components/enterprise/onlineReporting.vue b/company/src/components/enterprise/onlineReporting.vue
index 5e21033..bdb78be 100644
--- a/company/src/components/enterprise/onlineReporting.vue
+++ b/company/src/components/enterprise/onlineReporting.vue
@@ -7,7 +7,7 @@
         :confirm-working="isWorking"
         @confirm="confirm"
     >
-        <div class="box">
+        <div class="box" id="section1">
             <div class="box_status">
                 <div class="box_status_row" v-for="(item, index) in statusList" :key="index">
                     <div :class="index <= i ? 'box_status_row_icon statusColor2 statusColor3' : 'box_status_row_icon'">
@@ -181,7 +181,7 @@
                             </div>
                             <div class="box_desc_list_row">
                                 <el-form-item label="鎶ユ浜鸿仈绯绘柟寮�" prop="informantPhone">
-                                    <el-input v-model="form.informantPhone" placeholder="璇疯緭鍏�"></el-input>
+                                    <el-input v-model="form.informantPhone" type="number" maxlength="11" placeholder="璇疯緭鍏�"></el-input>
                                 </el-form-item>
                             </div>
                             <div class="box_desc_list_ZW"></div>
@@ -393,13 +393,13 @@
             </el-form>
             <div class="box_footer">
                 <div class="box_footer_btns" v-if="i === 0">
-                    <el-button type="primary" @click="confirm(0)">鏆傚瓨</el-button>
+                    <el-button type="primary" :loading="isWorking" @click="confirm(0)">鏆傚瓨</el-button>
                     <el-button type="primary" @click="next">涓嬩竴姝�</el-button>
                 </div>
                 <div class="box_footer_btns" v-if="i === 1">
-                    <el-button @click="i--">涓婁竴姝�</el-button>
-                    <el-button type="primary" @click="confirm(0)">鏆傚瓨</el-button>
-                    <el-button type="primary" @click="confirm(1)">鎻愪氦</el-button>
+                    <el-button @click="previousStep">涓婁竴姝�</el-button>
+                    <el-button type="primary" :loading="isWorking" @click="confirm(0)">鏆傚瓨</el-button>
+                    <el-button type="primary" :loading="isWorking" @click="confirm(1)">鎻愪氦</el-button>
                 </div>
             </div>
         </div>
@@ -432,6 +432,15 @@
     ...mapState(['userInfo'])
   },
   data () {
+      var checkPhone = (rule, value, callback) => {
+          if (value === '') {
+              callback(new Error('璇疯緭鍏�'));
+          } else if (!/^[1]\d{10}$/.test(value)) {
+              callback(new Error('鎵嬫満鍙蜂笉鍚堟硶'));
+          } else {
+              callback();
+          }
+      };
     return {
       i: 0,
       id: null,
@@ -521,7 +530,7 @@
           { required: true, message: '涓嶈兘涓虹┖' }
         ],
         informantPhone: [
-          { required: true, message: '涓嶈兘涓虹┖' }
+          { required: true, validator: checkPhone }
         ]
       },
       pickerOptions: {
@@ -544,6 +553,7 @@
   methods: {
     open (title, id) {
       this.title = title
+      this.continueReporting()
       this.form.area = []
       this.i = 0
       this.solutionList = []
@@ -758,40 +768,37 @@
       }
     },
     confirm (saveType) {
-      this.isWorking = true
-      saveSettleClaims({ ...this.form, saveType })
-        .then(res => {
-          console.log(res)
-          if (saveType === 0) {
-            this.visible = false
-          } else {
-            this.id = res
-            this.i = 2
-          }
-          this.$emit('success')
-        }).catch(err => {
-          this.$tip.apiFailed(err)
-        })
-        .finally(() => {
-          this.isWorking = false
+        this.$refs.form.validate((valid) => {
+            if (!valid) return;
+            this.isWorking = true
+            saveSettleClaims({ ...this.form, saveType })
+                .then(res => {
+                    if (saveType === 0) {
+                        this.visible = false
+                    } else {
+                        this.id = res
+                        this.i = 2
+                    }
+                    this.$emit('success')
+                }).catch(err => {
+                this.$tip.apiFailed(err)
+            })
+                .finally(() => {
+                    this.isWorking = false
+                })
         })
     },
+      previousStep() {
+          this.i--
+          var element = document.getElementById('section1');
+          element.scrollIntoView({ behavior: 'smooth' });
+      },
     next () {
       this.$refs.form.validate((valid) => {
         if (!valid) return
         this.i++
-        // this.isWorking = true
-        // createSys(obj)
-        //     .then(() => {
-        //         this.visible = false
-        //         this.$emit('success')
-        //     })
-        //     .catch(e => {
-        //         this.$tip.apiFailed(e)
-        //     })
-        //     .finally(() => {
-        //         this.isWorking = false
-        //     })
+          var element = document.getElementById('section1');
+          element.scrollIntoView({ behavior: 'smooth' });
       })
     }
   }
diff --git a/company/src/views/business/caseEntry.vue b/company/src/views/business/caseEntry.vue
index 3b83398..6faa002 100644
--- a/company/src/views/business/caseEntry.vue
+++ b/company/src/views/business/caseEntry.vue
@@ -23,10 +23,10 @@
             <el-form-item label="鍑洪櫓鏃堕棿" prop="createDate">
                 <el-date-picker
                     v-model="searchForm.createDate"
-                    type="datetime"
+                    type="date"
                     placeholder="閫夋嫨鏃ユ湡"
-                    format="yyyy-MM-dd hh:mm:ss"
-                    value-format="yyyy-MM-dd hh:mm:ss">
+                    format="yyyy-MM-dd"
+                    value-format="yyyy-MM-dd">
                 </el-date-picker>
             </el-form-item>
             <el-form-item label="鍑洪櫓浜�" prop="extData.memberName">
@@ -76,12 +76,12 @@
                 <el-table-column prop="reportNum" label="妗堜欢鍙�" min-width="150px" align="center"></el-table-column>
                 <el-table-column prop="companyName" label="鎶曚繚鍗曚綅" min-width="150px" align="center"></el-table-column>
                 <el-table-column prop="informantName" label="鎶ユ浜�" min-width="150px" align="center"></el-table-column>
-                <el-table-column prop="reportDate" label="鎶ユ鏃堕棿" min-width="100px" align="center"></el-table-column>
+                <el-table-column prop="createDateStr" label="鎶ユ鏃堕棿" min-width="100px" align="center"></el-table-column>
                 <el-table-column prop="happenTime" label="鍑洪櫓鏃堕棿" min-width="120px" align="center"></el-table-column>
                 <el-table-column prop="memberName" label="鍑洪櫓浜�" min-width="120px" align="center"></el-table-column>
-                <el-table-column prop="memberIdcard" label="韬唤璇佸彿" min-width="120px" align="center"></el-table-column>
+                <el-table-column prop="memberIdcardNo" label="韬唤璇佸彿" min-width="120px" align="center"></el-table-column>
                 <el-table-column prop="solutionName" label="淇濋櫓鏂规" min-width="120px" align="center"></el-table-column>
-                <el-table-column prop="code" label="淇濆崟鍙�" min-width="120px" align="center"></el-table-column>
+                <el-table-column prop="applyCode" label="淇濆崟鍙�" min-width="120px" align="center"></el-table-column>
                 <el-table-column prop="baoxianStartTime" label="淇濋櫓鐢熸晥璧锋湡" min-width="120px" align="center"></el-table-column>
                 <el-table-column prop="baoxianEndTime" label="淇濋櫓鐢熸晥姝㈡湡" min-width="120px" align="center"></el-table-column>
                 <el-table-column label="灏辫瘖绫诲瀷" min-width="120px" align="center">
@@ -100,7 +100,7 @@
                     fixed="right"
                 >
                     <template slot-scope="{row}">
-                        <el-button type="text">璇︽儏</el-button>
+<!--                        <el-button type="text">璇︽儏</el-button>-->
                         <el-button type="text" @click="$refs.opearaCaseEntryWindow.open('妗堜欢褰曞叆', row.id)">缂栬緫</el-button>
                         <el-button type="text" @click="deleRow(row.id)">鍒犻櫎</el-button>
                     </template>
diff --git a/company/src/views/business/settleClaims.vue b/company/src/views/business/settleClaims.vue
index 0c178d9..5e95e9f 100644
--- a/company/src/views/business/settleClaims.vue
+++ b/company/src/views/business/settleClaims.vue
@@ -75,7 +75,7 @@
                   <span :class="'settle-status'+row.status">{{row.statusName}}</span>
                 </template>
               </el-table-column>
-                <el-table-column prop="reportNum" label="鎶ユ鍙�" min-width="100px"></el-table-column>
+                <el-table-column prop="code" label="鎶ユ鍙�" min-width="100px"></el-table-column>
                 <el-table-column prop="companyName" label="鎶ユ浼佷笟" min-width="100px"></el-table-column>
                 <el-table-column prop="memberName" label="鍑洪櫓浜�" min-width="100px"></el-table-column>
                 <el-table-column prop="memberIdcardNo" label="韬唤璇佸彿" min-width="100px"></el-table-column>
@@ -111,7 +111,7 @@
                         <el-button
                             type="text"
                             @click="$refs.onlineReporting.open('缂栬緫鎶ユ', row.id)"
-                            v-if="[0,1,2,4,5,7].includes(row.status) && userInfo.type === 1">
+                            v-if="[0,1,2,4,5].includes(row.status) && userInfo.type === 1">
                             缂栬緫
                         </el-button>
                         <el-button
diff --git a/company/src/views/enterprise/settleClaimsCom.vue b/company/src/views/enterprise/settleClaimsCom.vue
index df52836..2a1d638 100644
--- a/company/src/views/enterprise/settleClaimsCom.vue
+++ b/company/src/views/enterprise/settleClaimsCom.vue
@@ -71,9 +71,23 @@
                 v-loading="isWorking.search"
                 :data="tableData.list"
                 stripe>
-                <el-table-column label="搴忓彿" width="80px">
-                    <template slot-scope="scope">
-                        <span>{{scope.$index + 1}}</span>
+<!--                <el-table-column label="搴忓彿" width="80px">-->
+<!--                    <template slot-scope="scope">-->
+<!--                        <span>{{scope.$index + 1}}</span>-->
+<!--                    </template>-->
+<!--                </el-table-column>-->
+                <el-table-column prop="code" label="鎶ユ鍙�" min-width="100px"></el-table-column>
+                <el-table-column prop="informantName" label="鎶ユ浜�" min-width="100px"></el-table-column>
+                <el-table-column prop="createDate" label="鎶ユ鏃堕棿" min-width="150px"></el-table-column>
+                <el-table-column prop="memberName" label="鍑洪櫓浜�" min-width="100px"></el-table-column>
+                <el-table-column prop="memberIdcardNo" label="韬唤璇佸彿" min-width="180px"></el-table-column>
+                <el-table-column prop="duName" label="鐢ㄤ汉閬e崟浣�" min-width="180px"></el-table-column>
+                <el-table-column prop="applyCode" label="淇濆崟鍙�" min-width="100px"></el-table-column>
+                <el-table-column prop="solutionName" label="淇濋櫓鏂规" min-width="180px"></el-table-column>
+                <el-table-column prop="money" label="璧斾粯閲戦(鍏�)" min-width="100px">
+                    <template slot-scope="{row}">
+                        <span style="color: #f95601;cursor: pointer" v-if="[11,12,13].includes(row.status)" :title="'涓昏禂浠橈細'+(row.hpAccount||0) +'鍏� 鍏朵粬璧斾粯锛�'+(row.hpOtherAccount||0) +'鍏�'">{{(row.hpAccount||0) +(row.hpOtherAccount ||0 ) }}</span>
+                        <span v-else>-</span>
                     </template>
                 </el-table-column>
               <el-table-column prop="statusName" label="妗堜欢鐘舵��" min-width="100px">
@@ -81,25 +95,12 @@
                   <span :class="'settle-status'+row.status">{{row.statusName}}</span>
                 </template>
               </el-table-column>
-                <el-table-column prop="reportNum" label="鎶ユ鍙�" min-width="100px"></el-table-column>
-                <el-table-column prop="informantName" label="鎶ユ浜�" min-width="100px"></el-table-column>
-                <el-table-column prop="createDate" label="鎶ユ鏃堕棿" min-width="150px"></el-table-column>
-              <el-table-column prop="memberName" label="鍑洪櫓浜�" min-width="100px"></el-table-column>
-                <el-table-column prop="memberIdcardNo" label="韬唤璇佸彿" min-width="180px"></el-table-column>
-              <el-table-column prop="duName" label="鐢ㄤ汉閬e崟浣�" min-width="180px"></el-table-column>
-              <el-table-column prop="applyCode" label="淇濆崟鍙�" min-width="100px"></el-table-column>
-              <el-table-column prop="solutionName" label="淇濋櫓鏂规" min-width="180px"></el-table-column>
-                <el-table-column prop="money" label="璧斾粯閲戦(鍏�)" min-width="100px">
-                  <template slot-scope="{row}">
-                    <span style="color: #f95601;cursor: pointer" v-if="[11,12,13].includes(row.status)" :title="'涓昏禂浠橈細'+(row.hpAccount||0) +'鍏� 鍏朵粬璧斾粯锛�'+(row.hpOtherAccount||0) +'鍏�'">{{(row.hpAccount||0) +(row.hpOtherAccount ||0 ) }}</span>
-                    <span v-else>-</span>
-                  </template>
-                </el-table-column>
-                <el-table-column prop="baoxianStartTime" label="淇濋櫓鐢熸晥璧锋湡" min-width="100px"></el-table-column>
-                <el-table-column prop="isRisk" label="鏄惁椋庨櫓妗堜欢" min-width="100px">
-                  <template slot-scope="{row}"> <span style="color: red" v-if="row.isRisk === 1">椋庨櫓妗堜欢</span></template>
-                </el-table-column>
-                <el-table-column prop="createDate" label="鎶ユ鏃堕棿" min-width="100px"></el-table-column>
+
+<!--                <el-table-column prop="baoxianStartTime" label="淇濋櫓鐢熸晥璧锋湡" min-width="100px"></el-table-column>-->
+<!--                <el-table-column prop="isRisk" label="鏄惁椋庨櫓妗堜欢" min-width="100px">-->
+<!--                  <template slot-scope="{row}"> <span style="color: red" v-if="row.isRisk === 1">椋庨櫓妗堜欢</span></template>-->
+<!--                </el-table-column>-->
+<!--                <el-table-column prop="createDate" label="鎶ユ鏃堕棿" min-width="100px"></el-table-column>-->
                 <el-table-column
                     v-if="containPermissions(['business:settleclaims:update', 'business:settleclaims:delete'])"
                     label="鎿嶄綔"
diff --git a/wx/main.js b/wx/main.js
index cd0ab80..b7da11c 100644
--- a/wx/main.js
+++ b/wx/main.js
@@ -9,7 +9,7 @@
 
 // Vue.prototype.$baseUrl = 'http://192.168.0.131:10031/';
 // Vue.prototype.$baseUrl = 'http://192.168.0.110:10031';
-Vue.prototype.$baseUrl = 'https://test.doumee.cn/yyb_web_api/';
+Vue.prototype.$baseUrl = 'https://test.doumee.cn:8088/yyb_web_api/';
 // Vue.prototype.$baseUrl = 'https://www.yyb.red/yyb_web_api/'
 Vue.prototype.$store = store;
 
diff --git a/wx/unpackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map b/wx/unpackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map
index d472898..4ce4a65 100644
--- a/wx/unpackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map
+++ b/wx/unpackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map
@@ -1 +1 @@
-{"version":3,"sources":["uni-app:///main.js","webpack:///D:/璞嗙背/yunyibao/wx/App.vue?36c5","webpack:///D:/璞嗙背/yunyibao/wx/App.vue?398d","uni-app:///App.vue","webpack:///D:/璞嗙背/yunyibao/wx/App.vue?b91a"],"names":["wx","__webpack_require_UNI_MP_PLUGIN__","__webpack_require__","Vue","config","productionTip","App","mpType","prototype","$baseUrl","$store","store","use","uView","app","httpApi","interceptor","$mount","render","staticRenderFns","components","renderjs","component","options","__file","onLaunch","console","onShow","onHide"],"mappings":"+IAAA,MAE2D,eAC3D,WACA,WACA,OACA,gBAmBA,YAIA,YAAqD,2kBA3BrDA,EAAGC,kCAAoCC,EAMvCC,UAAIC,OAAOC,eAAgB,EAC3BC,UAAIC,OAAS,MAIbJ,UAAIK,UAAUC,SAAW,sCAEzBN,UAAIK,UAAUE,OAASC,UAEvBR,UAAIS,IAAIC,WAER,IAAMC,EAAM,IAAIX,UAAI,EAAD,CAClBQ,iBACGL,YAKJH,UAAIS,IAAIG,UAASD,GAIjBX,UAAIS,IAAII,UAAaF,GAErB,EAAAA,GAAIG,W,8EChCJ,yHAAIC,EAAQC,EAAmCC,EAC3CC,EADJ,QASIC,EAAY,qBACd,aACAJ,EACAC,GACA,EACA,KACA,KACA,MACA,EACAC,EACAC,GAGFC,EAAUC,QAAQC,OAAS,UACZ,aAAAF,E,yCCvBf,wHAAkvB,eAAG,G,wGCCrvB,CACAG,oBACAC,2BAEAC,oBAeAC,kBACAF,0BAEA,a,gCCvBA,wHAAq4C,eAAG,G","file":"common/main.js","sourcesContent":["import 'uni-pages';\r\n// @ts-ignore\r\nwx.__webpack_require_UNI_MP_PLUGIN__ = __webpack_require__;import App from './App'\r\nimport Vue from 'vue'\r\nimport uView from \"uview-ui\";\r\nimport './uni.promisify.adaptor'\r\nimport store from './store/index.js'\r\n\r\nVue.config.productionTip = false\r\nApp.mpType = 'app'\r\n\r\n// Vue.prototype.$baseUrl = 'http://192.168.0.131:10031/';\r\n// Vue.prototype.$baseUrl = 'http://192.168.0.110:10031';\r\nVue.prototype.$baseUrl = 'https://test.doumee.cn/yyb_web_api/';\r\n// Vue.prototype.$baseUrl = 'https://www.yyb.red/yyb_web_api/'\r\nVue.prototype.$store = store;\r\n\r\nVue.use(uView);\r\n\r\nconst app = new Vue({\r\n\tstore,\r\n\t...App\r\n})\r\n\r\n// http鎺ュ彛API鎶界\r\nimport httpApi from '@/utils/http.api.js'\r\nVue.use(httpApi, app)\r\n\r\n// 璇锋眰鎷︽埅鍣╘r\nimport interceptor from '@/utils/http.interceptor.js'\r\nVue.use(interceptor, app)\r\n\r\napp.$mount()","var render, staticRenderFns, recyclableRender, components\nvar renderjs\nimport script from \"./App.vue?vue&type=script&lang=js&\"\nexport * from \"./App.vue?vue&type=script&lang=js&\"\nimport style0 from \"./App.vue?vue&type=style&index=0&lang=scss&\"\n\n\n/* normalize component */\nimport normalizer from \"!../../../鍔炲叕/HBuilderX.3.8.12.20230817/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/runtime/componentNormalizer.js\"\nvar component = normalizer(\n  script,\n  render,\n  staticRenderFns,\n  false,\n  null,\n  null,\n  null,\n  false,\n  components,\n  renderjs\n)\n\ncomponent.options.__file = \"App.vue\"\nexport default component.exports","import mod from \"-!../../../鍔炲叕/HBuilderX.3.8.12.20230817/HBuilderX/plugins/uniapp-cli/node_modules/babel-loader/lib/index.js!../../../鍔炲叕/HBuilderX.3.8.12.20230817/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader/index.js??ref--13-1!../../../鍔炲叕/HBuilderX.3.8.12.20230817/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!../../../鍔炲叕/HBuilderX.3.8.12.20230817/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/index.js??vue-loader-options!../../../鍔炲叕/HBuilderX.3.8.12.20230817/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./App.vue?vue&type=script&lang=js&\"; export default mod; export * from \"-!../../../鍔炲叕/HBuilderX.3.8.12.20230817/HBuilderX/plugins/uniapp-cli/node_modules/babel-loader/lib/index.js!../../../鍔炲叕/HBuilderX.3.8.12.20230817/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader/index.js??ref--13-1!../../../鍔炲叕/HBuilderX.3.8.12.20230817/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!../../../鍔炲叕/HBuilderX.3.8.12.20230817/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/index.js??vue-loader-options!../../../鍔炲叕/HBuilderX.3.8.12.20230817/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./App.vue?vue&type=script&lang=js&\"","<script>\r\n\texport default {\r\n\t\tonLaunch: function() {\r\n\t\t\tconsole.log('App Launch')\r\n\t\t},\r\n\t\tonShow: function() {\r\n\t\t\t// var that = this;\r\n\t\t\t// uni.login({\r\n\t\t\t// \tprovider: 'weixin',\r\n\t\t\t// \tsuccess: async function (loginRes) {\r\n\t\t\t// \t\tlet { code } = loginRes;\r\n\t\t\t// \t\tlet res = await that.$u.api.loginByWxMini({ code })\r\n\t\t\t// \t\tif (!res.data) {\r\n\t\t\t// \t\t\tuni.navigateTo({\r\n\t\t\t// \t\t\t\turl: '/pages/login/login'\r\n\t\t\t// \t\t\t})\r\n\t\t\t// \t\t}\r\n\t\t\t// \t}\r\n\t\t\t// });\r\n\t\t},\r\n\t\tonHide: function() {\r\n\t\t\tconsole.log('App Hide')\r\n\t\t}\r\n\t}\r\n</script>\r\n\r\n<style lang=\"scss\">\r\n\t/*姣忎釜椤甸潰鍏叡css */\r\n\t@import \"uview-ui/index.scss\";\r\n</style>\r\n","import mod from \"-!../../../鍔炲叕/HBuilderX.3.8.12.20230817/HBuilderX/plugins/uniapp-cli/node_modules/mini-css-extract-plugin/dist/loader.js??ref--8-oneOf-1-0!../../../鍔炲叕/HBuilderX.3.8.12.20230817/HBuilderX/plugins/uniapp-cli/node_modules/css-loader/dist/cjs.js??ref--8-oneOf-1-1!../../../鍔炲叕/HBuilderX.3.8.12.20230817/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/stylePostLoader.js!../../../鍔炲叕/HBuilderX.3.8.12.20230817/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader/index.js??ref--8-oneOf-1-2!../../../鍔炲叕/HBuilderX.3.8.12.20230817/HBuilderX/plugins/uniapp-cli/node_modules/postcss-loader/src/index.js??ref--8-oneOf-1-3!../../../鍔炲叕/HBuilderX.3.8.12.20230817/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/sass-loader/dist/cjs.js??ref--8-oneOf-1-4!../../../鍔炲叕/HBuilderX.3.8.12.20230817/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader/index.js??ref--8-oneOf-1-5!../../../鍔炲叕/HBuilderX.3.8.12.20230817/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/index.js??vue-loader-options!../../../鍔炲叕/HBuilderX.3.8.12.20230817/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./App.vue?vue&type=style&index=0&lang=scss&\"; export default mod; export * from \"-!../../../鍔炲叕/HBuilderX.3.8.12.20230817/HBuilderX/plugins/uniapp-cli/node_modules/mini-css-extract-plugin/dist/loader.js??ref--8-oneOf-1-0!../../../鍔炲叕/HBuilderX.3.8.12.20230817/HBuilderX/plugins/uniapp-cli/node_modules/css-loader/dist/cjs.js??ref--8-oneOf-1-1!../../../鍔炲叕/HBuilderX.3.8.12.20230817/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/stylePostLoader.js!../../../鍔炲叕/HBuilderX.3.8.12.20230817/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader/index.js??ref--8-oneOf-1-2!../../../鍔炲叕/HBuilderX.3.8.12.20230817/HBuilderX/plugins/uniapp-cli/node_modules/postcss-loader/src/index.js??ref--8-oneOf-1-3!../../../鍔炲叕/HBuilderX.3.8.12.20230817/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/sass-loader/dist/cjs.js??ref--8-oneOf-1-4!../../../鍔炲叕/HBuilderX.3.8.12.20230817/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader/index.js??ref--8-oneOf-1-5!../../../鍔炲叕/HBuilderX.3.8.12.20230817/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/index.js??vue-loader-options!../../../鍔炲叕/HBuilderX.3.8.12.20230817/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./App.vue?vue&type=style&index=0&lang=scss&\""],"sourceRoot":""}
\ No newline at end of file
+{"version":3,"sources":["uni-app:///main.js","webpack:///D:/璞嗙背/yunyibao/wx/App.vue?36c5","webpack:///D:/璞嗙背/yunyibao/wx/App.vue?398d","uni-app:///App.vue","webpack:///D:/璞嗙背/yunyibao/wx/App.vue?b91a"],"names":["wx","__webpack_require_UNI_MP_PLUGIN__","__webpack_require__","Vue","config","productionTip","App","mpType","prototype","$baseUrl","$store","store","use","uView","app","httpApi","interceptor","$mount","render","staticRenderFns","components","renderjs","component","options","__file","onLaunch","console","onShow","onHide"],"mappings":"+IAAA,MAE2D,eAC3D,WACA,WACA,OACA,gBAmBA,YAIA,YAAqD,2kBA3BrDA,EAAGC,kCAAoCC,EAMvCC,UAAIC,OAAOC,eAAgB,EAC3BC,UAAIC,OAAS,MAIbJ,UAAIK,UAAUC,SAAW,2CAEzBN,UAAIK,UAAUE,OAASC,UAEvBR,UAAIS,IAAIC,WAER,IAAMC,EAAM,IAAIX,UAAI,EAAD,CAClBQ,iBACGL,YAKJH,UAAIS,IAAIG,UAASD,GAIjBX,UAAIS,IAAII,UAAaF,GAErB,EAAAA,GAAIG,W,8EChCJ,yHAAIC,EAAQC,EAAmCC,EAC3CC,EADJ,QASIC,EAAY,qBACd,aACAJ,EACAC,GACA,EACA,KACA,KACA,MACA,EACAC,EACAC,GAGFC,EAAUC,QAAQC,OAAS,UACZ,aAAAF,E,yCCvBf,wHAAkvB,eAAG,G,wGCCrvB,CACAG,oBACAC,2BAEAC,oBAeAC,kBACAF,0BAEA,a,gCCvBA,wHAAq4C,eAAG,G","file":"common/main.js","sourcesContent":["import 'uni-pages';\r\n// @ts-ignore\r\nwx.__webpack_require_UNI_MP_PLUGIN__ = __webpack_require__;import App from './App'\r\nimport Vue from 'vue'\r\nimport uView from \"uview-ui\";\r\nimport './uni.promisify.adaptor'\r\nimport store from './store/index.js'\r\n\r\nVue.config.productionTip = false\r\nApp.mpType = 'app'\r\n\r\n// Vue.prototype.$baseUrl = 'http://192.168.0.131:10031/';\r\n// Vue.prototype.$baseUrl = 'http://192.168.0.110:10031';\r\nVue.prototype.$baseUrl = 'https://test.doumee.cn:8088/yyb_web_api/';\r\n// Vue.prototype.$baseUrl = 'https://www.yyb.red/yyb_web_api/'\r\nVue.prototype.$store = store;\r\n\r\nVue.use(uView);\r\n\r\nconst app = new Vue({\r\n\tstore,\r\n\t...App\r\n})\r\n\r\n// http鎺ュ彛API鎶界\r\nimport httpApi from '@/utils/http.api.js'\r\nVue.use(httpApi, app)\r\n\r\n// 璇锋眰鎷︽埅鍣╘r\nimport interceptor from '@/utils/http.interceptor.js'\r\nVue.use(interceptor, app)\r\n\r\napp.$mount()","var render, staticRenderFns, recyclableRender, components\nvar renderjs\nimport script from \"./App.vue?vue&type=script&lang=js&\"\nexport * from \"./App.vue?vue&type=script&lang=js&\"\nimport style0 from \"./App.vue?vue&type=style&index=0&lang=scss&\"\n\n\n/* normalize component */\nimport normalizer from \"!../../../鍔炲叕/HBuilderX.3.8.12.20230817/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/runtime/componentNormalizer.js\"\nvar component = normalizer(\n  script,\n  render,\n  staticRenderFns,\n  false,\n  null,\n  null,\n  null,\n  false,\n  components,\n  renderjs\n)\n\ncomponent.options.__file = \"App.vue\"\nexport default component.exports","import mod from \"-!../../../鍔炲叕/HBuilderX.3.8.12.20230817/HBuilderX/plugins/uniapp-cli/node_modules/babel-loader/lib/index.js!../../../鍔炲叕/HBuilderX.3.8.12.20230817/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader/index.js??ref--13-1!../../../鍔炲叕/HBuilderX.3.8.12.20230817/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!../../../鍔炲叕/HBuilderX.3.8.12.20230817/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/index.js??vue-loader-options!../../../鍔炲叕/HBuilderX.3.8.12.20230817/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./App.vue?vue&type=script&lang=js&\"; export default mod; export * from \"-!../../../鍔炲叕/HBuilderX.3.8.12.20230817/HBuilderX/plugins/uniapp-cli/node_modules/babel-loader/lib/index.js!../../../鍔炲叕/HBuilderX.3.8.12.20230817/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader/index.js??ref--13-1!../../../鍔炲叕/HBuilderX.3.8.12.20230817/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!../../../鍔炲叕/HBuilderX.3.8.12.20230817/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/index.js??vue-loader-options!../../../鍔炲叕/HBuilderX.3.8.12.20230817/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./App.vue?vue&type=script&lang=js&\"","<script>\r\n\texport default {\r\n\t\tonLaunch: function() {\r\n\t\t\tconsole.log('App Launch')\r\n\t\t},\r\n\t\tonShow: function() {\r\n\t\t\t// var that = this;\r\n\t\t\t// uni.login({\r\n\t\t\t// \tprovider: 'weixin',\r\n\t\t\t// \tsuccess: async function (loginRes) {\r\n\t\t\t// \t\tlet { code } = loginRes;\r\n\t\t\t// \t\tlet res = await that.$u.api.loginByWxMini({ code })\r\n\t\t\t// \t\tif (!res.data) {\r\n\t\t\t// \t\t\tuni.navigateTo({\r\n\t\t\t// \t\t\t\turl: '/pages/login/login'\r\n\t\t\t// \t\t\t})\r\n\t\t\t// \t\t}\r\n\t\t\t// \t}\r\n\t\t\t// });\r\n\t\t},\r\n\t\tonHide: function() {\r\n\t\t\tconsole.log('App Hide')\r\n\t\t}\r\n\t}\r\n</script>\r\n\r\n<style lang=\"scss\">\r\n\t/*姣忎釜椤甸潰鍏叡css */\r\n\t@import \"uview-ui/index.scss\";\r\n</style>\r\n","import mod from \"-!../../../鍔炲叕/HBuilderX.3.8.12.20230817/HBuilderX/plugins/uniapp-cli/node_modules/mini-css-extract-plugin/dist/loader.js??ref--8-oneOf-1-0!../../../鍔炲叕/HBuilderX.3.8.12.20230817/HBuilderX/plugins/uniapp-cli/node_modules/css-loader/dist/cjs.js??ref--8-oneOf-1-1!../../../鍔炲叕/HBuilderX.3.8.12.20230817/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/stylePostLoader.js!../../../鍔炲叕/HBuilderX.3.8.12.20230817/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader/index.js??ref--8-oneOf-1-2!../../../鍔炲叕/HBuilderX.3.8.12.20230817/HBuilderX/plugins/uniapp-cli/node_modules/postcss-loader/src/index.js??ref--8-oneOf-1-3!../../../鍔炲叕/HBuilderX.3.8.12.20230817/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/sass-loader/dist/cjs.js??ref--8-oneOf-1-4!../../../鍔炲叕/HBuilderX.3.8.12.20230817/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader/index.js??ref--8-oneOf-1-5!../../../鍔炲叕/HBuilderX.3.8.12.20230817/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/index.js??vue-loader-options!../../../鍔炲叕/HBuilderX.3.8.12.20230817/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./App.vue?vue&type=style&index=0&lang=scss&\"; export default mod; export * from \"-!../../../鍔炲叕/HBuilderX.3.8.12.20230817/HBuilderX/plugins/uniapp-cli/node_modules/mini-css-extract-plugin/dist/loader.js??ref--8-oneOf-1-0!../../../鍔炲叕/HBuilderX.3.8.12.20230817/HBuilderX/plugins/uniapp-cli/node_modules/css-loader/dist/cjs.js??ref--8-oneOf-1-1!../../../鍔炲叕/HBuilderX.3.8.12.20230817/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/stylePostLoader.js!../../../鍔炲叕/HBuilderX.3.8.12.20230817/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader/index.js??ref--8-oneOf-1-2!../../../鍔炲叕/HBuilderX.3.8.12.20230817/HBuilderX/plugins/uniapp-cli/node_modules/postcss-loader/src/index.js??ref--8-oneOf-1-3!../../../鍔炲叕/HBuilderX.3.8.12.20230817/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/sass-loader/dist/cjs.js??ref--8-oneOf-1-4!../../../鍔炲叕/HBuilderX.3.8.12.20230817/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader/index.js??ref--8-oneOf-1-5!../../../鍔炲叕/HBuilderX.3.8.12.20230817/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/index.js??vue-loader-options!../../../鍔炲叕/HBuilderX.3.8.12.20230817/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./App.vue?vue&type=style&index=0&lang=scss&\""],"sourceRoot":""}
\ No newline at end of file
diff --git a/wx/unpackage/dist/dev/mp-weixin/common/main.js b/wx/unpackage/dist/dev/mp-weixin/common/main.js
index 4c52d8d..ade93a1 100644
--- a/wx/unpackage/dist/dev/mp-weixin/common/main.js
+++ b/wx/unpackage/dist/dev/mp-weixin/common/main.js
@@ -1,2 +1,2 @@
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["common/main"],{0:function(e,t,n){"use strict";(function(e,t){var r=n(4),o=r(n(11));n(26);var u=r(n(27)),f=r(n(25)),a=r(n(33));n(158);var c=r(n(159)),i=r(n(161)),l=r(n(162));function p(e,t){var n=Object.keys(e);if(Object.getOwnPropertySymbols){var r=Object.getOwnPropertySymbols(e);t&&(r=r.filter((function(t){return Object.getOwnPropertyDescriptor(e,t).enumerable}))),n.push.apply(n,r)}return n}function d(e){for(var t=1;t<arguments.length;t++){var n=null!=arguments[t]?arguments[t]:{};t%2?p(Object(n),!0).forEach((function(t){(0,o.default)(e,t,n[t])})):Object.getOwnPropertyDescriptors?Object.defineProperties(e,Object.getOwnPropertyDescriptors(n)):p(Object(n)).forEach((function(t){Object.defineProperty(e,t,Object.getOwnPropertyDescriptor(n,t))}))}return e}e.__webpack_require_UNI_MP_PLUGIN__=n,f.default.config.productionTip=!1,u.default.mpType="app",f.default.prototype.$baseUrl="https://test.doumee.cn/yyb_web_api/",f.default.prototype.$store=c.default,f.default.use(a.default);var s=new f.default(d({store:c.default},u.default));f.default.use(i.default,s),f.default.use(l.default,s),t(s).$mount()}).call(this,n(1)["default"],n(2)["createApp"])},27:function(e,t,n){"use strict";n.r(t);var r=n(28);for(var o in r)["default"].indexOf(o)<0&&function(e){n.d(t,e,(function(){return r[e]}))}(o);n(30);var u,f,a,c,i=n(32),l=Object(i["default"])(r["default"],u,f,!1,null,null,null,!1,a,c);l.options.__file="App.vue",t["default"]=l.exports},28:function(e,t,n){"use strict";n.r(t);var r=n(29),o=n.n(r);for(var u in r)["default"].indexOf(u)<0&&function(e){n.d(t,e,(function(){return r[e]}))}(u);t["default"]=o.a},29:function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.default=void 0;var r={onLaunch:function(){console.log("App Launch")},onShow:function(){},onHide:function(){console.log("App Hide")}};t.default=r},30:function(e,t,n){"use strict";n.r(t);var r=n(31),o=n.n(r);for(var u in r)["default"].indexOf(u)<0&&function(e){n.d(t,e,(function(){return r[e]}))}(u);t["default"]=o.a},31:function(e,t,n){}},[[0,"common/runtime","common/vendor"]]]);
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["common/main"],{0:function(e,t,n){"use strict";(function(e,t){var r=n(4),o=r(n(11));n(26);var u=r(n(27)),f=r(n(25)),a=r(n(33));n(158);var c=r(n(159)),i=r(n(161)),l=r(n(162));function p(e,t){var n=Object.keys(e);if(Object.getOwnPropertySymbols){var r=Object.getOwnPropertySymbols(e);t&&(r=r.filter((function(t){return Object.getOwnPropertyDescriptor(e,t).enumerable}))),n.push.apply(n,r)}return n}function d(e){for(var t=1;t<arguments.length;t++){var n=null!=arguments[t]?arguments[t]:{};t%2?p(Object(n),!0).forEach((function(t){(0,o.default)(e,t,n[t])})):Object.getOwnPropertyDescriptors?Object.defineProperties(e,Object.getOwnPropertyDescriptors(n)):p(Object(n)).forEach((function(t){Object.defineProperty(e,t,Object.getOwnPropertyDescriptor(n,t))}))}return e}e.__webpack_require_UNI_MP_PLUGIN__=n,f.default.config.productionTip=!1,u.default.mpType="app",f.default.prototype.$baseUrl="https://test.doumee.cn:8088/yyb_web_api/",f.default.prototype.$store=c.default,f.default.use(a.default);var s=new f.default(d({store:c.default},u.default));f.default.use(i.default,s),f.default.use(l.default,s),t(s).$mount()}).call(this,n(1)["default"],n(2)["createApp"])},27:function(e,t,n){"use strict";n.r(t);var r=n(28);for(var o in r)["default"].indexOf(o)<0&&function(e){n.d(t,e,(function(){return r[e]}))}(o);n(30);var u,f,a,c,i=n(32),l=Object(i["default"])(r["default"],u,f,!1,null,null,null,!1,a,c);l.options.__file="App.vue",t["default"]=l.exports},28:function(e,t,n){"use strict";n.r(t);var r=n(29),o=n.n(r);for(var u in r)["default"].indexOf(u)<0&&function(e){n.d(t,e,(function(){return r[e]}))}(u);t["default"]=o.a},29:function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.default=void 0;var r={onLaunch:function(){console.log("App Launch")},onShow:function(){},onHide:function(){console.log("App Hide")}};t.default=r},30:function(e,t,n){"use strict";n.r(t);var r=n(31),o=n.n(r);for(var u in r)["default"].indexOf(u)<0&&function(e){n.d(t,e,(function(){return r[e]}))}(u);t["default"]=o.a},31:function(e,t,n){}},[[0,"common/runtime","common/vendor"]]]);
 //# sourceMappingURL=../../.sourcemap/mp-weixin/common/main.js.map
\ No newline at end of file
diff --git a/wx/unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-checkbox-group/u-checkbox-group.json b/wx/unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-checkbox-group/u-checkbox-group.json
index 4575d1b..e8cfaaf 100644
--- a/wx/unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-checkbox-group/u-checkbox-group.json
+++ b/wx/unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-checkbox-group/u-checkbox-group.json
@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }
\ No newline at end of file
diff --git a/wx/unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-checkbox/u-checkbox.json b/wx/unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-checkbox/u-checkbox.json
index 07c217d..5991bee 100644
--- a/wx/unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-checkbox/u-checkbox.json
+++ b/wx/unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-checkbox/u-checkbox.json
@@ -1,6 +1,6 @@
 {
+  "component": true,
   "usingComponents": {
     "u-icon": "/node-modules/uview-ui/components/u-icon/u-icon"
-  },
-  "component": true
+  }
 }
\ No newline at end of file
diff --git a/wx/unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-toast/u-toast.json b/wx/unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-toast/u-toast.json
index 021158b..bc23211 100644
--- a/wx/unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-toast/u-toast.json
+++ b/wx/unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-toast/u-toast.json
@@ -1,9 +1,9 @@
 {
+  "component": true,
   "usingComponents": {
     "u-overlay": "/node-modules/uview-ui/components/u-overlay/u-overlay",
     "u-loading-icon": "/node-modules/uview-ui/components/u-loading-icon/u-loading-icon",
     "u-icon": "/node-modules/uview-ui/components/u-icon/u-icon",
     "u-gap": "/node-modules/uview-ui/components/u-gap/u-gap"
-  },
-  "component": true
+  }
 }
\ No newline at end of file

--
Gitblit v1.9.3