Merge branch 'dev' into test

src/assets/scss/buttonstyle.scss

@@ -81,7 +81,11 @@
   background-color: #3e8ef7 !important;
   border-color: #3e8ef7 !important;
 }
-
+.diy-button--qrcode {
+  color: #fff !important;
+  background-color: #4ec591 !important;
+  border-color: #4ec591 !important;
+}
 //table按钮样式
 
 //查看
@@ -101,3 +105,9 @@
   color: #d51010 !important;
   text-decoration: underline !important;
 }
+
+// 
+.div-table-button--qr {
+  color: #4ec591 !important;
+  text-decoration: underline !important;
+}

src/views/modules/base/community/communityTable.vue

@@ -103,6 +103,10 @@
                  class="diy-button--reset"
                  size="small"
                  @click="handleExport">导出</el-button>
+      <el-button v-if="agencyObj.level == 'community'" style="margin-left:10px"
+                 class="diy-button--qrcode"
+                 size="small"
+                 @click="handleDownQr(agencyObj, 'community')">社区二维码</el-button>
 
     </div>
 
@@ -123,11 +127,11 @@
         <el-table-column prop="neighborHoodName"
                          label="小区名称"
                          min-width="100">
-          <template slot-scope="scope">
+          <!-- <template slot-scope="scope">
             <a class="name-a" @click="handleDetail(scope.row)">
               {{ scope.row.neighborHoodName }}
             </a>
-          </template>
+          </template> -->
         </el-table-column>
         <el-table-column prop="agencyName"
                          label="所属组织"
@@ -165,10 +169,15 @@
                        style="color:#feb349;text-decoration: underline;"
                        size="small"
                        @click="handleToNextLevel(scope.row)">进入</el-button> -->
-            <el-button type="text"
-                       class="div-table-button--delete"
+            <!-- <el-button type="text"
+                       class="div-table-button--qr"
                        size="small"
-                       @click="handleDownQr(scope.row)">二维码</el-button>
+                       @click="handleDownQr(scope.row, 'neighborHood')">二维码</el-button> -->
+            <el-button v-if="scope.row.showBtn"
+                       type="text"
+                       class="div-table-button--detail"
+                       size="small"
+                       @click="handleDetail(scope.row)">查看</el-button>
             <el-button v-if="scope.row.showBtn"
                        type="text"
                        class="div-table-button--edit"
@@ -538,11 +547,18 @@ export default {
         this.$message.error(msg)
       }
     },
-    async handleDownQr(row) {
-      const url = window.SITE_CONFIG['apiURL'] + `/gov/org/icneighborhood/createQrCode/${row.neighborHoodId}`
+    async handleDownQr(row, type) {
+      // const url = window.SITE_CONFIG['apiURL'] + `/gov/org/icneighborhood/createQrCode/${row.neighborHoodId}`
+      const url = '/gov/org/agency/create-qrcode'
+      const _id = type == 'community' ? row.id : row.neighborHoodId
+      const params = {
+        id: _id,
+        type
+      }
       await axios({
         method: 'POST',
-        url,
+        url: window.SITE_CONFIG['apiURL'] + url,
+        data: params,
         responseType: 'blob'
       }).then(res => {
         console.log('res----1r', res)