Merge branch 'master' of http://git.yujin.shuziyunyao.com/yujin/digital-medicine-front

src/views/cdt/menus/index.vue

@@ -85,9 +85,7 @@
                         </vxe-column>
                         <vxe-column title="剩余时间" field="restDay" width="100">
                             <template #default="{ row }">
-                                <span v-if="row.status == 0">未上架</span>
-                                <span v-if="row.status == 2"></span>
-                                <span v-if="row.status == 1 && new Date(row?.validUntil ) > new Date()">{{Math.floor((new Date(row?.validUntil).getTime()-new Date().getTime())/(3600*24*1000))+1 }}天</span>
+                                <span v-if="new Date(row?.validUntil ) > new Date()">{{Math.floor((new Date(row?.validUntil).getTime()-new Date().getTime())/(3600*24*1000))+1 }}天</span>
                                 <span v-else>已过期</span>
                             </template>
                         </vxe-column>

src/views/dgtmedicine/member/index.vue

@@ -22,7 +22,7 @@
                         <el-select style="width: 140px" v-model="queryParams.vipEnable" clearable placeholder="搜有效期状态">
                             <el-option label="全部" value=""></el-option>
                             <el-option label="有效" value="1"></el-option>
-                            <el-option label="过期" value="3"></el-option>
+                            <el-option label="过期" value="-3"></el-option>
                         </el-select>
                     </el-form-item>
                     <el-form-item>
@@ -131,7 +131,7 @@ const data = reactive<any>({
         pageNum: 1,
         pageSize: 10,
         vipLevel: '',
-        paymentStatus: '1',
+        payStatus: '1',
         reviewStatus: '1',
         vipEnable: ''
     },