Showing
3 changed files
with
71 additions
and
46 deletions
| @@ -2039,7 +2039,7 @@ class NotebookDetailPageState extends State<NotebookDetailPage> { | @@ -2039,7 +2039,7 @@ class NotebookDetailPageState extends State<NotebookDetailPage> { | ||
| 2039 | 2039 | ||
| 2040 | if (sucess) { | 2040 | if (sucess) { |
| 2041 | if (qiniuUrl != null) { | 2041 | if (qiniuUrl != null) { |
| 2042 | - _uploadImageProvider.deleteImg(context, qiniuUrl,needToast: false); | 2042 | + _uploadImageProvider.deleteImg(context, qiniuUrl, needToast: false); |
| 2043 | } | 2043 | } |
| 2044 | 2044 | ||
| 2045 | // bus.emit("refresh_book_list"); //刷新已预订列表 | 2045 | // bus.emit("refresh_book_list"); //刷新已预订列表 |
| @@ -2078,13 +2078,12 @@ class NotebookDetailPageState extends State<NotebookDetailPage> { | @@ -2078,13 +2078,12 @@ class NotebookDetailPageState extends State<NotebookDetailPage> { | ||
| 2078 | imageList: remarkImgs, | 2078 | imageList: remarkImgs, |
| 2079 | uploadType: UploadType.RemarkImagesType, | 2079 | uploadType: UploadType.RemarkImagesType, |
| 2080 | deleteCallback: (int index) { | 2080 | deleteCallback: (int index) { |
| 2081 | - String qiniuUrl = remarkImgs[index].qiniuUrl; | 2081 | + String qiniuUrl = remarkImgs[index].qiniuUrl; |
| 2082 | remarkImgs.removeWhere( | 2082 | remarkImgs.removeWhere( |
| 2083 | (element) => element == remarkImgs[index]); | 2083 | (element) => element == remarkImgs[index]); |
| 2084 | setState(() {}); | 2084 | setState(() {}); |
| 2085 | //删除图片接口?????? | 2085 | //删除图片接口?????? |
| 2086 | - _updatePhotoNote( | ||
| 2087 | - qiniuUrl: qiniuUrl); | 2086 | + _updatePhotoNote(qiniuUrl: qiniuUrl); |
| 2088 | }, | 2087 | }, |
| 2089 | callback: () async { | 2088 | callback: () async { |
| 2090 | print(remarkImgs); | 2089 | print(remarkImgs); |
| @@ -2229,6 +2228,23 @@ class NotebookDetailPageState extends State<NotebookDetailPage> { | @@ -2229,6 +2228,23 @@ class NotebookDetailPageState extends State<NotebookDetailPage> { | ||
| 2229 | bool show = (rolename == '管理员' || rolename == '店长') && | 2228 | bool show = (rolename == '管理员' || rolename == '店长') && |
| 2230 | data.logPhoto != null && | 2229 | data.logPhoto != null && |
| 2231 | data.logPhoto != ''; | 2230 | data.logPhoto != ''; |
| 2231 | +bool showPhone = (Utils.getAuthority(context, '订座详情-电话') || | ||
| 2232 | + widget.uid == | ||
| 2233 | + Provider.of<UserModel>(context, | ||
| 2234 | + listen: false) | ||
| 2235 | + .user | ||
| 2236 | + .openid || | ||
| 2237 | + (Provider.of<UserModel>(context, | ||
| 2238 | + listen: false) | ||
| 2239 | + .user | ||
| 2240 | + .role_name == | ||
| 2241 | + '店长' && | ||
| 2242 | + detailModel.detailModelAllSunModel | ||
| 2243 | + .roleName != | ||
| 2244 | + '管理员' && | ||
| 2245 | + detailModel.detailModelAllSunModel | ||
| 2246 | + .roleName != | ||
| 2247 | + '店长')); | ||
| 2232 | return Container( | 2248 | return Container( |
| 2233 | padding: | 2249 | padding: |
| 2234 | EdgeInsets.only(left: w(30), top: index == 0 ? w(16) : 0), | 2250 | EdgeInsets.only(left: w(30), top: index == 0 ? w(16) : 0), |
| @@ -2274,7 +2290,16 @@ class NotebookDetailPageState extends State<NotebookDetailPage> { | @@ -2274,7 +2290,16 @@ class NotebookDetailPageState extends State<NotebookDetailPage> { | ||
| 2274 | top: w(12), | 2290 | top: w(12), |
| 2275 | ), | 2291 | ), |
| 2276 | child: Text( | 2292 | child: Text( |
| 2277 | - data.content, | 2293 | + data.content.contains( |
| 2294 | + detailModel.detailModelAllSunModel.phone) | ||
| 2295 | + ? showPhone | ||
| 2296 | + ? data.content | ||
| 2297 | + : data.content.replaceAll( | ||
| 2298 | + detailModel.detailModelAllSunModel.phone, | ||
| 2299 | + Utils.starPhone( | ||
| 2300 | + detailModel.detailModelAllSunModel.phone)) | ||
| 2301 | + : data.content, | ||
| 2302 | + | ||
| 2278 | // overflow: TextOverflow.ellipsis, | 2303 | // overflow: TextOverflow.ellipsis, |
| 2279 | style: TextStyle( | 2304 | style: TextStyle( |
| 2280 | height: 2, | 2305 | height: 2, |
| @@ -5,14 +5,14 @@ packages: | @@ -5,14 +5,14 @@ packages: | ||
| 5 | dependency: transitive | 5 | dependency: transitive |
| 6 | description: | 6 | description: |
| 7 | name: async | 7 | name: async |
| 8 | - url: "https://pub.dartlang.org" | 8 | + url: "https://pub.flutter-io.cn" |
| 9 | source: hosted | 9 | source: hosted |
| 10 | version: "2.9.0" | 10 | version: "2.9.0" |
| 11 | boolean_selector: | 11 | boolean_selector: |
| 12 | dependency: transitive | 12 | dependency: transitive |
| 13 | description: | 13 | description: |
| 14 | name: boolean_selector | 14 | name: boolean_selector |
| 15 | - url: "https://pub.dartlang.org" | 15 | + url: "https://pub.flutter-io.cn" |
| 16 | source: hosted | 16 | source: hosted |
| 17 | version: "2.1.0" | 17 | version: "2.1.0" |
| 18 | calendar_date_picker2: | 18 | calendar_date_picker2: |
| @@ -26,35 +26,35 @@ packages: | @@ -26,35 +26,35 @@ packages: | ||
| 26 | dependency: transitive | 26 | dependency: transitive |
| 27 | description: | 27 | description: |
| 28 | name: characters | 28 | name: characters |
| 29 | - url: "https://pub.dartlang.org" | 29 | + url: "https://pub.flutter-io.cn" |
| 30 | source: hosted | 30 | source: hosted |
| 31 | version: "1.2.1" | 31 | version: "1.2.1" |
| 32 | clock: | 32 | clock: |
| 33 | dependency: transitive | 33 | dependency: transitive |
| 34 | description: | 34 | description: |
| 35 | name: clock | 35 | name: clock |
| 36 | - url: "https://pub.dartlang.org" | 36 | + url: "https://pub.flutter-io.cn" |
| 37 | source: hosted | 37 | source: hosted |
| 38 | version: "1.1.1" | 38 | version: "1.1.1" |
| 39 | collection: | 39 | collection: |
| 40 | dependency: transitive | 40 | dependency: transitive |
| 41 | description: | 41 | description: |
| 42 | name: collection | 42 | name: collection |
| 43 | - url: "https://pub.dartlang.org" | 43 | + url: "https://pub.flutter-io.cn" |
| 44 | source: hosted | 44 | source: hosted |
| 45 | version: "1.16.0" | 45 | version: "1.16.0" |
| 46 | cupertino_icons: | 46 | cupertino_icons: |
| 47 | dependency: "direct main" | 47 | dependency: "direct main" |
| 48 | description: | 48 | description: |
| 49 | name: cupertino_icons | 49 | name: cupertino_icons |
| 50 | - url: "https://pub.dartlang.org" | 50 | + url: "https://pub.flutter-io.cn" |
| 51 | source: hosted | 51 | source: hosted |
| 52 | version: "1.0.5" | 52 | version: "1.0.5" |
| 53 | fake_async: | 53 | fake_async: |
| 54 | dependency: transitive | 54 | dependency: transitive |
| 55 | description: | 55 | description: |
| 56 | name: fake_async | 56 | name: fake_async |
| 57 | - url: "https://pub.dartlang.org" | 57 | + url: "https://pub.flutter-io.cn" |
| 58 | source: hosted | 58 | source: hosted |
| 59 | version: "1.3.1" | 59 | version: "1.3.1" |
| 60 | flutter: | 60 | flutter: |
| @@ -66,7 +66,7 @@ packages: | @@ -66,7 +66,7 @@ packages: | ||
| 66 | dependency: "direct dev" | 66 | dependency: "direct dev" |
| 67 | description: | 67 | description: |
| 68 | name: flutter_lints | 68 | name: flutter_lints |
| 69 | - url: "https://pub.dartlang.org" | 69 | + url: "https://pub.flutter-io.cn" |
| 70 | source: hosted | 70 | source: hosted |
| 71 | version: "2.0.2" | 71 | version: "2.0.2" |
| 72 | flutter_localizations: | 72 | flutter_localizations: |
| @@ -83,42 +83,42 @@ packages: | @@ -83,42 +83,42 @@ packages: | ||
| 83 | dependency: transitive | 83 | dependency: transitive |
| 84 | description: | 84 | description: |
| 85 | name: intl | 85 | name: intl |
| 86 | - url: "https://pub.dartlang.org" | 86 | + url: "https://pub.flutter-io.cn" |
| 87 | source: hosted | 87 | source: hosted |
| 88 | version: "0.17.0" | 88 | version: "0.17.0" |
| 89 | lints: | 89 | lints: |
| 90 | dependency: transitive | 90 | dependency: transitive |
| 91 | description: | 91 | description: |
| 92 | name: lints | 92 | name: lints |
| 93 | - url: "https://pub.dartlang.org" | 93 | + url: "https://pub.flutter-io.cn" |
| 94 | source: hosted | 94 | source: hosted |
| 95 | version: "2.0.1" | 95 | version: "2.0.1" |
| 96 | matcher: | 96 | matcher: |
| 97 | dependency: transitive | 97 | dependency: transitive |
| 98 | description: | 98 | description: |
| 99 | name: matcher | 99 | name: matcher |
| 100 | - url: "https://pub.dartlang.org" | 100 | + url: "https://pub.flutter-io.cn" |
| 101 | source: hosted | 101 | source: hosted |
| 102 | version: "0.12.12" | 102 | version: "0.12.12" |
| 103 | material_color_utilities: | 103 | material_color_utilities: |
| 104 | dependency: transitive | 104 | dependency: transitive |
| 105 | description: | 105 | description: |
| 106 | name: material_color_utilities | 106 | name: material_color_utilities |
| 107 | - url: "https://pub.dartlang.org" | 107 | + url: "https://pub.flutter-io.cn" |
| 108 | source: hosted | 108 | source: hosted |
| 109 | version: "0.1.5" | 109 | version: "0.1.5" |
| 110 | meta: | 110 | meta: |
| 111 | dependency: transitive | 111 | dependency: transitive |
| 112 | description: | 112 | description: |
| 113 | name: meta | 113 | name: meta |
| 114 | - url: "https://pub.dartlang.org" | 114 | + url: "https://pub.flutter-io.cn" |
| 115 | source: hosted | 115 | source: hosted |
| 116 | version: "1.8.0" | 116 | version: "1.8.0" |
| 117 | path: | 117 | path: |
| 118 | dependency: transitive | 118 | dependency: transitive |
| 119 | description: | 119 | description: |
| 120 | name: path | 120 | name: path |
| 121 | - url: "https://pub.dartlang.org" | 121 | + url: "https://pub.flutter-io.cn" |
| 122 | source: hosted | 122 | source: hosted |
| 123 | version: "1.8.2" | 123 | version: "1.8.2" |
| 124 | sky_engine: | 124 | sky_engine: |
| @@ -130,49 +130,49 @@ packages: | @@ -130,49 +130,49 @@ packages: | ||
| 130 | dependency: transitive | 130 | dependency: transitive |
| 131 | description: | 131 | description: |
| 132 | name: source_span | 132 | name: source_span |
| 133 | - url: "https://pub.dartlang.org" | 133 | + url: "https://pub.flutter-io.cn" |
| 134 | source: hosted | 134 | source: hosted |
| 135 | version: "1.9.0" | 135 | version: "1.9.0" |
| 136 | stack_trace: | 136 | stack_trace: |
| 137 | dependency: transitive | 137 | dependency: transitive |
| 138 | description: | 138 | description: |
| 139 | name: stack_trace | 139 | name: stack_trace |
| 140 | - url: "https://pub.dartlang.org" | 140 | + url: "https://pub.flutter-io.cn" |
| 141 | source: hosted | 141 | source: hosted |
| 142 | version: "1.10.0" | 142 | version: "1.10.0" |
| 143 | stream_channel: | 143 | stream_channel: |
| 144 | dependency: transitive | 144 | dependency: transitive |
| 145 | description: | 145 | description: |
| 146 | name: stream_channel | 146 | name: stream_channel |
| 147 | - url: "https://pub.dartlang.org" | 147 | + url: "https://pub.flutter-io.cn" |
| 148 | source: hosted | 148 | source: hosted |
| 149 | version: "2.1.0" | 149 | version: "2.1.0" |
| 150 | string_scanner: | 150 | string_scanner: |
| 151 | dependency: transitive | 151 | dependency: transitive |
| 152 | description: | 152 | description: |
| 153 | name: string_scanner | 153 | name: string_scanner |
| 154 | - url: "https://pub.dartlang.org" | 154 | + url: "https://pub.flutter-io.cn" |
| 155 | source: hosted | 155 | source: hosted |
| 156 | version: "1.1.1" | 156 | version: "1.1.1" |
| 157 | term_glyph: | 157 | term_glyph: |
| 158 | dependency: transitive | 158 | dependency: transitive |
| 159 | description: | 159 | description: |
| 160 | name: term_glyph | 160 | name: term_glyph |
| 161 | - url: "https://pub.dartlang.org" | 161 | + url: "https://pub.flutter-io.cn" |
| 162 | source: hosted | 162 | source: hosted |
| 163 | version: "1.2.1" | 163 | version: "1.2.1" |
| 164 | test_api: | 164 | test_api: |
| 165 | dependency: transitive | 165 | dependency: transitive |
| 166 | description: | 166 | description: |
| 167 | name: test_api | 167 | name: test_api |
| 168 | - url: "https://pub.dartlang.org" | 168 | + url: "https://pub.flutter-io.cn" |
| 169 | source: hosted | 169 | source: hosted |
| 170 | version: "0.4.12" | 170 | version: "0.4.12" |
| 171 | vector_math: | 171 | vector_math: |
| 172 | dependency: transitive | 172 | dependency: transitive |
| 173 | description: | 173 | description: |
| 174 | name: vector_math | 174 | name: vector_math |
| 175 | - url: "https://pub.dartlang.org" | 175 | + url: "https://pub.flutter-io.cn" |
| 176 | source: hosted | 176 | source: hosted |
| 177 | version: "2.1.2" | 177 | version: "2.1.2" |
| 178 | sdks: | 178 | sdks: |
| @@ -5,42 +5,42 @@ packages: | @@ -5,42 +5,42 @@ packages: | ||
| 5 | dependency: transitive | 5 | dependency: transitive |
| 6 | description: | 6 | description: |
| 7 | name: async | 7 | name: async |
| 8 | - url: "https://pub.dartlang.org" | 8 | + url: "https://pub.flutter-io.cn" |
| 9 | source: hosted | 9 | source: hosted |
| 10 | version: "2.9.0" | 10 | version: "2.9.0" |
| 11 | boolean_selector: | 11 | boolean_selector: |
| 12 | dependency: transitive | 12 | dependency: transitive |
| 13 | description: | 13 | description: |
| 14 | name: boolean_selector | 14 | name: boolean_selector |
| 15 | - url: "https://pub.dartlang.org" | 15 | + url: "https://pub.flutter-io.cn" |
| 16 | source: hosted | 16 | source: hosted |
| 17 | version: "2.1.0" | 17 | version: "2.1.0" |
| 18 | characters: | 18 | characters: |
| 19 | dependency: transitive | 19 | dependency: transitive |
| 20 | description: | 20 | description: |
| 21 | name: characters | 21 | name: characters |
| 22 | - url: "https://pub.dartlang.org" | 22 | + url: "https://pub.flutter-io.cn" |
| 23 | source: hosted | 23 | source: hosted |
| 24 | version: "1.2.1" | 24 | version: "1.2.1" |
| 25 | clock: | 25 | clock: |
| 26 | dependency: transitive | 26 | dependency: transitive |
| 27 | description: | 27 | description: |
| 28 | name: clock | 28 | name: clock |
| 29 | - url: "https://pub.dartlang.org" | 29 | + url: "https://pub.flutter-io.cn" |
| 30 | source: hosted | 30 | source: hosted |
| 31 | version: "1.1.1" | 31 | version: "1.1.1" |
| 32 | collection: | 32 | collection: |
| 33 | dependency: transitive | 33 | dependency: transitive |
| 34 | description: | 34 | description: |
| 35 | name: collection | 35 | name: collection |
| 36 | - url: "https://pub.dartlang.org" | 36 | + url: "https://pub.flutter-io.cn" |
| 37 | source: hosted | 37 | source: hosted |
| 38 | version: "1.16.0" | 38 | version: "1.16.0" |
| 39 | fake_async: | 39 | fake_async: |
| 40 | dependency: transitive | 40 | dependency: transitive |
| 41 | description: | 41 | description: |
| 42 | name: fake_async | 42 | name: fake_async |
| 43 | - url: "https://pub.dartlang.org" | 43 | + url: "https://pub.flutter-io.cn" |
| 44 | source: hosted | 44 | source: hosted |
| 45 | version: "1.3.1" | 45 | version: "1.3.1" |
| 46 | flutter: | 46 | flutter: |
| @@ -52,7 +52,7 @@ packages: | @@ -52,7 +52,7 @@ packages: | ||
| 52 | dependency: "direct dev" | 52 | dependency: "direct dev" |
| 53 | description: | 53 | description: |
| 54 | name: flutter_lints | 54 | name: flutter_lints |
| 55 | - url: "https://pub.dartlang.org" | 55 | + url: "https://pub.flutter-io.cn" |
| 56 | source: hosted | 56 | source: hosted |
| 57 | version: "2.0.2" | 57 | version: "2.0.2" |
| 58 | flutter_test: | 58 | flutter_test: |
| @@ -64,42 +64,42 @@ packages: | @@ -64,42 +64,42 @@ packages: | ||
| 64 | dependency: "direct main" | 64 | dependency: "direct main" |
| 65 | description: | 65 | description: |
| 66 | name: intl | 66 | name: intl |
| 67 | - url: "https://pub.dartlang.org" | 67 | + url: "https://pub.flutter-io.cn" |
| 68 | source: hosted | 68 | source: hosted |
| 69 | version: "0.18.1" | 69 | version: "0.18.1" |
| 70 | lints: | 70 | lints: |
| 71 | dependency: transitive | 71 | dependency: transitive |
| 72 | description: | 72 | description: |
| 73 | name: lints | 73 | name: lints |
| 74 | - url: "https://pub.dartlang.org" | 74 | + url: "https://pub.flutter-io.cn" |
| 75 | source: hosted | 75 | source: hosted |
| 76 | version: "2.0.1" | 76 | version: "2.0.1" |
| 77 | matcher: | 77 | matcher: |
| 78 | dependency: transitive | 78 | dependency: transitive |
| 79 | description: | 79 | description: |
| 80 | name: matcher | 80 | name: matcher |
| 81 | - url: "https://pub.dartlang.org" | 81 | + url: "https://pub.flutter-io.cn" |
| 82 | source: hosted | 82 | source: hosted |
| 83 | version: "0.12.12" | 83 | version: "0.12.12" |
| 84 | material_color_utilities: | 84 | material_color_utilities: |
| 85 | dependency: transitive | 85 | dependency: transitive |
| 86 | description: | 86 | description: |
| 87 | name: material_color_utilities | 87 | name: material_color_utilities |
| 88 | - url: "https://pub.dartlang.org" | 88 | + url: "https://pub.flutter-io.cn" |
| 89 | source: hosted | 89 | source: hosted |
| 90 | version: "0.1.5" | 90 | version: "0.1.5" |
| 91 | meta: | 91 | meta: |
| 92 | dependency: transitive | 92 | dependency: transitive |
| 93 | description: | 93 | description: |
| 94 | name: meta | 94 | name: meta |
| 95 | - url: "https://pub.dartlang.org" | 95 | + url: "https://pub.flutter-io.cn" |
| 96 | source: hosted | 96 | source: hosted |
| 97 | version: "1.8.0" | 97 | version: "1.8.0" |
| 98 | path: | 98 | path: |
| 99 | dependency: transitive | 99 | dependency: transitive |
| 100 | description: | 100 | description: |
| 101 | name: path | 101 | name: path |
| 102 | - url: "https://pub.dartlang.org" | 102 | + url: "https://pub.flutter-io.cn" |
| 103 | source: hosted | 103 | source: hosted |
| 104 | version: "1.8.2" | 104 | version: "1.8.2" |
| 105 | sky_engine: | 105 | sky_engine: |
| @@ -111,49 +111,49 @@ packages: | @@ -111,49 +111,49 @@ packages: | ||
| 111 | dependency: transitive | 111 | dependency: transitive |
| 112 | description: | 112 | description: |
| 113 | name: source_span | 113 | name: source_span |
| 114 | - url: "https://pub.dartlang.org" | 114 | + url: "https://pub.flutter-io.cn" |
| 115 | source: hosted | 115 | source: hosted |
| 116 | version: "1.9.0" | 116 | version: "1.9.0" |
| 117 | stack_trace: | 117 | stack_trace: |
| 118 | dependency: transitive | 118 | dependency: transitive |
| 119 | description: | 119 | description: |
| 120 | name: stack_trace | 120 | name: stack_trace |
| 121 | - url: "https://pub.dartlang.org" | 121 | + url: "https://pub.flutter-io.cn" |
| 122 | source: hosted | 122 | source: hosted |
| 123 | version: "1.10.0" | 123 | version: "1.10.0" |
| 124 | stream_channel: | 124 | stream_channel: |
| 125 | dependency: transitive | 125 | dependency: transitive |
| 126 | description: | 126 | description: |
| 127 | name: stream_channel | 127 | name: stream_channel |
| 128 | - url: "https://pub.dartlang.org" | 128 | + url: "https://pub.flutter-io.cn" |
| 129 | source: hosted | 129 | source: hosted |
| 130 | version: "2.1.0" | 130 | version: "2.1.0" |
| 131 | string_scanner: | 131 | string_scanner: |
| 132 | dependency: transitive | 132 | dependency: transitive |
| 133 | description: | 133 | description: |
| 134 | name: string_scanner | 134 | name: string_scanner |
| 135 | - url: "https://pub.dartlang.org" | 135 | + url: "https://pub.flutter-io.cn" |
| 136 | source: hosted | 136 | source: hosted |
| 137 | version: "1.1.1" | 137 | version: "1.1.1" |
| 138 | term_glyph: | 138 | term_glyph: |
| 139 | dependency: transitive | 139 | dependency: transitive |
| 140 | description: | 140 | description: |
| 141 | name: term_glyph | 141 | name: term_glyph |
| 142 | - url: "https://pub.dartlang.org" | 142 | + url: "https://pub.flutter-io.cn" |
| 143 | source: hosted | 143 | source: hosted |
| 144 | version: "1.2.1" | 144 | version: "1.2.1" |
| 145 | test_api: | 145 | test_api: |
| 146 | dependency: transitive | 146 | dependency: transitive |
| 147 | description: | 147 | description: |
| 148 | name: test_api | 148 | name: test_api |
| 149 | - url: "https://pub.dartlang.org" | 149 | + url: "https://pub.flutter-io.cn" |
| 150 | source: hosted | 150 | source: hosted |
| 151 | version: "0.4.12" | 151 | version: "0.4.12" |
| 152 | vector_math: | 152 | vector_math: |
| 153 | dependency: transitive | 153 | dependency: transitive |
| 154 | description: | 154 | description: |
| 155 | name: vector_math | 155 | name: vector_math |
| 156 | - url: "https://pub.dartlang.org" | 156 | + url: "https://pub.flutter-io.cn" |
| 157 | source: hosted | 157 | source: hosted |
| 158 | version: "2.1.2" | 158 | version: "2.1.2" |
| 159 | sdks: | 159 | sdks: |
-
Please register or login to post a comment