详情

lttnew
Showing 3 changed files with 77 additions and 64 deletions
config.js
group/groupOrderDetail.vue
myCenter/order.vue
--- a/config.js
View file @3a3694c
+++ b/config.js
View file @3a3694c
 // dev
 // const baseUrl_api = 'http://192.168.1.125:8787'
-const baseUrl_api = 'http://47.98.186.233:8787'
+// const baseUrl_api = 'http://47.98.186.233:8787'
-// const baseUrl_api = 'https://tk001.wxjylt.com/stage-api/'
+const baseUrl_api = 'https://tk001.wxjylt.com/stage-api/'
 const loginImage_api = 'https://tk001.wxjylt.com/stage-api'
 const payUrl = 'https://wxpay.cmbc.com.cn/mobilePlatform/appserver/lcbpPay.do'
--- a/group/groupOrderDetail.vue
View file @3a3694c
+++ b/group/groupOrderDetail.vue
View file @3a3694c
@@ -87,25 +87,20 @@
      </view>
      <!-- 审核记录 -->
-      <view class="card">
+      <view class="h3-padding">审核记录</view>
-        <view class="card-header">
+      <view class="wBox">
-          <view class="header-left">审核记录</view>
-        </view>
        <view v-if="loadingAudit" class="state-tip">加载中...</view>
        <view v-else-if="auditList.length === 0" class="state-tip">暂无审核记录</view>
+        <view class="stepItem" v-else v-for="(n, index) in auditList" :key="index">
-        <view class="audit-list" v-else>
+          <view class="time">{{ parseDateTime(n.auditTime) }}</view>
-          <view class="audit-item" v-for="(n, index) in auditList" :key="index">
+          <view class="content">
-            <view class="audit-dot" :class="n.auditResult == 1 ? 'pass' : 'fail'"></view>
+            <view class="status">
-            <view class="audit-content">
+              <text v-if="n.auditResult == 1" class="text-success">审核通过</text>
-              <view class="audit-time">{{ parseDateTime(n.auditTime) }}</view>
+              <text v-else-if="n.auditResult == 0" class="text-danger">审核拒绝</text>
-              <view class="audit-status" :class="n.auditResult == 1 ? 'text-green' : 'text-red'">
+              <text v-else class="text-primary">审核中</text>
-                {{ getAuditResultText(n.auditResult) }}
-              </view>
-              <view class="audit-dept">{{ n.auditDeptName || '——' }}</view>
-              <view class="audit-remark" v-if="n.auditMsg">备注：{{ n.auditMsg }}</view>
            </view>
+            <view class="deptName">{{ n.auditDeptName || '--' }}</view>
+            <view v-if="n.auditMsg">备注：{{ n.auditMsg }}</view>
          </view>
        </view>
      </view>
@@ -430,7 +425,7 @@ $content-gap: 24rpx;
    }
    .info-col {
-      flex: 1;
+      // flex: 1;
      text-align: left;
      box-sizing: border-box;
@@ -445,69 +440,56 @@ $content-gap: 24rpx;
  }
 }
-.audit-list {
+.h3-padding {
-  padding: 0 $content-gap 24rpx;
+  padding: 30rpx 30rpx 0;
-  box-sizing: border-box;
+  font-size: 30rpx;
+  font-weight: 600;
+  color: #333;
 }
-.audit-item {
+.wBox {
-  display: flex;
+  width: 700rpx;
-  padding: 20rpx 0;
+  padding: 30rpx;
-  border-bottom: 1rpx dashed $border-color;
+  margin: 20rpx auto 0;
-  box-sizing: border-box;
+  background: #FFFFFF;
+  box-shadow: 0rpx 12rpx 116rpx 0rpx rgba(196, 203, 214, 0.1);
+  border-radius: 15rpx;
+}
+.stepItem {
+  padding: 16rpx;
+  border-bottom: 1rpx dashed #eee;
  &:last-child {
    border-bottom: none;
  }
-  .audit-dot {
+  .time {
-    width: 14rpx;
+    width: 80%;
-    height: 14rpx;
+    font-size: 22rpx;
-    border-radius: 50%;
+    color: #999;
-    margin-top: 8rpx;
-    margin-right: 20rpx;
    flex-shrink: 0;
-    box-sizing: border-box;
+    padding-top: 4rpx;
-    &.pass {
-      background: $success-color;
-    }
-    &.fail {
-      background: $danger-color;
-    }
  }
-  .audit-content {
+  .content {
    flex: 1;
-    padding-right: 12rpx;
-    box-sizing: border-box;
-    .audit-time {
-      font-size: 24rpx;
-      color: $text-placeholder;
-      margin-bottom: 6rpx;
-    }
-    .audit-status {
+    .status {
      font-size: 28rpx;
      font-weight: 600;
      margin-bottom: 6rpx;
    }
-    .audit-dept {
+    .deptName {
      font-size: 26rpx;
-      color: $text-secondary;
+      color: #666;
    }
-    .audit-remark {
+    view {
      font-size: 24rpx;
-      color: $text-placeholder;
+      color: #999;
-      margin-top: 6rpx;
+      margin-top: 4rpx;
-      padding: 8rpx 12rpx;
-      background: #f8f8f8;
-      border-radius: 8rpx;
-      box-sizing: border-box;
    }
  }
 }
@@ -519,4 +501,16 @@ $content-gap: 24rpx;
 .text-green {
  color: $success-color !important;
 }
+.text-success {
+  color: $success-color;
+}
+.text-danger {
+  color: $danger-color;
+}
+.text-primary {
+  color: #333;
+}
 </style>
\ No newline at end of file
--- a/myCenter/order.vue
View file @3a3694c
+++ b/myCenter/order.vue
View file @3a3694c
@@ -222,9 +222,7 @@ import * as api from '@/common/api.js'
 import config from '@/config.js'
 // 获取deptType值（初始值为0，在onMounted中设置实际值）
 const deptType = ref(0);
-const goToDetail = (item) => {
-  uni.navigateTo({url: `/pages/rank/applyDetail?examId=${item.sourceId || item.id}&type=${queryParams.type}`});
-}
 // 标签栏配置（根据deptType动态生成）
 const tabs = computed(() => {
@@ -417,6 +415,27 @@ const confirmDel = async () => {
  }
 };
+const goToDetail = (item) => {
+  console.log("goToDetail:", item);
+   console.log("currentTab.value", currentTab.value);
+  const form = encodeURIComponent(JSON.stringify(item))
+  switch (currentTab.value) {
+    case '1':
+      uni.navigateTo({ url: `/group/groupOrderDetail?form=${form}` });
+      break;
+    case '2':
+    case '3':
+    case '4':
+      uni.navigateTo({ url: `/pages/rank/applyDetail?examId=${item.sourceId || item.id}&type=${queryParams.type}` });
+      break;
+    case '0':
+    default:
+      uni.navigateTo({ url: `/personalVip/orderDetail?rangeId=${item.sourceId || item.id}&type=${queryParams.type}` });
+      break;
+  }
+  // uni.navigateTo({url: `/pages/rank/applyDetail?examId=${item.sourceId || item.id}&type=${queryParams.type}`});
+}
 // 关闭删除弹窗
 const closeDelPopup = () => {
  showDelPopup.value = false;