BIN simditor/static/simditor/images/emoji/arrow_lower_right.png
View File

BIN
simditor/static/simditor/images/emoji/arrow_right.png


BIN
simditor/static/simditor/images/emoji/arrow_right_hook.png


BIN
simditor/static/simditor/images/emoji/arrow_up.png


BIN
simditor/static/simditor/images/emoji/arrow_up_down.png


BIN
simditor/static/simditor/images/emoji/arrow_up_small.png


BIN
simditor/static/simditor/images/emoji/arrow_upper_left.png


BIN
simditor/static/simditor/images/emoji/arrow_upper_right.png


BIN
simditor/static/simditor/images/emoji/arrows_clockwise.png


BIN
simditor/static/simditor/images/emoji/arrows_counterclockwise.png


BIN
simditor/static/simditor/images/emoji/art.png


BIN
simditor/static/simditor/images/emoji/articulated_lorry.png


BIN
simditor/static/simditor/images/emoji/astonished.png


BIN
simditor/static/simditor/images/emoji/atm.png


BIN
simditor/static/simditor/images/emoji/b.png


BIN
simditor/static/simditor/images/emoji/baby.png


BIN
simditor/static/simditor/images/emoji/baby_bottle.png


BIN
simditor/static/simditor/images/emoji/baby_chick.png


BIN
simditor/static/simditor/images/emoji/baby_symbol.png


BIN
simditor/static/simditor/images/emoji/baggage_claim.png


BIN
simditor/static/simditor/images/emoji/balloon.png


BIN
simditor/static/simditor/images/emoji/ballot_box_with_check.png


BIN
simditor/static/simditor/images/emoji/bamboo.png


BIN
simditor/static/simditor/images/emoji/banana.png


BIN
simditor/static/simditor/images/emoji/bangbang.png


BIN
simditor/static/simditor/images/emoji/bank.png


BIN
simditor/static/simditor/images/emoji/bar_chart.png


BIN
simditor/static/simditor/images/emoji/barber.png


BIN
simditor/static/simditor/images/emoji/baseball.png


BIN
simditor/static/simditor/images/emoji/basketball.png


BIN
simditor/static/simditor/images/emoji/bath.png


BIN
simditor/static/simditor/images/emoji/bathtub.png


BIN
simditor/static/simditor/images/emoji/battery.png


BIN
simditor/static/simditor/images/emoji/bear.png


BIN
simditor/static/simditor/images/emoji/beer.png


BIN
simditor/static/simditor/images/emoji/beers.png


BIN
simditor/static/simditor/images/emoji/beetle.png


BIN
simditor/static/simditor/images/emoji/beginner.png


BIN
simditor/static/simditor/images/emoji/bell.png


BIN
simditor/static/simditor/images/emoji/bento.png


BIN
simditor/static/simditor/images/emoji/bicyclist.png


BIN
simditor/static/simditor/images/emoji/bike.png


BIN
simditor/static/simditor/images/emoji/bikini.png


BIN
simditor/static/simditor/images/emoji/bird.png


BIN
simditor/static/simditor/images/emoji/birthday.png


BIN
simditor/static/simditor/images/emoji/black_circle.png


BIN
simditor/static/simditor/images/emoji/black_joker.png


BIN
simditor/static/simditor/images/emoji/black_nib.png


BIN
simditor/static/simditor/images/emoji/black_square.png


BIN
simditor/static/simditor/images/emoji/black_square_button.png


BIN
simditor/static/simditor/images/emoji/blossom.png


BIN
simditor/static/simditor/images/emoji/blowfish.png


BIN
simditor/static/simditor/images/emoji/blue_book.png


BIN
simditor/static/simditor/images/emoji/blue_car.png


BIN
simditor/static/simditor/images/emoji/blue_heart.png


BIN
simditor/static/simditor/images/emoji/blush.png


BIN
simditor/static/simditor/images/emoji/boar.png


BIN
simditor/static/simditor/images/emoji/boat.png


BIN
simditor/static/simditor/images/emoji/bomb.png


BIN
simditor/static/simditor/images/emoji/book.png


BIN
simditor/static/simditor/images/emoji/bookmark.png


BIN
simditor/static/simditor/images/emoji/bookmark_tabs.png


BIN
simditor/static/simditor/images/emoji/books.png


BIN
simditor/static/simditor/images/emoji/boom.png


BIN
simditor/static/simditor/images/emoji/boot.png


BIN
simditor/static/simditor/images/emoji/bouquet.png


