Merge branch 'zzx' of http://git.zonelife.cn:3000/zhangtao/sports-merchant-minapp into zzx

src/config/index.ts

@@ -15,7 +15,7 @@ const mapEnvVersion = {
   /**
    * 正式版
    */
-  release: "",
+  release: "https://api.qlapp.cn/jeecgboot",
 };
 
 /**

src/manifest.json

@@ -77,4 +77,4 @@
     "darkmode": true,
     "themeLocation": "theme.json"
   }
-}
+}

src/pages/index/index.vue

@@ -65,6 +65,12 @@ onShow(() => {
     useUserStore().getMenuList();
   }
 });
+onLoad(() => {
+  wx.showShareMenu({
+    withShareTicket: true,
+    menus: ["shareAppMessage", "shareTimeline"]
+  })
+})
 watch(
   () => isShowLoging.value,
   () => {

src/subPack/PersonnelView/index.vue

@@ -3,50 +3,25 @@
     <wd-tabs v-model="tab" swipeable sticky @change="handleChange">
       <block v-for="(item, idx) in tabList" :key="idx">
         <wd-tab :title="item.title">
-          <view
-            class="bg-#F6F6F6 px32rpx pt-24rpx bottom-safe-area"
-            v-if="data"
-          >
-            <view
-              class="p24rpx box-border bg-white mb24rpx rounded-32rpx"
-              v-for="it in data"
-              :key="it.id"
-            >
+          <view class="bg-#F6F6F6 px32rpx pt-24rpx bottom-safe-area" v-if="data">
+            <view class="p24rpx box-border bg-white mb24rpx rounded-32rpx" v-for="it in data" :key="it.id">
               <view class="flex items-center justify-between">
                 <view class="font-semibold text-32rpx text-#222222">{{
                   it.useUserName
                 }}</view>
-                <commonbtn
-                  bg-color="#0074FF"
-                  v-if="it.verifyStatus == 0 && it.orPostpone != 1"
-                  >未核销</commonbtn
-                >
-                <commonbtn
-                  bg-color="rgba(0,0,0,0.3)"
-                  v-if="it.verifyStatus == 1"
-                  >已核销</commonbtn
-                >
-                <commonbtn bg-color="#FB5B5B" v-if="it.orPostpone == 1"
-                  >延课</commonbtn
-                >
+                <commonbtn bg-color="#0074FF" v-if="it.verifyStatus == 0 && it.orPostpone != 1">未核销</commonbtn>
+                <commonbtn bg-color="rgba(0,0,0,0.3)" v-if="it.verifyStatus == 1">已核销</commonbtn>
+                <commonbtn bg-color="#FB5B5B" v-if="it.orPostpone == 1">延课</commonbtn>
               </view>
-              <view
-                class="flex items-center justify-between text-28rpx mt24rpx"
-              >
+              <view class="flex items-center justify-between text-28rpx mt24rpx">
                 <view class="text-[rgb(0,0,0,0.3)]">手机号码</view>
                 <view>{{ it.useUserPhone }}</view>
               </view>
               <view class="text-[rgb(0,0,0,0.3)] mt24rpx"> 人脸照片 </view>
               <view class="mt24rpx">
-                <image
-                  :src="it.useUserImage"
-                  class="w-160rpx h-160rpx rounded-32rpx"
-                />
+                <image :src="it.useUserImage" class="w-160rpx h-160rpx rounded-32rpx" />
               </view>
-              <view
-                class="mt24rpx flex items-center justify-between"
-                v-if="it.orPostpone == 1"
-              >
+              <view class="mt24rpx flex items-center justify-between" v-if="it.orPostpone == 1">
                 <view class="text-28rpx text-[rgb(0,0,0,0.3)]">延课原因</view>
                 <view>{{ it.postponeReason }}</view>
               </view>
@@ -82,11 +57,13 @@ const { data, send: getList } = useRequest(
   { immediate: false },
 );
 function handleChange(e: { index: number }) {
+  console.log(e, '菜单标签');
+
   const { index } = e;
   getList({
     coursePriceRulesId: coursePriceRulesId.value,
     verifyStatus: index == 2 ? 1 : index == 3 ? 0 : null,
-    orPostpone: index != 1 ? null : index,
+    orPostpone: index === 3 ? 0 : (index != 1 ? null : index),
   });
 }
 onReachBottom(() => {
@@ -95,11 +72,9 @@ onReachBottom(() => {
 </script>
 
 <style scoped></style>
-<route lang="json">
-{
+<route lang="json">{
   "name": "personnelView",
   "style": {
     "navigationBarTitleText": "人员查看"
   }
-}
-</route>
+}</route>

src/subPack/classInspectionDetaile/index.vue

@@ -1,13 +1,6 @@
 <template>
-  <wd-navbar
-    :title="titleArr[type]"
-    fixed
-    placeholder
-    safeAreaInsetTop
-    :bordered="false"
-    leftArrow
-    @click-left="router.back()"
-  ></wd-navbar>
+  <wd-navbar :title="titleArr[type]" fixed placeholder safeAreaInsetTop :bordered="false" leftArrow
+    @click-left="router.back()"></wd-navbar>
   <view class="px32rpx py-24rpx" v-if="data">
     <course disabled :item="courseItem"></course>
     <view class="mt24rpx flex items-center" v-if="todayClass.length">
@@ -22,30 +15,16 @@
       </template>
     </view>
     <view class="title">
-      <view
-        class="mt24rpx mb24rpx flex text-32rpx items-center"
-        v-if="NormalClass.length"
-      >
-        <view
-          class="mr28rpx"
-          :class="[tab == 0 ? 'text-#0074FF' : 'text-[rgb(0,0,0,0.3)]']"
-          @click="tab = 0"
-          >正常课({{ NormalClass?.length }})</view
-        >
-        <view
-          :class="[tab == 1 ? 'text-#0074FF' : 'text-[rgb(0,0,0,0.3)]']"
-          @click="handleGoView"
-          >补课({{ MakeUpCasses?.length }})</view
-        >
+      <view class="mt24rpx mb24rpx flex text-32rpx items-center" v-if="NormalClass.length">
+        <view class="mr28rpx" :class="[tab == 0 ? 'text-#0074FF' : 'text-[rgb(0,0,0,0.3)]']" @click="tab = 0">正常课({{
+          NormalClass?.length }})</view>
+        <view :class="[tab == 1 ? 'text-#0074FF' : 'text-[rgb(0,0,0,0.3)]']" @click="handleGoView">补课({{
+          MakeUpCasses?.length }})</view>
       </view>
       <view v-for="item in NormalClass" class="mb24rpx" :key="item.id">
         <ClassItem :type="type" :item="item" :showBtn="false"></ClassItem>
       </view>
-      <view
-        v-if="MakeUpCasses?.length"
-        class="text-#0074FF mt24rpx mb24rpx view"
-        >补课({{ MakeUpCasses?.length }})</view
-      >
+      <view v-if="MakeUpCasses?.length" class="text-#0074FF mt24rpx mb24rpx view">补课({{ MakeUpCasses?.length }})</view>
       <view v-for="item in MakeUpCasses" class="mb24rpx" :key="item.id">
         <ClassItem :type="type" :item="item" :showBtn="false"></ClassItem>
       </view>
@@ -108,12 +87,10 @@ function handleGoView() {
 </script>
 
 <style scoped></style>
-<route lang="json">
-{
+<route lang="json">{
   "name": "classInspectionDetaile",
   "style": {
     "navigationBarTitleText": "拍照验课",
     "navigationStyle": "custom"
   }
-}
-</route>
+}</route>

src/subPack/selectClass/index.vue

@@ -1,29 +1,16 @@
 <template>
   <view class="px32rpx py20rpx" v-if="data">
-    <view class="text-28rpx"
-      >未核销<text class="text-#0074FF">{{ data.length }}</text
-      >人</view
-    >
+    <view class="text-28rpx">未核销<text class="text-#0074FF">{{ data.length }}</text>人</view>
 
-    <view
-      class="bg-white rounded-32rpx flex items-center justify-between p24rpx box-border mt20rpx"
-      v-for="(item, idx) in data"
-      :key="item.id"
-    >
+    <view class="bg-white rounded-32rpx flex items-center justify-between p24rpx box-border mt20rpx"
+      v-for="(item, idx) in data" :key="item.id">
       <view class="font-semibold text-32rpx">{{ item.useUserName }}</view>
-      <upload
-        :disabled="false"
-        @click="handleGoCamera(item)"
-        :imgUrl="item.verifyImage"
-        :key="item.id"
-        :id="item.id"
-      ></upload>
+      <upload :disabled="false" @click="handleGoCamera(item)" :imgUrl="item.verifyImage" :key="item.id" :id="item.id">
+      </upload>
     </view>
     <view class="h-180rpx"></view>
   </view>
-  <fixdbtn block size="large" @click="handleSubmit" :loading="loading"
-    >提交</fixdbtn
-  >
+  <fixdbtn block size="large" @click="handleSubmit" :loading="loading">提交</fixdbtn>
 </template>
 
 <script setup lang="ts">
@@ -94,11 +81,9 @@ watch(
 </script>
 
 <style scoped></style>
-<route lang="json">
-{
+<route lang="json">{
   "name": "selectClass",
   "style": {
     "navigationBarTitleText": ""
   }
-}
-</route>
+}</route>