Merge remote-tracking branch 'origin/dev' into dev

src/project/wuxi/AppCircle/Add.vue

@@ -33,7 +33,7 @@
     <div class="btn-wrapper">
       <div class="btn" hover-class="text-hover" :class="[!form.content ? 'active' : '']" @click="submit">发布服务</div>
     </div>
-    <u-popup v-model="isShow" mode="bottom" hidden height="700rpx" border-radius="30">
+    <!-- <u-popup v-model="isShow" mode="bottom" hidden height="700rpx" border-radius="30">
 			<div class="popup">
         <h2>请选择</h2>
         <scroll-view class="popup-list" scroll-y>
@@ -46,7 +46,9 @@
           </div>
         </scroll-view>
       </div>
-		</u-popup>
+		</u-popup> -->
+    <u-select v-model="isShow" :list="topicList" value-name="id"
+              label-name="title" @confirm="confirm"></u-select>
   </div>
 </template>
 <script>
@@ -74,10 +76,17 @@
     },
 
     methods: {
+      confirm(val) {
+        this.form.themeId = val[0].value;
+        this.form.themeTitle = val[0].label;
+      },
       submit () {
         if (!this.form.content) {
           return this.$toast(`内容不能为空`)
         }
+        if (!this.form.themeId) {
+          return this.$toast(`请绑定话题`)
+        }
 
         this.$loading()
         this.$instance.post(`/app/appneighborhoodassistance/addOrUpdate`, {