BIN
simditor/static/simditor/images/emoji/bow.png


BIN
simditor/static/simditor/images/emoji/bowling.png


BIN
simditor/static/simditor/images/emoji/bowtie.png


BIN
simditor/static/simditor/images/emoji/boy.png


BIN
simditor/static/simditor/images/emoji/bread.png


BIN
simditor/static/simditor/images/emoji/bride_with_veil.png


BIN
simditor/static/simditor/images/emoji/bridge_at_night.png


BIN
simditor/static/simditor/images/emoji/briefcase.png


BIN
simditor/static/simditor/images/emoji/broken_heart.png


BIN
simditor/static/simditor/images/emoji/bug.png


BIN
simditor/static/simditor/images/emoji/bulb.png


BIN
simditor/static/simditor/images/emoji/bullettrain_front.png


BIN
simditor/static/simditor/images/emoji/bullettrain_side.png


BIN
simditor/static/simditor/images/emoji/bus.png


BIN
simditor/static/simditor/images/emoji/busstop.png


BIN
simditor/static/simditor/images/emoji/bust_in_silhouette.png


BIN
simditor/static/simditor/images/emoji/busts_in_silhouette.png


BIN
simditor/static/simditor/images/emoji/cactus.png


BIN
simditor/static/simditor/images/emoji/cake.png


BIN
simditor/static/simditor/images/emoji/calendar.png


BIN
simditor/static/simditor/images/emoji/calling.png


BIN
simditor/static/simditor/images/emoji/camel.png


BIN
simditor/static/simditor/images/emoji/camera.png


BIN
simditor/static/simditor/images/emoji/cancer.png


BIN
simditor/static/simditor/images/emoji/candy.png


BIN
simditor/static/simditor/images/emoji/capital_abcd.png


BIN
simditor/static/simditor/images/emoji/capricorn.png


BIN
simditor/static/simditor/images/emoji/car.png


BIN
simditor/static/simditor/images/emoji/card_index.png


BIN
simditor/static/simditor/images/emoji/carousel_horse.png


BIN
simditor/static/simditor/images/emoji/cat.png


BIN
simditor/static/simditor/images/emoji/cat2.png


BIN
simditor/static/simditor/images/emoji/cd.png


BIN
simditor/static/simditor/images/emoji/chart.png


BIN
simditor/static/simditor/images/emoji/chart_with_downwards_trend.png


BIN
simditor/static/simditor/images/emoji/chart_with_upwards_trend.png


BIN
simditor/static/simditor/images/emoji/checkered_flag.png


BIN
simditor/static/simditor/images/emoji/cherries.png


BIN
simditor/static/simditor/images/emoji/cherry_blossom.png


BIN
simditor/static/simditor/images/emoji/chestnut.png


BIN
simditor/static/simditor/images/emoji/chicken.png


BIN
simditor/static/simditor/images/emoji/children_crossing.png


BIN
simditor/static/simditor/images/emoji/chocolate_bar.png


BIN
simditor/static/simditor/images/emoji/christmas_tree.png


BIN
simditor/static/simditor/images/emoji/church.png


BIN
simditor/static/simditor/images/emoji/cinema.png


BIN
simditor/static/simditor/images/emoji/circus_tent.png


BIN
simditor/static/simditor/images/emoji/city_sunrise.png


BIN
simditor/static/simditor/images/emoji/city_sunset.png


BIN
simditor/static/simditor/images/emoji/cl.png


BIN
simditor/static/simditor/images/emoji/clap.png


BIN
simditor/static/simditor/images/emoji/clapper.png


BIN
simditor/static/simditor/images/emoji/clipboard.png


BIN
simditor/static/simditor/images/emoji/clock1.png


BIN
simditor/static/simditor/images/emoji/clock10.png


BIN
simditor/static/simditor/images/emoji/clock1030.png


BIN
simditor/static/simditor/images/emoji/clock11.png


BIN
simditor/static/simditor/images/emoji/clock1130.png


BIN
simditor/static/simditor/images/emoji/clock12.png


BIN
simditor/static/simditor/images/emoji/clock1230.png


BIN
simditor/static/simditor/images/emoji/clock130.png


BIN
simditor/static/simditor/images/emoji/clock2.png


BIN
simditor/static/simditor/images/emoji/clock230.png


BIN
simditor/static/simditor/images/emoji/clock3.png


BIN
simditor/static/simditor/images/emoji/clock330.png


BIN
simditor/static/simditor/images/emoji/clock4.png


