Merge branch 'dev' into 'master'

Dev

See merge request alpha/sun!4

api/pick.py

@@ -131,8 +131,9 @@ class PickUserListView(APIView):
         celebrity_id = request.POST.get('celebrity_id', '')
         fake_pick_nums = request.POST.get('fake_pick_nums', 0)
         topic_id = request.POST.get('topic_id', '')
+        pick_id = request.POST.get('pick_id', '')
         try:
-            self.rpc['venus/sun/pick/add_fake_pick_nums'](celebrity_id=celebrity_id, topic_id=topic_id, pick_nums=fake_pick_nums).unwrap()
+            self.rpc['venus/sun/pick/add_fake_pick_nums'](celebrity_id=celebrity_id, topic_id=topic_id, pick_nums=fake_pick_nums, pick_id=pick_id).unwrap()
         except Exception as e:
             error_logger.error(u'增加fake_pick_num失败%s' ,e)
             raise

vu/dist/static/css/chunk-70ee.685373e8.css → vu/dist/static/css/chunk-570c.07aff359.css

-.waves-ripple{position:absolute;border-radius:100%;background-color:rgba(0,0,0,.15);background-clip:padding-box;pointer-events:none;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;-webkit-transform:scale(0);transform:scale(0);opacity:1}.waves-ripple.z-active{opacity:0;-webkit-transform:scale(2);transform:scale(2);-webkit-transition:opacity 1.2s ease-out,-webkit-transform .6s ease-out;transition:opacity 1.2s ease-out,-webkit-transform .6s ease-out;transition:opacity 1.2s ease-out,transform .6s ease-out;transition:opacity 1.2s ease-out,transform .6s ease-out,-webkit-transform .6s ease-out}.createPost-container[data-v-40a811a0]{position:relative}.createPost-container .createPost-main-container[data-v-40a811a0]{padding:40px 45px 20px 50px}.createPost-container .createPost-main-container .postInfo-container[data-v-40a811a0]{position:relative;margin-bottom:10px}.createPost-container .createPost-main-container .postInfo-container[data-v-40a811a0]:after{content:"";display:table;clear:both}.createPost-container .createPost-main-container .postInfo-container .postInfo-container-item[data-v-40a811a0]{float:left}.createPost-container .createPost-main-container .editor-container[data-v-40a811a0]{min-height:500px;margin:0 0 30px}.createPost-container .createPost-main-container .editor-container .editor-upload-btn-container[data-v-40a811a0]{text-align:right;margin-right:10px}.createPost-container .createPost-main-container .editor-container .editor-upload-btn-container .editor-upload-btn[data-v-40a811a0]{display:inline-block}.createPost-container .word-counter[data-v-40a811a0]{width:40px;position:absolute;right:-10px;top:0}.edit-input[data-v-40a811a0]{padding-right:100px}.cancel-btn[data-v-40a811a0]{position:absolute;right:15px;top:10px}
\ No newline at end of file
+.waves-ripple{position:absolute;border-radius:100%;background-color:rgba(0,0,0,.15);background-clip:padding-box;pointer-events:none;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;-webkit-transform:scale(0);transform:scale(0);opacity:1}.waves-ripple.z-active{opacity:0;-webkit-transform:scale(2);transform:scale(2);-webkit-transition:opacity 1.2s ease-out,-webkit-transform .6s ease-out;transition:opacity 1.2s ease-out,-webkit-transform .6s ease-out;transition:opacity 1.2s ease-out,transform .6s ease-out;transition:opacity 1.2s ease-out,transform .6s ease-out,-webkit-transform .6s ease-out}.createPost-container[data-v-263b1825]{position:relative}.createPost-container .createPost-main-container[data-v-263b1825]{padding:40px 45px 20px 50px}.createPost-container .createPost-main-container .postInfo-container[data-v-263b1825]{position:relative;margin-bottom:10px}.createPost-container .createPost-main-container .postInfo-container[data-v-263b1825]:after{content:"";display:table;clear:both}.createPost-container .createPost-main-container .postInfo-container .postInfo-container-item[data-v-263b1825]{float:left}.createPost-container .createPost-main-container .editor-container[data-v-263b1825]{min-height:500px;margin:0 0 30px}.createPost-container .createPost-main-container .editor-container .editor-upload-btn-container[data-v-263b1825]{text-align:right;margin-right:10px}.createPost-container .createPost-main-container .editor-container .editor-upload-btn-container .editor-upload-btn[data-v-263b1825]{display:inline-block}.createPost-container .word-counter[data-v-263b1825]{width:40px;position:absolute;right:-10px;top:0}.edit-input[data-v-263b1825]{padding-right:100px}.cancel-btn[data-v-263b1825]{position:absolute;right:15px;top:10px}
\ No newline at end of file

vu/src/views/pick/components/PickDetail.vue

@@ -549,8 +549,10 @@
         })
       },
       confirmEdit(row) {
+        const id = this.$route.params && this.$route.params.id
         row.edit = false
         row.original_fake_pick_nums = row.fake_pick_nums
+        row.pick_id = id
         this.$message({
           message: '添加成功',
           type: 'success'