xcx 4 gadus atpakaļ
vecāks
revīzija
b03b1a4aa7

+ 3
- 3
src/app.js Parādīt failu

@@ -12,9 +12,9 @@ class App extends Component {
12 12
 
13 13
   onLaunch () {
14 14
 
15
-    Taro.setEnableDebug({
16
-      enableDebug: true
17
-    })
15
+    // Taro.setEnableDebug({
16
+    //   enableDebug: true
17
+    // })
18 18
     // 此处获取不到 state, 因为 app 不会刷新
19 19
     const { setSysInfo } = store.getModel('sys').getState()
20 20
 

+ 0
- 1
src/layouts/index.jsx Parādīt failu

@@ -103,7 +103,6 @@ export default function (props) {
103 103
 
104 104
   return (
105 105
     <Spin loading={loading}>
106
-
107 106
       {/* 广告 */}
108 107
       <AdvLayer></AdvLayer>
109 108
       <RenZhengScreen Show={showAuthYeZhu}></RenZhengScreen>

+ 2
- 2
src/pages/ShouYe/index.jsx Parādīt failu

@@ -14,7 +14,7 @@ import '@/assets/css/reset.less'
14 14
 import '@/assets/css/iconfont.less'
15 15
 import './index.less'
16 16
 
17
-export default function Index (props) {
17
+export default function Index () {
18 18
 
19 19
   const { user } = useModel('user')
20 20
   const [OwnerList] = useState([
@@ -103,7 +103,7 @@ export default function Index (props) {
103 103
   }
104 104
 
105 105
   const GetNotice = () => { // 获取通知
106
-    request({ ...apis.getGongGaoList, args: { orgId: user.orgId }, params: { annType: 'notice', pageNum: 1, pageSize: 1 } }).then((res) => {
106
+    request({ ...apis.getGongGaoList, args: { orgId: 1 }, params: { annType: 'notice', pageNum: 1, pageSize: 1 } }).then((res) => {
107 107
       setNoticeInfo(res.records[0])
108 108
       if (res.records !== null && res.records.length > 0) {
109 109
         setShowNotice(true)

+ 14
- 2
src/pages/WoDe/YeZhuRenZheng/index.css Parādīt failu

@@ -20,11 +20,14 @@
20 20
   color: #333;
21 21
   line-height: 100px;
22 22
 }
23
-.YeZhuRenZheng > .Form > .flex-h > text:first-child {
23
+.YeZhuRenZheng > .Form > .flex-h > text.iconfont {
24 24
   font-size: 50px;
25 25
   color: #F35844;
26 26
   width: 80px;
27 27
 }
28
+.YeZhuRenZheng > .Form > .flex-h > text:first-child {
29
+  min-width: 80px;
30
+}
28 31
 .YeZhuRenZheng > .Form > .flex-h > text:last-child {
29 32
   line-height: 60px;
30 33
   padding: 0 20px;
@@ -36,6 +39,12 @@
36 39
   color: #F35844;
37 40
   border-color: #F35844;
38 41
 }
42
+.YeZhuRenZheng > .Form > .flex-h > .flex-item .PickerText {
43
+  width: 100%;
44
+  text-align: right;
45
+  font-size: 28px;
46
+  color: #666;
47
+}
39 48
 .YeZhuRenZheng > .Form > .flex-h > input {
40 49
   font-size: 28px;
41 50
   color: #333;
@@ -54,8 +63,11 @@
54 63
   width: 100%;
55 64
   font-size: 32px;
56 65
   color: #fff;
57
-  background: #F35844;
66
+  background: #ccc;
58 67
   border-radius: 12px;
59 68
   line-height: 84px;
60 69
   text-align: center;
61 70
 }
71
+.YeZhuRenZheng > .BottomBtn > text.active {
72
+  background: #F35844;
73
+}

+ 2
- 2
src/pages/WoDe/YeZhuRenZheng/index.jsx Parādīt failu

@@ -181,6 +181,7 @@ export default function YeZhuRenZheng () {
181 181
           }
182 182
         }).then((res) => {
183 183
           Taro.showToast({ title: '添加认证成功', icon: 'none' })
184
+          setDataLock(false)
184 185
           if (PageFrom === 'popup') {
185 186
             // 获取审核详情
186 187
             request({ ...apis.getRenZhengDetail, args: { id: res.id } }).then((cRes) => {
@@ -190,7 +191,6 @@ export default function YeZhuRenZheng () {
190 191
           } else {
191 192
             Taro.navigateTo({ url: `/pages/WoDe/YeZhuShenHe/index?id=${res.id}` })
192 193
           }
193
-          setDataLock(false)
194 194
         }).catch((res) => {
195 195
           Taro.showToast({ title: res, icon: 'none' })
196 196
           setDataLock(false)
@@ -372,7 +372,7 @@ export default function YeZhuRenZheng () {
372 372
           </view>
373 373
         </view>
374 374
         <view className='BottomBtn' onClick={Submit}>
375
-          <text>提交</text>
375
+          <text className={DataLock ? '' : 'active'}>{DataLock ? '提交中...' : '提交'}</text>
376 376
         </view>
377 377
       </view>
378 378
     </Page>

+ 4
- 1
src/pages/WoDe/YeZhuRenZheng/index.less Parādīt failu

@@ -74,10 +74,13 @@
74 74
       width: 100%;
75 75
       font-size: 32px;
76 76
       color: #fff;
77
-      background: #F35844;
77
+      background: #ccc;
78 78
       border-radius: 12px;
79 79
       line-height: 84px;
80 80
       text-align: center;
81
+      &.active {
82
+        background: #F35844;
83
+      }
81 84
     }
82 85
   }
83 86
 }

+ 1
- 1
src/pages/WuYe/TianJiaBaoXiu/index.jsx Parādīt failu

@@ -101,7 +101,7 @@ export default function WuYeTianJiaBaoXiu () {
101 101
           <Textarea placeholder='描述问题详情,以便我们更好的相处' onInput={TitleChange} value={Title}></Textarea>
102 102
           <view className='LabelList'>
103 103
             {
104
-              (repairType || {tags: ''}).tags.split(',').map(tag => <text key={tag} onClick={() => setTitle(tag)}>{tag}</text>)
104
+              (repairType || {tags: ''}).tags.split(',').map(tag => <text key={tag} onClick={() => setTitle(Title === '' ? tag : `${Title},${tag}`)}>{tag}</text>)
105 105
             }
106 106
           </view>
107 107
         </view>

+ 2
- 2
src/pages/WuYe/XiuGaiBaoXiu/index.jsx Parādīt failu

@@ -33,7 +33,7 @@ export default function WuYeXiuGaiBaoXiu () {
33 33
   }
34 34
 
35 35
   const TitleChange = (e) => {
36
-    handleTitleChange(e.detail.value)
36
+    setDetailInfo({ ...DetailInfo, ticketTitle: e.detail.value })
37 37
   }
38 38
 
39 39
   const DescChange = (e) => {
@@ -113,7 +113,7 @@ export default function WuYeXiuGaiBaoXiu () {
113 113
           <Textarea placeholder='描述问题详情,以便我们更好的相处' onInput={TitleChange} value={DetailInfo === null ? null : DetailInfo.ticketTitle}></Textarea>
114 114
           <view className='LabelList'>
115 115
             {
116
-              (repairType || {tags: ''}).tags.split(',').map(tag => <text key={tag} onClick={() => handleTitleChange(tag)}>{tag}</text>)
116
+              (repairType || {tags: ''}).tags.split(',').map(tag => <text key={tag} onClick={() => handleTitleChange(DetailInfo.ticketTitle === '' ? tag : `${DetailInfo.ticketTitle},${tag}`)}>{tag}</text>)
117 117
             }
118 118
           </view>
119 119
         </view>