Merge remote-tracking branch 'HS_MZAP/master'

# Conflicts:
#	src/main.js

package.json

@@ -20,6 +20,8 @@
     "@vue/cli-plugin-router": "~5.0.0",
     "@vue/cli-service": "~5.0.0",
     "babel-plugin-import": "^1.13.6",
+    "less": "^4.1.3",
+    "less-loader": "^11.1.0",
     "postcss": "^8.4.21",
     "postcss-pxtorem": "^6.0.0"
   }

src/main.js

@@ -17,4 +17,4 @@ app.use(router).use(NavBar).use(Button).use(Form).use(Field).use(CellGroup).use(
 
 app.config.globalProperties.$API = api
 app.config.globalProperties.$axios = axios
-app.mount('#app')
+app.mount('#app')

src/views/toBeDone/toBeDone.vue

@@ -1,6 +1,372 @@
 <template>
-    <div class="about">
-      <h1>toBeDone</h1>
-    </div>
+  <van-row class="header">
+    <van-col span="2">
+      <van-icon name="arrow-left" color="#ffffff" @click="goback"/>
+    </van-col>
+    <van-col span="22">
+      <h3 style="color: #fff">我的待办</h3>
+    </van-col>
+  </van-row>
+  <van-tabs
+    v-model:active="active"
+    title-inactive-color="#bdbdbd"
+    title-active-color="#36a7f3"
+  >
+    <van-tab title="待处理">
+      <div class="list1">
+        <van-row class="list-item">
+          <van-col span="6" class="list-item-left">
+            <div>
+              <p style="color: #a3a3a3">2022.12.01</p>
+              <p style="color: #a3a3a3">11:32</p>
+            </div>
+            <p style="color: red; margin-top: 10px">待处理</p>
+          </van-col>
+          <van-col span="18" style="border-left: 1px solid #e3e3e3" class="list-item-right">
+            <van-row>
+              <van-col span="24">
+                <span>东台市南阳镇菩提寺需要于12.12日晚8点举办祈福活动，请审核。</span>
+              </van-col>
+            </van-row>
+            <van-row justify="space-between">
+              <van-col span="12">盐城-东台-南阳镇</van-col>
+              <van-col span="8">一般交办</van-col>
+            </van-row>
+          </van-col>
+        </van-row>
+        <van-row class="list-item">
+          <van-col span="6" class="list-item-left">
+            <div>
+              <p style="color: #a3a3a3">2022.12.01</p>
+              <p style="color: #a3a3a3">11:32</p>
+            </div>
+            <p style="color: red; margin-top: 10px">待处理</p>
+          </van-col>
+          <van-col span="18" style="border-left: 1px solid #e3e3e3" class="list-item-right">
+            <van-row>
+              <van-col span="24">
+                <span>东台市南阳镇菩提寺需要于12.12日晚8点举办祈福活动，请审核。</span>
+              </van-col>
+            </van-row>
+            <van-row justify="space-between">
+              <van-col span="12">盐城-东台-南阳镇</van-col>
+              <van-col span="8">一般交办</van-col>
+            </van-row>
+          </van-col>
+        </van-row>
+        <van-row class="list-item">
+          <van-col span="6" class="list-item-left">
+            <div>
+              <p style="color: #a3a3a3">2022.12.01</p>
+              <p style="color: #a3a3a3">11:32</p>
+            </div>
+            <p style="color: red; margin-top: 10px">待处理</p>
+          </van-col>
+          <van-col span="18" style="border-left: 1px solid #e3e3e3" class="list-item-right">
+            <van-row>
+              <van-col span="24">
+                <span>东台市南阳镇菩提寺需要于12.12日晚8点举办祈福活动，请审核。</span>
+              </van-col>
+            </van-row>
+            <van-row justify="space-between">
+              <van-col span="12">盐城-东台-南阳镇</van-col>
+              <van-col span="8">一般交办</van-col>
+            </van-row>
+          </van-col>
+        </van-row>
+        <van-row class="list-item">
+          <van-col span="6" class="list-item-left">
+            <div>
+              <p style="color: #a3a3a3">2022.12.01</p>
+              <p style="color: #a3a3a3">11:32</p>
+            </div>
+            <p style="color: red; margin-top: 10px">待处理</p>
+          </van-col>
+          <van-col span="18" style="border-left: 1px solid #e3e3e3" class="list-item-right">
+            <van-row>
+              <van-col span="24">
+                <span>东台市南阳镇菩提寺需要于12.12日晚8点举办祈福活动，请审核。</span>
+              </van-col>
+            </van-row>
+            <van-row justify="space-between">
+              <van-col span="12">盐城-东台-南阳镇</van-col>
+              <van-col span="8">一般交办</van-col>
+            </van-row>
+          </van-col>
+        </van-row>
+        <van-row class="list-item">
+          <van-col span="6" class="list-item-left">
+            <div>
+              <p style="color: #a3a3a3">2022.12.01</p>
+              <p style="color: #a3a3a3">11:32</p>
+            </div>
+            <p style="color: red; margin-top: 10px">待处理</p>
+          </van-col>
+          <van-col span="18" style="border-left: 1px solid #e3e3e3" class="list-item-right">
+            <van-row>
+              <van-col span="24">
+                <span>东台市南阳镇菩提寺需要于12.12日晚8点举办祈福活动，请审核。</span>
+              </van-col>
+            </van-row>
+            <van-row justify="space-between">
+              <van-col span="12">盐城-东台-南阳镇</van-col>
+              <van-col span="8">一般交办</van-col>
+            </van-row>
+          </van-col>
+        </van-row>
+        <van-row class="list-item">
+          <van-col span="6" class="list-item-left">
+            <div>
+              <p style="color: #a3a3a3">2022.12.01</p>
+              <p style="color: #a3a3a3">11:32</p>
+            </div>
+            <p style="color: red; margin-top: 10px">待处理</p>
+          </van-col>
+          <van-col span="18" style="border-left: 1px solid #e3e3e3" class="list-item-right">
+            <van-row>
+              <van-col span="24">
+                <span>东台市南阳镇菩提寺需要于12.12日晚8点举办祈福活动，请审核。</span>
+              </van-col>
+            </van-row>
+            <van-row justify="space-between">
+              <van-col span="12">盐城-东台-南阳镇</van-col>
+              <van-col span="8">一般交办</van-col>
+            </van-row>
+          </van-col>
+        </van-row>
+        <van-row class="list-item">
+          <van-col span="6" class="list-item-left">
+            <div>
+              <p style="color: #a3a3a3">2022.12.01</p>
+              <p style="color: #a3a3a3">11:32</p>
+            </div>
+            <p style="color: red; margin-top: 10px">待处理</p>
+          </van-col>
+          <van-col span="18" style="border-left: 1px solid #e3e3e3" class="list-item-right">
+            <van-row>
+              <van-col span="24">
+                <span>东台市南阳镇菩提寺需要于12.12日晚8点举办祈福活动，请审核。</span>
+              </van-col>
+            </van-row>
+            <van-row justify="space-between">
+              <van-col span="12">盐城-东台-南阳镇</van-col>
+              <van-col span="8">一般交办</van-col>
+            </van-row>
+          </van-col>
+        </van-row>
+      </div>
+    </van-tab>
+    <van-tab title="已处理"> 
+      <div class="list1">
+        <van-row class="list-item">
+          <van-col span="6" class="list-item-left">
+            <div>
+              <p style="color: #a3a3a3">2022.12.01</p>
+              <p style="color: #a3a3a3">11:32</p>
+            </div>
+            <p style="color: red; margin-top: 10px">已处理</p>
+          </van-col>
+          <van-col span="18" style="border-left: 1px solid #e3e3e3" class="list-item-right">
+            <van-row>
+              <van-col span="24">
+                <span>东台市南阳镇菩提寺需要于12.12日晚8点举办祈福活动，请审核。</span>
+              </van-col>
+            </van-row>
+            <van-row justify="space-between">
+              <van-col span="12">盐城-东台-南阳镇</van-col>
+              <van-col span="8">一般交办</van-col>
+            </van-row>
+          </van-col>
+        </van-row>
+        <van-row class="list-item">
+          <van-col span="6" class="list-item-left">
+            <div>
+              <p style="color: #a3a3a3">2022.12.01</p>
+              <p style="color: #a3a3a3">11:32</p>
+            </div>
+            <p style="color: red; margin-top: 10px">已处理</p>
+          </van-col>
+          <van-col span="18" style="border-left: 1px solid #e3e3e3" class="list-item-right">
+            <van-row>
+              <van-col span="24">
+                <span>东台市南阳镇菩提寺需要于12.12日晚8点举办祈福活动，请审核。</span>
+              </van-col>
+            </van-row>
+            <van-row justify="space-between">
+              <van-col span="12">盐城-东台-南阳镇</van-col>
+              <van-col span="8">一般交办</van-col>
+            </van-row>
+          </van-col>
+        </van-row>
+        <van-row class="list-item">
+          <van-col span="6" class="list-item-left">
+            <div>
+              <p style="color: #a3a3a3">2022.12.01</p>
+              <p style="color: #a3a3a3">11:32</p>
+            </div>
+            <p style="color: red; margin-top: 10px">已处理</p>
+          </van-col>
+          <van-col span="18" style="border-left: 1px solid #e3e3e3" class="list-item-right">
+            <van-row>
+              <van-col span="24">
+                <span>东台市南阳镇菩提寺需要于12.12日晚8点举办祈福活动，请审核。</span>
+              </van-col>
+            </van-row>
+            <van-row justify="space-between">
+              <van-col span="12">盐城-东台-南阳镇</van-col>
+              <van-col span="8">一般交办</van-col>
+            </van-row>
+          </van-col>
+        </van-row>
+        <van-row class="list-item">
+          <van-col span="6" class="list-item-left">
+            <div>
+              <p style="color: #a3a3a3">2022.12.01</p>
+              <p style="color: #a3a3a3">11:32</p>
+            </div>
+            <p style="color: red; margin-top: 10px">已处理</p>
+          </van-col>
+          <van-col span="18" style="border-left: 1px solid #e3e3e3" class="list-item-right">
+            <van-row>
+              <van-col span="24">
+                <span>东台市南阳镇菩提寺需要于12.12日晚8点举办祈福活动，请审核。</span>
+              </van-col>
+            </van-row>
+            <van-row justify="space-between">
+              <van-col span="12">盐城-东台-南阳镇</van-col>
+              <van-col span="8">一般交办</van-col>
+            </van-row>
+          </van-col>
+        </van-row>
+        <van-row class="list-item">
+          <van-col span="6" class="list-item-left">
+            <div>
+              <p style="color: #a3a3a3">2022.12.01</p>
+              <p style="color: #a3a3a3">11:32</p>
+            </div>
+            <p style="color: red; margin-top: 10px">已处理</p>
+          </van-col>
+          <van-col span="18" style="border-left: 1px solid #e3e3e3" class="list-item-right">
+            <van-row>
+              <van-col span="24">
+                <span>东台市南阳镇菩提寺需要于12.12日晚8点举办祈福活动，请审核。</span>
+              </van-col>
+            </van-row>
+            <van-row justify="space-between">
+              <van-col span="12">盐城-东台-南阳镇</van-col>
+              <van-col span="8">一般交办</van-col>
+            </van-row>
+          </van-col>
+        </van-row>
+        <van-row class="list-item">
+          <van-col span="6" class="list-item-left">
+            <div>
+              <p style="color: #a3a3a3">2022.12.01</p>
+              <p style="color: #a3a3a3">11:32</p>
+            </div>
+            <p style="color: red; margin-top: 10px">已处理</p>
+          </van-col>
+          <van-col span="18" style="border-left: 1px solid #e3e3e3" class="list-item-right">
+            <van-row>
+              <van-col span="24">
+                <span>东台市南阳镇菩提寺需要于12.12日晚8点举办祈福活动，请审核。</span>
+              </van-col>
+            </van-row>
+            <van-row justify="space-between">
+              <van-col span="12">盐城-东台-南阳镇</van-col>
+              <van-col span="8">一般交办</van-col>
+            </van-row>
+          </van-col>
+        </van-row>
+        <van-row class="list-item">
+          <van-col span="6" class="list-item-left">
+            <div>
+              <p style="color: #a3a3a3">2022.12.01</p>
+              <p style="color: #a3a3a3">11:32</p>
+            </div>
+            <p style="color: red; margin-top: 10px">已处理</p>
+          </van-col>
+          <van-col span="18" style="border-left: 1px solid #e3e3e3" class="list-item-right">
+            <van-row>
+              <van-col span="24">
+                <span>东台市南阳镇菩提寺需要于12.12日晚8点举办祈福活动，请审核。</span>
+              </van-col>
+            </van-row>
+            <van-row justify="space-between">
+              <van-col span="12">盐城-东台-南阳镇</van-col>
+              <van-col span="8">一般交办</van-col>
+            </van-row>
+          </van-col>
+        </van-row>
+      </div>
+    </van-tab>
+  </van-tabs>
 </template>
+
+<script>
+export default {
+  setup() {
+    const goback = ()=>{
+      history.back();
+    }
+    return {
+      goback,
+    }
+  }
+};
+</script>
+
+<style lang="less">
+body,
+html {
+  margin: 0;
+  padding: 0;
+  background-color: #f2f2f2;
+}
+.header {
+  background-color: #39a9ed;
+  .van-col {
+    text-align: center;
+    margin: auto;
+  }
+}
+.list1 {
+  margin-top: 10px;
+  .list-item {
+    background-color: #fff;
+    padding: 10px 0;
+    margin-bottom: 5px;
+    .list-item-left {
+      text-align: center;
+      font-size: 12px;
+      border-right: 2px solid #f2f2f2;
+      p {
+        margin: 0;
+        padding: 0;
+      }
+    }
+    .list-item-right{
+      .van-row{
+        &:nth-child(1){
+          padding: 0 10px;
+          font-size: 16px;
+          font-weight: 700;
+          letter-spacing:2px
+        }
+        &:nth-child(2){
+          margin-top: 10px;
+          padding: 0 10px;
+          color: #c0c0c0;
+          font-size: 14px;
+          .van-col{
+            &:nth-child(2){
+              text-align: right;
+            }
+          }
+        }
+      }
+    }
+  }
+}
+</style>