Merge branch 'xiaowang-social' into feature

package.json

@@ -9,7 +9,7 @@
     "build": "vue-cli-service build",
     "build:sit": "vue-cli-service build --mode production.sit",
     "build:uat": "vue-cli-service build --mode production.uat",
-    "build:preview": "vue-cli-service build --mode preview",
+    "build:preview": "set NODE_OPTIONS=--max_old_space_size=4096 && vue-cli-service build --mode preview",
     "build:prod": "vue-cli-service build --mode production",
     "build:test": "set NODE_OPTIONS=--max_old_space_size=4096 && vue-cli-service build --mode test",
     "build:shibei_prod": "vue-cli-service build --mode shibei_production",

src/views/modules/volunteer/LifeCircleManagement/add.vue

@@ -336,13 +336,13 @@
             "label": "文化体育"
         },
         {
-            "children": [
+            // "children": [
-            {
+            // {
-                    "pv":"5",
+            //         "pv":"5",
-                    "value": "51",
+            //         "value": "51",
-                    "label": "其他"
+            //         "label": "其他"
-                },
+            //     },
-            ],
+            // ],
             "value": "5",
             "label": "其它"
         }

src/views/modules/volunteer/VolunteerProjects/index.vue

@@ -91,7 +91,7 @@
                             style="color:#1C6AFD;" size="small" @click="handleupOnline(scope.row)">上线</el-button>
                         <el-button type="text" style="color:#1C6AFD;" size="small" v-if="scope.row.onlineStatus==0&&scope.row.projectStatus==10"
                             @click="handledelete(scope.row)">删除</el-button>
-                        <el-button type="text" style="color:#1C6AFD;" size="small" v-if="scope.row.source==1"
+                        <el-button type="text" style="color:#1C6AFD;" size="small" v-if="scope.row.source==2"
                             @click="handlerecruit(scope.row)">招募</el-button>
                         <!-- <el-button type="text" style="color:#1C6AFD;" size="small"
                             @click="handleprocessl(scope.row)">审核</el-button> -->