1

unimall-admin/src/views/circleManagementInfo/index.vue

@@ -100,6 +100,8 @@
         <template slot-scope="scope">
           <el-button size="mini" type="text" @click="handle(scope.row)"
             v-permission="['unimall:circleManagementInfo:edit']" v-if="scope.row.status == '0'">通过</el-button>
+          <el-button size="mini" type="text" @click="handle(scope.row, 1)"
+            v-permission="['unimall:circleManagementInfo:edit']" v-if="scope.row.status == '0'">驳回</el-button>
           <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
             v-permission="['unimall:circleManagementInfo:edit']">修改</el-button>
           <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
@@ -160,6 +162,16 @@
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
+    <el-dialog title="审核驳回" :visible.sync="isShowhandle">
+      <div>
+        <el-input type="textarea" :rows="2" placeholder="请输入内容" v-model="textarea">
+        </el-input>
+      </div>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="isShowhandle = false">取 消</el-button>
+        <el-button type="primary" @click="handleSubmit">确 定</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
@@ -170,6 +182,9 @@ import { getToken } from '@/utils/auth'
 export default {
   data() {
     return {
+      selectObj:{},
+      textarea: '',
+      isShowhandle: false,
       imgsFileList: [],
       uploadPath,
       // 遮罩层
@@ -244,7 +259,7 @@ export default {
       }
     },
     handleRemove: function (file, fileList) {
-      this.form.circleHead=""
+      this.form.circleHead = ""
     },
     /** 查询圈子管理列表 */
     getList() {
@@ -268,7 +283,7 @@ export default {
         circleName: undefined,
         circleLabel: undefined,
         status: "0",
-        circleHead:'',
+        circleHead: '',
         gmtCreate: undefined,
         gmtUpdate: undefined,
         deleteFlag: undefined
@@ -297,27 +312,45 @@ export default {
       this.open = true;
       this.title = "添加圈子管理";
     },
-    // 审核
-    handle(row) {
-      console.log(row)
-      debugger
-      circleManagementInfoHandle(row).then(response => {
+    handleSubmit() {
+      this.selectObj.reason = this.textarea
+      circleManagementInfoHandle(this.selectObj).then(response => {
         if (response.data) {
-          this.msgSuccess("新增成功");
+          this.msgSuccess("驳回成功！");
+          this.isShowhandle = false 
           this.getList();
         } else {
           this.msgError(response.msg);
         }
       });
     },
+    // 审核
+    handle(row, type) {
+      this.selectObj = row
+      if (type == 1) {
+        this.isShowhandle = true
+      } else {
+        circleManagementInfoHandle(row).then(response => {
+          if (response.data) {
+            this.msgSuccess("新增成功");
+            this.getList();
+          } else {
+            this.msgError(response.msg);
+          }
+        });
+      }
+      console.log(row)
+      debugger
+
+    },
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();
       this.imgsFileList = []
       const id = row.id || this.ids.join(',')
       this.imgsFileList.push({
-            url:row.circleHead
-          })
+        url: row.circleHead
+      })
       getCircleManagementInfo(id).then(response => {
         this.form = response.data.data
         this.open = true;

xiaochengxu/pages/cardHolder/cardHolder.vue

@@ -1169,7 +1169,7 @@
 			},
 			toMap(item) {
 				uni.navigateTo({
-					url: "/pages/cardHolder/map?location=" + item.location
+					url: "/pages/cardHolder/map?val=" + JSON.stringify(item)
 				})
 			},
 		}

xiaochengxu/pages/cardHolder/map.vue

@@ -7,8 +7,8 @@
 				          <cover-view class="container">
 				            <cover-view class="flex-wrp" style="flex-direction:row;">
 				              <cover-view class="flex-item demo-text-1">
-								  <cover-view style="font-weight: bold;">黑龙江中天昊元贸易有限公司</cover-view>
-								   <cover-view style="margin-top: 20rpx;color: #ccc;font-size: 26rpx;display: flex;align-items: center;"><image src="../../static/location.png" mode="widthFix" style="width: 20px;margin-right: 20rpx;"></image>辽宁省营口市皱鱼圈区青龙山大街8号</cover-view>
+								  <cover-view style="font-weight: bold;">{{dataObj.companyName}}</cover-view>
+								   <cover-view style="margin-top: 20rpx;color: #ccc;font-size: 26rpx;display: flex;align-items: center;"><image src="../../static/location.png" mode="widthFix" style="width: 20px;margin-right: 20rpx;"></image>{{dataObj.province}}{{dataObj.city}}{{dataObj.area}}</cover-view>
 							  </cover-view>
 				            </cover-view>
 				          </cover-view>
@@ -27,11 +27,19 @@
 				title: 'map',
 				latitude: 39.909,
 				longitude: 116.39742,
-				covers: []
+				covers: [],
+				dataObj:{
+					companyName:'',
+					area:'',
+					city:'',
+					province:''
+				}
 			}
 		},
 		onLoad(options) {
-			var location=options.location.split(',')
+			this.dataObj = JSON.parse(options.val)
+			
+			let location=this.dataObj.location.split(',')
 			this.latitude=location[0]
 			this.longitude=location[1]
 			this.covers = [