合并h5代码

package.json

@@ -1,14 +1,14 @@
 {
   "name": "ie-plus",
-  "version": "0.0.0",
+  "version": "1.0.0",
   "scripts": {
     "server": "uni -p",
-    "dev:h5": "npm run server h5-dev",
-    "dev:mp": "npm run server mp-dev",
-    "dev:mp-weixin": "uni -p mp-weixin",
+    "dev": "uni -p h5-dev --host",
+    "dev:h5": "uni -p h5-dev --host",
+    "dev:mp": "uni -p mp-dev",
     "build": "uni build -p",
-    "build:h5": "uni build -p h5",
-    "build:mp-weixin": "uni build -p mp-weixin"
+    "build:h5": "uni build pro-h5",
+    "build:mp": "uni build pro-mp"
   },
   "uni-app": {
     "scripts": {

src/components/ie-picker/ie-picker.vue

@@ -1,6 +1,6 @@
 <template>
   <view class="w-full" @click="handleClick">
-    <view class="flex items-center gap-x-6" :style="customStyle">
+    <view class="flex items-center gap-x-6 justify-end" :style="customStyle">
       <view v-if="matchValue || customLabel" class="text-fore-title flex-1 min-w-1 ellipsis-1" :style="getValueStyle"
         :class="{ 'text-[#dce4f6]': disabled || readonly }">
         <slot :label="label">

src/pagesMain/pages/me/components/me-menu.vue

@@ -9,7 +9,7 @@
         </view>
       </view>
       <view class="mt-40 text-30 text-fore-title font-bold">其他功能</view>
-      <view class="mt-16 shadow-card rounded-8 py-10 bg-white">
+      <view class="mt-16 shadow-card rounded-8 bg-white">
         <uv-cell-group :border="false">
           <uv-cell isLink :cellStyle="cellStyle"
             @click="handleNavigate('/pagesSystem/pages/edit-profile/edit-profile', '基本资料')">
@@ -20,7 +20,7 @@
               </view>
             </template>
           </uv-cell>
-          <uv-cell isLink :cellStyle="cellStyle" @click="handleQuestion" :border="false">
+          <uv-cell isLink :cellStyle="cellStyle" @click="handleQuestion" :border="true">
             <template #title>
               <view class="flex items-center gap-x-10">
                 <uv-icon name="question-circle" size="16" color="#888888" />
@@ -28,6 +28,17 @@
               </view>
             </template>
           </uv-cell>
+          <uv-cell isLink :cellStyle="cellStyle" @click="handlePhone" :border="false">
+            <template #title>
+              <view class="flex items-center gap-x-10">
+                <uv-icon name="phone" size="17" color="#888888" />
+                <text class="text-30 text-fore-subtitle">客服电话</text>
+              </view>
+            </template>
+            <template #value>
+              <text class="text-30 text-fore-subtitle">{{ contactPhone }}</text>
+            </template>
+          </uv-cell>
         </uv-cell-group>
       </view>
     </view>
@@ -42,6 +53,8 @@ import { useUserStore } from '@/store/userStore';
 const { transferTo } = useTransferPage();
 const userStore = useUserStore();
 
+const contactPhone = computed(() => userStore.orgInfo.contactPhone);
+
 type MenuItem = {
   name: string;
   icon: string;
@@ -108,5 +121,21 @@ const handleLogout = async () => {
 
   }
 }
+const handlePhone = async () => {
+  if (!contactPhone.value) {
+    uni.$ie.showToast('暂无客服电话');
+    return;
+  } else {
+    uni.showActionSheet({
+      title: '客服电话',
+      itemList: [`拨打电话：${contactPhone.value}`],
+      success: (res) => {
+        uni.makePhoneCall({
+          phoneNumber: contactPhone.value
+        });
+      }
+    });
+  }
+}
 </script>
 <style lang="scss" scoped></style>

src/pagesStudy/pages/study-history/components/exam-history-paperwork.vue

@@ -204,13 +204,28 @@ const loadData = async () => {
   await Promise.all([queryBatch, queryClass, querySubject]);
   const queryCondition = getTeacherTestRecordCondition({}).then(res => {
     const { buildType, buildStatus, batchId, classId, subjectId } = res.data;
-    queryForm.value = {
-      buildType: buildType || buildTypeList.value[0]?.value,
-      buildStatus: buildStatus || buildStatusList.value[0]?.value,
-      batchId: batchId || batchList.value[0]?.batchId,
-      classId: classId || classList.value[0]?.classId,
-      subjectId: subjectId || subjectList.value[0]?.subjectId,
-    };
+    const params = {} as Study.PaperWorkRecordQuery;
+    const params_buildType = buildType || buildTypeList.value[0]?.value;
+    const params_buildStatus = buildStatus || buildStatusList.value[0]?.value
+    const params_batchId = batchId || batchList.value[0]?.batchId
+    const params_classId = classId || classList.value[0]?.classId
+    const params_subjectId = subjectId || subjectList.value[0]?.subjectId
+    if (params_buildType !== undefined && params_buildType !== null) {
+      params.buildType = params_buildType;
+    }
+    if (params_buildStatus !== undefined && params_buildStatus !== null) {
+      params.buildStatus = params_buildStatus;
+    }
+    if (params_batchId !== undefined && params_batchId !== null) {
+      params.batchId = params_batchId;
+    }
+    if (params_classId !== undefined && params_classId !== null) {
+      params.classId = params_classId;
+    }
+    if (params_subjectId !== undefined && params_subjectId !== null) {
+      params.subjectId = params_subjectId;
+    }
+    queryForm.value = params;
   });
   await Promise.all([queryCondition]);
 }

src/uni_modules/uv-cell/components/uv-cell/uv-cell.vue

@@ -107,7 +107,7 @@
 	$uv-cell-color: $uv-main-color !default;
 	$uv-cell-icon-size: 16px !default;
 	$uv-cell-title-font-size: 15px !default;
-	$uv-cell-title-line-height: 22px !default;
+	$uv-cell-title-line-height: 24px !default;
 	$uv-cell-title-color: $uv-main-color !default;
 	$uv-cell-label-font-size: 12px !default;
 	$uv-cell-label-color: $uv-tips-color !default;