dev01 1 year ago
parent
commit
743b4ed559

+ 3 - 3
src/app.js

@@ -20,12 +20,12 @@ class App extends Component {
   config = {
   config = {
     pages: [
     pages: [
       'pages/list/list', // 报告列表
       'pages/list/list', // 报告列表
-      'pages/user/reportdetail', // 报告详情
-      'pages/user/templatedetail', // 模板详情
+      'pages/reportdetail/reportdetail', // 报告详情
+      'pages/templatedetail/templatedetail', // 模板详情
       'pages/user-login/user-login', // 登录页
       'pages/user-login/user-login', // 登录页
       'pages/increase/increase', // 生成报告
       'pages/increase/increase', // 生成报告
       'pages/user/user', // 我的
       'pages/user/user', // 我的
-      'pages/user/template', // 模板列表
+      'pages/template/template', // 模板列表
 
 
     ],
     ],
     window: {
     window: {

+ 1 - 1
src/pages/increase/increase.js

@@ -59,7 +59,7 @@ class Increase extends Component {
         loading: false,
         loading: false,
       })
       })
       Taro.navigateTo({
       Taro.navigateTo({
-        url: "/pages/user/reportdetail?id=" + data
+        url: "/pages/reportdetail/reportdetail?id=" + data
       })
       })
     }).catch(() => {
     }).catch(() => {
       this.setState({ loading: false })
       this.setState({ loading: false })

+ 1 - 1
src/pages/list/itemlist.js

@@ -22,7 +22,7 @@ export default class ItemList extends Component {
                 }}
                 }}
                 onClick={() => {
                 onClick={() => {
                   Taro.navigateTo({
                   Taro.navigateTo({
-                    url: "/pages/user/reportdetail?id=" + item.id
+                    url: "/pages/reportdetail/reportdetail?id=" + item.id
                   })
                   })
                 }}
                 }}
               >
               >

+ 1 - 1
src/pages/user/reportdetail.js

@@ -6,7 +6,7 @@ import * as actions from '@actions/report'
 import { getWindowHeight } from '@utils/style'
 import { getWindowHeight } from '@utils/style'
 import ImagePicker from '../../components/imagePicker'
 import ImagePicker from '../../components/imagePicker'
 import RuiEditor from '../../components/editor'
 import RuiEditor from '../../components/editor'
-import './templatedetail.scss'
+import './reportdetail.scss'
 
 
 @connect(state => state.home, { ...actions, })
 @connect(state => state.home, { ...actions, })
 class ReportDetail extends Component {
 class ReportDetail extends Component {

src/pages/user/templatedetail.scss → src/pages/reportdetail/reportdetail.scss


+ 1 - 1
src/pages/user/template.js

@@ -75,7 +75,7 @@ class Template extends Component {
     }
     }
     this.props.creatReport(payload).then((data) => {
     this.props.creatReport(payload).then((data) => {
       Taro.navigateTo({
       Taro.navigateTo({
-        url: "/pages/user/reportdetail?id=" + data
+        url: "/pages/reportdetail/reportdetail?id=" + data
       })
       })
     }).catch(() => {
     }).catch(() => {
 
 

src/pages/user/template.scss → src/pages/template/template.scss


+ 1 - 1
src/pages/user/templatelist.js

@@ -38,7 +38,7 @@ export default class TemplateList extends Component {
               <View className='list__item' key={item.id}
               <View className='list__item' key={item.id}
                 onClick={() => {
                 onClick={() => {
                   Taro.navigateTo({
                   Taro.navigateTo({
-                    url: "/pages/user/templatedetail?id=" + item.id
+                    url: "/pages/templatedetail/templatedetail?id=" + item.id
                   })
                   })
                 }}
                 }}
               >
               >

src/pages/user/templatelist.scss → src/pages/template/templatelist.scss


src/pages/user/templatedetail.js → src/pages/templatedetail/templatedetail.js


+ 164 - 0
src/pages/templatedetail/templatedetail.scss

@@ -0,0 +1,164 @@
+.home {
+  background: #fff;
+
+  &-line {
+    height: 50px;
+  }
+
+  &-item {
+    display: flex;
+    flex-direction: column;
+    padding: 15px 30px;
+    font-size: 28px;
+
+    &-tit {
+      font-size: 32px;
+      margin-bottom: 10px;
+      font-weight: 600;
+
+    }
+
+    &-tits {
+      font-size: 32px;
+      margin-bottom: 10px;
+      font-weight: 600;
+      display: flex;
+      flex-direction: row;
+      align-items: center;
+      justify-content: space-between;
+      flex-wrap: nowrap;
+
+      &-txt {
+        width: 500px;
+        display: inline-block;
+        font-weight: 600;
+      }
+
+      &-bt {}
+
+    }
+
+    &-val {
+      border-bottom: 1px solid #d9d9d9;
+      font-size: 30px;
+
+    }
+
+    &-vals {
+      display: flex;
+      flex-direction: row;
+      justify-content: space-between;
+      flex-wrap: nowrap;
+      height: 50.68px;
+      border-bottom: 1px solid #d9d9d9;
+      font-size: 30px;
+
+      &-txt {
+        width: 500px;
+        display: inline-block;
+      }
+
+      &-bt {
+        // width: 26%;
+      }
+
+    }
+
+    &-text {
+      display: flex;
+      flex-direction: row;
+      flex-wrap: nowrap;
+
+      &-val {
+        display: flex;
+        flex: 1;
+        border-bottom: 1px solid #d9d9d9;
+
+      }
+
+    }
+
+    &-editor {
+      min-height: 150px;
+      font-size: 30px;
+      // border: 1px solid #d9d9d9;
+      // padding: 15px;
+      margin-top: 15px;
+
+    }
+
+    &-bottom {
+      display: flex;
+      justify-content: space-between;
+      width: 100%;
+      margin-top: 15px;
+      margin-bottom: 20px;
+
+    }
+
+  }
+
+}
+
+/* 遮罩层样式 */
+.mask {
+  position: fixed;
+  top: 0;
+  right: 0;
+  bottom: 0;
+  left: 0;
+  background: rgba(0, 0, 0, 0.5);
+  z-index: 998;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+
+  .count {
+    width: 70%;
+    background: #fff;
+    border-radius: 15px;
+
+    .title {
+      font-size: 36px;
+      display: flex;
+      flex-direction: row;
+      align-items: center;
+      justify-content: center;
+      margin-top: 20px;
+
+    }
+
+    &_top {
+      padding: 30px;
+      margin: 40px 0;
+
+      &_input {
+        border-bottom: 1px solid #d9d9d9;
+        font-size: 32px;
+
+      }
+
+      &_date {
+        border-bottom: 1px solid #d9d9d9;
+        font-size: 32px;
+        margin-top: 30px;
+      }
+
+      &_dates {
+        border-bottom: 1px solid #d9d9d9;
+        font-size: 32px;
+        margin-top: 30px;
+        color: #757575;
+      }
+
+    }
+
+    &_foot {
+      display: flex;
+      flex-direction: row;
+
+    }
+
+  }
+
+}

+ 1 - 1
src/pages/user/user.js

@@ -30,7 +30,7 @@ class User extends Component {
           <View className='item'
           <View className='item'
             onClick={() => {
             onClick={() => {
               Taro.navigateTo({
               Taro.navigateTo({
-                url: "/pages/user/template"
+                url: "/pages/template/template"
               })
               })
             }}
             }}
           >
           >