BIN
simditor/static/simditor/images/emoji/clock430.png


BIN
simditor/static/simditor/images/emoji/clock5.png


BIN
simditor/static/simditor/images/emoji/clock530.png


BIN
simditor/static/simditor/images/emoji/clock6.png


BIN
simditor/static/simditor/images/emoji/clock630.png


BIN
simditor/static/simditor/images/emoji/clock7.png


BIN
simditor/static/simditor/images/emoji/clock730.png


BIN
simditor/static/simditor/images/emoji/clock8.png


BIN
simditor/static/simditor/images/emoji/clock830.png


BIN
simditor/static/simditor/images/emoji/clock9.png


BIN
simditor/static/simditor/images/emoji/clock930.png


BIN
simditor/static/simditor/images/emoji/closed_book.png


BIN
simditor/static/simditor/images/emoji/closed_lock_with_key.png


BIN
simditor/static/simditor/images/emoji/closed_umbrella.png


BIN
simditor/static/simditor/images/emoji/cloud.png


BIN
simditor/static/simditor/images/emoji/clubs.png


BIN
simditor/static/simditor/images/emoji/cn.png


BIN
simditor/static/simditor/images/emoji/cocktail.png


BIN
simditor/static/simditor/images/emoji/coffee.png


BIN
simditor/static/simditor/images/emoji/cold_sweat.png


BIN
simditor/static/simditor/images/emoji/collision.png


BIN
simditor/static/simditor/images/emoji/computer.png


BIN
simditor/static/simditor/images/emoji/confetti_ball.png


BIN
simditor/static/simditor/images/emoji/confounded.png


BIN
simditor/static/simditor/images/emoji/confused.png


BIN
simditor/static/simditor/images/emoji/congratulations.png


BIN
simditor/static/simditor/images/emoji/construction.png


BIN
simditor/static/simditor/images/emoji/construction_worker.png


BIN
simditor/static/simditor/images/emoji/convenience_store.png


BIN
simditor/static/simditor/images/emoji/cookie.png


BIN
simditor/static/simditor/images/emoji/cool.png


BIN
simditor/static/simditor/images/emoji/cop.png


BIN
simditor/static/simditor/images/emoji/copyright.png


BIN
simditor/static/simditor/images/emoji/corn.png


BIN
simditor/static/simditor/images/emoji/couple.png


BIN
simditor/static/simditor/images/emoji/couple_with_heart.png


BIN
simditor/static/simditor/images/emoji/couplekiss.png


BIN
simditor/static/simditor/images/emoji/cow.png


BIN
simditor/static/simditor/images/emoji/cow2.png


BIN
simditor/static/simditor/images/emoji/credit_card.png


BIN
simditor/static/simditor/images/emoji/crocodile.png


BIN
simditor/static/simditor/images/emoji/crossed_flags.png


BIN
simditor/static/simditor/images/emoji/crown.png


BIN
simditor/static/simditor/images/emoji/cry.png


BIN
simditor/static/simditor/images/emoji/crying_cat_face.png


BIN
simditor/static/simditor/images/emoji/crystal_ball.png


BIN
simditor/static/simditor/images/emoji/cupid.png


BIN
simditor/static/simditor/images/emoji/curly_loop.png


BIN
simditor/static/simditor/images/emoji/currency_exchange.png


BIN
simditor/static/simditor/images/emoji/curry.png


BIN
simditor/static/simditor/images/emoji/custard.png


BIN
simditor/static/simditor/images/emoji/customs.png


BIN
simditor/static/simditor/images/emoji/cyclone.png


BIN
simditor/static/simditor/images/emoji/dancer.png


BIN
simditor/static/simditor/images/emoji/dancers.png


BIN
simditor/static/simditor/images/emoji/dango.png


BIN
simditor/static/simditor/images/emoji/dart.png


BIN
simditor/static/simditor/images/emoji/dash.png


BIN
simditor/static/simditor/images/emoji/date.png


BIN
simditor/static/simditor/images/emoji/de.png


BIN
simditor/static/simditor/images/emoji/deciduous_tree.png


BIN
simditor/static/simditor/images/emoji/department_store.png


BIN
simditor/static/simditor/images/emoji/diamond_shape_with_a_dot_inside.png


BIN
simditor/static/simditor/images/emoji/diamonds.png


BIN
simditor/static/simditor/images/emoji/disappointed.png


BIN
simditor/static/simditor/images/emoji/dizzy.png


