Merge branch 'prod' into test

src/views/modules/communityParty/regionalParty/activitys.vue

@@ -148,6 +148,16 @@
                          label="活动时间"
                          width="230">
         </el-table-column>
+        <el-table-column prop="activityTime"
+                         header-align="center"
+                         align="center"
+                         label="来源"
+                         width="100">
+          <template slot-scope="scope">
+            <span v-if="scope.row.actId">小程序</span>
+            <span v-else>管理平台</span>
+          </template>
+        </el-table-column>
 
         <el-table-column label="操作"
                          fixed="right"
@@ -161,7 +171,8 @@
                        style="color:#1C6AFD;text-decoration: underline;"
                        size="small"
                        @click="handleDetail(scope.row)">查看</el-button>
-            <el-button type="text"
+            <el-button v-if="!scope.row.actId"
+                       type="text"
                        style="color:#00A7A9;text-decoration: underline;"
                        size="small"
                        @click="handleEdit(scope.row)">修改</el-button>
@@ -199,6 +210,7 @@
                       @dialogCancle="addFormCancle"
                       @dialogOk="addFormOk"></activitys-form>
     </el-dialog>
+
     <el-dialog :visible.sync="detailShow"
                :close-on-click-modal="false"
                :close-on-press-escape="false"

src/views/modules/communityParty/regionalParty/activitysForm.vue

@@ -244,6 +244,8 @@ export default {
       }
       this.endLoading()
 
+
+
     },
 
     //加载组织
@@ -258,7 +260,16 @@ export default {
 
       if (code === 0) {
         this.formData = data
-        map.setCenter(new TMap.LatLng(this.formData.latitude, this.formData.longitude))
+        console.log(this.formData.content)
+        let style_img = "style='width:50px;height:40px;' "
+
+        if (this.formData.content) {
+          this.formData.content = this.formData.content.replace(/<img/g, "<img style='width:200px;height:120px;'")
+          // let array=this.formData.content.split('<img')
+
+        }
+        console.log(this.formData.content)
+        map.setCenter(new TMap.LatLng(parseFloat(this.formData.latitude), parseFloat(this.formData.longitude)))
         this.setMarker(this.formData.latitude, this.formData.longitude)
       } else {
         this.$message.error(msg)