改bug：用户在未提交认证、供应商-审核进行中，也是没有 待处理、已处理的

src/kirin-ui/kirin-form/kirin-form.vue

@@ -2,7 +2,7 @@
  * @Author: PoJun
  * @Date: 2023-10-09 15:51:12
  * @LastEditors: XuanJi
- * @LastEditTime: 2024-05-21 01:54:24
+ * @LastEditTime: 2024-05-22 19:06:00
  * @Message: 表单
 -->
 <template>
@@ -159,7 +159,7 @@
             >
                 <view
                     v-if="item.rv"
-                    :class="{ 'row-left': labelPosition == 'top', 'row-right': labelPosition == 'left' }"
+                  
                 >
                     <uv-qrcode :loading="false" ref="qrcodeDom" size="120px" :value="getQrcodeUrl(item)"></uv-qrcode>
                 </view>
@@ -183,7 +183,7 @@
                 :customStyle="item.customStyle"
                 :labelWidth="item.labelWidth ? item.labelWidth : 150"
             >
-                <view :class="{ 'row-left': labelPosition == 'top', 'row-right': labelPosition == 'left' }">
+                <view>
                     <uv-switch
                         :disabled="!item.canEdit"
                         v-model="item.rv"
@@ -218,10 +218,10 @@
                 :leftIconStyle="leftIconStyle"
                 :customStyle="item.customStyle"
                 :labelWidth="item.labelWidth ? item.labelWidth : 150"
+                :class="{ 'row-left': labelPosition == 'top', 'row-right': labelPosition == 'left' }"
             >
                 <view
                     class="pj-upload"
-                    :class="{ 'row-left': labelPosition == 'top', 'row-right': labelPosition == 'left' }"
                 >
                     <uv-upload
                         :fileList="getFileList(item.sv)"
@@ -687,9 +687,15 @@ export default {
 
 <style lang="scss" scoped>
 .row-left {
-    text-align: left;
+    /deep/ .uv-form-item__body__right__content__slot{
+
+        justify-content: flex-start;
+    }
 }
 .row-right {
-    text-align: right;
+    /deep/ .uv-form-item__body__right__content__slot{
+        justify-content: flex-end; 
+
+}
 }
 </style>

src/pages/index/components/home-chart.vue

@@ -2,7 +2,7 @@
  * @Author: PoJun
  * @Date: 2023-12-19 14:57:48
  * @LastEditors: XuanJi
- * @LastEditTime: 2024-05-21 11:32:29
+ * @LastEditTime: 2024-05-22 16:40:41
  * @Message: 柱形图
 -->
 <template>
@@ -90,21 +90,20 @@ export default {
         times: {
             immediate: true,
             handler: function () {
-
-                    this.init();
+                this.init();
             },
         },
     },
     onLoad() {
         console.log(this.showChart);
-    }
+    },
 };
 </script>
 
 <style lang="scss" scoped>
 .data-charts {
     width: 100%;
-    height: 300px;
+    height: 340px;
     .charts-box {
         width: 750rpx;
         height: 300px;

src/pages/index/index.vue

@@ -2,7 +2,7 @@
  * @Author: PoJun
  * @Date: 2023-05-15 19:59:55
  * @LastEditors: XuanJi
- * @LastEditTime: 2024-05-21 12:51:31
+ * @LastEditTime: 2024-05-23 13:54:31
  * @Message: Nothing
 -->
 <template>
@@ -102,6 +102,7 @@ export default {
     },
 
     onShow() {
+        this.loadData();
         if (this.vuex_userInfo) {
             this.showChart = true;
             this.times++;
@@ -125,20 +126,22 @@ export default {
             // console.log("登录成功后触发");
             this.showChart = false;
         },
+        async loadData() {
+            if (this.vuex_userInfo) {
+                this.showChart = true;
+                if (this.vuex_userInfo.attr.BusinessRole == "supplier") {
+                    const res = await getMySupplierInfo();
+                    this.score = res.mark;
+                }
+            } else {
+                this.showChart = false;
+            }
+            uni.$on("triggerMethod", this.methodToTrigger);
+        },
     },
-    async onLoad() {
+    onLoad() {
         checkAppUpdate();
         console.log("首页onload");
-        if (this.vuex_userInfo) {
-            this.showChart = true;
-            if (this.vuex_userInfo.attr.BusinessRole == "supplier") {
-                const res = await getMySupplierInfo();
-                this.score = res.mark;
-            }
-        } else {
-            this.showChart = false;
-        }
-        uni.$on("triggerMethod", this.methodToTrigger);
     },
     onUnload() {
         console.log("首页unload");

src/pages/mine/index.vue

@@ -2,7 +2,7 @@
  * @Author: XuanJi
  * @Date: 2024-05-08 17:23:25
  * @LastEditors: XuanJi
- * @LastEditTime: 2024-05-21 02:54:57
+ * @LastEditTime: 2024-05-22 18:22:35
  * @Message: Nothing
 -->
 <!--
@@ -37,7 +37,7 @@
             </view>
         </view>
         <view class="mine-cont">
-            <template v-if="vuex_userInfo && vuex_userInfo.attr.BusinessRole !== 'supplier'">
+            <template v-if="vuex_userInfo && vuex_userInfo.attr.BusinessRole !== 'supplier'&&[2].includes(vuex_userInfo.attr.auditState)">
                 <cols-container :list="managementTabs" :col="2" @click="tabClick"></cols-container>
             </template>
 
@@ -65,8 +65,8 @@
                     ></uv-cell>
                     <uv-cell
                         v-if="
-                            vuex_userInfo.attr.affairType == 'SupplierJoin' &&
-                            [2].includes(vuex_userInfo.attr.auditState)
+                            (vuex_userInfo.attr.affairType == 'SupplierJoin' &&
+                            [2].includes(vuex_userInfo.attr.auditState))||([0].includes(vuex_userInfo.attr.auditState)&&vuex_userInfo.attr.BusinessRole=='supplier')
                         "
                         title="角色认证"
                         :border="false"
@@ -99,14 +99,40 @@
                         </template>
                     </uv-cell>
                     <uv-cell
-                        v-else-if="[0, 3].includes(vuex_userInfo.attr.auditState)"
+                        v-else-if="
+                            ([0].includes(vuex_userInfo.attr.auditState)&&vuex_userInfo.attr.BusinessRole=='orgMember')
+                        "
+                        title="角色认证"
+                        :border="false"
+                        :cellStyle="{ padding: '15px' }"
+                        :isLink="true"
+                        arrow-direction="right"
+                        url="/subpkg/setting/authentication-info"
+                    >
+                        <template v-slot:value>
+                            <text>组织成员-已认证</text>
+
+                        </template>
+                    </uv-cell>
+
+
+                    
+                    <uv-cell
+                        v-else-if="[0,3].includes(vuex_userInfo.attr.auditState)"
                         title="角色认证"
                         :isLink="true"
                         arrow-direction="right"
                         url="/subpkg/setting/authentication"
                         :border="false"
                         :cellStyle="{ padding: '15px' }"
-                    ></uv-cell>
+                    >
+                    <template v-slot:value>
+                            <text>{{ vuex_userInfo.attr.affairType == "UserJoinOrg" ? "组织成员" : "供应商" }}-</text>
+                            <text>
+                                {{vuex_userInfo.attr.auditState==3?"认证失败":"未认证"}}
+                            </text>
+                        </template>
+                    </uv-cell>
                     <uv-cell
                         v-if="vuex_userInfo.attr.auditState == 2 && vuex_userInfo.attr.BusinessRole == 'supplier'"
                         title="评分申诉"