BIN
simditor/static/simditor/images/emoji/dizzy_face.png


BIN
simditor/static/simditor/images/emoji/do_not_litter.png


BIN
simditor/static/simditor/images/emoji/dog.png


BIN
simditor/static/simditor/images/emoji/dog2.png


BIN
simditor/static/simditor/images/emoji/dollar.png


BIN
simditor/static/simditor/images/emoji/dolls.png


BIN
simditor/static/simditor/images/emoji/dolphin.png


BIN
simditor/static/simditor/images/emoji/door.png


BIN
simditor/static/simditor/images/emoji/doughnut.png


BIN
simditor/static/simditor/images/emoji/dragon.png


BIN
simditor/static/simditor/images/emoji/dragon_face.png


BIN
simditor/static/simditor/images/emoji/dress.png


BIN
simditor/static/simditor/images/emoji/dromedary_camel.png


BIN
simditor/static/simditor/images/emoji/droplet.png


BIN
simditor/static/simditor/images/emoji/dvd.png


BIN
simditor/static/simditor/images/emoji/e-mail.png


BIN
simditor/static/simditor/images/emoji/ear.png


BIN
simditor/static/simditor/images/emoji/ear_of_rice.png


BIN
simditor/static/simditor/images/emoji/earth_africa.png


BIN
simditor/static/simditor/images/emoji/earth_americas.png


BIN
simditor/static/simditor/images/emoji/earth_asia.png


BIN
simditor/static/simditor/images/emoji/egg.png


BIN
simditor/static/simditor/images/emoji/eggplant.png


BIN
simditor/static/simditor/images/emoji/eight.png


BIN
simditor/static/simditor/images/emoji/eight_pointed_black_star.png


BIN
simditor/static/simditor/images/emoji/eight_spoked_asterisk.png


BIN
simditor/static/simditor/images/emoji/eightball.png


BIN
simditor/static/simditor/images/emoji/electric_plug.png


BIN
simditor/static/simditor/images/emoji/elephant.png


BIN
simditor/static/simditor/images/emoji/email.png


+ 0 - 0
simditor/static/simditor/images/emoji/emojify.css

@@ -0,0 +1 @@

add refused relative · 30d24179d9 - Gogs: Go Git Service

add refused relative

Brightcells 9 years ago
parent
commit
30d24179d9

+ 19 - 0
account/migrations/0014_lensmaninfo_refused_reason.py

@@ -0,0 +1,19 @@
1
+# -*- coding: utf-8 -*-
2
+from __future__ import unicode_literals
3
+
4
+from django.db import models, migrations
5
+
6
+
7
+class Migration(migrations.Migration):
8
+
9
+    dependencies = [
10
+        ('account', '0013_auto_20160711_1436'),
11
+    ]
12
+
13
+    operations = [
14
+        migrations.AddField(
15
+            model_name='lensmaninfo',
16
+            name='refused_reason',
17
+            field=models.TextField(help_text='\u5ba1\u6838\u62d2\u7edd\u539f\u56e0', null=True, verbose_name='refused_reason', blank=True),
18
+        ),
19
+    ]

+ 19 - 0
account/migrations/0015_auto_20160713_1646.py

@@ -0,0 +1,19 @@
1
+# -*- coding: utf-8 -*-
2
+from __future__ import unicode_literals
3
+
4
+from django.db import models, migrations
5
+
6
+
7
+class Migration(migrations.Migration):
8
+
9
+    dependencies = [
10
+        ('account', '0014_lensmaninfo_refused_reason'),
11
+    ]
12
+
13
+    operations = [
14
+        migrations.AlterField(
15
+            model_name='lensmaninfo',
16
+            name='user_status',
17
+            field=models.IntegerField(default=0, verbose_name='user_status', choices=[(-1, '\u5df2\u62d2\u7edd'), (0, '\u672a\u9a8c\u8bc1'), (1, '\u5df2\u6fc0\u6d3b'), (2, '\u5df2\u7981\u7528'), (3, '\u5df2\u5220\u9664'), (10, '\u5df2\u5206\u914d')]),
18
+        ),
19
+    ]

+ 4 - 0
account/models.py

@@ -16,6 +16,7 @@ class LensmanInfo(CreateUpdateMixin):
16 16
         (FEMALE, u'女'),
17 17
     )
18 18
 
19
+    REFUSED = -1
19 20
     UNVERIFIED = 0
20 21
     ACTIVATED = 1
21 22
     DISABLED = 2
