Merge branch 'develop' into develop-intranet

src/pages/login/login.vue

@@ -258,7 +258,9 @@ const submitForm = () => {
             param.runEnv = networkEnv.value;
 
             // #ifdef H5
-            param.uniqCode = 'b6ffbbfb-5b2d-4640-af3a-e43d0158eaf9';//h5测试用 内网-sn123456 外网-b6ffbbfb-5b2d-4640-af3a-e43d0158eaf9
+
+            // b6ffbbfb-5b2d-4640-af3a-e43d0158eaf9
+            param.uniqCode = '679d5560-534f-4df8-815a-49227ba6ffd2';//h5测试用 内网-sn123456 外网-b6ffbbfb-5b2d-4640-af3a-e43d0158eaf9
             let res = await login(param);
             userStore.login(res);
             uni.switchTab({ url: '/pages/home/home' })

src/pages/notice/waitApprove.vue

@@ -41,7 +41,7 @@
                         </view>
                         <view class="border-bottom"></view>
                         <view class="r-list">
-                            <view class="r-left">创建人 <text>{{ item.createUser.userId }}</text></view>
+                            <view class="r-left">创建人 <text>{{ item.createUser?item.createUser.userId:'' }}</text></view>
                             <view class="r-right">{{ parseTime(item.createTime,'{y}-{m}-{d} {h}:{i}') }}</view>
                         </view>
                     </view>
@@ -147,8 +147,7 @@ const getFlowList = (pageIndex, pageSize) => {
 const handleJump = (item)=>{
     uni.navigateTo({
         url: `/pages/notice/waitApproveDetail?detail=${encodeURIComponent(JSON.stringify(item))}`
-    });
+    })
-    
 }
 </script>
 
@@ -200,18 +199,20 @@ const handleJump = (item)=>{
     padding-bottom:10rpx;
 }
 
- /* .report-list .r-list{
+.report-list .r-list{
-    padding: 10rpx 0;
+    align-items: flex-start;
-} */
+}
 .report-list .r-list:first-child{
     padding-bottom:10rpx;
 }
 
 .report-list .r-list .r-name {
     color: #3384DF;
-    font-size: 38rpx;
+    font-size: 35rpx;
     font-weight: bold;
+    width:500rpx;
 }
+
 .report-list .r-list .r-left text{
     font-size: 28rpx;
     color:#919191;

src/pages/notice/waitApproveDetail.vue

@@ -35,7 +35,7 @@
                     <view class="border-bottom"></view>
                     <view class="r-list">
                         <view class="r-left">创建人</view>
-                        <view class="r-right">{{ detail.createUser.userId }}</view>
+                        <view class="r-right">{{ detail.createUser?detail.createUser.userId:'' }}</view>
                     </view>
                     <view class="border-bottom"></view>
                     <view class="r-list">
@@ -65,11 +65,10 @@ let detail = ref({})
 onLoad(async(opt) => {
     try {
         detail.value = JSON.parse(decodeURIComponent(opt.detail));
-        console.log(detail.value);
+        // console.log(detail.value);
     } catch (e) {
         console.error('参数解析失败', e);
     }
-
 });
 
 // 获取导航栏高度用于内容区域padding
@@ -78,49 +77,10 @@ onMounted(() => {
     navBarPaddingTop.value = getNavBarPaddingTop() * 2;
 })
 
-// 查询列表
-let list = ref([]);
-const mescrollRef = ref(null);
-const upOption = ref({
-    page: { num: 0, size: 10 },
-    noMoreSize: 5,
-    empty: { 
-        tip: '~ 空空如也 ~',
-        icon: "../../static/images/mescroll-empty.png"
-    },
-    textLoading: '加载中...',
-    textNoMore: '已经到底了'
-});
-
-const downOption = ref({
-    auto: false,
-    textInOffset: '下拉刷新',
-    textOutOffset: '释放更新',
-    textLoading: '刷新中...'
-});
-
-const mescrollInit = (mescroll) => {
-    console.log("mescrollInit=>")
-    mescrollRef.value = mescroll;
-};
-
-// 下拉刷新
-const downCallback = async (mescroll) => {
-    try {
-        // 查询数据
-        mescroll.resetUpScroll();
-    } catch (error) {
-        mescroll.endErr();
-    } finally {
-        mescroll.endSuccess();
-    }
-}
-
 
 // 跳转webview
 const handleJump = ()=>{
     let item = detail.value;
-    console.log(111,item)
     uni.navigateTo({
         url: `/pages/h5-webview/h5-webview?url=${item.mobileLink}&title=${item.subject}`
     });

src/static/common.css

@@ -629,3 +629,7 @@ uni-button[type='primary'][plain] {
 
 
 /* CRM 样式 end */
+
+.mescroll-empty .empty-tip{
+    color: #fff !important;
+}