@@ -23,6 +24,7 @@ class LensmanInfo(CreateUpdateMixin):
23 24
     ASSIGN = 10
24 25
 
25 26
     USER_STATUS = (
27
+        (REFUSED, u'已拒绝'),
26 28
         (UNVERIFIED, u'未验证'),
27 29
         (ACTIVATED, u'已激活'),
28 30
         (DISABLED, u'已禁用'),
@@ -48,6 +50,7 @@ class LensmanInfo(CreateUpdateMixin):
48 50
     balance = models.IntegerField(_(u'balance'), default=0, help_text=u'摄影师余额(分)')
49 51
 
50 52
     user_status = models.IntegerField(_(u'user_status'), choices=USER_STATUS, default=UNVERIFIED)
53
+    refused_reason = models.TextField(_(u'refused_reason'), blank=True, null=True, help_text=u'审核拒绝原因')
51 54
 
52 55
     signup_ip = models.CharField(_(u'signup_ip'), max_length=255, blank=True, null=True, help_text=_(u'注册IP'))
53 56
     login_ip = models.CharField(_(u'login_ip'), max_length=255, blank=True, null=True, help_text=_(u'登录IP'))
@@ -68,6 +71,7 @@ class LensmanInfo(CreateUpdateMixin):
68 71
             'phone': self.phone,
69 72
             'location': self.location,
70 73
             'status': self.user_status,
74
+            'refused_reason': self.refused_reason,
71 75
         }
72 76
 
73 77
 

+ 1 - 1
group/lensman_views.py

@@ -48,7 +48,7 @@ def lensman_submit_api(request):
48 48
 
49 49
     lensman, created = LensmanInfo.objects.get_or_create(unionid=unionid, defaults=fields)
50 50
     # 状态为 UNVERIFIED 的允许修改, 其他需要登录摄影师 APP 进行信息的修改
51
-    if lensman.user_status != LensmanInfo.UNVERIFIED:
51
+    if lensman.user_status not in [LensmanInfo.UNVERIFIED, LensmanInfo.REFUSED]:
52 52
         return response(LensmanStatusCode.LENSMAN_ALREADY_NOT_UNVERIFIED)
53 53
     if not created:
54 54
         for key, value in fields.iteritems():

+ 14 - 0
page/templates/page/lensman_oauth.html

@@ -61,6 +61,7 @@
61 61
                         <p>状态</p>
62 62
                     </div>
63 63
                     <div class="weui_cell_ft">
64
+                        {% ifequal lensman_info.status -1 %}已拒绝{% endifequal %}
64 65
                         {% ifequal lensman_info.status 0 %}审核中{% endifequal %}
65 66
                         {% ifequal lensman_info.status 1 %}已激活{% endifequal %}
66 67
                         {% ifequal lensman_info.status 2 %}已禁用{% endifequal %}
@@ -70,6 +71,18 @@
70 71
             </div>
71 72
             {% endif %}
72 73
 
74
+
75
+            {% ifequal lensman_info.status -1 %}
76
+            <div class="weui_cells_title">拒绝原因</div>
77
+            <div class="weui_cells">
78
+                <div class="weui_panel_bd">
79
+                    <div class="weui_media_box weui_media_text">
80
+                        <p class="weui_media_desc">{{ lensman_info.refused_reason|safe|linebreaks }}</p>
81
+                    </div>
82
+                </div>
83
+            </div>
84
+            {% endifequal %}
85
+
73 86
             <br>
74 87
 
75 88
             {% if modified %}<button id="submit" class="weui_btn weui_btn_warn">确认</button>{% endif %}
@@ -155,6 +168,7 @@
155 168
                                     setTimeout(function () {
156 169
                                         $('#toast').hide();
157 170
                                     }, 1000);
171
+                                    window.location.reload();
158 172
                                 } else {
159 173
                                     show_error_dialog('错误', data.description);
160 174
                                 }

+ 1 - 1
page/views.py

@@ -23,5 +23,5 @@ def lensman_oauth(request):
23 23
 
24 24
     return render(request, 'page/lensman_oauth.html', {
25 25
         'lensman_info': lensman and lensman.data,
26
-        'modified': bool((not lensman) or (lensman and lensman.user_status == LensmanInfo.UNVERIFIED)),  # 是否可以更改信息
26
+        'modified': bool((not lensman) or (lensman and lensman.user_status in [LensmanInfo.UNVERIFIED, LensmanInfo.REFUSED])),  # 是否可以更改信息
27 27
     })